allow to translate screen titles,

sync pot

diff --git a/simplerss/po/SimpleRSS.pot b/simplerss/po/SimpleRSS.pot
index 47d5a7e..51706db 100644 (file)
--- a/simplerss/po/SimpleRSS.pot
+++ b/simplerss/po/SimpleRSS.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 19:33+0100\n"
+"POT-Creation-Date: 2009-01-10 00:19+0100\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"
@@ -29,15 +29,15 @@ msgstr ""
 msgid "Autoupdate"
 msgstr ""
 
-#: ../src/RSSSetup.py:32 ../src/RSSSetup.py:92
+#: ../src/RSSSetup.py:32 ../src/RSSSetup.py:97
 msgid "Cancel"
 msgstr ""
 
-#: ../src/RSSScreens.py:395 ../src/RSSScreens.py:400
+#: ../src/RSSScreens.py:396 ../src/RSSScreens.py:401
 msgid "Close"
 msgstr ""
 
-#: ../src/RSSSetup.py:95
+#: ../src/RSSSetup.py:100
 msgid "Delete"
 msgstr ""
 
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Enclosures"
 msgstr ""
 
-#: ../src/RSSScreens.py:359 ../src/RSSScreens.py:384
+#: ../src/RSSScreens.py:359 ../src/RSSScreens.py:385
 msgid "Entries"
 msgstr ""
 
@@ -60,11 +60,11 @@ msgid ""
 "it."
 msgstr ""
 
-#: ../src/RSSSetup.py:72 ../src/RSSSetup.py:156
+#: ../src/RSSSetup.py:77 ../src/RSSSetup.py:166
 msgid "Feed"
 msgstr ""
 
-#: ../src/RSSScreens.py:360 ../src/RSSScreens.py:385
+#: ../src/RSSScreens.py:360 ../src/RSSScreens.py:386
 #, python-format
 msgid "Feed %s/%s"
 msgstr ""
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Found no Enclosure we can display."
 msgstr ""
 
-#: ../src/RSSSetup.py:81
+#: ../src/RSSSetup.py:86
 msgid "Keep running in background"
 msgstr ""
 
-#: ../src/RSSSetup.py:94
+#: ../src/RSSSetup.py:99
 msgid "New"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "Notification"
 msgstr ""
 
-#: ../src/RSSSetup.py:33 ../src/RSSSetup.py:93
+#: ../src/RSSSetup.py:33 ../src/RSSSetup.py:98
 msgid "OK"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: ../src/RSSSetup.py:123
+#: ../src/RSSSetup.py:133
 msgid ""
 "Really delete this entry?\n"
 "It cannot be recovered!"
@@ -124,14 +124,27 @@ msgstr ""
 msgid "Received %d new news item(s)."
 msgstr ""
 
-#: ../src/RSSScreens.py:394 ../src/RSSScreens.py:399
+#: ../src/RSSScreens.py:395 ../src/RSSScreens.py:400
 msgid "Setup"
 msgstr ""
 
-#: ../src/RSSSetup.py:86
+#: ../src/RSSSetup.py:91
 msgid "Show new Messages as"
 msgstr ""
 
+#: ../src/RSSScreens.py:368
+msgid "Simple RSS Reader"
+msgstr ""
+
+#: ../src/RSSSetup.py:46 ../src/RSSSetup.py:114
+msgid "Simple RSS Reader Setup"
+msgstr ""
+
+#: ../src/RSSScreens.py:116 ../src/RSSScreens.py:256
+#, python-format
+msgid "Simple RSS Reader: %s"
+msgstr ""
+
 #: ../src/RSSPoller.py:83
 #, python-format
 msgid ""
@@ -139,15 +152,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/RSSSetup.py:78
+#: ../src/RSSSetup.py:83
 msgid "Start automatically with Enigma2"
 msgstr ""
 
-#: ../src/RSSScreens.py:393
+#: ../src/RSSScreens.py:394
 msgid "Update Feed"
 msgstr ""
 
