Reorganize project so that each Activity version has its own directory.

67 files changed, 201 insertions, 75 deletions

diff --git a/MANIFEST b/Add_Refinements/MANIFEST
index 77e55dc..e724c0c 100644
--- a/MANIFEST
+++ b/Add_Refinements/MANIFEST
@@ -1,6 +1,6 @@
 toolbar.py
 setup.py
-ReadEtextsActivity.py
 ReadEtextsActivity2.py
 activity/read-etexts.svg
 activity/activity.info
+po/ReadEtextsII.pot
diff --git a/ReadEtextsActivity2.py b/Add_Refinements/ReadEtextsActivity2.py
index 906edac..906edac 100644
--- a/ReadEtextsActivity2.py
+++ b/Add_Refinements/ReadEtextsActivity2.py
diff --git a/activity/activity.info b/Add_Refinements/activity/activity.info
index 137333f..738f496 100644
--- a/activity/activity.info
+++ b/Add_Refinements/activity/activity.info
@@ -1,8 +1,8 @@
 [Activity]
 name = ReadEtexts II
-service_name = net.flossmanuals.ReadETexts
+service_name = net.flossmanuals.ReadETextsActivity2
 icon = read-etexts
-exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
+exec = sugar-activity ReadEtextsActivity2.ReadEtextsActivity
 show_launcher = no
 mime_types = text/plain;application/zip
 activity_version = 1
diff --git a/activity/activity.info b/Add_Refinements/activity/activity.info~
index 137333f..137333f 100644
--- a/activity/activity.info
+++ b/Add_Refinements/activity/activity.info~
diff --git a/activity/read-etexts.svg b/Add_Refinements/activity/read-etexts.svg
index 5682ec8..5682ec8 100644
--- a/activity/read-etexts.svg
+++ b/Add_Refinements/activity/read-etexts.svg
diff --git a/po/ReadETextsII.pot b/Add_Refinements/po/ReadEtextsII.pot
index 548c2a8..0df8967 100644
--- a/po/ReadETextsII.pot
+++ b/Add_Refinements/po/ReadEtextsII.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 18:31-0600\n"
+"POT-Creation-Date: 2010-03-05 09:47-0600\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"
@@ -17,37 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-msgid "Read ETexts II"
+msgid "ReadEtexts II"
 msgstr ""
 
-#: toolbar.py:34
+#: toolbar.py:36
 msgid "Back"
 msgstr ""
 
-#: toolbar.py:40
+#: toolbar.py:42
 msgid "Forward"
 msgstr ""
 
-#: toolbar.py:115
+#: toolbar.py:117
 msgid "Zoom out"
 msgstr ""
 
-#: toolbar.py:120
+#: toolbar.py:122
 msgid "Zoom in"
 msgstr ""
 
-#: toolbar.py:130
+#: toolbar.py:132
 msgid "Fullscreen"
 msgstr ""
 
-#: ReadEtextsActivity2.py:34
+#: ReadEtextsActivity2.py:54
 msgid "Edit"
 msgstr ""
 
-#: ReadEtextsActivity2.py:38
+#: ReadEtextsActivity2.py:58
 msgid "Read"
 msgstr ""
 
-#: ReadEtextsActivity2.py:46
+#: ReadEtextsActivity2.py:66
 msgid "View"
 msgstr ""
