Merge branch 'master' of git.sugarlabs.org:memorize/mainline

95 files changed, 17059 insertions, 5606 deletions

diff --git a/po/Memorize.pot b/po/Memorize.pot
index 488b53d..90996f0 100644
--- a/po/Memorize.pot
+++ b/po/Memorize.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/ak.po b/po/ak.po
index 96aadf5..a49cfd3 100644
--- a/po/ak.po
+++ b/po/ak.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/am.po b/po/am.po
index 78c616e..cc38e74 100644
--- a/po/am.po
+++ b/po/am.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:32-0500\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-04-17 03:56+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ar.po b/po/ar.po
index 22a6661..85414a9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,9 +1,13 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # Khaled Hosny <khaledhosny@eglug.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2010-02-19 18:18+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -19,111 +23,158 @@ msgstr ""
 msgid "Memorize"
 msgstr "تذكّر"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "العب"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "أنشئ"
 
-#: createcardpanel.py:79
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "اسم اللعبة"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "أزواج متساوية"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "الجمع"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "الحروف"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "الأصوات"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "أضف كزوج جديد"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "أضِف"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "حدِّث الزوج المحدد"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "حدّث"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "معاينة:"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "نص:"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "أدرِج صورة"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "أدرج صوتا"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "انطق النص عند قلب البلاطة"
 
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "لعبة جديدة"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "حمل لعبة"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "احفظ اللعبة"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "اسم اللعبة"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "أزواج متساوية"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "انقر لتلعب لعبة جماعية"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "اختر لعبة تذكّر"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "انقر لتلعب لعبة فردية"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr "يُحمّل اللعبة..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "حمّل ألعاب تجريبية"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "الجمع"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "الحروف"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "الأصوات"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "حمّل ألعاب تجريبية"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "أعِد تشغيل اللعبة"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "يستلم اللعبة"
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr "تمّ"
 
@@ -259,6 +310,24 @@ msgstr "بولندية "
 msgid "Esperanto"
 msgstr "إسبرانتو"
 
+#~ msgid "New game"
+#~ msgstr "لعبة جديدة"
+
+#~ msgid "Load game"
+#~ msgstr "حمل لعبة"
+
+#~ msgid "Save game"
+#~ msgstr "احفظ اللعبة"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "انقر لتلعب لعبة جماعية"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "اختر لعبة تذكّر"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "انقر لتلعب لعبة فردية"
+
 #~ msgid "Pronounce text while fliping tile"
 #~ msgstr "نطق النص بينما يتم قلب المربع "
 
diff --git a/po/ar_SY.po b/po/ar_SY.po
deleted file mode 100644
index a85b263..0000000
--- a/po/ar_SY.po
+++ /dev/null
@@ -1,313 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Khaled Hosny <khaledhosny@eglug.org>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2010-02-19 18:18+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.5.2\n"
-
-#: activity/activity.info:2
-msgid "Memorize"
-msgstr "تذكّر"
-
-#: activity.py:70
-msgid "Play"
-msgstr "العب"
-
-#: activity.py:74
-msgid "Create"
-msgstr "أنشئ"
-
-#: createcardpanel.py:79
-msgid "Add as new pair"
-msgstr "أضف كزوج جديد"
-
-#: createcardpanel.py:82
-msgid "Add"
-msgstr "أضِف"
-
-#: createcardpanel.py:87
-msgid "Update selected pair"
-msgstr "حدِّث الزوج المحدد"
-
-#: createcardpanel.py:90
-msgid "Update"
-msgstr "حدّث"
-
-#: createcardpanel.py:255
-msgid "Preview:"
-msgstr "معاينة:"
-
-#: createcardpanel.py:271
-msgid "Text:"
-msgstr "نص:"
-
-#: createcardpanel.py:283
-msgid "Insert picture"
-msgstr "أدرِج صورة"
-
-#: createcardpanel.py:288
-msgid "Insert sound"
-msgstr "أدرج صوتا"
-
-#: createcardpanel.py:434
-msgid "Pronounce text during tile flip"
-msgstr "انطق النص عند قلب البلاطة"
-
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "لعبة جديدة"
-
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "حمل لعبة"
-
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "احفظ اللعبة"
-
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "اسم اللعبة"
-
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "أزواج متساوية"
-
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "انقر لتلعب لعبة جماعية"
-
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "اختر لعبة تذكّر"
-
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "انقر لتلعب لعبة فردية"
-
-#: game.py:92
-msgid "Loading game..."
-msgstr "يُحمّل اللعبة..."
-
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "حمّل ألعاب تجريبية"
-
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr "الجمع"
-
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr "الحروف"
-
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr "الأصوات"
-
-#: memorizetoolbar.py:63
-msgid "Restart Game"
-msgstr "أعِد تشغيل اللعبة"
-
-#: messenger.py:195
-msgid "Receiving game"
-msgstr "يستلم اللعبة"
-
-#: messenger.py:196
-msgid "done"
-msgstr "تمّ"
-
-#: speak/voice.py:36
-msgid "Brazil"
-msgstr "البرازيل"
-
-#: speak/voice.py:37
-msgid "Swedish"
-msgstr "سويدية"
-
-#: speak/voice.py:38
-msgid "Icelandic"
-msgstr "أيسلندية"
-
-#: speak/voice.py:39
-msgid "Romanian"
-msgstr "رومانية"
-
-#: speak/voice.py:40
-msgid "Swahili"
-msgstr "سواحلية"
-
-#: speak/voice.py:41
-msgid "Hindi"
-msgstr "هندية"
-
-#: speak/voice.py:42
-msgid "Dutch"
-msgstr "هولندية"
-
-#: speak/voice.py:43
-msgid "Latin"
-msgstr "لاتينية"
-
-#: speak/voice.py:44
-msgid "Hungarian"
-msgstr "مجرية"
-
-#: speak/voice.py:45
-msgid "Macedonian"
-msgstr "مقدونية"
-
-#: speak/voice.py:46
-msgid "Welsh"
-msgstr "ولزية"
-
-#: speak/voice.py:47
-msgid "French"
-msgstr "فرنسية"
-
-#: speak/voice.py:48
-msgid "Norwegian"
-msgstr "نرويجية"
-
-#: speak/voice.py:49
-msgid "Russian"
-msgstr "روسية"
-
-#: speak/voice.py:50
-msgid "Afrikaans"
-msgstr "أفريكانية"
-
-#: speak/voice.py:51
-msgid "Finnish"
-msgstr "فنلندية"
-
-#: speak/voice.py:52 speak/voice.py:125
-msgid "Default"
-msgstr "المبدئية"
-
-#: speak/voice.py:53
-msgid "Cantonese"
-msgstr "كانتونية"
-
-#: speak/voice.py:54
-msgid "Scottish"
-msgstr "أسكتلندية"
-
-#: speak/voice.py:55
-msgid "Greek"
-msgstr "يونانية"
-
-#: speak/voice.py:56
-msgid "Vietnam"
-msgstr "فيتنامية"
-
-#: speak/voice.py:57
-msgid "English"
-msgstr "إنجليزية"
-
-#: speak/voice.py:58
-msgid "Lancashire"
-msgstr "لانكشايرة"
-
-#: speak/voice.py:59
-msgid "Italian"
-msgstr "إيطالية"
-
-#: speak/voice.py:60
-msgid "Portugal"
-msgstr "برتغالية"
-
-#: speak/voice.py:61
-msgid "German"
-msgstr "ألمانية"
-
-#: speak/voice.py:62
-msgid "Whisper"
-msgstr "همس"
-
-#: speak/voice.py:63
-msgid "Croatian"
-msgstr "كرواتية"
-
-#: speak/voice.py:64
-msgid "Czech"
-msgstr "تشيكية"
-
-#: speak/voice.py:65
-msgid "Slovak"
-msgstr "سلافية"
-
-#: speak/voice.py:66
-msgid "Spanish"
-msgstr "أسبانية"
-
-#: speak/voice.py:67
-msgid "Polish"
-msgstr "بولندية "
-
-#: speak/voice.py:68
-msgid "Esperanto"
-msgstr "إسبرانتو"
-
-#~ msgid "Pronounce text while fliping tile"
-#~ msgstr "نطق النص بينما يتم قلب المربع "
-
-#~ msgid "Choose image"
-#~ msgstr "اختر صورة"
-
-#~ msgid "Choose audio"
-#~ msgstr "اختر صوتا"
-
-#~ msgid "capitals"
-#~ msgstr "الحروف الكبيرة"
-
-#~ msgid "drumgit"
-#~ msgstr "الأصوات"
-
-#~ msgid "numbers"
-#~ msgstr "الأرقام"
-
-#~ msgid "phonemes"
-#~ msgstr "المقاطع"
diff --git a/po/ay.po b/po/ay.po
deleted file mode 100644
index ebfe79d..0000000
--- a/po/ay.po
+++ /dev/null
@@ -1,144 +0,0 @@
-#  [es] ""
-#  [es] "Project-Id-Version: PACKAGE VERSION\n"
-#  [es] "Report-Msgid-Bugs-To: \n"
-#  [es] "POT-Creation-Date: 2008-02-21 22:31+0100\n"
-#  [es] "PO-Revision-Date: 2008-03-11 15:41-0400\n"
-#  [es] "Last-Translator: Maria del Pilar Saenz Rodriguez <mapisaro@gmail.com>\n"
-#  [es] "Language-Team: LANGUAGE <LL@li.org>\n"
-#  [es] "MIME-Version: 1.0\n"
-#  [es] "Content-Type: text/plain; charset=UTF-8\n"
-#  [es] "Content-Transfer-Encoding: 8bit\n"
-#  [es] "X-Generator: Pootle 1.1.0rc2\n"
-msgid ""
-msgstr ""
-"Project-Id-Version: OLPC v.0.82 Sept2008\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-09-13 18:21-0400\n"
-"Last-Translator: OLPC-Bolivia\n"
-"Language-Team: OLE Bolivia <amosbatto@yahoo.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
-"X-Poedit-Language: Aymara\n"
-"X-Poedit-Country: Bolivia\n"
-
-#  [es] "Memorizar"
-#: activity/activity.info:2
-msgid "Memorize"
-msgstr "P'iqin katuña"
-
-#  [es] "Jugar"
-#: activity.py:70
-msgid "Play"
-msgstr "Añataña"
-
-#  [es] "Crear"
-#: activity.py:74
-msgid "Create"
-msgstr "Uñstayaña"
-
-#  [es] "Añadir un nuevo par"
-#: createcardpanel.py:52
-msgid "Add as new pair"
-msgstr "Machaq paris yapaña"
-
-#  [es] "Actualizar par seleccionado"
-#: createcardpanel.py:60
-msgid "Update selected pair"
-msgstr "Paris ajllit jichhakiptaña"
-
-#  [es] "Vista previa:"
-#: createcardpanel.py:180
-msgid "Preview:"
-msgstr "Nayra uñjawi"
-
-#  [es] "Texto:"
-#: createcardpanel.py:182
-msgid "Text:"
-msgstr "Sawu"
-
-#  [es] "Escoger imagen"
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Salta ajlliña"
-
-#  [es] "Escoger audio"
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Arsu ajlliña"
-
-#  [es] "Nuevo juego"
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Machaq anatawi"
-
-#  [es] "Cargar Juego"
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Anataw khumtaña"
-
-#  [es] "Guardar juego"
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Anataw imaña"
-
-#  [es] "Nombre del juego"
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Anatawin sutipa"
-
-#  [es] "Pares iguales"
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr " Kipkak parisa"
-
-#  [es] "Click para juego en grupo"
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "\"k'kj\" luraña  tamanakamp anatañataki"
-
-#  [es] "Escoger juego de memoria"
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Amuyu anatawi uk chhixllaña"
-
-#  [es] "Click para juego sin grupo"
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "\"k'kj\" luraña  tamanakamp jan anatañataki"
-
-#  [es] "Cargando juego..."
-#: game.py:105
-msgid "Loading game..."
-msgstr "Anataw khumuntaña"
-
-#  [es] "Cargar juegos de demostración"
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Uñanch anatawinak khumtaña"
-
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr ""
-
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr ""
-
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr ""
-
-#: memorizetoolbar.py:63
-msgid "Restart Game"
-msgstr ""
-
-#: messenger.py:183
-msgid "Receiving game"
-msgstr ""
-
-#: messenger.py:183
-msgid "done"
-msgstr ""
diff --git a/po/aym.po b/po/aym.po
index 3b9ed61..5731be1 100644
--- a/po/aym.po
+++ b/po/aym.po
@@ -1,8 +1,12 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-11-26 05:00+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,322 +17,289 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#  "Memorizar"
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#  "Jugar"
-#: activity.py:82
-msgid "Play game"
+#: activity.py:69
+msgid "Play"
+msgstr ""
+
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#  "Editar juego"
-#: activity.py:90
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr ""
 
-#  "Añadir un nuevo par"
-#: createcardpanel.py:77
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
 #  "Añadir"
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Yapxataña"
 
-#  "Actualizar par seleccionado"
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#  "Actualizar"
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#  "Vista previa:"
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
 #  "Texto:"
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Qillqawi:"
 
-#  "Insertar imagen"
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#  "Insertar sonido"
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#  "Pronunciar texto mientras voltea la carta"
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#  "Seleccionar pares iguales"
-#: createtoolbar.py:45 createtoolbar.py:98
-msgid "Set equal pairs"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#  "Seleccionar juego por grupos"
-#: createtoolbar.py:50 createtoolbar.py:109
-msgid "Set grouped game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#  "Limpiar el juego"
-#: createtoolbar.py:55
-msgid "Clear current game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#  "¿Limpiar todas las piezas del juego?"
-#: createtoolbar.py:71
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
 msgstr ""
 
 #  "Limpiar"
-#: createtoolbar.py:73
+#: createtoolbar.py:78
 msgid "Clear"
 msgstr "Qhana"
 
-#  "No Limpiar"
-#: createtoolbar.py:75
+#: createtoolbar.py:80
 msgid "Do not clear"
 msgstr ""
 
-#  "Seleccionar pares distintos"
-#: createtoolbar.py:94
-msgid "Set non equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#  "Seleccionar juego sin grupos"
-#: createtoolbar.py:105
-msgid "Set ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#  "Cargando juego..."
 #: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#  "Adición"
 #: memorizetoolbar.py:43
 msgid "Addition"
 msgstr ""
 
-#  "Letras"
 #: memorizetoolbar.py:44
 msgid "Letters"
 msgstr ""
 
-#  "Sonidos"
 #: memorizetoolbar.py:45
 msgid "Sounds"
 msgstr ""
 
-#  "Cargar juegos de demostración"
-#: memorizetoolbar.py:70
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr ""
 
-#  "Reiniciar Juego"
 #: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#  "¿Descartar tu juego modificado?"
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
 msgstr ""
 
-#  "Descartar"
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
 msgstr ""
 
-#  "No descartar"
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
 msgstr ""
 
-#  "Recibiendo juego"
 #: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#  "hecho"
 #: messenger.py:193
 msgid "done"
 msgstr ""
 
-#  "Brasil"
 #: speak/voice.py:36
 msgid "Brazil"
 msgstr ""
 
-#  "Sueco"
 #: speak/voice.py:37
 msgid "Swedish"
 msgstr ""
 
-#  "Islandés"
 #: speak/voice.py:38
 msgid "Icelandic"
 msgstr ""
 
-#  "Rumano"
 #: speak/voice.py:39
 msgid "Romanian"
 msgstr ""
 
-#  "Swahili"
 #: speak/voice.py:40
 msgid "Swahili"
 msgstr ""
 
-#  "Hindi"
 #: speak/voice.py:41
 msgid "Hindi"
 msgstr ""
 
-#  "Holandés"
 #: speak/voice.py:42
 msgid "Dutch"
 msgstr ""
 
-#  "Latín"
 #: speak/voice.py:43
 msgid "Latin"
 msgstr ""
 
-#  "Húngaro"
 #: speak/voice.py:44
 msgid "Hungarian"
 msgstr ""
 
-#  "Macedonio"
 #: speak/voice.py:45
 msgid "Macedonian"
 msgstr ""
 
-#  "Galés"
 #: speak/voice.py:46
 msgid "Welsh"
 msgstr ""
 
-#  "Francés"
 #: speak/voice.py:47
 msgid "French"
 msgstr ""
 
-#  "Noruego"
 #: speak/voice.py:48
 msgid "Norwegian"
 msgstr ""
 
-#  "Ruso"
 #: speak/voice.py:49
 msgid "Russian"
 msgstr ""
 
-#  "Afrikáans"
 #: speak/voice.py:50
 msgid "Afrikaans"
 msgstr ""
 
-#  "Finés"
 #: speak/voice.py:51
 msgid "Finnish"
 msgstr ""
 
-#  "Predeterminada"
 #: speak/voice.py:52 speak/voice.py:125
 msgid "Default"
 msgstr ""
 
-#  "Cantonés"
 #: speak/voice.py:53
 msgid "Cantonese"
 msgstr ""
 
-#  "Escocés"
 #: speak/voice.py:54
 msgid "Scottish"
 msgstr ""
 
-#  "Griego"
 #: speak/voice.py:55
 msgid "Greek"
 msgstr ""
 
-#  "Vietnamita"
 #: speak/voice.py:56
 msgid "Vietnam"
 msgstr ""
 
-#  "Inglés"
 #: speak/voice.py:57
 msgid "English"
 msgstr ""
 
-#  "Lancashire"
 #: speak/voice.py:58
 msgid "Lancashire"
 msgstr ""
 
-#  "Italiano"
 #: speak/voice.py:59
 msgid "Italian"
 msgstr ""
 
-#  "Portugués"
 #: speak/voice.py:60
 msgid "Portugal"
 msgstr ""
 
-#  "Alemán"
 #: speak/voice.py:61
 msgid "German"
 msgstr ""
 
-#  "Susurro"
 #: speak/voice.py:62
 msgid "Whisper"
 msgstr ""
 
-#  "Croata"
 #: speak/voice.py:63
 msgid "Croatian"
 msgstr ""
 
-#  "Checo"
 #: speak/voice.py:64
 msgid "Czech"
 msgstr ""
 
-#  "Eslovaco"
 #: speak/voice.py:65
 msgid "Slovak"
 msgstr ""
 
-#  "Español"
 #: speak/voice.py:66
 msgid "Spanish"
 msgstr ""
 
-#  "Polaco"
 #: speak/voice.py:67
 msgid "Polish"
 msgstr ""
 
-#  "Esperanto"
 #: speak/voice.py:68
 msgid "Esperanto"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 6368f73..e93f6c6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,8 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 21:48+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2008-03-01 13:05-0500\n"
 "Last-Translator: Alexander Todorov <atodorov@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,120 +43,331 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: game.py:105
-msgid "Loading game..."
-msgstr "Зареждане на играта..."
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "Запаметяване"
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Примерни игри"
+#: activity.py:69
+msgid "Play"
+msgstr "Игра"
 
-#: memorizetoolbar.py:41
+#: activity.py:69
+msgid "Create"
+msgstr "Създаване"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Име на играта"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Еднакви елементи"
+
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "събиране"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "главни букви"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "букви"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr "барабани и китари"
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "Звуци"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "Добавяне"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "Обновяване"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Преглед:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "Текст:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "Зареждане на играта..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "събиране"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "букви"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "числа"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "Звуци"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "фонеми"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Примерни игри"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Рестартиране на играта"
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Зареждане на игра"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Избор на игра"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
 
-#: messenger.py:183
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Получаване на игра"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "готово"
 
-#: activity.py:74
-msgid "Create"
-msgstr "Създаване"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: activity.py:70
-msgid "Play"
-msgstr "Игра"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
 
-#: createcardpanel.py:52
-msgid "Add as new pair"
-msgstr "Добавяне"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
 
-#: createcardpanel.py:60
-msgid "Update selected pair"
-msgstr "Обновяване"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
 
