JokeMachine-3.xo

  * Feature: Put alerts up when joke submitted and approved over mesh
  * Feature: Put alert up advising patience when joining a shared jokebook
  * Feature: Made Lesson Plans button work
  * Feature: Safe fallback for builds without sugar.alert
  * Feature: Hooked LanguageCombo up
  * i18n: Created (a rough!) Afrikaans translation
  * Fixed: Prepended Cover on preview
  * Fixed: Don't hardcode JokeEditor delete button position
  * Fixed: On read jokebook & empty -> "Edit My Jokes" -> Go to edit my jokes tab
  * Updated :Mesh code for dbus tubes changes

3 files changed, 433 insertions, 71 deletions

diff --git a/locale/jokemachine.pot b/locale/JokeMachine.pot
index 6129dcc..93dcf91 100644
--- a/locale/jokemachine.pot
+++ b/locale/JokeMachine.pot
@@ -1,113 +1,159 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
+# Copyright (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"
-"POT-Creation-Date: 2007-10-14 03:05+SAST\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-29 05:52+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.5\n"
+"Content-Transfer-Encoding: 8bit\n"
 
+#: activity/activity.info:2 JokeMachineActivity.py:123
+#: mesh/activitysession.py:165 mesh/activitysession.py:205
+msgid "Joke Machine"
+msgstr ""
 
-#: i18n.py:39
-msgid "Chinese (simplified)"
+#: JokeMachineActivity.py:123
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr ""
+
+#: gui/frame.py:121 gui/frame.py:208
+msgid "Lesson Plans"
+msgstr ""
+
+#: gui/frame.py:139
+msgid "Read Jokebooks"
+msgstr ""
+
+#: gui/frame.py:143
+msgid "Make Jokebook"
+msgstr ""
+
+#: gui/frame.py:212
+msgid "Close Lessons"
+msgstr ""
+
+#: gui/frame.py:216
+msgid "Lesson Plans:"
+msgstr ""
+
+#: gui/page.py:99
+msgid "Click to choose a sound"
+msgstr ""
+
+#: gui/page.py:294
+msgid "Choose image"
+msgstr ""
+
+#: gui/page.py:322
+msgid "Choose Sound"
 msgstr ""
 
 #: i18n.py:40
-msgid "Chinese (traditional)"
+msgid "Chinese (simplified)"
 msgstr ""
 
 #: i18n.py:41
-msgid "Czech"
+msgid "Chinese (traditional)"
 msgstr ""
 
 #: i18n.py:42
-msgid "Danish"
+msgid "Czech"
 msgstr ""
 
 #: i18n.py:43
-msgid "Dutch"
+msgid "Danish"
 msgstr ""
 
 #: i18n.py:44
-msgid "English"
+msgid "Dutch"
 msgstr ""
 
 #: i18n.py:45
-msgid "English - Great Britain"
+msgid "Afrikaans"
 msgstr ""
 
 #: i18n.py:46
-msgid "English - U.S."
+msgid "English"
 msgstr ""
 
 #: i18n.py:47
-msgid "Finnish"
+msgid "English - Great Britain"
 msgstr ""
 
 #: i18n.py:48
-msgid "French"
+msgid "English - U.S."
 msgstr ""
 
 #: i18n.py:49
-msgid "German"
+msgid "Finnish"
 msgstr ""
 
 #: i18n.py:50
-msgid "Hungarian"
+msgid "French"
 msgstr ""
 
 #: i18n.py:51
-msgid "Italian"
+msgid "German"
 msgstr ""
 
 #: i18n.py:52
-msgid "Japanese"
+msgid "Hungarian"
 msgstr ""
 
 #: i18n.py:53
-msgid "Korean"
+msgid "Italian"
 msgstr ""
 
 #: i18n.py:54
-msgid "Norwegian"
+msgid "Japanese"
 msgstr ""
 
 #: i18n.py:55
-msgid "Polish"
+msgid "Korean"
 msgstr ""
 
 #: i18n.py:56
-msgid "Portuguese"
+msgid "Norwegian"
 msgstr ""
 
 #: i18n.py:57
-msgid "Portuguese - Brazilian"
+msgid "Polish"
 msgstr ""
 
 #: i18n.py:58
-msgid "Russian"
+msgid "Portuguese"
 msgstr ""
 
 #: i18n.py:59
-msgid "Slovak"
+msgid "Portuguese - Brazilian"
 msgstr ""
 
 #: i18n.py:60
