Fix for internacionalization #3068, letters games merged and card some otmization in card code

39 files changed, 10 insertions, 25 deletions

diff --git a/games/addition/addition.mem b/games/addition/addition.mem
index 3c073f8..3ddac2f 100644
--- a/games/addition/addition.mem
+++ b/games/addition/addition.mem
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<memorize name="addition" scoresnd="score.wav" winsnd="win.wav" divided="0" align="1">
+<memorize name="addition" scoresnd="score.wav" winsnd="win.wav" divided="1" align="1">
 
  <pair achar="1+1"  bchar="2"/>
  <pair achar="1+2"  bchar="3" />
diff --git a/games/letters1/letters1.mem b/games/letters/letters.mem
index 87d626d..2e7ac99 100755
--- a/games/letters1/letters1.mem
+++ b/games/letters/letters.mem
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<memorize name="letters1" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
+<memorize name="letters" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
 
  <pair achar="A" asnd="a.ogg" bchar="a" bsnd="a.ogg"/>
  <pair achar="E" asnd="e.ogg" bchar="e" bsnd="e.ogg"/>
@@ -19,5 +19,13 @@
  <pair achar="N" asnd="n.ogg" bchar="n" bsnd="n.ogg"/>
  <pair achar="P" asnd="p.ogg" bchar="p" bsnd="p.ogg"/>
  <pair achar="Q" asnd="q.ogg" bchar="q" bsnd="q.ogg"/>
+ <pair achar="R" asnd="r.ogg" bchar="r" bsnd="r.ogg" />
+ <pair achar="S" asnd="s.ogg" bchar="s" bsnd="s.ogg" />
+ <pair achar="T" asnd="t.ogg" bchar="t" bsnd="t.ogg" />
+ <pair achar="V" asnd="v.ogg" bchar="v" bsnd="v.ogg" />
+ <pair achar="W" asnd="w.ogg" bchar="w" bsnd="w.ogg" />
+ <pair achar="X" asnd="x.ogg" bchar="x" bsnd="x.ogg" />
+ <pair achar="Y" asnd="y.ogg" bchar="y" bsnd="y.ogg" />
+ <pair achar="Z" asnd="z.ogg" bchar="z" bsnd="z.ogg" />
 
 </memorize>