diff --git a/setup.py b/Add_Refinements/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/Add_Refinements/setup.py
diff --git a/toolbar.py b/Add_Refinements/toolbar.py
index 564602c..564602c 100644
--- a/toolbar.py
+++ b/Add_Refinements/toolbar.py
diff --git a/ReadEtextsTTS.py b/Adding_TTS/ReadEtextsTTS.py
index 935a0ee..935a0ee 100755
--- a/ReadEtextsTTS.py
+++ b/Adding_TTS/ReadEtextsTTS.py
diff --git a/espeak.py b/Adding_TTS/espeak.py
index fbb1b22..fbb1b22 100755
--- a/espeak.py
+++ b/Adding_TTS/espeak.py
diff --git a/gst_choir_example.py b/Adding_TTS/gst_choir_example.py
index 9ea653f..9ea653f 100644..100755
--- a/gst_choir_example.py
+++ b/Adding_TTS/gst_choir_example.py
diff --git a/gst_simple_example.py b/Adding_TTS/gst_simple_example.py
index 6ae2707..6ae2707 100644..100755
--- a/gst_simple_example.py
+++ b/Adding_TTS/gst_simple_example.py
diff --git a/gst_simple_tts.py b/Adding_TTS/gst_simple_tts.py
index 34dcccf..34dcccf 100644..100755
--- a/gst_simple_tts.py
+++ b/Adding_TTS/gst_simple_tts.py
diff --git a/gst_track_marks.py b/Adding_TTS/gst_track_marks.py
index 5eecb78..5eecb78 100644..100755
--- a/gst_track_marks.py
+++ b/Adding_TTS/gst_track_marks.py
diff --git a/gst_track_words.py b/Adding_TTS/gst_track_words.py
index fe61c8a..fe61c8a 100644..100755
--- a/gst_track_words.py
+++ b/Adding_TTS/gst_track_words.py
diff --git a/speech.py b/Adding_TTS/speech.py
index cdab7d2..cdab7d2 100644
--- a/speech.py
+++ b/Adding_TTS/speech.py
diff --git a/Adding_TTS/testtts.txt b/Adding_TTS/testtts.txt
new file mode 100644
index 0000000..4057792
--- /dev/null
+++ b/Adding_TTS/testtts.txt
@@ -0,0 +1,21 @@
+Jane Austen? Why I go so far as to say that any library is a good library that does not contain a volume by Jane 
+Austen. Even if it contains no other book.
+
+- quoted in Remembered Yesterdays, Robert Underwood Johnson
+
+To me his prose is unreadable -- like Jane Austin's [sic]. No there is a difference. I could read his prose on salary, but 
+not Jane's. Jane is entirely impossible. It seems a great pity that they allowed her to die a natural death.
+
+- Letter to W. D. Howells, 18 January 1909
+
+Jane Austen's books, too, are absent from this library. Just that one omission alone would make a 
+fairly good library out of a library that hadn't a book in it.
+
+- Following the Equator
+
+I haven't any right to criticise books, and I don't do it except when I hate them. I often want to criticise 
+Jane Austen, but her books madden me so that I can't conceal my frenzy from the reader; and therefore I have 
+to stop every time I begin. Everytime I read 'Pride and Prejudice' I want to dig her up and beat her over 
+the skull with her own shin-bone.
+
+- Letter to Joseph Twichell, 13 September 1898 
diff --git a/testtts.txt b/Adding_TTS/testtts.txt~
index 38baf0e..38baf0e 100644
--- a/testtts.txt
+++ b/Adding_TTS/testtts.txt~
diff --git a/MANIFEST b/Inherit_From_sugar.activity.Activity/MANIFEST
index 77e55dc..8cba1c5 100644
--- a/MANIFEST
+++ b/Inherit_From_sugar.activity.Activity/MANIFEST
@@ -1,6 +1,7 @@
-toolbar.py
+
 setup.py
 ReadEtextsActivity.py
-ReadEtextsActivity2.py
+
 activity/read-etexts.svg
 activity/activity.info
+po/ReadEtextsI.pot
diff --git a/ReadEtextsActivity.py b/Inherit_From_sugar.activity.Activity/ReadEtextsActivity.py
index 9a9372a..9a9372a 100644
--- a/ReadEtextsActivity.py
+++ b/Inherit_From_sugar.activity.Activity/ReadEtextsActivity.py
diff --git a/Inherit_From_sugar.activity.Activity/activity/activity.info b/Inherit_From_sugar.activity.Activity/activity/activity.info
new file mode 100644
index 0000000..e1cdf73
--- /dev/null
+++ b/Inherit_From_sugar.activity.Activity/activity/activity.info
@@ -0,0 +1,9 @@
+[Activity]
+name = ReadEtexts I
+service_name = net.flossmanuals.ReadETextsActivity
+icon = read-etexts
+exec = sugar-activity ReadEtextsActivity.ReadEtextsActivity
+show_launcher = no
+mime_types = text/plain;application/zip
+activity_version = 1
+license = GPLv2+
diff --git a/activity/activity.info b/Inherit_From_sugar.activity.Activity/activity/activity.info~
index 137333f..b696c1e 100644
--- a/activity/activity.info
+++ b/Inherit_From_sugar.activity.Activity/activity/activity.info~
@@ -1,8 +1,8 @@
 [Activity]
 name = ReadEtexts II
-service_name = net.flossmanuals.ReadETexts
+service_name = net.flossmanuals.ReadETextsActivity
 icon = read-etexts
-exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
+exec = sugar-activity ReadEtextsActivity.ReadEtextsActivity
 show_launcher = no
 mime_types = text/plain;application/zip
 activity_version = 1
