MANIFEST

8 files changed, 143 insertions, 56 deletions

diff --git a/ReadEtextsActivity.py b/ReadEtextsActivity.py
index f6e8296..6cb86ff 100644
--- a/ReadEtextsActivity.py
+++ b/ReadEtextsActivity.py
@@ -18,13 +18,11 @@
 import os
 import re
 import logging
-import tempfile
 import time
 import zipfile
 import pygtk
 pygtk.require('2.0')
 import gtk
-import string
 from sugar.graphics import style
 from sugar import profile
 from sugar.activity import activity
@@ -920,7 +918,10 @@ class ReadEtextsActivity(activity.Activity):
 
     def set_current_page(self, page):
         self.current_page = page
-        self.update_nav_buttons()
+        if _NEW_TOOLBAR_SUPPORT:
+            self.update_nav_buttons()
+        else:
+            self.read_toolbar.update_nav_buttons()
         self.page = page
 
     def show_page(self, page_number):
diff --git a/activity/activity.info b/activity/activity.info
index 32121dd..24fe48e 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,6 +4,6 @@ service_name = org.laptop.sugar.ReadEtextsActivity
 icon = read-etexts
 exec = sugar-activity ReadEtextsActivity.ReadEtextsActivity
 show_launcher = yes
-activity_version = 19
+activity_version = 20
 mime_types = text/plain;application/zip;application/rtf
 license = GPLv2+
diff --git a/locale/de/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo b/locale/de/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
index 98399a8..f96981f 100644
--- a/locale/de/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
+++ b/locale/de/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
diff --git a/locale/it/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo b/locale/it/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
index aa93611..bf1e22c 100644
--- a/locale/it/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
+++ b/locale/it/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
diff --git a/locale/mn/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo b/locale/mn/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
index fffed00..3bc9693 100644
--- a/locale/mn/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
+++ b/locale/mn/LC_MESSAGES/org.laptop.sugar.ReadEtextsActivity.mo
diff --git a/po/de.po b/po/de.po
index 9041e34..f65c8ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 00:32-0400\n"
+"POT-Creation-Date: 2009-11-03 00:32-0500\n"
 "PO-Revision-Date: 2009-02-19 18:29-0600\n"
 "Last-Translator: James Simmons <ja.simmons@sbcglobal.net>\n"
 "Language-Team: German\n"
@@ -20,60 +20,60 @@ msgstr ""
 msgid "Read ETexts"
 msgstr "Lese-Aktivitäten"
 
-#: ReadEtextsActivity.py:188
+#: ReadEtextsActivity.py:201
 msgid "Edit"
 msgstr ""
 
-#: ReadEtextsActivity.py:193
+#: ReadEtextsActivity.py:206
 msgid "Read"
 msgstr ""
 
-#: ReadEtextsActivity.py:199
+#: ReadEtextsActivity.py:212
 msgid "Books"
 msgstr ""
 
-#: ReadEtextsActivity.py:204
+#: ReadEtextsActivity.py:217
 msgid "View"
 msgstr "Ansehen"
 
-#: ReadEtextsActivity.py:212
+#: ReadEtextsActivity.py:225
 msgid "Speech"
 msgstr ""
 
-#: ReadEtextsActivity.py:845 ReadEtextsActivity.py:895
-#: ReadEtextsActivity.py:947
+#: ReadEtextsActivity.py:944 ReadEtextsActivity.py:994
+#: ReadEtextsActivity.py:1046
 msgid "Error"
 msgstr ""
 
-#: ReadEtextsActivity.py:845
+#: ReadEtextsActivity.py:944
 msgid "You must enter at least one search word."
 msgstr ""
 
-#: ReadEtextsActivity.py:895
+#: ReadEtextsActivity.py:994
 msgid "Connection timed out for "
 msgstr ""
 
-#: ReadEtextsActivity.py:947
+#: ReadEtextsActivity.py:1046
 msgid "Could not download "
 msgstr ""
 
-#: ReadEtextsActivity.py:947
+#: ReadEtextsActivity.py:1046
 msgid " path in catalog may be incorrect."
 msgstr ""
 
-#: ReadEtextsActivity.py:980
+#: ReadEtextsActivity.py:1079
 msgid "Success"
 msgstr ""
 
-#: ReadEtextsActivity.py:980
+#: ReadEtextsActivity.py:1079
 msgid " added to Journal."
 msgstr ""
 
-#: ReadEtextsActivity.py:1096
+#: ReadEtextsActivity.py:1197
 msgid "Failure"
 msgstr ""
 
-#: ReadEtextsActivity.py:1096
+#: ReadEtextsActivity.py:1197
 msgid "Error getting document from tube"
 msgstr ""
 
@@ -105,43 +105,47 @@ msgstr ""
 msgid "Toggle Bookmark"
 msgstr ""
 
-#: readtoolbar.py:195
+#: readtoolbar.py:124
+msgid "Underline"
+msgstr ""
+
+#: readtoolbar.py:218
 msgid "Zoom out"
 msgstr ""
 
-#: readtoolbar.py:201
+#: readtoolbar.py:224
 msgid "Zoom in"
 msgstr ""
 
-#: readtoolbar.py:212
+#: readtoolbar.py:235
 msgid "Fullscreen"
 msgstr ""
 
-#: readtoolbar.py:255
+#: readtoolbar.py:280
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: readtoolbar.py:262
+#: readtoolbar.py:287
 msgid "Next"
 msgstr "Nächstes"
 
-#: readtoolbar.py:311
+#: readtoolbar.py:339
 msgid "Get Book"
 msgstr ""
 