diff --git a/games/letters1/sounds/a.ogg b/games/letters/sounds/a.ogg
index e56a27c..e56a27c 100644
--- a/games/letters1/sounds/a.ogg
+++ b/games/letters/sounds/a.ogg
diff --git a/games/letters1/sounds/b.ogg b/games/letters/sounds/b.ogg
index ebb0b0c..ebb0b0c 100644
--- a/games/letters1/sounds/b.ogg
+++ b/games/letters/sounds/b.ogg
diff --git a/games/letters1/sounds/c.ogg b/games/letters/sounds/c.ogg
index 237a564..237a564 100644
--- a/games/letters1/sounds/c.ogg
+++ b/games/letters/sounds/c.ogg
diff --git a/games/letters1/sounds/d.ogg b/games/letters/sounds/d.ogg
index 73eea5b..73eea5b 100644
--- a/games/letters1/sounds/d.ogg
+++ b/games/letters/sounds/d.ogg
diff --git a/games/letters1/sounds/e.ogg b/games/letters/sounds/e.ogg
index d08f166..d08f166 100644
--- a/games/letters1/sounds/e.ogg
+++ b/games/letters/sounds/e.ogg
diff --git a/games/letters1/sounds/f.ogg b/games/letters/sounds/f.ogg
index 3552848..3552848 100644
--- a/games/letters1/sounds/f.ogg
+++ b/games/letters/sounds/f.ogg
diff --git a/games/letters1/sounds/g.ogg b/games/letters/sounds/g.ogg
index d3515e4..d3515e4 100644
--- a/games/letters1/sounds/g.ogg
+++ b/games/letters/sounds/g.ogg
diff --git a/games/letters1/sounds/h.ogg b/games/letters/sounds/h.ogg
index d87d7e2..d87d7e2 100644
--- a/games/letters1/sounds/h.ogg
+++ b/games/letters/sounds/h.ogg
diff --git a/games/letters1/sounds/i.ogg b/games/letters/sounds/i.ogg
index 1428e96..1428e96 100644
--- a/games/letters1/sounds/i.ogg
+++ b/games/letters/sounds/i.ogg
diff --git a/games/letters1/sounds/j.ogg b/games/letters/sounds/j.ogg
index 02a285e..02a285e 100644
--- a/games/letters1/sounds/j.ogg
+++ b/games/letters/sounds/j.ogg
diff --git a/games/letters1/sounds/k.ogg b/games/letters/sounds/k.ogg
index 2079f22..2079f22 100644
--- a/games/letters1/sounds/k.ogg
+++ b/games/letters/sounds/k.ogg
diff --git a/games/letters1/sounds/l.ogg b/games/letters/sounds/l.ogg
index c8569ee..c8569ee 100644
--- a/games/letters1/sounds/l.ogg
+++ b/games/letters/sounds/l.ogg
diff --git a/games/letters1/sounds/m.ogg b/games/letters/sounds/m.ogg
index 7b8a553..7b8a553 100644
--- a/games/letters1/sounds/m.ogg
+++ b/games/letters/sounds/m.ogg
diff --git a/games/letters1/sounds/n.ogg b/games/letters/sounds/n.ogg
index bfd48a0..bfd48a0 100644
--- a/games/letters1/sounds/n.ogg
+++ b/games/letters/sounds/n.ogg
diff --git a/games/letters1/sounds/o.ogg b/games/letters/sounds/o.ogg
index 74b48e4..74b48e4 100644
--- a/games/letters1/sounds/o.ogg
+++ b/games/letters/sounds/o.ogg
diff --git a/games/letters1/sounds/p.ogg b/games/letters/sounds/p.ogg
index eccd963..eccd963 100644
--- a/games/letters1/sounds/p.ogg
+++ b/games/letters/sounds/p.ogg
diff --git a/games/letters1/sounds/q.ogg b/games/letters/sounds/q.ogg
index e991c5f..e991c5f 100644
--- a/games/letters1/sounds/q.ogg
+++ b/games/letters/sounds/q.ogg
diff --git a/games/letters2/sounds/r.ogg b/games/letters/sounds/r.ogg
index 66d805e..66d805e 100644..100755
--- a/games/letters2/sounds/r.ogg
+++ b/games/letters/sounds/r.ogg
diff --git a/games/letters2/sounds/s.ogg b/games/letters/sounds/s.ogg
index 640c2c7..640c2c7 100644..100755
--- a/games/letters2/sounds/s.ogg
+++ b/games/letters/sounds/s.ogg
diff --git a/games/letters2/sounds/t.ogg b/games/letters/sounds/t.ogg
index 6dc8fd5..6dc8fd5 100644..100755
--- a/games/letters2/sounds/t.ogg
+++ b/games/letters/sounds/t.ogg
diff --git a/games/letters1/sounds/u.ogg b/games/letters/sounds/u.ogg
index 8f00984..8f00984 100644
--- a/games/letters1/sounds/u.ogg
+++ b/games/letters/sounds/u.ogg
diff --git a/games/letters2/sounds/v.ogg b/games/letters/sounds/v.ogg
index ce5796e..ce5796e 100644..100755
--- a/games/letters2/sounds/v.ogg
+++ b/games/letters/sounds/v.ogg
diff --git a/games/letters2/sounds/w.ogg b/games/letters/sounds/w.ogg
index 95254b9..95254b9 100644..100755
--- a/games/letters2/sounds/w.ogg
+++ b/games/letters/sounds/w.ogg
diff --git a/games/letters2/sounds/x.ogg b/games/letters/sounds/x.ogg
index 09ed36a..09ed36a 100644..100755
--- a/games/letters2/sounds/x.ogg
+++ b/games/letters/sounds/x.ogg
diff --git a/games/letters2/sounds/y.ogg b/games/letters/sounds/y.ogg
index c1647e7..c1647e7 100644..100755
--- a/games/letters2/sounds/y.ogg
+++ b/games/letters/sounds/y.ogg
diff --git a/games/letters2/sounds/z.ogg b/games/letters/sounds/z.ogg
index c74771f..c74771f 100644..100755
--- a/games/letters2/sounds/z.ogg
+++ b/games/letters/sounds/z.ogg
diff --git a/games/letters2/letters2.mem b/games/letters2/letters2.mem
deleted file mode 100755
index 1b30363..0000000
--- a/games/letters2/letters2.mem
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<memorize name="letters2" scoresnd="score.wav" winsnd="win.wav" divided="1" face1="1" face2="2" >
-
- <pair achar="A" asnd="a.ogg" bchar="a" bsnd="a.ogg" />
- <pair achar="E" asnd="e.ogg" bchar="e" bsnd="e.ogg" />
- <pair achar="I" asnd="i.ogg" bchar="i" bsnd="i.ogg" />
- <pair achar="O" asnd="o.ogg" bchar="o" bsnd="o.ogg" />
- <pair achar="U" asnd="u.ogg" bchar="u" bsnd="u.ogg" />
- <pair achar="L" asnd="l.ogg" bchar="l" bsnd="l.ogg" />
- <pair achar="M" asnd="m.ogg" bchar="m" bsnd="m.ogg" />
- <pair achar="N" asnd="n.ogg" bchar="n" bsnd="n.ogg" />
- <pair achar="P" asnd="p.ogg" bchar="p" bsnd="p.ogg" />
- <pair achar="Q" asnd="q.ogg" bchar="q" bsnd="q.ogg" />
- <pair achar="R" asnd="r.ogg" bchar="r" bsnd="r.ogg" />
- <pair achar="S" asnd="s.ogg" bchar="s" bsnd="s.ogg" />
- <pair achar="T" asnd="t.ogg" bchar="t" bsnd="t.ogg" />
- <pair achar="V" asnd="v.ogg" bchar="v" bsnd="v.ogg" />
- <pair achar="W" asnd="w.ogg" bchar="w" bsnd="w.ogg" />
- <pair achar="X" asnd="x.ogg" bchar="x" bsnd="x.ogg" />
- <pair achar="Y" asnd="y.ogg" bchar="y" bsnd="y.ogg" />
- <pair achar="Z" asnd="z.ogg" bchar="z" bsnd="z.ogg" />
-
-</memorize>
diff --git a/games/letters2/sounds/a.ogg b/games/letters2/sounds/a.ogg
deleted file mode 100644
index f4592c8..0000000
--- a/games/letters2/sounds/a.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/e.ogg b/games/letters2/sounds/e.ogg
deleted file mode 100644
index 7c9cb75..0000000
--- a/games/letters2/sounds/e.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/i.ogg b/games/letters2/sounds/i.ogg
deleted file mode 100644
index 8ad50c8..0000000
--- a/games/letters2/sounds/i.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/l.ogg b/games/letters2/sounds/l.ogg
deleted file mode 100644
index 058c276..0000000
--- a/games/letters2/sounds/l.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/m.ogg b/games/letters2/sounds/m.ogg
deleted file mode 100644
index e9a5abd..0000000
--- a/games/letters2/sounds/m.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/n.ogg b/games/letters2/sounds/n.ogg
deleted file mode 100644
index 7d4eba8..0000000
--- a/games/letters2/sounds/n.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/o.ogg b/games/letters2/sounds/o.ogg
deleted file mode 100644
index aab82f4..0000000
--- a/games/letters2/sounds/o.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/p.ogg b/games/letters2/sounds/p.ogg
deleted file mode 100644
index c5ee3ee..0000000
--- a/games/letters2/sounds/p.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/q.ogg b/games/letters2/sounds/q.ogg
deleted file mode 100644
index 7d4da8c..0000000
--- a/games/letters2/sounds/q.ogg
+++ /dev/null
diff --git a/games/letters2/sounds/u.ogg b/games/letters2/sounds/u.ogg
deleted file mode 100644
index ee104de..0000000
--- a/games/letters2/sounds/u.ogg
+++ /dev/null