-#: createcardpanel.py:180
-msgid "Preview:"
-msgstr "Преглед:"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
 
-#: createcardpanel.py:182
-msgid "Text:"
-msgstr "Текст:"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Избор на изображение"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Избор на звук"
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Нова игра"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Запазване"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Име на играта"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Еднакви елементи"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Нова игра"
+
+#~ msgid "Load game"
+#~ msgstr "Зареждане на игра"
+
+#~ msgid "Save game"
+#~ msgstr "Запазване"
 
 # показва числа 1 и 2 в квадратчетата, за да не отваряш грешни елементи
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Игра с подсказки"
+#~ msgid "Click for grouped game"
+#~ msgstr "Игра с подсказки"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Избор на игра"
 
 # Не показва подсказките 1 и 2
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Игра без подсказки"
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Игра без подсказки"
 
-#: activity/activity.info:2
-msgid "Memorize"
-msgstr "Запаметяване"
+#~ msgid "Choose image"
+#~ msgstr "Избор на изображение"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr "Звуци"
+#~ msgid "Choose audio"
+#~ msgstr "Избор на звук"
+
+#~ msgid "capitals"
+#~ msgstr "главни букви"
+
+#~ msgid "drumgit"
+#~ msgstr "барабани и китари"
+
+#~ msgid "numbers"
+#~ msgstr "числа"
+
+#~ msgid "phonemes"
+#~ msgstr "фонеми"
diff --git a/po/bi.po b/po/bi.po
index 45b2728..ee1edc7 100644
--- a/po/bi.po
+++ b/po/bi.po
@@ -2,12 +2,44 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2009-10-17 00:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,55 +60,67 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: createcardpanel.py:79
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:82
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:87
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:90
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:255
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:271
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:283
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:288
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
+#: createcardpanel.py:434
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:51
 msgid "New game"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
+#: createtoolbar.py:61 memorizetoolbar.py:73
 msgid "Load game"
 msgstr ""
 
-#: createtoolbar.py:73
+#: createtoolbar.py:71
 msgid "Save game"
 msgstr ""
 
-#: createtoolbar.py:83
+#: createtoolbar.py:81
 msgid "Game name"
 msgstr ""
 
-#: createtoolbar.py:87
+#: createtoolbar.py:85
 msgid "Equal pairs"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
+#: createtoolbar.py:97 createtoolbar.py:158
 msgid "Click for grouped game"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
+#: createtoolbar.py:114 memorizetoolbar.py:118
 msgid "Choose memorize game"
 msgstr ""
 
@@ -84,7 +128,7 @@ msgstr ""
 msgid "Click for ungrouped game"
 msgstr ""
 
-#: game.py:105
+#: game.py:92
 msgid "Loading game..."
 msgstr ""
 
@@ -108,10 +152,142 @@ msgstr ""
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:195
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:196
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 95dc619..9b2f8e5 100644..100755
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,12 +1,44 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Loba Yeasmeen <loba@ankur.org.bd>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: honey VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2009-06-24 16:14-0800\n"
+"Last-Translator: Loba Yeasmeen <loba@ankur.org.bd>\n"
+"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -14,100 +46,315 @@ msgstr ""
 
 #: activity/activity.info:2
 msgid "Memorize"
-msgstr ""
+msgstr "মনে রাখা"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr ""
+msgstr "চালানো"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
+msgstr "তৈরি করা"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "খেলার নাম"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "সমান জোড়া"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "যোগ"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "বর্ণ"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "শব্দ"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: createcardpanel.py:52
+#: createcardpanel.py:78
 msgid "Add as new pair"
+msgstr "নতুন জোড়া হিসেবে যোগ করো"
+
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:86
 msgid "Update selected pair"
+msgstr "নির্বাচিত জোড়া হালনাগাদ করো"
+
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr ""
+msgstr "আগে দেখানো:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
+msgstr "টেক্সট:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
-msgstr ""
+msgstr "খেলা লোড হচ্ছে..."
 
-#: memorizetoolbar.py:40
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "যোগ"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "বর্ণ"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "শব্দ"
+
+#: memorizetoolbar.py:60
 msgid "Load demo games"
+msgstr "নমুনা খেলা লোড করো"
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "খেলা পুনরায় শুরু করো"
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: messenger.py:192
+msgid "Receiving game"
+msgstr "খেলা গ্রহন করা হচ্ছে"
+
+#: messenger.py:193
+msgid "done"
+msgstr "সম্পন্ন"
+
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: memorizetoolbar.py:63
-msgid "Restart Game"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: messenger.py:183
-msgid "Receiving game"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: messenger.py:183
-msgid "done"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "নতুন খেলা"
+
+#~ msgid "Load game"
+#~ msgstr "খেলা লোড করো"
+
+#~ msgid "Save game"
+#~ msgstr "খেলা সংরক্ষণ করো"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "শ্রেনীবদ্ধ খেলা খেলার জন্য ক্লিক করো"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "মনে রাখার খেলা বেছে নাও"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "শ্রেনীবদ্ধ নয় এমন খেলার জন্য ক্লিক করো"
+
+#~ msgid "Choose image"
+#~ msgstr "চিত্র নির্বাচন করুন"
+
+#~ msgid "Choose audio"
+#~ msgstr "অডিও নির্বাচন করুন"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 6742041..34b966c 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,8 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2008-01-22 09:27+0000\n"
 "Last-Translator: Sankarshan Mukhopadhyay <sankarshan.mukhopadhyay@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,115 +43,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "খেলা শুরু হচ্ছে"
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr ""
+
+#: activity.py:69
+msgid "Play"
+msgstr "খেলা করুন"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
+#: activity.py:69
+msgid "Create"
+msgstr "তৈরী করুন"
+
+#: activity.py:69
 #, fuzzy
-msgid "Load demo games"
-msgstr "ডেমো খেলাগুলি শুরু হচ্ছে"
+msgid "Game name:"
+msgstr "খেলার নাম"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "সমান জোড়"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "যোগ কর্ম"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "রাজধানি"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "অক্ষরসমূহ"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr "ড্রামগিট"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "জোড় হিসাবে যোগ করুন"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "টেক্সট"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "খেলা শুরু হচ্ছে"
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "যোগ কর্ম"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "অক্ষরসমূহ"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "সংখ্যাসমূহ"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "ফোনিমসমূহ"
+#: memorizetoolbar.py:60
+#, fuzzy
+msgid "Load demo games"
+msgstr "ডেমো খেলাগুলি শুরু হচ্ছে"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "খেলা পুনরাম্ভ করুন"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "খেলা শুরু করুন"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr "মেমোরাইজ খেলা বেছে নিন"
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "খেলা গ্রহণ করা হচ্ছে"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr "সমাপ্ত"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "তৈরী করুন"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "খেলা করুন"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "জোড় হিসাবে যোগ করুন"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "টেক্সট"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "ছবি বেছে নিন"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "শব্দস্রোত বেছে নিন"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "নতুন খেলা"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "খেলা সংরক্ষণ করুন"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "খেলার নাম"
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "সমান জোড়"
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "গ্রুপের খেলার জন্য ক্লিক করুন"
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "নতুন খেলা"
+
+#~ msgid "Load game"
+#~ msgstr "খেলা শুরু করুন"
+
+#~ msgid "Save game"
+#~ msgstr "খেলা সংরক্ষণ করুন"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "গ্রুপের খেলার জন্য ক্লিক করুন"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "মেমোরাইজ খেলা বেছে নিন"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
 #, fuzzy
-msgid "Click for ungrouped game"
-msgstr "গ্রুপের খেলার জন্য ক্লিক করুন"
+#~ msgid "Click for ungrouped game"
+#~ msgstr "গ্রুপের খেলার জন্য ক্লিক করুন"
+
+#~ msgid "Choose image"
+#~ msgstr "ছবি বেছে নিন"
+
+#~ msgid "Choose audio"
+#~ msgstr "শব্দস্রোত বেছে নিন"
+
+#~ msgid "capitals"
+#~ msgstr "রাজধানি"
+
+#~ msgid "drumgit"
+#~ msgstr "ড্রামগিট"
+
+#~ msgid "numbers"
+#~ msgstr "সংখ্যাসমূহ"
+
+#~ msgid "phonemes"
+#~ msgstr "ফোনিমসমূহ"
diff --git a/po/bs.po b/po/bs.po
index 84d317d..f6c3963 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2011-01-05 06:11+0200\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-07-13 17:28+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: bs\n"
@@ -16,117 +20,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
@@ -240,7 +284,7 @@ msgstr ""
 
 #: speak/voice.py:63
 msgid "Croatian"
-msgstr ""
+msgstr "Hrvatski"
 
 #: speak/voice.py:64
 msgid "Czech"
diff --git a/po/ca.po b/po/ca.po
index 3adecbb..323df12 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,126 +1,380 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # !! cal una altra traducció o potser deixar-la així
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: 2008-01-08 18:44+0000\n"
-"Last-Translator: Jaume <jaume@nualart.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-08-08 02:44+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "Carregant el joc"
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "Memoritza"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr "Carrega els jocs demo"
+#: activity.py:69
+msgid "Play"
+msgstr "Jugar"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
+#: activity.py:69
+msgid "Create"
+msgstr "Crear"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Nom del joc"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Parelles iguals"
+
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "suma"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "Majúscules"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "lletres"
 
-# !! cal una altra traducció o potser deixar-la així
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr "drumgit"
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "sona"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "Afegir com a nova parella"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Afegeix"
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "Actualitzar la parella selecionada"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "Actualitza"
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Vista prèvia:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "Text:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "Insereix una imatge"
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "Insereix un so"
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "Carregant el joc"
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "suma"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "lletres"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "números"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "sona"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "fonemes"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Carrega els jocs demo"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Reiniciar el joc"
 
-# Carrega el joc o carreja un joc_
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "Carrega el joc"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr "Tria el joc de memòria"
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Rebent el joc"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr "fet"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "Crear"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "Brasil"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "Jugar"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Suec"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "Afegir com a nova parella"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Islandès"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr "Actualitzar la parella selecionada"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Romanès"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr "Vista prèvia:"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Suahili"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Hindi"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "Tria una imatge"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Holandès"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "Tria un àudio"
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Llatí"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "Joc nou"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Hungarès"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "Desa el joc"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Macedoni"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "Nom del joc"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Gal·lès"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Parelles iguals"
+#: speak/voice.py:47
+msgid "French"
+msgstr "Francès"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Noruec"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Rus"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finès"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "Predeterminat"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "Cantonès"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "Escocès"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Grec"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnamita"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Anglès"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "Lancashireà"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italià"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portuguès"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Alemany"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "Xiuxiueja"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Croat"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Txec"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Eslovac"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Espanyol"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Polonès"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#~ msgid "New game"
+#~ msgstr "Joc nou"
+
+# Carrega el joc o carreja un joc_
+#~ msgid "Load game"
+#~ msgstr "Carrega el joc"
+
+#~ msgid "Save game"
+#~ msgstr "Desa el joc"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Clic per agrupar el joc"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Tria el joc de memòria"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Clic per desagrupar el joc"
+
+#~ msgid "Choose image"
+#~ msgstr "Tria una imatge"
+
+#~ msgid "Choose audio"
+#~ msgstr "Tria un àudio"
+
+#~ msgid "capitals"
+#~ msgstr "Majúscules"
+
+# !! cal una altra traducció o potser deixar-la així
+#~ msgid "drumgit"
+#~ msgstr "drumgit"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Clic per agrupar el joc"
+#~ msgid "numbers"
+#~ msgstr "números"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Clic per desagrupar el joc"
+#~ msgid "phonemes"
+#~ msgstr "fonemes"
diff --git a/po/cpp.po b/po/cpp.po
index 45b2728..422d939 100644
--- a/po/cpp.po
+++ b/po/cpp.po
@@ -2,12 +2,44 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +52,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 45b2728..73805cf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,116 +2,333 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-04-14 05:44+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr ""
+msgstr "Přehrát"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
+msgstr "Vytvořit"
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Přidat"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
+msgstr "Text:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
+msgstr "hotovo"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Švédština"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Islandština"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Rumunština"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Svahilština"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Hindština"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Holandština"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Latina"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Maďarština"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Makedonština"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Velština"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Francouzština"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Norština"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Ruština"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Afrikánština"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finština"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "Implicitní"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
 msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "řečtina"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnamština"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Angličtina"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italština"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portugalština"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Němčina"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Chorvatština"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Ceština"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Slovenština"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Španelština"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Polština"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
diff --git a/po/de.po b/po/de.po
index c6a5345..24308e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -54,8 +54,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:32-0500\n"
-"PO-Revision-Date: 2012-02-08 10:00+0200\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-02-15 17:37+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -184,17 +184,14 @@ msgstr "Spiel laden..."
 
 # Ich denke "Addieren" trifft es besser. Das Spiel ist wirklich: 3+3 = 6...
 #: memorizetoolbar.py:43
-#, fuzzy
 msgid "Addition"
 msgstr "Addieren"
 
 #: memorizetoolbar.py:44
-#, fuzzy
 msgid "Letters"
 msgstr "Buchstaben"
 
 #: memorizetoolbar.py:45
-#, fuzzy
 msgid "Sounds"
 msgstr "Klänge"
 
diff --git a/po/dz.po b/po/dz.po
index 2a89254..057e220 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,9 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +48,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 4478fc6..eb209ea 100644
--- a/po/el.po
+++ b/po/el.po
@@ -34,95 +34,127 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 00:32-0400\n"
-"PO-Revision-Date: 2009-11-09 08:27-0400\n"
-"Last-Translator: Γιάννης Κασκαμανίδης <ttnfy17@yahoo.gr>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-11-03 10:30+0200\n"
+"Last-Translator: pavlos hatzopoulos <phatzopoulos@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Απομνημόνευση"
 
-#: activity.py:82
-msgid "Play game"
-msgstr ""
+#: activity.py:69
+msgid "Play"
+msgstr "Αναπαραγωγή"
+
+#: activity.py:69
+msgid "Create"
+msgstr "Δημιουργία"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Όνομα παιχνιδιού"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Όμοια ζευγάρια"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "Προσθήκη"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "Γράμματα"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "Ήχοι"
 
-#: activity.py:90
+#: activity.py:91 activity.py:216
 msgid "Edit game"
-msgstr ""
+msgstr "Επεξεργασία παιχνιδιού"
+
+#: activity.py:212
+msgid "Play game"
+msgstr "Αναπαραγωγή παιχνιδιού"
 
-#: createcardpanel.py:77
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Προσθήκη ως νέου ζευγαριού"
 
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Ενημέρωση επιλεγμένου ζευγαριού"
 
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Προεπισκόπηση:"
 
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Κείμενο:"
 
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Εισαγωγή εικόνας"
 
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Εισαγωγή ήχου"
 
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "Προφορά του κειμένου όταν γυρίζουν τα πλακίδια"
 
-#: createtoolbar.py:45 createtoolbar.py:98
-msgid "Set equal pairs"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:50 createtoolbar.py:109
-msgid "Set grouped game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:55
-msgid "Clear current game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:71
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
-msgstr ""
+msgstr "Εκκαθάριση όλων των πλακιδίων από το παιχνίδι;"
 
-#: createtoolbar.py:73
+#: createtoolbar.py:78
 msgid "Clear"
-msgstr ""
+msgstr "Εκκαθάριση"
 
-#: createtoolbar.py:75
+#: createtoolbar.py:80
 msgid "Do not clear"
-msgstr ""
+msgstr "Όχι εκκαθάριση"
 
-#: createtoolbar.py:94
-msgid "Set non equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:105
-msgid "Set ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
 #: game.py:94
@@ -132,19 +164,19 @@ msgstr "Φόρτωση παιχνιδιού..."
 #: memorizetoolbar.py:43
 #, fuzzy
 msgid "Addition"
-msgstr "προσθήκη"
+msgstr "Προσθήκη"
 
 #: memorizetoolbar.py:44
 #, fuzzy
 msgid "Letters"
-msgstr "γράμματα"
+msgstr "Γράμματα"
 
 #: memorizetoolbar.py:45
 #, fuzzy
 msgid "Sounds"
-msgstr "ήχοι"
+msgstr "Ήχοι"
 
-#: memorizetoolbar.py:70
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr "Φόρτωση δοκιμαστικών παιχνιδιών"
 
@@ -152,17 +184,17 @@ msgstr "Φόρτωση δοκιμαστικών παιχνιδιών"
 msgid "Restart Game"
 msgstr "Επανέναρξη παιχνιδιού"
 
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
-msgstr ""
+msgstr "Απόρριψη του τροποποιημένου παιχνιδιού σας;"
 
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
-msgstr ""
+msgstr "Απόρριψη"
 
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
-msgstr ""
+msgstr "Όχι απόρριψη"
 
 #: messenger.py:192
 msgid "Receiving game"
@@ -304,12 +336,6 @@ msgstr "Πολωνικά"
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#~ msgid "Play"
-#~ msgstr "Αναπαραγωγή"
-
-#~ msgid "Create"
-#~ msgstr "Δημιουργία"
-
 #~ msgid "New game"
 #~ msgstr "Νέο παιχνίδι"
 
@@ -319,12 +345,6 @@ msgstr "Εσπεράντο"
 #~ msgid "Save game"
 #~ msgstr "Αποθήκευση παιχνιδιού"
 
-#~ msgid "Game name"
-#~ msgstr "Όνομα παιχνιδιού"
-
-#~ msgid "Equal pairs"
-#~ msgstr "Όμοια ζευγάρια"
-
 #~ msgid "Click for grouped game"
 #~ msgstr "Κλικ για ομαδικό παιχνίδι"
 
@@ -334,6 +354,21 @@ msgstr "Εσπεράντο"
 #~ msgid "Click for ungrouped game"
 #~ msgstr "Κλικ για μη ομαδικό παιχνίδι"
 
+#~ msgid "Set equal pairs"
+#~ msgstr "Ορισμός ίσων ζευγών"
+
+#~ msgid "Set grouped game"
+#~ msgstr "Ορισμός ομαδικού παιχνιδιού"
+
+#~ msgid "Clear current game"
+#~ msgstr "Εκκαθάριση τρέχοντος παιχνιδιού"
+
+#~ msgid "Set non equal pairs"
+#~ msgstr "Ορισμός μη ίσων ζευγών"
+
+#~ msgid "Set ungrouped game"
+#~ msgstr "Ορισμός μη ομαδικού παιχνιδιού"
+
 #~ msgid "Pronounce text while fliping tile"
 #~ msgstr "Προφορά κειμένου καθώς κάνετε κλικ στο πλακάκι"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 2edefbf..a111de9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:32-0500\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2012-02-08 09:45+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fa.po b/po/fa.po
index e9bba06..7e7d9d1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,124 +1,365 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: 2008-01-09 09:15+0000\n"
-"Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-10 23:30-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "بارگذاری بازی در حال جریان"
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr ""
+
+#: activity.py:69
+msgid "Play"
+msgstr "بازی"
+
+#: activity.py:69
+msgid "Create"
+msgstr "آفریدن"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
+#: activity.py:69
 #, fuzzy
