summaryrefslogtreecommitdiffstats
path: root/scilab/modules/parameters
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-15 15:25:59 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-15 15:25:59 +0100
commitc523b1358d8ea7a578f22edc011c4077aeef4aaa (patch)
tree03b0afb11b4ac4f9b5b6c2f4bc6908e86ee7b92d /scilab/modules/parameters
parent9c61e07470b2691e5dd1be660ad367e6dcd0d4f2 (diff)
parent362988b1133a09c67b43aef4a40cca732bae2310 (diff)
downloadscilab-c523b1358d8ea7a578f22edc011c4077aeef4aaa.zip
scilab-c523b1358d8ea7a578f22edc011c4077aeef4aaa.tar.gz
Merge remote branch 'origin/5.2'
Conflicts: scilab/CHANGES_5.2.X scilab/configure scilab/configure.ac scilab/etc/classpath.xml.vc scilab/m4/docbook.m4 scilab/modules/graphics/graphics.iss scilab/scilab-lib.properties.vc
Diffstat (limited to 'scilab/modules/parameters')
-rw-r--r--scilab/modules/parameters/locales/ca_ES/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/de_DE/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/es_ES/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/fr_FR/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/it_IT/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/ja_JP/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/pt_BR/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/ru_RU/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/zh_CN/parameters.po2
-rw-r--r--scilab/modules/parameters/locales/zh_TW/parameters.po2
10 files changed, 10 insertions, 10 deletions
diff --git a/scilab/modules/parameters/locales/ca_ES/parameters.po b/scilab/modules/parameters/locales/ca_ES/parameters.po
index 9856abb..bfb5dfe 100644
--- a/scilab/modules/parameters/locales/ca_ES/parameters.po
+++ b/scilab/modules/parameters/locales/ca_ES/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/de_DE/parameters.po b/scilab/modules/parameters/locales/de_DE/parameters.po
index aa7557e..3b3b9fd 100644
--- a/scilab/modules/parameters/locales/de_DE/parameters.po
+++ b/scilab/modules/parameters/locales/de_DE/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/es_ES/parameters.po b/scilab/modules/parameters/locales/es_ES/parameters.po
index 9f976bd..3621118 100644
--- a/scilab/modules/parameters/locales/es_ES/parameters.po
+++ b/scilab/modules/parameters/locales/es_ES/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/fr_FR/parameters.po b/scilab/modules/parameters/locales/fr_FR/parameters.po
index 8ba4b64..a3880b5 100644
--- a/scilab/modules/parameters/locales/fr_FR/parameters.po
+++ b/scilab/modules/parameters/locales/fr_FR/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/it_IT/parameters.po b/scilab/modules/parameters/locales/it_IT/parameters.po
index 2beb91c..804548f 100644
--- a/scilab/modules/parameters/locales/it_IT/parameters.po
+++ b/scilab/modules/parameters/locales/it_IT/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/ja_JP/parameters.po b/scilab/modules/parameters/locales/ja_JP/parameters.po
index 937ae18..bfc6a3f 100644
--- a/scilab/modules/parameters/locales/ja_JP/parameters.po
+++ b/scilab/modules/parameters/locales/ja_JP/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/pt_BR/parameters.po b/scilab/modules/parameters/locales/pt_BR/parameters.po
index 1f5a66b..90c0524 100644
--- a/scilab/modules/parameters/locales/pt_BR/parameters.po
+++ b/scilab/modules/parameters/locales/pt_BR/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/ru_RU/parameters.po b/scilab/modules/parameters/locales/ru_RU/parameters.po
index dfba5bc..5cab19f 100644
--- a/scilab/modules/parameters/locales/ru_RU/parameters.po
+++ b/scilab/modules/parameters/locales/ru_RU/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/zh_CN/parameters.po b/scilab/modules/parameters/locales/zh_CN/parameters.po
index c77aee5..f389af3 100644
--- a/scilab/modules/parameters/locales/zh_CN/parameters.po
+++ b/scilab/modules/parameters/locales/zh_CN/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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/parameters/locales/zh_TW/parameters.po b/scilab/modules/parameters/locales/zh_TW/parameters.po
index c31cd04..6f505c1 100644
--- a/scilab/modules/parameters/locales/zh_TW/parameters.po
+++ b/scilab/modules/parameters/locales/zh_TW/parameters.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: 2009-12-15 16:53+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09: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