summaryrefslogtreecommitdiffstats
path: root/scilab/modules/sound
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/sound
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/sound')
-rw-r--r--scilab/modules/sound/locales/ca_ES/sound.po2
-rw-r--r--scilab/modules/sound/locales/de_DE/sound.po2
-rw-r--r--scilab/modules/sound/locales/es_ES/sound.po2
-rw-r--r--scilab/modules/sound/locales/fr_FR/sound.po2
-rw-r--r--scilab/modules/sound/locales/it_IT/sound.po2
-rw-r--r--scilab/modules/sound/locales/ja_JP/sound.po2
-rw-r--r--scilab/modules/sound/locales/pt_BR/sound.po2
-rw-r--r--scilab/modules/sound/locales/ru_RU/sound.po2
-rw-r--r--scilab/modules/sound/locales/uk_UA/sound.po12
-rw-r--r--scilab/modules/sound/locales/zh_CN/sound.po2
-rw-r--r--scilab/modules/sound/locales/zh_TW/sound.po2
11 files changed, 12 insertions, 20 deletions
diff --git a/scilab/modules/sound/locales/ca_ES/sound.po b/scilab/modules/sound/locales/ca_ES/sound.po
index 46697e6..72c5545 100644
--- a/scilab/modules/sound/locales/ca_ES/sound.po
+++ b/scilab/modules/sound/locales/ca_ES/sound.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: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/sound/locales/de_DE/sound.po b/scilab/modules/sound/locales/de_DE/sound.po
index 8603496..83dd23a 100644
--- a/scilab/modules/sound/locales/de_DE/sound.po
+++ b/scilab/modules/sound/locales/de_DE/sound.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: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/sound/locales/es_ES/sound.po b/scilab/modules/sound/locales/es_ES/sound.po
index 8f694b1..dce121e 100644
--- a/scilab/modules/sound/locales/es_ES/sound.po
+++ b/scilab/modules/sound/locales/es_ES/sound.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: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/sound/locales/fr_FR/sound.po b/scilab/modules/sound/locales/fr_FR/sound.po
index 349bede..4681da1 100644
--- a/scilab/modules/sound/locales/fr_FR/sound.po
+++ b/scilab/modules/sound/locales/fr_FR/sound.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: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/sound/locales/it_IT/sound.po b/scilab/modules/sound/locales/it_IT/sound.po
index 2f8546a..3293508 100644
--- a/scilab/modules/sound/locales/it_IT/sound.po
+++ b/scilab/modules/sound/locales/it_IT/sound.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: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/sound/locales/ja_JP/sound.po b/scilab/modules/sound/locales/ja_JP/sound.po
index bdad6d6..d396179 100644
--- a/scilab/modules/sound/locales/ja_JP/sound.po
+++ b/scilab/modules/sound/locales/ja_JP/sound.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: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/sound/locales/pt_BR/sound.po b/scilab/modules/sound/locales/pt_BR/sound.po
index 8b92205..c8ab0c4 100644
--- a/scilab/modules/sound/locales/pt_BR/sound.po
+++ b/scilab/modules/sound/locales/pt_BR/sound.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: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/sound/locales/ru_RU/sound.po b/scilab/modules/sound/locales/ru_RU/sound.po
index eedb0d4..47d6f73 100644
--- a/scilab/modules/sound/locales/ru_RU/sound.po
+++ b/scilab/modules/sound/locales/ru_RU/sound.po
@@ -16,7 +16,7 @@ msgstr ""
16"MIME-Version: 1.0\n" 16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n" 17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n" 18"Content-Transfer-Encoding: 8bit\n"
19"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 19"X-Launchpad-Export-Date: 2010-04-16 07:53+0000\n"
20"X-Generator: Launchpad (build Unknown)\n" 20"X-Generator: Launchpad (build Unknown)\n"
21 21
22#, c-format 22#, c-format
diff --git a/scilab/modules/sound/locales/uk_UA/sound.po b/scilab/modules/sound/locales/uk_UA/sound.po
index bec1ef4..9e2de75 100644
--- a/scilab/modules/sound/locales/uk_UA/sound.po
+++ b/scilab/modules/sound/locales/uk_UA/sound.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-26 18:05+0100\n" 11"POT-Creation-Date: 2007-11-26 18:05+0100\n"
12"PO-Revision-Date: 2010-01-14 18:16+0000\n" 12"PO-Revision-Date: 2010-01-14 18:16+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
@@ -96,14 +96,6 @@ msgstr ""
96 96
97#, c-format 97#, c-format
98msgid "" 98msgid ""
99"%s: Wrong value for input argument #%d: Must be %s or %s , an integer or a "
100"vector of %d integers.\n"
101msgstr ""
102"%s: помилкове значення вхідного параметра №%d: слід використовувати %s або "
103"%s, ціле число або вектор з %d цілих чисел.\n"
104
105#, c-format
106msgid ""
107"%s: Wrong value for input argument #%d: Must be %s or %s, an integer or a " 99"%s: Wrong value for input argument #%d: Must be %s or %s, an integer or a "
108"vector of %d integers.\n" 100"vector of %d integers.\n"
109msgstr "" 101msgstr ""
diff --git a/scilab/modules/sound/locales/zh_CN/sound.po b/scilab/modules/sound/locales/zh_CN/sound.po
index 5b86eb4..ddb9cdd 100644
--- a/scilab/modules/sound/locales/zh_CN/sound.po
+++ b/scilab/modules/sound/locales/zh_CN/sound.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: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/sound/locales/zh_TW/sound.po b/scilab/modules/sound/locales/zh_TW/sound.po
index 5da16fa..d84df3a 100644
--- a/scilab/modules/sound/locales/zh_TW/sound.po
+++ b/scilab/modules/sound/locales/zh_TW/sound.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: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