-#: ../src/RSSSetup.py:87
+#: ../src/RSSSetup.py:92
 msgid "Update Interval (min)"
 msgstr ""
 
@@ -157,7 +170,7 @@ msgid ""
 "Contents will automatically be updated when it's done."
 msgstr ""
 
-#: ../src/RSSScreens.py:406
+#: ../src/RSSScreens.py:407
 msgid "What to do?"
 msgstr ""
 

diff --git a/simplerss/src/RSSList.py b/simplerss/src/RSSList.py
index 15e2373..db173e9 100644 (file)
--- a/simplerss/src/RSSList.py
+++ b/simplerss/src/RSSList.py
@@ -75,4 +75,4 @@ class RSSEntryList(RSSBaseList):
                res = [ None ]
                width = self.l.getItemSize().width()
                res.append(MultiContentEntryText(pos=(0, 3), size=(width, 50), font=0, flags = RT_HALIGN_LEFT|RT_WRAP, text = title))
-               return res
\ No newline at end of file
+               return res

diff --git a/simplerss/src/RSSScreens.py b/simplerss/src/RSSScreens.py
index 7baa4bd..1d29593 100644 (file)
--- a/simplerss/src/RSSScreens.py
+++ b/simplerss/src/RSSScreens.py
@@ -113,7 +113,7 @@ class RSSEntryView(RSSBaseView):
                self.onLayoutFinish.append(self.setConditionalTitle)
 
        def setConditionalTitle(self):
-               self.setTitle(': '.join(["Simple RSS Reader", self.feedTitle]))
+               self.setTitle(_("Simple RSS Reader: %s") % (self.feedTitle))
 
        def up(self):
                self["content"].pageUp()
@@ -253,7 +253,7 @@ class RSSFeedView(RSSBaseView):
                        self.updateInfo()
 
        def setConditionalTitle(self):
-               self.setTitle(': '.join(["Simple RSS Reader", self.feed.title]))
+               self.setTitle(_("Simple RSS Reader: %s") % (self.feed.title))
 
        def updateInfo(self):
                current_entry = self["content"].getCurrent()
@@ -365,6 +365,7 @@ class RSSOverview(RSSBaseView):
 
        def __show(self):
                self.rssPoller.addCallback(self.pollCallback)
+               self.setTitle(_("Simple RSS Reader"))
 
        def __close(self):
                self.rssPoller.removeCallback(self.pollCallback)
@@ -458,3 +459,4 @@ class RSSOverview(RSSBaseView):
                for entry in self["content"].getCurrent().history:
                                enclosures.extend(entry[3])
                RSSBaseView.selectEnclosure(self, enclosures)
+

diff --git a/simplerss/src/RSSSetup.py b/simplerss/src/RSSSetup.py
index 6102c7a..603ca75 100644 (file)
--- a/simplerss/src/RSSSetup.py
+++ b/simplerss/src/RSSSetup.py
@@ -40,6 +40,11 @@ class RSSFeedEdit(ConfigListScreen, Screen):
 
                self.id = id
 
+               self.onLayoutFinish.append(self.setCustomTitle)
+
+       def setCustomTitle(self):
+               self.setTitle(_("Simple RSS Reader Setup"))
+
        def save(self):
                config.plugins.simpleRSS.feed[self.id].save()
                config.plugins.simpleRSS.feed.save()
@@ -103,6 +108,11 @@ class RSSSetup(ConfigListScreen, Screen):
                        "ok": self.ok
                }, -1)
 
+               self.onLayoutFinish.append(self.setCustomTitle)
+
+       def setCustomTitle(self):
+               self.setTitle(_("Simple RSS Reader Setup"))
+
        def autostartChanged(self, instance):
                # Remove keep_running from list if autostart is active
                if instance.value:
@@ -187,3 +197,4 @@ def addFeed(address, auto = False):
 
        # Save (needed?)
        config.plugins.simpleRSS.feed.save()
+