Apply f9e35fbfe668fabc0e319cacd63f6ba74c4a7c50 mainline's patch

5 files changed, 27 insertions, 10 deletions

diff --git a/GUI_Components/Edit_Pane.py b/GUI_Components/Edit_Pane.py
index d01cd90..f6c8056 100644
--- a/GUI_Components/Edit_Pane.py
+++ b/GUI_Components/Edit_Pane.py
@@ -142,7 +142,8 @@ class Edit_Pane(Pane):
         return article

     

     def set_working_article(self, article):

-        self.editarticle.articletitle.set_markup("<span size='medium'><b>" + _("Theme:") + "</b>  %s  \n<b>" + _("Article:") + "</b>  %s</span>"%(article.article_theme, article.article_title))

+        self.editarticle.articletitle.set_markup("<span size='medium'><b> %s </b>  %s  \n<b> %s </b>  %s</span>" % \

+            (_("Theme:"), article.article_theme, _("Article:"), article.article_title))

         self.editarticle.textbox.set_article(article)

         self.editarticle.article_theme = _("Wikipedia Articles")

         

diff --git a/GUI_Components/Format_Pane.py b/GUI_Components/Format_Pane.py
index 511d633..d4bba35 100644
--- a/GUI_Components/Format_Pane.py
+++ b/GUI_Components/Format_Pane.py
@@ -95,5 +95,6 @@ class Format_Pane(Pane):
         return article

     

     def set_working_article(self, article):

-        self.panel.articletitle.set_markup("<span size='medium'><b>" + _("Theme:") + "</b>  %s   \n<b>" + _("Article:") + "</b>  %s</span>"%(article.article_theme, article.article_title))

+        self.panel.articletitle.set_markup("<span size='medium'><b> %s </b>  %s   \n<b> %s </b>  %s</span>" % \
+            (_("Theme:"), article.article_theme, _("Article:"), article.article_title))

         self.panel.textbox.set_article(article)      
diff --git a/GUI_Components/Image_Pane.py b/GUI_Components/Image_Pane.py
index 648104e..56161e4 100644
--- a/GUI_Components/Image_Pane.py
+++ b/GUI_Components/Image_Pane.py
@@ -110,7 +110,8 @@ class Image_Pane(Pane):
     def set_working_article(self, article):

         logger.debug("working received, title %s theme %s " %
                 (article.article_title, article.article_theme))

-        self.editarticle.articletitle.set_markup("<span size='medium'><b>" + _("Theme:") + "</b>  %s   \n<b>" + _("Article:") + "</b>  %s</span>"%(article.article_theme, article.article_title))

+        self.editarticle.articletitle.set_markup("<span size='medium'><b> %s </b>  %s   \n<b> %s </b>  %s</span>"% \
+            (_("Theme:"), article.article_theme, _("Article:"), article.article_title))

         if article == None:

             article = Article()

         self.editarticle.textbox.set_article(article)

diff --git a/activity/activity.info b/activity/activity.info
index fe0dc74..d975373 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -2,8 +2,8 @@
 name = InfoSlicer
 activity_version = 2
 host_version = 1
-bundle_id = org.sugarlabs.InfoSlicer
 icon = slicelogo
-exec = sugar-activity activity.InfoslicerActivity -s
+bundle_id = org.sugarlabs.infoslicer
+exec = sugar-activity sugaractivity.sugaractivity
 show_launcher = yes
 license = GPLv2+
diff --git a/po/InfoSlicer.pot b/po/InfoSlicer.pot
index 473f391..503def3 100644
--- a/po/InfoSlicer.pot
+++ b/po/InfoSlicer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-24 10:19-0500\n"
+"POT-Creation-Date: 2009-02-24 10:54-0500\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"
@@ -65,12 +65,14 @@ msgid ""
 msgstr ""
 
 #: GUI_Components/Edit_Pane.py:142 GUI_Components/Format_Pane.py:98
-#: GUI_Components/Image_Pane.py:108
+#: GUI_Components/Image_Pane.py:108 GUI_Components/Edit_Pane.py:143
+#: GUI_Components/Format_Pane.py:99 GUI_Components/Image_Pane.py:109
 msgid "Theme:"
 msgstr ""
 
 #: GUI_Components/Edit_Pane.py:142 GUI_Components/Format_Pane.py:98
-#: GUI_Components/Image_Pane.py:108
+#: GUI_Components/Image_Pane.py:108 GUI_Components/Edit_Pane.py:143
+#: GUI_Components/Format_Pane.py:99 GUI_Components/Image_Pane.py:109
 msgid "Article:"
 msgstr ""
 
@@ -90,7 +92,7 @@ msgstr ""
 msgid "Please select a Wikipedia article from the menu above"
 msgstr ""
 
-#: GUI_Components/Image_Pane.py:113
+#: GUI_Components/Image_Pane.py:113 GUI_Components/Image_Pane.py:114
 msgid "My Articles"
 msgstr ""
 
@@ -129,7 +131,8 @@ msgstr ""
 #: GUI_Components/Image_Pane.py:114 GUI_Components/Image_Pane.py:115
 #: sugaractivity.py:68 sugaractivity.py:69 sugaractivity.py:73
 #: Infoslicer_GUI.py:384 Infoslicer_GUI.py:385 Infoslicer_GUI.py:388
-#: Infoslicer_GUI.py:396 Infoslicer_GUI.py:398
+#: Infoslicer_GUI.py:396 Infoslicer_GUI.py:398 GUI_Components/Edit_Pane.py:145
+#: GUI_Components/Image_Pane.py:116
 msgid "Wikipedia Articles"
 msgstr ""
 
@@ -161,3 +164,14 @@ msgid ""
 "package and click 'Publish'."
 msgstr ""
 
+#: GUI_Components/Library_Pane.py:24
+msgid "English Wikipedia"
+msgstr ""
+
+#: GUI_Components/Library_Pane.py:25
+msgid "Simple English Wikipedia"
+msgstr ""
+
+#: GUI_Components/Library_Pane.py:26
+msgid "German Wikipedia"
+msgstr ""