-msgid "Load demo games"
-msgstr "بارگذاری بازی های دمو"
+msgid "Game name:"
+msgstr "نام بازی"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "جوره های مساوی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "افزایش"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "حروف بزرگ"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "حروف"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "یک جوره تازه را اضافه کن"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "جوره انتخاب شده را بروز کن"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "پیش نمایش:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "متن:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "بارگذاری بازی در حال جریان"
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "افزایش"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "حروف"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "اعداد"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "صدا های ساده"
+#: memorizetoolbar.py:60
+#, fuzzy
+msgid "Load demo games"
+msgstr "بارگذاری بازی های دمو"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "شروع دوباره بازی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "بارگذاری بازی"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr "بازی حافظیی را انتخاب نمائید"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "بدست آوردن بازی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr "شد"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "آفریدن"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "بازی"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "سوئدی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "یک جوره تازه را اضافه کن"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "ایسلندی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr "جوره انتخاب شده را بروز کن"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "رومانیایی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr "پیش نمایش:"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "سواحلی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "متن:"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "هندی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "شکل را انتخاب کن"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "هلندی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "شنیدنی را انتخاب کن"
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "لاتینی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "بازی جدید"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "مجاری"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "بازی را ثبت کن"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "مقدونی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "نام بازی"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "ویلزی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "جوره های مساوی"
+#: speak/voice.py:47
+msgid "French"
+msgstr "فرانسوی"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "نورسک جدید نروژی"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "روسی"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "آفریکانس"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "فنلاندی"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "ویتنامی"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "انگلیسی"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "ایتالیایی"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "پرتغالی"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "آلمانی"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "کرواتی"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "چکی"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "اسلواکی"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "اسپانیایی"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "لهستانی"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "اسپرانتو"
+
+#~ msgid "New game"
+#~ msgstr "بازی جدید"
+
+#~ msgid "Load game"
+#~ msgstr "بارگذاری بازی"
+
+#~ msgid "Save game"
+#~ msgstr "بازی را ثبت کن"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "برای بازی گروهی تیک کن "
+
+#~ msgid "Choose memorize game"
+#~ msgstr "بازی حافظیی را انتخاب نمائید"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "برای بازی غیرگروهی تیک کن"
+
+#~ msgid "Choose image"
+#~ msgstr "شکل را انتخاب کن"
+
+#~ msgid "Choose audio"
+#~ msgstr "شنیدنی را انتخاب کن"
+
+#~ msgid "capitals"
+#~ msgstr "حروف بزرگ"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "برای بازی گروهی تیک کن "
+#~ msgid "numbers"
+#~ msgstr "اعداد"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "برای بازی غیرگروهی تیک کن"
+#~ msgid "phonemes"
+#~ msgstr "صدا های ساده"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index 24a153c..ae97f3d 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -1,123 +1,369 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: 2008-01-28 05:34-0500\n"
-"Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2009-12-08 04:15-0400\n"
+"Last-Translator: javed khan <javedkhan2k2@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fa_AF\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "در حال اجرای بازی..."
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "حفظ کردن"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr "اجرای بازی های نمونه نمايشی"
+#: activity.py:69
+msgid "Play"
+msgstr "اجرا کردن"
+
+#: activity.py:69
+msgid "Create"
+msgstr "ساختن"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "نام بازی"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "جوره های مساوی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "افزایش"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "حروف بزرگ"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "حروف"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr "درم گت"
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "صداها"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "یک جوره تازه را اضافه کن"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "اضافه کردن"
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "جوره انتخاب شده را بروز کن"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "نمایش دادن:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "متن:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "در حال اجرای بازی..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "افزایش"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "حروف"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "اعداد"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "صداها"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "صدا های ساده"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "اجرای بازی های نمونه ی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
-msgstr "شروع دوباره بازی"
+msgstr "شروع مجدد بازی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "بارگذاری بازی"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr "بازی حافظیی را انتخاب نمائید"
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "بدست آوردن بازی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr "شد"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "آفریدن"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "بازی"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "یک جوره تازه را اضافه کن"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr "جوره انتخاب شده را بروز کن"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr "پیش نمایش:"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "متن:"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "شکل را انتخاب کن"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "شنیدنی را انتخاب کن"
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "بازی جدید"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "بازی را ثبت کن"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "نام بازی"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "جوره های مساوی"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "بازی جدید"
+
+#~ msgid "Load game"
+#~ msgstr "بارگذاری بازی"
+
+#~ msgid "Save game"
+#~ msgstr "بازی را ثبت کن"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "برای بازی گروهی کلیک کن"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "بازی حافظیی را انتخاب نمائید"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "برای بازی غیرگروهی کلیک کن"
+
+#~ msgid "Choose image"
+#~ msgstr "شکل را انتخاب کن"
+
+#~ msgid "Choose audio"
+#~ msgstr "شنیدنی را انتخاب کن"
+
+#~ msgid "capitals"
+#~ msgstr "حروف بزرگ"
+
+#~ msgid "drumgit"
+#~ msgstr "طبل گیتار"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "برای بازی گروهی تیک کن"
+#~ msgid "numbers"
+#~ msgstr "اعداد"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "برای بازی غیرگروهی تیک کن"
+#~ msgid "phonemes"
+#~ msgstr "صدا های ساده"
diff --git a/po/ff.po b/po/ff.po
index 2a89254..47746f5 100644
--- a/po/ff.po
+++ b/po/ff.po
@@ -1,9 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +40,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index c55ea9d..1690b10 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +24,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/fil.po b/po/fil.po
index 3ae9605..a45f697 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +48,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 99b9bc2..50fc0ef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:32-0500\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2012-02-08 10:14+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gu.po b/po/gu.po
index ddc4371..bb2434a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,129 +1,326 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 21:48+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-02 01:56-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: game.py:105
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: activity.py:69
+msgid "Create"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#: memorizetoolbar.py:63
-msgid "Restart Game"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createcardpanel.py:78
+msgid "Add as new pair"
 msgstr ""
 
-#: messenger.py:183
-msgid "Receiving game"
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: messenger.py:183
-msgid "done"
+#: createcardpanel.py:86
+msgid "Update selected pair"
 msgstr ""
 
-#: activity.py:74
-msgid "Create"
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: activity.py:70
-msgid "Play"
+#: createcardpanel.py:262
+msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:52
-msgid "Add as new pair"
+#: createcardpanel.py:278
+msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:60
-msgid "Update selected pair"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:180
-msgid "Preview:"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:182
-msgid "Text:"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: activity/activity.info:2
-msgid "Memorize"
+#: game.py:94
+msgid "Loading game..."
 msgstr ""
 
 #: memorizetoolbar.py:43
-msgid "sounds"
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr ""
+
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr ""
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr ""
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr ""
+
+#: messenger.py:193
+msgid "done"
+msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "સ્વેડિશ"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "આઇસલૅન્ડિક"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "રોમાનિયન"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "સ્વાહિલી"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "હિન્દી"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "ડચ"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "લેટિન"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "હન્ગેરિયન"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "મૅસિડોનિયન"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "વેલ્શ"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "ફ્રેન્ચ"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "નોર્વેજિયન નિનોર્સ્ક"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "રશિયન"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "આફ્રિકન્સ"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "ફિનીશ"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "ગ્રીક"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "વિયેતનામી"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "અંગ્રેજી"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "ઇટાલિયન"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "પોર્ટુગી"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "જર્મન"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "ક્રોએટિઅન"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "ચેક"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "સ્લોવાક"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "સ્પેનિશ"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "પોલિશ"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "ઇસ્પેરાન્ટો"
diff --git a/po/ha.po b/po/ha.po
index 2a89254..47746f5 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -1,9 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +40,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 45b2728..133bb6e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 2a89254..2052b5b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,124 +1,357 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-03-22 23:31+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.3\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr ""
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "याद करना"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr ""
+#: activity.py:69
+msgid "Play"
+msgstr "खेलिए"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
-msgstr ""
+#: activity.py:69
+msgid "Create"
+msgstr "निर्माण करे"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr ""
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "नया खेल"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr ""
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "समान जोड़ियाँ"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "जोड़ें"
+
+#: activity.py:70
+#, fuzzy
 msgid "letters"
-msgstr ""
+msgstr "अक्षर"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr ""
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "आवाज़"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
-msgid "Restart Game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr ""
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "नई जोड़ी जोड़े"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr ""
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "जोड़ें"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "Receiving game"
-msgstr ""
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "चुनीगई जोड़ी को अद्यतनीकरण कीजिए"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "done"
-msgstr ""
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "अद्यतन"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr ""
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "दृश्य:"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr ""
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "पाठ:"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr ""
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "फ़ोटो प्रविष्ट करें"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "ध्वनि जोड़ें"
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "टाइल पलटने के दौरान पाठ बोलें"
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: game.py:94
+msgid "Loading game..."
+msgstr "खेल शूरु हो रहा है..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "जोड़ें"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "अक्षर"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "आवाज़"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "प्रदर्शन खेल शूरु करे"
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "खेल पुनः सेट करें"
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr "खेल ग्रहण हो रहा है"
+
+#: messenger.py:193
+msgid "done"
+msgstr "सम्पन्न"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "ब्राजील"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "स्वीडिश"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "आइसलैंडिक"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "रोमानियाई"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "स्वाहिली"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "डच"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "लातिन"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "हंगेरियाई"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "मकदूनियाई"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "वेल्श"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "फ्रांसीसी"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "नारवेजियाई"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "रूसी"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "अफ्रीकी"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "फिनिश"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "डिफ़ॉल्ट"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "केंटोनी"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "स्कॉटिश"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "यूनानी"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "विएतनाम"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "अंग्रेज़ी"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "लंकाशायर"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "इतालवी"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "पुर्तगाल"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "जर्मन"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "फुसफुसाएँ"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "क्रोएशियाई"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "चेक"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "स्लोवाक"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "स्पेनी"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "पोलिश"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "एस्परेन्तो"
+
+#~ msgid "New game"
+#~ msgstr "नया खेल"
+
+#~ msgid "Load game"
+#~ msgstr "खेल लोड कीजिए"
+
+#~ msgid "Save game"
+#~ msgstr "खेल सुरक्षित रखिए"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "समूह खेल केलिए दबाए"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "मेमोराईज खेल चुने"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "असमुहित खेल केलिए दबाए"
+
+#~ msgid "Choose image"
+#~ msgstr "छवि चुने"
+
+#~ msgid "Choose audio"
+#~ msgstr "श्रव्य चुने"
diff --git a/po/ht.po b/po/ht.po
index ea13476..de3ae0e 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -1,115 +1,364 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-03-11 10:11-0400\n"
-"Last-Translator: Jude Augusma <jayme2901@yahoo.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-08-10 06:07+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ht\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n !=1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Memorize"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Jwe"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Kreye"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Non jwèt la"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Pè egal ego"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "Adisyon"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "Lèt yo"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "Son yo"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Ajoute yon nouvo pè"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Mete pè seleksyone-a ajou"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr "Previze:"
+msgstr "apèsi:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Tèks:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Chwazi imaj"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Chwazi son"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Nouvo jwèt"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Louvri jwèt"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Sove jwèt la"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Non jwèt la"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Pè egal ego"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Klike pou jwenn jwèt ki gwoupe yo"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Chwazi jwèt memorize"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Klike pou jwenn jwèt ki pa gwoupe yo"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: game.py:105
-msgid "Loading game..."
-msgstr "Jwèl la ap louvri....."
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Louvri demonstrasyon jwèt yo"
+#: game.py:94
+msgid "Loading game..."
+msgstr "Jwèt la ap louvri..."
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "Adisyon"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "Lèt yo"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "Son yo"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Louvri jwèt demonstrasyon yo"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Rekòmanse jwèt la"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Ap resevwa jwèt"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "Fini"
 
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Nouvo jwèt"
+
+#~ msgid "Load game"
+#~ msgstr "Louvri yon jwèt ki te sere"
+
+#~ msgid "Save game"
+#~ msgstr "Sove jwèt la"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Klike pou jwe ak yon gwoup"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Chwazi jwèt memorize"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Klike pou jwe poukont ou"
+
+#~ msgid "Choose image"
+#~ msgstr "Chwazi imaj"
+
+#~ msgid "Choose audio"
+#~ msgstr "Chwazi son"
+
 #~ msgid "numbers"
 #~ msgstr "Nonb yo"
diff --git a/po/hu.po b/po/hu.po
index 45b2728..6445d8c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,116 +2,328 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2009-12-21 23:02-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr ""
+msgstr "Lejátszás"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
+msgstr "Létrehozás"
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Bővítés"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
+msgstr "Szöveg:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/hus.po b/po/hus.po
index 66b2cd8..934560c 100644
--- a/po/hus.po
+++ b/po/hus.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2011-08-19 07:58+0200\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-03-02 05:17+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hus\n"
@@ -15,119 +15,166 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Dhaykol"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Ubat'"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
-msgstr "ts'ejka'"
+msgstr "Ts'ejka'"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Bijil an ubat'intaláb:"
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Tsabchik jununúl"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "punk'uy"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "dhuche'"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "kawintaláb"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Punchiy jun i it tsábchil"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Punchiy"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Itmedha tsabchil xi takudh"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Ajumta'lits"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr "K'aal tsu-uxlalab"
+msgstr "K'aal tsu-uxlalab:"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr "Dhuchláb"
+msgstr "Dhuchláb:"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Ofsba' an t'ipláb"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Otsba' in janídh"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "Bijiy an dhuchlab ani' ka wenk'a an dhuchláb"
 
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "It ubat'intaláb"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "K'adhba' an ubat'intaláb"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "Dhaya' an ubat'intaláb"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "Bijil an ubat'intaláb"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "Tsabchik jununúl"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Ni'ninchi' abal an ubat'intaláb ti yanel."
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "Takuy i ubat'intalán ba' an dhaykol."
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Ni'chi' abal an ubat'intalab kwetem"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
-msgstr "K'adhba' i ubat'intalán"
+msgstr "K'adhba' i ubat'intalán..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "K'adhba' i ubat'intaláb abal ka t'ipoy"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "punk'uy"
 
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr "Punk'uy"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "dhuche'"
 
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr "Dhuche'"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "kawintaláb"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr "Kawintaláb"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "K'adhba' i ubat'intaláb abal ka t'ipoy"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Tsab tujchij an ubat'intaláb"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Bats'ul ubat'intaláb"
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
-msgstr "Ts'ejkadh"
+msgstr "ts'ejkadh"
 
 #: speak/voice.py:36
 msgid "Brazil"
@@ -260,3 +307,21 @@ msgstr "Polaco"
 #: speak/voice.py:68
 msgid "Esperanto"
 msgstr "Aychix"
+
+#~ msgid "New game"
+#~ msgstr "It ubat'intaláb"
+
+#~ msgid "Load game"
+#~ msgstr "K'adhba' an ubat'intaláb"
+
+#~ msgid "Save game"
+#~ msgstr "Dhaya' an ubat'intaláb"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Ni'ninchi' abal an ubat'intaláb ti yanel"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Takuy i ubat'intalán ba' an dhaykol"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Ni'chi' abal an ubat'intalab kwetem"
diff --git a/po/id.po b/po/id.po
index 1292053..a2489f7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-01-05 06:29+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,111 +49,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/ig.po b/po/ig.po
index 2a89254..47746f5 100644
--- a/po/ig.po
+++ b/po/ig.po
@@ -1,9 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +40,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 2a89254..47746f5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,9 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +40,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index c3c239d..a858447 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,20 +18,28 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2009-11-09 02:52-0400\n"
-"Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-02-08 10:06+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 # Il nome indentifica il gioco ... il termine memorizza non rende l'idea anche se letteralmente sarebbe corretto.
 # Preferisco lasciare Memorize
@@ -39,115 +47,152 @@ msgstr ""
 msgid "Memorize"
 msgstr "Memorize"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Gioca"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Crea"
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr "Nome partita:"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Coppie identiche"
+
+#: activity.py:70
+msgid "addition"
+msgstr "somme"
+
+#: activity.py:70
+msgid "letters"
+msgstr "lettere"
+
+#: activity.py:70
+msgid "sounds"
+msgstr "suoni"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Aggiungi come nuova coppia"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Aggiungi"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Aggiorna la coppia selezionata"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Aggiorna"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Anteprima:"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Testo:"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Inserisci immagine"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Inserisci suono"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "Leggi il testo girando la carta"
 
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "Nuova partita"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Carica partita"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "Salva partita"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "Nome partita"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "Coppie identiche"
+#: createtoolbar.py:78
+#, fuzzy
+msgid "Clear"
+msgstr "Pulisci"
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Seleziona per partita di gruppo"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-# o gioco di memorizzazione??? (si c'è una attività memorize, infatti (cf))
-# Memorizzato sarebbe stored o altro
-#
-# Io lascerei il nome Memorize ... in questo caso forse si può mettere anche "Scegli il gioco".
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "Scegli il gioco Memorize"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Seleziona per partita da solo"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr "Caricamento partita..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Carica partite dimostrative"
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr "Somme"
 
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr "somme"
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr "Lettere"
 
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr "lettere"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr "Suoni"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr "suoni"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Carica partite dimostrative"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Ricomincia partita"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Ricezione partita"
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr "fatto"
 
@@ -216,6 +261,7 @@ msgid "Finnish"
 msgstr "Finlandese"
 
 #: speak/voice.py:52 speak/voice.py:125
+#, fuzzy
 msgid "Default"
 msgstr "Default"
 
@@ -283,6 +329,28 @@ msgstr "Polacco"
 msgid "Esperanto"
 msgstr "Esperanto"
 
+#~ msgid "New game"
+#~ msgstr "Nuova partita"
+
+#~ msgid "Load game"
+#~ msgstr "Carica partita"
+
+#~ msgid "Save game"
+#~ msgstr "Salva partita"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Seleziona per partita di gruppo"
+
+# o gioco di memorizzazione??? (si c'è una attività memorize, infatti (cf))
+# Memorizzato sarebbe stored o altro
+#
+# Io lascerei il nome Memorize ... in questo caso forse si può mettere anche "Scegli il gioco".
+#~ msgid "Choose memorize game"
+#~ msgstr "Scegli il gioco Memorize"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Seleziona per partita da solo"
+
 #~ msgid "Pronounce text while fliping tile"
 #~ msgstr "Pronuncia il testo mentre giri i tasselli"
 
diff --git a/po/ja.po b/po/ja.po
index a4f76a9..d2d970f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,8 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:26+0000\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2009-11-01 06:55-0400\n"
 "Last-Translator: korakurider <korakurider@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,250 +45,314 @@ msgstr ""
 msgid "Memorize"
 msgstr "Memorize"
 
-#: /home/sugar/src/activities/memorize.activity/game.py:93
-msgid "Loading game..."
-msgstr "ゲームを読み込んでいます..."
-
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "Receiving game"
-msgstr "ゲームを受け取る"
-
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "done"
-msgstr "完了"
-
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:51
-msgid "New game"
-msgstr "新しいゲーム"
-
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:61
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:73
-msgid "Load game"
-msgstr "ゲームを読み込む"
+#: activity.py:69
+msgid "Play"
+msgstr "遊ぶ"
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:71
-msgid "Save game"
-msgstr "ゲームを保存"
+#: activity.py:69
+msgid "Create"
+msgstr "作成"
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:81
-msgid "Game name"
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
 msgstr "ゲームの名前"
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:85
+#: activity.py:69
 msgid "Equal pairs"
 msgstr "同じもののペア"
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:97
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:156
-msgid "Click for grouped game"
-msgstr "クリックすると、グループ化されたゲームになります"
-
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:114
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "記憶ゲームを選ぶ"
-
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:152
-msgid "Click for ungrouped game"
-msgstr "クリックすると、グループ化されていないゲームになります"
-
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "デモゲームを読み込む"
-
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:41
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "足し算"
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:42
+#: activity.py:70
+#, fuzzy
 msgid "letters"
 msgstr "文字"
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:43
+#: activity.py:70
+#, fuzzy
 msgid "sounds"
 msgstr "音"
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:63
-msgid "Restart Game"
-msgstr "ゲームをやり直す"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:82
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "新しいペアとして追加"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:85
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "追加"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:90
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "選ばれたペアを更新"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:93
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "更新"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:254
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "プレビュー:"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:270
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "文字:"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:282
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "画像を入れる"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:287
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "音を入れる"
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:427
-msgid "Pronounce text while fliping tile"
-msgstr "タイルをめくる時テキストを読み上げる"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:74
-msgid "Play"
-msgstr "遊ぶ"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:78
-msgid "Create"
-msgstr "作成"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "ゲームを読み込んでいます..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "足し算"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "文字"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "音"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "デモゲームを読み込む"
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "ゲームをやり直す"
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:36
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr "ゲームを受け取る"
+
+#: messenger.py:193
+msgid "done"
+msgstr "完了"
+
+#: speak/voice.py:36
 msgid "Brazil"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:37