-msgid "Spanish"
+msgid "Russian"
 msgstr ""
 
 #: i18n.py:61
-msgid "Swedish"
+msgid "Slovak"
 msgstr ""
 
 #: i18n.py:62
+msgid "Spanish"
+msgstr ""
+
+#: i18n.py:63
+msgid "Swedish"
+msgstr ""
+
+#: i18n.py:64
 msgid "Turkish"
 msgstr ""
 
@@ -131,119 +177,130 @@ msgstr ""
 msgid "Introduction"
 msgstr ""
 
-#: gui/frame.py:117
-msgid "Lesson Plans"
+#: mesh/activitysession.py:164
+msgid " submitted a joke to "
 msgstr ""
 
-#: gui/frame.py:131
-msgid "Read Jokebooks"
+#: mesh/activitysession.py:203
+msgid " accepted a joke submitted to "
 msgstr ""
 
-#: gui/frame.py:134
-msgid "Make Jokebook"
+#: mesh/activitysession.py:204
+msgid " by "
 msgstr ""
 
-#: gui/page.py:70
-msgid "Choose image"
+#: pages/choose.py:42
+msgid "Choose a Jokebook to read:"
 msgstr ""
 
-#: pages/choose.py:95
+#: pages/choose.py:65
+msgid "Are you sure you want to delete your "
+msgstr ""
+
+#: pages/choose.py:68
+msgid "jokebook ?"
+msgstr ""
+
+#: pages/choose.py:110 pages/preview.py:62
 msgid "Edit"
 msgstr ""
 
-#: pages/choose.py:100
+#: pages/choose.py:114 pages/edit.py:178
 msgid "Delete"
 msgstr ""
 
-#: pages/cover.py:37
-msgid "Jokes started by"
+#: pages/cover.py:37 pages/preview.py:44
+msgid "started by"
 msgstr ""
 
 #: pages/cover.py:49
 msgid "Open"
 msgstr ""
 
-#: pages/edit.py:53
-msgid "Jokebook Info"
+#: pages/edit.py:57
+msgid "Edit Jokebook Cover"
 msgstr ""
 
-#: pages/edit.py:63
+#: pages/edit.py:67
 msgid "Edit My Jokes"
 msgstr ""
 
-#: pages/edit.py:73
+#: pages/edit.py:77
 msgid "Review Submitted Jokes"
 msgstr ""
 
-#: pages/edit.py:121
+#: pages/edit.py:123
 msgid "Preview"
 msgstr ""
 
-#: pages/edit.py:146
+#: pages/edit.py:149
 msgid "Title of Jokebook:"
 msgstr ""
 
-#: pages/edit.py:147
+#: pages/edit.py:153
 msgid "Sound Effect:"
 msgstr ""
 
-#: pages/edit.py:170
-msgid "Add Joke"
-msgstr ""
-
-#: pages/edit.py:200
-msgid "Status:"
+#: pages/edit.py:190
+msgid "Add New Joke"
 msgstr ""
 
-#: pages/edit.py:207
-msgid "Approved"
+#: pages/edit.py:201
+msgid "Are you sure you want to delete this joke ?"
 msgstr ""
 
-#: pages/edit.py:210
-msgid "Rejected"
+#: pages/edit.py:242
+msgid "Reject"
 msgstr ""
 
-#: pages/edit.py:213
-msgid "Not Reviewed"
+#: pages/edit.py:249
+msgid "Accept"
 msgstr ""
 
-#: pages/joke.py:53
+#: pages/joke.py:56
 msgid "Joke"
 msgstr ""
 
-#: pages/joke.py:56
+#: pages/joke.py:59
 msgid "By"
 msgstr ""
 
-#: pages/joke.py:66 pages/submit.py:67
+#: pages/joke.py:69 pages/submit.py:63
 msgid "Question"
 msgstr ""
 
-#: pages/joke.py:75 pages/joke.py:105 pages/submit.py:75
+#: pages/joke.py:78 pages/joke.py:123 pages/submit.py:71
 msgid "Answer"
 msgstr ""
 
-#: pages/joke.py:126
-msgid "Next"
+#: pages/joke.py:97
+msgid "This Jokebook is empty"
 msgstr ""
 
-#: pages/joke.py:131
+#: pages/joke.py:99 pages/joke.py:156
 msgid "Submit a Joke"
 msgstr ""
 
-#: pages/submit.py:96
+#: pages/joke.py:104
+msgid "Add Jokes"
+msgstr ""
+
+#: pages/joke.py:150
+msgid "Next"
+msgstr ""
+
+#: pages/submit.py:93
 msgid "Submission For:"
 msgstr ""
 