-#: readtoolbar.py:318
+#: readtoolbar.py:346
 msgid "Remove Results List"
 msgstr ""
 
-#: readtoolbar.py:378
+#: readtoolbar.py:406
 msgid "Play / Pause"
 msgstr ""
 
-#: readtoolbar.py:428
+#: readtoolbar.py:456
 msgid "pitch adjusted"
 msgstr ""
 
-#: readtoolbar.py:432
+#: readtoolbar.py:460
 msgid "rate adjusted"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 3452127..1b3939c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-03 00:32-0500\n"
-"PO-Revision-Date: 2009-11-09 04:04-0400\n"
-"Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
+"PO-Revision-Date: 2010-03-25 22:29+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\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 1.2.1\n"
+"X-Generator: Pootle 2.0.3\n"
 
 #: activity/activity.info:2
 msgid "Read ETexts"
@@ -48,7 +48,7 @@ msgstr "Errore"
 
 #: ReadEtextsActivity.py:944
 msgid "You must enter at least one search word."
-msgstr "Devi inserire almeno una parola da ricercare"
+msgstr "Devi inserire almeno una parola da ricercare."
 
 #: ReadEtextsActivity.py:994
 msgid "Connection timed out for "
diff --git a/po/mn.po b/po/mn.po
index cc3b273..8659430 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -2,72 +2,154 @@
 # 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-02-19 18:25-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-03 00:32-0500\n"
+"PO-Revision-Date: 2010-01-12 21:57-0400\n"
+"Last-Translator: Odontsetseg Bat-Erdene <obat-erdene@suffolk.edu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: mn\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Read ETexts"
 msgstr ""
 
-#: ReadEtextsActivity.py:147
+#: ReadEtextsActivity.py:201
 msgid "Edit"
-msgstr ""
+msgstr "Засварлах"
 
-#: ReadEtextsActivity.py:152
+#: ReadEtextsActivity.py:206
 msgid "Read"
-msgstr ""
+msgstr "Унших"
+
+#: ReadEtextsActivity.py:212
+msgid "Books"
+msgstr "Ном"
 
-#: ReadEtextsActivity.py:157
+#: ReadEtextsActivity.py:217
 msgid "View"
-msgstr ""
+msgstr "Харах"
 
-#: ReadEtextsActivity.py:163
+#: ReadEtextsActivity.py:225
 msgid "Speech"
+msgstr "Хэл яриа"
+
+#: ReadEtextsActivity.py:944 ReadEtextsActivity.py:994
+#: ReadEtextsActivity.py:1046
+msgid "Error"
+msgstr "Алдаа"
+
+#: ReadEtextsActivity.py:944
+msgid "You must enter at least one search word."
+msgstr "Та ядаж нэг хайлтийн үг орох хэрэгтэй."
+
+#: ReadEtextsActivity.py:994
+msgid "Connection timed out for "
 msgstr ""
 
-#: ReadEtextsActivity.py:228
-msgid "Choose document"
+#: ReadEtextsActivity.py:1046
+msgid "Could not download "
 msgstr ""
 
-#: readtoolbar.py:43
+#: ReadEtextsActivity.py:1046
+msgid " path in catalog may be incorrect."
+msgstr ""
+
+#: ReadEtextsActivity.py:1079
+msgid "Success"
+msgstr "Амжилт"
+
+#: ReadEtextsActivity.py:1079
+msgid " added to Journal."
+msgstr " Журналд нэмэгдсэн."
+
+#: ReadEtextsActivity.py:1197
+msgid "Failure"
+msgstr ""
+
+#: ReadEtextsActivity.py:1197
+msgid "Error getting document from tube"
+msgstr ""
+
+#: readtoolbar.py:42
 msgid "Back"
 msgstr ""
 
-#: readtoolbar.py:50
+#: readtoolbar.py:45
+msgid "Previous page"
+msgstr ""
+
+#: readtoolbar.py:48
+msgid "Previous bookmark"
+msgstr ""
+
+#: readtoolbar.py:58
 msgid "Forward"
 msgstr ""
 
-#: readtoolbar.py:159
+#: readtoolbar.py:61
+msgid "Next page"
+msgstr ""
+
+#: readtoolbar.py:64
+msgid "Next bookmark"
+msgstr ""
+
+#: readtoolbar.py:113
+msgid "Toggle Bookmark"
+msgstr ""
+
+#: readtoolbar.py:124
+msgid "Underline"
+msgstr ""
+
+#: readtoolbar.py:218
 msgid "Zoom out"
 msgstr ""
 
-#: readtoolbar.py:165
+#: readtoolbar.py:224
 msgid "Zoom in"
 msgstr ""
 
-#: readtoolbar.py:205
+#: readtoolbar.py:235
+msgid "Fullscreen"
+msgstr ""
+
+#: readtoolbar.py:280
 msgid "Previous"
 msgstr ""
 
-#: readtoolbar.py:212
+#: readtoolbar.py:287
 msgid "Next"
 msgstr ""
 
-#: readtoolbar.py:312
+#: readtoolbar.py:339
+msgid "Get Book"
+msgstr ""
+
+#: readtoolbar.py:346
+msgid "Remove Results List"
+msgstr ""
+
+#: readtoolbar.py:406
+msgid "Play / Pause"
+msgstr ""
+
+#: readtoolbar.py:456
 msgid "pitch adjusted"
 msgstr ""
 
-#: readtoolbar.py:316
+#: readtoolbar.py:460
 msgid "rate adjusted"
 msgstr ""
+
+#: readsidebar.py:47
+msgid "Bookmark"
+msgstr ""