+#: speak/voice.py:37
 msgid "Swedish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:38
+#: speak/voice.py:38
 msgid "Icelandic"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:39
+#: speak/voice.py:39
 msgid "Romanian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:40
+#: speak/voice.py:40
 msgid "Swahili"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:41
+#: speak/voice.py:41
 msgid "Hindi"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:42
+#: speak/voice.py:42
 msgid "Dutch"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:43
+#: speak/voice.py:43
 msgid "Latin"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:44
+#: speak/voice.py:44
 msgid "Hungarian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:45
+#: speak/voice.py:45
 msgid "Macedonian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:46
+#: speak/voice.py:46
 msgid "Welsh"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:47
+#: speak/voice.py:47
 msgid "French"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:48
+#: speak/voice.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:49
+#: speak/voice.py:49
 msgid "Russian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:50
+#: speak/voice.py:50
 msgid "Afrikaans"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:51
+#: speak/voice.py:51
 msgid "Finnish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:52
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:125
+#: speak/voice.py:52 speak/voice.py:125
 msgid "Default"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:53
+#: speak/voice.py:53
 msgid "Cantonese"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:54
+#: speak/voice.py:54
 msgid "Scottish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:55
+#: speak/voice.py:55
 msgid "Greek"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:56
+#: speak/voice.py:56
 msgid "Vietnam"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:57
+#: speak/voice.py:57
 msgid "English"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:58
+#: speak/voice.py:58
 msgid "Lancashire"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:59
+#: speak/voice.py:59
 msgid "Italian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:60
+#: speak/voice.py:60
 msgid "Portugal"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:61
+#: speak/voice.py:61
 msgid "German"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:62
+#: speak/voice.py:62
 msgid "Whisper"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:63
+#: speak/voice.py:63
 msgid "Croatian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:64
+#: speak/voice.py:64
 msgid "Czech"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:65
+#: speak/voice.py:65
 msgid "Slovak"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:66
+#: speak/voice.py:66
 msgid "Spanish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:67
+#: speak/voice.py:67
 msgid "Polish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:68
+#: speak/voice.py:68
 msgid "Esperanto"
 msgstr ""
 
+#~ msgid "New game"
+#~ msgstr "新しいゲーム"
+
+#~ msgid "Load game"
+#~ msgstr "ゲームを読み込む"
+
+#~ msgid "Save game"
+#~ msgstr "ゲームを保存"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "クリックすると、グループ化されたゲームになります"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "記憶ゲームを選ぶ"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "クリックすると、グループ化されていないゲームになります"
+
+#~ msgid "Pronounce text while fliping tile"
+#~ msgstr "タイルをめくる時テキストを読み上げる"
+
 #~ msgid "Choose image"
 #~ msgstr "画像を選ぶ"
 
diff --git a/po/km.po b/po/km.po
index 2c2c10e..d60443c 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-04 00:36-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-04-28 16:42+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,79 +21,110 @@ msgstr ""
 msgid "Memorize"
 msgstr "ទន្ទេញ"
 
-#: activity.py:84 activity.py:211
+#: activity.py:69
+msgid "Play"
+msgstr ""
+
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "វិធី​បូក"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "អក្សរ"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "សំឡេង"
+
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr ""
 
-#: activity.py:207
+#: activity.py:212
 msgid "Play game"
 msgstr ""
 
-#: createcardpanel.py:77
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "ថែមទៅជាគូថ្មី"
 
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "បន្ថែម"
 
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "កែជំរើស​គូ"
 
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "ធ្វើ​ឲ្យ​ទាន់​សម័យ"
 
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "ព្រាង"
 
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "អត្ថបត ៖"
 
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "បញ្ចូល​រូបភាព"
 
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "បញ្ចូល​សំឡេង"
 
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:46 createtoolbar.py:107
+#: createtoolbar.py:46 createtoolbar.py:106
 msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:52 createtoolbar.py:120
+#: createtoolbar.py:51 createtoolbar.py:119
 msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:57
+#: createtoolbar.py:56
 msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:77
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:79
+#: createtoolbar.py:78
 msgid "Clear"
 msgstr "ជម្រះ"
 
-#: createtoolbar.py:81
+#: createtoolbar.py:80
 msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:103
+#: createtoolbar.py:102
 msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:116
+#: createtoolbar.py:115
 msgid "Grouped tiles game"
 msgstr ""
 
@@ -102,6 +133,7 @@ msgid "Loading game..."
 msgstr "រៀប​ចំ​ល្បែង"
 
 #: memorizetoolbar.py:43
+#, fuzzy
 msgid "Addition"
 msgstr "វិធី​បូក"
 
@@ -111,6 +143,7 @@ msgid "Letters"
 msgstr "អក្សរ"
 
 #: memorizetoolbar.py:45
+#, fuzzy
 msgid "Sounds"
 msgstr "សំឡេង"
 
@@ -122,15 +155,15 @@ msgstr "រៀប​ចំ​​បង្ហាញ​ល្បែង"
 msgid "Restart Game"
 msgstr "ចាប់​ផ្ដើម​ឡើង​វិញ"
 
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index c55ea9d..1690b10 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +24,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 2a89254..47746f5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,9 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +40,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/kos.po b/po/kos.po
index bd54689..c127d18 100644
--- a/po/kos.po
+++ b/po/kos.po
@@ -2,11 +2,39 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:26+0000\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2009-09-02 21:33-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,246 +49,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/game.py:93
-msgid "Loading game..."
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "Receiving game"
+#: activity.py:69
+msgid "Create"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "done"
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:51
-msgid "New game"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:61
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:73
-msgid "Load game"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:71
-msgid "Save game"
+#: activity.py:70
+msgid "letters"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:81
-msgid "Game name"
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:85
-msgid "Equal pairs"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:97
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:156
-msgid "Click for grouped game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:114
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createcardpanel.py:78
+msgid "Add as new pair"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:152
-msgid "Click for ungrouped game"
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Sang"
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:40
-msgid "Load demo games"
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:41
-msgid "addition"
+#: createcardpanel.py:262
+msgid "Preview:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:42
-msgid "letters"
+#: createcardpanel.py:278
+msgid "Text:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:43
-msgid "sounds"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:63
-msgid "Restart Game"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:82
-msgid "Add as new pair"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:85
-msgid "Add"
-msgstr "Sang"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:90
-msgid "Update selected pair"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:93
-msgid "Update"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:254
-msgid "Preview:"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:270
-msgid "Text:"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:282
-msgid "Insert picture"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:287
-msgid "Insert sound"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:427
-msgid "Pronounce text while fliping tile"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:74
-msgid "Play"
+#: game.py:94
+msgid "Loading game..."
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:78
-msgid "Create"
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr ""
+
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr ""
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr ""
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr ""
+
+#: messenger.py:193
+msgid "done"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:36
+#: speak/voice.py:36
 msgid "Brazil"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:37
+#: speak/voice.py:37
 msgid "Swedish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:38
+#: speak/voice.py:38
 msgid "Icelandic"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:39
+#: speak/voice.py:39
 msgid "Romanian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:40
+#: speak/voice.py:40
 msgid "Swahili"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:41
+#: speak/voice.py:41
 msgid "Hindi"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:42
+#: speak/voice.py:42
 msgid "Dutch"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:43
+#: speak/voice.py:43
 msgid "Latin"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:44
+#: speak/voice.py:44
 msgid "Hungarian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:45
+#: speak/voice.py:45
 msgid "Macedonian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:46
+#: speak/voice.py:46
 msgid "Welsh"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:47
+#: speak/voice.py:47
 msgid "French"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:48
+#: speak/voice.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:49
+#: speak/voice.py:49
 msgid "Russian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:50
+#: speak/voice.py:50
 msgid "Afrikaans"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:51
+#: speak/voice.py:51
 msgid "Finnish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:52
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:125
+#: speak/voice.py:52 speak/voice.py:125
 msgid "Default"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:53
+#: speak/voice.py:53
 msgid "Cantonese"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:54
+#: speak/voice.py:54
 msgid "Scottish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:55
+#: speak/voice.py:55
 msgid "Greek"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:56
+#: speak/voice.py:56
 msgid "Vietnam"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:57
+#: speak/voice.py:57
 msgid "English"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:58
+#: speak/voice.py:58
 msgid "Lancashire"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:59
+#: speak/voice.py:59
 msgid "Italian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:60
+#: speak/voice.py:60
 msgid "Portugal"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:61
+#: speak/voice.py:61
 msgid "German"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:62
+#: speak/voice.py:62
 msgid "Whisper"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:63
+#: speak/voice.py:63
 msgid "Croatian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:64
+#: speak/voice.py:64
 msgid "Czech"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:65
+#: speak/voice.py:65
 msgid "Slovak"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:66
+#: speak/voice.py:66
 msgid "Spanish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:67
+#: speak/voice.py:67
 msgid "Polish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:68
+#: speak/voice.py:68
 msgid "Esperanto"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 96aadf5..a49cfd3 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 96aadf5..a49cfd3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/lv.po b/po/lv.po
index c55ea9d..1690b10 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +24,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/mg.po b/po/mg.po
index 45b2728..c4a97d0 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -2,116 +2,345 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2009-05-23 06:48-0400\n"
+"Last-Translator: dina garnier oeliarisoa <dina.garnier.oeliarisoa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
+msgstr "Tadidio"
+
+#: activity.py:69
+msgid "Play"
+msgstr "Alefao"
+
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Omeo anarana"
+
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
 #: activity.py:70
-msgid "Play"
+#, fuzzy
+msgid "addition"
+msgstr "Fanampiana"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "taratasy"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "feo"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: activity.py:74
-msgid "Create"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: createcardpanel.py:52
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
+msgstr "Lahatsoratra"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
-msgstr ""
+msgstr "Eo am-pandrotsahana ny lalao..."
 
-#: memorizetoolbar.py:40
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "Fanampiana"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "taratasy"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "feo"
+
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr ""
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "Avereno ny lalao"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:63
-msgid "Restart Game"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
+msgstr "vita"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
 msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Lalao vaovao"
+
+#~ msgid "Choose image"
+#~ msgstr "Mifidiana sary"
+
+#~ msgid "Choose audio"
+#~ msgstr "Mifidiana feo"
diff --git a/po/mk.po b/po/mk.po
index 2a89254..80bc43a 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,124 +1,330 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-06 00:15-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=3; plural=n==1 || n%10==1 ? 0 : 1;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr ""
+
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr ""
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Шведски"
+
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:47
+msgid "French"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 2a89254..3adce97 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,124 +1,331 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2008-03-07 06:16-0500\n"
+"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"X-Generator: Pootle 1.0.2\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
+#, fuzzy
 msgid "letters"
+msgstr "അക്ഷരങ്ങള്‍"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "ശബ്ദങ്ങള്‍"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "അക്ഷരങ്ങള്‍"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "ശബ്ദങ്ങള്‍"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:54
+msgid "Scottish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:55
+msgid "Greek"
 msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "numbers"
+#~ msgstr "അക്കങ്ങള്‍"
diff --git a/po/mn.po b/po/mn.po
index 1ccec33..8077a4c 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -1,127 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2010-01-06 00:41-0400\n"
-"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-03-09 04:21+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Цээжлэх"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Тоглох"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Үүсгэх"
 
-#: createcardpanel.py:79
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Тоглоомын нэр:"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Тэнцүү хосууд"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "нэмэлт"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "үсэгнүүд"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "дуу"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Шинэ хос болгон нэмэх"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Нэмэх"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Сонгосон хосыг шинэчлэх"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Шинэчлэх"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Урьдчилан харах:"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Бичвэр:"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Зураг оруулах"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Дуу чимээ оруулах"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "Шинэ тоглоом"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Тоглоом ачаалах"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "Тоглоомыг хадгалах"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "Тоглоомын нэр"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "Тэнцүү хосууд"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Бүлгээрээ тоглохдоо энд дарна уу"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "Тоглоом сонгох"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Ганцаараа тоглохдоо энд дарна уу"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr "Тоглоомыг ачаалж байна..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Жишээ тоглоомыг ачаалах"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "нэмэлт"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "үсэгнүүд"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "дуу"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Жишээ тоглоомыг ачаалах"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Тоглоомыг дахин эхлүүлэх"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Тоглоомыг хүлээн авч байна"
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr "боллоо"
 
@@ -257,6 +308,24 @@ msgstr "Польш"
 msgid "Esperanto"
 msgstr "Аспиранто"
 
+#~ msgid "New game"
+#~ msgstr "Шинэ тоглоом"
+
+#~ msgid "Load game"
+#~ msgstr "Тоглоом ачаалах"
+
+#~ msgid "Save game"
+#~ msgstr "Тоглоомыг хадгалах"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Бүлгээрээ тоглохдоо энд дарна уу"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Тоглоом сонгох"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Ганцаараа тоглохдоо энд дарна уу"
+
 #~ msgid "Choose image"
 #~ msgstr "Зураг сонгох"
 
diff --git a/po/mr.po b/po/mr.po
index 6a99c9e..1a2002e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,112 +1,365 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-04-28 02:33-0400\n"
-"Last-Translator: Sandip Gawas <sandip.gawas@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-03-27 20:53+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.3\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Memorize"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "खेळा"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "निर्माण करणे"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "खेळाचे नाव"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "समान जोडी"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "बेरीज"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "शब्द"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "आवाज"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "नवीन जोडी जोडा"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
-msgstr "निवडलेली जोडी अद्यावात करा "
+msgstr "निवडलेली जोडी अद्यावात करा"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr "पूर्ववालोकन"
+msgstr "पूर्ववालोकन:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr "संदर्भ"
+msgstr "संदर्भ:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "चित्र निवडा"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "आवाज निवडा"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "नवीन खेळ"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "खेळ सुरू करा"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "खेळ राखून ठेवा"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "खेळाचे नाव"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "समान जोडी"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "गटामधे खेळ खेळण्यासाठी क्लिक करा"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "मेमराइज खेळ निवडा"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "एकटे  खेळण्यासाठी क्लिक करा"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: game.py:105
-msgid "Loading game..."
-msgstr " खेळ सुरू होत आहे"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "प्रदर्शनि खेळ सुरू करा"
+#: game.py:94
+msgid "Loading game..."
+msgstr "खेळ सुरू होत आहे..."
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "बेरीज"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "शब्द"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "आवाज"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "प्रदर्शनि खेळ सुरू करा"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "खेळ पुन्हा चालू करा"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "खेळ घेणे"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "समाप्त"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "स्विडीश"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "आइसलॅन्डिक"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "रोमानियन"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "स्वाहिलि"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "हिंदी"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "डच"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "लॅटिन"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "हन्गेरियन"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "मेसिडोनियन"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "वेल्श"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "फ्रेंच"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "नोर्वेजिअन न्यिनोर्स्क"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "रशियन"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "अफ्रिकान्स"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "फिन्नीश"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "ग्रिक"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "विएतनामिज"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "इंग्रजी"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "इटॅलियन"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "पोर्ट्युगिज"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "जर्मन"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "क्रोएशियन"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "चेक"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "स्लोवाक"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "स्पॅनिश"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "पोलिश"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "इस्पेरान्टो"
+
+#~ msgid "New game"
+#~ msgstr "नवीन खेळ"
+
+#~ msgid "Load game"
+#~ msgstr "खेळ सुरू करा"
+
+#~ msgid "Save game"
+#~ msgstr "खेळ राखून ठेवा"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "गटामधे खेळ खेळण्यासाठी क्लिक करा"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "मेमराइज खेळ निवडा"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "एकटे खेळण्यासाठी क्लिक करा"
+
+#~ msgid "Choose image"
+#~ msgstr "चित्र निवडा"
+
+#~ msgid "Choose audio"
+#~ msgstr "आवाज निवडा"
diff --git a/po/ms.po b/po/ms.po
index 45b2728..133bb6e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/mvo.po b/po/mvo.po
index 45b2728..133bb6e 100644
--- a/po/mvo.po
+++ b/po/mvo.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/na.po b/po/na.po
index 45b2728..133bb6e 100644
--- a/po/na.po
+++ b/po/na.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/nah.po b/po/nah.po
index 96aadf5..a49cfd3 100644
--- a/po/nah.po
+++ b/po/nah.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 35dca5f..77720d2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,3 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # translation of memorize.po to Norsk bokmål
 # Kent Dahl <kentda@pvv.org>, 2008.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -6,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: memorize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2008-07-26 13:46+0200\n"
 "Last-Translator: Kent Dahl <kentda@pvv.org>\n"
 "Language-Team: Norsk bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -21,102 +49,317 @@ msgstr ""
 msgid "Memorize"
 msgstr "Minne"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Spill"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Lag"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Spillnavn"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Like par"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "addisjon"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "bokstaver"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "lyder"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Legg til som nytt par"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Oppdater valgt par"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Forhåndsvisning:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Tekst:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Velg bilde"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Velg lyd"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Nytt spill"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Last spill"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Lagre spill"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Spillnavn"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Like par"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-#, fuzzy
-msgid "Click for grouped game"
-msgstr "Klikk for gruppert spill"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-#, fuzzy
-msgid "Choose memorize game"
-msgstr "Velg minnespill"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-#, fuzzy
-msgid "Click for ungrouped game"
-msgstr "Klikk for ugruppert spill"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr "Laster spill..."
 
-#: memorizetoolbar.py:40
+#: memorizetoolbar.py:43
 #, fuzzy
-msgid "Load demo games"
-msgstr "Last spilldemonstrasjoner"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+msgid "Addition"
 msgstr "addisjon"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "bokstaver"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "lyder"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+#, fuzzy
+msgid "Load demo games"
+msgstr "Last spilldemonstrasjoner"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Start spillet på nytt"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Mottar spill"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "ferdig"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Nytt spill"
+
+#~ msgid "Load game"
+#~ msgstr "Last spill"
+
+#~ msgid "Save game"
+#~ msgstr "Lagre spill"
+
+#, fuzzy
+#~ msgid "Click for grouped game"
+#~ msgstr "Klikk for gruppert spill"
+
+#, fuzzy
+#~ msgid "Choose memorize game"
+#~ msgstr "Velg minnespill"
+
+#, fuzzy
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Klikk for ugruppert spill"
+
+#~ msgid "Choose image"
+#~ msgstr "Velg bilde"
+
+#~ msgid "Choose audio"
+#~ msgstr "Velg lyd"
diff --git a/po/ne.po b/po/ne.po
index 862746a..bbc2e4e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,116 +1,361 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-03-21 15:24-0400\n"
-"Last-Translator: Shankar Pokharel <memshankar@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-07-15 03:56+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
-msgstr "याद गर"
+msgstr "स्मरण खेल"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "खेल"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "बनाऊ"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "खेलको नाम"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "मिलेका जोडीहरु"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "जोड"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "अक्षरहरु"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "आवाजहरु"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "नया जोडी बनाउ"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "थप"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "छानेको जोडी फेर"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "अद्यावधिक"
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "झलक"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "पाठ:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "चित्र छान"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "चित्र घुसाऊ"
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "आवाज छान"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "ध्वनि घुसाऊ"
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "नयाँ खेल"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "टायल फ्लिप गर्दा पाठ प्रनाउन्स गर्नुहोस्"
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "खेल छान"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "खेल साँच"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "खेलको नाम"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "मिलेका जोडीहरु"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "सामुहिक खेलको लागी थिच"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "जोडी बनाऊ छान "
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "\"बेजोड समुह खेल\" को लागी क्लिक गर "
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "खेल सुरु गर्दै ..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "खेलको झलक शुरु"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "जोड"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "अक्षरहरु"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "आवाजहरु"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "खेलको झलक शुरु"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "खेल फेरी सुरु गर"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "खेल प्राप्त गर्दै"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "सक्यो"
 
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "ब्राजिल"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "स्विडिस्"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "आइसल्याण्डडिक्"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "रोमानियन"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "स्वाहिली"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "डच"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "ल्याटिन"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "हङ्गेरियन"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "मेसेडोनियन"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "वेल्स"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "फ्रेन्च"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "नर्विजियन"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "रसियन"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "अफ्रिकानहरु"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "फिनिस"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "पूर्वनिर्धारित"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "कानटोनिस"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "स्कटिस"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "ग्रीक"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "भियत्नाम"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "अङ्ग्रेजी"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "लान्कासायर"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "इटालियन"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "पोर्चुगल"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "जर्मन"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "ह्विस्पर"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "क्रोएशियन"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "चेक"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "स्लोभाक"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "स्पानिस"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "पोलिस"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "इस्पेरान्टो"
+
+#~ msgid "New game"
+#~ msgstr "नयाँ खेल"
+
+#~ msgid "Load game"
+#~ msgstr "खेल छान"
+
+#~ msgid "Save game"
+#~ msgstr "खेल साँच"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "सामुहिक खेलको लागी थिच"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "जोडी बनाऊ छान"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "\"बेजोड समुह खेल\" को लागी क्लिक गर"
+
+#~ msgid "Choose image"
+#~ msgstr "चित्र छान"
+
+#~ msgid "Choose audio"
+#~ msgstr "आवाज छान"
+
 #~ msgid "numbers"
 #~ msgstr "अंकहरु"
 