diff --git a/activity/read-etexts.svg b/Inherit_From_sugar.activity.Activity/activity/read-etexts.svg
index 5682ec8..5682ec8 100644
--- a/activity/read-etexts.svg
+++ b/Inherit_From_sugar.activity.Activity/activity/read-etexts.svg
diff --git a/Inherit_From_sugar.activity.Activity/po/ReadEtextsI.pot b/Inherit_From_sugar.activity.Activity/po/ReadEtextsI.pot
new file mode 100644
index 0000000..4ff74e6
--- /dev/null
+++ b/Inherit_From_sugar.activity.Activity/po/ReadEtextsI.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (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: 2010-03-05 09:50-0600\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
+msgid "ReadEtexts I"
+msgstr ""
diff --git a/setup.py b/Inherit_From_sugar.activity.Activity/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/Inherit_From_sugar.activity.Activity/setup.py
diff --git a/ReadEtexts.py b/Make_Standalone_Python/ReadEtexts.py
index 9e3522f..9e3522f 100755
--- a/ReadEtexts.py
+++ b/Make_Standalone_Python/ReadEtexts.py
diff --git a/DemoiselleActivity.py b/Making_Activities_Using_PyGame/DemoiselleActivity.py
index 2c6c99f..2c6c99f 100644
--- a/DemoiselleActivity.py
+++ b/Making_Activities_Using_PyGame/DemoiselleActivity.py
diff --git a/Making_Activities_Using_PyGame/MANIFEST b/Making_Activities_Using_PyGame/MANIFEST
new file mode 100644
index 0000000..42b54df
--- /dev/null
+++ b/Making_Activities_Using_PyGame/MANIFEST
@@ -0,0 +1,17 @@
+
+setup.py
+
+
+activity/read-etexts.svg
+activity/activity.info
+demoiselle2.py
+glider_hit.png
+demoiselle.py
+demoiselle.png
+DemoiselleActivity.py
+sky.jpg
+glider_normal.png
+po/Demoiselle.pot
+sugargame/event.py
+sugargame/__init__.py
+sugargame/canvas.py
diff --git a/Making_Activities_Using_PyGame/activity/activity.info b/Making_Activities_Using_PyGame/activity/activity.info
new file mode 100644
index 0000000..2767e12
--- /dev/null
+++ b/Making_Activities_Using_PyGame/activity/activity.info
@@ -0,0 +1,9 @@
+[Activity]
+name = Demoiselle
+service_name = net.flossmanuals.Demoiselle
+icon = read-etexts
+exec = sugar-activity DemoiselleActivity.DemoiselleActivity
+show_launcher = yes
+activity_version = 1
+license = GPLv2+
+
diff --git a/activity/activity.info b/Making_Activities_Using_PyGame/activity/activity.info~
index 137333f..137333f 100644
--- a/activity/activity.info
+++ b/Making_Activities_Using_PyGame/activity/activity.info~
diff --git a/activity/read-etexts.svg b/Making_Activities_Using_PyGame/activity/read-etexts.svg
index 5682ec8..5682ec8 100644
--- a/activity/read-etexts.svg
+++ b/Making_Activities_Using_PyGame/activity/read-etexts.svg
diff --git a/demoiselle.png b/Making_Activities_Using_PyGame/demoiselle.png
index 37db411..37db411 100644
--- a/demoiselle.png
+++ b/Making_Activities_Using_PyGame/demoiselle.png
diff --git a/demoiselle.py b/Making_Activities_Using_PyGame/demoiselle.py
index 93817e1..93817e1 100755
--- a/demoiselle.py
+++ b/Making_Activities_Using_PyGame/demoiselle.py
diff --git a/demoiselle2.py b/Making_Activities_Using_PyGame/demoiselle2.py
index 46656ca..46656ca 100755
--- a/demoiselle2.py
+++ b/Making_Activities_Using_PyGame/demoiselle2.py
diff --git a/glider_hit.png b/Making_Activities_Using_PyGame/glider_hit.png
index 49f0a8c..49f0a8c 100644
--- a/glider_hit.png
+++ b/Making_Activities_Using_PyGame/glider_hit.png
diff --git a/glider_normal.png b/Making_Activities_Using_PyGame/glider_normal.png
index 8fa812b..8fa812b 100644
--- a/glider_normal.png
+++ b/Making_Activities_Using_PyGame/glider_normal.png
diff --git a/Making_Activities_Using_PyGame/po/Demoiselle.pot b/Making_Activities_Using_PyGame/po/Demoiselle.pot
new file mode 100644
index 0000000..e50ab51
--- /dev/null
+++ b/Making_Activities_Using_PyGame/po/Demoiselle.pot
@@ -0,0 +1,3 @@
+#: activity/activity.info:2
+msgid "Demoiselle"
+msgstr ""
diff --git a/setup.py b/Making_Activities_Using_PyGame/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/Making_Activities_Using_PyGame/setup.py
diff --git a/sky.jpg b/Making_Activities_Using_PyGame/sky.jpg
index a92cf6c..a92cf6c 100644
--- a/sky.jpg
+++ b/Making_Activities_Using_PyGame/sky.jpg
diff --git a/sugargame/__init__.py b/Making_Activities_Using_PyGame/sugargame/__init__.py
index 7e49527..7e49527 100644
--- a/sugargame/__init__.py
+++ b/Making_Activities_Using_PyGame/sugargame/__init__.py
diff --git a/sugargame/canvas.py b/Making_Activities_Using_PyGame/sugargame/canvas.py
index cf99a13..cf99a13 100644
--- a/sugargame/canvas.py
+++ b/Making_Activities_Using_PyGame/sugargame/canvas.py
diff --git a/sugargame/event.py b/Making_Activities_Using_PyGame/sugargame/event.py
index 52ca4ab..52ca4ab 100644
--- a/sugargame/event.py
+++ b/Making_Activities_Using_PyGame/sugargame/event.py
diff --git a/MANIFEST b/Making_Shared_Activities/MANIFEST
index 77e55dc..a46aae0 100644
--- a/MANIFEST
+++ b/Making_Shared_Activities/MANIFEST
@@ -1,6 +1,8 @@
 toolbar.py
 setup.py
-ReadEtextsActivity.py
-ReadEtextsActivity2.py
+
+
 activity/read-etexts.svg
 activity/activity.info
+ReadEtextsActivity3.py
+po/ReadEtextsIII.pot
diff --git a/ReadEtextsActivity3.py b/Making_Shared_Activities/ReadEtextsActivity3.py
index ada9846..ada9846 100644
--- a/ReadEtextsActivity3.py
+++ b/Making_Shared_Activities/ReadEtextsActivity3.py
diff --git a/Making_Shared_Activities/activity/activity.info b/Making_Shared_Activities/activity/activity.info
new file mode 100644
index 0000000..0add223
--- /dev/null
+++ b/Making_Shared_Activities/activity/activity.info
@@ -0,0 +1,9 @@
+[Activity]
+name = ReadEtexts III
+service_name = net.flossmanuals.ReadETextsActivity3
+icon = read-etexts
+exec = sugar-activity ReadEtextsActivity3.ReadEtextsActivity
+show_launcher = no
+mime_types = text/plain;application/zip
+activity_version = 1
+license = GPLv2+
diff --git a/activity/activity.info b/Making_Shared_Activities/activity/activity.info~
index 137333f..137333f 100644
--- a/activity/activity.info
+++ b/Making_Shared_Activities/activity/activity.info~
diff --git a/activity/read-etexts.svg b/Making_Shared_Activities/activity/read-etexts.svg
index 5682ec8..5682ec8 100644
--- a/activity/read-etexts.svg
+++ b/Making_Shared_Activities/activity/read-etexts.svg
diff --git a/po/ReadETextsII.pot b/Making_Shared_Activities/po/ReadEtextsIII.pot
index 548c2a8..fb2e8cb 100644
--- a/po/ReadETextsII.pot
+++ b/Making_Shared_Activities/po/ReadEtextsIII.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 18:31-0600\n"
+"POT-Creation-Date: 2010-03-05 10:32-0600\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"
@@ -17,37 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-msgid "Read ETexts II"
+msgid "ReadEtexts III"
 msgstr ""
 
-#: toolbar.py:34
+#: toolbar.py:36
 msgid "Back"
 msgstr ""
 
-#: toolbar.py:40
+#: toolbar.py:42
 msgid "Forward"
 msgstr ""
 
-#: toolbar.py:115
+#: toolbar.py:117
 msgid "Zoom out"
 msgstr ""
 
-#: toolbar.py:120
+#: toolbar.py:122
 msgid "Zoom in"
 msgstr ""
 
-#: toolbar.py:130
+#: toolbar.py:132
 msgid "Fullscreen"
 msgstr ""
 
-#: ReadEtextsActivity2.py:34
+#: ReadEtextsActivity3.py:108
 msgid "Edit"
 msgstr ""
 
-#: ReadEtextsActivity2.py:38
+#: ReadEtextsActivity3.py:112
 msgid "Read"
 msgstr ""
 
-#: ReadEtextsActivity2.py:46
+#: ReadEtextsActivity3.py:120
 msgid "View"
 msgstr ""
+
+#: ReadEtextsActivity3.py:541
+msgid "Failure"
+msgstr ""
+
+#: ReadEtextsActivity3.py:541
+msgid "Error getting document from tube"
+msgstr ""
diff --git a/setup.py b/Making_Shared_Activities/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/Making_Shared_Activities/setup.py
diff --git a/toolbar.py b/Making_Shared_Activities/toolbar.py
index 564602c..564602c 100644
--- a/toolbar.py
+++ b/Making_Shared_Activities/toolbar.py
diff --git a/MiniChat/MANIFEST b/MiniChat/MANIFEST
new file mode 100644
index 0000000..51c6abf
--- /dev/null
+++ b/MiniChat/MANIFEST
@@ -0,0 +1,10 @@
+
+setup.py
+
+
+
+activity/activity.info
+minichat.py
+textchannel.py
+activity/chat.svg
+po/MiniChat.pot
diff --git a/MiniChat/activity/activity.info b/MiniChat/activity/activity.info
new file mode 100644
index 0000000..689414c
--- /dev/null
+++ b/MiniChat/activity/activity.info
@@ -0,0 +1,9 @@
+[Activity]
+name = Mini Chat
+service_name = net.flossmanuals.MiniChat
+icon = chat
+exec = sugar-activity minichat.MiniChat
+show_launcher = yes
+activity_version = 1
+license = GPLv2+
+
diff --git a/activity/activity.info b/MiniChat/activity/activity.info~
index 137333f..8355763 100644
--- a/activity/activity.info
+++ b/MiniChat/activity/activity.info~
@@ -1,7 +1,7 @@
 [Activity]
-name = ReadEtexts II
-service_name = net.flossmanuals.ReadETexts
-icon = read-etexts
+name = MiniChat
+service_name = net.flossmanuals.MiniChat
+icon = chat
 exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
 show_launcher = no
 mime_types = text/plain;application/zip
diff --git a/activity/chat.svg b/MiniChat/activity/chat.svg
index b0df51b..b0df51b 100644
--- a/activity/chat.svg
+++ b/MiniChat/activity/chat.svg
diff --git a/minichat.py b/MiniChat/minichat.py
index ce48cea..ce48cea 100644
--- a/minichat.py
+++ b/MiniChat/minichat.py
diff --git a/po/ReadETextsII.pot b/MiniChat/po/MiniChat.pot
index 548c2a8..074f630 100644
--- a/po/ReadETextsII.pot
+++ b/MiniChat/po/MiniChat.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 18:31-0600\n"
+"POT-Creation-Date: 2010-03-05 10:33-0600\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"
@@ -17,37 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-msgid "Read ETexts II"
+msgid "Mini Chat"
 msgstr ""
 
-#: toolbar.py:34
-msgid "Back"
+#: minichat.py:70
+msgid "Off-line"
 msgstr ""
 
-#: toolbar.py:40
-msgid "Forward"
+#: minichat.py:70
+msgid "Share, or invite someone."
 msgstr ""
 
-#: toolbar.py:115
-msgid "Zoom out"
+#: minichat.py:91
+msgid "On-line"
 msgstr ""
 
-#: toolbar.py:120
-msgid "Zoom in"
+#: minichat.py:91
+msgid "Connected"
 msgstr ""
 
-#: toolbar.py:130
-msgid "Fullscreen"
+#: minichat.py:125
+msgid "joined the chat"
 msgstr ""
 
-#: ReadEtextsActivity2.py:34
-msgid "Edit"
+#: minichat.py:136
+msgid "left the chat"
 msgstr ""
 
-#: ReadEtextsActivity2.py:38
-msgid "Read"
-msgstr ""
-
-#: ReadEtextsActivity2.py:46
-msgid "View"
+#: minichat.py:147
+msgid "is here"
 msgstr ""
diff --git a/setup.py b/MiniChat/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/MiniChat/setup.py
diff --git a/textchannel.py b/MiniChat/textchannel.py
index 1dfe1ac..1dfe1ac 100644
--- a/textchannel.py
+++ b/MiniChat/textchannel.py
diff --git a/MANIFEST b/New_Style_Toolbars/MANIFEST
index 77e55dc..f45e662 100644
--- a/MANIFEST
+++ b/New_Style_Toolbars/MANIFEST
@@ -1,6 +1,9 @@
 toolbar.py
 setup.py
-ReadEtextsActivity.py
-ReadEtextsActivity2.py
+
+
 activity/read-etexts.svg
 activity/activity.info
+ReadEtextsActivity4.py
+mybutton.py
+po/ReadEtextsIV.pot
diff --git a/ReadEtextsActivity4.py b/New_Style_Toolbars/ReadEtextsActivity4.py
index ad5604a..ad5604a 100644
--- a/ReadEtextsActivity4.py
+++ b/New_Style_Toolbars/ReadEtextsActivity4.py
diff --git a/activity/activity.info b/New_Style_Toolbars/activity/activity.info
index 137333f..7197bd8 100644
--- a/activity/activity.info
+++ b/New_Style_Toolbars/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
-name = ReadEtexts II
-service_name = net.flossmanuals.ReadETexts
+name = ReadEtexts IV
+service_name = net.flossmanuals.ReadETextsActivity4
 icon = read-etexts
 exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
 show_launcher = no
diff --git a/activity/activity.info b/New_Style_Toolbars/activity/activity.info~
index 137333f..670a054 100644
--- a/activity/activity.info
+++ b/New_Style_Toolbars/activity/activity.info~
@@ -1,6 +1,6 @@
 [Activity]
 name = ReadEtexts II
-service_name = net.flossmanuals.ReadETexts
+service_name = net.flossmanuals.ReadETextsActivity4
 icon = read-etexts
 exec = sugar-activity ReadEtextsActivity4.ReadEtextsActivity
 show_launcher = no
diff --git a/activity/read-etexts.svg b/New_Style_Toolbars/activity/read-etexts.svg
index 5682ec8..5682ec8 100644
--- a/activity/read-etexts.svg
+++ b/New_Style_Toolbars/activity/read-etexts.svg
diff --git a/mybutton.py b/New_Style_Toolbars/mybutton.py
index 38a7acb..38a7acb 100644
--- a/mybutton.py
+++ b/New_Style_Toolbars/mybutton.py
diff --git a/po/ReadETextsII.pot b/New_Style_Toolbars/po/ReadEtextsIV.pot
index 548c2a8..7d32f32 100644
--- a/po/ReadETextsII.pot
+++ b/New_Style_Toolbars/po/ReadEtextsIV.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 18:31-0600\n"
+"POT-Creation-Date: 2010-03-05 10:39-0600\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"
@@ -17,37 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-msgid "Read ETexts II"
+msgid "ReadEtexts IV"
 msgstr ""
 
-#: toolbar.py:34
-msgid "Back"
+#: ReadEtextsActivity4.py:182
+msgid "Edit"
 msgstr ""
 
-#: toolbar.py:40
-msgid "Forward"
+#: ReadEtextsActivity4.py:186
+msgid "Read"
 msgstr ""
 
-#: toolbar.py:115
-msgid "Zoom out"
+#: ReadEtextsActivity4.py:194
+msgid "View"
 msgstr ""
 
-#: toolbar.py:120
-msgid "Zoom in"
+#: ReadEtextsActivity4.py:240 toolbar.py:36
+msgid "Back"
 msgstr ""
 
-#: toolbar.py:130
-msgid "Fullscreen"
+#: ReadEtextsActivity4.py:247 toolbar.py:42
+msgid "Forward"
 msgstr ""
 
-#: ReadEtextsActivity2.py:34
-msgid "Edit"
+#: ReadEtextsActivity4.py:705
+msgid "Failure"
 msgstr ""
 
-#: ReadEtextsActivity2.py:38
-msgid "Read"
+#: ReadEtextsActivity4.py:705
+msgid "Error getting document from tube"
 msgstr ""
 
-#: ReadEtextsActivity2.py:46
-msgid "View"
+#: toolbar.py:117
+msgid "Zoom out"
+msgstr ""
+
+#: toolbar.py:122
+msgid "Zoom in"
+msgstr ""
+
+#: toolbar.py:132
+msgid "Fullscreen"
 msgstr ""
diff --git a/setup.py b/New_Style_Toolbars/setup.py
index ebc201d..ebc201d 100755
--- a/setup.py
+++ b/New_Style_Toolbars/setup.py
diff --git a/toolbar.py b/New_Style_Toolbars/toolbar.py
index 564602c..564602c 100644
--- a/toolbar.py
+++ b/New_Style_Toolbars/toolbar.py