From 213e6775ed3e4682337064724aeb73c92c8036ae Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 25 Feb 2010 21:26:34 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:joke-machine-branch/mainline

---
(limited to 'po')

diff --git a/po/ar.po b/po/ar.po
index 40382ff..bdd18f0 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,306 +1,289 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (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
+# Khaled Hosny <khaledhosny@eglug.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\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: 2009-04-09 17:16+0000\n"
+"PO-Revision-Date: 2010-02-19 18:12+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"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
-
-#: activity/activity.info:2 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+"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"
+"X-Poedit-Language: Arabic\n"
+
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
-msgstr ""
+msgstr "آلة النكات"
 
-#: JokeMachineActivity.py:128
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
-msgstr ""
+msgstr "انتظر قليلا حتى يظهر كتاب كتاب نكات صديقك"
 
-#: gui/frame.py:121 gui/frame.py:208
-msgid "Lesson Plans"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "بدأه"
 
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "افتح"
 
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "سؤال"
 
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "جواب"
 
-#: gui/frame.py:216
-msgid "Lesson Plans:"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr "إرسال لـ:"
 
-#: gui/page.py:99
-msgid "Click to choose a sound"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "اسمك:"
 
-#: gui/page.py:294
-msgid "Choose image"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "أرسل"
 
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "إلى الخلف"
 
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "نكتة"
 
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "من"
 
-#: i18n.py:42
-msgid "Czech"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "كتاب النكات هذا فارغة"
 
-#: i18n.py:43
-msgid "Danish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "أرسل نكتة"
 
-#: i18n.py:44
-msgid "Dutch"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "أضف نكات"
 
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "التالي"
 
-#: i18n.py:46
-msgid "English"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr "اختر كتاب نكات للقراءة:"
 
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr "أمتأكّدٌ أنّك تريد حذف "
 
-#: i18n.py:48
-msgid "English - U.S."
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr "كتاب نكاتك؟"
 
-#: i18n.py:49
-msgid "Finnish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr "حرّر"
 
-#: i18n.py:50
-msgid "French"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr "احذف"
 
-#: i18n.py:51
-msgid "German"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr "حرر غلاف كتاب النكات"
 
-#: i18n.py:52
-msgid "Hungarian"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr "حرر نكاتي"
 
-#: i18n.py:53
-msgid "Italian"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr "راجع النكات المرسلة"
 
-#: i18n.py:54
-msgid "Japanese"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr "معاينة"
 
-#: i18n.py:55
-msgid "Korean"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr "عنوان كتاب النكات:"
 
-#: i18n.py:56
-msgid "Norwegian"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr "مؤثر الصوت:"
 
-#: i18n.py:57
-msgid "Polish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr "أضف نكتة جديدة"
 
-#: i18n.py:58
-msgid "Portuguese"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr "أمتأكد أنك ترغب في حذف هذه النكتة؟"
 
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr "أرفض"
 
-#: i18n.py:60
-msgid "Russian"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr "أقبل"
 
-#: i18n.py:61
-msgid "Slovak"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr " أرسل نكتة إلى"
 
-#: i18n.py:62
-msgid "Spanish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr " قبل النكتة المرسلة إلى"
 
-#: i18n.py:63
-msgid "Swedish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " من"
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "أنقر لاختيار صوت"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "اختر صورة"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "اختر صوتا"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "جدول الدروس"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "اقرأ كتب النكات"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr "اصنع نكتة"
 
-#: mesh/activitysession.py:164
-msgid " submitted a joke to "
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "أغلق الدروس"
 
-#: mesh/activitysession.py:203
-msgid " accepted a joke submitted to "
-msgstr ""
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "جدول الدروس:"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr ""
+#~ msgid "Chinese (simplified)"
+#~ msgstr "صينية(مبسطة)"
 
-#: pages/choose.py:42
-msgid "Choose a Jokebook to read:"
-msgstr ""
+#~ msgid "Chinese (traditional)"
+#~ msgstr "صينية(تقليدية)"
 
-#: pages/choose.py:65
-msgid "Are you sure you want to delete your "
-msgstr ""
+#~ msgid "Czech"
+#~ msgstr "تشيكية"
 
-#: pages/choose.py:68
-msgid "jokebook ?"
-msgstr ""
+#~ msgid "Danish"
+#~ msgstr "دنماركية"
 
-#: pages/choose.py:110 pages/preview.py:62
-msgid "Edit"
-msgstr ""
+#~ msgid "Dutch"
+#~ msgstr "هولندية"
 
-#: pages/choose.py:114 pages/edit.py:178
-msgid "Delete"
-msgstr ""
+#~ msgid "Afrikaans"
+#~ msgstr "افريقية"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr ""
+#~ msgid "English"
+#~ msgstr "إنجليزية"
 
-#: pages/cover.py:49
-msgid "Open"
-msgstr ""
+#~ msgid "English - Great Britain"
+#~ msgstr "إنجليزية-بريطانية"
 
-#: pages/edit.py:57
-msgid "Edit Jokebook Cover"
-msgstr ""
+#~ msgid "English - U.S."
+#~ msgstr "إنجليزية-أمريكية"
 
-#: pages/edit.py:67
-msgid "Edit My Jokes"
-msgstr ""
+#~ msgid "Finnish"
+#~ msgstr "فنلندية"
 
-#: pages/edit.py:77
-msgid "Review Submitted Jokes"
-msgstr ""
+#~ msgid "French"
+#~ msgstr "فرنسية"
 
-#: pages/edit.py:123
-msgid "Preview"
-msgstr ""
+#~ msgid "German"
+#~ msgstr "ألمانية"
 
-#: pages/edit.py:149
-msgid "Title of Jokebook:"
-msgstr ""
+#~ msgid "Hungarian"
+#~ msgstr "هنغارية"
 
-#: pages/edit.py:153
-msgid "Sound Effect:"
-msgstr ""
+#~ msgid "Italian"
+#~ msgstr "ايطالية"
 
-#: pages/edit.py:190
-msgid "Add New Joke"
-msgstr ""
+#~ msgid "Japanese"
+#~ msgstr "يابانية"
 
-#: pages/edit.py:201
-msgid "Are you sure you want to delete this joke ?"
-msgstr ""
+#~ msgid "Korean"
+#~ msgstr "كورية"
 
-#: pages/edit.py:242
-msgid "Reject"
-msgstr ""
+#~ msgid "Norwegian"
+#~ msgstr "نورفيجية"
 
-#: pages/edit.py:249
-msgid "Accept"
-msgstr ""
+#~ msgid "Polish"
+#~ msgstr "بولندية"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr ""
+#~ msgid "Portuguese"
+#~ msgstr "برتغالية"
 
-#: pages/joke.py:60
-msgid "By"
-msgstr ""
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "برتغالية-برازيلية"
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr ""
+#~ msgid "Russian"
+#~ msgstr "روسية"
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr ""
+#~ msgid "Slovak"
+#~ msgstr "سلافية"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr ""
+#~ msgid "Spanish"
+#~ msgstr "إسبانية"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr ""
+#~ msgid "Swedish"
+#~ msgstr "سويدية"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr ""
+#~ msgid "Turkish"
+#~ msgstr "تركية"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr ""
+#~ msgid "Lesson 1"
+#~ msgstr "درس 1"
 
-#: pages/submit.py:93
-msgid "Submission For:"
-msgstr ""
+#~ msgid "Lesson 2"
+#~ msgstr "درس 2"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr ""
+#~ msgid "Lesson 3"
+#~ msgstr "درس 3"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr ""
+#~ msgid "Lesson 4"
+#~ msgstr "درس 4"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr ""
+#~ msgid "Introduction"
+#~ msgstr "تقديم"
diff --git a/po/de.po b/po/de.po
index 1f7de92..1bd6cd6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,307 +6,294 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\n"
-"PO-Revision-Date: 2008-09-19 09:43-0400\n"
-"Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
+"POT-Creation-Date: 2009-04-09 17:16+0000\n"
+"PO-Revision-Date: 2008-10-08 14:15-0400\n"
+"Last-Translator: Dr. Oliver Thiel <thiel.oliver@nexgo.de>\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: Pootle 1.1.0rc2\n"
 
-#: activity/activity.info:2 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
 msgstr "Witz-Maschine"
 
-#: JokeMachineActivity.py:128
+# O.T.
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#, fuzzy
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
 msgstr ""
-"Bitte warte einen Moment, bis die Witzbücher deines Kumpels angezeigt werden"
+"Bitte warte einen Moment, bis die Witzbücher deines Spielkameraden angezeigt "
+"werden"
 
-#: gui/frame.py:121 gui/frame.py:208
-msgid "Lesson Plans"
-msgstr "Übungspläne"
-
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr "Lese Witzbücher"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "begonnen von"
 
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr "Stelle ein Witzbuch her"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "Öffnen"
 
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr "Schließe Übungen"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "Frage"
 
-#: gui/frame.py:216
-msgid "Lesson Plans:"
-msgstr "Übungspläne:"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "Antwort"
 
-# (Markus S.) war 'Klicke, um einen Klang auszuwählen'; analog zu den anderen Strings auch hier lieber Infinitiv, oder ist das eine Hilfeblase?
-#: gui/page.py:99
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
 #, fuzzy
-msgid "Click to choose a sound"
-msgstr "Klicken, um einen Klang auszuwählen"
-
-#: gui/page.py:294
-msgid "Choose image"
-msgstr "Bild auswählen"
-
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr "Klang auswählen"
-
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr "Chinesisch (vereinfacht)"
-
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr "Chinesisch (traditionell)"
-
-#: i18n.py:42
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: i18n.py:43
-msgid "Danish"
-msgstr "Dänisch"
-
-#: i18n.py:44
-msgid "Dutch"
-msgstr "Niederländisch"
-
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr "Afrikaans"
-
-#: i18n.py:46
-msgid "English"
-msgstr "Englisch"
-
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr "Englisch (Großbritannien)"
-
-#: i18n.py:48
-msgid "English - U.S."
-msgstr "Englisch (USA)"
-
-#: i18n.py:49
-msgid "Finnish"
-msgstr "Finnisch"
-
-#: i18n.py:50
-msgid "French"
-msgstr "Französisch"
-
-#: i18n.py:51
-msgid "German"
-msgstr "Deutsch"
-
-#: i18n.py:52
-msgid "Hungarian"
-msgstr "Ungarisch"
-
-#: i18n.py:53
-msgid "Italian"
-msgstr "Italienisch"
-
-#: i18n.py:54
-msgid "Japanese"
-msgstr "Japanisch"
-
-#: i18n.py:55
-msgid "Korean"
-msgstr "Koreanisch"
-
-#: i18n.py:56
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: i18n.py:57
-msgid "Polish"
-msgstr "Polnisch"
-
-#: i18n.py:58
-msgid "Portuguese"
-msgstr "Portugiesisch"
-
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr "Portugiesisch (Brasilien)"
-
-#: i18n.py:60
-msgid "Russian"
-msgstr "Russisch"
-
-#: i18n.py:61
-msgid "Slovak"
-msgstr "Slowakisch"
-
-#: i18n.py:62
-msgid "Spanish"
-msgstr "Spanisch"
-
-#: i18n.py:63
-msgid "Swedish"
-msgstr "Schwedisch"
+msgid "Submission For:"
+msgstr "Abgabe für:"
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr "Türkisch"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "Dein Name:"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr "Übung 1"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "Abgeben"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr "Übung 2"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "Zurück"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr "Übung 3"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "Witz"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr "Übung 4"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "Von"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr "Einführung"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "Dieses Witzbuch ist leer"
 
-#: mesh/activitysession.py:164
-#, fuzzy
-msgid " submitted a joke to "
-msgstr " hat einen Witz geschickt an "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "Einen Witz abgeben"
 
-#: mesh/activitysession.py:203
-#, fuzzy
-msgid " accepted a joke submitted to "
-msgstr " hat einen Witz angenommen, der geschickt wurde an "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "Witze anfügen"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr " von "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "Nächster"
 
-#: pages/choose.py:42
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
 msgid "Choose a Jokebook to read:"
 msgstr "Ein Witzbuch zum Lesen auswählen:"
 
-#: pages/choose.py:65
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
 #, fuzzy
 msgid "Are you sure you want to delete your "
 msgstr "Bist du sicher, dass du es löschen willst, dein "
 
-#: pages/choose.py:68
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
 msgid "jokebook ?"
 msgstr "Witzbuch?"
 
-#: pages/choose.py:110 pages/preview.py:62
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: pages/choose.py:114 pages/edit.py:178
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
 msgid "Delete"
 msgstr "Löschen"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr "begonnen von"
-
-#: pages/cover.py:49
-msgid "Open"
-msgstr "Öffnen"
-
-#: pages/edit.py:57
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
 msgid "Edit Jokebook Cover"
 msgstr "Witzbuch-Einband bearbeiten"
 
-#: pages/edit.py:67
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
 msgid "Edit My Jokes"
 msgstr "Meine Witze bearbeiten"
 
-#: pages/edit.py:77
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
 msgid "Review Submitted Jokes"
 msgstr "Abgegebene Witze durchsehen"
 
-#: pages/edit.py:123
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
 msgid "Preview"
 msgstr "Vorschau"
 
-#: pages/edit.py:149
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
 msgid "Title of Jokebook:"
 msgstr "Titel des Witzbuches:"
 
-#: pages/edit.py:153
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
 msgid "Sound Effect:"
 msgstr "Klangeffekt:"
 
-#: pages/edit.py:190
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
 msgid "Add New Joke"
 msgstr "Neuen Witz anfügen"
 
-#: pages/edit.py:201
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
 msgid "Are you sure you want to delete this joke ?"
 msgstr "Möchtest du diesen Witz wirklich löschen?"
 
-#: pages/edit.py:242
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: pages/edit.py:249
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
 msgid "Accept"
 msgstr "Annehmen"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr "Witz"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+#, fuzzy
+msgid " submitted a joke to "
+msgstr " hat einen Witz geschickt an "
 
-#: pages/joke.py:60
-msgid "By"
-msgstr "Von"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+#, fuzzy
+msgid " accepted a joke submitted to "
+msgstr " hat einen Witz angenommen, der geschickt wurde an "
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr "Frage"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " von "
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr "Antwort"
+# (Markus S.) war 'Klicke, um einen Klang auszuwählen'; analog zu den anderen Strings auch hier lieber Infinitiv, oder ist das eine Hilfeblase?
+# O.T.: Infinitiv ist korrekt.
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "Klicken, um einen Klang auszuwählen"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr "Dieses Witzbuch ist leer"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "Bild auswählen"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr "Einen Witz abgeben"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "Klang auswählen"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr "Witze anfügen"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "Übungspläne"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr "Nächster"
+# O.T.
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "Witzbücher lesen"
 
-#: pages/submit.py:93
+# O.T.: oder 'herstellen'?
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
 #, fuzzy
-msgid "Submission For:"
-msgstr "Abgabe für:"
+msgid "Make Jokebook"
+msgstr "Witzbuch anlegen"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr "Dein Name:"
+# O.T.
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "Übungen schließen"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr "Abgeben"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "Übungspläne:"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr "Zurück"
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Chinesisch (vereinfacht)"
+
+#~ msgid "Chinese (traditional)"
+#~ msgstr "Chinesisch (traditionell)"
+
+#~ msgid "Czech"
+#~ msgstr "Tschechisch"
+
+#~ msgid "Danish"
+#~ msgstr "Dänisch"
+
+#~ msgid "Dutch"
+#~ msgstr "Niederländisch"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Afrikaans"
+
+#~ msgid "English"
+#~ msgstr "Englisch"
+
+#~ msgid "English - Great Britain"
+#~ msgstr "Englisch (Großbritannien)"
+
+#~ msgid "English - U.S."
+#~ msgstr "Englisch (USA)"
+
+#~ msgid "Finnish"
+#~ msgstr "Finnisch"
+
+#~ msgid "French"
+#~ msgstr "Französisch"
+
+#~ msgid "German"
+#~ msgstr "Deutsch"
+
+#~ msgid "Hungarian"
+#~ msgstr "Ungarisch"
+
+#~ msgid "Italian"
+#~ msgstr "Italienisch"
+
+#~ msgid "Japanese"
+#~ msgstr "Japanisch"
+
+#~ msgid "Korean"
+#~ msgstr "Koreanisch"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norwegisch"
+
+#~ msgid "Polish"
+#~ msgstr "Polnisch"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugiesisch"
+
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "Portugiesisch (Brasilien)"
+
+#~ msgid "Russian"
+#~ msgstr "Russisch"
+
+#~ msgid "Slovak"
+#~ msgstr "Slowakisch"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanisch"
+
+#~ msgid "Swedish"
+#~ msgstr "Schwedisch"
+
+#~ msgid "Turkish"
+#~ msgstr "Türkisch"
+
+#~ msgid "Lesson 1"
+#~ msgstr "Übung 1"
+
+#~ msgid "Lesson 2"
+#~ msgstr "Übung 2"
+
+#~ msgid "Lesson 3"
+#~ msgstr "Übung 3"
+
+#~ msgid "Lesson 4"
+#~ msgstr "Übung 4"
+
+#~ msgid "Introduction"
+#~ msgstr "Einführung"
diff --git a/po/es.po b/po/es.po
index e549a6b..61cd211 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,304 +6,283 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\n"
-"PO-Revision-Date: 2008-11-23 13:20-0500\n"
-"Last-Translator: Gabriel Caro <gecaro@gmail.com>\n"
+"POT-Creation-Date: 2009-04-09 17:16+0000\n"
+"PO-Revision-Date: 2009-07-29 01:12-0400\n"
+"Last-Translator: Victor Alfonso Parada Suarez <deathvaps@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\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 1.2.1\n"
 
-#: activity/activity.info:2 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
 msgstr "Joke Machine"
 
-#: JokeMachineActivity.py:128
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
 msgstr "Por favor espere un momento por su amigo de chistes"
 
-#: gui/frame.py:121 gui/frame.py:208
-#, fuzzy
-msgid "Lesson Plans"
-msgstr "Planes de la Lección:"
-
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr "Leer Libros de chistes"
-
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr "Crear Libro de Chistes"
-
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr "Cerrar Lecciones"
-
-#: gui/frame.py:216
-#, fuzzy
-msgid "Lesson Plans:"
-msgstr "Planes de la Lección:"
-
-#: gui/page.py:99
-msgid "Click to choose a sound"
-msgstr "Haz click para elegir un sonido"
-
-#: gui/page.py:294
-msgid "Choose image"
-msgstr "Escoge una imagen"
-
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr "Escoge un Sonido"
-
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr "Chino (simplificado)"
-
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr "Chino (tradicional)"
-
-#: i18n.py:42
-msgid "Czech"
-msgstr "Checo"
-
-#: i18n.py:43
-msgid "Danish"
-msgstr "Danés"
-
-#: i18n.py:44
-msgid "Dutch"
-msgstr "Holandés"
-
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr "Africano"
-
-#: i18n.py:46
-msgid "English"
-msgstr "Inglés"
-
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr "Inglés - Gran Bretaña"
-
-#: i18n.py:48
-msgid "English - U.S."
-msgstr "Inglés - Estados Unidos"
-
-#: i18n.py:49
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: i18n.py:50
-msgid "French"
-msgstr "Francés"
-
-#: i18n.py:51
-msgid "German"
-msgstr "Alemán"
-
-#: i18n.py:52
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: i18n.py:53
-msgid "Italian"
-msgstr "Italiano"
-
-#: i18n.py:54
-msgid "Japanese"
-msgstr "Japonés"
-
-#: i18n.py:55
-msgid "Korean"
-msgstr "Koreano"
-
-#: i18n.py:56
-msgid "Norwegian"
-msgstr "Noruego"
-
-#: i18n.py:57
-msgid "Polish"
-msgstr "Polaco"
-
-#: i18n.py:58
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr "Portugués - Brasil"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "comenzado por"
 
-#: i18n.py:60
-msgid "Russian"
-msgstr "Ruso"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "Abrir"
 
-#: i18n.py:61
-msgid "Slovak"
-msgstr "Eslovaco"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "Pregunta"
 
-#: i18n.py:62
-msgid "Spanish"
-msgstr "Español"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "Respuesta"
 
-#: i18n.py:63
-msgid "Swedish"
-msgstr "Sueco"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr "Sumisión Para:"
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr "Turco"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "Tu Nombre:"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr "Lección 1"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "Someter"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr "Lección 2"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "Atrás"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr "Lección 3"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "Chiste"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr "Lección 4"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "Por"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr "Introducción"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "Este Libro de Chistes esta vacío"
 
-#: mesh/activitysession.py:164
-msgid " submitted a joke to "
-msgstr "_sometió un chiste a_"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "Añadir un Chiste"
 
-#: mesh/activitysession.py:203
-msgid " accepted a joke submitted to "
-msgstr "_aceptó un chiste sometido a_"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "Añadir Chistes"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr "_por_"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "Siguiente"
 
-#: pages/choose.py:42
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
 msgid "Choose a Jokebook to read:"
 msgstr "Elegir un Libro de Chistes a leer:"
 
-#: pages/choose.py:65
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
 msgid "Are you sure you want to delete your "
-msgstr "Esta seguro(a) que quiere borrar su_"
+msgstr "Esta seguro(a) que quiere borrar su "
 
-#: pages/choose.py:68
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
 msgid "jokebook ?"
 msgstr "libro de chistes?"
 
-#: pages/choose.py:110 pages/preview.py:62
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
 msgid "Edit"
 msgstr "Editar"
 
-#: pages/choose.py:114 pages/edit.py:178
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
 msgid "Delete"
 msgstr "Borrar"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr "comenzado por"
-
-#: pages/cover.py:49
-msgid "Open"
-msgstr "Abrir"
-
-#: pages/edit.py:57
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
 msgid "Edit Jokebook Cover"
 msgstr "Editar portada de Libro de Chistes"
 
-#: pages/edit.py:67
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
 msgid "Edit My Jokes"
 msgstr "Editar mis chistes"
 
-#: pages/edit.py:77
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
 msgid "Review Submitted Jokes"
 msgstr "Revisar Chistes Suministrados"
 
 # This is a hard one. "Preestreno" or "Anticipo" could both fit the bill.
-#: pages/edit.py:123
-#, fuzzy
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
 msgid "Preview"
-msgstr "Preestreno"
+msgstr "Vista Previa"
 
-#: pages/edit.py:149
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
 msgid "Title of Jokebook:"
 msgstr "Título de Libro de Chistes"
 
-#: pages/edit.py:153
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
 msgid "Sound Effect:"
 msgstr "Effecto de Sonido:"
 
-#: pages/edit.py:190
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
 msgid "Add New Joke"
 msgstr "Añadir Chiste Nuevo"
 
-#: pages/edit.py:201
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
 msgid "Are you sure you want to delete this joke ?"
 msgstr "¿Esta seguro(a) que quiere borrar este chiste?"
 
-#: pages/edit.py:242
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
 msgid "Reject"
 msgstr "Rechazar"
 
-#: pages/edit.py:249
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
 msgid "Accept"
 msgstr "Aceptar"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr "Chiste"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr " presentando un chiste a "
 
-#: pages/joke.py:60
-msgid "By"
-msgstr "Por"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr " aceptó un chiste presentado a "
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr "Pregunta"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " por "
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr "Respuesta"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "Haz click para elegir un sonido"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr "Este Libro de Chistes esta vacío"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "Escoge una imagen"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr "Añadir un Chiste"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "Escoge un Sonido"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr "Añadir Chistes"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "Lecciones"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr "Siguiente"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "Leer Libros de chistes"
 
-#: pages/submit.py:93
-msgid "Submission For:"
-msgstr "Sumisión Para:"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr "Crear Libro de Chistes"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr "Tu Nombre:"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "Cerrar Lecciones"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr "Someter"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "Lecciones:"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr "Atrás"
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Chino (simplificado)"
+
+#~ msgid "Chinese (traditional)"
+#~ msgstr "Chino (tradicional)"
+
+#~ msgid "Czech"
+#~ msgstr "Checo"
+
+#~ msgid "Danish"
+#~ msgstr "Danés"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Africano"
+
+#~ msgid "English"
+#~ msgstr "Inglés"
+
+#~ msgid "English - Great Britain"
+#~ msgstr "Inglés - Gran Bretaña"
+
+#~ msgid "English - U.S."
+#~ msgstr "Inglés - Estados Unidos"
+
+#~ msgid "Finnish"
+#~ msgstr "Finlandés"
+
+#~ msgid "French"
+#~ msgstr "Francés"
+
+#~ msgid "German"
+#~ msgstr "Alemán"
+
+#~ msgid "Hungarian"
+#~ msgstr "Húngaro"
+
+#~ msgid "Italian"
+#~ msgstr "Italiano"
+
+#~ msgid "Japanese"
+#~ msgstr "Japonés"
+
+#~ msgid "Korean"
+#~ msgstr "Koreano"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noruego"
+
+#~ msgid "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
+
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "Portugués - Brasil"
+
+#~ msgid "Russian"
+#~ msgstr "Ruso"
+
+#~ msgid "Slovak"
+#~ msgstr "Eslovaco"
+
+#~ msgid "Spanish"
+#~ msgstr "Español"
+
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
+
+#~ msgid "Turkish"
+#~ msgstr "Turco"
+
+#~ msgid "Lesson 1"
+#~ msgstr "Lección 1"
+
+#~ msgid "Lesson 2"
+#~ msgstr "Lección 2"
+
+#~ msgid "Lesson 3"
+#~ msgstr "Lección 3"
+
+#~ msgid "Lesson 4"
+#~ msgstr "Lección 4"
+
+#~ msgid "Introduction"
+#~ msgstr "Introducción"
diff --git a/po/fil.po b/po/fil.po
new file mode 100644
index 0000000..88a5f07
--- /dev/null
+++ b/po/fil.po
@@ -0,0 +1,196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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-04-09 17:16+0000\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.3.0\n"
+
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
+msgid "Joke Machine"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4cbb90b..03775c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,302 +6,284 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\n"
-"PO-Revision-Date: 2008-08-12 21:16-0500\n"
-"Last-Translator: Bastien Guerry <bzg@altern.org>\n"
+"POT-Creation-Date: 2009-04-09 17:16+0000\n"
+"PO-Revision-Date: 2010-01-25 07:39+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\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 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
 msgstr "Machine à blagues"
 
-#: JokeMachineActivity.py:128
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
 msgstr ""
 "Attendez un instant pour qu'apparaisse le livre de blagues de votre "
 "partenaire"
 
-#: gui/frame.py:121 gui/frame.py:208
-msgid "Lesson Plans"
-msgstr "Plan de cours"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "commencé par"
 
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr "Lire le livre de blagues"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "Ouvrir"
 
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr "Créer un livre de blagues"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "Question"
 
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr "Fermer les leçons"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "Réponse"
 
-#: gui/frame.py:216
-msgid "Lesson Plans:"
-msgstr "Plans des leçons :"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr "Proposition pour :"
 
-#: gui/page.py:99
-msgid "Click to choose a sound"
-msgstr "Cliquez pour choisir un son"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "Votre nom :"
 
-#: gui/page.py:294
-msgid "Choose image"
-msgstr "Choisir une image"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "Proposer"
 
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr "Choisir un son"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "Retour"
 
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr "Chinois (simplifié)"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "Blague"
 
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr "Chinois (traditionnel)"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "Par"
 
-#: i18n.py:42
-msgid "Czech"
-msgstr "Tchèque"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "Ce livre de blagues est vide"
 
-#: i18n.py:43
-msgid "Danish"
-msgstr "Danois"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "Proposer une blague"
 
-#: i18n.py:44
-msgid "Dutch"
-msgstr "Hollandais "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "Ajouter des blagues"
 
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr "Africains"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "Suivant"
 
-#: i18n.py:46
-msgid "English"
-msgstr "Anglais"
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr "Choisir un livre de blagues à lire :"
 
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr "Anglais - Grande Bretagne"
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr "Es-tu sûr que tu veux effacer ton "
 
-#: i18n.py:48
-msgid "English - U.S."
-msgstr "Anglais - États-Unis"
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr "livre de blagues?"
 
-#: i18n.py:49
-msgid "Finnish"
-msgstr "Finnois"
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr "Éditer"
 
-#: i18n.py:50
-msgid "French"
-msgstr "Français"
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr "Effacer"
 
-#: i18n.py:51
-msgid "German"
-msgstr "Allemand"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr "Éditer la couverture du livre de blagues"
 
-#: i18n.py:52
-msgid "Hungarian"
-msgstr "Hongrois"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr "Éditer mes blagues"
 
-#: i18n.py:53
-msgid "Italian"
-msgstr "Italien"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr "Revoir les blagues proposées"
 
-#: i18n.py:54
-msgid "Japanese"
-msgstr "Japonais"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr "Aperçu"
 
-#: i18n.py:55
-msgid "Korean"
-msgstr "Coréen"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr "Titre du livre de blagues:"
 
-#: i18n.py:56
-msgid "Norwegian"
-msgstr "Norvégien"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr "Effet sonore :"
 
-#: i18n.py:57
-msgid "Polish"
-msgstr "Polonais"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr "Ajouter une nouvelle blague"
 
-#: i18n.py:58
-msgid "Portuguese"
-msgstr "Portugais"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr "Es-tu sûr de vouloir effacer cette blague?"
 
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr "Portugais - brésilien"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr "Rejeter"
 
-#: i18n.py:60
-msgid "Russian"
-msgstr "Russe"
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr "Accepter"
 
-#: i18n.py:61
-msgid "Slovak"
-msgstr "Slovaque"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr " a proposé une blague à "
 
-#: i18n.py:62
-msgid "Spanish"
-msgstr "Espagnol"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr " a accepté une blague proposée par "
 
-#: i18n.py:63
-msgid "Swedish"
-msgstr "Suédois"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " par "
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr "Turque"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "Cliquez pour choisir un son"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr "Leçon 1"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "Choisir une image"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr "Leçon 2"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "Choisir un son"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr "Leçon 3"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "Plan de cours"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr "Leçon 4"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "Lire le livre de blagues"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr "Introduction"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr "Créer un livre de blagues"
 
-#: mesh/activitysession.py:164
-msgid " submitted a joke to "
-msgstr " a proposé une blague à "
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "Fermer les leçons"
 
-#: mesh/activitysession.py:203
-msgid " accepted a joke submitted to "
-msgstr " a accepté une blague proposée par "
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "Plans des leçons :"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr " par "
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Chinois (simplifié)"
 
-#: pages/choose.py:42
-msgid "Choose a Jokebook to read:"
-msgstr "Choisir un livre de blague à lire :"
+#~ msgid "Chinese (traditional)"
+#~ msgstr "Chinois (traditionnel)"
 
-#: pages/choose.py:65
-msgid "Are you sure you want to delete your "
-msgstr "Es-tu sûr que tu veux effacer ton "
+#~ msgid "Czech"
+#~ msgstr "Tchèque"
 
-#: pages/choose.py:68
-msgid "jokebook ?"
-msgstr "livre de blagues ?"
+#~ msgid "Danish"
+#~ msgstr "Danois"
 
-#: pages/choose.py:110 pages/preview.py:62
-msgid "Edit"
-msgstr "Éditer"
+#~ msgid "Dutch"
+#~ msgstr "Hollandais "
 
-#: pages/choose.py:114 pages/edit.py:178
-msgid "Delete"
-msgstr "Effacer"
+#~ msgid "Afrikaans"
+#~ msgstr "Africains"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr "commencé par"
+#~ msgid "English"
+#~ msgstr "Anglais"
 
-#: pages/cover.py:49
-msgid "Open"
-msgstr "Ouvrir"
+#~ msgid "English - Great Britain"
+#~ msgstr "Anglais - Grande Bretagne"
 
-#: pages/edit.py:57
-msgid "Edit Jokebook Cover"
-msgstr "Éditer la couverture du livre de blague"
+#~ msgid "English - U.S."
+#~ msgstr "Anglais - États-Unis"
 
-#: pages/edit.py:67
-msgid "Edit My Jokes"
-msgstr "Éditer mes blagues"
+#~ msgid "Finnish"
+#~ msgstr "Finnois"
 
-#: pages/edit.py:77
-msgid "Review Submitted Jokes"
-msgstr "Revoir les blagues proposées"
+#~ msgid "French"
+#~ msgstr "Français"
 
-#: pages/edit.py:123
-msgid "Preview"
-msgstr "Aperçu"
+#~ msgid "German"
+#~ msgstr "Allemand"
 
-#: pages/edit.py:149
-msgid "Title of Jokebook:"
-msgstr "Titre du livre de blagues"
+#~ msgid "Hungarian"
+#~ msgstr "Hongrois"
 
-#: pages/edit.py:153
-msgid "Sound Effect:"
-msgstr "Effet sonore :"
+#~ msgid "Italian"
+#~ msgstr "Italien"
 
-#: pages/edit.py:190
-msgid "Add New Joke"
-msgstr "Ajouter une nouvelle blague"
+#~ msgid "Japanese"
+#~ msgstr "Japonais"
 
-#: pages/edit.py:201
-msgid "Are you sure you want to delete this joke ?"
-msgstr "Es-tu sûr de vouloir effacer cette blague ?"
+#~ msgid "Korean"
+#~ msgstr "Coréen"
 
-#: pages/edit.py:242
-msgid "Reject"
-msgstr "Rejeter"
+#~ msgid "Norwegian"
+#~ msgstr "Norvégien"
 
-#: pages/edit.py:249
-msgid "Accept"
-msgstr "Accepter"
+#~ msgid "Polish"
+#~ msgstr "Polonais"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr "Blague"
+#~ msgid "Portuguese"
+#~ msgstr "Portugais"
 
-#: pages/joke.py:60
-msgid "By"
-msgstr "Par"
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "Portugais - brésilien"
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr "Question"
+#~ msgid "Russian"
+#~ msgstr "Russe"
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr "Réponse"
+#~ msgid "Slovak"
+#~ msgstr "Slovaque"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr "Ce livre de blagues est vide"
+#~ msgid "Spanish"
+#~ msgstr "Espagnol"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr "Proposer une blague"
+#~ msgid "Swedish"
+#~ msgstr "Suédois"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr "Ajouter des blagues"
+#~ msgid "Turkish"
+#~ msgstr "Turque"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr "Suivant"
+#~ msgid "Lesson 1"
+#~ msgstr "Leçon 1"
 
-#: pages/submit.py:93
-msgid "Submission For:"
-msgstr "Proposition pour :"
+#~ msgid "Lesson 2"
+#~ msgstr "Leçon 2"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr "Votre nom :"
+#~ msgid "Lesson 3"
+#~ msgstr "Leçon 3"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr "Proposer"
+#~ msgid "Lesson 4"
+#~ msgstr "Leçon 4"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr "Retour"
+#~ msgid "Introduction"
+#~ msgstr "Introduction"
diff --git a/po/kos.po b/po/kos.po
new file mode 100644
index 0000000..d35d0bc
--- /dev/null
+++ b/po/kos.po
@@ -0,0 +1,197 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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-04-09 17:16+0000\n"
+"PO-Revision-Date: 2009-09-02 21:30-0400\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: kos\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 1.2.1\n"
+
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
+msgid "Joke Machine"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr "Aoloah"
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr "Eislah"
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index a20d35c..49c18c4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\n"
+"POT-Creation-Date: 2009-04-09 17:16+0000\n"
 "PO-Revision-Date: 2008-08-25 16:20-0400\n"
 "Last-Translator: Myckel Habets <myckel@sdf.lonestar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,291 +15,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: activity/activity.info:2 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
 msgstr "Grappenmaker"
 
-#: JokeMachineActivity.py:128
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
 msgstr "Wacht even totdat je maatje's Grappenboek verschijnt"
 
-#: gui/frame.py:121 gui/frame.py:208
-msgid "Lesson Plans"
-msgstr "Les ideeën"
-
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr "Grappenboeken lezen"
-
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr "Grappenboek maken"
-
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr "Lessen sluiten"
-
-#: gui/frame.py:216
-msgid "Lesson Plans:"
-msgstr "Les ideeën:"
-
-#: gui/page.py:99
-msgid "Click to choose a sound"
-msgstr "Klik om een geluid te kiezen:"
-
-#: gui/page.py:294
-msgid "Choose image"
-msgstr "Kies afbeelding"
-
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr "Kies geluid"
-
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr "Chinees (vereenvoudigd)"
-
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr "Chinees (traditioneel)"
-
-#: i18n.py:42
-msgid "Czech"
-msgstr "Tsjechisch"
-
-#: i18n.py:43
-msgid "Danish"
-msgstr "Deens"
-
-#: i18n.py:44
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr "Afrikaans"
-
-#: i18n.py:46
-msgid "English"
-msgstr "Engels"
-
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr "Engels - Groot-Brittannië"
-
-#: i18n.py:48
-msgid "English - U.S."
-msgstr "Engels - V.S."
-
-#: i18n.py:49
-msgid "Finnish"
-msgstr "Fins"
-
-#: i18n.py:50
-msgid "French"
-msgstr "Frans"
-
-#: i18n.py:51
-msgid "German"
-msgstr "Duits"
-
-#: i18n.py:52
-msgid "Hungarian"
-msgstr "Hongaars"
-
-#: i18n.py:53
-msgid "Italian"
-msgstr "Italiaans"
-
-#: i18n.py:54
-msgid "Japanese"
-msgstr "Japans"
-
-#: i18n.py:55
-msgid "Korean"
-msgstr "Koreaans"
-
-#: i18n.py:56
-msgid "Norwegian"
-msgstr "Noors"
-
-#: i18n.py:57
-msgid "Polish"
-msgstr "Pools"
-
-#: i18n.py:58
-msgid "Portuguese"
-msgstr "Portugees"
-
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr "Portugees - Braziliaans"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "gestart door"
 
-#: i18n.py:60
-msgid "Russian"
-msgstr "Russisch"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "Openen"
 
-#: i18n.py:61
-msgid "Slovak"
-msgstr "Slowaaks"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "Vraag"
 
-#: i18n.py:62
-msgid "Spanish"
-msgstr "Spaans"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "Antwoord"
 
-#: i18n.py:63
-msgid "Swedish"
-msgstr "Zweeds"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr "Ingestuurd voor:"
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr "Turks"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "Je naam:"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr "Les 1"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "Insturen"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr "Les 2"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "Terug"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr "Les 3"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "Grap"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr "Les 4"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "door"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr "Introductie"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "Dit grappenboek is leeg"
 
-#: mesh/activitysession.py:164
-msgid " submitted a joke to "
-msgstr " stuurde een grap naar "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "Een grap insturen"
 
-#: mesh/activitysession.py:203
-msgid " accepted a joke submitted to "
-msgstr "  accepteerde een grap gestuurd naar "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "Grappen toevoegen"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr " door "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "Volgende"
 
-#: pages/choose.py:42
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
 msgid "Choose a Jokebook to read:"
 msgstr "Kies een Grappenboek om te lezen:"
 
-#: pages/choose.py:65
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
 msgid "Are you sure you want to delete your "
 msgstr "Weet je zeker dat je wilt verwijderen je "
 
-#: pages/choose.py:68
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
 msgid "jokebook ?"
 msgstr "grappenboek?"
 
-#: pages/choose.py:110 pages/preview.py:62
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
 msgid "Edit"
 msgstr "Bewerken"
 
-#: pages/choose.py:114 pages/edit.py:178
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr "gestart door"
-
-#: pages/cover.py:49
-msgid "Open"
-msgstr "Openen"
-
-#: pages/edit.py:57
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
 msgid "Edit Jokebook Cover"
 msgstr "Grappenboekkaft bewerken"
 
-#: pages/edit.py:67
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
 msgid "Edit My Jokes"
 msgstr "Mijn grappen bewerken"
 
-#: pages/edit.py:77
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
 msgid "Review Submitted Jokes"
 msgstr "Ingestuurde grappen beoordelen"
 
-#: pages/edit.py:123
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: pages/edit.py:149
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
 msgid "Title of Jokebook:"
 msgstr "Titel van het grappenboek:"
 
-#: pages/edit.py:153
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
 msgid "Sound Effect:"
 msgstr "Geluidseffect:"
 
-#: pages/edit.py:190
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
 msgid "Add New Joke"
 msgstr "Nieuwe grap toevoegen"
 
-#: pages/edit.py:201
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
 msgid "Are you sure you want to delete this joke ?"
 msgstr "Weet je zeker dat je deze grap verwijderen wilt?"
 
-#: pages/edit.py:242
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: pages/edit.py:249
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
 msgid "Accept"
 msgstr "Accepteren"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr "Grap"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr " stuurde een grap naar "
 
-#: pages/joke.py:60
-msgid "By"
-msgstr "door"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr "  accepteerde een grap gestuurd naar "
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr "Vraag"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " door "
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr "Antwoord"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "Klik om een geluid te kiezen:"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr "Dit grappenboek is leeg"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "Kies afbeelding"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr "Een grap insturen"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "Kies geluid"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr "Grappen toevoegen"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "Les ideeën"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr "Volgende"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "Grappenboeken lezen"
 
-#: pages/submit.py:93
-msgid "Submission For:"
-msgstr "Ingestuurd voor:"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr "Grappenboek maken"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr "Je naam:"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "Lessen sluiten"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr "Insturen"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "Les ideeën:"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr "Terug"
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Chinees (vereenvoudigd)"
+
+#~ msgid "Chinese (traditional)"
+#~ msgstr "Chinees (traditioneel)"
+
+#~ msgid "Czech"
+#~ msgstr "Tsjechisch"
+
+#~ msgid "Danish"
+#~ msgstr "Deens"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlands"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Afrikaans"
+
+#~ msgid "English"
+#~ msgstr "Engels"
+
+#~ msgid "English - Great Britain"
+#~ msgstr "Engels - Groot-Brittannië"
+
+#~ msgid "English - U.S."
+#~ msgstr "Engels - V.S."
+
+#~ msgid "Finnish"
+#~ msgstr "Fins"
+
+#~ msgid "French"
+#~ msgstr "Frans"
+
+#~ msgid "German"
+#~ msgstr "Duits"
+
+#~ msgid "Hungarian"
+#~ msgstr "Hongaars"
+
+#~ msgid "Italian"
+#~ msgstr "Italiaans"
+
+#~ msgid "Japanese"
+#~ msgstr "Japans"
+
+#~ msgid "Korean"
+#~ msgstr "Koreaans"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noors"
+
+#~ msgid "Polish"
+#~ msgstr "Pools"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugees"
+
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "Portugees - Braziliaans"
+
+#~ msgid "Russian"
+#~ msgstr "Russisch"
+
+#~ msgid "Slovak"
+#~ msgstr "Slowaaks"
+
+#~ msgid "Spanish"
+#~ msgstr "Spaans"
+
+#~ msgid "Swedish"
+#~ msgstr "Zweeds"
+
+#~ msgid "Turkish"
+#~ msgstr "Turks"
+
+#~ msgid "Lesson 1"
+#~ msgstr "Les 1"
+
+#~ msgid "Lesson 2"
+#~ msgstr "Les 2"
+
+#~ msgid "Lesson 3"
+#~ msgstr "Les 3"
+
+#~ msgid "Lesson 4"
+#~ msgstr "Les 4"
+
+#~ msgid "Introduction"
+#~ msgstr "Introductie"
diff --git a/po/tvl.po b/po/tvl.po
new file mode 100644
index 0000000..88a5f07
--- /dev/null
+++ b/po/tvl.po
@@ -0,0 +1,196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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-04-09 17:16+0000\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.3.0\n"
+
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
+msgid "Joke Machine"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr ""
diff --git a/po/tzo.po b/po/tzo.po
new file mode 100644
index 0000000..88a5f07
--- /dev/null
+++ b/po/tzo.po
@@ -0,0 +1,196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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-04-09 17:16+0000\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.3.0\n"
+
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
+msgid "Joke Machine"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
+msgid "Choose a Jokebook to read:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
+msgid "Are you sure you want to delete your "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
+msgid "jokebook ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
+msgid "Edit"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
+msgid "Delete"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
+msgid "Edit Jokebook Cover"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
+msgid "Review Submitted Jokes"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
+msgid "Preview"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
+msgid "Title of Jokebook:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
+msgid "Sound Effect:"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
+msgid "Add New Joke"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
+msgid "Are you sure you want to delete this joke ?"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
+msgid "Reject"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
+msgid "Accept"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr ""
+
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 8ebd802..ad680ba 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 22:32+0200\n"
+"POT-Creation-Date: 2009-04-09 17:16+0000\n"
 "PO-Revision-Date: 2009-02-16 09:13-0500\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,291 +15,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: activity/activity.info:2 JokeMachineActivity.py:128
-#: mesh/activitysession.py:165 mesh/activitysession.py:205
+#: activity/activity.info:2
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:170
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:210
 msgid "Joke Machine"
 msgstr "Máy trò đùa"
 
-#: JokeMachineActivity.py:128
+#: /home/sugar/src/activities/joke-machine/JokeMachineActivity.py:137
 msgid "Please wait a moment for your buddy's Jokebooks to show up"
 msgstr "Hãy đợi một chút để hiển thị các Sách Trò Đùa của bạn bè"
 
-#: gui/frame.py:121 gui/frame.py:208
-msgid "Lesson Plans"
-msgstr "Kế hoạch bài học"
-
-#: gui/frame.py:139
-msgid "Read Jokebooks"
-msgstr "Đọc Sách Trò Đùa"
-
-#: gui/frame.py:143
-msgid "Make Jokebook"
-msgstr "Tạo Sách Trò Đùa"
-
-#: gui/frame.py:212
-msgid "Close Lessons"
-msgstr "Đóng bài học"
-
-#: gui/frame.py:216
-msgid "Lesson Plans:"
-msgstr "Kế hoạch bài học:"
-
-#: gui/page.py:99
-msgid "Click to choose a sound"
-msgstr "Nhấn để chọn âm thanh"
-
-#: gui/page.py:294
-msgid "Choose image"
-msgstr "Chọn ảnh"
-
-#: gui/page.py:322
-msgid "Choose Sound"
-msgstr "Chọn âm thanh"
-
-#: i18n.py:40
-msgid "Chinese (simplified)"
-msgstr "Tiếng Trung (giản thể)"
-
-#: i18n.py:41
-msgid "Chinese (traditional)"
-msgstr "Tiếng Trung (phồn thể)"
-
-#: i18n.py:42
-msgid "Czech"
-msgstr "Tiếng Séc"
-
-#: i18n.py:43
-msgid "Danish"
-msgstr "Tiếng Đan Mạch"
-
-#: i18n.py:44
-msgid "Dutch"
-msgstr "Tiếng Hoà Lan"
-
-#: i18n.py:45
-msgid "Afrikaans"
-msgstr "Tiếng Hoà Nam Phi"
-
-#: i18n.py:46
-msgid "English"
-msgstr "Tiếng Anh"
-
-#: i18n.py:47
-msgid "English - Great Britain"
-msgstr "Tiếng Anh (Quốc Anh)"
-
-#: i18n.py:48
-msgid "English - U.S."
-msgstr "Tiếng Anh (Mỹ)"
-
-#: i18n.py:49
-msgid "Finnish"
-msgstr "Tiếng Phần Lan"
-
-#: i18n.py:50
-msgid "French"
-msgstr "Tiếng Pháp"
-
-#: i18n.py:51
-msgid "German"
-msgstr "Tiếng Đức"
-
-#: i18n.py:52
-msgid "Hungarian"
-msgstr "Tiếng Hung-ga-ri"
-
-#: i18n.py:53
-msgid "Italian"
-msgstr "Tiếng Ý"
-
-#: i18n.py:54
-msgid "Japanese"
-msgstr "Tiếng Nhật"
-
-#: i18n.py:55
-msgid "Korean"
-msgstr "Tiếng Hàn"
-
-#: i18n.py:56
-msgid "Norwegian"
-msgstr "Tiếng Na Uy"
-
-#: i18n.py:57
-msgid "Polish"
-msgstr "Tiếng Ba Lan"
-
-#: i18n.py:58
-msgid "Portuguese"
-msgstr "Tiếng Bồ Đào Nha"
-
-#: i18n.py:59
-msgid "Portuguese - Brazilian"
-msgstr "Tiếng Bồ Đào Nha ở Bra-xin"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:42
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:50
+msgid "started by"
+msgstr "khởi tạo bởi"
 
-#: i18n.py:60
-msgid "Russian"
-msgstr "Tiếng Nga"
+#: /home/sugar/src/activities/joke-machine/pages/cover.py:53
+msgid "Open"
+msgstr "Mở"
 
-#: i18n.py:61
-msgid "Slovak"
-msgstr "Tiếng Xlô-vác"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:65
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:72
+msgid "Question"
+msgstr "Hỏi"
 
-#: i18n.py:62
-msgid "Spanish"
-msgstr "Tiếng Tây Ban Nha"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:72
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:80
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:124
+msgid "Answer"
+msgstr "Đáp"
 
-#: i18n.py:63
-msgid "Swedish"
-msgstr "Tiếng Thuỵ Điển"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:93
+msgid "Submission For:"
+msgstr "Gửi cho :"
 
-#: i18n.py:64
-msgid "Turkish"
-msgstr "Tiếng Thổ Nhĩ Kỳ"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:94
+msgid "Your Name:"
+msgstr "Tên của bạn:"
 
-#: i18n_misc_strings.py:1
-msgid "Lesson 1"
-msgstr "Bài học 1"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:105
+msgid "Submit"
+msgstr "Gửi"
 
-#: i18n_misc_strings.py:2
-msgid "Lesson 2"
-msgstr "Bài học 2"
+#: /home/sugar/src/activities/joke-machine/pages/submit.py:108
+msgid "Back"
+msgstr "Lùi"
 
-#: i18n_misc_strings.py:3
-msgid "Lesson 3"
-msgstr "Bài học 3"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:61
+msgid "Joke"
+msgstr "Trò đùa"
 
-#: i18n_misc_strings.py:4
-msgid "Lesson 4"
-msgstr "Bài học 4"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:63
+msgid "By"
+msgstr "Bởi"
 
-#: i18n_misc_strings.py:5
-msgid "Introduction"
-msgstr "Giới thiệu"
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:98
+msgid "This Jokebook is empty"
+msgstr "Sách Trò Đùa này vẫn trống"
 
-#: mesh/activitysession.py:164
-msgid " submitted a joke to "
-msgstr " đã gửi một trò đùa cho "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:100
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:160
+msgid "Submit a Joke"
+msgstr "Gửi trò đùa"
 
-#: mesh/activitysession.py:203
-msgid " accepted a joke submitted to "
-msgstr " đã chấp nhận một trò đùa được gửi cho "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:105
+msgid "Add Jokes"
+msgstr "Thêm trò đùa"
 
-#: mesh/activitysession.py:204
-msgid " by "
-msgstr " bởi "
+#: /home/sugar/src/activities/joke-machine/pages/joke.py:154
+msgid "Next"
+msgstr "Tiếp"
 
-#: pages/choose.py:42
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:46
 msgid "Choose a Jokebook to read:"
 msgstr "Chọn Sách Trò Đùa cần đọc:"
 
-#: pages/choose.py:65
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:67
 msgid "Are you sure you want to delete your "
 msgstr "Bạn có chắc muốn xoá sách trò đùa "
 
-#: pages/choose.py:68
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:70
 msgid "jokebook ?"
 msgstr " của mình không?"
 
-#: pages/choose.py:110 pages/preview.py:62
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:107
+#: /home/sugar/src/activities/joke-machine/pages/preview.py:67
 msgid "Edit"
 msgstr "Sửa"
 
-#: pages/choose.py:114 pages/edit.py:178
+#: /home/sugar/src/activities/joke-machine/pages/choose.py:111
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:173
 msgid "Delete"
 msgstr "Xoá"
 
-#: pages/cover.py:37 pages/preview.py:44
-msgid "started by"
-msgstr "khởi tạo bởi"
-
-#: pages/cover.py:49
-msgid "Open"
-msgstr "Mở"
-
-#: pages/edit.py:57
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:59
 msgid "Edit Jokebook Cover"
 msgstr "Sửa bìa Sách Trò Đùa"
 
-#: pages/edit.py:67
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:67
 msgid "Edit My Jokes"
 msgstr "Sửa trò đùa của mình"
 
-#: pages/edit.py:77
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:75
 msgid "Review Submitted Jokes"
 msgstr "Xem lại các trò đùa gửi đến"
 
-#: pages/edit.py:123
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:119
 msgid "Preview"
 msgstr "Xem thử"
 
-#: pages/edit.py:149
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:144
 msgid "Title of Jokebook:"
 msgstr "Tên của Sách Trò Đùa:"
 
-#: pages/edit.py:153
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:148
 msgid "Sound Effect:"
 msgstr "Hiệu ứng âm thanh:"
 
-#: pages/edit.py:190
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:185
 msgid "Add New Joke"
 msgstr "Thêm trò đùa mới"
 
-#: pages/edit.py:201
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:196
 msgid "Are you sure you want to delete this joke ?"
 msgstr "Bạn có chắc muốn xoá trò đùa này không?"
 
-#: pages/edit.py:242
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:237
 msgid "Reject"
 msgstr "Từ chối"
 
-#: pages/edit.py:249
+#: /home/sugar/src/activities/joke-machine/pages/edit.py:244
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: pages/joke.py:57
-msgid "Joke"
-msgstr "Trò đùa"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:169
+msgid " submitted a joke to "
+msgstr " đã gửi một trò đùa cho "
 
-#: pages/joke.py:60
-msgid "By"
-msgstr "Bởi"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:208
+msgid " accepted a joke submitted to "
+msgstr " đã chấp nhận một trò đùa được gửi cho "
 
-#: pages/joke.py:70 pages/submit.py:63
-msgid "Question"
-msgstr "Hỏi"
+#: /home/sugar/src/activities/joke-machine/mesh/activitysession.py:209
+msgid " by "
+msgstr " bởi "
 
-#: pages/joke.py:79 pages/joke.py:124 pages/submit.py:71
-msgid "Answer"
-msgstr "Đáp"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:105
+msgid "Click to choose a sound"
+msgstr "Nhấn để chọn âm thanh"
 
-#: pages/joke.py:98
-msgid "This Jokebook is empty"
-msgstr "Sách Trò Đùa này vẫn trống"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:299
+msgid "Choose image"
+msgstr "Chọn ảnh"
 
-#: pages/joke.py:100 pages/joke.py:160
-msgid "Submit a Joke"
-msgstr "Gửi trò đùa"
+#: /home/sugar/src/activities/joke-machine/gui/page.py:333
+msgid "Choose Sound"
+msgstr "Chọn âm thanh"
 
-#: pages/joke.py:105
-msgid "Add Jokes"
-msgstr "Thêm trò đùa"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:106
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:193
+msgid "Lesson Plans"
+msgstr "Kế hoạch bài học"
 
-#: pages/joke.py:154
-msgid "Next"
-msgstr "Tiếp"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:124
+msgid "Read Jokebooks"
+msgstr "Đọc Sách Trò Đùa"
 
-#: pages/submit.py:93
-msgid "Submission For:"
-msgstr "Gửi cho :"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:128
+msgid "Make Jokebook"
+msgstr "Tạo Sách Trò Đùa"
 
-#: pages/submit.py:94
-msgid "Your Name:"
-msgstr "Tên của bạn:"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:197
+msgid "Close Lessons"
+msgstr "Đóng bài học"
 
-#: pages/submit.py:105
-msgid "Submit"
-msgstr "Gửi"
+#: /home/sugar/src/activities/joke-machine/gui/frame.py:201
+msgid "Lesson Plans:"
+msgstr "Kế hoạch bài học:"
 
-#: pages/submit.py:108
-msgid "Back"
-msgstr "Lùi"
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Tiếng Trung (giản thể)"
+
+#~ msgid "Chinese (traditional)"
+#~ msgstr "Tiếng Trung (phồn thể)"
+
+#~ msgid "Czech"
+#~ msgstr "Tiếng Séc"
+
+#~ msgid "Danish"
+#~ msgstr "Tiếng Đan Mạch"
+
+#~ msgid "Dutch"
+#~ msgstr "Tiếng Hoà Lan"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Tiếng Hoà Nam Phi"
+
+#~ msgid "English"
+#~ msgstr "Tiếng Anh"
+
+#~ msgid "English - Great Britain"
+#~ msgstr "Tiếng Anh (Quốc Anh)"
+
+#~ msgid "English - U.S."
+#~ msgstr "Tiếng Anh (Mỹ)"
+
+#~ msgid "Finnish"
+#~ msgstr "Tiếng Phần Lan"
+
+#~ msgid "French"
+#~ msgstr "Tiếng Pháp"
+
+#~ msgid "German"
+#~ msgstr "Tiếng Đức"
+
+#~ msgid "Hungarian"
+#~ msgstr "Tiếng Hung-ga-ri"
+
+#~ msgid "Italian"
+#~ msgstr "Tiếng Ý"
+
+#~ msgid "Japanese"
+#~ msgstr "Tiếng Nhật"
+
+#~ msgid "Korean"
+#~ msgstr "Tiếng Hàn"
+
+#~ msgid "Norwegian"
+#~ msgstr "Tiếng Na Uy"
+
+#~ msgid "Polish"
+#~ msgstr "Tiếng Ba Lan"
+
+#~ msgid "Portuguese"
+#~ msgstr "Tiếng Bồ Đào Nha"
+
+#~ msgid "Portuguese - Brazilian"
+#~ msgstr "Tiếng Bồ Đào Nha ở Bra-xin"
+
+#~ msgid "Russian"
+#~ msgstr "Tiếng Nga"
+
+#~ msgid "Slovak"
+#~ msgstr "Tiếng Xlô-vác"
+
+#~ msgid "Spanish"
+#~ msgstr "Tiếng Tây Ban Nha"
+
+#~ msgid "Swedish"
+#~ msgstr "Tiếng Thuỵ Điển"
+
+#~ msgid "Turkish"
+#~ msgstr "Tiếng Thổ Nhĩ Kỳ"
+
+#~ msgid "Lesson 1"
+#~ msgstr "Bài học 1"
+
+#~ msgid "Lesson 2"
+#~ msgstr "Bài học 2"
+
+#~ msgid "Lesson 3"
+#~ msgstr "Bài học 3"
+
+#~ msgid "Lesson 4"
+#~ msgstr "Bài học 4"
+
+#~ msgid "Introduction"
+#~ msgstr "Giới thiệu"
--
cgit v0.9.1