diff --git a/po/nn.po b/po/nn.po
index c55ea9d..1690b10 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +24,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 2a89254..4531bb2 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,124 +1,326 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-02 19:05-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
-msgid "Restart Game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: createcardpanel.py:78
+msgid "Add as new pair"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "Receiving game"
+#: createcardpanel.py:86
+msgid "Update selected pair"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "done"
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: createcardpanel.py:262
+msgid "Preview:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: createcardpanel.py:278
+msgid "Text:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr ""
+
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: memorizetoolbar.py:82
+msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr ""
+
+#: messenger.py:193
+msgid "done"
+msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "ਸਵੈਡਿਸ਼"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "ਆਈਸਲੈਂਡਿਕ"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "ਰੋਮਾਨੀਅਨ"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "ਸਵਾਹਿਲੀ"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "ਹਿੰਦੀ"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "ਡੱਚ"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "ਲੈਟਿਨ"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "ਹੁੰਗਾਰੀਅਨ"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "ਮੈਕੇਡੋਨੀਅਨ"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "ਵੇਲਸ਼"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "ਫਰੈਂਚ"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "ਨਾਰਵੇਜੀਅਨ ਨਯਨੋਰਸਕ"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "ਰੂਸੀ"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "ਅਫਰੀਕਨ"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "ਫਿਨਿਸ਼"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "ਗਰੀਕ"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "ਵੀਅਤਨਾਮੀ"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "ਅੰਗਰੇਜ਼ੀ"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "ਇਟਾਲੀਅਨ"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "ਪੋਰਤੂਗੂਈਸ"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "ਜਰਮਨ"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "ਕਰੋਆਟੀਅਨ"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "ਸੀਜ਼ੈੱਕ"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "ਸਲੋਵਾਕ"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "ਸਪੈਨਿਸ਼"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "ਪੌਲਿਸ਼"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "ਈਸਪੇਰਾਂਟੋ"
diff --git a/po/pap.po b/po/pap.po
index 995ab3c..f130f73 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -2,115 +2,360 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-06-19 08:02-0400\n"
-"Last-Translator: Urso Wieske <uwieske@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-02-16 02:37+0200\n"
+"Last-Translator: <esse_line@msn.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pap\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Memorisá"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr "Reprodusi"
+msgstr "Reprodusí"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Krea"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Nòmber di wega"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Par igual"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "adishon"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "lèternan"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "zonidonan"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
-msgstr "Agrega komo un par nobo"
+msgstr "Agregá komo un par nobo"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Agregá"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:86
 msgid "Update selected pair"
-msgstr "Aktualisa e par selektá"
+msgstr "Aktualisá e par selektá"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "Aktualisá"
+
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr "Bista previo"
+msgstr "Bista previo:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr "Teksto"
+msgstr "Teksto:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "Hinka plachi/potrèt"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Skohe imagen"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "Hinka zonido"
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Skohe audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "Pronunsiá teksto segun mosaiko/aseleho ta bira"
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Wega nobo"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Karga wega"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Warda wega"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Nomber di wega"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Par igual"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Klik pa wega den grupo"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Skohe wega di memoria"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Klik for di wega sin grupo"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "Kargando wega..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Karga weganan di demonstrashon"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "adishon"
 
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr "letranan"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "lèternan"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr "sonidonan"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "zonidonan"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Karga weganan di demostrashon"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Reinisia Wega"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
-msgstr "Resibiendo wega"
+msgstr "Aseptando wega"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "kla"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "Brazil"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Sueka"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Islandes"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Rumano"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Swahili"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Hindu"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Hulandes"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Latin"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Hungaro"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Macedonia"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Wales"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Franses"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Norwechi"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Ruso"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Afrikano"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finlandes"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "Default"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "Kantones"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "Escoses"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Griego"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnamis"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Ingles"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "Lancashire"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italiano"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portugues"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Aleman"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "Flùister"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Kroasia"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Chèko"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Slovakia"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Spañó"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Polako"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#~ msgid "New game"
+#~ msgstr "Wega nobo"
+
+#~ msgid "Load game"
+#~ msgstr "Karga wega"
+
+#~ msgid "Save game"
+#~ msgstr "Warda wega"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Klik pa wega den grupo"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Skohe wega di memoria"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Klik pa wega for di den grupo"
+
+#~ msgid "Choose image"
+#~ msgstr "Skohe imagen"
+
+#~ msgid "Choose audio"
+#~ msgstr "Skohe audio"
diff --git a/po/pis.po b/po/pis.po
index 45b2728..17b0f7a 100644
--- a/po/pis.po
+++ b/po/pis.po
@@ -2,116 +2,332 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2009-12-22 11:30-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pis\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr ""
+msgstr "Plei"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 62261e4..1f9b162 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -30,9 +30,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-02 00:33-0500\n"
-"PO-Revision-Date: 2012-01-26 12:21+0200\n"
-"Last-Translator: lkjlkj <agniechka@o2.pl>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-02-09 18:04+0200\n"
+"Last-Translator: Marcin <ulinski.marcin@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -46,86 +46,107 @@ msgstr ""
 msgid "Memorize"
 msgstr "Zapamiętaj"
 
-#: activity.py:84 activity.py:209
+#: activity.py:69
+msgid "Play"
+msgstr "Zagraj"
+
+#: activity.py:69
+msgid "Create"
+msgstr "Stwórz"
+
+#: activity.py:69
+msgid "Game name:"
+msgstr "Nazwa gry:"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Identyczne pary"
+
+#: activity.py:70
+msgid "addition"
+msgstr "dodawanie"
+
+#: activity.py:70
+msgid "letters"
+msgstr "litery"
+
+#: activity.py:70
+msgid "sounds"
+msgstr "dźwięki"
+
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr "Edytuj grę"
 
-#: activity.py:205
+#: activity.py:212
 msgid "Play game"
 msgstr "Graj"
 
-#: createcardpanel.py:77
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Dodaj nową parę"
 
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Dodaj"
 
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Odśwież wybraną parę"
 
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Odśwież"
 
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Podgląd:"
 
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Tekst:"
 
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Wstaw obraz"
 
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Wstaw dźwięk"
 
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "Wymów tekst podczas przekręcania się klocka"
 
 #: createtoolbar.py:46 createtoolbar.py:106
-#, fuzzy
 msgid "Match different tiles"
 msgstr "Dopasuj różne płytki"
 
 #: createtoolbar.py:51 createtoolbar.py:119
-#, fuzzy
 msgid "Mixed tiles game"
 msgstr "Gra w wymieszane płytki"
 
 #: createtoolbar.py:56
-#, fuzzy
 msgid "Clear all tiles"
-msgstr "Wyczyść wszystkie płytki"
+msgstr "Usuń wszystkie płytki"
 
 #: createtoolbar.py:76
-#, fuzzy
 msgid "Clear all the tiles from the game?"
-msgstr "Wyczyścić wszystkie płytki z gry?"
+msgstr "Usunąć wszystkie płytki z gry?"
 
 #: createtoolbar.py:78
-#, fuzzy
 msgid "Clear"
-msgstr "Wyczyść"
+msgstr "Usuń"
 
 #: createtoolbar.py:80
-#, fuzzy
 msgid "Do not clear"
-msgstr "Nie czyść"
+msgstr "Nie usuwaj"
 
 #: createtoolbar.py:102
 msgid "Match identical tiles"
 msgstr "Dopasuj identyczne płytki"
 
 #: createtoolbar.py:115
-#, fuzzy
 msgid "Grouped tiles game"
 msgstr "Gra w pogrupowane płytki"
 
@@ -154,17 +175,14 @@ msgid "Restart Game"
 msgstr "Restartuj Grę"
 
 #: memorizetoolbar.py:105
-#, fuzzy
 msgid "Discard your modified game?"
 msgstr "Odrzucić zmodyfikowaną grę?"
 
 #: memorizetoolbar.py:107
-#, fuzzy
 msgid "Discard"
 msgstr "Odrzuć"
 
 #: memorizetoolbar.py:109
-#, fuzzy
 msgid "Do not discard"
 msgstr "Nie odrzucaj"
 
@@ -308,12 +326,6 @@ msgstr "Polski"
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#~ msgid "Play"
-#~ msgstr "Zagraj"
-
-#~ msgid "Create"
-#~ msgstr "Stwórz"
-
 #~ msgid "New game"
 #~ msgstr "Nowa gra"
 
@@ -323,12 +335,6 @@ msgstr "Esperanto"
 #~ msgid "Save game"
 #~ msgstr "Zapisz grę"
 
-#~ msgid "Game name"
-#~ msgstr "Nazwa gry"
-
-#~ msgid "Equal pairs"
-#~ msgstr "Identyczne pary"
-
 #~ msgid "Click for grouped game"
 #~ msgstr "Kliknij aby grać w grupie"
 
diff --git a/po/ps.po b/po/ps.po
index d29a07d..97b7dea 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -1,125 +1,357 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: 2008-01-09 09:06+0000\n"
-"Last-Translator: usman mansoor ansari <jalalkut@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-06 01:39-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
+"Language-Team: PASHTO <LL@li.org>\n"
+"Language: ps\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "لوبه پېلېدل"
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "يادول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr "ډېمو لوبې پیل کړﺉ"
+#: activity.py:69
+msgid "Play"
+msgstr "غږول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
-msgstr "زیاتونې"
+#: activity.py:69
+msgid "Create"
+msgstr "پنځول"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "د لوبې نوم"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "لوتوري"
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "برابرې جوړې"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
+#: activity.py:70
 #, fuzzy
-msgid "drumgit"
-msgstr "ډرم جېټ"
+msgid "addition"
+msgstr "جمع"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
+#, fuzzy
 msgid "letters"
-msgstr "ليكونه"
+msgstr "توري"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "غږونه"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "د نوې جوړې په توګه زياتول"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "ټاکلې جوړه اوسمهاليزول"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "مخکتنه:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "متن:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "لوبه ليښل کېږي..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "جمع"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "شمېرې"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "توري"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "غږونه"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "ازميېښتي لوبې لېښل"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
-msgstr "لوبه بیاپیلول"
+msgstr "لوبه بياپيلول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "لوبه تیارول"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-#, fuzzy
-msgid "Choose memorize game"
-msgstr "د یادې لوبې چڼل"
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:192
 msgid "Receiving game"
-msgstr "لوبه د ترلاسه کولو په حال کې"
+msgstr "لوبه ترلاسه کول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
-msgstr "هوکې"
+msgstr "هوكې"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "پنځول"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "غږول"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "سویډنی"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "د نوې جوړې په توګه زیاتوونې"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr "ټاکلې جوړه اوسمهالول"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr "مخليد"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "متن"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "هندي"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "انځور چوڼل"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "اوريز چوڼل"
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "لاتیني"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "نوې لوبه"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "لوبه ساتل"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "مقدوني"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "د لوبې نوم"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "برابرې جوړې"
+#: speak/voice.py:47
+msgid "French"
+msgstr "فرانسوي"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "روسي"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "فینلنډي"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "انګلیسي"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "ایټالوي"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "پورتګالي"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "الماني"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "پولنډي"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "نوې لوبه"
+
+#~ msgid "Load game"
+#~ msgstr "لوبه لېښل"
+
+#~ msgid "Save game"
+#~ msgstr "لوبه ساتل"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "د ګروپي لوبې لپاره کلېکول"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "لوبه يادول انتخاب کړﺉ"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "د ناګروپي لوبې لپاره کلېکول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "د ډله ییزې لوبې لپاره ټک وکړه"
+#~ msgid "Choose image"
+#~ msgstr "انځور انتخابول"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "د... لپاره ټک وکړﺉ"
+#~ msgid "Choose audio"
+#~ msgstr "صوت انتخابول"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5f0a58..e39b252 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,8 +1,12 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2008-01-18 20:45+0000\n"
 "Last-Translator: Eduardo H. Silva <HoboPrimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,113 +15,327 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr "Carregando jogo..."
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr "Carregar jogos de demonstração"
+#: activity.py:69
+msgid "Play"
+msgstr "Jogar"
+
+#: activity.py:69
+msgid "Create"
+msgstr "Criar"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Nome do jogo"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Pares iguais"
+
+#: activity.py:70
+#, fuzzy
 msgid "addition"
 msgstr "adição"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr "maiúsculas e minúsculas"
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "letras"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr "instrumentos"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "Adicionar como novo par"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "Atualizar par selecionado"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Previsão:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "Texto:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr "Carregando jogo..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "adição"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "letras"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr "números"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr "fonemas"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Carregar jogos de demonstração"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Reiniciar jogo"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr "Carregar jogo"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr "Escolha o jogo da memória"
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Recebendo jogo"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr "pronto"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr "Criar"
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr "Jogar"
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr "Adicionar como novo par"
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr "Atualizar par selecionado"
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr "Previsão:"
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr "Texto:"
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr "Escolha imagem"
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr "Escolha áudio"
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr "Novo jogo"
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr "Salvar jogo"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr "Nome do jogo"
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Pares iguais"
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Novo jogo"
+
+#~ msgid "Load game"
+#~ msgstr "Carregar jogo"
+
+#~ msgid "Save game"
+#~ msgstr "Salvar jogo"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Clique para jogo agrupado"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Escolha o jogo da memória"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Clique para jogo desagrupado"
+
+#~ msgid "capitals"
+#~ msgstr "maiúsculas e minúsculas"
+
+#~ msgid "drumgit"
+#~ msgstr "instrumentos"
+
+#~ msgid "numbers"
+#~ msgstr "números"
+
+#~ msgid "phonemes"
+#~ msgstr "fonemas"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Clique para jogo agrupado"
+#~ msgid "Choose image"
+#~ msgstr "Escolha imagem"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Clique para jogo desagrupado"
+#~ msgid "Choose audio"
+#~ msgstr "Escolha áudio"
diff --git a/po/qu.po b/po/qu.po
deleted file mode 100644
index 2a89254..0000000
--- a/po/qu.po
+++ /dev/null
@@ -1,124 +0,0 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
-msgid "Restart Game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "Receiving game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "done"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr ""
-
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr ""
diff --git a/po/quz.po b/po/quz.po
index e564a9e..bda5667 100644
--- a/po/quz.po
+++ b/po/quz.po
@@ -1,8 +1,12 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-11-26 08:55+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,153 +17,157 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#  "Memorizar"
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#  "Jugar"
-#: activity.py:82
-msgid "Play game"
+#: activity.py:69
+msgid "Play"
+msgstr ""
+
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#  "Editar juego"
-#: activity.py:90
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+# "Sonidos"
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "Uyarina"
+
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr ""
 
-#  "Añadir un nuevo par"
-#: createcardpanel.py:77
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
 #  "Añadir"
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Yapay"
 
-#  "Actualizar par seleccionado"
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#  "Actualizar"
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#  "Vista previa:"
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
 #  "Texto:"
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Qillqa:"
 
-#  "Insertar imagen"
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#  "Insertar sonido"
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#  "Pronunciar texto mientras voltea la carta"
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#  "Seleccionar pares iguales"
-#: createtoolbar.py:45 createtoolbar.py:98
-msgid "Set equal pairs"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#  "Seleccionar juego por grupos"
-#: createtoolbar.py:50 createtoolbar.py:109
-msgid "Set grouped game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#  "Limpiar el juego"
-#: createtoolbar.py:55
-msgid "Clear current game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#  "¿Limpiar todas las piezas del juego?"
-#: createtoolbar.py:71
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
 msgstr ""
 
 #  "Limpiar"
-#: createtoolbar.py:73
+#: createtoolbar.py:78
 msgid "Clear"
 msgstr "Pichay"
 
-#  "No Limpiar"
-#: createtoolbar.py:75
+#: createtoolbar.py:80
 msgid "Do not clear"
 msgstr ""
 
-#  "Seleccionar pares distintos"
-#: createtoolbar.py:94
-msgid "Set non equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#  "Seleccionar juego sin grupos"
-#: createtoolbar.py:105
-msgid "Set ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#  "Cargando juego..."
 #: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#  "Adición"
 #: memorizetoolbar.py:43
 msgid "Addition"
 msgstr ""
 
-#  "Letras"
 #: memorizetoolbar.py:44
 msgid "Letters"
 msgstr ""
 
-#  "Sonidos"
+# "Sonidos"
 #: memorizetoolbar.py:45
 #, fuzzy
 msgid "Sounds"
 msgstr "Uyarina"
 
-#  "Cargar juegos de demostración"
-#: memorizetoolbar.py:70
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr ""
 
-#  "Reiniciar Juego"
 #: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#  "¿Descartar tu juego modificado?"
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
 msgstr ""
 
-#  "Descartar"
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
 msgstr ""
 
-#  "No descartar"
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
 msgstr ""
 
-#  "Recibiendo juego"
 #: messenger.py:192
 msgid "Receiving game"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 2a89254..fc09d0f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,124 +1,367 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-02 19:23-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "Memorează"
+
+#: activity.py:69
+msgid "Play"
+msgstr "Joacă"
+
+#: activity.py:69
+msgid "Create"
+msgstr "Crează"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Nume joc"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Perechi egale"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "adunare"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "litere"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "sunete"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "Adaugă ca pereche nouă"
+
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "Actualizează pereche selectată"
+
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Previzualizare:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "Text:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
-msgid "letters"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
-msgid "Restart Game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "Receiving game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "done"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: game.py:94
+msgid "Loading game..."
+msgstr "Se încarcă jocul..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "adunare"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "litere"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "sunete"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Încarcă jocuri demonstrative"
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "Reporneşte joc"
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: messenger.py:192
+msgid "Receiving game"
+msgstr "Se primeşte joc"
+
+#: messenger.py:193
+msgid "done"
+msgstr "finalizat"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Islandeză"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Română"
+
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Olandeză"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Adresă"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Maghiară"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Macedoneană"
+
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:47
+msgid "French"
+msgstr "Franceză"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Norvegiană"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Rusesc"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finlandeză"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:53
+msgid "Cantonese"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:54
+msgid "Scottish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:55
+msgid "Greek"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:56
+msgid "Vietnam"
 msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Engleză"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italiană"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portugheză"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Germană"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Croată"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Cehă"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Slovacă"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Spaniolă"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Poloneză"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#~ msgid "New game"
