Release v25

3 files changed, 7 insertions, 581 deletions

diff --git a/NEWS b/NEWS
index c823273..596d0f9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+25
+
+* Fix font size on XO.
+* Use GDK keymap as a fallback when a custom keymap is not present.
+
 24
 
 Mostly lesson editor changes.
diff --git a/activity/activity.info b/activity/activity.info
index 491e0a7..21eba73 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Typing Turtle
-activity_version = 24
+activity_version = 25
 host_version = 1
 service_name = org.laptop.community.TypingTurtle
 icon = Activity-typingturtle
diff --git a/po/TypingTurtle.pot b/po/TypingTurtle.pot
index 8637fc2..11f9b3c 100644
--- a/po/TypingTurtle.pot
+++ b/po/TypingTurtle.pot
@@ -1,582 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (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-11-18 23:13+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=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: activity/activity.info:2 /home/wadeb/typing-turtle/titlescene.py:49
-#: /home/wadeb/typing-turtle/typingturtle.py:60
+#: activity/activity.info:2
 msgid "Typing Turtle"
 msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:47
-#: /home/wadeb/typing-turtle/typingturtle.py:92
-msgid "Edit Lessons"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:50
-#: /home/wadeb/typing-turtle/balloongame.py:53
-#: /home/wadeb/typing-turtle/lessonscreen.py:64
-#: /home/wadeb/typing-turtle/editlessonscreen.py:49
-#: /home/wadeb/typing-turtle/editlessonscreen.py:570
-msgid "Go Back"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:74
-#: /home/wadeb/typing-turtle/editlessonscreen.py:271
-msgid "Name"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:79
-#: /home/wadeb/typing-turtle/editlessonscreen.py:302
-msgid "Description"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:85
-#: /home/wadeb/typing-turtle/editlessonscreen.py:283
-msgid "Type"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:94
-msgid "Import Lessons from Journal"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:99
-msgid "Export Lessons to Journal"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:104
-msgid "Save Lessons to Activity"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:163
-#: /home/wadeb/typing-turtle/editlessonscreen.py:188
-msgid "Text"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:165
-#: /home/wadeb/typing-turtle/editlessonscreen.py:290
-msgid "Balloon Game"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:201
-msgid "Delete Lesson?"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:202
-msgid "Deleting the lesson will erase the lesson content."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonlistscreen.py:300
-msgid " (Exported Lessons)"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:261
-#: /home/wadeb/typing-turtle/lessonscreen.py:610
-msgid "Well done!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:262
-msgid "Good job."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:263
-msgid "Awesome!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:264
-#: /home/wadeb/typing-turtle/lessonscreen.py:612
-msgid "Way to go!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:265
-msgid "Wonderful!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:266
-msgid "Nice work."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:267
-msgid "You did it!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:274
-msgid ""
-"Be careful to use the correct finger to press each key.  Look at the "
-"keyboard below if you need help remembering."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:275
-msgid ""
-"Try to type at the same speed, all the time.  As you get more comfortable "
-"you can increase the speed a little."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:282
-msgid "left little"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:283
-msgid "left ring"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:284
-msgid "left middle"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:285
-msgid "left index"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:286
-#: /home/wadeb/typing-turtle/lessonscreen.py:43
-msgid "left thumb"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:287
-msgid "right little"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:288
-msgid "right ring"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:289
-msgid "right middle"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:290
-msgid "right index"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:291
-#: /home/wadeb/typing-turtle/lessonscreen.py:48
-msgid "right thumb"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:320
-#, python-format
-msgid " and %s keys"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:322
-msgid " key"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:325
-#, python-format
-msgid ""
-"In this lesson, you will learn the %(keynames)s.\n"
-"\n"
-"Press the ENTER key when you are ready to begin!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:364
-msgid "Let's learn the new keys."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:367
-msgid "Practice typing the keys you just learned."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:371
-msgid "Now put the keys together into pairs."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:376
-msgid "Time to type jumbles."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:381
-msgid "Time to type real words."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:390
-msgid "Hihowahyah!  Ready to learn the secret of fast typing?\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:391
-msgid ""
-"Always use the correct finger to press each key!\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:392
-msgid "Now, place your hands on the keyboard just like the picture below.\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:393
-msgid "When you're ready, press the SPACE bar with your thumb!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:397
-msgid ""
-"Good job!  The SPACE bar is used to insert spaces between words.\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:398
-msgid "Press the SPACE bar again with your thumb."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:402
-msgid "Now I'll teach you the second key, ENTER.  "
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:403
-msgid ""
-"That's the big square key near your right little finger.\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:404
-msgid "Now, reach your little finger over and press ENTER."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:408
-msgid ""
-"Great!  When typing, the ENTER key is used to begin a new line.\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:409
-msgid "Press the ENTER key again with your right little finger."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonbuilder.py:417
-msgid "Copy out the following text."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:210
-msgid "You finished!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:219
-#, python-format
-msgid "Your score was %(score)d."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:221
-#, python-format
-msgid "You earned a %(type)s medal!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:223
-#: /home/wadeb/typing-turtle/medalscreen.py:99
-msgid "Press the ENTER key to continue."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:321
-#: /home/wadeb/typing-turtle/balloongame.py:329
-#, python-format
-msgid "SCORE: %d"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/balloongame.py:340
-msgid "Type the words to pop the balloons!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:54
-msgid ""
-"<span font_desc='Serif Bold Italic 28'>Certificate of Achievement</span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:57
-msgid "<span font_desc='Sans 16'>This certifies that</span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:60
-#, python-format
-msgid "<span font_desc='Sans 16'><b><u><i>%(nick)s</i></u></b></span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:63
-#, python-format
-msgid "<span font_desc='Sans 16'>earned a %(type)s medal in </span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:66
-#, python-format
-msgid "<span font_desc='Sans 16'>in <b><u><i>%(lesson)s</i></u></b></span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:69
-#, python-format
-msgid "<span font_desc='Sans 16'>on <b><u><i>%(date)s</i></u></b>.</span>"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:86
-#, python-format
-msgid "<b>Words Per Minute:</b> %(wpm)d"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:90
-#: /home/wadeb/typing-turtle/lessonscreen.py:197
-#, python-format
-msgid "<b>Accuracy:</b> %(accuracy)d%%"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/medalscreen.py:95
-#, python-format
-msgid "<b>SCORE:</b> %(score)d"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:39
-msgid "left little finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:40
-msgid "left ring finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:41
-msgid "left middle finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:42
-msgid "left index finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:44
-msgid "right little finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:45
-msgid "right ring finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:46
-msgid "right middle finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:47
-msgid "right index finger"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:189
-#, python-format
-msgid "<b>WPM:</b> %(wpm)d"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:509
-#, python-format
-msgid "Press and hold the shift key with your %(finger)s, "
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:510
-#: /home/wadeb/typing-turtle/lessonscreen.py:514
-#: /home/wadeb/typing-turtle/lessonscreen.py:518
-#, python-format
-msgid "then press the %(letter)s key with your %(finger)s."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:513
-msgid "Press and hold the altgr key, "
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:517
-msgid "Press and hold the altgr and shift keys, "
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:521
-#, python-format
-msgid "Press the %(letter)s key with your %(finger)s."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:609
-msgid "Good job!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:611
-msgid "Nice work!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:617
-#, python-format
-msgid "You finished the lesson in %(time)d seconds, with %(errors)d errors.\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:619
-#, python-format
-msgid ""
-"Your words per minute (WPM) was %(wpm)d, and your accuracy was %(accuracy)d%"
-"%.\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:622
-#, python-format
-msgid "You finished the lesson with %(errors)d errors.\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:624
-#, python-format
-msgid ""
-"Your accuracy was %(accuracy)d%%.\n"
-"\n"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:630
-#, python-format
-msgid "Congratulations!  You earned a %(type)s medal!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:638
-msgid "You need to practice this lesson more before moving on."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:641
-msgid "You almost got a medal!  Next time, try not to make as many errors."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/lessonscreen.py:644
-msgid "You almost got a medal!  Next time, try to type a little faster."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:56
-msgid "Next"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:65
-msgid "Previous"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:72
-msgid "Start Lesson"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:170
-msgid ""
-"You earned a medal in this lesson!  Advance to the next one\n"
-"by clicking the Next button."
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:201
-msgid "No Medal Yet"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:202
-msgid "Bronze Medal"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:203
-msgid "Silver Medal"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/mainscreen.py:204
-msgid "Gold Medal"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:46
-msgid "Edit a Lesson"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:76
-msgid "New keys"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:77
-msgid "Known keys"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:78
-msgid "Length"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:89
-msgid "Generate!"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:107
-#: /home/wadeb/typing-turtle/editlessonscreen.py:567
-msgid "Edit Word List"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:123
-#, python-format
-msgid "Step #%d"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:129
-msgid "Keys"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:130
-#: /home/wadeb/typing-turtle/editlessonscreen.py:381
-msgid "Words"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:167
-msgid "Instructions"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:230
-msgid "Accuracy"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:231
-msgid "WPM"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:245
-msgid "Score"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:266
-msgid "Lesson Details"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:287
-msgid "Normal Lesson"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:320
-msgid "Options"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:324
-msgid "Allow Mistakes"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:326
-msgid "Allow Backspace"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:347
-msgid "Automatic Lesson Generator"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:404
-msgid "Medal Requirements"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:411
-msgid "Bronze"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:412
-msgid "Silver"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:413
-msgid "Gold"
-msgstr ""
-
-#: /home/wadeb/typing-turtle/editlessonscreen.py:580
-msgid ""
-"Type or paste words here, for the Automatic Lesson Generator.  If empty, the "
-"dictionary will be used."
-msgstr ""