-#: pages/submit.py:97
+#: pages/submit.py:94
 msgid "Your Name:"
 msgstr ""
 
-#: pages/submit.py:108
+#: pages/submit.py:105
 msgid "Submit"
 msgstr ""
 
-#: pages/submit.py:111
+#: pages/submit.py:108
 msgid "Back"
 msgstr ""
-
diff --git a/locale/af/LC_MESSAGES/JokeMachine.mo b/locale/af/LC_MESSAGES/JokeMachine.mo
new file mode 100644
index 0000000..7fac1bc
--- /dev/null
+++ b/locale/af/LC_MESSAGES/JokeMachine.mo
diff --git a/locale/af/LC_MESSAGES/JokeMachine.po b/locale/af/LC_MESSAGES/JokeMachine.po
new file mode 100644
index 0000000..3682935
--- /dev/null
+++ b/locale/af/LC_MESSAGES/JokeMachine.po
@@ -0,0 +1,305 @@
+# Afrikaans translations for PACKAGE package.
+# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#  <antoine@g7.org.za>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-29 05:52+0200\n"
+"PO-Revision-Date: 2007-10-29 05:53+0200\n"
+"Last-Translator:  <antoine@g7.org.za>\n"
+"Language-Team: Afrikaans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: activity/activity.info:2 JokeMachineActivity.py:123
+#: mesh/activitysession.py:165 mesh/activitysession.py:205
+msgid "Joke Machine"
+msgstr "Grap Masjien"
+
+#: JokeMachineActivity.py:123
+msgid "Please wait a moment for your buddy's Jokebooks to show up"
+msgstr "Wag asseblief 'n oomblik vir jou maaitjie se grap boek"
+
+#: gui/frame.py:121 gui/frame.py:208
+msgid "Lesson Plans"
+msgstr "Les Planne"
+
+#: gui/frame.py:139
+msgid "Read Jokebooks"
+msgstr "Lees Grapboeke"
+
+#: gui/frame.py:143
+msgid "Make Jokebook"
+msgstr "Maak Grapboek"
+
+#: gui/frame.py:212
+msgid "Close Lessons"
+msgstr "Maak Lesse Toe"
+
+#: gui/frame.py:216
+msgid "Lesson Plans:"
+msgstr "Les Planne:"
+
+#: gui/page.py:99
+msgid "Click to choose a sound"
+msgstr "Klik om n klank te kies"
+
+#: gui/page.py:294
+msgid "Choose image"
+msgstr "Kies n prentjie"
+
+#: gui/page.py:322
+msgid "Choose Sound"
+msgstr "Kies n klank"
+
+#: i18n.py:40
+msgid "Chinese (simplified)"
+msgstr ""
+
+#: i18n.py:41
+msgid "Chinese (traditional)"
+msgstr ""
+
+#: i18n.py:42
+msgid "Czech"
+msgstr ""
+
+#: i18n.py:43
+msgid "Danish"
+msgstr ""
+
+#: i18n.py:44
+msgid "Dutch"
+msgstr ""
+
+#: i18n.py:45
+msgid "Afrikaans"
+msgstr ""
+
+#: i18n.py:46
+msgid "English"
+msgstr ""
+
+#: i18n.py:47
+msgid "English - Great Britain"
+msgstr ""
+
+#: i18n.py:48
+msgid "English - U.S."
+msgstr ""
+
+#: i18n.py:49
+msgid "Finnish"
+msgstr ""
+
+#: i18n.py:50
+msgid "French"
+msgstr ""
+
+#: i18n.py:51
+msgid "German"
+msgstr ""
+
+#: i18n.py:52
+msgid "Hungarian"
+msgstr ""
+
+#: i18n.py:53
+msgid "Italian"
+msgstr ""
+
+#: i18n.py:54
+msgid "Japanese"
+msgstr ""
+
+#: i18n.py:55
+msgid "Korean"
+msgstr ""
+
+#: i18n.py:56
+msgid "Norwegian"
+msgstr ""
+
+#: i18n.py:57
+msgid "Polish"
+msgstr ""
+
+#: i18n.py:58
+msgid "Portuguese"
+msgstr ""
+
+#: i18n.py:59
+msgid "Portuguese - Brazilian"
+msgstr ""
+
+#: i18n.py:60
+msgid "Russian"
+msgstr ""
+
+#: i18n.py:61
+msgid "Slovak"
+msgstr ""
+
+#: i18n.py:62
+msgid "Spanish"
+msgstr ""
+
+#: i18n.py:63
+msgid "Swedish"
+msgstr ""
+
+#: i18n.py:64
+msgid "Turkish"
+msgstr ""
+
+#: i18n_misc_strings.py:1
+msgid "Lesson 1"
+msgstr "Les 1"
+
+#: i18n_misc_strings.py:2
+msgid "Lesson 2"
+msgstr "Les 2"
+
+#: i18n_misc_strings.py:3
+msgid "Lesson 3"
+msgstr "Les 3"
+
+#: i18n_misc_strings.py:4
+msgid "Lesson 4"
+msgstr "Les 4"
+
+#: i18n_misc_strings.py:5
+msgid "Introduction"
+msgstr "Introduksie"
+
+#: mesh/activitysession.py:164
+msgid " submitted a joke to "
+msgstr " het 'n grappie gestuur aan  "
+
+#: mesh/activitysession.py:203
+msgid " accepted a joke submitted to "
+msgstr " het 'n grappie antvaar vir "
+
+#: mesh/activitysession.py:204
+msgid " by "
+msgstr " deur "
+
+#: pages/choose.py:42
+msgid "Choose a Jokebook to read:"
+msgstr "Kies 'n Grapboek om te lees:"
+
+#: pages/choose.py:65
+msgid "Are you sure you want to delete your "
+msgstr "Is jy seker jy wil jou "
+
+#: pages/choose.py:68
+msgid "grapboek uitvee ?"
+msgstr ""
+
+#: pages/choose.py:110 pages/preview.py:62
+msgid "Edit"
+msgstr "Redigeer"
+
+#: pages/choose.py:114 pages/edit.py:178
+msgid "Delete"
+msgstr "Vee uit"
+
+#: pages/cover.py:37 pages/preview.py:44
+msgid "started by"
+msgstr "begin deur"
+
+#: pages/cover.py:49
+msgid "Open"
+msgstr "Maak oop"
+
+#: pages/edit.py:57
+msgid "Edit Jokebook Cover"
+msgstr "Redigeer Grapboek "
+
+#: pages/edit.py:67
+msgid "Edit My Jokes"
+msgstr "Redigeer Grap"
+
+#: pages/edit.py:77
+msgid "Review Submitted Jokes"
+msgstr "Redigeer verwysings"
+
+#: pages/edit.py:123
+msgid "Preview"
+msgstr "Voorkyk"
+
+#: pages/edit.py:149
+msgid "Title of Jokebook:"
+msgstr "Naam van Grapboek:"
+
+#: pages/edit.py:153
+msgid "Sound Effect:"
+msgstr "Klank:"
+
+#: pages/edit.py:190
+msgid "Add New Joke"
+msgstr "Voeg nuwe grap by"
+
+#: pages/edit.py:201
+msgid "Are you sure you want to delete this joke ?"
+msgstr "Is jy seker jy wil hierdie grap uit vee ?"
+
+#: pages/edit.py:242
+msgid "Reject"
+msgstr "Nie Aanvaar"
+
+#: pages/edit.py:249
+msgid "Accept"
+msgstr "Aanvaar"
+
+#: pages/joke.py:56
+msgid "Joke"
+msgstr "Grap"
+
+#: pages/joke.py:59
+msgid "By"
+msgstr "By"
+
+#: pages/joke.py:69 pages/submit.py:63
+msgid "Question"
+msgstr "Vraag"
+
+#: pages/joke.py:78 pages/joke.py:123 pages/submit.py:71
+msgid "Answer"
+msgstr "Antwoord"
+
+#: pages/joke.py:97
+msgid "This Jokebook is empty"
+msgstr "Hierdie Grapboek is leeg"
+
+#: pages/joke.py:99 pages/joke.py:156
+msgid "Submit a Joke"
+msgstr "Stuur 'n Grappie"
+
+#: pages/joke.py:104
+msgid "Add Jokes"
+msgstr "Voeg grap by"
+
+#: pages/joke.py:150
+msgid "Next"
+msgstr "Volgende"
+
+#: pages/submit.py:93
+msgid "Submission For:"
+msgstr "Verwysing vir:"
+
+#: pages/submit.py:94
+msgid "Your Name:"
+msgstr "Jou Naam:"
+
+#: pages/submit.py:105
+msgid "Submit"
+msgstr "Verwys"
+
+#: pages/submit.py:108
+msgid "Back"
+msgstr "Terug"