+#~ msgstr "Joc nou"
+
+#~ msgid "Load game"
+#~ msgstr "Încarcă joc"
+
+#~ msgid "Save game"
+#~ msgstr "Salvează joc"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Clic pentru joc în grupă"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Alege joc de memorie"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Clip pentru joc individual"
+
+#~ msgid "Choose image"
+#~ msgstr "Alege imagine"
+
+#~ msgid "Choose audio"
+#~ msgstr "Alege sunet"
+
+#~ msgid "capitals"
+#~ msgstr "Majuscule"
+
+#~ msgid "numbers"
+#~ msgstr "numere"
+
+#~ msgid "phonemes"
+#~ msgstr "foneme"
diff --git a/po/ru.po b/po/ru.po
index 2a89254..f379e36 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,124 +1,366 @@
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-01-02 19:35-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
-msgstr ""
+#: activity/activity.info:2
+msgid "Memorize"
+msgstr "Запомнить"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
-msgstr ""
+#: activity.py:69
+msgid "Play"
+msgstr "Играть"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
-msgstr ""
+#: activity.py:69
+msgid "Create"
+msgstr "Создать"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
-msgstr ""
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Название игры"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
-msgstr ""
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Равные пары"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "дополнения"
+
+#: activity.py:70
+#, fuzzy
 msgid "letters"
-msgstr ""
+msgstr "буквы"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
-msgstr ""
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "звуки"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
-msgid "Restart Game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
-msgstr ""
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "Добавить как новую пару"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "Receiving game"
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr "Обновить выделенную пару"
+
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
-msgid "done"
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Преварительный просмотр:"
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr "Текст:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: game.py:94
+msgid "Loading game..."
+msgstr "Загрузка игры..."
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "дополнения"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "буквы"
+
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "звуки"
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Загрузить демонстрацию игры"
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "Перезапустить игру"
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: messenger.py:192
+msgid "Receiving game"
+msgstr "Получение игры"
+
+#: messenger.py:193
+msgid "done"
+msgstr "готово"
+
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Шведский"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Исландский"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Румынский"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Суахили"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Хинди"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Голландский"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Латинский"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Венгерский"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Македонский"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Валлийский"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Французский"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Норвежский"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Русский"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Финский"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "По умолчанию"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "Кантон"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "Шотландский"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Греческий"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Вьетнамский"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Английский"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "Ланкашир"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Итальянский"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Португальский"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Немецкий"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "Шепот"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Хорватский"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Чешский"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Словацкий"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Испанский"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Польский"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#~ msgid "New game"
+#~ msgstr "Новая игра"
+
+#~ msgid "Load game"
+#~ msgstr "Загрузка игры"
+
+#~ msgid "Save game"
+#~ msgstr "Сохранить игру"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Клинуть для групповой игры"
+
+#, fuzzy
+#~ msgid "Choose memorize game"
+#~ msgstr "Выбрать игру для заучивания"
+
+#, fuzzy
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Кликнуть для разгруппировки"
+
+#~ msgid "Choose image"
+#~ msgstr "Выбрать изображение"
+
+#~ msgid "Choose audio"
+#~ msgstr "Выбрать звук"
+
+#~ msgid "numbers"
+#~ msgstr "числа"
+
+#~ msgid "phonemes"
+#~ msgstr "фонемы"
diff --git a/po/sd.po b/po/sd.po
index 45b2728..422d939 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -2,12 +2,44 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +52,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/si.po b/po/si.po
index a209f37..f410832 100644
--- a/po/si.po
+++ b/po/si.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-09-28 08:24+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,80 +45,112 @@ msgstr ""
 msgid "Memorize"
 msgstr "මතක තබා ගන්න"
 
-#: activity.py:82
-msgid "Play game"
-msgstr ""
+#: activity.py:69
+msgid "Play"
+msgstr "ක්‍රිඩා කරන්න"
+
+#: activity.py:69
+msgid "Create"
+msgstr "නිර්මානය කරන්න"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "ක්‍රීඩාවේ නම"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "සමාන යුගල"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "එකතුව"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "අකුරු"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "ශබ්ද"
 
-#: activity.py:90
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr ""
 
-#: createcardpanel.py:77
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "අලුත් යුගලයක් ලෙස එකතු කරන්න"
 
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "තෝරාගත් යුගලය යාවත්කාල කරන්න"
 
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "පෙරදසුන:"
 
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "පෙළ:"
 
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:45 createtoolbar.py:98
-msgid "Set equal pairs"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:50 createtoolbar.py:109
-msgid "Set grouped game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:55
-msgid "Clear current game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:71
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:73
+#: createtoolbar.py:78
 msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:75
+#: createtoolbar.py:80
 msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:94
-msgid "Set non equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:105
-msgid "Set ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
 #: game.py:94
@@ -140,7 +172,7 @@ msgstr "අකුරු"
 msgid "Sounds"
 msgstr "ශබ්ද"
 
-#: memorizetoolbar.py:70
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr "නිදර්ශන ක්‍රීඩා ආරම්භ කරන්න"
 
@@ -148,15 +180,15 @@ msgstr "නිදර්ශන ක්‍රීඩා ආරම්භ කරන්
 msgid "Restart Game"
 msgstr "ක්‍රීඩාව නැවත පටන් ගන්න"
 
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
 msgstr ""
 
@@ -300,12 +332,6 @@ msgstr ""
 msgid "Esperanto"
 msgstr ""
 
-#~ msgid "Play"
-#~ msgstr "ක්‍රිඩා කරන්න"
-
-#~ msgid "Create"
-#~ msgstr "නිර්මානය කරන්න"
-
 #~ msgid "New game"
 #~ msgstr "අලුත් ක්‍රීඩාවක්"
 
@@ -315,12 +341,6 @@ msgstr ""
 #~ msgid "Save game"
 #~ msgstr "ක්‍රීඩාව සුරකින්න "
 
-#~ msgid "Game name"
-#~ msgstr "ක්‍රීඩාවේ නම"
-
-#~ msgid "Equal pairs"
-#~ msgstr "සමාන යුගල"
-
 #~ msgid "Click for grouped game"
 #~ msgstr "සමුහ ක්‍රීඩාවක් සඳහා ක්ලික් කරන්න"
 
diff --git a/po/sk.po b/po/sk.po
index 45b2728..6113fa5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,116 +2,329 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-04-01 17:32+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
+msgstr "Vytvoriť"
+
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
-msgid "Preview:"
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr "Prezrieť:"
+
+#: createcardpanel.py:278
 msgid "Text:"
+msgstr "Text:"
+
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e3748c2..76dbe95 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,115 +2,361 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-07-09 08:32-0400\n"
-"Last-Translator: Denis Oštir <denis.ostir@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-02-07 05:37+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Spomin"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Igraj"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Ustvari"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Ime igre"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Enaka para"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "dodatek"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "črke"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "zvoki"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Dodaj nov par"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Posodobi izbran par"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Predogled:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Besedilo:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Izberi sliko"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Izberi zvok"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Nova igra"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Naloži igro"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Shrani igro"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Ime igre"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Enaka para"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Pritisni za skupinsko igro"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Izberi igro spomin"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Pritisni za samostojno igro"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: game.py:105
-msgid "Loading game..."
-msgstr "Nalagam igro ..."
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Naloži vzorčne igre"
+#: game.py:94
+msgid "Loading game..."
+msgstr "Nalagam igro..."
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "dodatek"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "črke"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "zvoki"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Naloži vzorčne igre"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Znova začni igro"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Prejemam igro"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "konec"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "švedščina"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Islandščina"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Romunščina"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Svahilščina"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Hindijščina"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Nizozemščina"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Latinščina"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Madžarščina"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Makedonščina"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Valižanščina"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Francoščina"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Norveščina"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Ruščina"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Afrikanščina"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finščina"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Grščina"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnamščina"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Angleščina"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italijanščina"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portugalđščina"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Nemščina"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Hrvaščina"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "češčina"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Slovaščina"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "španščina"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Poljščina"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#~ msgid "New game"
+#~ msgstr "Nova igra"
+
+#~ msgid "Load game"
+#~ msgstr "Naloži igro"
+
+#~ msgid "Save game"
+#~ msgstr "Shrani igro"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Pritisni za skupinsko igro"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Izberi igro spomin"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Pritisni za samostojno igro"
+
+#~ msgid "Choose image"
+#~ msgstr "Izberi sliko"
+
+#~ msgid "Choose audio"
+#~ msgstr "Izberi zvok"
diff --git a/po/sm.po b/po/sm.po
index 8e12885..1fd9313 100644
--- a/po/sm.po
+++ b/po/sm.po
@@ -14,129 +14,174 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2010-07-28 12:54+0200\n"
-"Last-Translator: Tabitha <tabitha.roder@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-03-28 05:39+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sm\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Mafaufauga"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "ta'alo"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "fau"
 
-#: createcardpanel.py:79
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "igoa ole ta'aloga "
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Fa'aopoopo"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Fa'aopoopo"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Fa'asa'o"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Fa'asa'o"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Va'aiga muamua"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "tusitusiga"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Fa'aopopo ata"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Fa'aopoopo leo"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "amata ta'aloga"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "sefe ta'aloga"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "igoa ole ta'aloga "
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "toe amata ta'aloga"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
@@ -186,7 +231,7 @@ msgstr ""
 
 #: speak/voice.py:47
 msgid "French"
-msgstr ""
+msgstr "Falani"
 
 #: speak/voice.py:48
 msgid "Norwegian"
@@ -226,7 +271,7 @@ msgstr ""
 
 #: speak/voice.py:57
 msgid "English"
-msgstr ""
+msgstr "Igilisi"
 
 #: speak/voice.py:58
 msgid "Lancashire"
@@ -271,3 +316,9 @@ msgstr ""
 #: speak/voice.py:68
 msgid "Esperanto"
 msgstr ""
+
+#~ msgid "Load game"
+#~ msgstr "amata ta'aloga"
+
+#~ msgid "Save game"
+#~ msgstr "sefe ta'aloga"
diff --git a/po/son.po b/po/son.po
index 96aadf5..0fcaa83 100644
--- a/po/son.po
+++ b/po/son.po
@@ -2,129 +2,170 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-03-26 05:07+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: son\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
@@ -186,7 +227,7 @@ msgstr ""
 
 #: speak/voice.py:50
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afirikaŋsi"
 
 #: speak/voice.py:51
 msgid "Finnish"
diff --git a/po/sq.po b/po/sq.po
index bd1953d..ba68035 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:32-0500\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2010-02-16 07:17+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index eaf3a34..f508f22 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,111 +40,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/st.po b/po/st.po
index c55ea9d..1690b10 100644
--- a/po/st.po
+++ b/po/st.po
@@ -2,12 +2,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +24,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index e835f4b..5de7715 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,115 +2,360 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2009-01-11 13:44-0500\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2010-02-08 22:36+0200\n"
 "Last-Translator: Nicci Manns <nicci@saunalahti.fi>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Komihåg"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Spela"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Skapa"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Spelnamn"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Jämt antal par"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "addition"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "bokstäver"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "ljud"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Lägg till som nytt par"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "Lägg till"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Uppdatera markerat par"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "Uppdatera"
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Förhandsgranskning:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Text:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Välj bild"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "Infoga bild"
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Välj ljud"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "Infoga ljud"
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Nytt spel"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "Uttala text under vändnig av bricka"
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Ladda spel"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Spara spel"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Spelnamn"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Jämt antal par"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Klicka för grupperat spel"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Välj komihågspel"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Klicka för ogrupperat spel"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "Laddar spel..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Ladda demospel"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "addition"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "bokstäver"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "ljud"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Ladda demospel"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Starta om spel"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Tar emot spel"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "klar"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Svenska"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Isländska"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Rumänska"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "Swahili"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "Hindi"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Nederländska"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Latin"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Makedonska"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Kymriska"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Franska"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Nynorsk"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Ryska"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Finska"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "Standard"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "Kantonesiska"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "Skotska språket"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Nygrekiska"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnamesiska"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Engelska"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "Lancashire"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "Italienska"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Portugisiska"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Tyska"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "Viska"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Kroatiska"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Slovakiska"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Spanska"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Polska"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#~ msgid "New game"
+#~ msgstr "Nytt spel"
+
+#~ msgid "Load game"
+#~ msgstr "Ladda spel"
+
+#~ msgid "Save game"
+#~ msgstr "Spara spel"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Klicka för grupperat spel"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Välj komihågspel"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Klicka för ogrupperat spel"
+
+#~ msgid "Choose image"
+#~ msgstr "Välj bild"
+
+#~ msgid "Choose audio"
+#~ msgstr "Välj ljud"
diff --git a/po/sw.po b/po/sw.po
index 45b2728..c10e54e 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -2,116 +2,362 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-04-24 13:46+0200\n"
+"Last-Translator: Christian <kryskaka@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
-msgstr ""
+msgstr "kukariri"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
-msgstr ""
+msgstr "ku play"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
+msgstr "kujenga"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "jina ya mchezo"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "jozi sawa"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "aidha"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "herufi"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "sauti"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: createcardpanel.py:52
-msgid "Add as new pair"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr "kuongeza kama jozi mpya"
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "kuongeza"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
-msgstr ""
+msgstr "update jozi umechaguliwa"
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "update"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr ""
+msgstr "hakikisho"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr ""
+msgstr "Maandishi: or nakala"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr ""
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "kutiya picture"
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr ""
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "kutiya sauti"
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "kutamka maandishi wakati wa tile flip"
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
-msgstr ""
+msgstr "upakiaji wa mchezo"
+
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
+msgstr "aidha"
+
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
+msgstr "herufi"
 
-#: memorizetoolbar.py:40
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
+msgstr "sauti"
+
+#: memorizetoolbar.py:60
 msgid "Load demo games"
-msgstr ""
+msgstr "ku shehena mchezo wa maandamano"
 
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr ""
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr "kuanziliya mchezo"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:63
-msgid "Restart Game"
+#: memorizetoolbar.py:109
+msgid "Do not discard"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:192
 msgid "Receiving game"
-msgstr ""
+msgstr "kupokeya mchezo"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
-msgstr ""
+msgstr "kufanyika"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "Brazili"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "Swedish"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "Kiaislandi"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "Kiromania"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "swahili"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "hindi"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "Kiholanzi"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "Latin"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "Kimasedonia"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "Welsh"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "Kifaransa"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "Kinorwe"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "Russian"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "Kiafrikana"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "Kifini"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "Default"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "Kikantoni"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "Scottish"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "Kigiriki"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "Kiingereza"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "Lancashire"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "  Italian "
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "Ureno"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "Kijerumani"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "Whisper"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "Kikroeshia"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "Kicheki"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "Kislovakia"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "Kihispania"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "Polish"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "Kiesperanto"
+
+#~ msgid "New game"
+#~ msgstr "mchezo mpya"
+
+#~ msgid "Load game"
+#~ msgstr "shehena mchezo"
+
+#~ msgid "Save game"
+#~ msgstr "kuokoa mchezo"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "click kikundi kwa ajili ya mchezo"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Kuchagua kukariri mchezo"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Click kwa ajili ya mchezo yasiyo ya kundi"
diff --git a/po/ta.po b/po/ta.po
index 429132d..51e98cd 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2011-07-03 14:39+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,80 +49,112 @@ msgstr ""
 msgid "Memorize"
 msgstr "நினைவில் நிறுத்திக்கொள்"
 
-#: activity.py:82
-msgid "Play game"
-msgstr ""
+#: activity.py:69
+msgid "Play"
+msgstr "ஆடு"
+
+#: activity.py:69
+msgid "Create"
+msgstr "உருவாக்கு"
+
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "ஆட்டப் பெயர்"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "சமமான இணை"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "கூட்டு"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "எழுத்துக்கள்"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "ஒலிகள்"
 
-#: activity.py:90
+#: activity.py:91 activity.py:216
 msgid "Edit game"
 msgstr ""
 
-#: createcardpanel.py:77
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "புதிய இணையாகச் சேர்"
 
-#: createcardpanel.py:80
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "சேர்"
 
-#: createcardpanel.py:85
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "தெரிவு செய்யப்பட்ட இணையை இற்றைப்படுத்தல்"
 
-#: createcardpanel.py:88
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "புதுப்பி"
 
-#: createcardpanel.py:261
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "பார்வை மாதிரி"
 
-#: createcardpanel.py:277
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "உள்ளடக்கம்"
 
-#: createcardpanel.py:289
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "படத்தைச் செருகு"
 
-#: createcardpanel.py:294
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "ஒலியைச் செருகு"
 
-#: createcardpanel.py:432
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "தலை மாறும்போது உரையை உச்சரிக்கவும்"
 
-#: createtoolbar.py:45 createtoolbar.py:98
-msgid "Set equal pairs"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:50 createtoolbar.py:109
-msgid "Set grouped game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:55
-msgid "Clear current game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:71
+#: createtoolbar.py:76
 msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:73
+#: createtoolbar.py:78
 msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:75
+#: createtoolbar.py:80
 msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:94
-msgid "Set non equal pairs"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:105
-msgid "Set ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
 #: game.py:94
@@ -144,7 +176,7 @@ msgstr "எழுத்துக்கள்"
 msgid "Sounds"
 msgstr "ஒலிகள்"
 
-#: memorizetoolbar.py:70
+#: memorizetoolbar.py:60
 msgid "Load demo games"
 msgstr "மாதிரி ஆட்டத்தை ஏற்றுக"
 
@@ -152,15 +184,15 @@ msgstr "மாதிரி ஆட்டத்தை ஏற்றுக"
 msgid "Restart Game"
 msgstr "மீண்டும் ஆட்டத்தைத் துவக்கு"
 
-#: memorizetoolbar.py:111
+#: memorizetoolbar.py:105
 msgid "Discard your modified game?"
 msgstr ""
 
-#: memorizetoolbar.py:113
+#: memorizetoolbar.py:107
 msgid "Discard"
 msgstr ""
 
-#: memorizetoolbar.py:115
+#: memorizetoolbar.py:109
 msgid "Do not discard"
 msgstr ""
 
@@ -304,12 +336,6 @@ msgstr "பொலிஸ்"
 msgid "Esperanto"
 msgstr "எஸ்பிறன்ரோ"
 
-#~ msgid "Play"
-#~ msgstr "ஆடு"
-
-#~ msgid "Create"
-#~ msgstr "உருவாக்கு"
-
 #~ msgid "New game"
 #~ msgstr "புதிய ஆட்டம்"
 
@@ -319,12 +345,6 @@ msgstr "எஸ்பிறன்ரோ"
 #~ msgid "Save game"
 #~ msgstr "ஆட்டத்தை சேமி"
 
-#~ msgid "Game name"
-#~ msgstr "ஆட்டப் பெயர்"
-
-#~ msgid "Equal pairs"
-#~ msgstr "சமமான இணை"
-
 #~ msgid "Click for grouped game"
 #~ msgstr "குழு ஆட்டத்திற்கு இவ்விடத்தில் சொடுக்கக்வும்"
 
diff --git a/po/te.po b/po/te.po
index 3674ce5..4e6b2d2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,116 +1,361 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-07-02 23:48+0100\n"
-"Last-Translator: Satyanarayana Murthy Saladi <saladism@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-11-27 06:14+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "గుర్తింపు ఆట"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "ఆడు"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "సృష్టించు"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "ఆట పేరు"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "సమాన జతలు"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "కూడిక"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "అక్షరములు"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "శబ్దము"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "కొత్త జంట చేర్చు"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "ఎంచుకొన్న జతను తాజాపరచు"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "రిహార్సు:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "వచనం:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "చిత్రం కోరుకో"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "ద్వని కోరుకో"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "కొత్త ఆట"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "ఆట అమర్చు"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "ఆట బద్రపరచు"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "ఆట పేరు"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "సమాన జతలు"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "గుంపు ఆటకు నొక్కు"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "గుర్తింపు ఆట కోరుకో "
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "గుంపుగా కాని ఆటకు నొక్కు"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "ఆట అమరుస్తున్నా..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "ఉదహరించే ఆటలు అమర్చనా"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "కూడిక"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "అక్షరములు"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "శబ్దము"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "ఉదహరించే ఆటలు అమర్చనా"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "ఆట తిరిగి ఆడు"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "ఆట అందుకోబడుతోంది"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "పూర్తయింది"
 
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "కొత్త ఆట"
+
+#~ msgid "Load game"
+#~ msgstr "ఆట అమర్చు"
+
+#~ msgid "Save game"
+#~ msgstr "ఆట బద్రపరచు"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "గుంపు ఆటకు నొక్కు"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "గుర్తింపు ఆట కోరుకో"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "గుంపుగా కాని ఆటకు నొక్కు"
+
+#~ msgid "Choose image"
+#~ msgstr "చిత్రం కోరుకో"
+
+#~ msgid "Choose audio"
+#~ msgstr "ద్వని కోరుకో"
+
 #~ msgid "capitals"
 #~ msgstr "మొదటిబరి అక్షరములు"
 
