summaryrefslogtreecommitdiffstats
path: root/scilab/modules/genetic_algorithms
diff options
context:
space:
mode:
authorYann Collette <yann.collette@scilab.org>2010-01-25 13:40:30 +0100
committerYann Collette <yann.collette@scilab.org>2010-01-25 13:40:30 +0100
commit2e99cf077c43f38fec48e19b26ebb47f7a6c21b7 (patch)
treecdab60a7a9f8d7a1a45b86148320561b0d6476c0 /scilab/modules/genetic_algorithms
parent5523397c4edabb519d30c682d179bc3770e629aa (diff)
parenta19f6b91d2c7230b97d7bbb57a91ee09eaddc21e (diff)
downloadscilab-2e99cf077c43f38fec48e19b26ebb47f7a6c21b7.zip
scilab-2e99cf077c43f38fec48e19b26ebb47f7a6c21b7.tar.gz
Merge remote branch 'origin/5.2'
Diffstat (limited to 'scilab/modules/genetic_algorithms')
-rw-r--r--scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot6
1 files changed, 1 insertions, 5 deletions
diff --git a/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot b/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot
index 0a43ecf..3848e17 100644
--- a/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot
+++ b/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.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: 2009-12-09 16:34+0100\n" 17"Revision-Date: 2010-01-25 10:33+0100\n"
18 18
19# File: macros/optim_nsga.sci, line: 220 19# File: macros/optim_nsga.sci, line: 220
20# File: macros/optim_ga.sci, line: 161 20# File: macros/optim_ga.sci, line: 161
@@ -69,10 +69,6 @@ msgstr ""
69msgid "%s: wrong direction" 69msgid "%s: wrong direction"
70msgstr "" 70msgstr ""
71# 71#
72# File: etc/genetic_algorithms.start, line: 24
73msgid "Genetic Algorithms"
74msgstr ""
75#
76# File: macros/optim_nsga.sci, line: 27 72# File: macros/optim_nsga.sci, line: 27
77# File: macros/optim_moga.sci, line: 27 73# File: macros/optim_moga.sci, line: 27
78msgid "optim_moga: ga_f is mandatory" 74msgid "optim_moga: ga_f is mandatory"