From 35583a073d80e6a0b2810f8ff549c7b4830c0840 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 16 Mar 2012 11:34:11 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:deducto/deducto

---
diff --git a/game.py b/game.py
index 882761f..dbbe118 100644
--- a/game.py
+++ b/game.py
@@ -308,7 +308,6 @@ class Game():
         self._activity = parent
         self._colors = [colors[0]]
         self._colors.append(colors[1])
-        self._dot_cache = {}
 
         self._canvas = canvas
         if parent is not None:
@@ -444,6 +443,7 @@ class Game():
 
     def _new_dot(self, color):
         ''' generate a dot of a color color '''
+        self._dot_cache = {}
         if not color in self._dot_cache:
             self._stroke = color
             self._fill = color
diff --git a/po/en.po b/po/en.po
new file mode 100644
index 0000000..523801e
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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: 2012-03-15 15:31-0400\n"
+"PO-Revision-Date: 2012-03-16 09:27+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: activity/activity.info:2
+msgid "Deducto"
+msgstr "Deducto"
+
+#: DeductoActivity.py:92
+#, python-format
+msgid "Resuming level %d"
+msgstr "Resuming level %d"
+
+#: DeductoActivity.py:120
+msgid "Game"
+msgstr "Game"
+
+#: DeductoActivity.py:127
+msgid "Start a new game."
+msgstr "Start a new game."
+
+#: DeductoActivity.py:134 DeductoActivity.py:269
+msgid "The pattern matches the rule."
+msgstr "The pattern matches the rule."
+
+#: DeductoActivity.py:138 DeductoActivity.py:271
+msgid "The pattern does not match the rule."
+msgstr "The pattern does not match the rule."
+
+#: DeductoActivity.py:145 DeductoActivity.py:267
+msgid "Explore some examples."
+msgstr "Explore some examples."
+
+#: DeductoActivity.py:155
+msgid "Load a custom level."
+msgstr "Load a custom level."
+
+#: DeductoActivity.py:176 DeductoActivity.py:187 DeductoActivity.py:272
+#: DeductoActivity.py:435
+#, python-format
+msgid "Playing level %d"
+msgstr "Playing level %d"
+
+#: DeductoActivity.py:178
+msgid "Only sharer can start a new game."
+msgstr "Only sharer can start a new game."
+
+#: DeductoActivity.py:185
+msgid "Game over."
+msgstr "Game over."
+
+#: DeductoActivity.py:198 DeductoActivity.py:228
+msgid "Click on new game button to begin."
+msgstr "Click on new game button to begin."
+
+#: DeductoActivity.py:200 DeductoActivity.py:230
+msgid "Wait for sharer to start a new game."
+msgstr "Wait for sharer to start a new game."
+
+#: DeductoActivity.py:211 DeductoActivity.py:240
+#, python-format
+msgid "%d correct answers."
+msgstr "%d correct answers."
+
+#: DeductoActivity.py:217
+msgid "Pattern was false."
+msgstr "Pattern was false."
+
+#: DeductoActivity.py:246
+msgid "Pattern was true."
+msgstr "Pattern was true."
+
+#: DeductoActivity.py:257
+msgid "Resume play"
+msgstr "Resume play"
+
+#: DeductoActivity.py:259
+msgid "Show a pattern that matches the rule."
+msgstr "Show a pattern that matches the rule."
+
+#: DeductoActivity.py:261
+msgid "Show a pattern that does not match the rule."
+msgstr "Show a pattern that does not match the rule."
+
+#: DeductoActivity.py:263
+#, python-format
+msgid "Explore patterns with the %s and %s buttons."
+msgstr "Explore patterns with the %s and %s buttons."
+
+#: DeductoActivity.py:279
+msgid "Load a \"True\" pattern generator from the journal"
+msgstr "Load a \"True\" pattern generator from the journal"
+
+#: DeductoActivity.py:286
+msgid "Load a \"False\" pattern generator from the journal"
+msgstr "Load a \"False\" pattern generator from the journal"
+
+#: DeductoActivity.py:292
+msgid "New level added"
+msgstr "New level added"
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..165c3b5
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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: 2012-03-15 15:31-0400\n"
+"PO-Revision-Date: 2012-03-16 10:54+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: activity/activity.info:2
+msgid "Deducto"
+msgstr "Deducto"
+
+#: DeductoActivity.py:92
+#, python-format
+msgid "Resuming level %d"
+msgstr "Resuming level %d"
+
+#: DeductoActivity.py:120
+msgid "Game"
+msgstr "Game"
+
+#: DeductoActivity.py:127
+msgid "Start a new game."
+msgstr "Start a new game."
+
+#: DeductoActivity.py:134 DeductoActivity.py:269
+msgid "The pattern matches the rule."
+msgstr "The pattern matches the rule."
+
+#: DeductoActivity.py:138 DeductoActivity.py:271
+msgid "The pattern does not match the rule."
+msgstr "The pattern does not match the rule."
+
+#: DeductoActivity.py:145 DeductoActivity.py:267
+msgid "Explore some examples."
+msgstr "Explore some examples."
+
+#: DeductoActivity.py:155
+msgid "Load a custom level."
+msgstr "Load a custom level."
+
+#: DeductoActivity.py:176 DeductoActivity.py:187 DeductoActivity.py:272
+#: DeductoActivity.py:435
+#, python-format
+msgid "Playing level %d"
+msgstr "Playing level %d"
+
+#: DeductoActivity.py:178
+msgid "Only sharer can start a new game."
+msgstr "Only sharer can start a new game."
+
+#: DeductoActivity.py:185
+msgid "Game over."
+msgstr "Game over."
+
+#: DeductoActivity.py:198 DeductoActivity.py:228
+msgid "Click on new game button to begin."
+msgstr "Click on new game button to begin."
+
+#: DeductoActivity.py:200 DeductoActivity.py:230
+msgid "Wait for sharer to start a new game."
+msgstr "Wait for sharer to start a new game."
+
+#: DeductoActivity.py:211 DeductoActivity.py:240
+#, python-format
+msgid "%d correct answers."
+msgstr "%d correct answers."
+
+#: DeductoActivity.py:217
+msgid "Pattern was false."
+msgstr "Pattern was false."
+
+#: DeductoActivity.py:246
+msgid "Pattern was true."
+msgstr "Pattern was true."
+
+#: DeductoActivity.py:257
+msgid "Resume play"
+msgstr "Resume play"
+
+#: DeductoActivity.py:259
+msgid "Show a pattern that matches the rule."
+msgstr "Show a pattern that matches the rule."
+
+#: DeductoActivity.py:261
+msgid "Show a pattern that does not match the rule."
+msgstr "Show a pattern that does not match the rule."
+
+#: DeductoActivity.py:263
+#, python-format
+msgid "Explore patterns with the %s and %s buttons."
+msgstr "Explore patterns with the %s and %s buttons."
+
+#: DeductoActivity.py:279
+msgid "Load a \"True\" pattern generator from the journal"
+msgstr "Load a \"True\" pattern generator from the journal"
+
+#: DeductoActivity.py:286
+msgid "Load a \"False\" pattern generator from the journal"
+msgstr "Load a \"False\" pattern generator from the journal"
+
+#: DeductoActivity.py:292
+msgid "New level added"
+msgstr "New level added"
diff --git a/po/en_US.po b/po/en_US.po
new file mode 100644
index 0000000..b3679b4
--- /dev/null
+++ b/po/en_US.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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: 2012-03-15 15:31-0400\n"
+"PO-Revision-Date: 2012-03-16 10:19+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: activity/activity.info:2
+msgid "Deducto"
+msgstr "Deducto"
+
+#: DeductoActivity.py:92
+#, python-format
+msgid "Resuming level %d"
+msgstr "Resuming level %d"
+
+#: DeductoActivity.py:120
+msgid "Game"
+msgstr "Game"
+
+#: DeductoActivity.py:127
+msgid "Start a new game."
+msgstr "Start a new game."
+
+#: DeductoActivity.py:134 DeductoActivity.py:269
+msgid "The pattern matches the rule."
+msgstr "The pattern matches the rule."
+
+#: DeductoActivity.py:138 DeductoActivity.py:271
+msgid "The pattern does not match the rule."
+msgstr "The pattern does not match the rule."
+
+#: DeductoActivity.py:145 DeductoActivity.py:267
+msgid "Explore some examples."
+msgstr "Explore some examples."
+
+#: DeductoActivity.py:155
+msgid "Load a custom level."
+msgstr "Load a custom level."
+
+#: DeductoActivity.py:176 DeductoActivity.py:187 DeductoActivity.py:272
+#: DeductoActivity.py:435
+#, python-format
+msgid "Playing level %d"
+msgstr "Playing level %d"
+
+#: DeductoActivity.py:178
+msgid "Only sharer can start a new game."
+msgstr "Only sharer can start a new game."
+
+#: DeductoActivity.py:185
+msgid "Game over."
+msgstr "Game over."
+
+#: DeductoActivity.py:198 DeductoActivity.py:228
+msgid "Click on new game button to begin."
+msgstr "Click on new game button to begin."
+
+#: DeductoActivity.py:200 DeductoActivity.py:230
+msgid "Wait for sharer to start a new game."
+msgstr "Wait for sharer to start a new game."
+
+#: DeductoActivity.py:211 DeductoActivity.py:240
+#, python-format
+msgid "%d correct answers."
+msgstr "%d correct answers."
+
+#: DeductoActivity.py:217
+msgid "Pattern was false."
+msgstr "Pattern was false."
+
+#: DeductoActivity.py:246
+msgid "Pattern was true."
+msgstr "Pattern was true."
+
+#: DeductoActivity.py:257
+msgid "Resume play"
+msgstr "Resume play"
+
+#: DeductoActivity.py:259
+msgid "Show a pattern that matches the rule."
+msgstr "Show a pattern that matches the rule."
+
+#: DeductoActivity.py:261
+msgid "Show a pattern that does not match the rule."
+msgstr "Show a pattern that does not match the rule."
+
+#: DeductoActivity.py:263
+#, python-format
+msgid "Explore patterns with the %s and %s buttons."
+msgstr "Explore patterns with the %s and %s buttons."
+
+#: DeductoActivity.py:279
+msgid "Load a \"True\" pattern generator from the journal"
+msgstr "Load a \"True\" pattern generator from the journal"
+
+#: DeductoActivity.py:286
+msgid "Load a \"False\" pattern generator from the journal"
+msgstr "Load a \"False\" pattern generator from the journal"
+
+#: DeductoActivity.py:292
+msgid "New level added"
+msgstr "New level added"
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..dff690f
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,115 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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: 2012-03-15 15:31-0400\n"
+"PO-Revision-Date: 2012-03-16 09:12+0200\n"
+"Last-Translator: AlanJAS <alanjas@hotmail.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: activity/activity.info:2
+msgid "Deducto"
+msgstr ""
+
+#: DeductoActivity.py:92
+#, python-format
+msgid "Resuming level %d"
+msgstr ""
+
+#: DeductoActivity.py:120
+msgid "Game"
+msgstr "Juego"
+
+#: DeductoActivity.py:127
+msgid "Start a new game."
+msgstr "Comenzar nuevo juego."
+
+#: DeductoActivity.py:134 DeductoActivity.py:269
+msgid "The pattern matches the rule."
+msgstr ""
+
+#: DeductoActivity.py:138 DeductoActivity.py:271
+msgid "The pattern does not match the rule."
+msgstr ""
+
+#: DeductoActivity.py:145 DeductoActivity.py:267
+msgid "Explore some examples."
+msgstr "Explorar varios ejemplos."
+
+#: DeductoActivity.py:155
+msgid "Load a custom level."
+msgstr ""
+
+#: DeductoActivity.py:176 DeductoActivity.py:187 DeductoActivity.py:272
+#: DeductoActivity.py:435
+#, python-format
+msgid "Playing level %d"
+msgstr ""
+
+#: DeductoActivity.py:178
+msgid "Only sharer can start a new game."
+msgstr ""
+
+#: DeductoActivity.py:185
+msgid "Game over."
+msgstr ""
+
+#: DeductoActivity.py:198 DeductoActivity.py:228
+msgid "Click on new game button to begin."
+msgstr ""
+
+#: DeductoActivity.py:200 DeductoActivity.py:230
+msgid "Wait for sharer to start a new game."
+msgstr ""
+
+#: DeductoActivity.py:211 DeductoActivity.py:240
+#, python-format
+msgid "%d correct answers."
+msgstr ""
+
+#: DeductoActivity.py:217
+msgid "Pattern was false."
+msgstr ""
+
+#: DeductoActivity.py:246
+msgid "Pattern was true."
+msgstr ""
+
+#: DeductoActivity.py:257
+msgid "Resume play"
+msgstr ""
+
+#: DeductoActivity.py:259
+msgid "Show a pattern that matches the rule."
+msgstr ""
+
+#: DeductoActivity.py:261
+msgid "Show a pattern that does not match the rule."
+msgstr ""
+
+#: DeductoActivity.py:263
+#, python-format
+msgid "Explore patterns with the %s and %s buttons."
+msgstr ""
+
+#: DeductoActivity.py:279
+msgid "Load a \"True\" pattern generator from the journal"
+msgstr ""
+
+#: DeductoActivity.py:286
+msgid "Load a \"False\" pattern generator from the journal"
+msgstr ""
+
+#: DeductoActivity.py:292
+msgid "New level added"
+msgstr ""
--
cgit v0.9.1