diff --git a/po/templates.po b/po/templates.po
deleted file mode 100644
index 673797c..0000000
--- a/po/templates.po
+++ /dev/null
@@ -1,281 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.2\n"
-
-#: activity/activity.info:2
-msgid "Memorize"
-msgstr ""
-
-#: activity.py:70
-msgid "Play"
-msgstr ""
-
-#: activity.py:74
-msgid "Create"
-msgstr ""
-
-#: createcardpanel.py:79
-msgid "Add as new pair"
-msgstr ""
-
-#: createcardpanel.py:82
-msgid "Add"
-msgstr ""
-
-#: createcardpanel.py:87
-msgid "Update selected pair"
-msgstr ""
-
-#: createcardpanel.py:90
-msgid "Update"
-msgstr ""
-
-#: createcardpanel.py:255
-msgid "Preview:"
-msgstr ""
-
-#: createcardpanel.py:271
-msgid "Text:"
-msgstr ""
-
-#: createcardpanel.py:283
-msgid "Insert picture"
-msgstr ""
-
-#: createcardpanel.py:288
-msgid "Insert sound"
-msgstr ""
-
-#: createcardpanel.py:434
-msgid "Pronounce text during tile flip"
-msgstr ""
-
-#: createtoolbar.py:51
-msgid "New game"
-msgstr ""
-
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr ""
-
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr ""
-
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr ""
-
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr ""
-
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr ""
-
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr ""
-
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr ""
-
-#: game.py:92
-msgid "Loading game..."
-msgstr ""
-
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr ""
-
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr ""
-
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr ""
-
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr ""
-
-#: memorizetoolbar.py:63
-msgid "Restart Game"
-msgstr ""
-
-#: messenger.py:195
-msgid "Receiving game"
-msgstr ""
-
-#: messenger.py:196
-msgid "done"
-msgstr ""
-
-#: speak/voice.py:36
-msgid "Brazil"
-msgstr ""
-
-#: speak/voice.py:37
-msgid "Swedish"
-msgstr ""
-
-#: speak/voice.py:38
-msgid "Icelandic"
-msgstr ""
-
-#: speak/voice.py:39
-msgid "Romanian"
-msgstr ""
-
-#: speak/voice.py:40
-msgid "Swahili"
-msgstr ""
-
-#: speak/voice.py:41
-msgid "Hindi"
-msgstr ""
-
-#: speak/voice.py:42
-msgid "Dutch"
-msgstr ""
-
-#: speak/voice.py:43
-msgid "Latin"
-msgstr ""
-
-#: speak/voice.py:44
-msgid "Hungarian"
-msgstr ""
-
-#: speak/voice.py:45
-msgid "Macedonian"
-msgstr ""
-
-#: speak/voice.py:46
-msgid "Welsh"
-msgstr ""
-
-#: speak/voice.py:47
-msgid "French"
-msgstr ""
-
-#: speak/voice.py:48
-msgid "Norwegian"
-msgstr ""
-
-#: speak/voice.py:49
-msgid "Russian"
-msgstr ""
-
-#: speak/voice.py:50
-msgid "Afrikaans"
-msgstr ""
-
-#: speak/voice.py:51
-msgid "Finnish"
-msgstr ""
-
-#: speak/voice.py:52 speak/voice.py:125
-msgid "Default"
-msgstr ""
-
-#: speak/voice.py:53
-msgid "Cantonese"
-msgstr ""
-
-#: speak/voice.py:54
-msgid "Scottish"
-msgstr ""
-
-#: speak/voice.py:55
-msgid "Greek"
-msgstr ""
-
-#: speak/voice.py:56
-msgid "Vietnam"
-msgstr ""
-
-#: speak/voice.py:57
-msgid "English"
-msgstr ""
-
-#: speak/voice.py:58
-msgid "Lancashire"
-msgstr ""
-
-#: speak/voice.py:59
-msgid "Italian"
-msgstr ""
-
-#: speak/voice.py:60
-msgid "Portugal"
-msgstr ""
-
-#: speak/voice.py:61
-msgid "German"
-msgstr ""
-
-#: speak/voice.py:62
-msgid "Whisper"
-msgstr ""
-
-#: speak/voice.py:63
-msgid "Croatian"
-msgstr ""
-
-#: speak/voice.py:64
-msgid "Czech"
-msgstr ""
-
-#: speak/voice.py:65
-msgid "Slovak"
-msgstr ""
-
-#: speak/voice.py:66
-msgid "Spanish"
-msgstr ""
-
-#: speak/voice.py:67
-msgid "Polish"
-msgstr ""
-
-#: speak/voice.py:68
-msgid "Esperanto"
-msgstr ""
diff --git a/po/ton.po b/po/ton.po
deleted file mode 100644
index c470f40..0000000
--- a/po/ton.po
+++ /dev/null
@@ -1,277 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
-
-#: activity/activity.info:2
-msgid "Memorize"
-msgstr ""
-
-#: activity.py:70
-msgid "Play"
-msgstr ""
-
-#: activity.py:74
-msgid "Create"
-msgstr ""
-
-#: createcardpanel.py:79
-msgid "Add as new pair"
-msgstr ""
-
-#: createcardpanel.py:82
-msgid "Add"
-msgstr ""
-
-#: createcardpanel.py:87
-msgid "Update selected pair"
-msgstr ""
-
-#: createcardpanel.py:90
-msgid "Update"
-msgstr ""
-
-#: createcardpanel.py:255
-msgid "Preview:"
-msgstr ""
-
-#: createcardpanel.py:271
-msgid "Text:"
-msgstr ""
-
-#: createcardpanel.py:283
-msgid "Insert picture"
-msgstr ""
-
-#: createcardpanel.py:288
-msgid "Insert sound"
-msgstr ""
-
-#: createcardpanel.py:434
-msgid "Pronounce text during tile flip"
-msgstr ""
-
-#: createtoolbar.py:51
-msgid "New game"
-msgstr ""
-
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr ""
-
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr ""
-
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr ""
-
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr ""
-
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr ""
-
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr ""
-
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr ""
-
-#: game.py:92
-msgid "Loading game..."
-msgstr ""
-
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr ""
-
-#: memorizetoolbar.py:41
-msgid "addition"
-msgstr ""
-
-#: memorizetoolbar.py:42
-msgid "letters"
-msgstr ""
-
-#: memorizetoolbar.py:43
-msgid "sounds"
-msgstr ""
-
-#: memorizetoolbar.py:63
-msgid "Restart Game"
-msgstr ""
-
-#: messenger.py:195
-msgid "Receiving game"
-msgstr ""
-
-#: messenger.py:196
-msgid "done"
-msgstr ""
-
-#: speak/voice.py:36
-msgid "Brazil"
-msgstr ""
-
-#: speak/voice.py:37
-msgid "Swedish"
-msgstr ""
-
-#: speak/voice.py:38
-msgid "Icelandic"
-msgstr ""
-
-#: speak/voice.py:39
-msgid "Romanian"
-msgstr ""
-
-#: speak/voice.py:40
-msgid "Swahili"
-msgstr ""
-
-#: speak/voice.py:41
-msgid "Hindi"
-msgstr ""
-
-#: speak/voice.py:42
-msgid "Dutch"
-msgstr ""
-
-#: speak/voice.py:43
-msgid "Latin"
-msgstr ""
-
-#: speak/voice.py:44
-msgid "Hungarian"
-msgstr ""
-
-#: speak/voice.py:45
-msgid "Macedonian"
-msgstr ""
-
-#: speak/voice.py:46
-msgid "Welsh"
-msgstr ""
-
-#: speak/voice.py:47
-msgid "French"
-msgstr ""
-
-#: speak/voice.py:48
-msgid "Norwegian"
-msgstr ""
-
-#: speak/voice.py:49
-msgid "Russian"
-msgstr ""
-
-#: speak/voice.py:50
-msgid "Afrikaans"
-msgstr ""
-
-#: speak/voice.py:51
-msgid "Finnish"
-msgstr ""
-
-#: speak/voice.py:52 speak/voice.py:125
-msgid "Default"
-msgstr ""
-
-#: speak/voice.py:53
-msgid "Cantonese"
-msgstr ""
-
-#: speak/voice.py:54
-msgid "Scottish"
-msgstr ""
-
-#: speak/voice.py:55
-msgid "Greek"
-msgstr ""
-
-#: speak/voice.py:56
-msgid "Vietnam"
-msgstr ""
-
-#: speak/voice.py:57
-msgid "English"
-msgstr ""
-
-#: speak/voice.py:58
-msgid "Lancashire"
-msgstr ""
-
-#: speak/voice.py:59
-msgid "Italian"
-msgstr ""
-
-#: speak/voice.py:60
-msgid "Portugal"
-msgstr ""
-
-#: speak/voice.py:61
-msgid "German"
-msgstr ""
-
-#: speak/voice.py:62
-msgid "Whisper"
-msgstr ""
-
-#: speak/voice.py:63
-msgid "Croatian"
-msgstr ""
-
-#: speak/voice.py:64
-msgid "Czech"
-msgstr ""
-
-#: speak/voice.py:65
-msgid "Slovak"
-msgstr ""
-
-#: speak/voice.py:66
-msgid "Spanish"
-msgstr ""
-
-#: speak/voice.py:67
-msgid "Polish"
-msgstr ""
-
-#: speak/voice.py:68
-msgid "Esperanto"
-msgstr ""
diff --git a/po/tpi.po b/po/tpi.po
index 45b2728..133bb6e 100644
--- a/po/tpi.po
+++ b/po/tpi.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 0954071..0271aa8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: 2008-10-07 03:21-0400\n"
 "Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,98 +43,313 @@ msgstr ""
 msgid "Memorize"
 msgstr "Eşleştirme"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Oynat"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Oluştur"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Oyun adı"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Eşit çiftler"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "ekleme"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "harfler"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "sesler"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Yeni bir çift olarak ekle"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Seçilen çifti güncelle"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "Önizleme"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "Metin:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "Görüntü seç"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "Ses seç"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "Yeni oyun"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Oyun yükle"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "Oyunu kaydet"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "Oyun adı"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "Eşit çiftler"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Grup oyunu için tıkla"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "Eşleştirme oyunu seç"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Tekli oyun için tıkla"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "Oyun yükleniyor.."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Oyun demolarını yükle"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "ekleme"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "harfler"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "sesler"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Oyun demolarını yükle"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Oyunu yeniden başlat"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Açılan oyun"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "tamam"
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
+
+#~ msgid "New game"
+#~ msgstr "Yeni oyun"
+
+#~ msgid "Load game"
+#~ msgstr "Oyun yükle"
+
+#~ msgid "Save game"
+#~ msgstr "Oyunu kaydet"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Grup oyunu için tıkla"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Eşleştirme oyunu seç"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Tekli oyun için tıkla"
+
+#~ msgid "Choose image"
+#~ msgstr "Görüntü seç"
+
+#~ msgid "Choose audio"
+#~ msgstr "Ses seç"
diff --git a/po/tvl.po b/po/tvl.po
index 3ae9605..a45f697 100644
--- a/po/tvl.po
+++ b/po/tvl.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +48,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/tyv.po b/po/tyv.po
index 96aadf5..a49cfd3 100644
--- a/po/tyv.po
+++ b/po/tyv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,111 +20,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/tzm.po b/po/tzm.po
index 96aadf5..852cb90 100644
--- a/po/tzm.po
+++ b/po/tzm.po
@@ -2,129 +2,170 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-10-23 02:36+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: tzm\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
-msgstr ""
+msgstr "ⵣⴰⵢⴻⴷ"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr ""
+msgstr "ⴰⴹⵕⵉⵙ"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/tzo.po b/po/tzo.po
index 46a8a8b..2ce5710 100644
--- a/po/tzo.po
+++ b/po/tzo.po
@@ -2,12 +2,44 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:26+0000\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,246 +52,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/game.py:93
-msgid "Loading game..."
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "Receiving game"
+#: activity.py:69
+msgid "Create"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/messenger.py:192
-msgid "done"
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:51
-msgid "New game"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:61
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:73
-msgid "Load game"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:71
-msgid "Save game"
+#: activity.py:70
+msgid "letters"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:81
-msgid "Game name"
+#: activity.py:70
+msgid "sounds"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:85
-msgid "Equal pairs"
+#: activity.py:91 activity.py:216
+msgid "Edit game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:97
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:156
-msgid "Click for grouped game"
+#: activity.py:212
+msgid "Play game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:114
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createcardpanel.py:78
+msgid "Add as new pair"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createtoolbar.py:152
-msgid "Click for ungrouped game"
+#: createcardpanel.py:81
+msgid "Add"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:40
-msgid "Load demo games"
+#: createcardpanel.py:86
+msgid "Update selected pair"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:41
-msgid "addition"
+#: createcardpanel.py:89
+msgid "Update"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:42
-msgid "letters"
+#: createcardpanel.py:262
+msgid "Preview:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:43
-msgid "sounds"
+#: createcardpanel.py:278
+msgid "Text:"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/memorizetoolbar.py:63
-msgid "Restart Game"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:82
-msgid "Add as new pair"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:85
-msgid "Add"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:90
-msgid "Update selected pair"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:93
-msgid "Update"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:254
-msgid "Preview:"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:270
-msgid "Text:"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:282
-msgid "Insert picture"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:287
-msgid "Insert sound"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/createcardpanel.py:427
-msgid "Pronounce text while fliping tile"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:74
-msgid "Play"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/activity.py:78
-msgid "Create"
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
+msgstr ""
+
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr ""
+
+#: memorizetoolbar.py:82
+msgid "Restart Game"
+msgstr ""
+
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
+msgid "Receiving game"
+msgstr ""
+
+#: messenger.py:193
+msgid "done"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:36
+#: speak/voice.py:36
 msgid "Brazil"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:37
+#: speak/voice.py:37
 msgid "Swedish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:38
+#: speak/voice.py:38
 msgid "Icelandic"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:39
+#: speak/voice.py:39
 msgid "Romanian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:40
+#: speak/voice.py:40
 msgid "Swahili"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:41
+#: speak/voice.py:41
 msgid "Hindi"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:42
+#: speak/voice.py:42
 msgid "Dutch"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:43
+#: speak/voice.py:43
 msgid "Latin"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:44
+#: speak/voice.py:44
 msgid "Hungarian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:45
+#: speak/voice.py:45
 msgid "Macedonian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:46
+#: speak/voice.py:46
 msgid "Welsh"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:47
+#: speak/voice.py:47
 msgid "French"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:48
+#: speak/voice.py:48
 msgid "Norwegian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:49
+#: speak/voice.py:49
 msgid "Russian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:50
+#: speak/voice.py:50
 msgid "Afrikaans"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:51
+#: speak/voice.py:51
 msgid "Finnish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:52
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:125
+#: speak/voice.py:52 speak/voice.py:125
 msgid "Default"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:53
+#: speak/voice.py:53
 msgid "Cantonese"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:54
+#: speak/voice.py:54
 msgid "Scottish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:55
+#: speak/voice.py:55
 msgid "Greek"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:56
+#: speak/voice.py:56
 msgid "Vietnam"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:57
+#: speak/voice.py:57
 msgid "English"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:58
+#: speak/voice.py:58
 msgid "Lancashire"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:59
+#: speak/voice.py:59
 msgid "Italian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:60
+#: speak/voice.py:60
 msgid "Portugal"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:61
+#: speak/voice.py:61
 msgid "German"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:62
+#: speak/voice.py:62
 msgid "Whisper"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:63
+#: speak/voice.py:63
 msgid "Croatian"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:64
+#: speak/voice.py:64
 msgid "Czech"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:65
+#: speak/voice.py:65
 msgid "Slovak"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:66
+#: speak/voice.py:66
 msgid "Spanish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:67
+#: speak/voice.py:67
 msgid "Polish"
 msgstr ""
 
-#: /home/sugar/src/activities/memorize.activity/speak/voice.py:68
+#: speak/voice.py:68
 msgid "Esperanto"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 45b2728..133bb6e 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index c470f40..f508f22 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -18,12 +18,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,111 +40,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/ur.po b/po/ur.po
index 2fbefa1..271efb5 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -1,116 +1,376 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-07-08 05:35-0400\n"
-"Last-Translator: salman minhas <sulmanminhas@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-04-15 08:56+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "ذہن میں محفوظ کريں"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "کھيليں"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "بنائيں"
 
-#: createcardpanel.py:52
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "کھيل کا نام"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "برابر جوڑے"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "ا‍ضافہ کريں"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "خطوط"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "آوازيں"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "نئے جوڑے کا اضافہ کريں"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "منتخب کيے ہوئے جوڑے کو اپ ڈيٹ کريں"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "ديکھيں"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "متن:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "تصوير منتخب کريں"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "آڈيو منتخب کريں"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "نيا کھيل"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "کھيل چلائيں"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "کھيل محفوظ کريں"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "کھيل کا نام"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "برابر جوڑے"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "اکھٹے کھيلنے کے ليے کلک کريں"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "ياداشت کا کھيل منتخب کريں"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "گروپ ميں نہ کھيلنے کے ليۓ کلک کريں"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:105
+#: game.py:94
 msgid "Loading game..."
 msgstr "گيم لوڈ ہو رہی ہے۔۔۔"
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "نمونہ کھيل لوڈ کريں"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "ا‍ضافہ کريں"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "خطوط"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "آوازيں"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "نمونہ کھيل لوڈ کريں"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "کھيل دوبارہ شروع کريں"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+#, fuzzy
+msgid "Discard"
+msgstr "مسترد کریں"
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "کھيل حاصل کريں"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "مکمل"
 
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+#, fuzzy
+msgid "Swedish"
+msgstr "سویڈش (فن لینڈ)"
+
+#: speak/voice.py:38
+#, fuzzy
+msgid "Icelandic"
+msgstr "آئس لینڈی"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+#, fuzzy
+msgid "Swahili"
+msgstr "سواہلى"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+#, fuzzy
+msgid "Hungarian"
+msgstr "ہنگریائی"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+#, fuzzy
+msgid "Welsh"
+msgstr "ویلسی زبان"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+#, fuzzy
+msgid "Norwegian"
+msgstr "نارویجی"
+
+#: speak/voice.py:49
+#, fuzzy
+msgid "Russian"
+msgstr "روسی"
+
+#: speak/voice.py:50
+#, fuzzy
+msgid "Afrikaans"
+msgstr "افریقانی"
+
+#: speak/voice.py:51
+#, fuzzy
+msgid "Finnish"
+msgstr "فنی"
+
+#: speak/voice.py:52 speak/voice.py:125
+#, fuzzy
+msgid "Default"
+msgstr "طے شدہ"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+#, fuzzy
+msgid "Vietnam"
+msgstr "ویت نام"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+#, fuzzy
+msgid "Czech"
+msgstr "چیک"
+
+#: speak/voice.py:65
+#, fuzzy
+msgid "Slovak"
+msgstr "سلوواکی"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+#, fuzzy
+msgid "Esperanto"
+msgstr "اسپيرانتو "
+
+#~ msgid "New game"
+#~ msgstr "نيا کھيل"
+
+#~ msgid "Load game"
+#~ msgstr "کھيل چلائيں"
+
+#~ msgid "Save game"
+#~ msgstr "کھيل محفوظ کريں"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "اکھٹے کھيلنے کے ليے کلک کريں"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "ياداشت کا کھيل منتخب کريں"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "گروپ ميں نہ کھيلنے کے ليۓ کلک کريں"
+
+#~ msgid "Choose image"
+#~ msgstr "تصوير منتخب کريں"
+
+#~ msgid "Choose audio"
+#~ msgstr "آڈيو منتخب کريں"
+
 #~ msgid "capitals"
 #~ msgstr "کيپيٹل"
 
