summaryrefslogtreecommitdiffstats
path: root/scilab/modules/genetic_algorithms
diff options
context:
space:
mode:
authorYann Collette <yann.collette@scilab.org>2009-12-10 10:38:55 +0100
committerYann Collette <yann.collette@scilab.org>2009-12-10 10:38:55 +0100
commitc8042a2e95f531117226187b533a242226730185 (patch)
tree0a4003e3b25f4ddfcdbe93682433c198589ff3b3 /scilab/modules/genetic_algorithms
parent56bc32f1a3694998afcbfc5802790f5995e0a738 (diff)
parent1b5deaa1b03e6bcf16758beb95d0824d51a8d0d7 (diff)
downloadscilab-c8042a2e95f531117226187b533a242226730185.zip
scilab-c8042a2e95f531117226187b533a242226730185.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.pot14
1 files changed, 12 insertions, 2 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 29b230b..0a43ecf 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-11-17 16:14+0100\n" 17"Revision-Date: 2009-12-09 16:34+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
@@ -29,9 +29,9 @@ msgid "%s: F_in is mandatory"
29msgstr "" 29msgstr ""
30# 30#
31# File: macros/optim_nsga.sci, line: 54 31# File: macros/optim_nsga.sci, line: 54
32# File: macros/optim_nsga2.sci, line: 46
33# File: macros/optim_ga.sci, line: 54 32# File: macros/optim_ga.sci, line: 54
34# File: macros/optim_moga.sci, line: 48 33# File: macros/optim_moga.sci, line: 48
34# File: macros/optim_nsga2.sci, line: 46
35#, c-format 35#, c-format
36msgid "%s: Initialization of the population\n" 36msgid "%s: Initialization of the population\n"
37msgstr "" 37msgstr ""
@@ -53,6 +53,16 @@ msgstr ""
53msgid "%s: iteration %d / %d\n" 53msgid "%s: iteration %d / %d\n"
54msgstr "" 54msgstr ""
55# 55#
56# File: demos/NSGAdemo.sce, line: 85
57# File: demos/GAdemo.sce, line: 81
58# File: demos/GAdemo.sce, line: 125
59# File: demos/MOGAdemo.sce, line: 83
60# File: demos/GAIsing2ddemo.sce, line: 62
61# File: demos/NSGA2demo.sce, line: 81
62#, c-format
63msgid "%s: optimization starting, please wait ...\n"
64msgstr ""
65#
56# File: macros/coding_ga_binary.sci, line: 46 66# File: macros/coding_ga_binary.sci, line: 46
57# File: macros/coding_ga_identity.sci, line: 18 67# File: macros/coding_ga_identity.sci, line: 18
58#, c-format 68#, c-format