diff --git a/po/vi.po b/po/vi.po
index 81bd3b4..f3bbee8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,130 +6,197 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
-"PO-Revision-Date: 2010-03-07 16:48+0200\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2011-11-26 03:01+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "Ghi nhớ"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "Chơi"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "Tạo"
 
-#: createcardpanel.py:79
+#: activity.py:69
+#, fuzzy
+msgid "Game name:"
+msgstr "Tên lượt chơi"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "Cặp đều"
+
+#: activity.py:70
+#, fuzzy
+msgid "addition"
+msgstr "phép cộng"
+
+#: activity.py:70
+#, fuzzy
+msgid "letters"
+msgstr "chữ"
+
+#: activity.py:70
+#, fuzzy
+msgid "sounds"
+msgstr "âm"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "Thêm dạng cặp mới"
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr "Thêm"
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "Cập nhật cặp đã chọn"
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr "Cập nhật"
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
-msgstr "Xem thử : "
+msgstr "Xem thử :"
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
-msgstr "Văn bản: "
+msgstr "Văn bản:"
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr "Chèn ảnh"
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr "Chèn âm thanh"
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr "Phát âm chuỗi trong khi lật ngói"
 
-#: createtoolbar.py:51
-msgid "New game"
-msgstr "Lượt chơi mới"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "Nạp lượt chơi"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
-msgstr "Lưu lượt chơi"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
-msgstr "Tên lượt chơi"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
-msgstr "Cặp đều"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "Nhấn chuột để chơi trong nhóm"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
-msgstr "Chọn lượt chơi đã ghi nhớ"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "Nhấn chuột để chơi một mình"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr "Đang nạp lượt chơi..."
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "Nạp các lượt chơi minh họa"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+#, fuzzy
+msgid "Addition"
 msgstr "phép cộng"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+#, fuzzy
+msgid "Letters"
 msgstr "chữ"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+#, fuzzy
+msgid "Sounds"
 msgstr "âm"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "Nạp các lượt chơi minh họa"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "Chạy lại lượt chơi"
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "Đang nhận lươt chơi"
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr "hoàn tất"
 
@@ -265,6 +332,24 @@ msgstr "Ba Lan"
 msgid "Esperanto"
 msgstr "Ét-pe-ran-tô"
 
+#~ msgid "New game"
+#~ msgstr "Lượt chơi mới"
+
+#~ msgid "Load game"
+#~ msgstr "Nạp lượt chơi"
+
+#~ msgid "Save game"
+#~ msgstr "Lưu lượt chơi"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "Nhấn chuột để chơi trong nhóm"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "Chọn lượt chơi đã ghi nhớ"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "Nhấn chuột để chơi một mình"
+
 #~ msgid "Pronounce text while fliping tile"
 #~ msgstr "Phát âm văn bản trong khi lật gạch lát"
 
diff --git a/po/wa.po b/po/wa.po
index 45b2728..133bb6e 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -2,12 +2,40 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,98 +48,282 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:243
-msgid "Choose image"
+#: createcardpanel.py:290
+msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:263
-msgid "Choose audio"
+#: createcardpanel.py:295
+msgid "Insert sound"
 msgstr ""
 
-#: createtoolbar.py:53
-msgid "New game"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:73
-msgid "Save game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:83
-msgid "Game name"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr ""
+
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr ""
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr ""
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr ""
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr ""
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr ""
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr ""
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr ""
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr ""
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr ""
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr ""
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr ""
+
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr ""
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr ""
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr ""
diff --git a/po/yo.po b/po/yo.po
index 2a89254..06efb85 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -1,9 +1,13 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 16:33-0300\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,113 +16,286 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/game.py:103
-msgid "Loading game..."
+#: activity/activity.info:2
+msgid "Memorize"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:43
-msgid "Load demo games"
+#: activity.py:69
+msgid "Play"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:44
-msgid "addition"
+#: activity.py:69
+msgid "Create"
+msgstr ""
+
+#: activity.py:69
+msgid "Game name:"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:45
-msgid "capitals"
+#: activity.py:69
+msgid "Equal pairs"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:46
-msgid "drumgit"
+#: activity.py:70
+msgid "addition"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:47
+#: activity.py:70
 msgid "letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:48
-msgid "numbers"
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
+msgid "Add as new pair"
+msgstr ""
+
+#: createcardpanel.py:81
+msgid "Add"
+msgstr ""
+
+#: createcardpanel.py:86
+msgid "Update selected pair"
+msgstr ""
+
+#: createcardpanel.py:89
+msgid "Update"
+msgstr ""
+
+#: createcardpanel.py:262
+msgid "Preview:"
+msgstr ""
+
+#: createcardpanel.py:278
+msgid "Text:"
+msgstr ""
+
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr ""
+
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr ""
+
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr ""
+
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr ""
+
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr ""
+
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr ""
+
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr ""
+
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr ""
+
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr ""
+
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr ""
+
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr ""
+
+#: game.py:94
+msgid "Loading game..."
+msgstr ""
+
+#: memorizetoolbar.py:43
+msgid "Addition"
+msgstr ""
+
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:49
-msgid "phonemes"
+#: memorizetoolbar.py:45
+msgid "Sounds"
+msgstr ""
+
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:69
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:79
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:63
-msgid "Load game"
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/memorizetoolbar.py:123
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:116
-msgid "Choose memorize game"
+#: memorizetoolbar.py:107
+msgid "Discard"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/messenger.py:180
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:70
-msgid "Create"
+#: speak/voice.py:36
+msgid "Brazil"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/activity.py:74
-msgid "Play"
+#: speak/voice.py:37
+msgid "Swedish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:50
-msgid "Add as new pair"
+#: speak/voice.py:38
+msgid "Icelandic"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:58
-msgid "Update selected pair"
+#: speak/voice.py:39
+msgid "Romanian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:175
-msgid "Preview:"
+#: speak/voice.py:40
+msgid "Swahili"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:177
-msgid "Text:"
+#: speak/voice.py:41
+msgid "Hindi"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:238
-msgid "Choose image"
+#: speak/voice.py:42
+msgid "Dutch"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createcardpanel.py:258
-msgid "Choose audio"
+#: speak/voice.py:43
+msgid "Latin"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:53
-msgid "New game"
+#: speak/voice.py:44
+msgid "Hungarian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:73
-msgid "Save game"
+#: speak/voice.py:45
+msgid "Macedonian"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:83
-msgid "Game name"
+#: speak/voice.py:46
+msgid "Welsh"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:87
-msgid "Equal pairs"
+#: speak/voice.py:47
+msgid "French"
+msgstr ""
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr ""
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr ""
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr ""
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr ""
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr ""
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr ""
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr ""
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr ""
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr ""
+
+#: speak/voice.py:57
+msgid "English"
+msgstr ""
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr ""
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr ""
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr ""
+
+#: speak/voice.py:61
+msgid "German"
+msgstr ""
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr ""
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr ""
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr ""
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr ""
+
+#: speak/voice.py:66
+msgid "Spanish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:99
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:158
-msgid "Click for grouped game"
+#: speak/voice.py:67
+msgid "Polish"
 msgstr ""
 
-#: /home/msgodoi/olpc/workspace/Memorize.activity/createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: speak/voice.py:68
+msgid "Esperanto"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c026028..9f3403f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-17 00:32-0400\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,111 +28,151 @@ msgstr ""
 msgid "Memorize"
 msgstr ""
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr ""
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr ""
 
-#: createcardpanel.py:79
+#: activity.py:69
+msgid "Game name:"
+msgstr ""
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr ""
+
+#: activity.py:70
+msgid "addition"
+msgstr ""
+
+#: activity.py:70
+msgid "letters"
+msgstr ""
+
+#: activity.py:70
+msgid "sounds"
+msgstr ""
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr ""
+
+#: activity.py:212
+msgid "Play game"
+msgstr ""
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr ""
 
-#: createcardpanel.py:82
+#: createcardpanel.py:81
 msgid "Add"
 msgstr ""
 
-#: createcardpanel.py:87
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr ""
 
-#: createcardpanel.py:90
+#: createcardpanel.py:89
 msgid "Update"
 msgstr ""
 
-#: createcardpanel.py:255
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr ""
 
-#: createcardpanel.py:271
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr ""
 
-#: createcardpanel.py:283
+#: createcardpanel.py:290
 msgid "Insert picture"
 msgstr ""
 
-#: createcardpanel.py:288
+#: createcardpanel.py:295
 msgid "Insert sound"
 msgstr ""
 
-#: createcardpanel.py:434
+#: createcardpanel.py:433
 msgid "Pronounce text during tile flip"
 msgstr ""
 
-#: createtoolbar.py:51
-msgid "New game"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
 msgstr ""
 
-#: createtoolbar.py:61 memorizetoolbar.py:73
-msgid "Load game"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
 msgstr ""
 
-#: createtoolbar.py:71
-msgid "Save game"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
 msgstr ""
 
-#: createtoolbar.py:81
-msgid "Game name"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
 msgstr ""
 
-#: createtoolbar.py:85
-msgid "Equal pairs"
+#: createtoolbar.py:78
+msgid "Clear"
 msgstr ""
 
-#: createtoolbar.py:97 createtoolbar.py:158
-msgid "Click for grouped game"
+#: createtoolbar.py:80
+msgid "Do not clear"
 msgstr ""
 
-#: createtoolbar.py:114 memorizetoolbar.py:118
-msgid "Choose memorize game"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
 msgstr ""
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
 msgstr ""
 
-#: game.py:92
+#: game.py:94
 msgid "Loading game..."
 msgstr ""
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr ""
 
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr ""
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr ""
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:60
+msgid "Load demo games"
 msgstr ""
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr ""
 
-#: messenger.py:195
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr ""
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr ""
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr ""
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr ""
 
-#: messenger.py:196
+#: messenger.py:193
 msgid "done"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 209b3b3..ad620f1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,116 +1,354 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: Memorize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 22:31+0100\n"
-"PO-Revision-Date: 2008-03-07 22:22-0500\n"
-"Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 00:32-0500\n"
+"PO-Revision-Date: 2012-03-22 17:23+0200\n"
+"Last-Translator: Yuan <yuanchao@gmail.com>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Memorize"
 msgstr "記憶遊戲"
 
-#: activity.py:70
+#: activity.py:69
 msgid "Play"
 msgstr "遊玩"
 
-#: activity.py:74
+#: activity.py:69
 msgid "Create"
 msgstr "開始新遊戲"
 
-#: createcardpanel.py:52
+#: activity.py:69
+msgid "Game name:"
+msgstr "遊戲名稱:"
+
+#: activity.py:69
+msgid "Equal pairs"
+msgstr "等同配對"
+
+#: activity.py:70
+msgid "addition"
+msgstr "加法"
+
+#: activity.py:70
+msgid "letters"
+msgstr "字母"
+
+#: activity.py:70
+msgid "sounds"
+msgstr "聲音"
+
+#: activity.py:91 activity.py:216
+msgid "Edit game"
+msgstr "編輯遊戲"
+
+#: activity.py:212
+msgid "Play game"
+msgstr "進行遊戲"
+
+#: createcardpanel.py:78
 msgid "Add as new pair"
 msgstr "增加新配對"
 
-#: createcardpanel.py:60
+#: createcardpanel.py:81
+msgid "Add"
+msgstr "新增"
+
+#: createcardpanel.py:86
 msgid "Update selected pair"
 msgstr "更新選取的配對"
 
-#: createcardpanel.py:180
+#: createcardpanel.py:89
+msgid "Update"
+msgstr "更新"
+
+#: createcardpanel.py:262
 msgid "Preview:"
 msgstr "預覽:"
 
-#: createcardpanel.py:182
+#: createcardpanel.py:278
 msgid "Text:"
 msgstr "文字:"
 
-#: createcardpanel.py:243
-msgid "Choose image"
-msgstr "選擇圖片"
+#: createcardpanel.py:290
+msgid "Insert picture"
+msgstr "插入圖案"
 
-#: createcardpanel.py:263
-msgid "Choose audio"
-msgstr "選擇音效"
+#: createcardpanel.py:295
+msgid "Insert sound"
+msgstr "插入音效"
 
-#: createtoolbar.py:53
-msgid "New game"
-msgstr "新遊戲"
+#: createcardpanel.py:433
+msgid "Pronounce text during tile flip"
+msgstr "翻動卡片時唸出文字"
 
-#: createtoolbar.py:63 memorizetoolbar.py:73
-msgid "Load game"
-msgstr "載入遊戲"
+#: createtoolbar.py:46 createtoolbar.py:106
+msgid "Match different tiles"
+msgstr "配對不同的牌"
 
-#: createtoolbar.py:73
-msgid "Save game"
-msgstr "儲存遊戲"
+#: createtoolbar.py:51 createtoolbar.py:119
+msgid "Mixed tiles game"
+msgstr "混合牌遊戲"
 
-#: createtoolbar.py:83
-msgid "Game name"
-msgstr "遊戲名稱"
+#: createtoolbar.py:56
+msgid "Clear all tiles"
+msgstr "清除所有的牌"
 
-#: createtoolbar.py:87
-msgid "Equal pairs"
-msgstr "等同配對"
+#: createtoolbar.py:76
+msgid "Clear all the tiles from the game?"
+msgstr "確定要清除所有的遊戲牌？"
 
-#: createtoolbar.py:99 createtoolbar.py:158
-msgid "Click for grouped game"
-msgstr "點選團體遊戲"
+#: createtoolbar.py:78
+msgid "Clear"
+msgstr "清除"
 
-#: createtoolbar.py:116 memorizetoolbar.py:117
-msgid "Choose memorize game"
-msgstr "選擇記憶遊戲"
+#: createtoolbar.py:80
+msgid "Do not clear"
+msgstr "不要清除"
 
-#: createtoolbar.py:154
-msgid "Click for ungrouped game"
-msgstr "點選單人遊戲"
+#: createtoolbar.py:102
+msgid "Match identical tiles"
+msgstr "配對相同的牌"
 
-#: game.py:105
+#: createtoolbar.py:115
+msgid "Grouped tiles game"
+msgstr "歸類牌遊戲"
+
+#: game.py:94
 msgid "Loading game..."
 msgstr "遊戲載入中…"
 
-#: memorizetoolbar.py:40
-msgid "Load demo games"
-msgstr "載入範例遊戲"
-
-#: memorizetoolbar.py:41
-msgid "addition"
+#: memorizetoolbar.py:43
+msgid "Addition"
 msgstr "加法"
 
-#: memorizetoolbar.py:42
-msgid "letters"
+#: memorizetoolbar.py:44
+msgid "Letters"
 msgstr "字母"
 
-#: memorizetoolbar.py:43
-msgid "sounds"
+#: memorizetoolbar.py:45
+msgid "Sounds"
 msgstr "聲音"
 
-#: memorizetoolbar.py:63
+#: memorizetoolbar.py:60
+msgid "Load demo games"
+msgstr "載入範例遊戲"
+
+#: memorizetoolbar.py:82
 msgid "Restart Game"
 msgstr "重新開始"
 
-#: messenger.py:183
+#: memorizetoolbar.py:105
+msgid "Discard your modified game?"
+msgstr "捨棄編輯過的遊戲嗎？"
+
+#: memorizetoolbar.py:107
+msgid "Discard"
+msgstr "捨棄"
+
+#: memorizetoolbar.py:109
+msgid "Do not discard"
+msgstr "不要捨棄"
+
+#: messenger.py:192
 msgid "Receiving game"
 msgstr "遊戲接收中"
 
-#: messenger.py:183
+#: messenger.py:193
 msgid "done"
 msgstr "完成"
 
+#: speak/voice.py:36
+msgid "Brazil"
+msgstr "巴西"
+
+#: speak/voice.py:37
+msgid "Swedish"
+msgstr "瑞典語"
+
+#: speak/voice.py:38
+msgid "Icelandic"
+msgstr "冰島語"
+
+#: speak/voice.py:39
+msgid "Romanian"
+msgstr "羅馬尼亞語"
+
+#: speak/voice.py:40
+msgid "Swahili"
+msgstr "史瓦西里語"
+
+#: speak/voice.py:41
+msgid "Hindi"
+msgstr "印地語(北印度)"
+
+#: speak/voice.py:42
+msgid "Dutch"
+msgstr "荷蘭語"
+
+#: speak/voice.py:43
+msgid "Latin"
+msgstr "拉丁語"
+
+#: speak/voice.py:44
+msgid "Hungarian"
+msgstr "匈牙利語"
+
+#: speak/voice.py:45
+msgid "Macedonian"
+msgstr "馬其頓語"
+
+#: speak/voice.py:46
+msgid "Welsh"
+msgstr "威爾斯語"
+
+#: speak/voice.py:47
+msgid "French"
+msgstr "法語"
+
+#: speak/voice.py:48
+msgid "Norwegian"
+msgstr "新挪威語"
+
+#: speak/voice.py:49
+msgid "Russian"
+msgstr "俄語"
+
+#: speak/voice.py:50
+msgid "Afrikaans"
+msgstr "南非語"
+
+#: speak/voice.py:51
+msgid "Finnish"
+msgstr "芬蘭語"
+
+#: speak/voice.py:52 speak/voice.py:125
+msgid "Default"
+msgstr "預設"
+
+#: speak/voice.py:53
+msgid "Cantonese"
+msgstr "粵語"
+
+#: speak/voice.py:54
+msgid "Scottish"
+msgstr "蘇格蘭語"
+
+#: speak/voice.py:55
+msgid "Greek"
+msgstr "現代希臘語"
+
+#: speak/voice.py:56
+msgid "Vietnam"
+msgstr "越南語"
+
+#: speak/voice.py:57
+msgid "English"
+msgstr "英語"
+
+#: speak/voice.py:58
+msgid "Lancashire"
+msgstr "蘭開郡語"
+
+#: speak/voice.py:59
+msgid "Italian"
+msgstr "義大利語"
+
+#: speak/voice.py:60
+msgid "Portugal"
+msgstr "葡萄牙語"
+
+#: speak/voice.py:61
+msgid "German"
+msgstr "德語"
+
+#: speak/voice.py:62
+msgid "Whisper"
+msgstr "竊竊私語"
+
+#: speak/voice.py:63
+msgid "Croatian"
+msgstr "克羅埃西亞語"
+
+#: speak/voice.py:64
+msgid "Czech"
+msgstr "捷克語"
+
+#: speak/voice.py:65
+msgid "Slovak"
+msgstr "斯洛伐克語"
+
+#: speak/voice.py:66
+msgid "Spanish"
+msgstr "西班牙語"
+
+#: speak/voice.py:67
+msgid "Polish"
+msgstr "波蘭語"
+
+#: speak/voice.py:68
+msgid "Esperanto"
+msgstr "世界語"
+
+#~ msgid "New game"
+#~ msgstr "新遊戲"
+
+#~ msgid "Load game"
+#~ msgstr "載入遊戲"
+
+#~ msgid "Save game"
+#~ msgstr "儲存遊戲"
+
+#~ msgid "Click for grouped game"
+#~ msgstr "點選團體遊戲"
+
+#~ msgid "Choose memorize game"
+#~ msgstr "選擇記憶遊戲"
+
+#~ msgid "Click for ungrouped game"
+#~ msgstr "點選單人遊戲"
+
+#~ msgid "Choose image"
+#~ msgstr "選擇圖片"
+
+#~ msgid "Choose audio"
+#~ msgstr "選擇音效"
+
 #~ msgid "capitals"
 #~ msgstr "大寫字母"