Packman Build Service PMBS

gpodder3.changes Changed

gpodder3.spec Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/woodchuck.py Deleted

@@ -1,514 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
-# Copyright (c) 2011 Neal H. Walfield
-#
-# gPodder is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# gPodder is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#  gpodder.woodchuck - Woodchuck support for gPodder (2011-07)
-
-__title__ = 'Woodchuck Plugin'
-__description__ = 'Let the woodchuck analyze your download habits.'
-
-import gpodder
-from gpodder import feedcore
-from gpodder.util import idle_add
-
-from functools import wraps
-import time
-import threading
-import traceback
-
-import logging
-logger = logging.getLogger(__name__)
-
-# Don't fail if the Woodchuck modules are not available.  Just disable
-# Woodchuck's functionality.
-
-# Whether we imported the woodchuck modules successfully.
-woodchuck_imported = True
-try:
-    import pywoodchuck
-    from pywoodchuck import PyWoodchuck
-    from pywoodchuck import woodchuck
-except ImportError, e:
-    logger.info('Unable to load pywoodchuck. Disabling woodchuck plug-in.')
-    woodchuck_imported = False
-
-    class PyWoodchuck(object):
-        def __init__(self, *args, **kwargs):
-            pass
-
-        def available(self):
-            return False
-
-# The default podcast refresh interval: 6 hours.
-REFRESH_INTERVAL = 6 * 60 * 60
-
-_main_thread = None
-def execute_in_main_thread(func):
-    """
-    Execute FUNC in the main thread asynchronously (i.e., do not wait
-    for the function to be executed before returning to the caller).
-
-    This is used for executing DBus calls, which are not thread safe,
-    in the main thread.
-    """
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        if not woodchuck_instance.available():
-            return
-
-        def doit():
-            @wraps(func)
-            def it():
-                # Execute the function.
-
-                # Assert that we are running in the main thread.
-                assert _main_thread is not None
-                assert threading.currentThread() == _main_thread, \
-                    ("idle function executed in %s, not %s"
-                     % (threading.currentThread(), _main_thread))
-
-                try:
-                    func(*args, **kwargs)
-                except KeyboardInterrupt:
-                    raise
-                except:
-                    logger.error(
-                        "execute_in_main_thread: Executing %s: %s"
-                        % (func, traceback.format_exc()))
-    
-                return False
-            return it
-    
-        if threading.currentThread() == _main_thread:
-            logger.debug("Already in main thread. Executing %s" % (func,))
-            doit()()
-        else:
-            logger.debug("Queuing execution of %s from %s"
-                         % (func, threading.currentThread()))
-            idle_add(doit())
-    return wrapper
-
-def coroutine(func):
-    """
-    func is a function that returns a generator.  This routine runs
-    the generator until it raises the StopIteration exception.
-
-    After the generator emits a value and before it is run again, the
-    event loop is iterated.
-    """
-    def wrapper(*args, **kwargs):
-        def doit(generator):
-            def execute():
-                try:
-                    generator.next()
-                    idle_add(execute)
-                except StopIteration:
-                    return
-                except Exception, e:
-                    logger.exception("Running %s: %s" % (str(func), str(e)))
-            execute()
-
-        generator = func(*args, **kwargs)
-        doit(generator)
-    return wrapper
-
-class mywoodchuck(PyWoodchuck):
-    def __init__(self, model, podcast_update, episode_download):
-        if podcast_update is None and episode_download is None:
-            # Disable upcalls.
-            request_feedback = False
-        else:
-            request_feedback = True
-
-        PyWoodchuck.__init__(self, "gPodder", "org.gpodder",
-                             request_feedback=request_feedback)
-
-        self.model = model
-        self.podcast_update = podcast_update
-        self.episode_download = episode_download
-
-    def auto_download(self, stream, obj):
-        """Return whether to auto download an episode."""
-        # If the episode was published before the stream was
-        # registered, don't automatically download it.
-        if obj.publication_time >= stream.registration_time:
-            True
-
-        # If the episode is one of the two newest episodes, download
-        # it.
-        try:
-            podcast = self.stream_to_podcast(stream)
-            episode = self.object_to_episode(stream, obj)
-            episodes = podcast.get_all_episodes()
-            episodes.sort(key=lambda e: e.published, reverse=True)
-            if episode in episodes[:2]:
-                logging.debug("Auto-downloading %s (from %s)",
-                              episode.title, podcast.title)
-                return True
-            return False
-        except Exception, e:
-            logging.exception("Checking whether to auto-download episode: %s"
-                              % (str(e),))
-
-    def stream_to_podcast(self, stream):
-        """
-        Find the gPodder podcast corresponding to the Woodchuck stream.
-        """
-        known_podcasts = self.model.get_podcasts()
-        matching_podcasts = [p for p in known_podcasts
-                             if p.url == stream.identifier]
-        if not matching_podcasts:
-            logger.warn(
-                "lookup_podcast: Unknown stream: %s (%s) (known: %s): %s"
-                % (stream.human_readable_name, stream.identifier,
-                   ' '.join(p.url for p in known_podcasts),
-                   traceback.format_exc()))
-            return None
-
-        # URL is supposed to be a primary key and thus at most one
-        # podcast should match.
-        assert(len(matching_podcasts) == 1)
-
-        return matching_podcasts[0]
-
-    def object_to_episode(self, stream, object):
-        """
-        Find the gPodder podcast episode corresponding to the
-        Woodchuck object (which is in the specified stream).
-        """
-        podcast = self.stream_to_podcast(stream)
-        if podcast is None:
-            return None
-
-        episodes = [e for e in podcast.get_all_episodes()
-                    if e.guid == object.identifier]

gpodder-3.3.0.tar.gz/share/gpodder/ui/gtk/gpoddershownotes.ui Deleted

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<interface>
-  <object class="GtkDialog" id="gPodderShownotes">
-    <property name="default_height">260</property>
-    <property name="default_width">320</property>
-    <property name="title" translatable="yes">Episode details</property>
-    <property name="type_hint">dialog</property>
-    <property name="visible">False</property>
-    <property name="modal">True</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="gpodderepisode-vbox">
-        <property name="border_width">2</property>
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="border_width">6</property>
-            <property name="spacing">6</property>
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolled_window">
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="shadow_type">in</property>
-                <property name="visible">True</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTextView" id="textview">
-                    <property name="is_focus">True</property>
-                    <property name="visible">True</property>
-                    <property name="editable">False</property>
-                    <property name="wrap_mode">GTK_WRAP_WORD</property>
-                    <property name="border_width">5</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="download_progress">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="gpodderepisode-footer-area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkHButtonBox" id="gpodderepisode-flattr_area">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">10</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkButton" id="flattr_button">
-                    <property name="label" translatable="yes">Flattr this</property>
-                    <property name="visible">True</property>
-                    <signal name="clicked" handler="on_flattr_button_clicked"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" id="flattr_image">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">start</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHButtonBox" id="gpodderepisode-action_area">
-                <property name="border_width">5</property>
-                <property name="layout_style">end</property>
-                <property name="spacing">6</property>
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkButton" id="btnPlay">
-                    <property name="label">gtk-media-play</property>
-                    <property name="use_stock">True</property>
-                    <property name="visible">True</property>
-                    <signal handler="on_play_button_clicked" name="clicked"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btnDownload">
-                    <property name="label" translatable="yes">_Download</property>
-                    <property name="use_underline">True</property>
-                    <property name="visible">True</property>
-                    <signal handler="on_download_button_clicked" name="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btnCancel">
-                    <property name="label" translatable="yes">C_ancel download</property>
-                    <property name="use_underline">True</property>
-                    <property name="visible">True</property>
-                    <signal handler="on_cancel_button_clicked" name="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="btnClose">
-                    <property name="label">gtk-close</property>
-                    <property name="use_stock">True</property>
-                    <property name="visible">True</property>
-                    <signal handler="on_close_button_clicked" name="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/ContextMenuArea.qml Deleted

@@ -1,69 +0,0 @@
-
-import Qt 4.7
-
-import com.nokia.meego 1.0
-
-import 'config.js' as Config
-
-Item {
-    id: contextMenuArea
-
-    property bool subscribeMode: true
-
-    property variant items: []
-
-    signal close
-    signal response(int index)
-
-    ListView {
-        id: listView
-        visible: !contextMenuArea.subscribeMode
-        model: contextMenuArea.items
-        anchors.fill: parent
-
-        header: Item { height: Config.headerHeight * 2 }
-        footer: Item { height: Config.headerHeight }
-
-        delegate: SelectableItem {
-            Label {
-                anchors.leftMargin: Config.switcherWidth
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    verticalCenter: parent.verticalCenter
-                }
-                color: "white"
-                font.pixelSize: parent.height * .3
-                text: modelData.caption
-            }
-
-            onSelected: {
-                contextMenuArea.response(index)
-                contextMenuArea.close()
-            }
-        }
-    }
-
-    ScrollDecorator {
-        flickableItem: listView
-    }
-
-    function showSubscribe() {
-        contextMenuArea.subscribeMode = true
-        contextMenuArea.state = 'opened'
-        subscribe.show()
-    }
-
-    Subscribe {
-        id: subscribe
-        visible: contextMenuArea.subscribeMode && (contextMenuArea.state == 'opened')
-        anchors.fill: parent
-        anchors.topMargin: Config.headerHeight
-
-        onSubscribe: {
-            controller.addSubscriptions(urls)
-            contextMenuArea.close()
-        }
-    }
-}
-

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/FilledIcon.qml Deleted

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/InputField.qml Deleted

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/TitlebarButton.qml Deleted

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/artwork/background-harmattan.png Deleted

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/artwork/cover-shadow.png Deleted

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/artwork/episode-background.png Deleted

gpodder-3.3.0.tar.gz/src/gpodder/api.py Deleted

@@ -1,276 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
-#
-# gPodder is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# gPodder is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-"""
-
-                XXX DO NOT USE IN NEW CODE XXX
-
-This "public API" was created at a time where the internal structure
-of gPodder was very much in flux. Now, the situation has changed, and
-this module should not be used anymore. It only exists, because the
-"gpo" command-line utility still makes use of it.
-
-In the not too distant future, this module will be removed and code
-that is still useful will be moved into other modules (e.g. model or
-core) or into the "gpo" command-line utility itself.
-
-                XXX DO NOT USE IN NEW CODE XXX
-
-"""
-
-import gpodder
-
-from gpodder import util
-from gpodder import core
-from gpodder import download
-
-from gpodder import youtube
-
-class Podcast(object):
-    """API interface of gPodder podcasts
-
-    This is the API specification of podcast objects that
-    are returned from API functions.
-
-    Public attributes:
-      title
-      url
-    """
-    def __init__(self, _podcast, _manager):
-        """For internal use only."""
-        self._podcast = _podcast
-        self._manager = _manager
-        self.title = self._podcast.title
-        self.url = self._podcast.url
-
-    def get_episodes(self):
-        """Get all episodes that belong to this podcast
-
-        Returns a list of Episode objects that belong to this podcast."""
-        return [Episode(e, self._manager) for e in self._podcast.get_all_episodes()]
-
-    def rename(self, title):
-        """Set a new title for this podcast
-
-        Sets a new title for this podcast that will be available
-        as the "title" attribute of this object."""
-        self._podcast.rename(title)
-        self.title = self._podcast.title
-        self._podcast.save()
-
-    def rewrite_url(self, url):
-        """Set a new URL for this podcast
-
-        Sets a new feed URL for this podcast. Use with care.
-        See also: gPodder bug 1020
-        """
-        url = util.normalize_feed_url(url)
-        if url is None:
-            return None
-
-        self._podcast.url = url
-
-        # Remove etag + last_modified to force a refresh next time
-        self._podcast.http_etag = None
-        self._podcast.http_last_modified = None
-
-        self._podcast.save()
-
-        return url
-
-    def delete(self):
-        """Remove this podcast from the subscription list
-
-        Removes the subscription and all downloaded episodes.
-        """
-        self._podcast.remove_downloaded()
-        self._podcast.delete()
-        self._podcast = None
-
-    def update_enabled(self):
-        """Check if this feed has updates enabled
-
-        This function will return True if the podcast has feed
-        updates enabled. If the user pauses a subscription, the
-        feed updates are disabled, and the podcast should be
-        excluded from automatic updates.
-        """
-        return not self._podcast.pause_subscription
-
-    def update(self):
-        """Updates this podcast by downloading the feed
-
-        Downloads the podcast feed (using the feed cache), and
-        adds new episodes and updated information to the database.
-        """
-        self._podcast.update(self._manager._config.max_episodes_per_feed)
-
-    def feed_update_status_msg(self):
-        """Show the feed update status
- 
-        Display the feed update current status.
-        """
-        if self._podcast.pause_subscription:
-            return "disabled"
-        else:
-            return "enabled"
-
-    def feed_update_status(self):
-        """Return the feed update status
-
-        Return the feed update current status.
-        """
-        return not self._podcast.pause_subscription
-
-    def disable(self):
-        """Toogle the feed update to disable
-
-        Change the feed update status to disable only if currently enable.
-        """
-        if not self._podcast.pause_subscription:
-            self._podcast.pause_subscription = True
-            self._podcast.save()
-
-    def enable(self):
-        """Toogle the feed update to disable
-
-        Change the feed update status to disable only if currently enable.
-        """
-        if self._podcast.pause_subscription:
-            self._podcast.pause_subscription = False
-            self._podcast.save()
-
-class Episode(object):
-    """API interface of gPodder episodes
-
-    This is the API specification of episode objects that
-    are returned from API functions.
-
-    Public attributes:
-      title
-      url
-      is_new
-      is_downloaded
-      is_deleted
-    """
-    def __init__(self, _episode, _manager):
-        """For internal use only."""
-        self._episode = _episode
-        self._manager = _manager
-        self.title = self._episode.title
-        self.url = self._episode.url
-        self.is_new = (self._episode.state == gpodder.STATE_NORMAL and \
-                self._episode.is_new)
-        self.is_downloaded = (self._episode.state == gpodder.STATE_DOWNLOADED)
-        self.is_deleted = (self._episode.state == gpodder.STATE_DELETED)
-
-    def download(self, callback=None):
-        """Downloads the episode to a local file
-
-        This will run the download in the same thread, so be sure
-        to call this method from a worker thread in case you have
-        a GUI running as a frontend."""
-        task = download.DownloadTask(self._episode, self._manager._config)
-        if callback is not None:
-            task.add_progress_callback(callback)
-        task.status = download.DownloadTask.QUEUED
-        task.run()
-
-
-class PodcastClient(object):
-    def __init__(self):
-        """Create a new gPodder API instance
-

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/shownotes.py Deleted

@@ -1,197 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
-#
-# gPodder is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# gPodder is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import gtk
-import gtk.gdk
-import gobject
-import pango
-import os
-import cgi
-
-
-import gpodder
-
-_ = gpodder.gettext
-
-import logging
-logger = logging.getLogger(__name__)
-
-from gpodder import util
-
-from gpodder.gtkui.interface.shownotes import gPodderShownotesBase
-
-
-SHOWNOTES_HTML_TEMPLATE = """
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-  </head>
-  <body>
-    <span style="font-size: big; font-weight: bold;">%s</span>
-    <br>
-    <span style="font-size: small;">%s (%s)</span>
-    <hr style="border: 1px #eeeeee solid;">
-    <p>%s</p>
-  </body>
-</html>
-"""
-
-class gPodderShownotes(gPodderShownotesBase):
-    def on_create_window(self):
-        if self._config.ui.gtk.episode_list.embed_shownotes:
-            self.main_window.hide()
-
-        self.textview.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('#ffffff'))
-        if self._config.enable_html_shownotes:
-            try:
-                import webkit
-                webview_signals = gobject.signal_list_names(webkit.WebView)
-                if 'navigation-policy-decision-requested' in webview_signals:
-                    setattr(self, 'have_webkit', True)
-                    setattr(self, 'htmlview', webkit.WebView())
-                else:
-                    logger.warn('Your WebKit is too old (gPodder bug 1001).')
-                    setattr(self, 'have_webkit', False)
-
-                def navigation_policy_decision(wv, fr, req, action, decision):
-                    REASON_LINK_CLICKED, REASON_OTHER = 0, 5
-                    if action.get_reason() == REASON_LINK_CLICKED:
-                        util.open_website(req.get_uri())
-                        decision.ignore()
-                    elif action.get_reason() == REASON_OTHER:
-                        decision.use()
-                    else:
-                        decision.ignore()
-
-                self.htmlview.connect('navigation-policy-decision-requested', \
-                        navigation_policy_decision)
-
-                self.scrolled_window.remove(self.scrolled_window.get_child())
-                self.scrolled_window.add(self.htmlview)
-                self.textview = None
-                self.htmlview.load_html_string('', '')
-                self.htmlview.show()
-            except ImportError:
-                setattr(self, 'have_webkit', False)
-        else:
-            setattr(self, 'have_webkit', False)
-
-    def on_scroll_down(self):
-        if not hasattr(self.scrolled_window, 'get_vscrollbar'):
-            return
-        vsb = self.scrolled_window.get_vscrollbar()
-        vadj = vsb.get_adjustment()
-        step = vadj.step_increment
-        vsb.set_value(vsb.get_value() + step)
-
-    def on_scroll_up(self):
-        if not hasattr(self.scrolled_window, 'get_vscrollbar'):
-            return
-        vsb = self.scrolled_window.get_vscrollbar()
-        vadj = vsb.get_adjustment()
-        step = vadj.step_increment
-        vsb.set_value(vsb.get_value() - step)
-
-    def on_show_window(self):
-        self.main_window.vbox.show()
-        self.download_progress.set_fraction(0)
-        self.download_progress.set_text(_('Please wait...'))
-        self.main_window.set_title(self.episode.title)
-
-        if self.have_webkit:
-            self.htmlview.load_html_string('<html><head></head><body><em>%s</em></body></html>' % _('Loading shownotes...'), '')
-        else:
-            self.b = gtk.TextBuffer()
-            self.textview.set_buffer(self.b)
-
-    def on_display_text(self):
-        # Now do the stuff that takes a bit longer...
-        heading = self.episode.title
-        subheading = _('from %s') % (self.episode.channel.title)
-        description = self.episode.description
-
-        if self.have_webkit:
-            global SHOWNOTES_HTML_TEMPLATE
-
-            # Get the description - if it looks like plaintext, replace the
-            # newline characters with line breaks for the HTML view
-            description = self.episode.description_html
-
-            args = (
-                    cgi.escape(heading),
-                    cgi.escape(subheading),
-                    self.episode.get_play_info_string(),
-                    description,
-            )
-            url = os.path.dirname(self.episode.channel.url)
-            self.htmlview.load_html_string(SHOWNOTES_HTML_TEMPLATE % args, url)
-        else:
-            self.b.create_tag('heading', scale=pango.SCALE_LARGE, weight=pango.WEIGHT_BOLD)
-            self.b.create_tag('subheading', scale=pango.SCALE_SMALL)
-
-            self.b.insert_with_tags_by_name(self.b.get_end_iter(), heading, 'heading')
-            self.b.insert_at_cursor('\n')
-            self.b.insert_with_tags_by_name(self.b.get_end_iter(), subheading, 'subheading')
-            self.b.insert_at_cursor('\n\n')
-            self.b.insert(self.b.get_end_iter(), util.remove_html_tags(description))
-            self.b.place_cursor(self.b.get_start_iter())
-
-    def on_hide_window(self):
-        self.main_window.vbox.hide()
-        self.episode = None
-        if self.have_webkit:
-            self.htmlview.load_html_string('', '')
-        else:
-            self.textview.get_buffer().set_text('')
-
-    def on_episode_status_changed(self):
-        if self.task:
-            self.download_progress.show()
-            self.btnCancel.set_property('visible', self.task.status not in \
-                    (self.task.DONE, self.task.CANCELLED, self.task.FAILED))
-            self.btnDownload.set_property('visible', self.task.status in
-                    (self.task.CANCELLED, self.task.FAILED, self.task.PAUSED))
-            self.btnPlay.set_property('visible', \
-                    self.task.status == self.task.DONE)
-        else:
-            self.download_progress.hide()
-            self.btnCancel.hide()
-            if self.episode.was_downloaded(and_exists=True):
-                if self.episode.file_type() in ('audio', 'video'):
-                    self.btnPlay.set_label(gtk.STOCK_MEDIA_PLAY)
-                else:
-                    self.btnPlay.set_label(gtk.STOCK_OPEN)
-                self.btnPlay.set_use_stock(True)
-                self.btnPlay.show_all()
-                self.btnDownload.hide()
-            else:
-                self.btnPlay.show()
-                self.btnDownload.show()
-
-
-    def on_download_status_progress(self):
-        # We receive this from the main window every time the progress
-        # for our episode has changed (but only when this window is visible)
-        if self.task:
-            self.download_progress.set_fraction(self.task.progress)
-            self.download_progress.set_text('%s: %d%% (%s/s)' % ( \
-                    self.task.STATUS_MESSAGE[self.task.status], \
-                    100.*self.task.progress, \
-                    util.format_filesize(self.task.speed)))
-

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/shownotes.py Deleted

@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
-#
-# gPodder is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# gPodder is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import gtk
-
-import gpodder
-
-_ = gpodder.gettext
-
-from gpodder import util
-
-from gpodder.gtkui.interface.common import BuilderWidget
-from gpodder.gtkui.flattr import set_flattr_button
-
-class gPodderShownotesBase(BuilderWidget):
-    def new(self):
-        setattr(self, 'episode', None)
-        setattr(self, 'task', None)
-
-        self._config.connect_gtk_window(self.main_window, \
-                'episode_window', True)
-        self.main_window.connect('delete-event', self._on_delete_event)
-        self.main_window.connect('key-press-event', self._on_key_press_event)
-        self.on_create_window()
-
-    def _on_delete_event(self, widget, event):
-        self.on_close_button_clicked()
-        return True
-
-    def _on_key_press_event(self, widget, event):
-        if event.keyval in (gtk.keysyms.J, gtk.keysyms.j):
-            self.on_scroll_down()
-            return True
-        elif event.keyval in (gtk.keysyms.K, gtk.keysyms.k):
-            self.on_scroll_up()
-            return True
-
-        return False
-
-    #############################################################
-
-    def on_scroll_down(self):
-        """Called when the shownotes should scroll down one unit"""
-        pass
-
-    def on_scroll_up(self):
-        """Called when the shownotes should scroll up one unit"""
-        pass
-
-    def on_create_window(self):
-        """Called when the window is created (only once!)"""
-        pass
-
-    def on_show_window(self):
-        """Called when the window is about to be shown"""
-        pass
-
-    def on_display_text(self):
-        """Called when the shownotes text should be loaded"""
-        pass
-
-    def on_hide_window(self):
-        """Called when the window is about to be hidden"""
-        pass
-
-    def on_download_status_progress(self):
-        """Called when the progress info should be updated"""
-        pass
-
-    def on_episode_status_changed(self):
-        """Called when the episode/download status is changed"""
-        pass
-
-    #############################################################
-
-    def set_flattr_information(self):
-        self.flattr_possible = set_flattr_button(self._flattr,
-            self.episode.payment_url, self.flattr_image,
-            self.flattr_button)
-
-    def on_flattr_button_clicked(self, widget):
-        if self.flattr_possible:
-            success, message = self._flattr.flattr_url(self.episode.payment_url)
-            self.show_message(message, title=_('Flattr status'), important=not success)
-            self.set_flattr_information()
-
-    #############################################################
-
-    def on_play_button_clicked(self, widget=None):
-        if self.episode:
-            self._playback_episodes([self.episode])
-
-    def on_download_button_clicked(self, widget=None):
-        if self.episode:
-            self._download_episode_list([self.episode])
-
-    def on_cancel_button_clicked(self, widget=None):
-        if self.task:
-            self._cancel_task_list([self.task])
-
-    def on_delete_button_clicked(self, widget=None):
-        if self.episode and self.episode.was_downloaded(and_exists=True):
-            if self._delete_episode_list([self.episode]):
-                self.on_episode_status_changed()
-                self.on_close_button_clicked()
-
-    def on_mark_as_new_button_clicked(self, widget=None):
-        if self.episode:
-            self.episode.mark_new()
-            self._episode_list_status_changed([self.episode])
-            self.on_episode_status_changed()
-
-    def on_do_not_download_button_clicked(self, widget=None):
-        if self.episode:
-            self.episode.mark_old()
-            self._episode_list_status_changed([self.episode])
-            self.on_episode_status_changed()
-
-    def on_visit_website_button_clicked(self, widget=None):
-        if self.episode and self.episode.link:
-            util.open_website(self.episode.link)
-
-    def on_pause_download_button_clicked(self, widget=None):
-        if self.task and self.task.status in \
-                (self.task.DOWNLOADING, self.task.QUEUED):
-            self.task.status = self.task.PAUSED
-
-    def on_resume_download_button_clicked(self, widget=None):
-        self.on_download_button_clicked()
-
-    def on_close_button_clicked(self, widget=None):
-        self.episode = None
-        self.task = None
-        self.on_hide_window()
-        self.main_window.hide()
-
-    #############################################################
-
-    def _download_status_changed(self, task):
-        """Called from main window for download status changes"""
-        if self.main_window.vbox.get_property('visible'):
-            self.task = task
-            self.on_episode_status_changed()
-
-    def _download_status_progress(self):
-        """Called from main window for progress updates"""
-        if self.main_window.vbox.get_property('visible'):
-            self.on_download_status_progress()
-
-    #############################################################
-
-    def show(self, episode):
-        if self.episode is not None:
-            if episode == self.episode:
-                return
-
-            self.episode = None
-            self.task = None
-            self.on_hide_window()
-
-        self.episode = episode
-
-        self.on_show_window()
-        self.on_episode_status_changed()
-
-        if not self._config.ui.gtk.episode_list.embed_shownotes:
-            if not self.main_window.get_property('visible'):
-                self.main_window.show()
-                self.main_window.present()
-
-        # Make sure the window comes up quick
-        while gtk.events_pending():
-            gtk.main_iteration(False)
-
-        # Load the shownotes into the UI
-        self.on_display_text()
-
-        # Set flattr information
-        self.set_flattr_information()

gpodder-3.3.0.tar.gz/ChangeLog -> gpodder-3.5.0.tar.gz/ChangeLog Changed

@@ -1,407 +1,945 @@
-commit 8a2d0611447d3c89571b3768ec1def73f1bf1a06
+commit ef2d1746bcac5b274ad2e65adb9b9c7ffc7ac68c
 Author: Thomas Perl <m@thp.io>
-Date:   Mon Sep 24 14:03:12 2012 +0200
+Date:   Tue Mar 5 16:57:26 2013 +0100
 
-    gPodder 3.3.0 "Intermission" released
-    
-    Updated credits, manpages, release date and version.
+    gPodder 3.5.0 "The After Hours" released
 
-commit 9cdde2bb90f2812dcab0ff077e7674531fc0a8e8
+commit bda982be028b45b47ea2899f7f8962572da1e9c2
 Author: Thomas Perl <m@thp.io>
-Date:   Mon Sep 24 13:48:15 2012 +0200
+Date:   Tue Mar 5 16:38:48 2013 +0100
 
-    Updated German translation
+    Update copyright years for 2013
 
-commit b76a25a2d8924eedc311bb5fe054ca1e0e93dc76
+commit 4720daa4c87da554acf5ac26dc9f0cef3c14cb1d
 Author: Thomas Perl <m@thp.io>
-Date:   Mon Sep 24 13:45:41 2012 +0200
+Date:   Tue Mar 5 16:37:26 2013 +0100
 
-    Update translation template from source
+    README: Add dependency information for Sailfish Silica
 
-commit 4c48f55a15570922245424eb5dfe62092e22dd32
+commit 98a25e2096a493effba3ab5702ed0b7a0eb30da3
 Author: Thomas Perl <m@thp.io>
-Date:   Mon Sep 24 10:18:59 2012 +0200
+Date:   Tue Mar 5 16:34:43 2013 +0100
+
+    Util: Fix unit test (use real unknown extension)
+
+commit 8eb7f7c7d412d1bb5a81e681c231158bfaf5be4b
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Tue Mar 5 16:22:56 2013 +0100
+
+    Updated Portuguese (Brazil) translation
+
+commit 0a5ff92d20e23a0ce343008555899ca6048589f6
+Author: Sérgio Marques <smarquespt@gmail.com>
+Date:   Tue Mar 5 16:22:33 2013 +0100
+
+    Updated Portuguese translation
+
+commit 542ec297c858b6174bd662ce67f5d883de0ac1c3
+Author: Filip Kłębczyk <fklebczyk@gmail.com>
+Date:   Tue Mar 5 16:22:14 2013 +0100
 
-    QML UI: Show pubdate and file size (bug 1640)
+    Updated Polish translation
 
-commit c665edbb31d518ebc06530e9962e934b05b9004b
+commit a9025c3c0efb5515f27d499183c5afc85d8e906e
+Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>
+Date:   Tue Mar 5 16:21:47 2013 +0100
+
+    Updated Spanish (Spain) translation
+
+commit 0fa044c984d18a21d837941bfffe733a2533f406
 Author: Thomas Perl <m@thp.io>
-Date:   Mon Sep 24 10:10:25 2012 +0200
+Date:   Tue Mar 5 16:21:22 2013 +0100
+
+    Updated German translation
+
+commit 8b70bd1c15c4dd236ee5dc65bc00db3b93a83152
+Author: David Štancl <dstancl@dstancl.cz>
+Date:   Tue Mar 5 16:21:09 2013 +0100
 
-    QML UI: Filters for unfinished downloads (bug 1655)
+    Updated Czech (Czech Republic) translation
 
-commit c25992445e5b4e7e1013a9a250d164f79a30d78d
+commit 8358e76143009562ddbf6e370b68bfa8e7d79083
 Author: Thomas Perl <m@thp.io>
-Date:   Sun Sep 23 21:08:24 2012 +0200
+Date:   Tue Mar 5 16:01:14 2013 +0100
 
-    Fix missing ".feed" in feedcore (bug 1672)
+    Updated translation templates from source
 
-commit 6db58176f6994fce39bdae6ead2740c2e92a2723
+commit 36312f29ca225427b896ca9f8824052269ff01c5
 Author: Thomas Perl <m@thp.io>
-Date:   Sun Sep 23 20:29:29 2012 +0200
+Date:   Tue Mar 5 13:49:19 2013 +0100
 
-    YouTube: Parse error messages, improve downloading
+    QML UI: Fix top margin of input sheet
 
-commit e5f778ced92b4b9b3c89102394b8a01e319e1f95
+commit 762974db2e7cc7768e424ccd99cd05f8d4d4ff61
 Author: Thomas Perl <m@thp.io>
-Date:   Sun Sep 23 20:17:47 2012 +0200
+Date:   Tue Mar 5 13:46:33 2013 +0100
 
-    feedcore: Fix feed autodiscovery (bug 1672)
+    QML UI: Small triangle new indicator in podcast item
 
-commit 0d605960d9b9441e487edb3f36f03e7ff4e42f91
+commit 26d6787b0335d4d35dc1c1d836edb36d42e6ab73
 Author: Thomas Perl <m@thp.io>
-Date:   Tue Sep 18 09:53:10 2012 +0200
+Date:   Tue Mar 5 13:09:30 2013 +0100
 
-    Fix parse_qs importing for Python < 2.6
+    Gtk UI: Shownotes text view must not be editable
 
-commit 61f2cfa379037b7f0fd90ca9b2d28915241de2dd
+commit b6706cc50948cb2b9b49b61287210dbc1d3af97b
 Author: Thomas Perl <m@thp.io>
-Date:   Sat Sep 15 20:22:06 2012 +0200
+Date:   Tue Mar 5 12:08:14 2013 +0100
 
-    QML UI: Remove remaining Maemo 5 (Fremantle) support
+    Gtk UI: Searching in extensions list, keyboard interaction
     
-    After a year of basically no work towards Maemo 5 support,
-    I consider gPodder 3-on-Maemo 5 something that we won't ever
-    do, so the remaining codes goes. This also cleans up some
-    dead code in the Gtk UI that's been sitting there.
+    Allow search-as-you-type searching in the extensions list.
     
-    If anybody wants to step up and do something about that, be
-    my guest. If anything, I'd assume that if anything on the N900,
-    gPodder 3-on-Nemo Mobilemight be feasible, and in that case, it
-    should be "just like Harmattan" in most ways.
+    Use separate columns in extensions list to allow interaction
+    with keyboard (enable/disable and show extension infos).
+    
+    Remove custom mouse button handling, which was confusing.
+
+commit 7de1a3e01dcf8f1194860487bc3a0d20bf66fa65
+Author: Thomas Perl <m@thp.io>
+Date:   Tue Mar 5 11:36:41 2013 +0100
+
+    Gtk UI: Resizable shownotes view in main window
 
-commit abe01deca37d69e74ea7ca07d8a62b44797deaff
+commit 1699e8cb230c9ced3c343919275d578177dfa919
 Author: Thomas Perl <m@thp.io>
-Date:   Sat Sep 15 19:30:02 2012 +0200
+Date:   Tue Mar 5 11:15:41 2013 +0100
 
-    Fix YouTube download URL resolving (bug 1665)
+    Gtk UI: Don't close preferences when WebKit/Gtk is missing
     
-    Thanks to Andreas Piesk for the proposed patch and
-    to all who reported this issue in our bug tracker.
+    When trying to login to Flattr without WebKit/Gtk installed,
+    the preferences dialog should stay open after the message box.
 
-commit 6ec076f114f6f4cf5b42959dd131cd3f4a81c0dd
-Author: Nikolaos Papagrigoriou <nikolaos@papagrigoriou.com>
-Date:   Fri Sep 14 21:36:46 2012 +0200
+commit 84667ae4ed9f870d87cc340e11b6b1970c6b1cff
+Author: Thomas Perl <m@thp.io>
+Date:   Tue Mar 5 11:13:41 2013 +0100
+
+    Gtk UI: Show error message for unconfigured devices
 
-    Decode enclosure filename properly (bug 1663)
+commit 5aea82928bd16fb82938251e6c3f8613d1c369aa
+Author: Thomas Perl <m@thp.io>
+Date:   Tue Mar 5 11:10:33 2013 +0100
+
+    Gtk UI: Disable all widgets when device sync is off
+    
+    In the preferences dialog, disable all widgets in the
+    "Device sync" tab if device sync is not enabled.
 
-commit ea597c00ac1b7b586541b176eccdf10cfd7bfb3e
-Merge: 889664c d91b837
+commit 54e7593b754268bc26be3be4c82cad64355d1992
 Author: Thomas Perl <m@thp.io>
-Date:   Wed Sep 5 02:08:40 2012 -0700
+Date:   Sun Mar 3 15:00:55 2013 +0200
 
-    Merge pull request #16 from rafiyr/master
+    QML UI: Fade truncated text in Sailfish UI
     
-    see http://gpodder.org/bug/1658
+    Looks sexy.
+
+commit 19b91af31d4a1929f7f87871f153aef9b1bf1fc8
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Mar 2 16:30:14 2013 +0200
+
+    QML UI: Abstraction for common UI elements (Label, Button, ...)
+
+commit 199300bc3a776d3be7a275d234be1f897b982806
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Mar 2 16:29:36 2013 +0200
+

gpodder-3.3.0.tar.gz/PKG-INFO -> gpodder-3.5.0.tar.gz/PKG-INFO Changed

gpodder-3.3.0.tar.gz/README -> gpodder-3.5.0.tar.gz/README Changed

@@ -8,7 +8,7 @@
 
   ............................................................................
 
-             Copyright  2005-2012 Thomas Perl and the gPodder Team
+             Copyright  2005-2013 Thomas Perl and the gPodder Team
 
 
  [ LICENSE ]
@@ -33,7 +33,7 @@
     - Python 2.6 or newer              http://python.org/
     - "sqlite3" Python module          (usually included with Python)
     - Feedparser 5.1.2 or newer        http://code.google.com/p/feedparser/
-    - mygpoclient 1.4 or newer         http://thp.io/2010/mygpoclient/
+    - mygpoclient 1.7 or newer         http://thp.io/2010/mygpoclient/
     - Python D-Bus bindings
 
     gPodder might still work with Python 2.5, but you may need to
@@ -59,6 +59,7 @@
     - PySide 1.0.8 or newer            http://www.pyside.org/
     - Qt Mobility 1.2 or newer         http://qt.gitorious.org/qt-mobility
     - Qt Quick Components              http://qt.gitorious.org/qt-components
+    - Sailfish Silica Components       https://sailfishos.org/sailfish-silica/
 
     The QML UI depends on the QtMultimediaKit QML bindings for playing
     back audio (libdeclarative-multimedia in Debian) and on the WebKit QML
@@ -74,6 +75,11 @@
     elements to be displayed correctly. Alternatively, you can use the free
     "darko" theme from: https://github.com/jpavelek/meego-handset-theme-darko
 
+    For running gPodder on Sailfish OS using Sailfish Silica Components, you
+    need to have Sailfish Silica installed. Right now, gPodder still depends on
+    qt-components even on Sailfish, but this is going to change soon once a
+    more mature version of Sailfish Silica is out.
+
 
  [ OPTIONAL DEPENDENCIES ]
 
@@ -82,6 +88,7 @@
     - Flattr integration: python-webkit
     - Size detection on Windows: PyWin32
     - Native OS X support: ige-mac-integration
+    - MP3 Player Sync Support: python-eyed3 (< 0.7)
 
 
  [ BUILD DEPENDENCIES ]
@@ -103,6 +110,28 @@
     To set a specific python binary set PYTHON:
         PYTHON=python2 make unittest
 
+    Tests in gPodder are written in two different ways:
+
+       - doctests (see http://docs.python.org/2/library/doctest.html)
+       - unittests (see http://docs.python.org/2/library/unittest.html)
+
+    If you want to add doctests, simply write the doctest and make sure that
+    the module appears in "doctest_modules" in src/gpodder/unittests.py. For
+    example, the doctests in src/gpodder/util.py are added as 'util' (the
+    "gpodder" prefix must not be specified there).
+
+    If you want to add unit tests for a specific module (ex: gpodder.model),
+    you should add the tests as gpodder.test.model, or in other words:
+
+        The file       src/gpodder/model.py
+        is tested by   src/gpodder/test/model.py
+
+    After you've added the test, make sure that the module appears in
+    "test_modules" in src/gpodder/unittests.py - for the example above, the
+    unittests in src/gpodder/test/model.py are added as 'model'. For unit
+    tests, coverage reporting happens for the tested module (that's why the
+    test module name should mirror the module to be tested).
+
 
  [ RUNNING AND INSTALLATION ]
 
@@ -250,5 +279,5 @@
     - IRC channel                      #gpodder on irc.freenode.net
 
   ............................................................................
-             Last updated: 2012-02-24 by Thomas Perl <thp.io/about>
+             Last updated: 2013-02-12 by Thomas Perl <thp.io/about>

gpodder-3.3.0.tar.gz/bin/gpo -> gpodder-3.5.0.tar.gz/bin/gpo Changed

@@ -3,7 +3,7 @@
 
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,9 +61,12 @@
     rewrite OLDURL NEWURL      Change the feed URL of [OLDURL] to [NEWURL]
     webui [public]             Start gPodder's Web UI server
                                (public = listen on all network interfaces)
+    pipe                       Start gPodder in pipe-based IPC server mode
 
 """
 
+from __future__ import print_function
+
 import sys
 import collections
 import os
@@ -111,6 +114,7 @@
 _ = gpodder.gettext
 N_ = gpodder.ngettext
 
+gpodder.images_folder = os.path.join(prefix, 'share', 'gpodder', 'images')
 gpodder.prefix = prefix
 
 # This is the command-line UI variant
@@ -119,21 +123,23 @@
 # Platform detection (i.e. MeeGo 1.2 Harmattan, etc..)
 gpodder.detect_platform()
 
-have_ansi = sys.stdout.isatty() and not gpodder.win32
+have_ansi = sys.stdout.isatty() and not gpodder.ui.win32
 interactive_console = sys.stdin.isatty() and sys.stdout.isatty()
 is_single_command = False
 
 from gpodder import log
 log.setup(verbose)
 
-from gpodder import api
+from gpodder import core
+from gpodder import download
 from gpodder import my
 from gpodder import opml
 from gpodder import util
+from gpodder import youtube
 from gpodder.config import config_value_to_string
 
 def incolor(color_id, s):
-    if have_ansi and cli.config.ui.cli.colors:
+    if have_ansi and cli._config.ui.cli.colors:
         return '\033[9%dm%s\033[0m' % (color_id, s)
     return s
 
@@ -151,7 +157,7 @@
     try:
         ofile.write(output)
     except Exception, e:
-        print """
+        print("""
         *** ENCODING FAIL ***
 
         Please report this to http://bugs.gpodder.org/:
@@ -160,12 +166,16 @@
         map(convert, args) = %s
 
         Exception = %s
-        """ % (repr(args), repr(map(convert, args)), e)
+        """ % (repr(args), repr(map(convert, args)), e))
 
-    if kwargs.get('newline', True):
-        ofile.write(os.linesep)
+    ofile.write(kwargs.get('end', os.linesep))
     ofile.flush()
 
+# On Python 3 the encoding insanity is gone, so our safe_print()
+# function simply becomes the normal print() function. Good stuff!
+if sys.version_info >= (3,):
+    safe_print = print
+
 # ANSI Colors: red = 1, green = 2, yellow = 3, blue = 4
 inred, ingreen, inyellow, inblue = (functools.partial(incolor, x)
         for x in range(1, 5))
@@ -190,8 +200,10 @@
     EXIT_COMMANDS = ('quit', 'exit', 'bye')
 
     def __init__(self):
-        self.client = api.PodcastClient()
-        self.config = self.client._config
+        self.core = core.Core()
+        self._db = self.core.db
+        self._config = self.core.config
+        self._model = self.core.model
 
         self._current_action = ''
         self._commands = dict((name.rstrip('_'), func)
@@ -200,7 +212,7 @@
         self._prefixes, self._expansions = self._build_prefixes_expansions()
         self._prefixes.update({'?': 'help'})
         self._valid_commands = sorted(self._prefixes.values())
-        gpodder.user_extensions.on_ui_initialized(self.client.core.model,
+        gpodder.user_extensions.on_ui_initialized(self.core.model,
                 self._extensions_podcast_update_cb,
                 self._extensions_episode_download_cb)
 
@@ -247,13 +259,13 @@
         else:
             line = line + (' '*(self.COLUMNS-7-len(line)))
         self._current_action = line
-        safe_print(self._current_action, newline=False)
+        safe_print(self._current_action, end='')
 
     def _update_action(self, progress):
         if have_ansi:
             progress = '%3.0f%%' % (progress*100.,)
             result = '['+inblue(progress)+']'
-            safe_print('\r' + self._current_action + result, newline=False)
+            safe_print('\r' + self._current_action + result, end='')
 
     def _finish_action(self, success=True, skip=False):
         if skip:
@@ -270,7 +282,7 @@
         self._current_action = ''
 
     def _atexit(self):
-        self.client.finish()
+        self.core.shutdown()
 
     # -------------------------------------------------------------------
 
@@ -279,23 +291,38 @@
             self.subscribe(channel['url'], channel.get('title'))
 
     def export(self, filename):
-        podcasts = self.client._model.get_podcasts()
+        podcasts = self._model.get_podcasts()
         opml.Exporter(filename).write(podcasts)
 
-    def subscribe(self, url, title=None):
+    def get_podcast(self, url, create=False):
+        """Get a specific podcast by URL
+
+        Returns a podcast object for the URL or None if
+        the podcast has not been subscribed to.
+        """
         url = util.normalize_feed_url(url)
         if url is None:
-            self._error(_('Invalid URL.'))
-            return True
-
-        if self.client.get_podcast(url) is not None:
-            self._info(_('You are already subscribed to %s.') % url)
-            return True
+            self._error(_('Invalid url: %s') % url)
+            return None
+            
+        podcast = self._model.load_podcast(url, create=create, \
+                    max_episodes=self._config.max_episodes_per_feed)
+        if podcast is None:
+            self._error(_('You are not subscribed to %s.') % url)
+            return None
+            
+        return podcast
 
+    def subscribe(self, url, title=None):
         try:
-            if self.client.create_podcast(url, title) is None:
+            podcast = self.get_podcast(url, create=True)
+            if podcast is None:
                 self._error(_('Cannot subscribe to %s.') % url)
                 return True
+                
+            if title is not None:
+                podcast.rename(title)
+            podcast.save()
         except Exception, e:
             if hasattr(e, 'strerror'):
                 self._error(e.strerror)
@@ -303,15 +330,15 @@
                 self._error(str(e))
             return True
 
-        self.client.commit()
+        self._db.commit()
 
         self._info(_('Successfully added %s.' % url))
         return True
 
     def _print_config(self, search_for):
-        for key in self.config.all_keys():
+        for key in self._config.all_keys():
             if search_for is None or search_for.lower() in key.lower():
-                value = config_value_to_string(self.config._lookup(key))
+                value = config_value_to_string(self._config._lookup(key))
                 safe_print(key, '=', value)
 
     def set(self, key=None, value=None):

gpodder-3.3.0.tar.gz/bin/gpodder -> gpodder-3.5.0.tar.gz/bin/gpodder Changed

@@ -3,7 +3,7 @@
 
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,14 +20,10 @@
 #
 
 """
-gPodder enables you to subscribe to RSS feeds and download
-podcast episodes from these feeds.
+gPodder enables you to subscribe to media feeds (RSS, Atom, YouTube,
+Soundcloud, Vimeo and XSPF) and automatically download new content.
 
-Downloaded podcasts can either be synchronized to portable
-MP3 players (including iPods) or played back on the user's
-desktop.
-
-See gpo(1) for the command-line interface.
+This is the gPodder GUI. See gpo(1) for the command-line interface.
 """
 
 import sys
@@ -109,26 +105,29 @@
 
     parser.add_option("-v", "--verbose",
                       action="store_true", dest="verbose", default=False,
-                      help=_("Print debugging output to stdout"))
+                      help=_("print logging output on the console"))
 
     parser.add_option("-q", "--qml",
                       action="store_true", dest="qml", default=False,
-                      help=_("Start the QML interface of gPodder"))
+                      help=_("use the QML-based MeeGo 1.2 Harmattan UI"))
 
     parser.add_option('-s', '--subscribe', dest='subscribe', metavar='URL',
-                      help=_('Subscribe to the given URL'))
+                      help=_('subscribe to the feed at URL'))
 
     # On Mac OS X, support the "psn" parameter for compatibility (bug 939)
-    if gpodder.osx:
+    if gpodder.ui.osx:
         parser.add_option('-p', '--psn', dest='macpsn', metavar='PSN',
                           help=_('Mac OS X application process number'))
 
     options, args = parser.parse_args(sys.argv)
 
-    if options.qml or gpodder.ui.harmattan:
+    if options.qml or (gpodder.ui.harmattan or gpodder.ui.sailfish):
         gpodder.ui.qml = True
     else:
         gpodder.ui.gtk = True
+    
+    gpodder.ui.unity = (os.environ.get('DESKTOP_SESSION', 'unknown').lower() in 
+        ('ubuntu', 'ubuntu-2d'))
 
     from gpodder import log
     log.setup(options.verbose)
@@ -156,7 +155,7 @@
             except dbus.exceptions.DBusException, dbus_exception:
                 logger.info('Cannot connect to remote object.', exc_info=True)
 
-    if not gpodder.win32 and os.environ.get('DISPLAY', '') == '':
+    if not gpodder.ui.win32 and os.environ.get('DISPLAY', '') == '':
         logger.error('Cannot start gPodder: $DISPLAY is not set.')
         sys.exit(1)

gpodder-3.3.0.tar.gz/bin/gpodder-migrate2tres -> gpodder-3.5.0.tar.gz/bin/gpodder-migrate2tres Changed

gpodder-3.3.0.tar.gz/makefile -> gpodder-3.5.0.tar.gz/makefile Changed

gpodder-3.3.0.tar.gz/po/ca.po -> gpodder-3.5.0.tar.gz/po/ca.po Changed

@@ -7,1020 +7,1060 @@
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/gpodder/language/"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/gpodder/language/"
 "ca/)\n"
 "Language: ca\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr ""
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
+#: src/gpodder/util.py:495
+msgid "Today"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
 msgstr ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr ""
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
+#, python-format
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr ""
+#: src/gpodder/util.py:1236
+#, python-format
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr ""
+#: src/gpodder/util.py:1239
+#, python-format
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
+#: src/gpodder/util.py:1245
+msgid "and"
 msgstr ""
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
+#: src/gpodder/sync.py:195
+msgid "Cancelled by user"
 msgstr ""
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
+#: src/gpodder/sync.py:198
+msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
+#: src/gpodder/sync.py:284
+msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
+#: src/gpodder/sync.py:294
+msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
+#: src/gpodder/sync.py:305
+msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:162
-#, python-format
-msgid "Command not found: %(command)s"
+#: src/gpodder/sync.py:310
+msgid "Writing extended gtkpod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format
-msgid "Python module not found: %(module)s"
+msgid "Removing %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
+#: src/gpodder/sync.py:401 src/gpodder/sync.py:514
+#, python-format
+msgid "Adding %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
+#: src/gpodder/sync.py:417
+#, python-format
+msgid "Error copying %(episode)s: Not enough free space on %(mountpoint)s"
 msgstr ""
 
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
+#: src/gpodder/sync.py:504
+msgid "Opening MP3 player"
 msgstr ""
 
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
+#: src/gpodder/sync.py:507
+msgid "MP3 player opened"
 msgstr ""
 
-#: src/gpodder/flattr.py:167
-msgid "No description"
+#: src/gpodder/sync.py:569 src/gpodder/sync.py:577
+#, python-format
+msgid "Error opening %(filename)s: %(message)s"
 msgstr ""
 
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
+#: src/gpodder/sync.py:746 src/gpodder/sync.py:752
+msgid "MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:730
-msgid "unknown"
+#: src/gpodder/sync.py:759
+msgid "Opening the MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
+#: src/gpodder/sync.py:769
+#, python-format
+msgid "%s opened"
 msgstr ""
 
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
+#: src/gpodder/sync.py:774
+#, python-format
+msgid "Closing %s"
 msgstr ""
 
-#: src/gpodder/model.py:1248
-msgid "Audio"
+#: src/gpodder/sync.py:782
+#, python-format

gpodder-3.3.0.tar.gz/po/cs.po -> gpodder-3.5.0.tar.gz/po/cs.po Changed

@@ -1,147 +1,76 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Czech Gpodder\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2008-02-10 20:06+0100\n"
-"Last-Translator: Ondrej Vesely <xorwen@gmail.com>\n"
-"Language-Team: Xorwen <xorwen@gmail.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/gpodder/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Czech\n"
-"X-Poedit-Country: CZECH REPUBLIC\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,10,-1,-1,-1,-1\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/gpodder/config.py:55
 #, fuzzy, python-format
 msgid "gPodder on %s"
 msgstr "gPodder nalezl %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr ""
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-#, fuzzy
-msgid "Added"
-msgstr "Pokročilé"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Zařazeno do fronty"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-#, fuzzy
-msgid "Downloading"
-msgstr "stahování"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr ""
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#, fuzzy
-msgid "Failed"
-msgstr "Filtr:"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#, fuzzy
-msgid "Cancelled"
-msgstr "Zrušit"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr ""
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr ""
-
-#: src/gpodder/download.py:859
-#, fuzzy, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Chyba otevírání %s: %s"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/download.py:866
-#, fuzzy, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Chyba otevírání %s: %s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Dnes"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, fuzzy, python-format
-msgid "Error: %s"
-msgstr "Chyba otevírání %s: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Včera"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Popis není dostupný"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(neznámý)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Popis"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Popis není dostupný"
-
-#: src/gpodder/model.py:730
-#, fuzzy
-msgid "unknown"
-msgstr "(neznámý)"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr ""
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
+#: src/gpodder/util.py:1239
+#, python-format
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/model.py:1248
-msgid "Audio"
+#: src/gpodder/util.py:1245
+msgid "and"
 msgstr ""
 
-#: src/gpodder/my.py:165
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Přidávání %s"
-
-#: src/gpodder/my.py:167
-#, fuzzy, python-format
-msgid "Remove %s"
-msgstr "Odstranit %s?"
-
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
 msgstr "Zrušeno uživatelem"
@@ -150,145 +79,240 @@

gpodder-3.3.0.tar.gz/po/cs_CZ.po -> gpodder-3.5.0.tar.gz/po/cs_CZ.po Changed

@@ -2,296 +2,309 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# David Štancl <dstancl@gmail.com>, 2012.
+#   <dstancl@dstancl.cz>, 2012.
+#   <petr.simacek@gmail.com>, 2012.
+# Petr Šimáček <petr.simacek@gmail.com>, 2013.
+# Vít Stanislav <slaweet@seznam.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:14+0000\n"
-"Last-Translator: thp <m@thp.io>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.net/projects/p/"
-"gpodder/team/cs_CZ/)\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 15:01+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
+"gpodder/language/cs_CZ/)\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder na %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Špatné jméno/heslo"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Přidáno"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Zařazeno do fronty"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Stahování"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Dokončeno"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Selhalo"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Zrušeno"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pozastaveno"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Poznámky"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Chyba vstupu/výstupu: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Před %(count)d dnem"
+msgstr[1] "Před %(count)d dny"
+msgstr[2] "Před %(count)d dny"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Chyba HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Dnes"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Chyba: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Včera"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Pro tento doplněk není dostupný popis."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(neznámo)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Příkaz %(command)s nebyl nalezen"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekunda"
+msgstr[1] "%(count)d sekundy"
+msgstr[2] "%(count)d sekund"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python modul %(module)s nebyl nalezen"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Neplatná hodnota"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Žádné odběry"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Popis není k dispozici"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "neznámý"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Jiný"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hodina"
+msgstr[1] "%(count)d hodiny"
+msgstr[2] "%(count)d hodin"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Přidat %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuta"
+msgstr[1] "%(count)d minuty"
+msgstr[2] "%(count)d minut"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Odebrat %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "a"
 
 #: src/gpodder/sync.py:195
-#, fuzzy
 msgid "Cancelled by user"
-msgstr "Zrušeno"
+msgstr "Zrušeno uživatelem"
 
 #: src/gpodder/sync.py:198
 msgid "Writing data to disk"
-msgstr ""
+msgstr "Zapisování dat na disk"

gpodder-3.3.0.tar.gz/po/da.po -> gpodder-3.5.0.tar.gz/po/da.po Changed

@@ -1,145 +1,74 @@
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@gpodder.org>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+#   <3xm@detfalskested.dk>, 2011.
+# Jon Hedemann <tradomusnordic@gmail.com>, 2012.
+# Thomas Perl <thp@gpodder.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 2.3\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-11-22 23:41+0100\n"
-"Last-Translator: Jon Hedemann <tradomusnordic@gmail.com>\n"
-"Language-Team: \n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/gpodder/language/"
+"da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: DENMARK\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder på %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Forkert brugernavn/adgangskode"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Tilføjet"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Sat i kø"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Downloader"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Afsluttet"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fejlet"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Annulleret"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "for %(count)d dag siden"
+msgstr[1] "for %(count)d dage siden"
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Sat på pause"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "I dag"
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Manglende data fra server"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "I går"
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O-fejl: %(error)s: %(filename)s"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(ukendt)"
 
-#: src/gpodder/download.py:866
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP-fejl: %(code)s: %(message)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekund"
+msgstr[1] "%(count)d sekunder"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Error: %s"
-msgstr "Fejl: %s"
-
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Ingen beskrivelse tilgængelig."
-
-#: src/gpodder/extensions.py:162
-#, fuzzy, python-format
-msgid "Command not found: %(command)s"
-msgstr "Brugerkommando ikke fundet"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python-modulet \"%s\" er ikke installeret"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Ugyldig URL"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Ingen abonnementer"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Ingen tilgængelig beskrivelse"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "ukendt"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Andet"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Lyd"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d time"
+msgstr[1] "%(count)d timer"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Tilføj %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minut"
+msgstr[1] "%(count)d minutter"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Fjern %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "og"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -149,142 +78,233 @@
 msgid "Writing data to disk"
 msgstr "Skriver data til disk"
 
-#: src/gpodder/sync.py:281

gpodder-3.3.0.tar.gz/po/de.po -> gpodder-3.5.0.tar.gz/po/de.po Changed

@@ -1,158 +1,73 @@
 # 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.
 #
+# Translators:
+# Thomas Perl <m@thp.io>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 2.0\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 13:43+0200\n"
-"PO-Revision-Date: 2012-09-24 13:47+0100\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 16:11+0100\n"
 "Last-Translator: Thomas Perl <m@thp.io>\n"
-"Language-Team: gPodder Team <gpodder-devel@lists.berlios.de>\n"
-"Language: \n"
+"Language-Team: German (http://www.transifex.com/projects/p/gpodder/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Rosetta-Export-Date: 2007-06-21 13:48:14+0000\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder auf %s"
 
-#: src/gpodder/download.py:327
-msgid "Wrong username/password"
-msgstr "Falscher Benutzername/Passwort"
-
-#: src/gpodder/download.py:525
-#: src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Hinzugefügt"
-
-#: src/gpodder/download.py:525
-#: src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Eingereiht"
-
-#: src/gpodder/download.py:525
-#: src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Herunterladen"
-
-#: src/gpodder/download.py:526
-#: src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:68
-msgid "Finished"
-msgstr "Fertig"
-
-#: src/gpodder/download.py:526
-#: src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fehlgeschlagen"
-
-#: src/gpodder/download.py:526
-#: src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#: src/gpodder/download.py:526
-#: src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pause"
-
-#: src/gpodder/download.py:845
-msgid "Missing content from server"
-msgstr "Fehlender Inhalt vom Server"
-
-#: src/gpodder/download.py:851
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O Fehler: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "vor %(count)d Tag"
+msgstr[1] "vor %(count)d Tagen"
 
-#: src/gpodder/download.py:858
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP-Fehler %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Heute"
 
-#: src/gpodder/download.py:862
-#: src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Fehler: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Gestern"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Keine Beschreibung für diese Erweiterung."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(unbekannt)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Befehl nicht gefunden: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d Sekunde"
+msgstr[1] "%(count)d Sekunden"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python-Modul nicht gefunden: %(module)s"
-
-#: src/gpodder/flattr.py:210
-msgid "Not enough means to flattr"
-msgstr "Nicht genügend Mittel, um zu flattrn"
-
-#: src/gpodder/flattr.py:212
-msgid "Item does not exist on Flattr"
-msgstr "Item existiert nicht auf Flattr"
-
-#: src/gpodder/flattr.py:214
-msgid "Already flattred or own item"
-msgstr "Bereits geflattred oder eigenes Item"
-
-#: src/gpodder/flattr.py:216
-msgid "Invalid request"
-msgstr "Ungültiger Request"
-
-#: src/gpodder/flattr.py:222
-msgid "No internet connection"
-msgstr "Keine Internet-Verbindung"
-
-#: src/gpodder/flattr.py:227
-msgid "No description"
-msgstr "Keine Beschreibung"
-
-#: src/gpodder/model.py:495
-#: src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Keine Beschreibung verfügbar"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "unbekannt"
-
-#: src/gpodder/model.py:822
-#: src/gpodder/model.py:1244
-msgid "Other"
-msgstr "Andere"
-
-#: src/gpodder/model.py:1227
-#: src/gpodder/model.py:1242
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1240
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d Stunde"
+msgstr[1] "%(count)d Stunden"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Abonniere %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d Minute"
+msgstr[1] "%(count)d Minuten"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Entferne %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "und"
 
 #: src/gpodder/sync.py:195

gpodder-3.3.0.tar.gz/po/el.po -> gpodder-3.5.0.tar.gz/po/el.po Changed

@@ -1,142 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+#   <hellene.atheist@gmail.com>, 2011.
+# Konstantinos Georgokitsos <kgeorgokitsos@yahoo.de>, 2012.
+# Teo  <anapospastos@hotmail.com>, 2011-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 2.6\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Alkinoos <hellene.atheist@gmail.com>\n"
-"Language-Team: Greek\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Teo <anapospastos@hotmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/gpodder/language/"
+"el/)\n"
+"Language: el\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-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "Το gPodder στο %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Λάθος όνομα χρήστη/κωδικός πρόσβασης"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Προστέθηκε"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Σε αναμονή"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Λήψη"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Τελείωσε"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Απέτυχε"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Ακυρώθηκε"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Παύση"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Λείπει περιεχόμενο από τον διακομιστή"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Σφάλμα I/O: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Πριν από %(count)d ημέρα"
+msgstr[1] "Πριν από %(count)d ημέρες"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Σφάλμα HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Σήμερα"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Σφάλμα: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Χθες"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(άγνωστο)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Το python module \"%s\" δεν είναι εγκατεστημένο"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Δεν υπάρχουν συνδρομές"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Δεν υπάρχει διαθέσιμη περιγραφή"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "άγνωστο"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Άλλο"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Βίντεο"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Ήχος"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d δευτερόλεπτο"
+msgstr[1] "%(count)d δευτερόλεπτα"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Προσθήκη %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d ώρα"
+msgstr[1] "%(count)d ώρες"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Αφαίρεση %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d λεπτό"
+msgstr[1] "%(count)d λεπτά"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "και"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -146,144 +78,231 @@
 msgid "Writing data to disk"
 msgstr "Εγγραφή δεδομένων στο δίσκο"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "Άνοιγμα της βάσης δεδομένων του iPod"
 
-#: src/gpodder/sync.py:291

gpodder-3.3.0.tar.gz/po/es.po -> gpodder-3.5.0.tar.gz/po/es.po Changed

@@ -1,21 +1,23 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@perli.net>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Simó Albert i Beltran <sim6@probeta.net>, 2012.
+# Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 0.8.0+svn20070122\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-07-04 14:32-0300\n"
-"Last-Translator: Silvio Sisto <sisto.silvio@gmail.com>\n"
-"Language-Team: gpodder team <gpodder-devel@lists.berlios.de>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/gpodder/language/"
+"es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Rosetta-Export-Date: 2007-09-20 22:38:16+0000\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
@@ -23,124 +25,49 @@
 msgid "gPodder on %s"
 msgstr "gPodder en %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Nombre de usuario/contraseña incorrectos"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Agregado"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Puesto en cola"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Descargando"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Terminado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fallado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Hace %(count)d día"
+msgstr[1] "Hace %(count)d días"
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausado"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoy"
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Falta contenido en el servidor"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ayer"
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Error de Entrada/Salida: %(error)s: %(filename)s"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(desconocido)"
 
-#: src/gpodder/download.py:866
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Error HTTP %(code)s: %(message)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Error: %s"
-msgstr "Error: %s"
-
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "No hay una descripción disponible."
-
-#: src/gpodder/extensions.py:162
-#, fuzzy, python-format
-msgid "Command not found: %(command)s"
-msgstr "Comando de usuario no encontrado"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Módulo python \"%s\" no instalado"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "URL inválida"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "No hay suscripciones"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "No hay una descripción disponible"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "desconocido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Otro"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Añadir %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Eliminar %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "y"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -150,143 +77,235 @@
 msgid "Writing data to disk"
 msgstr "Escribiendo datos al disco"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"

gpodder-3.3.0.tar.gz/po/es_ES.po -> gpodder-3.5.0.tar.gz/po/es_ES.po Changed

@@ -2,292 +2,303 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Adolfo Jayme Barrientos <fitoschido@gmail.com>, 2011-2013.
+# Marco Antonio Frias Butrón <marcoantoniofrias@gmail.com>, 2012.
+# Simó Albert i Beltran <sim6@probeta.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:14+0000\n"
-"Last-Translator: thp <m@thp.io>\n"
-"Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/gpodder/"
-"team/es_ES/)\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 15:01+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/gpodder/"
+"language/es_ES/)\n"
 "Language: es_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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder en %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Nombre de usuario/contraseña incorrecto"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Añadido"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "En cola"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Descargando"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Finalizado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fallido"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "En pausa"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Falta el contenido del servidor"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Error de E/S: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Hace %(count)d día"
+msgstr[1] "Hace %(count)d días"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Error HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoy"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Error: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ayer"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "No hay descripción para esta extensión."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(desconocido)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Comando no encontrado: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Módulo Python no encontrado: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Valor no válido."
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "No hay suscripciones"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Sin descripción disponible"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "desconocido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Otros"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Añadir %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Quitar %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "y"
 
 #: src/gpodder/sync.py:195
-#, fuzzy
 msgid "Cancelled by user"
-msgstr "Cancelado"
+msgstr "Cancelado por el usuario"
 
 #: src/gpodder/sync.py:198
 msgid "Writing data to disk"
-msgstr ""
+msgstr "Escribiendo datos al disco"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
-msgstr ""
+msgstr "Abriendo la base de datos del iPod"

gpodder-3.3.0.tar.gz/po/es_MX.po -> gpodder-3.5.0.tar.gz/po/es_MX.po Changed

@@ -8,139 +8,65 @@
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2012-06-13 08:04-0600\n"
-"Last-Translator: Rigoberto Calleja <rigoberto@SID6581>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/gpodder/"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/gpodder/"
 "language/es_MX/)\n"
 "Language: es_MX\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder en %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Usuario y/o contraseña incorrectos"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Agregado"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "En espera"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Descargando"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Terminados"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Falló"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "En pausa"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Falta el contenido del servidor"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Error de E/S: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Hace %(count)d día"
+msgstr[1] "Hace %(count)d días"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Error HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoy"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Error: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ayer"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "No hay descripción para esta extensión."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(desconocido)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Comando no encontrado: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Módulo de Python no encontrado: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Valor no válido."
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "No hay suscripciones"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "No hay descripción disponible"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "desconocido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Otro"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Eliminar %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "y"
 
 #: src/gpodder/sync.py:195
 #, fuzzy
@@ -151,145 +77,236 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 #, fuzzy
 msgid "iPod opened"
 msgstr "abierto"
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"

gpodder-3.3.0.tar.gz/po/eu.po -> gpodder-3.5.0.tar.gz/po/eu.po Changed

@@ -3,295 +3,304 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2011.
+# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-12-17 13:35+0000\n"
-"Last-Translator: Thomas Perl <m@thp.io>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/gpodder/team/"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-23 00:23+0000\n"
+"Last-Translator: Asier Iturralde Sarasola <asier.iturralde@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/gpodder/language/"
 "eu/)\n"
 "Language: eu\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder %s-n"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Erabiltzaile-izen/pasahitz okerra"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Gehituta"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Ilaran"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Deskargatzen"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Amaituta"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Huts egin du"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Bertan behera utzita"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausarazita"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Edukia ez dago zerbitzarian"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O Errorea: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Duela egun %(count)d"
+msgstr[1] "Duela %(count)d egun"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP Errorea %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Gaur"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Errorea: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Atzo"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Deskribapenik ez hedapen honentzat"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(ezezaguna)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Ez da komandoa aurkitu: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "Segundu %(count)d"
+msgstr[1] "%(count)d segundu"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Ez da Python modulua aurkitu: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Baliogabeko balioa."
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Ez dago harpidetzarik"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Ez dago deskribapenik eskuragarri"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "ezezaguna"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Bestelakoak"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Bideoa"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audioa"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "Ordu %(count)d"
+msgstr[1] "%(count)d ordu"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Gehitu %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "Minutu %(count)d"
+msgstr[1] "%(count)d minutu"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Ezabatu %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "eta"
 
 #: src/gpodder/sync.py:195
-#, fuzzy
 msgid "Cancelled by user"
-msgstr "Bertan behera utzita"
+msgstr "Erabiltzaileak ezeztatua"
 
 #: src/gpodder/sync.py:198
 msgid "Writing data to disk"
 msgstr "Datuak diskora idazten"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "iPod datu-basea irekitzen"
 
-#: src/gpodder/sync.py:291
-#, fuzzy
+#: src/gpodder/sync.py:294
 msgid "iPod opened"

gpodder-3.3.0.tar.gz/po/fa_IR.po -> gpodder-3.5.0.tar.gz/po/fa_IR.po Changed

@@ -3,142 +3,67 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 # Mohammadreza Abdollahzadeh <morealaz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2012-08-16 07:12+0000\n"
-"Last-Translator: Thomas Perl <m@thp.io>\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/gpodder/"
 "language/fa_IR/)\n"
 "Language: fa_IR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "نام کاربری/گذر واژه اشتباه"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "اضافه شد"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "در صف قرار گرفت"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "در حال دانلود"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "اتمام یافته"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "نا موفق"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "لغو شده"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "متوقف شده"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr ""
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr ""
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr ""
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "امروز"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr ""
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "دیروز"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr ""
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(نامعلوم)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-msgid "No description"
-msgstr ""
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "هیچ توضیحی مهیا نیست"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "ناشناخه"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "دیگر"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "ویدئو"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "صوت"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr ""
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr ""
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "و"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -148,853 +73,970 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"
 msgstr ""

gpodder-3.3.0.tar.gz/po/fi.po -> gpodder-3.5.0.tar.gz/po/fi.po Changed

@@ -1,146 +1,71 @@
-# Finnish translation of gPodder.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
 # Thomas Perl <thp@perli.net>, 2006.
-# Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2009-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-11-23 00:34+0200\n"
-"Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder koneella %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Virheellinen käyttäjätunnus tai salasana"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Lisätty"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Jonossa"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Ladataan"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Valmis"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Epäonnistui"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Peruttu"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d päivä sitten"
+msgstr[1] "%(count)d päivää sitten"
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Tauolla"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Tänään"
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Palvelimelta puuttuu sisältöä"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Eilen"
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Siirräntävirhe: %(error)s: %(filename)s"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(tuntematon)"
 
-#: src/gpodder/download.py:866
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP-virhe: %(code)s: %(message)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekunti"
+msgstr[1] "%(count)d sekuntia"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Error: %s"
-msgstr "Virhe: %s"
-
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Kuvausta ei ole saatavilla."
-
-#: src/gpodder/extensions.py:162
-#, fuzzy, python-format
-msgid "Command not found: %(command)s"
-msgstr "Käyttäjän komentoa ei löytynyt"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python-moduulia ”%s” ei ole asennettu"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Virheellinen URL"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Ei tilauksia"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Kuvausta ei ole saatavilla"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "tuntematon"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Muu"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d tunti"
+msgstr[1] "%(count)d tuntia"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Lisää %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuutti"
+msgstr[1] "%(count)d minuuttia"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Poista %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "ja"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -150,144 +75,235 @@
 msgid "Writing data to disk"
 msgstr "Kirjoitetaan tietoja levylle"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "Avataan iPodin tietokantaa"
 
-#: src/gpodder/sync.py:291

gpodder-3.3.0.tar.gz/po/fr.po -> gpodder-3.5.0.tar.gz/po/fr.po Changed

@@ -1,143 +1,73 @@
 # 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.
 #
+# Translators:
+#   <bttf.mcf@gmail.com>, 2012.
+# Ludovic LACOSTE <ludolacost@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 3.0.0\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\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"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/gpodder/language/"
+"fr/)\n"
+"Language: fr\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"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder sur %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Mauvais nom d'utilisateur / mot de passe"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Ajouté"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Mis en file d'attente"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-#, fuzzy
-msgid "Downloading"
-msgstr "télécharger"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Terminé"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Echoué"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Annulé"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "En pause"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Contenu manquant sur le serveur"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Erreur E/S : %(error)s:%(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "il y a %(count)d jour"
+msgstr[1] "il y a %(count)d jours"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Erreur HTTP %(code)s:%(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Aujourd'hui"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Erreur: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Hier"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Aucune description pour cette extension"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(inconnu)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d seconde"
+msgstr[1] "%(count)d secondes"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Aucun abonnement"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Aucune description disponible"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "inconnu"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Autre"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Vidéo"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d heure"
+msgstr[1] "%(count)d heures"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Ajouter %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minute"
+msgstr[1] "%(count)d minutes"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Supprimer %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "et"
 
 #: src/gpodder/sync.py:195
 #, fuzzy
@@ -148,147 +78,236 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 #, fuzzy
 msgid "iPod opened"

gpodder-3.3.0.tar.gz/po/gl.po -> gpodder-3.5.0.tar.gz/po/gl.po Changed

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Gonçalo Cordeiro <gzcordeiro@gmail.com>, 2009, 2010, 2012.
+# Gonçalo Cordeiro <gzcordeiro@gmail.com>, 2009-2010,2012.
 # Teo Ramirez <teoramirez@gmail.com>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2012-08-16 07:18+0000\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
 "Last-Translator: Gonçalo Cordeiro <gzcordeiro@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/gpodder/"
 "language/gl/)\n"
@@ -18,128 +18,56 @@
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder en %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Nome de persoa usuaria ou contrasinal incorrecto"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Engadido"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Na fila"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Descargando"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Finalizada"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fallou"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Detida"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Faltan contidos do servidor"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Erro de E/S: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "vai %(count)d día"
+msgstr[1] "vai %(count)d días"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Erro de HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoxe"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Erro: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Onte"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Non hai unha descrición para esta extensión."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(descoñecido)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Non se encontrou o comando: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Non se encontrou o módulo de Python: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr "Non hai suficientes medios para facer flattr"
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr "Ese elemento no existe no Flattr"
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr "Xa foi «flatteado» ou ben se trata dun elemento propio"
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr "Solicitude non válida"
-
-#: src/gpodder/flattr.py:167
-msgid "No description"
-msgstr "Sen descrición"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Sen descrición dispoñíbel"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "descoñecido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Outro"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Engadir %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Eliminar %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "e"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -149,143 +77,232 @@
 msgid "Writing data to disk"
 msgstr "Escribindo datos no disco"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "Abrindo a base de datos do iPod"
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr "Abriuse o iPod"
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr "Gardando a base de datos do iPod"
 
-#: src/gpodder/sync.py:307

gpodder-3.3.0.tar.gz/po/he.po -> gpodder-3.5.0.tar.gz/po/he.po Changed

@@ -3,150 +3,72 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Amiad Bareli <amiadb@gmail.com>, 2010.
+# Amiad Bareli <amiadb [at] gmail>, 2010, 2011, 2012.
+# <transifex@hatul.info>, 2011, 2012.
+#   <transifex@hatul.info>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.7\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-11-23 18:56+0300\n"
-"Last-Translator: Amiad Bareli <amiadb [at] gmail>\n"
-"Language-Team: Hebrew\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/gpodder/language/"
+"he/)\n"
 "Language: he\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: Virtaal 0.6.1\n"
-"X-Poedit-Country: Israel\n"
-"X-Poedit-Language: Hebrew\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_N;_\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/amiad/desktop/gpodder/src\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder על %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "שם משתמש/ססמה שגויים"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "נוסף"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "ממתין"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "מוריד"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "הסתיים"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "נכשל"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "בוטל"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "הושהה"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "חסר תוכן מהשרת"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "שגיאת I/O: %(error)s: %(filename)s‎"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "לפני יום"
+msgstr[1] "לפני %(count)d ימים"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "שגיאת HTTP %(code)s: %(message)s‎"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "היום"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "שגיאה: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "אתמול"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "אין תיאור זמין"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(לא ידוע)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "הפקודה לא נמצאה: %(command)s"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "מודול פייתון \"%s\" לא מותקן"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "אין הרשמות"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "אין תיאור זמין"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "לא ידוע"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "אחר"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "וידאו"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "שמע"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "שנייה אחת"
+msgstr[1] "%(count)d שניות"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "הוסף את %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "שעה אחת"
+msgstr[1] "%(count)d שעות"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "הסר את %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "דקה אחת"
+msgstr[1] "%(count)d דקות"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "וגם"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -156,142 +78,230 @@
 msgid "Writing data to disk"
 msgstr "כותב מידע לכונן"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"

gpodder-3.3.0.tar.gz/po/id_ID.po -> gpodder-3.5.0.tar.gz/po/id_ID.po Changed

@@ -7,1013 +7,1053 @@
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Indonesian (Indonesia) (http://www.transifex.net/projects/p/"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/"
 "gpodder/language/id_ID/)\n"
 "Language: id_ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr ""
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
+#: src/gpodder/util.py:495
+msgid "Today"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
 msgstr ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr ""
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
+#, python-format
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr ""
+#: src/gpodder/util.py:1236
+#, python-format
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr ""
+#: src/gpodder/util.py:1239
+#, python-format
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
+#: src/gpodder/util.py:1245
+msgid "and"
 msgstr ""
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
+#: src/gpodder/sync.py:195
+msgid "Cancelled by user"
 msgstr ""
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
+#: src/gpodder/sync.py:198
+msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
+#: src/gpodder/sync.py:284
+msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
+#: src/gpodder/sync.py:294
+msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
+#: src/gpodder/sync.py:305
+msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:162
-#, python-format
-msgid "Command not found: %(command)s"
+#: src/gpodder/sync.py:310
+msgid "Writing extended gtkpod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format
-msgid "Python module not found: %(module)s"
+msgid "Removing %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
+#: src/gpodder/sync.py:401 src/gpodder/sync.py:514
+#, python-format
+msgid "Adding %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
+#: src/gpodder/sync.py:417
+#, python-format
+msgid "Error copying %(episode)s: Not enough free space on %(mountpoint)s"
 msgstr ""
 
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
+#: src/gpodder/sync.py:504
+msgid "Opening MP3 player"
 msgstr ""
 
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
+#: src/gpodder/sync.py:507
+msgid "MP3 player opened"
 msgstr ""
 
-#: src/gpodder/flattr.py:167
-msgid "No description"
+#: src/gpodder/sync.py:569 src/gpodder/sync.py:577
+#, python-format
+msgid "Error opening %(filename)s: %(message)s"
 msgstr ""
 
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
+#: src/gpodder/sync.py:746 src/gpodder/sync.py:752
+msgid "MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:730
-msgid "unknown"
+#: src/gpodder/sync.py:759
+msgid "Opening the MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
+#: src/gpodder/sync.py:769
+#, python-format
+msgid "%s opened"
 msgstr ""
 
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
+#: src/gpodder/sync.py:774
+#, python-format
+msgid "Closing %s"
 msgstr ""
 
-#: src/gpodder/model.py:1248
-msgid "Audio"
+#: src/gpodder/sync.py:782
+#, python-format
+msgid "%s closed"
 msgstr ""
 
-#: src/gpodder/my.py:165

gpodder-3.3.0.tar.gz/po/it.po -> gpodder-3.5.0.tar.gz/po/it.po Changed

@@ -1,17 +1,20 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@perli.net>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+#   <alessandrocampidori@gmail.com>, 2012.
+# Andrea Scarpino <andrea@archlinux.org>, 2011.
+# Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 2.7.22\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 11:19+0200\n"
-"PO-Revision-Date: 2012-08-30 23:07+0100\n"
-"Last-Translator: Maurizio Ballo <xmaurizio.13@hotmail.com>\n"
-"Language-Team: Italian <gpodder-devel@lists.berlios.de>\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/gpodder/language/"
+"it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,132 +26,49 @@
 msgid "gPodder on %s"
 msgstr "gPodder su %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Nome utente o password errati"
-
-#: src/gpodder/download.py:533
-#: src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Aggiunto"
-
-#: src/gpodder/download.py:533
-#: src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "In coda"
-
-#: src/gpodder/download.py:533
-#: src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Download in corso"
-
-#: src/gpodder/download.py:534
-#: src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Completato"
-
-#: src/gpodder/download.py:534
-#: src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Fallito"
-
-#: src/gpodder/download.py:534
-#: src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Annullato"
-
-#: src/gpodder/download.py:534
-#: src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "In pausa"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Contenuti mancanti dal server"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Errore I/O: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d giorno fa"
+msgstr[1] "%(count)d giorni fa"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Errore HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Oggi"
 
-#: src/gpodder/download.py:870
-#: src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Errore: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ieri"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Nessuna descrizione per questa estensione."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(sconosciuto)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Comando non trovato: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d secondo"
+msgstr[1] "%(count)d secondi"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Modulo Python non installato: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr "Non sufficiente per Flattr"
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr "L'elemento non esiste su Flattr"
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr "Elemento giò segnalato a Flattr o personale"
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr "Richiesta non valida"
-
-#: src/gpodder/flattr.py:167
-msgid "No description"
-msgstr "Nessuna descrizione"
-
-#: src/gpodder/model.py:495
-#: src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Nessuna descrizione disponibile"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: src/gpodder/model.py:818
-#: src/gpodder/model.py:1251
-msgid "Other"
-msgstr "Altro"
-
-#: src/gpodder/model.py:1234
-#: src/gpodder/model.py:1249
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1247
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d ora"
+msgstr[1] "%(count)d ore"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Aggiungi %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minuti"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Elimina %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "e"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -158,149 +78,229 @@
 msgid "Writing data to disk"
 msgstr "Scrittura dei dati su disco"

gpodder-3.3.0.tar.gz/po/kk.po -> gpodder-3.5.0.tar.gz/po/kk.po Changed

@@ -1,16 +1,18 @@
-# gpodder to kazakh
-# Copyright (C) 2010 gpodder team
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010.
 #
+# Translators:
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010,2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: master\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-11-26 10:30+0600\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
-"Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/gpodder/language/"
+"kk/)\n"
 "Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,265 +24,278 @@
 msgid "gPodder on %s"
 msgstr "gPodder, %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Қате тіркелгі/пароль"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Қосылған"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Кезекте"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Жүктелуде"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Аяқталған"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Сәтсіз аяқталды"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Бас тартылған"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Аялдатылған"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Серверден құрама жоқ"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Е/Ш қатесі: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d күн бұрын"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP қатесі %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Бүгін"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Қате: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Кеше"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Анықтамасы жоқ."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(белгісіз)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python модулі \"%s\" орнатылмаған"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Мәні қате."
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Жазылулар жоқ"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Анықтамасы жоқ"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "белгісіз"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Басқа"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Видео"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Аудио"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d секунд"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Қосу %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d сағат"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Өшіру %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d минут"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "және"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
-msgstr "Пайдаланушы болдырмады"
+msgstr "Пайдаланушы болдырмаған"
 
 #: src/gpodder/sync.py:198
 msgid "Writing data to disk"
-msgstr "Дискіге ақпаратты жазу"
+msgstr "Мәліметті дискіге жазу"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
-msgstr "iPod дереққорын ашу"
+msgstr "iPod дерекқорын ашу"
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr "iPod ашылды"
 
-#: src/gpodder/sync.py:302

gpodder-3.3.0.tar.gz/po/messages.pot -> gpodder-3.5.0.tar.gz/po/messages.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 13:43+0200\n"
+"POT-Creation-Date: 2013-03-05 16:00+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"
@@ -23,268 +23,278 @@
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:327
-msgid "Wrong username/password"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gpodder/util.py:495
+msgid "Today"
 msgstr ""
 
-#: src/gpodder/download.py:525 src/gpodder/sync.py:886
-msgid "Added"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
 msgstr ""
 
-#: src/gpodder/download.py:525 src/gpodder/sync.py:886
-msgid "Queued"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
 msgstr ""
 
-#: src/gpodder/download.py:525 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
+#, python-format
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gpodder/util.py:1236
+#, python-format
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gpodder/util.py:1239
+#, python-format
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gpodder/util.py:1245
+msgid "and"
 msgstr ""
 
-#: src/gpodder/download.py:526 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:68
-msgid "Finished"
+#: src/gpodder/sync.py:195
+msgid "Cancelled by user"
 msgstr ""
 
-#: src/gpodder/download.py:526 src/gpodder/sync.py:887
-msgid "Failed"
+#: src/gpodder/sync.py:198
+msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/download.py:526 src/gpodder/sync.py:887
-msgid "Cancelled"
+#: src/gpodder/sync.py:284
+msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/download.py:526 src/gpodder/sync.py:887
-msgid "Paused"
+#: src/gpodder/sync.py:294
+msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/download.py:845
-msgid "Missing content from server"
+#: src/gpodder/sync.py:305
+msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/download.py:851
+#: src/gpodder/sync.py:310
+msgid "Writing extended gtkpod database"
+msgstr ""
+
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
+msgid "Removing %s"
 msgstr ""
 
-#: src/gpodder/download.py:858
+#: src/gpodder/sync.py:401 src/gpodder/sync.py:514
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
+msgid "Adding %s"
 msgstr ""
 
-#: src/gpodder/download.py:862 src/gpodder/sync.py:1043
+#: src/gpodder/sync.py:417
 #, python-format
-msgid "Error: %s"
+msgid "Error copying %(episode)s: Not enough free space on %(mountpoint)s"
 msgstr ""
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
+#: src/gpodder/sync.py:504
+msgid "Opening MP3 player"
 msgstr ""
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/sync.py:507
+msgid "MP3 player opened"
+msgstr ""
+
+#: src/gpodder/sync.py:569 src/gpodder/sync.py:577
 #, python-format
-msgid "Command not found: %(command)s"
+msgid "Error opening %(filename)s: %(message)s"
+msgstr ""
+
+#: src/gpodder/sync.py:746 src/gpodder/sync.py:752
+msgid "MTP device"
 msgstr ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/sync.py:759
+msgid "Opening the MTP device"
+msgstr ""
+
+#: src/gpodder/sync.py:769
 #, python-format
-msgid "Python module not found: %(module)s"
+msgid "%s opened"
 msgstr ""
 
-#: src/gpodder/flattr.py:210
-msgid "Not enough means to flattr"
+#: src/gpodder/sync.py:774
+#, python-format
+msgid "Closing %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:212
-msgid "Item does not exist on Flattr"
+#: src/gpodder/sync.py:782
+#, python-format
+msgid "%s closed"
 msgstr ""
 
-#: src/gpodder/flattr.py:214
-msgid "Already flattred or own item"
+#: src/gpodder/sync.py:787 bin/gpo:646
+#, python-format
+msgid "Adding %s..."
 msgstr ""
 
-#: src/gpodder/flattr.py:216
-msgid "Invalid request"
+#: src/gpodder/sync.py:889 src/gpodder/download.py:526
+msgid "Added"
 msgstr ""
 
-#: src/gpodder/flattr.py:222
-msgid "No internet connection"
+#: src/gpodder/sync.py:889 src/gpodder/download.py:526
+msgid "Queued"
 msgstr ""
 
-#: src/gpodder/flattr.py:227
-msgid "No description"
+#: src/gpodder/sync.py:889
+msgid "Synchronizing"
 msgstr ""
 
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
+#: src/gpodder/sync.py:890 src/gpodder/download.py:527
+#: src/gpodder/qmlui/__init__.py:69
+msgid "Finished"
 msgstr ""
 
-#: src/gpodder/model.py:730

gpodder-3.3.0.tar.gz/po/nb.po -> gpodder-3.5.0.tar.gz/po/nb.po Changed

@@ -1,153 +1,75 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# , fuzzy
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Jim Nygård <jim@nygard.priv.no>, 2009, 2011, 2012.
 # Thomas Perl <thp@perli.net>, 2006.
-# Jim Nygård <jim@nygard.priv.no>, 2009.
-# Torstein Adolf Winterseth <kvikende@yahoo.no>, 2010.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
+# Torstein Adolf Winterseth <kvikende@yahoo.no>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 2.4\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-08-26 06:28+0100\n"
-"Last-Translator: Jim Nygård <jim@nygard.priv.no>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
-"Language: nn\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/gpodder/"
+"language/nb/)\n"
+"Language: nb\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: Lokalize 1.0\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder på %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Feil brukernavn/passord"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Lagt til"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "I kø"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Laster ned"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Ferdig"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Feilet"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Avbrutt"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dag siden"
+msgstr[1] "%(count)d dager siden"
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pauset"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Idag"
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Manglende innhold fra tjener"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Igår"
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O feil: %(error)s: %(filename)s"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(ukjent)"
 
-#: src/gpodder/download.py:866
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP feil %(code)s: %(message)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekund"
+msgstr[1] "%(count)d sekunder"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Error: %s"
-msgstr "Feil: %s"
-
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Ingen beskrivelse tilgjengelig."
-
-#: src/gpodder/extensions.py:162
-#, fuzzy, python-format
-msgid "Command not found: %(command)s"
-msgstr "Fant ikke brukerkommando"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python modul «%s» er ikke installert"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Ugyldig URL"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Ingen abonnement"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Ingen beskrivelse tilgjengelig"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "ukjent"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Annet"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d time"
+msgstr[1] "%(count)d timer"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Legg til %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minutt"
+msgstr[1] "%(count)d minutter"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Fjern %s?"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "og"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"

gpodder-3.3.0.tar.gz/po/nl.po -> gpodder-3.5.0.tar.gz/po/nl.po Changed

@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2012-08-16 07:12+0000\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
 "Last-Translator: Thomas Perl <m@thp.io>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/gpodder/language/"
 "nl/)\n"
@@ -20,128 +20,56 @@
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder heeft %s gevonden"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Voer uw naam en wachtwoord in."
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Toegevoegd"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "In wachtrij"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Downloaden"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Klaar"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Mislukt"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pauze"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Ontbrekende componenten:"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Fout bij het openen van %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dag geleden"
+msgstr[1] "%(count)d dagen geleden"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Fout bij het openen van %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Vandaag"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Fout: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Gisteren"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Geen omschrijving voor deze extensie"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(onbekend)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d seconde"
+msgstr[1] "%(count)d seconden"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-msgid "No description"
-msgstr ""
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Geen beschrijving beschikbaar"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "onbekend"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Anders"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Audio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d uur"
+msgstr[1] "%(count)d uren"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Toevoegen van %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuut"
+msgstr[1] "%(count)d minuten"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "%s verwijderen?"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "en"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -151,141 +79,230 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"
 msgstr ""
 
-#: src/gpodder/sync.py:383 src/gpodder/sync.py:643 src/gpodder/sync.py:837
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format

gpodder-3.3.0.tar.gz/po/nn.po -> gpodder-3.5.0.tar.gz/po/nn.po Changed

@@ -1,146 +1,73 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
 # Thomas Perl <thp@perli.net>, 2006.
-# Torstein Adolf Winterseth <kvikende@yahoo.no>, 2009, 2010.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
+# Torstein Adolf Winterseth <kvikende@yahoo.no>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-09-11 09:18+0200\n"
-"Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\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: Virtaal 0.6.1\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder på %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Feil brukarnamn/passord"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Lagt til"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "I kø"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Lastar ned"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Ferdig"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Feila"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Avbrote"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausa"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Manglande innhald frå tenaren"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O-feil: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP-feil %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Idag"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Feil: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "I går"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Inga skildring tilgjengeleg."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(ukjend)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python-modulen «%s» er ikkje installert"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Ingen abonnement"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Ingen detaljar tilgjengeleg"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "ukjend"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Andre"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Legg til %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Fjern %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "og"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -150,143 +77,233 @@
 msgid "Writing data to disk"
 msgstr "Skriv data til disk"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "Opnar iPod-database"
 
-#: src/gpodder/sync.py:291

gpodder-3.3.0.tar.gz/po/pl.po -> gpodder-3.5.0.tar.gz/po/pl.po Changed

@@ -1,147 +1,78 @@
-# Polish translation of gPodder.
-# Copyright (C) 2009 Tomasz Dominikowski
-# This file is distributed under the same license as the gPodder package.
-# Tomasz Dominikowski <tdominikowski@aviary.pl>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+#  <fklebczyk@gmail.com>, 2013.
+# Tomasz Dominikowski <tdominikowski@aviary.pl>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-11-23 10:04+0100\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
-"Language-Team: Polish <tdominikowski@aviary.pl>\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 15:01+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/gpodder/language/"
+"pl/)\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder na %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Dodane"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Zakolejkowane"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Pobierane"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Ukończone"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Nieudane"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Anulowane"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Wstrzymane"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Brak zawartości na serwerze"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Błąd we/wy: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dzień temu"
+msgstr[1] "%(count)d dni temu"
+msgstr[2] "%(count)d dni temu"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Błąd HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Dzisiaj"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Błąd: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Wczoraj"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Brak dostępnego opisu."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(nieznane)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Moduł Python \"%s\" nie jest zainstalowany"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Brak subskrypcji"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Brak opisu"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "nieznany"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Inne"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekundę"
+msgstr[1] "%(count)d sekundy"
+msgstr[2] "%(count)d sekund"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Dodaj %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d godzinę"
+msgstr[1] "%(count)d godziny"
+msgstr[2] "%(count)d godzin"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Usuń %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minutę"
+msgstr[1] "%(count)d minuty"
+msgstr[2] "%(count)d minut"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "i"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -151,148 +82,229 @@
 msgid "Writing data to disk"
 msgstr "Zapisywanie danych na dysk"

gpodder-3.3.0.tar.gz/po/pt.po -> gpodder-3.5.0.tar.gz/po/pt.po Changed

@@ -4,295 +4,302 @@
 #
 # Translators:
 # Joel Calado <joelcalado@gmail.com>, 2007.
-# Sérgio Marques <smarquespt@gmail.com>, 2010.
+# Sérgio Marques <smarquespt@gmail.com>, 2010,2012-2013.
 # Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-11-22 10:47-0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/gpodder/team/"
-"pt/)\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 15:01+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/gpodder/"
+"language/pt/)\n"
 "Language: pt\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder em %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Utilizador/senha inválida"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Adicionado"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Na fila"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "A transferir"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Concluído"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Falhou"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausado"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "O conteúdo não existe no servidor"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Erro E/S: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dia atrás"
+msgstr[1] "%(count)d dias atrás"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Erro HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoje"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Erro: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ontem"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr "Sem descrição para esta extensão."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(desconhecido)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr "Comando não encontrado: %(command)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Módulo python não encontrado: %(module)s"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr "O Item não existe no Flattr"
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Valor inválido."
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Sem subscrições"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Sem descrição"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "desconhecido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Outros"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Áudio"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Adicionar %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Remover %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "e"
 
 #: src/gpodder/sync.py:195
-#, fuzzy
 msgid "Cancelled by user"
-msgstr "Cancelado"
+msgstr "Cancelado pelo utilizador"
 
 #: src/gpodder/sync.py:198
 msgid "Writing data to disk"
 msgstr "A escrever dados no disco"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
-msgstr "A abrir base de dados do iPod"
+msgstr "A abrir base de dados iPod"
 
-#: src/gpodder/sync.py:291

gpodder-3.3.0.tar.gz/po/pt_BR.po -> gpodder-3.5.0.tar.gz/po/pt_BR.po Changed

@@ -1,149 +1,77 @@
-# translation of pt.po to
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@perli.net>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Dudu Maroja <stuffmail@gmail.com>, 2010.
+# Eduardo Maroja <stuffmail@gmail.com>, 2009.
+# Enrico Nicoletto <enrico.BR@gmx.co.uk>, 2013.
 # Joel Calado <joelcalado@gmail.com>, 2007.
-# Eduardo Maroja <stuffmail@gmail.com>, 2009
-# Dudu Maroja <stuffmail@gmail.com>, 2010
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012-2013.
+# Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: pt\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-03-16 06:44-0300\n"
-"Last-Translator: Dudu Maroja <stuffmail@gmail.com>\n"
-"Language-Team: Eduardo Maroja\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-03-05 15:01+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"gpodder/language/pt_BR/)\n"
 "Language: pt_BR\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-Rosetta-Export-Date: 2009-11-02 18:38:19-0300\n"
-"X-Generator: Virtaal 0.3.1\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder em %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Login/Password inválidos"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Adicionado"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Em espera"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Downloading"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Terminados"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Falhou"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausado"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Conteúdo do servidor esta faltando"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Erro de I/O: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dia atrás"
+msgstr[1] "%(count)d dias atrás"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Erro de HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Hoje"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Erro: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ontem"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Descrição indisponível"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(desconhecido)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Módulo do Python \"%s\" não instalado"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Nenhuma inscrição"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Descrição não disponível"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "desconhecido"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Outro"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d segundo"
+msgstr[1] "%(count)d segundos"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Adicionar %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d hora"
+msgstr[1] "%(count)d horas"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Remove %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minuto"
+msgstr[1] "%(count)d minutos"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "e"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -151,612 +79,681 @@

gpodder-3.3.0.tar.gz/po/ro.po -> gpodder-3.5.0.tar.gz/po/ro.po Changed

@@ -1,150 +1,75 @@
 # 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.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-02-27 22:49-0500\n"
-"Last-Translator: Gherhardt Mathisz <gmathisz@gmail.com>\n"
-"Language-Team: Gherhardt Mathisz <gmathisz@gmail.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Poedit-Language: Romanian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/gmathisz/Documents/traduceri/gPodder\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-Country: ROMANIA\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder pe %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Numele sau parola este greșită"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Adăugat"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Adăugat în coada de așteptare"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Se descarcă"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Gata"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Eșuat"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Sa renunțat"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Întrerupt temporar"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Conținutul lipseste de pe server"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Eroare I/O: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Eroare HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Astăzi"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Eroare: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Ieri"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Nu există disponibilă nici o descriere."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(necunoscut)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Modulul Python \"%s\" nu este instalat"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Nu există abonamente"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Nu există descriere"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "necunoscut"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Altele"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Adaugă %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Îndepărtează %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "și"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -154,148 +79,234 @@
 msgid "Writing data to disk"
 msgstr "Datele sunt scrise pe disc"

gpodder-3.3.0.tar.gz/po/ru.po -> gpodder-3.5.0.tar.gz/po/ru.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gPodder 2.10+git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
 "PO-Revision-Date: 2010-11-24 21:55+0300\n"
 "Last-Translator: Maxim Prohorov <prohorov.max@gmail.com>\n"
 "Language-Team: \n"
@@ -23,123 +23,53 @@
 msgid "gPodder on %s"
 msgstr "gPodder на %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Неверное имя пользователя/пароль"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Добавлено"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "В очереди"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Загрузка"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Завершено"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Ошибка"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Отменено"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Остановлено"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Отсутствуют данные с сервера"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Ошибка ввода/вывода: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "Один день назад"
+msgstr[1] "%(count)d дня назад"
+msgstr[2] "%(count)d дней назад"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "Ошибка HTTP %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Сегодня"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Ошибка: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Вчера"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Нет описания."
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(неизвестно)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python module \"%s\" not installed"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Нет подписок"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Нет описания"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "неизвестно"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Другое"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Видео"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Аудио"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "Одна секунда"
+msgstr[1] "%(count)d секунды"
+msgstr[2] "%(count)d секунд"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Добавление %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "один час"
+msgstr[1] "%(count)d часа"
+msgstr[2] "%(count)d часов"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Удалить %s?"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "Одна минута"
+msgstr[1] "%(count)d минуты"
+msgstr[2] "%(count)d минут"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "и"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -149,148 +79,234 @@
 msgid "Writing data to disk"
 msgstr "Запись на диск"
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr "Открытия базы данных iPod"
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr "iPod открыт"
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr "Сохранение базы данных iPod"
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"
 msgstr "Запись в базу данных gtkpod"
 
-#: src/gpodder/sync.py:383 src/gpodder/sync.py:643 src/gpodder/sync.py:837
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format
 msgid "Removing %s"
 msgstr "Удаление %s"

gpodder-3.3.0.tar.gz/po/sv.po -> gpodder-3.5.0.tar.gz/po/sv.po Changed

@@ -1,148 +1,75 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@perli.net>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2012.
+# Peter Hultqvist <phq@endnode.se>, 2011.
+#   <revoltism@gmail.com>, 2012.
+# Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 0.17.0\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-05-11 23:13+0100\n"
-"Last-Translator: Peter Hultqvist\n"
-"Language-Team: gPodder team <gpodder-devel@lists.berlios.de>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/gpodder/language/"
+"sv/)\n"
+"Language: sv\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-Rosetta-Export-Date: 2007-06-21 13:48:19+0000\n"
-"X-Poedit-Country: SWEDEN\n"
-"X-Poedit-Language: Swedish\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder på %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Fel användarnamn/lösenord."
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Tillagt"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "Köad"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Laddar ner"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Klar"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Misslyckad"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Avbruten"
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d dag sedan"
+msgstr[1] "%(count)d dagar sedan"
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Pausad"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Idag"
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "Innehåll från server saknas"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Igår"
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O Fel: %(error)s: %(filename)s"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(okänt)"
 
-#: src/gpodder/download.py:866
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP Fel: %(code)s: %(message)s"
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d sekund"
+msgstr[1] "%(count)d sekunder"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Error: %s"
-msgstr "Fel: %s"
-
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Beskrivning saknas."
-
-#: src/gpodder/extensions.py:162
-#, fuzzy, python-format
-msgid "Command not found: %(command)s"
-msgstr "Anvädar kommando finns inte"
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Python modul \"%s\" ej installerad"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-#, fuzzy
-msgid "Invalid request"
-msgstr "Ogiltig URL"
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Inga prenumerationer"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Ingen beskrivning tillgänglig"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "okänt"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Annan"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Ljud"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d timme"
+msgstr[1] "%(count)d timmar"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "Lägg till %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d minut"
+msgstr[1] "%(count)d minuter"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "Radera %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "och"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -152,144 +79,235 @@
 msgid "Writing data to disk"
 msgstr "Skriver data till hårddisk"

gpodder-3.3.0.tar.gz/po/tr.po -> gpodder-3.5.0.tar.gz/po/tr.po Changed

@@ -2,141 +2,67 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+#   <sunder67@hotmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/gpodder/team/"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/gpodder/language/"
 "tr/)\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr ""
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr ""
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr ""
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr ""
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr ""
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr ""
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "İptal Edildi"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Durduruldu"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr ""
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr ""
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr ""
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Bugün"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Hata: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Dün"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr ""
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(Bilinmiyor)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d saniye"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-msgid "No description"
-msgstr ""
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr ""
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "bilinmiyor"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Diğer"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "Video"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "Ses"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d saat"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "%s Ekle"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d dakika"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "%s kaldır"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "ve"
 
 #: src/gpodder/sync.py:195
 #, fuzzy
@@ -147,860 +73,978 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"
 msgstr ""

gpodder-3.3.0.tar.gz/po/tr_TR.po -> gpodder-3.5.0.tar.gz/po/tr_TR.po Changed

@@ -2,1017 +2,1058 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2011-08-04 10:14+0000\n"
-"Last-Translator: thp <m@thp.io>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.net/projects/p/gpodder/"
-"team/tr_TR/)\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:30+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/gpodder/"
+"language/tr_TR/)\n"
 "Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr ""
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr ""
+#: src/gpodder/util.py:419
+#, python-format
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
+#: src/gpodder/util.py:495
+msgid "Today"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
 msgstr ""
 
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
 msgstr ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr ""
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
+#, python-format
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr ""
+#: src/gpodder/util.py:1236
+#, python-format
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr ""
+#: src/gpodder/util.py:1239
+#, python-format
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] ""
 
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
+#: src/gpodder/util.py:1245
+msgid "and"
 msgstr ""
 
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
+#: src/gpodder/sync.py:195
+msgid "Cancelled by user"
 msgstr ""
 
-#: src/gpodder/download.py:859
-#, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
+#: src/gpodder/sync.py:198
+msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
+#: src/gpodder/sync.py:284
+msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
+#: src/gpodder/sync.py:294
+msgid "iPod opened"
 msgstr ""
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
+#: src/gpodder/sync.py:305
+msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:162
-#, python-format
-msgid "Command not found: %(command)s"
+#: src/gpodder/sync.py:310
+msgid "Writing extended gtkpod database"
 msgstr ""
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840
 #, python-format
-msgid "Python module not found: %(module)s"
+msgid "Removing %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
+#: src/gpodder/sync.py:401 src/gpodder/sync.py:514
+#, python-format
+msgid "Adding %s"
 msgstr ""
 
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
+#: src/gpodder/sync.py:417
+#, python-format
+msgid "Error copying %(episode)s: Not enough free space on %(mountpoint)s"
 msgstr ""
 
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
+#: src/gpodder/sync.py:504
+msgid "Opening MP3 player"
 msgstr ""
 
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
+#: src/gpodder/sync.py:507
+msgid "MP3 player opened"
 msgstr ""
 
-#: src/gpodder/flattr.py:167
-msgid "No description"
+#: src/gpodder/sync.py:569 src/gpodder/sync.py:577
+#, python-format
+msgid "Error opening %(filename)s: %(message)s"
 msgstr ""
 
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
+#: src/gpodder/sync.py:746 src/gpodder/sync.py:752
+msgid "MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:730
-msgid "unknown"
+#: src/gpodder/sync.py:759
+msgid "Opening the MTP device"
 msgstr ""
 
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
+#: src/gpodder/sync.py:769
+#, python-format
+msgid "%s opened"
 msgstr ""
 
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
+#: src/gpodder/sync.py:774
+#, python-format
+msgid "Closing %s"
 msgstr ""
 
-#: src/gpodder/model.py:1248
-msgid "Audio"

gpodder-3.3.0.tar.gz/po/uk.po -> gpodder-3.5.0.tar.gz/po/uk.po Changed

@@ -1,148 +1,76 @@
-# gPodder translation template.
-# Copyright (C) 2006 Thomas Perl
-# This file is distributed under the same license as the gPodder package.
-# Thomas Perl <thp@perli.net>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Thomas Perl <thp@perli.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: gPodder 0.9.2+svn20070611\n"
+"Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2010-03-16 21:25+0300\n"
-"Last-Translator: Boryslav Larin <brabadu@gmail.com>\n"
-"Language-Team: Украинский <brabadu@gmail.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Country: UKRAINE\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Ukrainian\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder на %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "Неправильне ім'я користувача/пароль"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "Додано"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "В черзі"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "Завантажую"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "Завершено"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "Помилка"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "Скасовано"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "Призупинено"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "На сервері немає контенту"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "Помилка вводу/виводу: %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d день тому"
+msgstr[1] "%(count)d дні тому"
+msgstr[2] "%(count)d днів тому"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP помилка %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "Сьогодні"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "Помилка: %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "Вчора"
 
-#: src/gpodder/extensions.py:92
-#, fuzzy
-msgid "No description for this extension."
-msgstr "Опис відсутній"
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(невідомо)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
-
-#: src/gpodder/extensions.py:199
-#, fuzzy, python-format
-msgid "Python module not found: %(module)s"
-msgstr "Модуль Python \"%s\" не встановлено"
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "Немає підписок"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "Опис відсутній"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "невідомий"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "Інше"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr ""
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d секунда"
+msgstr[1] "%(count)d секунди"
+msgstr[2] "%(count)d секунд"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Add %s"
-msgstr "Додати %s"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d година"
+msgstr[1] "%(count)d години"
+msgstr[2] "%(count)d годин"
 
-#: src/gpodder/my.py:167
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Remove %s"
-msgstr "Видалити %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d хвилина"
+msgstr[1] "%(count)d хвилини"
+msgstr[2] "%(count)d хвилин\t"
+
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr "та"
 
 #: src/gpodder/sync.py:195
 msgid "Cancelled by user"
@@ -152,147 +80,233 @@
 msgid "Writing data to disk"
 msgstr "Збереження даних на диск"

gpodder-3.3.0.tar.gz/po/zh_CN.po -> gpodder-3.5.0.tar.gz/po/zh_CN.po Changed

@@ -9,138 +9,61 @@
 msgstr ""
 "Project-Id-Version: gPodder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-16 09:53+0200\n"
-"PO-Revision-Date: 2012-01-05 09:54+0000\n"
-"Last-Translator: jiero <lililjlj@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/gpodder/"
-"team/zh_CN/)\n"
+"POT-Creation-Date: 2013-03-05 16:00+0100\n"
+"PO-Revision-Date: 2013-01-19 12:31+0000\n"
+"Last-Translator: Thomas Perl <m@thp.io>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/gpodder/"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/gpodder/config.py:55
 #, python-format
 msgid "gPodder on %s"
 msgstr "gPodder 在 %s"
 
-#: src/gpodder/download.py:335
-msgid "Wrong username/password"
-msgstr "错误的 用户名/密码"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Added"
-msgstr "已添加"
-
-#: src/gpodder/download.py:533 src/gpodder/sync.py:886
-msgid "Queued"
-msgstr "已入序"
-
-#: src/gpodder/download.py:533 src/gpodder/gtkui/model.py:328
-msgid "Downloading"
-msgstr "下载中"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-#: src/gpodder/qmlui/__init__.py:67
-msgid "Finished"
-msgstr "已完成"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Failed"
-msgstr "失败"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Cancelled"
-msgstr "取消"
-
-#: src/gpodder/download.py:534 src/gpodder/sync.py:887
-msgid "Paused"
-msgstr "暂停"
-
-#: src/gpodder/download.py:853
-msgid "Missing content from server"
-msgstr "服务端缺失内容"
-
-#: src/gpodder/download.py:859
+#: src/gpodder/util.py:419
 #, python-format
-msgid "I/O Error: %(error)s: %(filename)s"
-msgstr "I/O错误 %(error)s: %(filename)s"
+msgid "%(count)d day ago"
+msgid_plural "%(count)d days ago"
+msgstr[0] "%(count)d 日之前"
 
-#: src/gpodder/download.py:866
-#, python-format
-msgid "HTTP Error %(code)s: %(message)s"
-msgstr "HTTP错误 %(code)s: %(message)s"
+#: src/gpodder/util.py:495
+msgid "Today"
+msgstr "今日"
 
-#: src/gpodder/download.py:870 src/gpodder/sync.py:1043
-#, python-format
-msgid "Error: %s"
-msgstr "错误 %s"
+#: src/gpodder/util.py:497
+msgid "Yesterday"
+msgstr "昨日"
 
-#: src/gpodder/extensions.py:92
-msgid "No description for this extension."
-msgstr ""
+#: src/gpodder/util.py:540 src/gpodder/util.py:543
+msgid "(unknown)"
+msgstr "(不明)"
 
-#: src/gpodder/extensions.py:162
+#: src/gpodder/util.py:1223 src/gpodder/util.py:1242
 #, python-format
-msgid "Command not found: %(command)s"
-msgstr ""
+msgid "%(count)d second"
+msgid_plural "%(count)d seconds"
+msgstr[0] "%(count)d 秒"
 
-#: src/gpodder/extensions.py:199
+#: src/gpodder/util.py:1236
 #, python-format
-msgid "Python module not found: %(module)s"
-msgstr ""
-
-#: src/gpodder/flattr.py:159
-msgid "Not enough means to flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:161
-msgid "Item does not exist on Flattr"
-msgstr ""
-
-#: src/gpodder/flattr.py:163
-msgid "Already flattred or own item"
-msgstr ""
-
-#: src/gpodder/flattr.py:165
-msgid "Invalid request"
-msgstr ""
-
-#: src/gpodder/flattr.py:167
-#, fuzzy
-msgid "No description"
-msgstr "无介绍"
-
-#: src/gpodder/model.py:495 src/gpodder/plugins/soundcloud.py:155
-msgid "No description available"
-msgstr "无介绍"
-
-#: src/gpodder/model.py:730
-msgid "unknown"
-msgstr "未知"
-
-#: src/gpodder/model.py:818 src/gpodder/model.py:1252
-msgid "Other"
-msgstr "其他"
-
-#: src/gpodder/model.py:1235 src/gpodder/model.py:1250
-msgid "Video"
-msgstr "视频"
-
-#: src/gpodder/model.py:1248
-msgid "Audio"
-msgstr "音频"
+msgid "%(count)d hour"
+msgid_plural "%(count)d hours"
+msgstr[0] "%(count)d 小时"
 
-#: src/gpodder/my.py:165
+#: src/gpodder/util.py:1239
 #, python-format
-msgid "Add %s"
-msgstr "添加 %s"
+msgid "%(count)d minute"
+msgid_plural "%(count)d minutes"
+msgstr[0] "%(count)d 分"
 
-#: src/gpodder/my.py:167
-#, python-format
-msgid "Remove %s"
-msgstr "移除 %s"
+#: src/gpodder/util.py:1245
+msgid "and"
+msgstr " "
 
 #: src/gpodder/sync.py:195
 #, fuzzy
@@ -151,140 +74,233 @@
 msgid "Writing data to disk"
 msgstr ""
 
-#: src/gpodder/sync.py:281
+#: src/gpodder/sync.py:284
 msgid "Opening iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:291
+#: src/gpodder/sync.py:294
 #, fuzzy
 msgid "iPod opened"
 msgstr "打开过的"
 
-#: src/gpodder/sync.py:302
+#: src/gpodder/sync.py:305
 msgid "Saving iPod database"
 msgstr ""
 
-#: src/gpodder/sync.py:307
+#: src/gpodder/sync.py:310
 msgid "Writing extended gtkpod database"
 msgstr ""
 
-#: src/gpodder/sync.py:383 src/gpodder/sync.py:643 src/gpodder/sync.py:837
+#: src/gpodder/sync.py:386 src/gpodder/sync.py:646 src/gpodder/sync.py:840

gpodder-3.3.0.tar.gz/setup.py -> gpodder-3.5.0.tar.gz/setup.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/credits.txt -> gpodder-3.5.0.tar.gz/share/gpodder/credits.txt Changed

@@ -1,5 +1,7 @@
+Adolfo Jayme Barrientos
 Adrien Beaucreux
 Alain Tauch
+Alessandro Campidori
 Alexander Boström
 Alex Bennee
 Alex Ghitza
@@ -8,6 +10,7 @@
 Anders Kvist
 Andrea Carpineti
 Andreas Böttger
+Andreas Piesk
 Andrei Dolganov
 Andrew Bennett
 Andy Busch
@@ -34,6 +37,7 @@
 Carlos Moffat
 Casey Watson
 Cesar Alcalde
+Chionsas
 Chris Arnold
 Chris Moffitt
 Clark Burbidge
@@ -42,17 +46,22 @@
 Cory Albrecht
 daggpod
 Daniel Ramos
+Daniel Sandman
+Daniel Schaal
 Danilo Shiga
 darkmanx
 David Spreen
+David Štancl
 Doug Hellmann
 Dov Feldstern
+Dudu Maroja
 Edouard Pellerin
 Eduardo Maroja
 Eric Le Lay
 Eugene Nikolsky
 Fabio Fiorentini
 FFranci72
+Filip Kłębczyk
 Floriano Scioscia
 Florian Richter
 Frank Harper
@@ -91,6 +100,7 @@
 José Luis Fustel
 Joseph Bleau
 Joseph Wickremasinghe
+Josh Mondragon
 Julio Acuña
 Junio C Hamano
 Jürgen Schinker
@@ -114,6 +124,7 @@
 Mika Leppinen
 Mike Coulson
 Mikolaj Laczynski
+Mohammad Dashtizadeh
 Mohammadreza Abdollahzadeh
 Morten Juhl-Johansen Zölde-Fejér
 Morten Nygaard Åsnes
@@ -121,11 +132,13 @@
 Mykola Nikishov
 narf
 Neal H. Walfield
+Nelson Ferreira
 Nick L.
 Nick Sonneveld
 Nick Stevens
 Nicolas Quienot
 Nikolaos Papagrigoriou
+Olivier Brisson
 Ondrej Vesely
 Ortwin Forster
 Paul Elliot
@@ -139,11 +152,13 @@
 Pieter de Decker
 Preben Randhol
 psychedelys
+Rafael Ferreira
 Rafael Proença
 Rafi Rubin
 R.Bell
 red26wings
 Richard Voigt
+Rigoberto Calleja
 Robert Willert
 Robert Young
 Roel Groeneveld
@@ -152,6 +167,7 @@
 Sam Freilich
 Scott Wegner
 Scott Worley
+Sean Munkel
 Sebastian Hanula
 Sebastian Krause
 Sebastian Semmler
@@ -161,6 +177,8 @@
 Shane Donohoe
 Shane Huntley
 Silvio Sisto
+Simó Albert i Beltran
+Simon Schubert
 sneakypete
 SPGoetze
 S. Rust

gpodder-3.5.0.tar.gz/share/gpodder/extensions/enqueue_in_mediaplayer.py Added

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Extension script to add a context menu item for enqueueing episodes in a player
+# Requirements: gPodder 3.x (or "tres" branch newer than 2011-06-08)
+# (c) 2011-06-08 Thomas Perl <thp.io/about>
+# Released under the same license terms as gPodder itself.
+import subprocess
+
+import gpodder
+from gpodder import util
+
+import logging
+logger = logging.getLogger(__name__)
+
+_ = gpodder.gettext
+
+__title__ = _('Enqueue in media players')
+__description__ = _('Add a context menu item for enqueueing episodes in installed media players')
+__author__ = 'Thomas Perl <thp@gpodder.org>, Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'interface'
+__only_for__ = 'gtk'
+
+AMAROK = (['amarok', '--play', '--append'],
+    '%s/%s' % (_('Enqueue in'), 'Amarok'))
+VLC = (['vlc', '--started-from-file', '--playlist-enqueue'],
+    '%s/%s' % (_('Enqueue in'), 'VLC'))
+
+
+class gPodderExtension:
+    def __init__(self, container):
+        self.container = container
+        self.gpodder = None
+
+        # Check media players
+        self.amarok_available = self.check_mediaplayer(AMAROK[0][0])
+        self.vlc_available = self.check_mediaplayer(VLC[0][0])
+
+    def on_ui_object_available(self, name, ui_object):
+        if name == 'gpodder-gtk':
+            self.gpodder = ui_object
+
+    def check_mediaplayer(self, cmd):
+        return not (util.find_command(cmd) == None)
+
+    def _enqueue_episodes_cmd(self, episodes, cmd):
+        filenames = [episode.get_playback_url() for episode in episodes]
+
+        vlc = subprocess.Popen(cmd + filenames,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        for episode in episodes:
+            episode.playback_mark()
+            self.gpodder.update_episode_list_icons(selected=True)
+
+    def enqueue_episodes_amarok(self, episodes):
+        self._enqueue_episodes_cmd(episodes, AMAROK[0])
+
+    def enqueue_episodes_vlc(self, episodes):
+        self._enqueue_episodes_cmd(episodes, VLC[0])
+
+    def on_episodes_context_menu(self, episodes):
+        if not [e for e in episodes if e.file_exists()]:
+            return None
+
+        menu_entries = []
+
+        if self.amarok_available:
+            menu_entries.append((AMAROK[1], self.enqueue_episodes_amarok))
+
+        if self.vlc_available:
+            menu_entries.append((VLC[1], self.enqueue_episodes_vlc))
+
+        return menu_entries

gpodder-3.3.0.tar.gz/share/gpodder/extensions/flv2mp4.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/flv2mp4.py Changed

@@ -23,6 +23,7 @@
 __title__ = _('Convert .flv files from YouTube to .mp4')
 __description__ = _('Useful for playing downloaded videos on hardware players')
 __authors__ = 'Thomas Perl <thp@gpodder.org>, Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'post-download'
 
 DefaultConfig = {
     'context_menu': True, # Show the conversion option in the context menu
@@ -81,12 +82,15 @@
                 stderr=subprocess.PIPE)
         stdout, stderr = ffmpeg.communicate()
 
-        if ffmpeg.returncode == 0:
-            logger.info('FLV conversion successful.')
+        if ffmpeg.returncode == 0:            
             util.rename_episode_file(episode, new_filename)
             os.remove(old_filename)
+            
+            logger.info('FLV conversion successful.')
+            gpodder.user_extensions.on_notification_show(_('File converted'), episode.title)
         else:
             logger.warn('Error converting file: %s / %s', stdout, stderr)
+            gpodder.user_extensions.on_notification_show(_('Conversion failed'), episode.title)
 
     def _convert_episodes(self, episodes):
         for episode in episodes:

gpodder-3.3.0.tar.gz/share/gpodder/extensions/gtk_statusicon.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/gtk_statusicon.py Changed

@@ -10,9 +10,12 @@
 
 __title__ = _('Gtk Status Icon')
 __description__ = _('Show a status icon for Gtk-based Desktops.')
+__category__ = 'desktop-integration'
 __only_for__ = 'gtk'
+__disable_in__ = 'unity'
 
 import gtk
+import os.path
 
 class gPodderExtension:
     def __init__(self, container):
@@ -21,21 +24,31 @@
         self.gpodder = None
 
     def on_load(self):
-        self.status_icon = gtk.status_icon_new_from_icon_name('gpodder')
+        path = os.path.join(os.path.dirname(__file__), '..', '..', 'icons')
+        icon_path = os.path.abspath(path)
+
+        theme = gtk.icon_theme_get_default()
+        theme.append_search_path(icon_path)
+
+        if theme.has_icon('gpodder'):
+            self.status_icon = gtk.status_icon_new_from_icon_name('gpodder')
+        else:
+            self.status_icon = gtk.status_icon_new_from_icon_name('stock_mic')
+
         self.status_icon.connect('activate', self.on_toggle_visible)
+        self.status_icon.set_has_tooltip(True)
+        self.status_icon.set_tooltip_text("gPodder")
 
     def on_toggle_visible(self, status_icon):
         if self.gpodder is None:
             return
 
-        if self.gpodder.main_window.get_property('visible'):
-            self.gpodder.main_window.hide()
-        else:
-            self.gpodder.main_window.show()
+        visibility = self.gpodder.main_window.get_visible()
+        self.gpodder.main_window.set_visible(not visibility)
 
     def on_unload(self):
         if self.status_icon is not None:
-            self.status_icon.hide()
+            self.status_icon.set_visible(False)
             self.status_icon = None
 
     def on_ui_object_available(self, name, ui_object):

gpodder-3.3.0.tar.gz/share/gpodder/extensions/m4a_converter.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/m4a_converter.py Changed

@@ -10,6 +10,7 @@
 import subprocess
 
 import gpodder
+from gpodder import util
 
 import logging
 logger = logging.getLogger(__name__)
@@ -19,6 +20,7 @@
 __title__ = _('Convert M4A audio to MP3 or OGG')
 __description__ = _('Transcode .m4a files to .mp3 or .ogg using ffmpeg')
 __authors__ = 'Bernd Schlapsi <brot@gmx.info>, Thomas Perl <thp@gpodder.org>'
+__category__ = 'post-download'
 
 
 DefaultConfig = {
@@ -27,18 +29,38 @@
 }
 
 class gPodderExtension:
-    MIME_TYPES = ['audio/x-m4a', 'audio/mp4']
+    MIME_TYPES = ['audio/x-m4a', 'audio/mp4', 'audio/mp4a-latm']
+    EXT = '.m4a'
+    CMD = {'avconv': ['-i', '%(old_file)s', '-q:a', '2', '-id3v2_version',
+                '3', '-write_id3v1', '1', '%(new_file)s'],
+           'ffmpeg': ['-i', '%(old_file)s', '-q:a', '2', '-id3v2_version',
+                '3', '-write_id3v1', '1', '%(new_file)s']
+          }
 
     def __init__(self, container):
         self.container = container
         self.config = self.container.config
 
         # Dependency checks
-        self.container.require_command('ffmpeg')
+        self.command = self.container.require_any_command(['avconv', 'ffmpeg'])
+
+        # extract command without extension (.exe on Windows) from command-string
+        command_without_ext = os.path.basename(os.path.splitext(self.command)[0])
+        self.command_param = self.CMD[command_without_ext]
 
     def on_episode_downloaded(self, episode):
         self._convert_episode(episode)
 
+    def _check_mp4(self, episode):
+        if episode.mime_type in self.MIME_TYPES:
+            return True
+
+        # Also check file extension (bug 1770)
+        if episode.extension() == self.EXT:
+            return True
+
+        return False
+
     def on_episodes_context_menu(self, episodes):
         if not self.config.context_menu:
             return None
@@ -46,7 +68,7 @@
         if not all(e.was_downloaded(and_exists=True) for e in episodes):
             return None
 
-        if not any(e.mime_type in self.MIME_TYPES for e in episodes):
+        if not any(self._check_mp4(episode) for episode in episodes):
             return None
 
         target_format = ('OGG' if self.config.use_ogg else 'MP3')
@@ -55,7 +77,9 @@
         return [(menu_item, self._convert_episodes)]
 
     def _convert_episode(self, episode):
-        if episode.mime_type not in self.MIME_TYPES:
+        old_filename = episode.local_filename(create=False)
+
+        if not self._check_mp4(episode):
             return
 
         if self.config.use_ogg:
@@ -63,23 +87,26 @@
         else:
             extension = '.mp3'
 
-        old_filename = episode.local_filename(create=False)
         filename, old_extension = os.path.splitext(old_filename)
         new_filename = filename + extension
 
-        cmd = ['ffmpeg', '-i', old_filename, '-sameq', new_filename]
+        cmd = [self.command] + \
+            [param % {'old_file': old_filename, 'new_file': new_filename}
+                for param in self.command_param]
         ffmpeg = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
         stdout, stderr = ffmpeg.communicate()
 
         if ffmpeg.returncode == 0:
+            util.rename_episode_file(episode, new_filename)
+            os.remove(old_filename)
+            
             logger.info('Converted M4A file.')
-            gpodder.user_extensions.on_notification_show(_('File converted'), episode)
+            gpodder.user_extensions.on_notification_show(_('File converted'), episode.title)
         else:
             logger.warn('Error converting file: %s / %s', stdout, stderr)
-            gpodder.user_extensions.on_notification_show(_('Conversion failed'), episode)
+            gpodder.user_extensions.on_notification_show(_('Conversion failed'), episode.title)
 
     def _convert_episodes(self, episodes):
         for episode in episodes:
             self._convert_episode(episode)
-

gpodder-3.3.0.tar.gz/share/gpodder/extensions/minimize_on_start.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/minimize_on_start.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/normalize_audio.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/normalize_audio.py Changed

@@ -21,6 +21,7 @@
 __title__ = _('Normalize audio with re-encoding')
 __description__ = _('Normalize the volume of audio files with normalize-audio')
 __authors__ = 'Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'post-download'
 
 
 DefaultConfig = {
@@ -60,7 +61,7 @@
         if 'audio/ogg' not in mimetypes and 'audio/mpeg' not in mimetypes:
             return None
 
-        return [(self.container.metadata.title, self._convert_episodes)]
+        return [(self.container.metadata.title, self.convert_episodes)]
 
     def _convert_episode(self, episode):
         if episode.file_type() != 'audio':
@@ -81,11 +82,11 @@
         if p.returncode == 0:
             logger.info('normalize-audio processing successful.')
             gpodder.user_extensions.on_notification_show(_('File normalized'),
-                    episode)
+                    episode.title)
         else:
             logger.warn('normalize-audio failed: %s / %s', stdout, stderr)
 
-    def _convert_episodes(self, episodes):
+    def convert_episodes(self, episodes):
         for episode in episodes:
             self._convert_episode(episode)

gpodder-3.5.0.tar.gz/share/gpodder/extensions/notification-win32.py Added

@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Notification implementation for Windows
+# Sean Munkel; 2012-12-29
+
+__title__ = 'Notification Bubbles for Windows'
+__description__ = 'Display notification bubbles for different events.'
+__authors__ = 'Sean Munkel <SeanMunkel@gmail.com>'
+__category__ = 'desktop-integration'
+__only_for__ = 'win32'
+
+import functools
+import os
+import os.path
+import gpodder
+import pywintypes
+import win32gui
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+IDI_APPLICATION = 32512
+WM_TASKBARCREATED = win32gui.RegisterWindowMessage('TaskbarCreated')
+WM_TRAYMESSAGE = 1044
+
+# based on http://code.activestate.com/recipes/334779/
+class NotifyIcon(object):
+    def __init__(self, hwnd):
+        self._hwnd = hwnd
+        self._id = 0
+        self._flags = win32gui.NIF_MESSAGE | win32gui.NIF_ICON
+        self._callbackmessage = WM_TRAYMESSAGE
+        path = os.path.join(os.path.dirname(__file__), '..', '..',
+                'icons', 'hicolor', '16x16', 'apps', 'gpodder.ico')
+        icon_path = os.path.abspath(path)
+
+        try:
+            self._hicon = win32gui.LoadImage(None, icon_path, 1, 0, 0, 0x50)
+        except pywintypes.error as e:
+            logger.warn("Couldn't load gpodder icon for tray")
+            self._hicon = win32gui.LoadIcon(0, IDI_APPLICATION)
+
+        self._tip = ''
+        self._info = ''
+        self._timeout = 0
+        self._infotitle = ''
+        self._infoflags = win32gui.NIIF_NONE
+        win32gui.Shell_NotifyIcon(win32gui.NIM_ADD, self.notify_config_data)
+
+    @property
+    def notify_config_data(self):
+        """ Function to retrieve the NOTIFYICONDATA Structure. """
+        return (self._hwnd, self._id, self._flags, self._callbackmessage,
+                self._hicon, self._tip, self._info, self._timeout,
+                self._infotitle, self._infoflags)
+
+    def remove(self):
+        """ Removes the tray icon. """
+        win32gui.Shell_NotifyIcon(win32gui.NIM_DELETE,
+                self.notify_config_data)
+
+    def set_tooltip(self, tooltip):
+        """ Sets the tray icon tooltip. """
+        self._flags = self._flags | win32gui.NIF_TIP
+        self._tip = tooltip.encode("mbcs")
+        win32gui.Shell_NotifyIcon(win32gui.NIM_MODIFY,
+                self.notify_config_data)
+
+    def show_balloon(self, title, text, timeout=10,
+            icon=win32gui.NIIF_NONE):
+        """ Shows a balloon tooltip from the tray icon. """
+        self._flags = self._flags | win32gui.NIF_INFO
+        self._infotitle = title.encode("mbcs")
+        self._info = text.encode("mbcs")
+        self._timeout = timeout * 1000
+        self._infoflags = icon
+        win32gui.Shell_NotifyIcon(win32gui.NIM_MODIFY,
+                self.notify_config_data)
+
+
+class gPodderExtension(object):
+    def __init__(self, *args):
+        self.notifier = None
+
+    def on_ui_object_available(self, name, ui_object):
+        def callback(self, window, *args):
+            self.notifier = NotifyIcon(window.window.handle)
+
+        if name == 'gpodder-gtk':
+            ui_object.main_window.connect('realize',
+                    functools.partial(callback, self))
+
+    def on_notification_show(self, title, message):
+        if self.notifier is not None:
+            self.notifier.show_balloon(title, message)
+
+    def on_unload(self):
+        if self.notifier is not None:
+            self.notifier.remove()
+

gpodder-3.3.0.tar.gz/share/gpodder/extensions/notification.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/notification.py Changed

gpodder-3.5.0.tar.gz/share/gpodder/extensions/ogg2mp3_converter.py Added

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+# Convertes ogg audio files to mp3
+# This requires ffmpeg to be installed. Also works as a context
+# menu item for already-downloaded files.
+#
+# (c) 2012-12-28 Bernd Schlapsi <brot@gmx.info>
+# Released under the same license terms as gPodder itself.
+
+import os
+import subprocess
+
+import gpodder
+from gpodder import util
+
+import logging
+logger = logging.getLogger(__name__)
+
+_ = gpodder.gettext
+
+__title__ = _('Convert OGG audio to MP3')
+__description__ = _('Transcode .ogg files to .mp3 using ffmpeg')
+__authors__ = 'Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'post-download'
+
+
+DefaultConfig = {
+    'context_menu': True, # Show the conversion option in the context menu
+}
+
+class gPodderExtension:
+    MIME_TYPES = ('audio/ogg',)
+    TARGET_EXT = '.mp3'
+    CMD = {'avconv': ['-i', '%(old_file)s', '-q:a', '2', '-id3v2_version',
+                '3', '-write_id3v1', '1', '%(new_file)s'],
+           'ffmpeg': ['-i', '%(old_file)s', '-q:a', '2', '-id3v2_version',
+                '3', '-write_id3v1', '1', '%(new_file)s']
+          }
+
+    def __init__(self, container):
+        self.container = container
+        self.config = self.container.config
+
+        # Dependency checks
+        self.command = self.container.require_any_command(['avconv', 'ffmpeg'])
+
+        # extract command without extension (.exe on Windows) from command-string
+        command_without_ext = os.path.basename(os.path.splitext(self.command)[0])
+        self.command_param = self.CMD[command_without_ext]
+
+    def on_episode_downloaded(self, episode):
+        self.convert_episode(episode)
+
+    def on_episodes_context_menu(self, episodes):
+        if not self.config.context_menu:
+            return None
+
+        if not all(e.was_downloaded(and_exists=True) for e in episodes):
+            return None
+
+        if not any(e.mime_type in self.MIME_TYPES for e in episodes):
+            return None
+
+        return [('Convert to MP3', self.convert_episodes)]
+
+    def convert_episode(self, episode):
+        if episode.mime_type not in self.MIME_TYPES:
+            return
+
+        old_filename = episode.local_filename(create=False)
+        filename, old_extension = os.path.splitext(old_filename)
+        new_filename = filename + self.TARGET_EXT
+
+        cmd = [self.command] + \
+            [param % {'old_file': old_filename, 'new_file': new_filename}
+                for param in self.command_param]
+        ffmpeg = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE)
+        stdout, stderr = ffmpeg.communicate()
+
+        if ffmpeg.returncode == 0:            
+            util.rename_episode_file(episode, new_filename)
+            os.remove(old_filename)
+            
+            logger.info('Converted OGG file to MP3.')
+            gpodder.user_extensions.on_notification_show(_('File converted from ogg to mp3'), episode.title)
+        else:
+            logger.warn('Error converting file from ogg to mp3: %s / %s', stdout, stderr)
+            gpodder.user_extensions.on_notification_show(_('Conversion failed from ogg to mp3'), episode.title)
+
+    def convert_episodes(self, episodes):
+        for episode in episodes:
+            self.convert_episode(episode)
+

gpodder-3.3.0.tar.gz/share/gpodder/extensions/rename_download.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/rename_download.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/rm_ogg_cover.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/rm_ogg_cover.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/rockbox_convert2mp4.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/rockbox_convert2mp4.py Changed

@@ -26,6 +26,7 @@
 __title__ = _('Convert video files to MP4 for Rockbox')
 __description__ = _('Converts all videos to a Rockbox-compatible format')
 __authors__ = 'Guy Sheffer <guysoft@gmail.com>, Thomas Perl <thp@gpodder.org>, Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'post-download'
 
 
 DefaultConfig = {
@@ -58,9 +59,10 @@
         converted_filename = self._convert_mp4(episode, current_filename)
 
         if converted_filename is not None:
-            self.rename_episode_file(episode, converted_filename)
+            util.rename_episode_file(episode, converted_filename)
             os.remove(current_filename)
             logger.info('Conversion for %s was successfully' % current_filename)
+            gpodder.user_extensions.on_notification_show(_('File converted'), episode.title)
 
     def _get_rockbox_filename(self, origin_filename):
         if not os.path.exists(origin_filename):
@@ -110,7 +112,7 @@
             return to_file
 
         logger.info("Converting: %s", from_file)
-        gpodder.user_extensions.on_notification_show("Converting", episode)
+        gpodder.user_extensions.on_notification_show("Converting", episode.title)
 
         # calculationg the new screen resolution
         info = kaa.metadata.parse(from_file)
@@ -142,6 +144,6 @@
             logger.error(stderr)
             return None
 
-        gpodder.user_extensions.on_notification_show("Converting finished", episode)
+        gpodder.user_extensions.on_notification_show("Converting finished", episode.title)
 
         return to_file

gpodder-3.5.0.tar.gz/share/gpodder/extensions/sonos.py Added

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# Extension script to stream podcasts to Sonos speakers
+# Requirements: gPodder 3.x and the soco module (https://github.com/rahims/SoCo)
+# (c) 2013-01-19 Stefan Kögl <stefan@skoegl.net>
+# Released under the same license terms as gPodder itself.
+
+from functools import partial
+
+import gpodder
+_ = gpodder.gettext
+
+import logging
+logger = logging.getLogger(__name__)
+
+import soco
+import requests
+
+
+__title__ = _('Stream to Sonos')
+__description__ = _('Stream podcasts to Sonos speakers')
+__author__ = 'Stefan Kögl <stefan@skoegl.net>'
+__category__ = 'interface'
+__only_for__ = 'gtk'
+
+
+SONOS_CAN_PLAY = lambda e: 'audio' in e.file_type()
+
+class gPodderExtension:
+    def __init__(self, container):
+        sd = soco.SonosDiscovery()
+        speaker_ips = sd.get_speaker_ips()
+
+        logger.info('Found Sonos speakers: %s' % ', '.join(speaker_ips))
+
+        self.speakers = {}
+        for speaker_ip in speaker_ips:
+            controller = soco.SoCo(speaker_ip)
+
+            try:
+                info = controller.get_speaker_info()
+
+            except requests.ConnectionError as ce:
+                # ignore speakers we can't connect to
+                continue
+
+            name = info.get('zone_name', None)
+
+            # devices that do not have a name are probably bridges
+            if name:
+                self.speakers[speaker_ip] = name
+
+    def _stream_to_speaker(self, speaker_ip, episodes):
+        """ Play or enqueue selected episodes """
+
+        urls = [episode.url for episode in episodes if SONOS_CAN_PLAY(episode)]
+        logger.info('Streaming to Sonos %s: %s'%(speaker_ip, ', '.join(urls)))
+
+        controller = soco.SoCo(speaker_ip)
+
+        # enqueue and play
+        for episode in episodes:
+            controller.add_to_queue(episode.url)
+            episode.playback_mark()
+
+        controller.play()
+
+    def on_episodes_context_menu(self, episodes):
+        """ Adds a context menu for each Sonos speaker group """
+
+        # Only show context menu if we can play at least one file
+        if not any(SONOS_CAN_PLAY(e) for e in episodes):
+            return []
+
+        menu_entries = []
+        for speaker_ip, name in self.speakers.items():
+            callback = partial(self._stream_to_speaker, speaker_ip)
+
+            menu_entries.append('/'.join((_('Stream to Sonos'), name)), callback)
+
+        return menu_entries

gpodder-3.3.0.tar.gz/share/gpodder/extensions/tagging.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/tagging.py Changed

@@ -38,11 +38,13 @@
 __title__ = _('Tag downloaded files using Mutagen')
 __description__ = _('Add episode and podcast titles to MP3/OGG tags')
 __authors__ = 'Bernd Schlapsi <brot@gmx.info>'
+__category__ = 'post-download'
 
 
 DefaultConfig = {
     'strip_album_from_title': True,
     'genre_tag': 'Podcast',
+    'always_remove_tags': False,
 }
 
 
@@ -97,24 +99,28 @@
         if audio is None:
             return
 
-        # write title+album information into audio files
-        if audio.tags is None:
-            audio.add_tags()
-
-        # write album+title
-        if info['album'] is not None:
-            audio.tags['album'] = info['album']
-        if info['title'] is not None:
-            audio.tags['title'] = info['title']
-
-        # write genre tag
-        if self.container.config.genre_tag is not None:
-            audio.tags['genre'] = self.container.config.genre_tag
+        if self.container.config.always_remove_tags:
+            if audio.tags is not None:
+                audio.delete()
         else:
-            audio.tags['genre'] = ''
-
-        # write pubDate
-        if info['pubDate'] is not None:
-            audio.tags['date'] = info['pubDate']
+            # write title+album information into audio files
+            if audio.tags is None:
+                audio.add_tags()
+
+            # write album+title
+            if info['album'] is not None:
+                audio.tags['album'] = info['album']
+            if info['title'] is not None:
+                audio.tags['title'] = info['title']
+
+            # write genre tag
+            if self.container.config.genre_tag is not None:
+                audio.tags['genre'] = self.container.config.genre_tag
+            else:
+                audio.tags['genre'] = ''
+
+            # write pubDate
+            if info['pubDate'] is not None:
+                audio.tags['date'] = info['pubDate']
 
         audio.save()

gpodder-3.5.0.tar.gz/share/gpodder/extensions/taskbar_progress.py Added

@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Windows 7 taskbar progress
+# Sean Munkel; 2013-01-05
+
+import gpodder
+
+_ = gpodder.gettext
+
+
+__title__ = _('Show download progress on the taskbar')
+__description__ = _('Displays the progress on the Windows taskbar.')
+__authors__ = 'Sean Munkel <seanmunkel@gmail.com>'
+__category__ = 'desktop-integration'
+__only_for__ = 'win32'
+
+
+from ctypes import (c_ushort, c_int, c_uint, c_ulong, c_ulonglong,
+                    c_wchar_p, alignment, sizeof, Structure, POINTER)
+from comtypes import IUnknown, GUID, COMMETHOD, wireHWND, client
+from ctypes import HRESULT
+from ctypes.wintypes import tagRECT
+import functools
+
+import logging
+logger = logging.getLogger(__name__)
+
+WSTRING = c_wchar_p
+# values for enumeration 'TBPFLAG'
+TBPF_NOPROGRESS = 0
+TBPF_INDETERMINATE = 1
+TBPF_NORMAL = 2
+TBPF_ERROR = 4
+TBPF_PAUSED = 8
+TBPFLAG = c_int  # enum
+# values for enumeration 'TBATFLAG'
+TBATF_USEMDITHUMBNAIL = 1
+TBATF_USEMDILIVEPREVIEW = 2
+TBATFLAG = c_int  # enum
+
+
+class tagTHUMBBUTTON(Structure):
+    _fields_ = [
+        ('dwMask', c_ulong),
+        ('iId', c_uint),
+        ('iBitmap', c_uint),
+        ('hIcon', POINTER(IUnknown)),
+        ('szTip', c_ushort * 260),
+        ('dwFlags', c_ulong)]
+
+
+class ITaskbarList(IUnknown):
+    _case_insensitive_ = True
+    _iid_ = GUID('{56FDF342-FD6D-11D0-958A-006097C9A090}')
+    _idlflags_ = []
+    _methods_ = [
+        COMMETHOD([], HRESULT, 'HrInit'),
+        COMMETHOD([], HRESULT, 'AddTab',
+                  (['in'], c_int, 'hwnd')),
+        COMMETHOD([], HRESULT, 'DeleteTab',
+                  (['in'], c_int, 'hwnd')),
+        COMMETHOD([], HRESULT, 'ActivateTab',
+                  (['in'], c_int, 'hwnd')),
+        COMMETHOD([], HRESULT, 'SetActivateAlt',
+                  (['in'], c_int, 'hwnd'))]
+
+
+class ITaskbarList2(ITaskbarList):
+    _case_insensitive_ = True
+    _iid_ = GUID('{602D4995-B13A-429B-A66E-1935E44F4317}')
+    _idlflags_ = []
+    _methods_ = [
+        COMMETHOD([], HRESULT, 'MarkFullscreenWindow',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], c_int, 'fFullscreen'))]
+
+
+class ITaskbarList3(ITaskbarList2):
+    _case_insensitive_ = True
+    _iid_ = GUID('{EA1AFB91-9E28-4B86-90E9-9E9F8A5EEFAF}')
+    _idlflags_ = []
+    _methods_ = [
+        COMMETHOD([], HRESULT, 'SetProgressValue',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], c_ulonglong, 'ullCompleted'),
+                  (['in'], c_ulonglong, 'ullTotal')),
+        COMMETHOD([], HRESULT, 'SetProgressState',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], TBPFLAG, 'tbpFlags')),
+        COMMETHOD([], HRESULT, 'RegisterTab',
+                  (['in'], c_int, 'hwndTab'),
+                  (['in'], wireHWND, 'hwndMDI')),
+        COMMETHOD([], HRESULT, 'UnregisterTab',
+                  (['in'], c_int, 'hwndTab')),
+        COMMETHOD([], HRESULT, 'SetTabOrder',
+                  (['in'], c_int, 'hwndTab'),
+                  (['in'], c_int, 'hwndInsertBefore')),
+        COMMETHOD([], HRESULT, 'SetTabActive',
+                  (['in'], c_int, 'hwndTab'),
+                  (['in'], c_int, 'hwndMDI'),
+                  (['in'], TBATFLAG, 'tbatFlags')),
+        COMMETHOD([], HRESULT, 'ThumbBarAddButtons',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], c_uint, 'cButtons'),
+                  (['in'], POINTER(tagTHUMBBUTTON), 'pButton')),
+        COMMETHOD([], HRESULT, 'ThumbBarUpdateButtons',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], c_uint, 'cButtons'),
+                  (['in'], POINTER(tagTHUMBBUTTON), 'pButton')),
+        COMMETHOD([], HRESULT, 'ThumbBarSetImageList',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], POINTER(IUnknown), 'himl')),
+        COMMETHOD([], HRESULT, 'SetOverlayIcon',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], POINTER(IUnknown), 'hIcon'),
+                  (['in'], WSTRING, 'pszDescription')),
+        COMMETHOD([], HRESULT, 'SetThumbnailTooltip',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], WSTRING, 'pszTip')),
+        COMMETHOD([], HRESULT, 'SetThumbnailClip',
+                  (['in'], c_int, 'hwnd'),
+                  (['in'], POINTER(tagRECT), 'prcClip'))]
+
+
+assert sizeof(tagTHUMBBUTTON) == 540, sizeof(tagTHUMBBUTTON)
+assert alignment(tagTHUMBBUTTON) == 4, alignment(tagTHUMBBUTTON)
+
+
+# based on http://stackoverflow.com/a/1744503/905256
+class gPodderExtension:
+    def __init__(self, container):
+        self.container = container
+        self.window_handle = None
+        self.restart_warning = True
+
+    def on_load(self):
+        self.taskbar = client.CreateObject(
+                '{56FDF344-FD6D-11d0-958A-006097C9A090}',
+                interface=ITaskbarList3)
+        self.taskbar.HrInit()
+
+    def on_unload(self):
+        if self.taskbar is not None:
+            self.taskbar.SetProgressState(self.window_handle, TBPF_NOPROGRESS)
+
+    def on_ui_object_available(self, name, ui_object):
+        def callback(self, window, *args):
+            self.window_handle = window.window.handle
+
+        if name == 'gpodder-gtk':
+            ui_object.main_window.connect('realize',
+                    functools.partial(callback, self))
+
+    def on_download_progress(self, progress):
+        if self.window_handle is None:
+            if not self.restart_warning:
+                return
+            logger.warn("No window handle available, a restart max fix this")
+            self.restart_warning = False
+            return
+        if 0 < progress < 1:
+            self.taskbar.SetProgressState(self.window_handle, TBPF_NORMAL)
+            self.taskbar.SetProgressValue(self.window_handle,
+                    int(progress * 100), 100)
+        else:
+            self.taskbar.SetProgressState(self.window_handle, TBPF_NOPROGRESS)
+

gpodder-3.3.0.tar.gz/share/gpodder/extensions/ted_subtitles.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/ted_subtitles.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/ubuntu_appindicator.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/ubuntu_appindicator.py Changed

gpodder-3.3.0.tar.gz/share/gpodder/extensions/ubuntu_unity.py -> gpodder-3.5.0.tar.gz/share/gpodder/extensions/ubuntu_unity.py Changed

gpodder-3.5.0.tar.gz/share/gpodder/extensions/update_feeds_on_startup.py Added

gpodder-3.3.0.tar.gz/share/gpodder/ui/gtk/gpodderchannel.ui -> gpodder-3.5.0.tar.gz/share/gpodder/ui/gtk/gpodderchannel.ui Changed

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  
   
   <object class="GtkDialog" id="gPodderChannel">
     <property name="can_focus">False</property>
@@ -58,7 +57,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">10</property>
-                <property name="n_rows">5</property>
+                <property name="n_rows">7</property>
                 <property name="n_columns">4</property>
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">10</property>
@@ -75,7 +74,7 @@
                     <property name="right_attach">4</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -90,7 +89,7 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">4</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -102,10 +101,10 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -126,8 +125,8 @@
                   </object>
                   <packing>
                     <property name="right_attach">4</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
                   </packing>
                 </child>
                 <child>
@@ -149,6 +148,24 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkCheckButton" id="cbEnableDeviceSync">
+                    <property name="label" translatable="yes">Synchronize to MP3 player devices</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkEventBox" id="imgCoverEventBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -183,8 +200,8 @@
                   <packing>
                     <property name="left_attach">3</property>
                     <property name="right_attach">4</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
@@ -197,11 +214,42 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_strategy">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Strategy:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkComboBox" id="combo_strategy">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
             <child type="tab">
@@ -251,7 +299,7 @@
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -265,7 +313,7 @@
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -281,7 +329,7 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -299,7 +347,7 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                   </object>
@@ -351,7 +399,7 @@
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -366,7 +414,7 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">3</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -380,7 +428,7 @@
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>

gpodder-3.3.0.tar.gz/share/gpodder/ui/gtk/gpodderpreferences.ui -> gpodder-3.5.0.tar.gz/share/gpodder/ui/gtk/gpodderpreferences.ui Changed

@@ -52,7 +52,7 @@
                   <object class="GtkTable" id="table_players">
                     <property name="column_spacing">6</property>
                     <property name="n_columns">3</property>
-                    <property name="n_rows">2</property>
+                    <property name="n_rows">3</property>
                     <property name="row_spacing">6</property>
                     <property name="visible">True</property>
                     <child>
@@ -135,6 +135,32 @@
                         <property name="x_options">fill</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label_preferred_video_format">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Preferred video format:</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="combobox_preferred_video_format">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <signal name="changed" handler="on_combobox_preferred_video_format_changed" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -155,15 +181,17 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="shadow_type">in</property>
+		    <property name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+		    <property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
                     <child>
                       <object class="GtkTreeView" id="treeviewExtensions">
                         <property name="visible">True</property>
                         <property name="headers_visible">False</property>
                         <property name="can_focus">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="enable_search">False</property>
-                        <property name="search_column">0</property>
-                        <signal name="row-activated" handler="on_extensions_row_activated" swapped="no"/>
+                        <property name="reorderable">False</property>
+                        <property name="enable_search">True</property>
+                        <property name="search_column">1</property>
+                        <signal name="row-activated" handler="on_treeview_extensions_row_activated" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -194,6 +222,7 @@
                     <property name="bottom_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="x_options">fill</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -206,6 +235,7 @@
                     <property name="bottom_attach">3</property>
                     <property name="x_options">fill</property>
                     <property name="top_attach">2</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -217,6 +247,7 @@
                   <packing>
                     <property name="bottom_attach">4</property>
                     <property name="top_attach">3</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
               </object>
@@ -243,6 +274,7 @@
                     <property name="bottom_attach">2</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">1</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -255,6 +287,7 @@
                     <property name="bottom_attach">3</property>
                     <property name="top_attach">2</property>
                     <property name="x_options">fill</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -267,6 +300,7 @@
                     <property name="bottom_attach">4</property>
                     <property name="top_attach">3</property>
                     <property name="x_options">fill</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -279,6 +313,7 @@
                     <property name="bottom_attach">6</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">5</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -291,6 +326,7 @@
                     <property name="bottom_attach">5</property>
                     <property name="top_attach">4</property>
                     <property name="x_options">fill</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -303,6 +339,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">2</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -317,6 +354,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">3</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -329,6 +367,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">3</property>
                     <property name="top_attach">4</property>
+		    <property name="y_options"></property>
                   </packing>
                 </child>
               </object>
@@ -528,13 +567,13 @@
             </child>
             <child>
               <object class="GtkVBox" id="vbox_devices">
-                <property name="border_width">12</property>
                 <property name="visible">True</property>
+                <property name="border_width">12</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkTable" id="table_devices">
                     <property name="visible">True</property>
-                    <property name="n_rows">3</property>
+                    <property name="n_rows">6</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
@@ -579,7 +618,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="label" translatable="no"></property>
                         <signal name="clicked" handler="on_btn_device_mountpoint_clicked"/>
                       </object>
                       <packing>
@@ -598,10 +636,10 @@
                         <property name="justify">right</property>
                       </object>
                       <packing>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
@@ -612,18 +650,78 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_create_playlists">

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/Action.qml Added

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/EpisodeActionItem.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/EpisodeActionItem.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/EpisodeActions.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/EpisodeActions.qml Changed

@@ -1,12 +1,14 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
 import 'config.js' as Config
 
-Item {
+Rectangle {
     id: episodeActions
+    color: Config.episodeActionsColorBg
 
     property variant episode: undefined
+    property bool playing: false
 
     height: Config.listItemHeight
 
@@ -17,23 +19,23 @@
             height: episodeActions.height
             text: _('Download')
             image: 'download'
-            onSelected: controller.downloadEpisode(episode)
-            visible: (episode!==undefined)?(!episode.qdownloaded && !episode.qdownloading):false
+            onSelected: controller.downloadEpisode(episode.episode)
+            visible: (episode!==undefined)?(!episode.downloaded && !episode.downloading):false
         }
 
         EpisodeActionItem {
             height: episodeActions.height
             text: _('Cancel')
             image: 'download-cancel'
-            onSelected: controller.cancelDownload(episode)
-            visible: (episode!==undefined)?(!episode.qdownloaded && episode.qdownloading):false
+            onSelected: controller.cancelDownload(episode.episode)
+            visible: (episode!==undefined)?(!episode.downloaded && episode.downloading):false
         }
 
         EpisodeActionItem {
             height: episodeActions.height
-            text: (episode!==undefined)?(episode.qplaying?_('Pause'):(episode.qdownloaded?_('Play'):_('Stream'))):''
-            image: (episode!==undefined)?(episode.qplaying?'pause':'play'):''
-            onSelected: main.togglePlayback(episode)
+            text: (episode!==undefined)?(episodeActions.playing?_('Pause'):(episode.downloaded?_('Play'):_('Stream'))):''
+            image: (episode!==undefined)?(episodeActions.playing?'pause':'play'):''
+            onSelected: main.togglePlayback(episode.episode)
             visible: episode!==undefined
         }
 
@@ -41,15 +43,15 @@
             height: episodeActions.height
             text: _('Delete')
             image: 'delete'
-            onSelected: controller.deleteEpisode(episode)
-            visible: (episode!==undefined)?(episode.qdownloaded && !episode.qarchive):false
+            onSelected: controller.deleteEpisode(episode.episode)
+            visible: (episode!==undefined)?(episode.downloaded && !episode.archive):false
         }
 
         EpisodeActionItem {
             height: episodeActions.height
             text: _('Shownotes')
             image: 'shownotes'
-            onSelected: main.openShowNotes(episode)
+            onSelected: main.openShowNotes(episode.episode)
             visible: episode!==undefined
         }
     }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/EpisodeItem.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/EpisodeItem.qml Changed

@@ -1,97 +1,122 @@
-import Qt 4.7
-import com.nokia.meego 1.0
+
+import QtQuick 1.1
+
+import org.gpodder.qmlui 1.0
 
 import 'config.js' as Config
 import 'util.js' as Util
 
 SelectableItem {
     id: episodeItem
-
-    // Show context menu when single-touching the icon
-    singlePressContextMenuLeftBorder: title.x
+    property bool playing: false
+    property real playbackPosition: playing?mediaPlayer.position:position
+    property real playbackDuration: duration?duration:(playing?mediaPlayer.duration:0)
 
     height: Config.listItemHeight
 
     Rectangle {
-        id: downloadProgress
-        anchors.left: parent.left
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.width * modelData.qprogress
-        height: modelData.qdownloading?parent.height:0
-        color: Config.downloadColor
-        opacity: modelData.qdownloaded?0:.3
-        Behavior on opacity { PropertyAnimation { } }
-        Behavior on height { PropertyAnimation { } }
-    }
-
-    Rectangle {
-        id: playbackProgress
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
 
-        anchors.left: parent.left
+        visible: downloading || (playbackPosition && (episodeItem.playing || !episodeItem.inSelection))
 
-        anchors.verticalCenter: parent.verticalCenter
-        width: modelData.qduration?(parent.width * (modelData.qposition / modelData.qduration)):0
-        height: parent.height
-        color: Config.playbackColor
-        opacity: .3
+        width: parent.width * (downloading?(progress):(playbackPosition / duration))
+        color: downloading?Config.downloadColorBg:Config.playbackColorBg
     }
 
     Image {
         id: icon
+        opacity: {
+            if (downloaded) {
+                1
+            } else {
+                .5
+            }
+        }
         source: {
             if (episodeModel.is_subset_view) {
-                Util.formatCoverURL(modelData.qpodcast)
+                cover_url
+            } else if (downloading) {
+                'artwork/' + filetype + '-downloading.png'
+            } else if (episodeItem.playing && true/*!episodeItem.inSelection*/) {
+                'artwork/' + filetype + '-playing.png'
             } else {
-                'artwork/' + modelData.qfiletype + (modelData.qdownloading?'-downloading':(modelData.qplaying?'-playing':'')) + '.png'
+                'artwork/' + filetype + '.png'
             }
         }
-        sourceSize.width: width
-        sourceSize.height: height
+
+        sourceSize {
+            width: Config.iconSize
+            height: Config.iconSize
+        }
 
         width: Config.iconSize
         height: Config.iconSize
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.leftMargin: Config.largeSpacing
-        opacity: (modelData.qdownloaded || modelData.qdownloading)?1:.3
-        Behavior on opacity { PropertyAnimation { } }
-    }
 
-    Label {
-        id: title
-        text: modelData.qtitle
-        wrapMode: Text.NoWrap
-        color: modelData.qdownloading?'#8ae234':(modelData.qplaying?'#729fcf':(modelData.qnew?(modelData.qdownloaded?"white":Config.newColor):"#888"))
-        font.pixelSize: episodeItem.height * .35
-        font.bold: false
-        anchors.left: icon.right
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: positionInfo.left
-        anchors.leftMargin: Config.largeSpacing
-        anchors.rightMargin: Config.smallSpacing
-        clip: true
-    }
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: Config.largeSpacing
+        }
 
-    Label {
-        id: positionInfo
-        text: modelData.qduration?Util.formatDuration(modelData.qduration):''
-        font.pixelSize: episodeItem.height * .2
-        color: '#888'
-        anchors.right: archiveIcon.visible?archiveIcon.left:parent.right
-        anchors.rightMargin: Config.largeSpacing
-        anchors.verticalCenter: parent.verticalCenter
+        cache: true
+        asynchronous: true
     }
 
-    Image {
-        id: archiveIcon
-        source: 'artwork/episode-archive.png'
-        opacity: .5
-        visible: modelData.qarchive
-        width: Config.iconSize
-        height: Config.iconSize
-        anchors.right: parent.right
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.rightMargin: Config.largeSpacing
+    Column {
+        anchors {
+            left: icon.right
+            right: parent.right
+            leftMargin: Config.largeSpacing
+            rightMargin: Config.smallSpacing
+            verticalCenter: parent.verticalCenter
+        }
+
+        Label {
+            id: labelTitle
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            text: title
+            wrapMode: Text.NoWrap
+
+            color: {
+                if (downloading) {
+                    Config.downloadColor
+                } else if (episodeItem.playing) {
+                    Config.playbackColor
+                } else if (isnew && !downloaded) {
+                    Config.newColor
+                } else if (episodeItem.inSelection) {
+                    Config.selectColor
+                } else if (isnew && downloaded) {
+                    'white'
+                } else {
+                    '#999'
+                }
+            }
+
+            font.pixelSize: Config.listItemHeight * .35
+        }
+
+        Label {
+            text: {
+                if (episodeItem.playbackDuration && episodeItem.playbackPosition) {
+                    Util.formatPosition(episodeItem.playbackPosition, episodeItem.playbackDuration)
+                } else if (episodeItem.playbackDuration) {
+                    Util.formatDuration(episodeItem.playbackDuration)
+                } else {
+                    '-'
+                }
+            }
+            font.pixelSize: Config.listItemHeight * .2
+            color: labelTitle.color
+        }
     }
 }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/EpisodeList.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/EpisodeList.qml Changed

@@ -1,6 +1,7 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
+import org.gpodder.qmlui 1.0
 import com.nokia.meego 1.0
 
 import 'config.js' as Config
@@ -9,15 +10,19 @@
     id: episodeList
     property string currentFilterText
     property string mainState
+    property alias model: listView.model
+    property variant listview: listView
+
+    clip: true
 
-    onMainStateChanged: {
+    /*onMainStateChanged: {
         // Don't remember contentY when leaving episode list
         listView.lastContentY = 0;
-    }
+    }*/
 
-    property alias model: listView.model
     property alias moving: listView.moving
     property alias count: listView.count
+    property alias listViewContentY: listView.contentY
 
     signal episodeContextMenu(variant episode)
 
@@ -29,33 +34,35 @@
         listView.openedIndex = -1
     }
 
-    onModelChanged: {
-        filterDialog.resetSelection();
-    }
-
     Text {
         anchors.centerIn: parent
         color: 'white'
         font.pixelSize: 30
         horizontalAlignment: Text.AlignHCenter
-        text: '<big>' + _('No episodes') + '</big>' + '<br><small>' + _('Touch to change filter') + '</small>'
+        text: {
+            if (main.loadingEpisodes) {
+                '<big>' + _('Loading episodes') + '</big>'
+            } else {
+                '<big>' + _('No episodes') + '</big>' + '<br><small>' + _('Touch to change filter') + '</small>'
+            }
+        }
         visible: !listView.visible
 
         MouseArea {
             anchors.fill: parent
-            onClicked: episodeList.showFilterDialog()
+            onClicked: {
+                if (!main.loadingEpisodes) {
+                    episodeList.showFilterDialog()
+                }
+            }
         }
     }
 
-    ListView {
-        id: listView
+    ListList {
+        headerText: main.currentPodcast.qtitle
 
-        onContentHeightChanged: {
-            if (count > 0 && openedIndex == count - 1 && !flicking && !moving) {
-                /* Scroll the "opening" item into view at the bottom */
-                listView.positionViewAtEnd();
-            }
-        }
+        id: listView
+        cacheBuffer: 10000
 
         property real lastContentY: 0
 
@@ -65,12 +72,10 @@
                 if (lastContentY > 0) {
                     contentY = lastContentY;
                 }
-            } else {
-                if (episodeList.mainState === 'episodes') {
-                    // Only store scroll position when the episode list is
-                    // shown (avoids overwriting it in onMainStateChanged)
-                    lastContentY = contentY;
-                }
+            } else if (episodeList.mainState === 'episodes') {
+                // Only store scroll position when the episode list is
+                // shown (avoids overwriting it in onMainStateChanged)
+                lastContentY = contentY;
             }
         }
 
@@ -78,71 +83,86 @@
         property int openedIndex: -1
         visible: count > 0
 
-        delegate: Item {
-            id: listItem
+        delegate: EpisodeItem {
+            id: episodeItem
+            property variant modelData: episode
+            property bool playing: (episode === mediaPlayer.episode) && mediaPlayer.playing
+
+            inSelection: (index === listView.openedIndex)
+            opacity: {
+                if ((listView.openedIndex === -1) || inSelection) {
+                    1
+                } else {
+                    .3
+                }
+            }
 
-            height: listItem.opened?(Config.listItemHeight + Config.smallSpacing * 3 + Config.headerHeight):(Config.listItemHeight)
-            width: parent.width
-            property bool opened: (index == listView.openedIndex)
+            height: Config.listItemHeight
+            width: listView.width
 
-            Image {
-                source: 'artwork/episode-background.png'
-                anchors {
-                    fill: parent
-                    topMargin: 3
-                    bottomMargin: 3
+            onSelected: {
+                if (listView.openedIndex !== -1) {
+                    listView.openedIndex = -1
+                } else {
+                    listView.openedIndex = index
                 }
-                visible: listItem.opened
             }
 
-            Loader {
-                id: loader
-                clip: true
-                source: listItem.opened?'EpisodeActions.qml':''
+            onContextMenu: episodeList.episodeContextMenu(episode)
+        }
+    }
 
-                Behavior on opacity { PropertyAnimation { } }
+    EpisodeActions {
+        id: episodeActions
+        visible: (listView.openedIndex !== -1) && listView.visible
 
-                opacity: listItem.opened
+        episode: episodeListModel.get(listView.openedIndex)
+        playing: {
+            if (episode !== undefined) {
+                (episode.episode === mediaPlayer.episode) && mediaPlayer.playing
+            } else {
+                false
+            }
+        }
 
-                onItemChanged: {
-                    if (item) {
-                        item.episode = modelData
-                    }
-                }
+        property alias modelData: episodeActions.episode
 
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    top: parent.top
-                    topMargin: episodeItem.y + episodeItem.height
-                    bottom: parent.bottom
+        anchors {
+            top: parent.top
+            topMargin: {
+                var overlayIndex = listView.openedIndex + 1
+                if (listView.count === listView.openedIndex + 1 && listView.height < listView.contentHeight) {
+                    overlayIndex = listView.openedIndex - 1
                 }
-
-                width: parent.width
+                overlayIndex * Config.listItemHeight - listView.contentY + listView.headerHeight
             }
+            left: parent.left
+            right: parent.right
+        }
+    }
 
-            Behavior on height { PropertyAnimation { } }
-
-            EpisodeItem {
-                id: episodeItem
-                y: listItem.opened?Config.smallSpacing:0
-                width: parent.width
-                onSelected: {
-                    if (listView.openedIndex == index) {

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/Main.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/Main.qml Changed

@@ -1,10 +1,13 @@
 
-import Qt 4.7
+import QtQuick 1.1
+
+import org.gpodder.qmlui 1.0
 import com.nokia.meego 1.0
 
 import 'config.js' as Config
+import 'util.js' as Util
 
-Image {
+Item {
     id: main
     focus: true
 
@@ -16,44 +19,132 @@
         return controller.ntranslate(x, y, z)
     }
 
-    property alias podcastModel: podcastList.model
-    property alias episodeModel: episodeList.model
-    property alias currentEpisode: mediaPlayer.episode
-    property alias showNotesEpisode: showNotes.episode
+    property alias multiEpisodesSheetOpened: multiEpisodesSheet.opened
     property variant currentPodcast: undefined
     property bool hasPodcasts: podcastList.hasItems
     property alias currentFilterText: episodeList.currentFilterText
+    property variant podcastListView: podcastList.listview
 
     property bool playing: mediaPlayer.playing
-    property bool canGoBack: (main.state != 'podcasts' || contextMenu.state != 'closed' || mediaPlayer.visible) && !progressIndicator.opacity
-    property bool hasPlayButton: nowPlayingThrobber.shouldAppear && !progressIndicator.opacity
-    property bool hasSearchButton: (contextMenu.state == 'closed' && main.state == 'podcasts') && !mediaPlayer.visible && !progressIndicator.opacity
-    property bool hasFilterButton: state == 'episodes' && !mediaPlayer.visible
+    property bool hasPlayButton: ((mediaPlayer.episode !== undefined)) && !progressIndicator.opacity
+    property bool hasSearchButton: !progressIndicator.opacity
 
-    function clickSearchButton() {
-        contextMenu.showSubscribe()
-    }
-
-    function goBack() {
-        if (contextMenu.state == 'opened') {
-            contextMenu.state = 'closed'
-        } else if (main.state == 'podcasts') {
-            mediaPlayer.stop()
-            controller.quit()
-        } else if (main.state == 'episodes') {
-            main.state = 'podcasts'
-            main.currentPodcast = undefined
-        } else if (main.state == 'shownotes') {
-            main.state = 'episodes'
+    property bool loadingEpisodes: false
+
+    function clearEpisodeListModel() {
+        /* Abort loading when clearing list model */
+        episodeListModelLoader.running = false;
+        loadingEpisodes = true;
+        episodeListModel.clear();
+    }
+
+    Timer {
+        id: episodeListModelLoader
+
+        /**
+         * These values determined by non-scientific experimentation,
+         * feel free to tweak depending on the power of your device.
+         *
+         * Loads <stepSize> items every <interval> ms, and to populate
+         * the first screen, loads <initialStepSize> items on start.
+         **/
+        property int initialStepSize: 13
+        property int stepSize: 4
+        interval: 50
+
+        property int count: 0
+        property int position: 0
+
+        repeat: true
+        triggeredOnStart: true
+
+        onTriggered: {
+            var step = (position === 0) ? initialStepSize : stepSize;
+            var end = Math.min(count, position+step);
+
+            for (var i=position; i<end; i++) {
+                episodeListModel.append(episodeModel.get_object_by_index(i));
+            }
+
+            position = end;
+            if (position === count) {
+                running = false;
+                main.loadingEpisodes = false;
+            } else if (pageStack.depth === 1) {
+                /* Abort loading when switching to main view */
+                running = false;
+                main.loadingEpisodes = false;
+            }
         }
     }
 
+    function setEpisodeListModel() {
+        episodeListModelLoader.count = episodeModel.getCount();
+        episodeListModelLoader.position = 0;
+        episodeListModelLoader.restart();
+    }
+
+    Component.onCompleted: {
+        /* Signal connections for upcalls from the backend */
+        controller.episodeUpdated.connect(episodeUpdated);
+
+        controller.showMessage.connect(showMessage);
+        controller.showInputDialog.connect(showInputDialog);
+        controller.openContextMenu.connect(openContextMenu);
+
+        controller.startProgress.connect(startProgress);
+        controller.endProgress.connect(endProgress);
+
+        controller.clearEpisodeListModel.connect(clearEpisodeListModel);
+        controller.setEpisodeListModel.connect(setEpisodeListModel);
+
+        controller.enqueueEpisode.connect(enqueueEpisode);
+        controller.removeQueuedEpisode.connect(removeQueuedEpisode);
+        controller.removeQueuedEpisodesForPodcast.connect(removeQueuedEpisodesForPodcast);
+
+        controller.shutdown.connect(shutdown);
+    }
+
+    function episodeUpdated(id) {
+        for (var i=0; i<episodeListModel.count; i++) {
+            var element = episodeListModel.get(i);
+            if (element.episode_id === id) {
+                var episode = element.episode;
+                element.duration = episode.qduration;
+                element.downloading = episode.qdownloading;
+                element.position = episode.qposition;
+                element.progress = episode.qprogress;
+                element.downloaded = episode.qdownloaded;
+                element.isnew = episode.qnew;
+                element.archive = episode.qarchive;
+                break;
+            }
+        }
+    }
+
+    function clickSearchButton() {
+        pageStack.push(subscribePage);
+    }
+
+    function shutdown() {
+        mediaPlayer.stop();
+    }
+
     function showFilterDialog() {
         episodeList.showFilterDialog()
     }
 
     function clickPlayButton() {
-        nowPlayingThrobber.opened = !nowPlayingThrobber.opened
+        if (!main.hasPlayButton) {
+            main.showMessage(_('Playlist empty'));
+            return;
+        }
+
+        if (pageStack.currentPage === mediaPlayerPage) {
+            pageStack.pop();
+        } else {
+            pageStack.push(mediaPlayerPage);
+        }
     }
 
     function showMultiEpisodesSheet(title, label, action) {
@@ -61,6 +152,7 @@
         multiEpisodesSheet.acceptButtonText = label;
         multiEpisodesSheet.action = action;
         multiEpisodesList.selected = [];
+        multiEpisodesList.contentY = episodeList.listViewContentY;
         multiEpisodesSheet.open();
         multiEpisodesSheet.opened = true;
     }
@@ -68,22 +160,8 @@
     width: 800
     height: 480
 
-    property bool useEmptyBackground: !podcastList.hasItems
-
-    anchors.topMargin: useEmptyBackground?-35:0
-    fillMode: useEmptyBackground?Image.Tile:Image.Stretch
-    source: {
-        if (useEmptyBackground) {
-            '/usr/share/themes/blanco/meegotouch/images/backgrounds/meegotouch-empty-application-background-black-portrait.png'
-        } else {
-            'artwork/background-harmattan.png'
-        }
-    }
-
-    state: 'podcasts'
-
     function enqueueEpisode(episode) {

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/MediaPlayer.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/MediaPlayer.qml Changed

@@ -1,6 +1,8 @@
 
-import Qt 4.7
+import QtQuick 1.1
 import QtMultimediaKit 1.1
+
+import org.gpodder.qmlui 1.0
 import com.nokia.meego 1.0
 
 import 'config.js' as Config
@@ -12,9 +14,17 @@
     height: (Config.largeSpacing * 4) + (150 * Config.scale) + 110
 
     property variant episode: undefined
+    property real position: audioPlayer.position/1000
+    property real duration: audioPlayer.duration/1000
     property variant playQueue: []
     property int startedFrom: 0
 
+    property bool hasQueue: playQueue.length > 0
+
+    function showQueue() {
+        playQueueDialog.showQueue();
+    }
+
     onStartedFromChanged: {
         console.log('started from: ' + startedFrom)
     }
@@ -105,6 +115,11 @@
     }
 
     function removeQueuedEpisodesForPodcast(podcast) {
+        if (mediaPlayer.episode !== undefined && podcast.equals(mediaPlayer.episode.qpodcast)) {
+            // Stop playback if currently playing an episode in the podcast
+            togglePlayback(undefined);
+        }
+
         var newQueue = [];
 
         for (var i in playQueue) {
@@ -119,6 +134,11 @@
     }
 
     function removeQueuedEpisode(episode) {
+        if (mediaPlayer.episode !== undefined && episode.equals(mediaPlayer.episode)) {
+            // Stop playback if the deleted epiosde is currently played
+            togglePlayback(undefined);
+        }
+
         var newQueue = [];
 
         for (var i in playQueue) {
@@ -133,7 +153,7 @@
     }
 
     function togglePlayback(episode) {
-        controller.currentEpisodeChanging();
+        controller.currentEpisodeChanging(episode);
 
         if (mediaPlayer.episode == episode && audioPlayer.status !== 7) {
             if (audioPlayer.paused) {
@@ -175,77 +195,59 @@
         audioPlayer.source = ''
     }
 
-    Rectangle {
-        visible: playQueue.length > 0
-        color: 'black'
-        anchors {
-            top: mediaPlayerMain.bottom
-            left: parent.left
-            right: parent.right
-        }
-        height: playQueueButton.height + Config.smallSpacing
-
-        Button {
-            id: playQueueButton
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: _('Play queue') + ' (' + playQueue.length + ')'
-            onClicked: playQueueDialog.showQueue();
-        }
-
-        MultiSelectionDialog {
-            id: playQueueDialog
+    MultiSelectionDialog {
+        id: playQueueDialog
 
-            function showQueue() {
-                selectedIndexes = [];
-                model.clear();
-                for (var index in playQueue) {
-                    var episode = playQueue[index];
-                    model.append({'name': episode.qtitle, 'position': index});
-                }
-                open();
+        function showQueue() {
+            selectedIndexes = [];
+            model.clear();
+            for (var index in playQueue) {
+                var episode = playQueue[index];
+                model.append({'name': episode.qtitle, 'position': index});
             }
+            open();
+        }
 
-            onAccepted: {
-                /**
-                 * FIXME: If things have been removed from the play queue while
-                 * the dialog was open, we have to subtract the values in
-                 * selectedIndexes by the amount of played episodes to get the
-                 * right episodes to delete. This is not yet done here.
-                 * We can know from the nextInQueue() function (hint, hint)
-                 **/
-                var newQueue = [];
-                for (var queueIndex in playQueue) {
-                    var episode = playQueue[queueIndex];
-                    var shouldRemove = false;
-
-                    for (var index in selectedIndexes) {
-                        var pos = model.get(selectedIndexes[index]).position;
-                        if (queueIndex === pos) {
-                            shouldRemove = true;
-                            break;
-                        }
+        onAccepted: {
+            /**
+             * FIXME: If things have been removed from the play queue while
+             * the dialog was open, we have to subtract the values in
+             * selectedIndexes by the amount of played episodes to get the
+             * right episodes to delete. This is not yet done here.
+             * We can know from the nextInQueue() function (hint, hint)
+             **/
+            var newQueue = [];
+            for (var queueIndex in playQueue) {
+                var episode = playQueue[queueIndex];
+                var shouldRemove = false;
+
+                for (var index in selectedIndexes) {
+                    var pos = model.get(selectedIndexes[index]).position;
+                    if (queueIndex === pos) {
+                        shouldRemove = true;
+                        break;
                     }
+                }
 
-                    if (shouldRemove) {
-                        controller.releaseEpisode(episode);
-                        /* Implicit removal by absence of newQueue.push() */
-                    } else {
-                        newQueue.push(episode);
-                    }
+                if (shouldRemove) {
+                    controller.releaseEpisode(episode);
+                    /* Implicit removal by absence of newQueue.push() */
+                } else {
+                    newQueue.push(episode);
                 }
-                playQueue = newQueue;
             }
-
-            titleText: _('Play queue')
-            acceptButtonText: _('Remove')
-            model: ListModel { }
+            playQueue = newQueue;
         }
+
+        titleText: _('Play queue')
+        acceptButtonText: _('Remove')
+        model: ListModel { }
     }
 
     Rectangle {
         id: mediaPlayerMain
         anchors.fill: mediaPlayer
-        color: 'black'
+        color: Config.mediaPlayerColorBg
 
         Column {
             spacing: Config.smallSpacing
@@ -260,7 +262,6 @@
                 text: (episode!=undefined)?episode.qtitle:''
                 color: 'white'
                 font.pixelSize: 30 * Config.scale
-                elide: Text.ElideRight
                 width: parent.width
             }
 
@@ -269,7 +270,6 @@
                 text: (episode!=undefined)?episode.qpodcast.qtitle:''
                 color: '#aaa'
                 font.pixelSize: 20 * Config.scale
-                elide: Text.ElideRight
                 width: parent.width
             }
 
@@ -285,7 +285,7 @@
                     width: 150 * Config.scale
                     height: 150 * Config.scale
 
-                    source: (episode!==undefined)?Util.formatCoverURL(episode.qpodcast):''

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/PlaybackBar.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/PlaybackBar.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/PlaybackBarButton.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/PlaybackBarButton.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/PlaybackBarProgress.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/PlaybackBarProgress.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/PodcastItem.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/PodcastItem.qml Changed

@@ -1,7 +1,7 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
-import com.nokia.meego 1.0
+import org.gpodder.qmlui 1.0
 
 import 'config.js' as Config
 import 'util.js' as Util
@@ -9,9 +9,6 @@
 SelectableItem {
     id: podcastItem
 
-    // Show context menu when single-touching the count or cover art
-    singlePressContextMenuLeftBorder: titleBox.x
-
     Item {
         id: counterBox
         width: Config.iconSize * 1.3
@@ -53,10 +50,36 @@
         running: visible
     }
 
+    Item {
+        visible: counters.newEpisodes > 0
+        clip: true
+
+        anchors {
+            left: cover.right
+            leftMargin: 2
+            verticalCenter: cover.verticalCenter
+        }
+
+        height: cover.height
+        width: cover.width * .25
+
+        Rectangle {
+            anchors {
+                verticalCenter: parent.verticalCenter
+                horizontalCenter: parent.left
+            }
+
+            color: Config.newColor
+            width: parent.width
+            height: width
+            rotation: 45
+        }
+    }
+
     Image {
     	id: cover
 
-        source: Util.formatCoverURL(modelData)
+        source: modelData.qcoverart
         asynchronous: true
         width: podcastItem.height * .8
         height: width
@@ -74,18 +97,17 @@
         id: titleBox
 
         text: modelData.qtitle
-        color: (counters.newEpisodes > 0)?Config.newColor:"white"
+        color: 'white'
 
         anchors {
             verticalCenter: parent.verticalCenter
             left: cover.visible?cover.right:cover.left
-            leftMargin: Config.smallSpacing
+            leftMargin: Config.smallSpacing * 2
             right: parent.right
             rightMargin: Config.smallSpacing
         }
 
         font.pixelSize: podcastItem.height * .35
-        elide: Text.ElideRight
         wrapMode: Text.NoWrap
     }
 }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/PodcastList.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/PodcastList.qml Changed

@@ -1,13 +1,14 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
-import com.nokia.meego 1.0
+import org.gpodder.qmlui 1.0
 
 import 'config.js' as Config
 
 Item {
     id: podcastList
 
+    property variant listview: listView
     property alias model: listView.model
     property alias moving: listView.moving
     property bool hasItems: listView.visible
@@ -46,26 +47,34 @@
         }
     }
 
-    ListView {
+    ListList {
+        headerText: 'gPodder'
+        hasRefresh: true
+        onRefresh: controller.updateAllPodcasts()
+
         id: listView
         anchors.fill: parent
         visible: count > 1
 
         section.property: 'section'
-        section.delegate: Item {
-            height: Config.headerHeight
-            Label {
-                font.pixelSize: parent.height * .5
+        section.delegate: Column {
+            Text {
+                font.pixelSize: Config.headerHeight * .5
                 wrapMode: Text.NoWrap
                 text: section
-                color: "#aaa"
+                color: Config.sectionHeaderColorText
                 anchors {
-                    leftMargin: Config.iconSize * 1.3 + Config.smallSpacing
-                    bottom: parent.bottom
                     left: parent.left
-                    right: parent.right
+                    leftMargin: Config.smallSpacing
                 }
             }
+
+            Rectangle {
+              height: 1
+              border.width: 0
+              color: Config.sectionHeaderColorLine
+              width: listView.width - Config.largeSpacing
+            }
         }
 
         delegate: PodcastItem {
@@ -76,8 +85,8 @@
         cacheBuffer: height
     }
 
-    ScrollDecorator {
-        flickableItem: listView
+    ScrollScroll {
+        flickable: listView
     }
 
 }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/ScaledIcon.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/ScaledIcon.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/SearchResultsListModel.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/SearchResultsListModel.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/SelectableItem.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/SelectableItem.qml Changed

@@ -1,5 +1,5 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
 import 'config.js' as Config
 
@@ -8,10 +8,6 @@
     signal selected(variant item)
     signal contextMenu(variant item)
 
-    /* The width of the area from the left edge that when
-     * pressed will signal contextMenu instead of selected.
-     */
-    property int singlePressContextMenuLeftBorder: 0
     property bool pressed: mouseArea.pressed
     property bool inSelection: false
 
@@ -19,51 +15,20 @@
     width: parent.width
 
     Rectangle {
-        id: highlight
-        property real maxOpacity: .2
-
-        opacity: mouseArea.pressed?maxOpacity:0
-        color: "white"
-        anchors {
-            left: parent.left
-            right: parent.right
-            verticalCenter: parent.verticalCenter
-        }
-        height: parent.height + parent.height * (opacity - maxOpacity)
-
-        Behavior on opacity { NumberAnimation { duration: Config.slowTransition } }
-    }
-
-    Rectangle {
         id: selectionHighlight
-        property real maxOpacity: .7
-
-        opacity: selectableItem.inSelection?maxOpacity:0
-        color: Config.selectColor
-        anchors {
-            left: parent.left
-            right: parent.right
-            verticalCenter: parent.verticalCenter
-        }
-        height: parent.height + parent.height * (opacity - maxOpacity)
 
-        Behavior on opacity { NumberAnimation { duration: Config.slowTransition } }
+        anchors.fill: parent
+        visible: selectableItem.inSelection
+        color: Config.selectColorBg
+        opacity: .5
     }
 
     MouseArea {
         id: mouseArea
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
+
         anchors.fill: parent
-        onClicked: {
-            if (mouse.x <= selectableItem.singlePressContextMenuLeftBorder) {
-                selectableItem.contextMenu(modelData)
-            } else if (mouse.button == Qt.LeftButton) {
-                selectableItem.selected(modelData)
-            } else if (mouse.button == Qt.RightButton) {
-                selectableItem.contextMenu(modelData)
-            }
-        }
-        onPressAndHold: selectableItem.contextMenu(modelData)
+        onClicked: parent.selected(modelData)
+        onPressAndHold: parent.contextMenu(modelData)
     }
 }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/SettingsHeader.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/SettingsHeader.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/SettingsLabel.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/SettingsLabel.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/ShowNotes.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/ShowNotes.qml Changed

@@ -1,7 +1,7 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
-import com.nokia.meego 1.0
+import org.gpodder.qmlui 1.0
 
 import 'config.js' as Config
 
@@ -32,11 +32,17 @@
             anchors.right: parent.right
             wrapMode: Text.Wrap
             text: episode!=undefined?('<h3 color="#666">'+episode.qtitle+'</h3><small>'+formatSubtitle()+'</small><p>'+episode.qdescription+'</p>'):'No episode selected'
+            onLinkActivated: Qt.openUrlExternally(link)
 
             function formatSubtitle() {
                 var pubdate = episode.qpubdate;
                 var filesize = episode.qfilesize;
                 if (filesize !== '') {
+                    if (episode.qdownloaded) {
+                        var filename = episode.qsourceurl.split('/').pop();
+                        return pubdate + ' | ' + filesize + ' | ' + filename;
+                    }
+
                     return pubdate + ' | ' + filesize;
                 } else {
                     return pubdate;
@@ -45,8 +51,8 @@
         }
     }
 
-    ScrollDecorator {
-        flickableItem: showNotesFlickable
+    ScrollScroll {
+        flickable: showNotesFlickable
     }
 }

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/SimpleButton.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/SimpleButton.qml Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/Subscribe.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/Subscribe.qml Changed

@@ -1,6 +1,7 @@
 
-import Qt 4.7
+import QtQuick 1.1
 
+import org.gpodder.qmlui 1.0
 import com.nokia.meego 1.0
 
 import 'config.js' as Config
@@ -13,11 +14,12 @@
     function show() {
         searchInput.text = ''
         searchResultsListModel.source = ''
-        topBar.opened = true
+        resultsSheet.reject();
     }
 
     function search() {
-        searchResultsListModel.searchFor(searchInput.text)
+        searchResultsListModel.searchFor(searchInput.text);
+        resultsSheet.open();
     }
 
     onVisibleChanged: {
@@ -29,12 +31,8 @@
 
     Item {
         id: topBar
-        property bool opened: true
-        clip: true
-
-        height: opened?70:0
-
-        Behavior on height { PropertyAnimation { duration: Config.slowTransition } }
+        visible: resultsSheet.status == DialogStatus.Closed
+        height: 70
 
         anchors {
             left: parent.left
@@ -42,25 +40,13 @@
             top: parent.top
         }
 
-        Label {
-            id: searchLabel
-            text: _('Search for:')
-            color: 'white'
-            font.pixelSize: 20
-            anchors {
-                leftMargin: Config.smallSpacing
-                left: parent.left
-                verticalCenter: parent.verticalCenter
-            }
-        }
-
         InputField {
             id: searchInput
             placeholderText: _('Search term or URL')
 
             anchors {
                 leftMargin: Config.smallSpacing
-                left: searchLabel.right
+                left: parent.left
                 right: searchButton.left
                 verticalCenter: parent.verticalCenter
             }
@@ -86,180 +72,7 @@
     }
 
     Item {
-        id: listHeader
-        anchors {
-            top: topBar.bottom
-            left: parent.left
-            right: parent.right
-        }
-
-        height: (listView.selectedIndices.length > 0)?Config.listItemHeight:0
-        Behavior on height { PropertyAnimation { } }
-        clip: true
-
-        Text {
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                right: subscribeButton.left
-                leftMargin: Config.largeSpacing
-            }
-
-            elide: Text.ElideRight
-            text: controller.formatCount(n_('%(count)s podcast selected', '%(count)s podcasts selected', listView.selectedIndices.length), listView.selectedIndices.length)
-            color: 'white'
-            font.pixelSize: 20 * Config.scale
-        }
-
-        SimpleButton {
-            id: subscribeButton
-            width: parent.height
-            height: parent.height
-
-            anchors {
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-            }
-
-            image: 'artwork/subscriptions.png'
-
-            onClicked: {
-                var urls = new Array();
-                var i;
-
-                for (i=0; i<listView.selectedIndices.length; i++) {
-                    urls.push(listView.model.get(listView.selectedIndices[i]).url);
-                }
-
-                subscribe.subscribe(urls)
-            }
-        }
-    }
-
-
-    ListView {
-        id: listView
-        property variant selectedIndices: []
-        clip: true
-
-        opacity: (searchResultsListModel.status == XmlListModel.Ready)?1:0
-        Behavior on opacity { PropertyAnimation { } }
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            top: listHeader.bottom
-        }
-
-        model: SearchResultsListModel {
-            id: searchResultsListModel
-
-            function searchFor(query) {
-                console.log('Searching for: ' + query)
-                source = 'http://gpodder.net/search.xml?q=' + query
-                console.log('new source:' + source)
-            }
-        }
-
-        delegate: SelectableItem {
-            property string modelData: url
-            inSelection: (listView.selectedIndices.indexOf(index) != -1)
-
-            height: Config.listItemHeight
-            width: listView.width
-
-            Item {
-                id: coverArt
-
-                height: Config.listItemHeight
-                width: Config.listItemHeight
-
-                anchors {
-                    leftMargin: Config.largeSpacing
-                    left: parent.left
-                    verticalCenter: parent.verticalCenter
-                }
-
-                Image {
-                    anchors.centerIn: parent
-                    source: logo
-                }
-            }
-
-            Column {
-                clip: true
-
-                anchors {
-                    leftMargin: Config.largeSpacing
-                    rightMargin: Config.largeSpacing
-                    left: coverArt.right
-                    right: subscriberCount.left
-                    verticalCenter: parent.verticalCenter
-                }
-
-                Label {
-                    text: title
-                    anchors.leftMargin: Config.largeSpacing
-                    color: 'white'
-                    font.pixelSize: 25
-                }
-
-                Label {
-                    text: url
-                    anchors.leftMargin: Config.largeSpacing
-                    color: '#aaa'
-                    font.pixelSize: 15
-                }
-            }
-
-            Label {
-                id: subscriberCount
-                anchors {

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/artwork/episode-archive.png -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/artwork/episode-archive.png Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/config.js -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/config.js Changed

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/ActionMenu.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/BusyIndicator.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/Button.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/InfoBanner.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/InputField.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/Label.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/ListList.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/PagePage.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/PullDownHandle.qml Added

@@ -0,0 +1,68 @@
+
+import QtQuick 1.1
+import com.nokia.meego 1.0
+
+import '../../../../config.js' as Config
+
+Item {
+    id: pullDown
+    clip: true
+
+    signal refresh
+
+    property string pullDownText: ''
+    property string releaseText: ''
+    property variant target
+    property int threshold: 100
+    property int lastMinY: 0
+    property bool startedAtZero: false
+    property bool wouldRefresh: (lastMinY < -threshold)
+    property bool enabled: false
+
+    Connections {
+        target: pullDown.target
+
+        onMovementStarted: {
+            pullDown.lastMinY = 0;
+            pullDown.startedAtZero = (pullDown.target.contentY === 0);
+        }
+
+        onContentYChanged: {
+            if (pullDown.startedAtZero && pullDown.target.moving && !pullDown.target.flicking) {
+                if (pullDown.target.contentY > 0) {
+                    pullDown.startedAtZero = false;
+                } else if (pullDown.target.contentY < pullDown.lastMinY) {
+                    pullDown.lastMinY = pullDown.target.contentY;
+                }
+            }
+        }
+
+        onFlickStarted: {
+            pullDown.startedAtZero = false;
+        }
+
+        onMovementEnded: {
+            if (enabled && pullDown.startedAtZero && pullDown.target.contentY == 0 && pullDown.wouldRefresh) {
+                pullDown.refresh();
+            }
+            pullDown.startedAtZero = false;
+            pullDown.lastMinY = 0;
+        }
+    }
+
+    visible: enabled && startedAtZero && pullDown.target.contentY < 0 && !pullDown.target.flicking
+    height: -pullDown.target.contentY
+
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+
+    Label {
+        color: 'white'
+        anchors.centerIn: parent
+        text: pullDown.wouldRefresh?pullDown.releaseText:pullDown.pullDownText
+        anchors.verticalCenter: parent.verticalCenter
+    }
+}
+

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/ScrollScroll.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/SettingsSwitch.qml Changed

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/WindowWindow.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/harmattan/org/gpodder/qmlui/qmldir Added

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/main_default.qml -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/main_default.qml Changed

@@ -1,219 +1,105 @@
 
-import Qt 4.7
-import com.nokia.meego 1.0
+import QtQuick 1.1
 import QtWebKit 1.0
 
+import org.gpodder.qmlui 1.0
+
 import 'config.js' as Config
 
-PageStackWindow {
+WindowWindow {
     id: rootWindow
     property variant main: mainObject
-    property bool fullsize: (platformWindow.viewMode == WindowState.Fullsize)
 
     function _(x) {
         return controller.translate(x)
     }
 
-    // Unused boolean activity variables:
-    //  - platformWindow.visible - Visible somewhere
-    //  - platformWindow.active - Active (input focus?)
-
-    showToolBar: (mainObject.canGoBack || mainObject.hasPlayButton || mainObject.hasSearchButton) && (mainObject.hasPodcasts || mainObject.canGoBack) || pageStack.depth > 1
-
-    // Hide status bar in landscape mode
-    showStatusBar: screen.currentOrientation == Screen.Portrait
+    InfoBanner {
+        id: infoBanner
+    }
 
-    initialPage: Page {
+    initialPage: PagePage {
         id: mainPage
-        orientationLock: {
-            if (configProxy.autorotate) {
-                PageOrientation.Automatic
-            } else {
-                PageOrientation.LockPortrait
-            }
-        }
-
-        tools: ToolBarLayout {
-            ToolIcon {
-                id: toolBack
-                anchors.left: parent.left
-                iconId: "icon-m-toolbar-back-white"
-                onClicked: mainObject.goBack()
-                visible: mainObject.canGoBack
-            }
-
-            ToolIcon {
-                id: toolFlattr
-                iconSource: 'artwork/flattr.png'
-                visible: mainObject.state == 'shownotes'
-
-                opacity: (mainObject.state == 'shownotes') && (labelFlattr.text !== '')
-                Behavior on opacity { PropertyAnimation { } }
-
-                anchors.right: toolPlay.visible?toolPlay.left:parent.right
+        listview: mainObject.podcastListView
+
+        lockToPortrait: !configProxy.autorotate
+
+        actions: [
+            Action {
+                text: _('Now playing')
+                onClicked: mainObject.clickPlayButton();
+            },
+            Action {
+                text: _('Check for new episodes')
+                onClicked: controller.updateAllPodcasts();
+            },
+            Action {
+                text: _('Add podcast')
+                onClicked: mainObject.clickSearchButton();
+            },
+            Action {
+                text: _('Settings')
                 onClicked: {
-                    controller.flattrEpisode(mainObject.showNotesEpisode);
+                    settingsPage.loadSettings();
+                    pageStack.push(settingsPage);
                 }
+            },
+            Action {
+                text: _('About gPodder')
+                onClicked: pageStack.push(aboutBox);
             }
+        ]
 
-            Connections {
-                target: mainObject
-                onShowNotesEpisodeChanged: {
-                    controller.updateFlattrButtonText(mainObject.showNotesEpisode);
-                }
-            }
+        Main {
+            id: mainObject
+            anchors.fill: parent
+        }
+    }
 
-            Label {
-                id: labelFlattr
-                color: 'white'
-                anchors.right: toolFlattr.left
-                anchors.verticalCenter: toolFlattr.verticalCenter
-                opacity: toolFlattr.opacity
-                visible: toolFlattr.visible
+    PagePage {
+        id: subscribePage
 
-                text: controller.flattrButtonText
-            }
+        Subscribe {
+            anchors.fill: parent
 
-            ToolIcon {
-                id: toolMenu
-                onClicked: {
-                    if (mainObject.state === 'episodes') {
-                        hrmtnEpisodesMenu.open();
-                    } else {
-                        hrmtnMainViewMenu.open();
-                    }
-                }
-                anchors.right: parent.right
-                iconId: "toolbar-view-menu"
-                visible: (!toolBack.visible && mainObject.state == 'podcasts') || (mainObject.currentPodcast !== undefined && mainObject.state == 'episodes')
+            onSubscribe: {
+                controller.addSubscriptions(urls);
+                pageStack.pop();
             }
+        }
+    }
 
-            ToolIcon {
-                id: toolRefresh
-                iconId: 'icon-m-toolbar-refresh-white'
-                onClicked: controller.updateAllPodcasts()
-                visible: mainObject.hasSearchButton && mainObject.hasPodcasts
-                anchors.left: parent.left
-            }
+    PagePage {
+        id: showNotesPage
 
-            ToolIcon {
-                id: toolAdd
-                iconId: "icon-m-toolbar-add-white"
-                onClicked: mainObject.clickSearchButton()
-                visible: mainObject.hasSearchButton
-                anchors.centerIn: parent
-                //anchors.right: toolPlay.visible?toolPlay.left:toolPlay.right
-            }
+        ShowNotes {
+            id: showNotes
 
-            ToolButton {
-                id: toolFilter
-                visible: mainObject.hasFilterButton
-                width: 300
-                onClicked: mainObject.showFilterDialog()
-                anchors.centerIn: parent
-
-                Label {
-                    color: 'white'
-                    text: mainObject.currentFilterText
-                    anchors.centerIn: parent
-                }
-            }
+            anchors.fill: parent
 
-            ToolIcon {
-                id: toolPlay
-                iconId: "icon-m-toolbar-content-audio-white"
-                onClicked: mainObject.clickPlayButton()
-                visible: mainObject.hasPlayButton && !toolMenu.visible
-                anchors.right: parent.right
-            }
+            Behavior on opacity { NumberAnimation { duration: Config.slowTransition } }
+            Behavior on anchors.leftMargin { NumberAnimation { duration: Config.slowTransition } }
         }
 
-        ContextMenu {
-            id: hrmtnMainViewMenu
-
-            MenuLayout {
-                MenuItem {
-                    text: _('Now playing')
-                    onClicked: nowPlayingMenuItem.clicked()
-                }
-                MenuItem {
-                    text: _('Settings')
-                    onClicked: {
-                        hrmtnMainViewMenu.close()
-                        settingsPage.loadSettings()
-                        pageStack.push(settingsPage)

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/ActionMenu.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/BusyIndicator.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/Button.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/InfoBanner.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/InputField.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/Label.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/ListList.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/PagePage.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/ScrollScroll.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/SettingsSwitch.qml Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/WindowWindow.qml Added

@@ -0,0 +1,28 @@
+
+import Sailfish.Silica 1.0
+import QtQuick 1.1
+
+ApplicationWindow {
+    /*cover: Column {
+        anchors.fill: parent
+        anchors.topMargin: 40
+        spacing: 5
+
+        Image { source: '../../../../artwork/gpodder200.png'; anchors.horizontalCenter: parent.horizontalCenter }
+        Text { font.bold: true; font.pixelSize: 15; anchors.horizontalCenter: parent.horizontalCenter; color: 'white'; text: "5 new episodes"; horizontalAlignment: Text.AlignHCenter }
+        Text { font.bold: true; font.pixelSize: 15; anchors.horizontalCenter: parent.horizontalCenter; color: 'white'; text: "Currently playing: foo"; horizontalAlignment: Text.AlignHCenter }
+    }
+
+    CoverActionList {
+        enabled: true
+        CoverAction {
+            iconSource: "artwork/btn_ffwd.png"
+            onTriggered: player.togglePlaying()
+        }
+        CoverAction {
+            iconSource: "artwork/btn_fffwd.png"
+            onTriggered: player.nextSong()
+        }
+    }*/
+}
+

gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/sailfish/org/gpodder/qmlui/qmldir Added

gpodder-3.3.0.tar.gz/share/gpodder/ui/qml/util.js -> gpodder-3.5.0.tar.gz/share/gpodder/ui/qml/util.js Changed

gpodder-3.3.0.tar.gz/share/gpodder/ui/web/gpodder.js -> gpodder-3.5.0.tar.gz/share/gpodder/ui/web/gpodder.js Changed

@@ -1,4 +1,3 @@
-
 gPodder = {
     /* XXX: Partially ugly. Some parts would be shorter with JQuery. */
 
@@ -24,19 +23,48 @@
     createEpisode: function(episode) {
         var li = document.createElement('li');
         var a = document.createElement('a');
+        var img = document.createElement('img');
+        var wrapper = document.createElement('p');
+
+        wrapper.setAttribute('class', 'listwrapper');
+
+        if(episode.mime_type.indexOf('video') == 0)
+            img.setAttribute('src', '/static/images/video.png');
+        else if(episode.mime_type.indexOf('audio') == 0)
+            img.setAttribute('src', '/static/images/audio.png');
+        wrapper.appendChild(img);
+        //img.setAttribute('class', 'ui-li-icon');
+        var title = document.createElement('h3');
+        title.appendChild(document.createTextNode(episode.title));
+        var description = document.createElement('p');
+        description.appendChild(document.createTextNode(episode.description));
+
         a.setAttribute('gpodder:episode', JSON.stringify(episode));
+        a.setAttribute('data-rel', 'dialog');
+        a.setAttribute('data-transition', 'pop');
+
         a.href = '#episode_details';
         a.onclick = function() {
             gPodder.selectEpisode(this);
             gPodder.currentlySelectedEpisode = this;
         };
+        a.appendChild(wrapper);
+        a.appendChild(title);
+        a.appendChild(description);
+
         li.appendChild(a);
-        a.appendChild(document.createTextNode(episode.title));
         return li;
     },
 
     createPodcast: function(podcast) {
         var li = document.createElement('li');
+        var img = document.createElement('img');
+        img.setAttribute('src', podcast.cover_url);
+        var title = document.createElement('h3');
+        title.appendChild(document.createTextNode(podcast.title));
+        var description = document.createElement('p');
+        description.appendChild(document.createTextNode(podcast.description));
+
         var a = document.createElement('a');
         a.setAttribute('gpodder:podcast', JSON.stringify(podcast));
         a.href = '#episodes_page';
@@ -44,80 +72,89 @@
             gPodder.selectPodcast(this);
             gPodder.currentlySelectedPodcast = this;
         };
+        a.appendChild(img);
+        a.appendChild(title);
+        a.appendChild(description);
+
         li.appendChild(a);
-        a.appendChild(document.createTextNode(podcast.title));
         return li;
     },
 
     init: function() {
-        var xmlhttp = new XMLHttpRequest();
-        var podcasts_ul = document.getElementById('podcasts');
-        xmlhttp.onreadystatechange = function() {
-            if (xmlhttp.readyState == 4) {
-                podcasts_ul.innerHTML = '';
-
-                var podcasts = JSON.parse(xmlhttp.responseText);
-                var lis = podcasts.map(gPodder.createPodcast);
-                for (i=0; i<lis.length; i++) {
-                    podcasts_ul.appendChild(lis[i]);
-                }
-                $('#podcasts').listview('refresh');
-            }
-        };
-        xmlhttp.open('GET', gPodder.url.podcasts, true);
-        xmlhttp.send(null);
+        $.getJSON(gPodder.url.podcasts, function(data) {
+            $('#podcasts').html('');
+            $.each(data, function() {
+                $('#podcasts').append(gPodder.createPodcast(this));
+            })
+            $('#podcasts').listview('refresh');
+        });
     },
 
     selectPodcast: function(li) {
         var podcast = JSON.parse(li.getAttribute('gpodder:podcast'));
-
-        var xmlhttp = new XMLHttpRequest();
-        var episodes_ul = document.getElementById('episodes');
-        xmlhttp.onreadystatechange = function() {
-            if (xmlhttp.readyState == 4) {
-                episodes_ul.innerHTML = '';
+    $.getJSON(gPodder.url.episodes(podcast), function(data) {
                 $('#episodes_title').html(podcast.title);
-
-                var episodes = JSON.parse(xmlhttp.responseText);
-                var lis = episodes.map(gPodder.createEpisode);
-                for (i=0; i<lis.length; i++) {
-                    episodes_ul.appendChild(lis[i]);
-                }
-                $('#episodes').listview('refresh');
-            }
-        };
-        xmlhttp.open('GET', gPodder.url.episodes(podcast), true);
-        xmlhttp.send(null);
+        $('#episodes').html('');
+        $.each(data, function() {
+            $('#episodes').append(gPodder.createEpisode(this));
+        })
+            $('#episodes').listview('refresh');
+    });
     },
 
     selectEpisode: function(li) {
         var episode = JSON.parse(li.getAttribute('gpodder:episode'));
         var content = '';
-        var media_url = '';
-
-        var keys = new Array();
-        for (var key in episode) {
-            keys.push(key);
-        }
-        keys.sort();
-
-        for (var i=0; i<keys.length; i++) {
-            var data = episode[keys[i]];
 
-            if (keys[i] === 'url') {
-                content += '<audio controls="controls"><source src="' + data + '" type="audio/mp3" /></audio><br>';
-            }
+        if(episode.mime_type.indexOf("audio") == 0)
+            content += '<div align="center"><audio id="episode_player" width="100%" controls="controls"><source src="' + episode.url + '" type="' + episode.mime_type + '" /></audio></div><br/>';
+        else if(episode.mime_type.indexOf("video") == 0)
+            content += '<video width="100%" id="episode_player" controls="controls"><source src="' + episode.url + '" type="' + episode.mime_type + '" /></video><br/>';
+
+        // TODO: Add more fields in the dialog box (Pubdate, etc.)
+        var published = new Date(episode.published * 1000)
+        content += '<strong>' + episode.title + '</strong>';
+
+        //content += '<div data-role="collapsible">';
+        //content += '<h3>Details</h3>';
+
+        content += '<p>' + episode.description + '</p>';
+        content += '<strong>Released: </strong>' + published.toDateString() + '<br/>';
+        content += '<strong>Time: </strong>' + published.toTimeString() + '<br/>';
+        content += '<strong>Size: </strong>' + gPodder.bytesToSize(episode.file_size) + '<br/>';
+        content += '<strong>Link: </strong><a href="' + episode.link + '" rel="external">' + episode.link + '</a><br/>';
+        //content += '</div>'; // End collapsible
+        $('#episode_details_title').text(episode.title);
+        $('#episode_details_content').html(content);
 
-            if (data !== null && data.length !== undefined && data.length > 50) {
-                data = data.substring(0, 48) + '...';
-            }
-            var key = gPodder.quote(keys[i]);
-            var data = gPodder.quote(data);
-            content += '<strong>' + key + '</strong> = ' + data + '<br>';
-        }
+        // Pause playback if the dialog is closed
+        $('#episode_details').bind('pagebeforehide', function() {
+            $('#episode_player').get(0).pause();
+        });
+        // Start the player at the last saved position
+        $('#episode_player').bind('loadedmetadata', function() {
+            this.currentTime = episode.current_position;
+        });
+
+        // TODO: Mark the episode as played
+        $('#episode_player').bind('play', function() {
+            console.log("played episode: " + episode.url);
+            $.post('/podcast/save', function() {
+                console.log("POSTED");
+            })
+        });
+
+        // TODO: Mark the current position
+        $('#episode_player').bind('pause', function() {
+            console.log("paused episode: " + episode.url + " at " + this.currentTime);
+        });
 
-        $('#episode_details_content').html(content);
     },
-
+    bytesToSize: function(bytes) {
+        var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+        if (bytes == 0) return 'n/a';
+        var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
+        return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
+    }
 };

gpodder-3.5.0.tar.gz/share/gpodder/ui/web/images Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/web/images/audio.png Added

gpodder-3.5.0.tar.gz/share/gpodder/ui/web/images/video.png Added

gpodder-3.3.0.tar.gz/share/gpodder/ui/web/index.html -> gpodder-3.5.0.tar.gz/share/gpodder/ui/web/index.html Changed

@@ -8,10 +8,9 @@
         <link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.css" />
         <script src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
         <script src="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.js"></script>
-
     </head>
     <body onload="gPodder.init()">
-        <div data-role="page" id="podcasts_page">
+        <div data-role="page" data-theme="a" id="podcasts_page">
             <div data-role="header">
                 <h1>Podcasts</h1>
             </div>
@@ -20,20 +19,18 @@
             </div>
         </div>
 
-        <div data-role="page" id="episodes_page">
+        <div data-role="page" data-theme="a" id="episodes_page" data-add-back-btn="true">
             <div data-role="header">
                 <h1 id="episodes_title">Episodes</h1>
-                <a href="#podcasts_page" data-icon="back" data-iconpos="notext" data-direction="reverse">Home</a>
             </div>
             <div data-role="content">
                 <ul id="episodes" data-role="listview" data-inset="true" data-filter="true"></ul>
             </div>
         </div>
 
-        <div data-role="page" id="episode_details">
+        <div data-role="page" data-theme="a" id="episode_details" data-transition="pop" data-add-back-btn="true">
             <div data-role="header">
                 <h1 id="episode_details_title">Episode</h1>
-                <a href="#episodes_page" data-icon="back" data-iconpos="notext" data-direction="reverse">Episodes</a>
             </div>
             <div data-role="content">
                 <div id="episode_details_content"></div>

gpodder-3.3.0.tar.gz/share/gpodder/ui/web/style.css -> gpodder-3.5.0.tar.gz/share/gpodder/ui/web/style.css Changed

gpodder-3.5.0.tar.gz/share/icons/hicolor/16x16/apps/gpodder.ico Added

gpodder-3.3.0.tar.gz/share/man/man1/gpo.1 -> gpodder-3.5.0.tar.gz/share/man/man1/gpo.1 Changed

gpodder-3.3.0.tar.gz/share/man/man1/gpodder.1 -> gpodder-3.5.0.tar.gz/share/man/man1/gpodder.1 Changed

@@ -1,19 +1,15 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.11.
-.TH GPODDER "1" "September 2012" "gpodder 3.3.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH GPODDER "1" "March 2013" "gpodder 3.5.0" "User Commands"
 .SH NAME
 gpodder \- Media aggregator and podcast client
 .SH SYNOPSIS
 .B gpodder
 [\fIoptions\fR]
 .SH DESCRIPTION
-gPodder enables you to subscribe to RSS feeds and download
-podcast episodes from these feeds.
+gPodder enables you to subscribe to media feeds (RSS, Atom, YouTube,
+Soundcloud, Vimeo and XSPF) and automatically download new content.
 .PP
-Downloaded podcasts can either be synchronized to portable
-MP3 players (including iPods) or played back on the user's
-desktop.
-.PP
-See gpo(1) for the command\-line interface.
+This is the gPodder GUI. See gpo(1) for the command\-line interface.
 .SH OPTIONS
 .TP
 \fB\-\-version\fR
@@ -23,10 +19,10 @@
 show this help message and exit
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Print debugging output to stdout
+print logging output on the console
 .TP
 \fB\-q\fR, \fB\-\-qml\fR
-Start the QML interface of gPodder
+use the QML\-based MeeGo 1.2 Harmattan UI
 .TP
 \fB\-s\fR URL, \fB\-\-subscribe\fR=\fIURL\fR
-Subscribe to the given URL
+subscribe to the feed at URL

gpodder-3.3.0.tar.gz/src/gpodder/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/__init__.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 # This metadata block gets parsed by setup.py - use single quotes only
 __tagline__   = 'Media aggregator and podcast client'
 __author__    = 'Thomas Perl <thp@gpodder.org>'
-__version__   = '3.3.0'
-__date__      = '2012-09-24'
-__relname__   = 'Intermission'
-__copyright__ = '© 2005-2012 Thomas Perl and the gPodder Team'
+__version__   = '3.5.0'
+__date__      = '2013-03-05'
+__relname__   = 'The After Hours'
+__copyright__ = '© 2005-2013 Thomas Perl and the gPodder Team'
 __license__   = 'GNU General Public License, version 3 or later'
 __url__       = 'http://gpodder.org/'
 
@@ -77,6 +77,7 @@
 class UI(object):
     def __init__(self):
         self.harmattan = False
+        self.sailfish = False
         self.gtk = False
         self.qml = False
         self.cli = False
@@ -93,9 +94,9 @@
 dbus_session_bus = None
 
 # Set "win32" to True if we are on Windows
-win32 = (platform.system() == 'Windows')
+ui.win32 = (platform.system() == 'Windows')
 # Set "osx" to True if we are on Mac OS X
-osx = (platform.system() == 'Darwin')
+ui.osx = (platform.system() == 'Darwin')
 
 # i18n setup (will result in "gettext" to be available)
 # Use   _ = gpodder.gettext   in modules to enable string translations
@@ -112,7 +113,7 @@
     gettext = t.gettext
     ngettext = t.ngettext
 
-if win32:
+if ui.win32:
     try:
         # Workaround for bug 650
         from gtk.glade import bindtextdomain
@@ -211,6 +212,7 @@
         etc_issue = ''
 
     ui.harmattan = ('MeeGo 1.2 Harmattan' in etc_issue)
+    ui.sailfish = ('Mer release' in etc_issue)
 
     if ui.harmattan and ENV_HOME not in os.environ:
         new_home = os.path.expanduser(os.path.join('~', 'MyDocs', 'gPodder'))

gpodder-3.3.0.tar.gz/src/gpodder/common.py -> gpodder-3.5.0.tar.gz/src/gpodder/common.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -93,3 +93,43 @@
     else:
         clean_up_downloads(True)
 
+def get_expired_episodes(channels, config):
+    for channel in channels:
+        for index, episode in enumerate(channel.get_episodes(gpodder.STATE_DOWNLOADED)):
+            # Never consider archived episodes as old
+            if episode.archive:
+                continue
+
+            # Download strategy "Only keep latest"
+            if (channel.download_strategy == channel.STRATEGY_LATEST and
+                    index > 0):
+                logger.info('Removing episode (only keep latest strategy): %s',
+                        episode.title)
+                yield episode
+                continue
+
+            # Only expire episodes if the age in days is positive
+            if config.episode_old_age < 1:
+                continue
+
+            # Never consider fresh episodes as old
+            if episode.age_in_days() < config.episode_old_age:
+                continue
+
+            # Do not delete played episodes (except if configured)
+            if not episode.is_new:
+                if not config.auto_remove_played_episodes:
+                    continue
+
+            # Do not delete unfinished episodes (except if configured)
+            if not episode.is_finished():
+                if not config.auto_remove_unfinished_episodes:
+                    continue
+
+            # Do not delete unplayed episodes (except if configured)
+            if episode.is_new:
+                if not config.auto_remove_unplayed_episodes:
+                    continue
+
+            yield episode
+

gpodder-3.3.0.tar.gz/src/gpodder/config.py -> gpodder-3.5.0.tar.gz/src/gpodder/config.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@
 
     # Software updates from gpodder.org (primary audience: Windows users)
     'software_update': {
-        'check_on_startup': gpodder.win32, # check for updates on start
+        'check_on_startup': gpodder.ui.win32, # check for updates on start
         'last_check': 0, # unix timestamp of last update check
         'interval': 5, # interval (in days) to check for updates
     },
@@ -117,6 +117,7 @@
                     'x': -1, 'y': -1, 'maximized': False,
 
                     'paned_position': 200,
+                    'episode_list_size': 200,
                 },
                 'episode_selector': {
                     'width': 600,
@@ -146,7 +147,6 @@
                 'descriptions': True,
                 'view_mode': 1,
                 'columns': int('101', 2), # bitfield of visible columns
-                'embed_shownotes': False, # show shownotes below episode list
             },
 
             'download_list': {
@@ -174,10 +174,18 @@
             'delete_episodes': False,
             'sync_disks': False,
         },
+        'playlists': {
+            'create': True,
+            'two_way_sync': False,
+            'use_absolute_path': True,
+            'folder': 'Playlists',
+        }
+
     },
 
     'youtube': {
-        'preferred_fmt_id': 18,
+        'preferred_fmt_id': 18, # default fmt_id (see fallbacks in youtube.py)
+        'preferred_fmt_ids': [], # for advanced uses (custom fallback sequence)
     },
 
     'extensions': {
@@ -204,7 +212,6 @@
     'auto_remove_unplayed_episodes': 'auto.cleanup.unplayed',
     'max_episodes_per_feed': 'limit.episodes',
     'show_toolbar': 'ui.gtk.toolbar',
-    'paned_position': 'ui.gtk.state.main_window.paned_position',
     'episode_list_descriptions': 'ui.gtk.episode_list.descriptions',
     'podcast_list_view_all': 'ui.gtk.podcast_list.all_episodes',
     'podcast_list_sections': 'ui.gtk.podcast_list.sections',
@@ -212,7 +219,6 @@
     'episode_list_view_mode': 'ui.gtk.episode_list.view_mode',
     'podcast_list_view_mode': 'ui.gtk.podcast_list.view_mode',
     'podcast_list_hide_boring': 'ui.gtk.podcast_list.hide_empty',
-    'youtube_preferred_fmt_id': 'youtube.preferred_fmt_id',
     'episode_list_columns': 'ui.gtk.episode_list.columns',
     'auto_cleanup_downloads': 'ui.gtk.download_list.remove_finished',
     'auto_update_feeds': 'auto.update.enabled',

gpodder-3.3.0.tar.gz/src/gpodder/core.py -> gpodder-3.5.0.tar.gz/src/gpodder/core.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/coverart.py -> gpodder-3.5.0.tar.gz/src/gpodder/coverart.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/dbsqlite.py -> gpodder-3.5.0.tar.gz/src/gpodder/dbsqlite.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/dbusproxy.py -> gpodder-3.5.0.tar.gz/src/gpodder/dbusproxy.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/download.py -> gpodder-3.5.0.tar.gz/src/gpodder/download.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +69,8 @@
         msg = email.message_from_string('\n'.join(headers_string))
         if header_name in msg:
             raw_value = msg.get_param(param, header=header_name)
-            value = email.utils.collapse_rfc2231_value(raw_value)
+            if raw_value is not None:
+                value = email.utils.collapse_rfc2231_value(raw_value)
     except Exception, e:
         logger.error('Cannot get %s from %s', param, header_name, exc_info=True)
 
@@ -529,6 +530,8 @@
     # Wheter this task represents a file download or a device sync operation
     ACTIVITY_DOWNLOAD, ACTIVITY_SYNCHRONIZE = range(2)
 
+    # Minimum time between progress updates (in seconds)
+    MIN_TIME_BETWEEN_UPDATES = 1.
 
     def __str__(self):
         return self.__episode.title
@@ -610,8 +613,9 @@
         self.__limit_rate_value = self._config.limit_rate_value
         self.__limit_rate = self._config.limit_rate
 
-        # Callbacks
-        self._progress_updated = lambda x: None
+        # Progress update functions
+        self._progress_updated = None
+        self._last_progress_updated = 0.
 
         # If the tempname already exists, set progress accordingly
         if os.path.exists(self.tempname):
@@ -665,7 +669,11 @@
 
         if self.total_size > 0:
             self.progress = max(0.0, min(1.0, float(count*blockSize)/self.total_size))
-            self._progress_updated(self.progress)
+            if self._progress_updated is not None:
+                diff = time.time() - self._last_progress_updated
+                if diff > self.MIN_TIME_BETWEEN_UPDATES or self.progress == 1.:
+                    self._progress_updated(self.progress)
+                    self._last_progress_updated = time.time()
 
         self.calculate_speed(count, blockSize)
 
@@ -740,8 +748,8 @@
 
         try:
             # Resolve URL and start downloading the episode
-            url = youtube.get_real_download_url(self.__episode.url, \
-                    self._config.youtube_preferred_fmt_id)
+            fmt_ids = youtube.get_fmt_ids(self._config.youtube)
+            url = youtube.get_real_download_url(self.__episode.url, fmt_ids)
             url = vimeo.get_real_download_url(url)
 
             downloader = DownloadURLOpener(self.__episode.channel)
@@ -823,7 +831,7 @@
                 if new_mimetype is not None:
                     logger.info('Using content-disposition mimetype: %s',
                             new_mimetype)
-                    self.__episode.set_mimetype(new_mimetype, commit=True)
+                    self.__episode.mime_type = new_mimetype
 
             # Re-evaluate filename and tempname to take care of podcast renames
             # while downloads are running (which will change both file names)

gpodder-3.3.0.tar.gz/src/gpodder/extensions.py -> gpodder-3.5.0.tar.gz/src/gpodder/extensions.py Changed

@@ -51,6 +51,14 @@
 logger = logging.getLogger(__name__)
 
 
+CATEGORY_DICT = {
+    'desktop-integration': _('Desktop Integration'),
+    'interface': _('Interface'),
+    'post-download': _('Post download'),
+}
+DEFAULT_CATEGORY = _('Other')
+
+
 def call_extensions(func):
     """Decorator to create handler functions in ExtensionManager
 
@@ -91,45 +99,80 @@
     DEFAULTS = {
         'description': _('No description for this extension.'),
     }
+    SORTKEYS = {
+        'title': 1,
+        'description': 2,
+        'category': 3,
+        'author': 4,
+        'only_for': 5,
+        'mandatory_in': 6,
+        'disable_in': 7,
+    }
 
     def __init__(self, container, metadata):
         if 'title' not in metadata:
             metadata['title'] = container.name
 
+        category = metadata.get('category', 'other')
+        metadata['category'] = CATEGORY_DICT.get(category, DEFAULT_CATEGORY)
+        
         self.__dict__.update(metadata)
-
+        
     def __getattr__(self, name):
         try:
             return self.DEFAULTS[name]
-        except KeyError:
-            raise AttributeError(name)
-
-    @property
-    def for_current_ui(self):
-        """Check if this extension makes sense for the current UI
-
-        The __only_for__ metadata field in an extension can be a string with
-        comma-separated values for UIs. This will be checked against boolean
-        variables in the "gpodder.ui" object.
+        except KeyError, e:
+            raise AttributeError(name, e)
+            
+    def get_sorted(self):
+        kf = lambda x: self.SORTKEYS.get(x[0], 99)
+        return sorted([(k, v) for k, v in self.__dict__.items()], key=kf)
+
+    def check_ui(self, target, default):
+        """Checks metadata information like
+            __only_for__ = 'gtk'
+            __mandatory_in__ = 'gtk'
+            __disable_in__ = 'gtk'
+
+        The metadata fields in an extension can be a string with
+        comma-separated values for UIs. This will be checked against
+        boolean variables in the "gpodder.ui" object.
 
         Example metadata field in an extension:
 
             __only_for__ = 'gtk,qml'
+            __only_for__ = 'unity'
 
-        In this case, this function will return True if any of the following
-        expressions will evaluate to True:
+        In this case, this function will return the value of the default
+        if any of the following expressions will evaluate to True:
 
             gpodder.ui.gtk
             gpodder.ui.qml
+            gpodder.ui.unity
+            gpodder.ui.cli
+            gpodder.ui.osx
+            gpodder.ui.win32
 
         New, unknown UIs are silently ignored and will evaluate to False.
         """
-        if not hasattr(self, 'only_for'):
-            return True
+        if not hasattr(self, target):
+            return default
 
-        uis = filter(None, [x.strip() for x in self.only_for.split(',')])
+        uis = filter(None, [x.strip() for x in getattr(self, target).split(',')])
         return any(getattr(gpodder.ui, ui.lower(), False) for ui in uis)
 
+    @property   
+    def available_for_current_ui(self):
+        return self.check_ui('only_for', True)
+    
+    @property
+    def mandatory_in_current_ui(self):
+        return self.check_ui('mandatory_in', False)
+        
+    @property
+    def disable_in_current_ui(self):
+        return self.check_ui('disable_in', False)
+
 class MissingDependency(Exception):
     def __init__(self, message, dependency, cause=None):
         Exception.__init__(self, message)
@@ -157,12 +200,34 @@
         self.metadata = ExtensionMetadata(self, self._load_metadata(filename))
 
     def require_command(self, command):
+        """Checks if the given command is installed on the system
+
+        Returns the complete path of the command
+
+        @param command: String with the command name
+        """
         result = util.find_command(command)
         if result is None:
             msg = _('Command not found: %(command)s') % {'command': command}
             raise MissingCommand(msg, command)
         return result
 
+    def require_any_command(self, command_list):
+        """Checks if any of the given commands is installed on the system
+
+        Returns the complete path of first found command in the list
+
+        @param command: List with the commands name
+        """
+        for command in command_list:
+            result = util.find_command(command)
+            if result is not None:
+                return result
+
+        msg = _('Need at least one of the following commands: %(list_of_commands)s') % \
+            {'list_of_commands': ', '.join(command_list)}
+        raise MissingCommand(msg, ', '.join(command_list))
+
     def _load_metadata(self, filename):
         if not filename or not os.path.exists(filename):
             return {}
@@ -217,7 +282,7 @@
             logger.info('Module already loaded.')
             return
 
-        if not self.metadata.for_current_ui:
+        if not self.metadata.available_for_current_ui:
             logger.info('Not loading "%s" (only_for = "%s")',
                     self.name, self.metadata.only_for)
             return
@@ -264,8 +329,12 @@
             logger.debug('Found extension "%s" in %s', name, filename)
             config = getattr(core.config.extensions, name)
             container = ExtensionContainer(self, name, config, filename)
-            if name in enabled_extensions:
+            if (name in enabled_extensions or
+                    container.metadata.mandatory_in_current_ui):
                 container.set_enabled(True)
+            if (name in enabled_extensions and
+                    container.metadata.disable_in_current_ui):
+                container.set_enabled(False)
             self.containers.append(container)
 
     def shutdown(self):
@@ -273,19 +342,23 @@
             container.set_enabled(False)
 
     def _config_value_changed(self, name, old_value, new_value):
-        if name == 'extensions.enabled':
-            for container in self.containers:
-                new_enabled = (container.name in new_value)
-                if new_enabled != container.enabled:
-                    logger.info('Extension "%s" is now %s', container.name,
-                            'enabled' if new_enabled else 'disabled')
-                    container.set_enabled(new_enabled)
-                    if new_enabled and not container.enabled:
-                        logger.warn('Could not enable extension: %s',
-                                container.error)
-                        self.core.config.extensions.enabled = [x
-                                for x in self.core.config.extensions.enabled
-                                if x != container.name]
+        if name != 'extensions.enabled':
+            return
+            
+        for container in self.containers:
+            new_enabled = (container.name in new_value)
+            if new_enabled == container.enabled:
+                continue
+                
+            logger.info('Extension "%s" is now %s', container.name,
+                    'enabled' if new_enabled else 'disabled')
+            container.set_enabled(new_enabled)
+            if new_enabled and not container.enabled:
+                logger.warn('Could not enable extension: %s',

gpodder-3.3.0.tar.gz/src/gpodder/feedcore.py -> gpodder-3.5.0.tar.gz/src/gpodder/feedcore.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -300,15 +300,6 @@
         pubdate = entry.get('updated_parsed', None)
 
     if pubdate is None:
-        # See http://code.google.com/p/feedparser/issues/detail?id=327
-        updated = entry.get('published', entry.get('updated', None))
-        if updated is not None:
-            # FIXME: This is kludgy. We should write our own date handler
-            # and register it with feedparser.registerDateHandler() and/or
-            # wait for feedparser to add support for this bogus date format.
-            pubdate = feedparser._parse_date(updated.replace(',', ''))
-
-    if pubdate is None:
         # Cannot determine pubdate - party like it's 1970!
         return 0

gpodder-3.3.0.tar.gz/src/gpodder/feedservice.py -> gpodder-3.5.0.tar.gz/src/gpodder/feedservice.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/flattr.py -> gpodder-3.5.0.tar.gz/src/gpodder/flattr.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/__init__.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/config.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/config.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/__init__.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/channel.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/channel.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
         self.entryTitle.set_text( self.channel.title)
         self.labelURL.set_text(self.channel.url)
         self.cbSkipFeedUpdate.set_active(self.channel.pause_subscription)
+        self.cbEnableDeviceSync.set_active(self.channel.sync_to_mp3_player)
 
         self.section_list = gtk.ListStore(str)
         active_index = 0
@@ -50,6 +51,19 @@
         self.combo_section.add_attribute(cell_renderer, 'text', 0)
         self.combo_section.set_active(active_index)
 
+        self.strategy_list = gtk.ListStore(str, int)
+        active_index = 0
+        for index, (checked, strategy_id, strategy) in \
+            enumerate(self.channel.get_download_strategies()):
+            self.strategy_list.append([strategy, strategy_id])
+            if checked:
+                active_index = index
+        self.combo_strategy.set_model(self.strategy_list)
+        cell_renderer = gtk.CellRendererText()
+        self.combo_strategy.pack_start(cell_renderer)
+        self.combo_strategy.add_attribute(cell_renderer, 'text', 0)
+        self.combo_strategy.set_active(active_index)
+
         self.LabelDownloadTo.set_text( self.channel.save_dir)
         self.LabelWebsite.set_text( self.channel.link)
 
@@ -131,8 +145,9 @@
 
     def cover_download_finished(self, channel, pixbuf):
         def set_cover(channel, pixbuf):
-            self.imgCover.set_from_pixbuf(self.scale_pixbuf(pixbuf))
-            self.gPodderChannel.show()
+            if self.channel == channel:
+                self.imgCover.set_from_pixbuf(self.scale_pixbuf(pixbuf))
+                self.gPodderChannel.show()
 
         util.idle_add(set_cover, channel, pixbuf)
 
@@ -172,6 +187,7 @@
 
     def on_btnOK_clicked(self, widget, *args):
         self.channel.pause_subscription = self.cbSkipFeedUpdate.get_active()
+        self.channel.sync_to_mp3_player = self.cbEnableDeviceSync.get_active()
         self.channel.rename(self.entryTitle.get_text())
         self.channel.auth_username = self.FeedUsername.get_text().strip()
         self.channel.auth_password = self.FeedPassword.get_text()
@@ -186,6 +202,9 @@
         else:
             section_changed = False
 
+        new_strategy = self.strategy_list[self.combo_strategy.get_active()][1]
+        self.channel.set_download_strategy(new_strategy)
+
         self.channel.save()
 
         self.gPodderChannel.destroy()

gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/deviceplaylist.py Added

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2011 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import gpodder
+
+_ = gpodder.gettext
+
+from gpodder import util
+
+import logging
+logger = logging.getLogger(__name__)
+
+class gPodderDevicePlaylist(object):
+    def __init__(self, config, playlist_name):
+        self._config=config
+        self.linebreak = '\r\n'
+        self.playlist_file=playlist_name + '.m3u'
+        self.playlist_folder = os.path.join(self._config.device_sync.device_folder, self._config.device_sync.playlists.folder)
+        self.mountpoint = util.find_mount_point(self.playlist_folder)
+        if self.mountpoint == '/':
+            self.mountpoint = self.playlist_folder
+            logger.warning('MP3 player resides on / - using %s as MP3 player root', self.mountpoint)
+        self.playlist_absolute_filename=os.path.join(self.playlist_folder, self.playlist_file)
+
+    def build_extinf(self, filename):
+#TO DO: Windows playlists
+#        if self._config.mp3_player_playlist_win_path:
+#            filename = filename.replace('\\', os.sep)
+
+#        # rebuild the whole filename including the mountpoint
+#        if self._config.device_sync.playlist_absolute_path:
+#            absfile = os.path.join(self.mountpoint,filename)
+#        else: #TODO: Test rel filenames
+#            absfile = util.rel2abs(filename, os.path.dirname(self.playlist_file))
+
+        # fallback: use the basename of the file
+        (title, extension) = os.path.splitext(os.path.basename(filename))
+
+        return "#EXTINF:0,%s%s" % (title.strip(), self.linebreak)
+
+    def read_m3u(self):
+        """
+        read all files from the existing playlist
+        """
+        tracks = []
+        logger.info("Read data from the playlistfile %s" % self.playlist_absolute_filename)
+        if os.path.exists(self.playlist_absolute_filename):
+            for line in open(self.playlist_absolute_filename, 'r'):
+                if not line.startswith('#EXT'):
+                    tracks.append(line.rstrip('\r\n'))
+        return tracks
+
+    def get_filename_for_playlist(self, episode):
+        """
+        get the filename for the given episode for the playlist
+        """
+        filename_base = util.sanitize_filename(episode.sync_filename(
+            self._config.device_sync.custom_sync_name_enabled,
+            self._config.device_sync.custom_sync_name),
+            self._config.device_sync.max_filename_length)
+        filename = filename_base + os.path.splitext(episode.local_filename(create=False))[1].lower()
+        return filename
+
+    def get_absolute_filename_for_playlist(self, episode):
+        """
+        get the filename including full path for the given episode for the playlist
+        """
+        filename = self.get_filename_for_playlist(episode)
+        if self._config.device_sync.one_folder_per_podcast:
+            filename = os.path.join(episode.channel.title, filename)
+        if self._config.device_sync.playlist.absolute_path:
+            filename = os.path.join(util.relpath(self.mountpoint, self._config.device_sync.device_folder), filename)
+        return filename
+
+    def write_m3u(self, episodes):
+        """
+        write the list into the playlist on the device
+        """
+        logger.info('Writing playlist file: %s', self.playlist_file)
+        if not util.make_directory(self.playlist_folder):
+            raise IOError(_('Folder %s could not be created.') % self.playlist_folder, _('Error writing playlist'))
+        else:
+            fp = open(os.path.join(self.playlist_folder, self.playlist_file), 'w')
+            fp.write('#EXTM3U%s' % self.linebreak)
+            for current_episode in episodes:
+                filename_base = util.sanitize_filename(current_episode.sync_filename(
+                    self._config.device_sync.custom_sync_name_enabled,
+                    self._config.device_sync.custom_sync_name),
+                    self._config.device_sync.max_filename_length)
+                filename = filename_base + os.path.splitext(current_episode.local_filename(create=False))[1].lower()
+                filename = self.get_filename_for_playlist(current_episode)
+                fp.write(self.build_extinf(filename))
+                filename = self.get_absolute_filename_for_playlist(current_episode)
+                fp.write(filename)
+                fp.write(self.linebreak)
+            fp.close()
+

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/episodeselector.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/episodeselector.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/podcastdirectory.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/podcastdirectory.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@
             new_parent.remove(self.notebookChannelAdder)
             self.vboxOpmlImport.reparent(new_parent)
 
-        if not hasattr(self, 'add_urls_callback'):
-            self.add_urls_callback = None
+        if not hasattr(self, 'add_podcast_list'):
+            self.add_podcast_list = None
 
         self.setup_treeview(self.treeviewChannelChooser)
         self.setup_treeview(self.treeviewTopPodcastsChooser)
@@ -89,7 +89,8 @@
         if model is not None:
             for row in model:
                 if row[OpmlListModel.C_SELECTED]:
-                    channels.append(row[OpmlListModel.C_URL])
+                    channels.append((row[OpmlListModel.C_TITLE],
+                        row[OpmlListModel.C_URL]))
 
         return channels
 
@@ -172,12 +173,12 @@
         self.select_all(False)
 
     def on_btnOK_clicked(self, widget, *args):
-        channel_urls = self.get_selected_channels()
+        channels = self.get_selected_channels()
         self.gPodderPodcastDirectory.destroy()
 
         # add channels that have been selected
-        if self.add_urls_callback is not None:
-            self.add_urls_callback(channel_urls)
+        if self.add_podcast_list is not None:
+            self.add_podcast_list(channels)
 
     def on_btnCancel_clicked(self, widget, *args):
         self.gPodderPodcastDirectory.destroy()

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/preferences.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/preferences.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@
 N_ = gpodder.ngettext
 
 from gpodder import util
+from gpodder import youtube
 
 from gpodder.gtkui.interface.common import BuilderWidget
 from gpodder.gtkui.interface.configeditor import gPodderConfigEditor
@@ -136,9 +137,35 @@
     def on_btn_close_clicked(self, widget):
         util.idle_add(self.main_window.destroy)
 
+class VideoFormatList(gtk.ListStore):
+    C_CAPTION, C_ID = range(2)
+
+    def __init__(self, config):
+        gtk.ListStore.__init__(self, str, int)
+        self._config = config
+
+        if self._config.youtube.preferred_fmt_ids:
+            caption = _('Custom (%(format_ids)s)') % {
+                    'format_ids': ', '.join(self.custom_format_ids),
+            }
+            self.append((caption, -1))
+        else:
+            for id, (fmt_id, path, description) in youtube.formats:
+                self.append((description, id))
+
+    def get_index(self):
+        for index, row in enumerate(self):
+            if self._config.youtube.preferred_fmt_id == row[self.C_ID]:
+                return index
+        return 0
+
+    def set_index(self, index):
+        value = self[index][self.C_ID]
+        if value > 0:
+            self._config.youtube.preferred_fmt_id = value
 
 class gPodderPreferences(BuilderWidget):
-    C_TOGGLE, C_LABEL, C_EXTENSION = range(3)
+    C_TOGGLE, C_LABEL, C_EXTENSION, C_SHOW_TOGGLE = range(4)
 
     def new(self):
         for cb in (self.combo_audio_player_app, self.combo_video_player_app):
@@ -161,6 +188,13 @@
         index = self.video_player_model.get_index(self._config.videoplayer)
         self.combo_video_player_app.set_active(index)
 
+        self.preferred_video_format_model = VideoFormatList(self._config)
+        self.combobox_preferred_video_format.set_model(self.preferred_video_format_model)
+        cellrenderer = gtk.CellRendererText()
+        self.combobox_preferred_video_format.pack_start(cellrenderer, True)
+        self.combobox_preferred_video_format.add_attribute(cellrenderer, 'text', self.preferred_video_format_model.C_CAPTION)
+        self.combobox_preferred_video_format.set_active(self.preferred_video_format_model.get_index())
+
         self.update_interval_presets = [0, 10, 30, 60, 2*60, 6*60, 12*60]
         adjustment_update_interval = self.hscale_update_interval.get_adjustment()
         adjustment_update_interval.upper = len(self.update_interval_presets)-1
@@ -195,14 +229,17 @@
         else:
             self.hscale_expiration.set_value(0)
 
-        self._config.connect_gtk_togglebutton('auto_remove_unplayed_episodes', self.checkbutton_expiration_unplayed)
-        self._config.connect_gtk_togglebutton('auto_remove_unfinished_episodes', self.checkbutton_expiration_unfinished)
+        self._config.connect_gtk_togglebutton('auto_remove_unplayed_episodes',
+                                              self.checkbutton_expiration_unplayed)
+        self._config.connect_gtk_togglebutton('auto_remove_unfinished_episodes',
+                                              self.checkbutton_expiration_unfinished)
 
         self.device_type_model = DeviceTypeActionList(self._config)
         self.combobox_device_type.set_model(self.device_type_model)
         cellrenderer = gtk.CellRendererText()
         self.combobox_device_type.pack_start(cellrenderer, True)
-        self.combobox_device_type.add_attribute(cellrenderer, 'text', DeviceTypeActionList.C_CAPTION)
+        self.combobox_device_type.add_attribute(cellrenderer, 'text',
+                                                DeviceTypeActionList.C_CAPTION)
         self.combobox_device_type.set_active(self.device_type_model.get_index())
 
         self.on_sync_model = OnSyncActionList(self._config)
@@ -212,8 +249,12 @@
         self.combobox_on_sync.add_attribute(cellrenderer, 'text', OnSyncActionList.C_CAPTION)
         self.combobox_on_sync.set_active(self.on_sync_model.get_index())
 
-        self._config.connect_gtk_togglebutton('device_sync.skip_played_episodes', self.checkbutton_skip_played_episodes)
-
+        self._config.connect_gtk_togglebutton('device_sync.skip_played_episodes',
+                                              self.checkbutton_skip_played_episodes)
+        self._config.connect_gtk_togglebutton('device_sync.playlists.create',
+                                              self.checkbutton_create_playlists)
+        self._config.connect_gtk_togglebutton('device_sync.playlists.two_way_sync',
+                                              self.checkbutton_delete_using_playlists)
 
         # Have to do this before calling set_active on checkbutton_enable
         self._enable_mygpo = self._config.mygpo.enabled
@@ -231,29 +272,59 @@
         self.set_flattr_preferences()
 
         # Configure the extensions manager GUI
+        self.set_extension_preferences()
+
+    def set_extension_preferences(self):
+        def search_equal_func(model, column, key, it):
+            label = model.get_value(it, self.C_LABEL)
+            if key.lower() in label.lower():
+                # from http://www.pygtk.org/docs/pygtk/class-gtktreeview.html:
+                # "func should return False to indicate that the row matches
+                # the search criteria."
+                return False
+
+            return True
+        self.treeviewExtensions.set_search_equal_func(search_equal_func)
+
         toggle_cell = gtk.CellRendererToggle()
         toggle_cell.connect('toggled', self.on_extensions_cell_toggled)
-        toggle_column = gtk.TreeViewColumn('', toggle_cell, active=self.C_TOGGLE)
-        toggle_column.set_clickable(True)
+        toggle_column = gtk.TreeViewColumn('')
+        toggle_column.pack_start(toggle_cell, True)
+        toggle_column.add_attribute(toggle_cell, 'active', self.C_TOGGLE)
+        toggle_column.add_attribute(toggle_cell, 'visible', self.C_SHOW_TOGGLE)
+        toggle_column.set_property('min-width', 32)
         self.treeviewExtensions.append_column(toggle_column)
 
-        renderer = gtk.CellRendererText()
-        renderer.set_property('ellipsize', pango.ELLIPSIZE_END)
-        column = gtk.TreeViewColumn(_('Name'), renderer, markup=self.C_LABEL)
-        column.set_clickable(False)
-        column.set_resizable(True)
-        column.set_expand(True)
-        self.treeviewExtensions.append_column(column)
+        name_cell = gtk.CellRendererText()
+        name_cell.set_property('ellipsize', pango.ELLIPSIZE_END)
+        extension_column = gtk.TreeViewColumn(_('Name'))
+        extension_column.pack_start(name_cell, True)
+        extension_column.add_attribute(name_cell, 'markup', self.C_LABEL)
+        extension_column.set_expand(True)
+        self.treeviewExtensions.append_column(extension_column)
+
+        self.extensions_model = gtk.ListStore(bool, str, object, bool)
 
-        self.extensions_model = gtk.ListStore(bool, str, object)
+        def key_func(pair):
+            category, container = pair
+            return (category, container.metadata.title)
+
+        def convert(extensions):
+            for container in extensions:
+                yield (container.metadata.category, container)
+
+        old_category = None
+        for category, container in sorted(convert(gpodder.user_extensions.get_extensions()), key=key_func):
+            if old_category != category:
+                label = '<span weight="bold">%s</span>' % cgi.escape(category)
+                self.extensions_model.append((None, label, None, False))
+                old_category = category
 
-        for container in gpodder.user_extensions.get_extensions():
             label = '%s\n<small>%s</small>' % (
                     cgi.escape(container.metadata.title),
                     cgi.escape(container.metadata.description))
-            self.extensions_model.append([container.enabled, label, container])
+            self.extensions_model.append((container.enabled, label, container, True))
 
-        self.extensions_model.set_sort_column_id(self.C_LABEL, gtk.SORT_ASCENDING)
         self.treeviewExtensions.set_model(self.extensions_model)
         self.treeviewExtensions.columns_autosize()
 
@@ -275,7 +346,6 @@
             except ImportError, ie:
                 self.show_message(_('Flattr integration requires WebKit/Gtk.'),
                         _('WebKit/Gtk not found'), important=True)
-                self.main_window.destroy()
                 return
 
             gPodderFlattrSignIn(self.parent_window,
@@ -313,17 +383,20 @@
                     _('Extension cannot be activated'), important=True)
             model.set_value(it, self.C_TOGGLE, False)
 
-    def on_extensions_row_activated(self, treeview, path, view_column):
+    def on_treeview_extensions_row_activated(self, treeview, path, column):
         model = treeview.get_model()
         container = model.get_value(model.get_iter(path), self.C_EXTENSION)
+        self.show_extension_info(model, container)
+
+    def show_extension_info(self, model, container):
+        if not container or not model:
+            return
 
-        # This is one ugly hack, but it displays the container's attributes

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/sync.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/sync.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 # Thomas Perl <thp@gpodder.org>; 2009-09-05 (based on code from gui.py)
 # Ported to gPodder 3 by Joseph Wickremasinghe in June 2012
 
-import gtk
+import os
 import gpodder
 
 _ = gpodder.gettext
@@ -29,6 +29,8 @@
 from gpodder import util
 from gpodder import sync
 
+from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector
+from gpodder.gtkui.desktop.deviceplaylist import gPodderDevicePlaylist
 import logging
 logger = logging.getLogger(__name__)
 
@@ -38,11 +40,12 @@
             update_episode_list_icons,
             update_podcast_list_model,
             preferences_widget,
-            episode_selector_class,
+            channels,
             download_status_model,
             download_queue_manager,
             enable_download_list_update,
-            commit_changes_to_database):
+            commit_changes_to_database,
+            delete_episode_list):
         self.device = None
 
         self._config = config
@@ -53,12 +56,12 @@
         self.update_episode_list_icons = update_episode_list_icons
         self.update_podcast_list_model = update_podcast_list_model
         self.preferences_widget = preferences_widget
-        self.episode_selector_class = episode_selector_class
+        self.channels=channels
         self.download_status_model = download_status_model
         self.download_queue_manager = download_queue_manager
         self.enable_download_list_update = enable_download_list_update
         self.commit_changes_to_database = commit_changes_to_database
-
+        self.delete_episode_list=delete_episode_list
 
     def _filter_sync_episodes(self, channels, only_downloaded=False):
         """Return a list of episodes for device synchronization
@@ -69,7 +72,7 @@
         """
         episodes = []
         for channel in channels:
-            if only_downloaded:
+            if only_downloaded or not channel.sync_to_mp3_player:
                 logger.info('Skipping channel: %s', channel.title)
                 continue
 
@@ -82,12 +85,12 @@
     def _show_message_unconfigured(self):
         title = _('No device configured')
         message = _('Please set up your device in the preferences dialog.')
-        self.notification(message, title, widget=self.preferences_widget)
+        self.notification(message, title, widget=self.preferences_widget, important=True)
 
     def _show_message_cannot_open(self):
         title = _('Cannot open device')
         message = _('Please check the settings in the preferences dialog.')
-        self.notification(message, title, widget=self.preferences_widget)
+        self.notification(message, title, widget=self.preferences_widget, important=True)
 
     def on_synchronize_episodes(self, channels, episodes=None, force_played=True):
         device = sync.open_device(self)
@@ -141,11 +144,148 @@
                     device.close()
                     return
 
-            # Finally start the synchronization process
-            @util.run_in_background
-            def sync_thread_func():
+            #enable updating of UI
+            self.enable_download_list_update()
+
+            #Update device playlists
+            #General approach is as follows:
+
+            #When a episode is downloaded and synched, it is added to the
+            #standard playlist for that podcast which is then written to
+            #the device.
+
+            #After the user has played that episode on their device, they
+            #can delete that episode from their device.
+
+            #At the next sync, gPodder will then compare the standard
+            #podcast-specific playlists on the device (as written by
+            #gPodder during the last sync), with the episodes on the
+            #device.If there is an episode referenced in the playlist
+            #that is no longer on the device, gPodder will assume that
+            #the episode has already been synced and subsequently deleted
+            #from the device, and will hence mark that episode as deleted
+            #in gPodder. If there are no playlists, nothing is deleted.
+
+            #At the next sync, the playlists will be refreshed based on
+            #the downloaded, undeleted episodes in gPodder, and the
+            #cycle begins again...
+
+            def resume_sync(episode_urls, channel_urls,progress):
+                if progress is not None:
+                    progress.on_finished()
+
+                #rest of sync process should continue here
+                self.commit_changes_to_database()
+                for current_channel in self.channels:
+                    #only sync those channels marked for syncing
+                    if (current_channel.sync_to_mp3_player and self._config.device_sync.playlists.create):
+
+                        #get playlist object
+                        playlist=gPodderDevicePlaylist(self._config,
+                                                       current_channel.title)
+                        #need to refresh episode list so that
+                        #deleted episodes aren't included in playlists
+                        episodes_for_playlist=sorted(current_channel.get_episodes(gpodder.STATE_DOWNLOADED),
+                                                     key=lambda ep: ep.published)
+                        playlist.write_m3u(episodes_for_playlist)
+
+                #enable updating of UI
                 self.enable_download_list_update()
-                device.add_sync_tasks(episodes, force_played=force_played)
+                
+                if self._config.device_sync.playlists.create:                 
+                    title = _('Update successful')
+                    message = _('The playlist on your MP3 player has been updated.')
+                    self.notification(message, title, widget=self.preferences_widget)
+
+                # Finally start the synchronization process
+                @util.run_in_background
+                def sync_thread_func():
+                    device.add_sync_tasks(episodes, force_played=force_played)
+
+                return
+
+            if self._config.device_sync.playlists.create:
+                try:
+                    episodes_to_delete=[]
+                    if self._config.device_sync.playlists.two_way_sync:
+                        for current_channel in self.channels:
+                            #only include channels that are included in the sync
+                            if current_channel.sync_to_mp3_player:
+                                #get playlist object
+                                playlist=gPodderDevicePlaylist(self._config, current_channel.title)
+                                #get episodes to be written to playlist
+                                episodes_for_playlist=sorted(current_channel.get_episodes(gpodder.STATE_DOWNLOADED),
+                                                             key=lambda ep: ep.published)
+                                episode_keys=map(playlist.get_absolute_filename_for_playlist,
+                                                 episodes_for_playlist)
+
+                                episode_dict=dict(zip(episode_keys, episodes_for_playlist))
+
+                                #then get episodes in playlist (if it exists) already on device
+                                episodes_in_playlists = playlist.read_m3u()
+                                #if playlist doesn't exist (yet) episodes_in_playlist will be empty
+                                if episodes_in_playlists:
+                                    for episode_filename in episodes_in_playlists:
+
+                                        if not(os.path.exists(os.path.join(playlist.mountpoint,
+                                                                           episode_filename))):
+                                            #episode was synced but no longer on device
+                                            #i.e. must have been deleted by user, so delete from gpodder
+                                            try:
+                                                episodes_to_delete.append(episode_dict[episode_filename])
+                                            except KeyError, ioe:
+                                                logger.warn('Episode %s, removed from device has already been deleted from gpodder',
+                                                            episode_filename)
+
+
+                    #delete all episodes from gpodder (will prompt user)
+
+                    #not using playlists to delete
+                    def auto_delete_callback(episodes):
+
+                        if not episodes:
+                            #episodes were deleted on device
+                            #but user decided not to delete them from gpodder
+                            #so jump straight to sync
+                            logger.info ('Starting sync - no episodes selected for deletion')
+                            resume_sync([],[],None)
+                        else:
+                            #episodes need to be deleted from gpodder
+                            for episode_to_delete in episodes:
+                                logger.info("Deleting episode %s",
+                                               episode_to_delete.title)
+

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktop/welcome.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktop/welcome.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/desktopfile.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/desktopfile.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/download.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/download.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/draw.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/draw.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/flattr.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/flattr.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/interface/__init__.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/addpodcast.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/interface/addpodcast.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 
 class gPodderAddPodcast(BuilderWidget):
     def new(self):
-        if not hasattr(self, 'add_urls_callback'):
-            self.add_urls_callback = None
+        if not hasattr(self, 'add_podcast_list'):
+            self.add_podcast_list = None
         if hasattr(self, 'custom_label'):
             self.label_add.set_text(self.custom_label)
         if hasattr(self, 'custom_title'):
@@ -82,6 +82,7 @@
     def on_btn_add_clicked(self, widget):
         url = self.entry_url.get_text()
         self.on_btn_close_clicked(widget)
-        if self.add_urls_callback is not None:
-            self.add_urls_callback([url])
+        if self.add_podcast_list is not None:
+            title = None # FIXME: Add title GUI element
+            self.add_podcast_list([(title, url)])

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/common.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/interface/common.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/configeditor.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/interface/configeditor.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/interface/progress.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/interface/progress.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/macosx.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/macosx.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/main.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/main.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,26 +78,26 @@
 from gpodder.gtkui.desktop.welcome import gPodderWelcome
 from gpodder.gtkui.desktop.channel import gPodderChannel
 from gpodder.gtkui.desktop.preferences import gPodderPreferences
-from gpodder.gtkui.desktop.shownotes import gPodderShownotes
 from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector
 from gpodder.gtkui.desktop.podcastdirectory import gPodderPodcastDirectory
 from gpodder.gtkui.interface.progress import ProgressIndicator
 
 from gpodder.gtkui.desktop.sync import gPodderSyncUI
 from gpodder.gtkui import flattr
+from gpodder.gtkui import shownotes
 
 from gpodder.dbusproxy import DBusPodcastsProxy
 from gpodder import extensions
 
 
 macapp = None
-if gpodder.osx and getattr(gtk.gdk, 'WINDOWING', 'x11') == 'quartz':
+if gpodder.ui.osx and getattr(gtk.gdk, 'WINDOWING', 'x11') == 'quartz':
     try:
-        from gtk_osxapplication import *
-        macapp = OSXApplication()
+        from gtkosx_application import *
+        macapp = Application()
     except ImportError:
         print >> sys.stderr, """
-        Warning: gtk-mac-integration not found, disabling native menus 
+        Warning: gtk-mac-integration not found, disabling native menus
         """
 
 
@@ -119,7 +119,7 @@
         self.model = self.core.model
         self.flattr = self.core.flattr
         BuilderWidget.__init__(self, None)
-    
+
     def new(self):
         gpodder.user_extensions.on_ui_object_available('gpodder-gtk', self)
         self.toolbar.set_property('visible', self.config.show_toolbar)
@@ -128,7 +128,7 @@
 
         self.config.connect_gtk_window(self.main_window, 'main_window')
 
-        self.config.connect_gtk_paned('paned_position', self.channelPaned)
+        self.config.connect_gtk_paned('ui.gtk.state.main_window.paned_position', self.channelPaned)
 
         self.main_window.show()
 
@@ -139,7 +139,34 @@
         self.episode_columns_menu = None
         self.config.add_observer(self.on_config_changed)
 
-        self.episode_shownotes_window = None
+        self.sw_shownotes = gtk.ScrolledWindow()
+        self.sw_shownotes.set_shadow_type(gtk.SHADOW_IN)
+        self.sw_shownotes.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+
+        # Vertical paned for the episode list and shownotes
+        self.vpaned = gtk.VPaned()
+        paned = self.vbox_episode_list.get_parent()
+        self.vbox_episode_list.reparent(self.vpaned)
+        self.vpaned.child_set_property(self.vbox_episode_list, 'resize', True)
+        self.vpaned.child_set_property(self.vbox_episode_list, 'shrink', False)
+        self.vpaned.pack2(self.sw_shownotes, resize=False, shrink=False)
+        self.vpaned.show()
+
+        # Minimum height for both episode list and shownotes
+        self.vbox_episode_list.set_size_request(-1, 100)
+        self.sw_shownotes.set_size_request(-1, 100)
+
+        self.config.connect_gtk_paned('ui.gtk.state.main_window.episode_list_size',
+                self.vpaned)
+        paned.add2(self.vpaned)
+
+        if self.config.enable_html_shownotes and shownotes.have_webkit:
+            self.shownotes_object = shownotes.gPodderShownotesHTML(self.sw_shownotes)
+        else:
+            self.shownotes_object = shownotes.gPodderShownotesText(self.sw_shownotes)
+
+        self.sw_shownotes.hide()
+
         self.new_episodes_window = None
 
         # Mac OS X-specific UI tweaks: Native main menu integration
@@ -210,6 +237,9 @@
         self.active_channel = None
         self.channels = self.model.get_podcasts()
 
+        # Set up the first instance of MygPoClient
+        self.mygpo_client = my.MygPoClient(self.config)
+
         gpodder.user_extensions.on_ui_initialized(self.model,
                 self.extensions_podcast_update_cb,
                 self.extensions_episode_download_cb)
@@ -218,9 +248,6 @@
         self.user_apps_reader = UserAppsReader(['audio', 'video'])
         util.run_in_background(self.user_apps_reader.read)
 
-        # Set up the first instance of MygPoClient
-        self.mygpo_client = my.MygPoClient(self.config)
-
         # Now, update the feed cache, when everything's in place
         self.btnUpdateFeeds.show()
         self.feed_cache_update_cancelled = False
@@ -237,7 +264,7 @@
             self.restart_auto_update_timer()
 
         # Find expired (old) episodes and delete them
-        old_episodes = list(self.get_expired_episodes())
+        old_episodes = list(common.get_expired_episodes(self.channels, self.config))
         if len(old_episodes) > 0:
             self.delete_episode_list(old_episodes, confirm=False)
             updated_urls = set(e.channel.url for e in old_episodes)
@@ -413,7 +440,11 @@
         self.mygpo_client.confirm_received_actions(ignored)
 
         def execute_podcast_actions(selected):
-            add_list = [c.action.url for c in selected if c.action.is_add]
+            # In the future, we might retrieve the title from gpodder.net here,
+            # but for now, we just use "None" to use the feed-provided title
+            title = None
+            add_list = [(title, c.action.url)
+                    for c in selected if c.action.is_add]
             remove_list = [c.podcast for c in selected if c.action.is_remove]
 
             # Apply the accepted changes locally
@@ -851,7 +882,10 @@
             if event.keyval == gtk.keysyms.Left:
                 self.treeChannels.grab_focus()
             elif event.keyval == gtk.keysyms.Escape:
-                self.hide_episode_search()
+                if self.hbox_search_episodes.get_property('visible'):
+                    self.hide_episode_search()
+                else:
+                    self.sw_shownotes.hide()
             elif event.state & gtk.gdk.CONTROL_MASK:
                 # Don't handle type-ahead when control is pressed (so shortcuts
                 # with the Ctrl key still work, e.g. Ctrl+A, ...)
@@ -885,14 +919,12 @@
         # Update the toolbar buttons
         self.play_or_download()
 
-        if (self.episode_shownotes_window is not None and
-                self.episode_shownotes_window.episode is not None):
-            rows = selection.count_selected_rows()
-            if rows != 1:
-                self.episode_shownotes_window.on_close_button_clicked()
-            else:
-                episode = self.get_selected_episodes()[0]
-                self.show_episode_shownotes(episode)
+        rows = selection.count_selected_rows()
+        if rows != 1:
+            self.shownotes_object.set_episode(None)
+        elif self.sw_shownotes.get_property('visible'):
+            episode = self.get_selected_episodes()[0]
+            self.shownotes_object.set_episode(episode)
 
     def init_download_list_treeview(self):
         # enable multiple selection support
@@ -1007,12 +1039,6 @@
         # Tell the podcasts tab to update icons for our removed podcasts
         self.update_episode_list_icons(changed_episode_urls)
 
-        # Tell the shownotes window that we have removed the episode
-        if self.episode_shownotes_window is not None and \
-                self.episode_shownotes_window.episode is not None and \
-                self.episode_shownotes_window.episode.url in changed_episode_urls:
-            self.episode_shownotes_window._download_status_changed(None)
-
         # Update the downloads list one more time
         self.update_downloads_list(can_call_cleanup=False)
 
@@ -1047,15 +1073,6 @@
             # Keep a list of all download tasks that we've seen
             download_tasks_seen = set()
 
-            # Remember the DownloadTask object for the episode that
-            # has been opened in the episode shownotes dialog (if any)
-            if self.episode_shownotes_window is not None:
-                shownotes_episode = self.episode_shownotes_window.episode
-                shownotes_task = None
-            else:
-                shownotes_episode = None
-                shownotes_task = None
-
             # Do not go through the list of the model is not (yet) available
             if model is None:
                 model = ()
@@ -1073,10 +1090,6 @@

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/model.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/model.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/opml.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/opml.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,12 +29,13 @@
 import urllib
 
 class OpmlListModel(gtk.ListStore):
-    C_SELECTED, C_DESCRIPTION_MARKUP, C_URL = range(3)
+    C_SELECTED, C_TITLE, C_DESCRIPTION_MARKUP, C_URL = range(4)
 
     def __init__(self, importer):
-        gtk.ListStore.__init__(self, bool, str, str)
+        gtk.ListStore.__init__(self, bool, str, str, str)
         for channel in importer.items:
-            self.append([False, self._format_channel(channel), channel['url']])
+            self.append([False, channel['title'],
+                self._format_channel(channel), channel['url']])
 
     def _format_channel(self, channel):
         title = cgi.escape(urllib.unquote_plus(channel['title']))

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/services.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/services.py Changed

gpodder-3.5.0.tar.gz/src/gpodder/gtkui/shownotes.py Added

@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import gtk
+import gtk.gdk
+import gobject
+import pango
+import os
+import cgi
+
+
+import gpodder
+
+_ = gpodder.gettext
+
+import logging
+logger = logging.getLogger(__name__)
+
+from gpodder import util
+
+
+try:
+    import webkit
+    webview_signals = gobject.signal_list_names(webkit.WebView)
+    if 'navigation-policy-decision-requested' in webview_signals:
+        have_webkit = True
+    else:
+        logger.warn('Your WebKit is too old (gPodder bug 1001).')
+        have_webkit = False
+except ImportError:
+    have_webkit = False
+
+
+class gPodderShownotes:
+    def __init__(self, scrolled_window):
+        self.scrolled_window = scrolled_window
+        self.scrolled_window.add(self.init())
+        self.scrolled_window.show_all()
+
+    def set_episode(self, episode):
+        if episode is None:
+            self.clear()
+            self.scrolled_window.hide()
+        else:
+            heading = episode.title
+            subheading = _('from %s') % (episode.channel.title)
+            self.update(heading, subheading, episode)
+            self.scrolled_window.show()
+
+
+class gPodderShownotesText(gPodderShownotes):
+    def init(self):
+        self.text_view = gtk.TextView()
+        self.text_view.set_wrap_mode(gtk.WRAP_WORD_CHAR)
+        self.text_view.set_border_width(10)
+        self.text_view.set_editable(False)
+        self.text_buffer = gtk.TextBuffer()
+        self.text_buffer.create_tag('heading', scale=pango.SCALE_LARGE, weight=pango.WEIGHT_BOLD)
+        self.text_buffer.create_tag('subheading', scale=pango.SCALE_SMALL)
+        self.text_view.set_buffer(self.text_buffer)
+        self.text_view.modify_bg(gtk.STATE_NORMAL,
+                gtk.gdk.color_parse('#ffffff'))
+        return self.text_view
+
+    def clear(self):
+        self.text_buffer.set_text('')
+
+    def update(self, heading, subheading, episode):
+        self.text_buffer.set_text('')
+        self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), heading, 'heading')
+        self.text_buffer.insert_at_cursor('\n')
+        self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), subheading, 'subheading')
+        self.text_buffer.insert_at_cursor('\n\n')
+        self.text_buffer.insert(self.text_buffer.get_end_iter(), util.remove_html_tags(episode.description))
+        self.text_buffer.place_cursor(self.text_buffer.get_start_iter())
+
+
+class gPodderShownotesHTML(gPodderShownotes):
+    SHOWNOTES_HTML_TEMPLATE = """
+    <html>
+      <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+      </head>
+      <body>
+        <span style="font-size: big; font-weight: bold;">%s</span>
+        <br>
+        <span style="font-size: small;">%s (%s)</span>
+        <hr style="border: 1px #eeeeee solid;">
+        <p>%s</p>
+      </body>
+    </html>
+    """
+
+    def init(self):
+        self.html_view = webkit.WebView()
+        self.html_view.connect('navigation-policy-decision-requested',
+                self._navigation_policy_decision)
+        self.html_view.load_html_string('', '')
+        return self.html_view
+
+    def _navigation_policy_decision(self, wv, fr, req, action, decision):
+        REASON_LINK_CLICKED, REASON_OTHER = 0, 5
+        if action.get_reason() == REASON_LINK_CLICKED:
+            util.open_website(req.get_uri())
+            decision.ignore()
+        elif action.get_reason() == REASON_OTHER:
+            decision.use()
+        else:
+            decision.ignore()
+
+    def clear(self):
+        self.html_view.load_html_string('', '')
+
+    def update(self, heading, subheading, episode):
+        html = self.SHOWNOTES_HTML_TEMPLATE % (
+                cgi.escape(heading),
+                cgi.escape(subheading),
+                episode.get_play_info_string(),
+                episode.description_html,
+        )
+        url = os.path.dirname(episode.channel.url)
+        self.html_view.load_html_string(html, url)
+

gpodder-3.3.0.tar.gz/src/gpodder/gtkui/widgets.py -> gpodder-3.5.0.tar.gz/src/gpodder/gtkui/widgets.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/jsonconfig.py -> gpodder-3.5.0.tar.gz/src/gpodder/jsonconfig.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/log.py -> gpodder-3.5.0.tar.gz/src/gpodder/log.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/minidb.py -> gpodder-3.5.0.tar.gz/src/gpodder/minidb.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/model.py -> gpodder-3.5.0.tar.gz/src/gpodder/model.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 # Copyright (c) 2011 Neal H. Walfield
 #
 # gPodder is free software; you can redistribute it and/or modify
@@ -113,7 +113,7 @@
     A generic base class for our podcast model providing common helper
     and utility functions.
     """
-    __slots__ = ('id', 'parent', 'children', 'changed')
+    __slots__ = ('id', 'parent', 'children')
 
     @classmethod
     def create_from_dict(cls, d, *args):
@@ -123,41 +123,12 @@
         """
         o = cls(*args)
 
-        o.changed = None
-
         # XXX: all(map(lambda k: hasattr(o, k), d))?
         for k, v in d.iteritems():
             setattr(o, k, v)
 
-        o.changed = {}
-
         return o
 
-    def __setattr__(self, name, value):
-        """Track changes once "self.changed" is a dictionary
-
-        The changed values will be stored in self.changed until
-        _clear_changes is called.
-        """
-        if getattr(self, 'changed', None) is not None and self.id is not None:
-            old_value = getattr(self, name, None)
-
-            if old_value is not None and value != old_value:
-                # Value changed (and it is not an initialization)
-                if name not in self.changed:
-                    self.changed[name] = old_value
-                # logger.debug("%s: %s.%s changed: %s -> %s"
-                #              % (self.__class__.__name__, self.id, name,
-                #                 old_value, value))
-
-        super(PodcastModelObject, self).__setattr__(name, value)
-
-    def _clear_changes(self):
-        # logger.debug("Changes: %s: %s"
-        #              % ([getattr (self, a) for a in self.__slots__],
-        #                 str(self.changed),))
-        self.changed = {}
-
 class PodcastEpisode(PodcastModelObject):
     """holds data for one object in a channel"""
     MAX_FILENAME_LENGTH = 200
@@ -170,15 +141,6 @@
     is_played = property(fget=_deprecated, fset=_deprecated)
     is_locked = property(fget=_deprecated, fset=_deprecated)
 
-    def _get_podcast_id(self):
-        return self.channel.id
-
-    def _set_podcast_id(self, podcast_id):
-        assert self.channel.id == podcast_id
-
-    # Accessor for the "podcast_id" DB column
-    podcast_id = property(fget=_get_podcast_id, fset=_set_podcast_id)
-
     def has_website_link(self):
         return bool(self.link) and (self.link != self.url or \
                 youtube.is_video_link(self.link))
@@ -197,6 +159,10 @@
         else:
             episode.description = entry.get('summary', '')
 
+        # Fallback to subtitle if summary is not available
+        if not episode.description:
+            episode.description = entry.get('subtitle', '')
+
         try:
             total_time = 0
 
@@ -217,10 +183,6 @@
         except:
             pass
 
-        # Fallback to subtitle if summary is not available0
-        if not episode.description:
-            episode.description = entry.get('subtitle', '')
-
         episode.published = feedcore.get_pubdate(entry)
 
         enclosures = entry.get('enclosures', [])
@@ -324,18 +286,11 @@
             if file_type is not None:
                 return episode
 
-        # Scan MP3 links in description text
-        mp3s = re.compile(r'http://[^"]*\.mp3')
-        for content in entry.get('content', ()):
-            html = content.value
-            for match in mp3s.finditer(html):
-                episode.url = match.group(0)
-                return episode
-
         return None
 
     def __init__(self, channel):
         self.parent = channel
+        self.podcast_id = self.parent.id
         self.children = (None, None)
 
         self.id = None
@@ -434,9 +389,6 @@
 
     def save(self):
         gpodder.user_extensions.on_episode_save(self)
-
-        self._clear_changes()
-
         self.db.save_episode(self)
 
     def on_downloaded(self, filename):
@@ -452,6 +404,7 @@
     def playback_mark(self):
         self.is_new = False
         self.last_playback = int(time.time())
+        gpodder.user_extensions.on_episode_playback(self)
         self.save()
 
     def mark(self, state=None, is_played=None, is_locked=None):
@@ -510,7 +463,7 @@
 
         self.set_state(gpodder.STATE_DELETED)
 
-    def get_playback_url(self, fmt_id=None, allow_partial=False):
+    def get_playback_url(self, fmt_ids=None, allow_partial=False):
         """Local (or remote) playback/streaming filename/URL
 
         Returns either the local filename or a streaming URL that
@@ -527,7 +480,7 @@
 
         if url is None or not os.path.exists(url):
             url = self.url
-            url = youtube.get_real_download_url(url, fmt_id)
+            url = youtube.get_real_download_url(url, fmt_ids)
             url = vimeo.get_real_download_url(url)
 
         return url
@@ -602,8 +555,10 @@
                 episode_filename, _ = util.filename_from_url(url)
                 fn_template = util.sanitize_filename(episode_filename, self.MAX_FILENAME_LENGTH)
 
-            # Use title for YouTube downloads and Soundcloud streams
-            if youtube.is_video_link(self.url) or fn_template == 'stream':
+            # Use title for YouTube, Vimeo and Soundcloud downloads
+            if (youtube.is_video_link(self.url) or
+                    vimeo.is_video_link(self.url) or
+                    fn_template == 'stream'):
                 sanitized = util.sanitize_filename(self.title, self.MAX_FILENAME_LENGTH)
                 if sanitized:
                     fn_template = sanitized
@@ -644,12 +599,6 @@
         return os.path.join(util.sanitize_encoding(self.channel.save_dir),
                 util.sanitize_encoding(self.download_filename))
 
-    def set_mimetype(self, mimetype, commit=False):
-        """Sets the mimetype for this episode"""
-        self.mime_type = mimetype
-        if commit:
-            self.db.commit()
-
     def extension(self, may_call_local_filename=True):
         filename, ext = util.filename_from_url(self.url)
         if may_call_local_filename:
@@ -730,22 +679,27 @@
             return '(%s)' % _('unknown')
         else:
             return result
-    
+
     pubdate_prop = property(fget=cute_pubdate)
 
+    def published_datetime(self):
+        return datetime.datetime.fromtimestamp(self.published)
+
     @property
     def sortdate(self):
-	    return str(datetime.datetime.fromtimestamp(self.published).strftime('%F'))
+        return self.published_datetime().strftime('%F')
 
-    def calculate_filesize(self):
-        filename = self.local_filename(create=False)
-        if filename is None:
-            return

gpodder-3.3.0.tar.gz/src/gpodder/my.py -> gpodder-3.5.0.tar.gz/src/gpodder/my.py Changed

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@
 import mygpoclient
 mygpoclient.user_agent += ' ' + gpodder.user_agent
 
+# 2013-02-08: We should update this to 1.7 once we use the new features
 MYGPOCLIENT_REQUIRED = '1.4'
 
 if not hasattr(mygpoclient, 'require_version') or \
@@ -57,6 +58,15 @@
     """ % (MYGPOCLIENT_REQUIRED, mygpoclient.__version__)
     sys.exit(1)
 
+try:
+    from mygpoclient.simple import MissingCredentials
+
+except ImportError:
+    # if MissingCredentials does not yet exist in the installed version of
+    # mygpoclient, we use an object that can never be raised/caught
+    MissingCredentials = object()
+
+
 from mygpoclient import api
 from mygpoclient import public
 
@@ -64,6 +74,7 @@
 
 EXAMPLES_OPML = 'http://gpodder.org/directory.opml'
 TOPLIST_OPML = 'http://gpodder.org/toplist.opml'
+EPISODE_ACTIONS_BATCH_SIZE=100
 
 # Database model classes
 class SinceValue(object):
@@ -489,21 +500,38 @@
 
                 # Save the "since" value for later use
                 self._store.update(since_o, since=changes.since)
+
+            except MissingCredentials:
+                # handle outside
+                raise
+
             except Exception, e:
                 logger.warn('Exception while polling for episodes.', exc_info=True)
 
             # Step 2: Upload Episode actions
 
-            # Convert actions to the mygpoclient format for uploading
-            episode_actions = [convert_to_api(a) for a in actions]
+            # Uploads are done in batches; uploading can resume if only parts
+            # be uploaded; avoids empty uploads as well
+            for lower in range(0, len(actions), EPISODE_ACTIONS_BATCH_SIZE):
+                batch = actions[lower:lower+EPISODE_ACTIONS_BATCH_SIZE]
 
-            # Upload the episode actions
-            self._client.upload_episode_actions(episode_actions)
+                # Convert actions to the mygpoclient format for uploading
+                episode_actions = [convert_to_api(a) for a in batch]
+
+                # Upload the episode actions
+                self._client.upload_episode_actions(episode_actions)
+
+                # Actions have been uploaded to the server - remove them
+                self._store.remove(batch)
 
-            # Actions have been uploaded to the server - remove them
-            self._store.remove(actions)
             logger.debug('Episode actions have been uploaded to the server.')
             return True
+
+        except MissingCredentials:
+            logger.warn('No credentials configured. Disabling gpodder.net.')
+            self._config.mygpo.enabled = False
+            return False
+
         except Exception, e:
             logger.error('Cannot upload episode actions: %s', str(e), exc_info=True)
             return False
@@ -563,6 +591,12 @@
             self._store.remove(actions)
             logger.debug('All actions have been uploaded to the server.')
             return True
+
+        except MissingCredentials:
+            logger.warn('No credentials configured. Disabling gpodder.net.')
+            self._config.mygpo.enabled = False
+            return False
+
         except Exception, e:
             logger.error('Cannot upload subscriptions: %s', str(e), exc_info=True)
             return False
@@ -574,6 +608,12 @@
                     action.caption, action.device_type)
             logger.debug('Device settings uploaded.')
             return True
+
+        except MissingCredentials:
+            logger.warn('No credentials configured. Disabling gpodder.net.')
+            self._config.mygpo.enabled = False
+            return False
+
         except Exception, e:
             logger.error('Cannot update device %s: %s', self.device_id,
                 str(e), exc_info=True)
@@ -581,7 +621,16 @@
 
     def get_devices(self):
         result = []
-        for d in self._client.get_devices():
+
+        try:
+            devices = self._client.get_devices()
+
+        except MissingCredentials:
+            logger.warn('No credentials configured. Disabling gpodder.net.')
+            self._config.mygpo.enabled = False
+            raise
+
+        for d in devices:
             result.append((d.device_id, d.caption, d.type))
         return result

gpodder-3.3.0.tar.gz/src/gpodder/opml.py -> gpodder-3.5.0.tar.gz/src/gpodder/opml.py Changed

gpodder-3.5.0.tar.gz/src/gpodder/pipe Added

gpodder-3.5.0.tar.gz/src/gpodder/pipe/__init__.py Added

@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# gpodder.pipe - Socket/pipe-based backend for New UIs
+# Thomas Perl <thp@gpodder.org>; 2012-11-24
+
+
+import gpodder
+
+from gpodder import core
+from gpodder import model
+from gpodder import util
+from gpodder import coverart
+
+try:
+    # For Python < 2.6, we use the "simplejson" add-on module
+    import simplejson as json
+except ImportError:
+    # Python 2.6 already ships with a nice "json" module
+    import json
+
+import os
+import re
+import sys
+import threading
+import Queue
+import time
+import fcntl
+
+def cmd(*signature):
+    def wrapper(f):
+        setattr(f, '_pipecmd', True)
+        return f
+    return wrapper
+
+def to_json(o):
+    keys = list(('id',) + o.__slots__)
+    values = list(getattr(o, key) for key in keys)
+    yield keys
+    yield values
+
+class PipeError(BaseException): pass
+
+class Pipe:
+    def __init__(self, core, reader, writer):
+        self.core = core
+
+        self.model = self.core.model
+        self.cover_download = coverart.CoverDownloader()
+
+        self.reader = reader
+        self.writer = writer
+        self.events_in = Queue.Queue()
+        self.events_out = Queue.Queue()
+
+    def event_writer_proc(self):
+        while True:
+            item = self.events_out.get(True)
+            self.writer.write(item.encode('utf-8') + '\n')
+            self.writer.flush()
+
+    def event_reader_proc(self):
+        while True:
+            args = self.events_in.get(True)
+            cmd = args.pop(0)
+            func = getattr(self, cmd, None)
+            if func is not None:
+                if getattr(func, '_pipecmd', False):
+                    try:
+                        result = func(*args)
+                        if result:
+                            self.event_out(result)
+                    except PipeError, e:
+                        self.event_out('! %s' % e)
+                    except Exception, e:
+                        print >>sys.stderr, 'FAIL:', e
+                        self.event_out('! %s' % e)
+                        raise
+                    continue
+
+            self.event_out('? %s' % cmd)
+
+    def event_in(self, data):
+        self.events_in.put(data)
+
+    def event_out(self, data):
+        self.events_out.put(data)
+
+    def find_episode(self, id):
+        for podcast in self.model.get_podcasts():
+            for episode in podcast.get_all_episodes():
+                if episode.id == int(id):
+                    return episode
+        raise PipeError('episode not found')
+
+    def find_podcast(self, id):
+        for podcast in self.model.get_podcasts():
+            if podcast.id == int(id):
+                return podcast
+        raise PipeError('podcast not found')
+
+    def summarize_podcasts(self, podcasts):
+        yield ('id', 'title', 'downloads', 'cover')
+        for podcast in podcasts:
+            total, deleted, new, downloaded, unplayed = podcast.get_statistics()
+            cover_filename = self.cover_download.get_cover(podcast.cover_file,
+                    podcast.cover_url, podcast.url, podcast.title,
+                    podcast.auth_username, podcast.auth_password, False)
+            yield (podcast.id, podcast.title, downloaded, cover_filename)
+
+    def summarize_episodes(self, episodes):
+        yield ('id', 'title', 'state')
+        for episode in episodes:
+            yield (episode.id, episode.title, episode.state)
+
+    def serialize(self, data):
+        return json.dumps(list(data), ensure_ascii=False)
+
+    @cmd()
+    def podcasts(self):
+        return 'podcasts ' + self.serialize(self.summarize_podcasts(self.model.get_podcasts()))
+
+    @cmd(int)
+    def episodes(self, id):
+        podcast = self.find_podcast(id)
+        return 'episodes ' + id + ' ' + self.serialize(self.summarize_episodes(podcast.get_all_episodes()))
+
+    @cmd(int)
+    def episode(self, id):
+        episode = self.find_episode(id)
+        return 'episode ' + id + ' ' + self.serialize(to_json(episode))
+
+    @cmd(int)
+    def podcast(self, id):
+        podcast = self.find_podcast(id)
+        return 'podcast ' + id + ' ' + self.serialize(to_json(podcast))
+
+    @cmd()
+    def update_all(self):
+        @util.run_in_background
+        def update_proc():
+            for podcast in self.model.get_podcasts():
+                self.event_out('updating %d' % podcast.id)
+                podcast.update()
+                self.event_out('updated %d' % podcast.id)
+            self.event_out('updated_all')
+
+    @cmd(int)
+    def update(self, id):
+        @util.run_in_background
+        def update_proc():
+            podcast = self.find_podcast(id)
+            self.event_out('updating %d' % podcast.id)
+            podcast.update()
+            self.event_out('updated %d' % podcast.id)
+
+    def run(self):
+        def post_random_events():
+            while True:
+                time.sleep(1)
+                self.event_out('hello')
+                time.sleep(2)
+                self.event_out('hello 10')
+        random_event_thread = threading.Thread(target=post_random_events)
+        random_event_thread.setDaemon(True)
+        #random_event_thread.start()
+
+        reader_thread = threading.Thread(target=self.event_reader_proc)
+        writer_thread = threading.Thread(target=self.event_writer_proc)
+        reader_thread.setDaemon(True)
+        writer_thread.setDaemon(True)
+        reader_thread.start()
+        writer_thread.start()
+
+        while True:
+            line = self.reader.readline()
+            if not line:
+                break
+            line = line.rstrip()
+            if line:
+                self.event_in(line.split())
+
+def main(core):

gpodder-3.3.0.tar.gz/src/gpodder/player.py -> gpodder-3.5.0.tar.gz/src/gpodder/player.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/plugins/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/plugins/__init__.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/plugins/soundcloud.py -> gpodder-3.5.0.tar.gz/src/gpodder/plugins/soundcloud.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/plugins/xspf.py -> gpodder-3.5.0.tar.gz/src/gpodder/plugins/xspf.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/qmlui/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/qmlui/__init__.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 import os
 import signal
 import functools
+import itertools
 import subprocess
 
 import dbus
@@ -72,6 +73,10 @@
     (_('Unplayed downloads'), 'downloaded and not played'),
 ]
 
+EPISODE_LIST_LIMIT = 200
+
+def grouped(iterable, n):
+    return itertools.izip(*[iter(iterable)]*n)
 
 class ConfigProxy(QObject):
     def __init__(self, config):
@@ -132,6 +137,30 @@
         self.root.config.add_observer(self.on_config_changed)
         self._flattr = self.root.core.flattr
         self.flattr_button_text = u''
+        self._busy = False
+        self.updating_podcasts = 0
+        self.current_episode = None
+
+
+    # Upcalls to the GUI
+    episodeUpdated = Signal(int)
+
+    showMessage = Signal(unicode)
+    showInputDialog = Signal(unicode, unicode, unicode, unicode, bool)
+    openContextMenu = Signal('QVariant')
+
+    startProgress = Signal(unicode)
+    endProgress = Signal()
+
+    clearEpisodeListModel = Signal()
+    setEpisodeListModel = Signal()
+
+    enqueueEpisode = Signal(QObject)
+    removeQueuedEpisode = Signal(QObject)
+    removeQueuedEpisodesForPodcast = Signal(QObject)
+
+    shutdown = Signal()
+
 
     def on_config_changed(self, name, old_value, new_value):
         logger.info('Config changed: %s (%s -> %s)', name,
@@ -145,6 +174,18 @@
         elif name == 'mygpo.device.caption':
             self.myGpoDeviceCaptionChanged.emit()
 
+    busyChanged = Signal()
+
+    def getBusy(self):
+        return self._busy
+
+    def setBusy(self, busy):
+        if self._busy != busy:
+            self._busy = busy
+            self.busyChanged.emit()
+
+    busy = Property(bool, getBusy, setBusy, notify=busyChanged)
+
     episodeListTitleChanged = Signal()
 
     def setEpisodeListTitle(self, title):
@@ -217,10 +258,10 @@
         if not episode.payment_url:
             return
         if not self._flattr.has_token():
-            self.root.show_message(_('Sign in to Flattr in the settings.'))
+            self.showMessage.emit(_('Sign in to Flattr in the settings.'))
             return
 
-        self.root.start_progress(_('Flattring episode...'))
+        self.startProgress.emit(_('Flattring episode...'))
 
         @util.run_in_background
         def flattr_episode():
@@ -229,9 +270,9 @@
                 if success:
                     self.updateFlattrButtonText(qepisode)
                 else:
-                    self.root.show_message(message)
+                    self.showMessage.emit(message)
             finally:
-                self.root.end_progress()
+                self.endProgress.emit()
 
     @Slot(result=str)
     def getFlattrLoginURL(self):
@@ -244,7 +285,7 @@
     @Slot(str)
     def processFlattrCode(self, url):
         if not self._flattr.process_retrieved_code(url):
-            self.root.show_message(_('Could not log in to Flattr.'))
+            self.showMessage.emit(_('Could not log in to Flattr.'))
 
     @Slot(result='QStringList')
     def getEpisodeListFilterNames(self):
@@ -256,18 +297,20 @@
             return
 
         count = len(selected)
-        episodes = map(self.root.episode_model.get_object_by_index, selected)
+        episodes = map(lambda idx: self.root.episode_model._filtered[idx], selected)
 
         def delete():
             for episode in episodes:
                 if not episode.qarchive:
                     episode.delete_episode()
+                    self.episodeUpdated.emit(episode.id)
             self.update_subset_stats()
             self.root.mygpo_client.on_delete(episodes)
             self.root.mygpo_client.flush()
             for episode in episodes:
-                self.root.on_episode_deleted(episode)
-            self.root.episode_model.sort()
+                self.removeQueuedEpisode.emit(episode)
+
+            util.run_in_background(self.root.episode_model.sort)
 
         if action == 'delete':
             msg = N_('Delete %(count)d episode?', 'Delete %(count)d episodes?', count) % {'count':count}
@@ -277,12 +320,13 @@
                 if episode.qdownloaded:
                     print '    XXX     already downloaded'
                     continue
-                episode.qdownload(self.root.config, self.update_subset_stats)
+                self.downloadEpisode(episode)
             self.root.mygpo_client.on_download(episodes)
             self.root.mygpo_client.flush()
         elif action == 'play':
             for episode in episodes:
-                self.root.enqueue_episode(episode)
+                self.enqueueEpisode.emit(episode)
+                self.episodeUpdated.emit(episode.id)
 
     @Slot(str, result=str)
     def translate(self, x):
@@ -327,6 +371,7 @@
 
     @Slot(QObject, int, int)
     def storePlaybackAction(self, episode, start, end):
+        self.episodeUpdated.emit(episode.id)
         if end - 5 < start:
             logger.info('Ignoring too short playback action.')
             return
@@ -353,7 +398,7 @@
     @Slot(QObject)
     def podcastSelected(self, podcast):
         self.setEpisodeListTitle(podcast.qtitle)
-        self.root.select_podcast(podcast)
+        util.run_in_background(lambda: self.root.select_podcast(podcast))
 
     windowTitleChanged = Signal()
 
@@ -369,16 +414,16 @@
     @Slot()
     def myGpoUploadList(self):
         def upload_proc(self):
-            self.root.start_progress(_('Uploading subscriptions...'))
+            self.startProgress.emit(_('Uploading subscriptions...'))
 
             try:
                 try:
                     self.root.mygpo_client.set_subscriptions([podcast.url
                         for podcast in self.root.podcast_model.get_podcasts()])
                 except Exception, e:
-                    self.root.show_message('\n'.join((_('Error on upload:'), unicode(e))))
+                    self.showMessage.emit('\n'.join((_('Error on upload:'), unicode(e))))
             finally:
-                self.root.end_progress()
+                self.endProgress.emit()
 
         util.run_in_background(lambda: upload_proc(self))
 
@@ -451,10 +496,15 @@
         self.show_context_menu(menu)
 
     def show_context_menu(self, actions):
-        if gpodder.ui.harmattan:
-            actions = filter(lambda a: a.caption != '', actions)
+        actions = filter(lambda a: a.caption != '', actions)
         self.context_menu_actions = actions
-        self.root.open_context_menu(self.context_menu_actions)
+        self.openContextMenu.emit(self.context_menu_actions)
+

gpodder-3.3.0.tar.gz/src/gpodder/qmlui/helper.py -> gpodder-3.5.0.tar.gz/src/gpodder/qmlui/helper.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,38 +44,6 @@
     caption = QtCore.Property(unicode, _get_caption, notify=changed)
 
 
-class QObjectProxy(object):
-    """Proxy for accessing properties and slots as attributes
-
-    This class acts as a proxy for the object for which it is
-    created, and makes property access more Pythonic while
-    still allowing access to slots (as member functions).
-
-    Attribute names starting with '_' are not proxied.
-    """
-
-    def __init__(self, root_object):
-        self._root_object = root_object
-        m = self._root_object.metaObject()
-        self._properties = [m.property(i).name() \
-                for i in range(m.propertyCount())]
-
-    def __getattr__(self, key):
-        value = self._root_object.property(key)
-
-        # No such property, so assume we call a slot
-        if value is None and key not in self._properties:
-            return getattr(self._root_object, key)
-
-        return value
-
-    def __setattr__(self, key, value):
-        if key.startswith('_'):
-            object.__setattr__(self, key, value)
-        else:
-            self._root_object.setProperty(key, value)
-
-
 class MediaButtonsHandler(QtCore.QObject):
     def __init__(self):
         QtCore.QObject.__init__(self)

gpodder-3.3.0.tar.gz/src/gpodder/qmlui/images.py -> gpodder-3.5.0.tar.gz/src/gpodder/qmlui/images.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/qmlui/model.py -> gpodder-3.5.0.tar.gz/src/gpodder/qmlui/model.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
 from gpodder import coverart
 
 import os
+import urllib
 
 convert = util.convert_bytes
 
@@ -155,7 +156,7 @@
 
     qprogress = Property(float, _progress, notify=changed)
 
-    def qdownload(self, config, finished_callback=None):
+    def qdownload(self, config, finished_callback=None, progress_callback=None):
         # Avoid starting the same download twice
         if self.download_task is not None:
             return
@@ -167,19 +168,25 @@
         task = download.DownloadTask(self._episode, config)
         task.status = download.DownloadTask.QUEUED
         self.changed.emit()
+        if progress_callback is not None:
+            progress_callback(self.id)
 
         def t(self):
             def cb(progress):
                 if progress > self._qt_download_progress + .01 or progress == 1:
                     self._qt_download_progress = progress
                     self.changed.emit()
+                    if progress_callback is not None:
+                        progress_callback(self.id)
             task.add_progress_callback(cb)
             task.run()
             task.recycle()
             task.removed_from_list()
-            self.changed.emit()
             self.source_url_changed.emit()
 
+            if progress_callback is not None:
+                progress_callback(self.id)
+
             # Make sure the single channel is updated (main view)
             self._podcast.changed.emit()
 
@@ -306,6 +313,17 @@
 
     qcoverurl = Property(unicode, _coverurl, notify=changed)
 
+    def _coverart(self):
+        quote = lambda x: convert(x) if x else u''
+        return convert(u'image://cover/%s|%s|%s|%s' % (
+            quote(self._podcast.cover_file),
+            quote(self._podcast.cover_url),
+            quote(self._podcast.url),
+            quote(self._podcast.title),
+        ))
+
+    qcoverart = Property(unicode, _coverart, notify=changed)
+
     def _downloaded(self):
         return self._podcast.get_statistics()[3]
 
@@ -419,6 +437,17 @@
     qcoverurl = Property(unicode, _return_empty, notify=changed)
     qsection = Property(unicode, _return_empty, notify=changed)
 
+    def _coverart(self):
+        quote = lambda x: convert(x) if x else u''
+        return convert(u'image://cover/%s|%s|%s|%s' % (
+            quote(coverart.CoverDownloader.ALL_EPISODES_ID),
+            u'',
+            u'',
+            quote(self.title),
+        ))
+
+    qcoverart = Property(unicode, _coverart, notify=changed)
+
     def _title(self):
         return convert(self.title)

gpodder-3.3.0.tar.gz/src/gpodder/query.py -> gpodder-3.5.0.tar.gz/src/gpodder/query.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/schema.py -> gpodder-3.5.0.tar.gz/src/gpodder/schema.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,9 +61,11 @@
     'pause_subscription',
     'section',
     'payment_url',
+    'download_strategy',
+    'sync_to_mp3_player',
 )
 
-CURRENT_VERSION = 3
+CURRENT_VERSION = 5
 
 
 # SQL commands to upgrade old database versions to new ones
@@ -82,6 +84,16 @@
         ALTER TABLE episode ADD COLUMN payment_url TEXT NULL DEFAULT NULL
         UPDATE podcast SET http_last_modified=NULL, http_etag=NULL
         """),
+
+        # Version 4: Per-podcast download strategy management
+        (3, 4, """
+        ALTER TABLE podcast ADD COLUMN download_strategy INTEGER NOT NULL DEFAULT 0
+        """),
+
+        # Version 5: Per-podcast MP3 player device synchronization option
+        (4, 5, """
+        ALTER TABLE podcast ADD COLUMN sync_to_mp3_player INTEGER NOT NULL DEFAULT 1
+        """)
 ]
 
 def initialize_database(db):
@@ -102,7 +114,9 @@
         download_folder TEXT NOT NULL DEFAULT '',
         pause_subscription INTEGER NOT NULL DEFAULT 0,
         section TEXT NOT NULL DEFAULT '',
-        payment_url TEXT NULL DEFAULT NULL
+        payment_url TEXT NULL DEFAULT NULL,
+        download_strategy INTEGER NOT NULL DEFAULT 0,
+        sync_to_mp3_player INTEGER NOT NULL DEFAULT 1
     )
     """)
 
@@ -224,6 +238,8 @@
                 not row['feed_update_enabled'],
                 '',
                 None,
+                0,
+                row['sync_to_devices'],
         )
         new_db.execute("""
         INSERT INTO podcast VALUES (%s)

gpodder-3.3.0.tar.gz/src/gpodder/services.py -> gpodder-3.5.0.tar.gz/src/gpodder/services.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/sync.py -> gpodder-3.5.0.tar.gz/src/gpodder/sync.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -196,7 +196,7 @@
 
     def close(self):
         self.notify('status', _('Writing data to disk'))
-        if self._config.device_sync.after_sync.sync_disks and not gpodder.win32:
+        if self._config.device_sync.after_sync.sync_disks and not gpodder.ui.win32:
             os.system('sync')
         else:
             logger.warning('Not syncing disks. Unmount your device before unplugging.')
@@ -213,18 +213,21 @@
             if does_not_exist or exclude_played or wrong_type:
                 logger.info('Excluding %s from sync', track.title)
                 tracklist.remove(track)
-
-        for track in sorted(tracklist, key=lambda e: e.pubdate_prop):
-            if self.cancelled:
-                return False
-
-            # XXX: need to check if track is added properly?
-            sync_task=SyncTask(track)
-
-            sync_task.status=sync_task.QUEUED
-            sync_task.device=self
-            self.download_status_model.register_task(sync_task)
-            self.download_queue_manager.add_task(sync_task)
+        
+        if tracklist:
+            for track in sorted(tracklist, key=lambda e: e.pubdate_prop):
+                if self.cancelled:
+                    return False
+    
+                # XXX: need to check if track is added properly?
+                sync_task=SyncTask(track)
+    
+                sync_task.status=sync_task.QUEUED
+                sync_task.device=self
+                self.download_status_model.register_task(sync_task)
+                self.download_queue_manager.add_task(sync_task)
+        else:
+            logger.warning("No episodes to sync")
 
         return True

gpodder-3.5.0.tar.gz/src/gpodder/test Added

gpodder-3.5.0.tar.gz/src/gpodder/test/__init__.py Added

gpodder-3.5.0.tar.gz/src/gpodder/test/model.py Added

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#
+# gPodder - A media aggregator and podcast client
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
+#
+# gPodder is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# gPodder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# gpodder.test.model - Unit tests for gpodder.model
+# Thomas Perl <thp@gpodder.org>; 2013-02-12
+
+
+import unittest
+
+import gpodder
+
+from gpodder import model
+
+class TestEpisodePublishedProperties(unittest.TestCase):
+    PUBLISHED_UNIXTIME = 1360666744
+    PUBLISHED_SORT = '2013-02-12'
+    PUBLISHED_YEAR = '13'
+    PUBLISHED_MONTH = '02'
+    PUBLISHED_DAY = '12'
+
+    def setUp(self):
+        self.podcast = model.PodcastChannel(None)
+        self.episode = model.PodcastEpisode(self.podcast)
+        self.episode.published = self.PUBLISHED_UNIXTIME
+
+    def test_sortdate(self):
+        self.assertEqual(self.episode.sortdate, self.PUBLISHED_SORT)
+
+    def test_pubdate_year(self):
+        self.assertEqual(self.episode.pubdate_year, self.PUBLISHED_YEAR)
+
+    def test_pubdate_month(self):
+        self.assertEqual(self.episode.pubdate_month, self.PUBLISHED_MONTH)
+
+    def test_pubdate_day(self):
+        self.assertEqual(self.episode.pubdate_day, self.PUBLISHED_DAY)
+

gpodder-3.3.0.tar.gz/src/gpodder/unittests.py -> gpodder-3.5.0.tar.gz/src/gpodder/unittests.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,19 +37,47 @@
     """
     sys.exit(2)
 
-# Which package and which modules in the package should be tested?
+# Main package and test package (for modules in main package)
 package = 'gpodder'
-modules = ['util', 'jsonconfig']
-coverage_modules = []
+test_package = '.'.join((package, 'test'))
 
 suite = unittest.TestSuite()
+coverage_modules = []
+
+
+# Modules (in gpodder) for which doctests exist
+# ex: Doctests embedded in "gpodder.util", coverage reported for "gpodder.util"
+doctest_modules = ['util', 'jsonconfig']
+
+for module in doctest_modules:
+    doctest_mod = __import__('.'.join((package, module)), fromlist=[module])
+
+    suite.addTest(doctest.DocTestSuite(doctest_mod))
+    coverage_modules.append(doctest_mod)
 
-for module in modules:
-    m = __import__('.'.join((package, module)), fromlist=[module])
-    coverage_modules.append(m)
-    suite.addTest(doctest.DocTestSuite(m))
 
-runner = unittest.TextTestRunner(verbosity=2)
+# Modules (in gpodder) for which unit tests (in gpodder.test) exist
+# ex: Tests are in "gpodder.test.model", coverage reported for "gpodder.model"
+test_modules = ['model']
+
+for module in test_modules:
+    test_mod = __import__('.'.join((test_package, module)), fromlist=[module])
+    coverage_mod = __import__('.'.join((package, module)), fromlist=[module])
+
+    suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_mod))
+    coverage_modules.append(coverage_mod)
+
+try:
+    # If you want a HTML-based test report, install HTMLTestRunner from:
+    # http://tungwaiyip.info/software/HTMLTestRunner.html
+    import HTMLTestRunner
+    REPORT_FILENAME = 'test_report.html'
+    runner = HTMLTestRunner.HTMLTestRunner(stream=open(REPORT_FILENAME, 'w'))
+    print """
+    HTML Test Report will be written to %s
+    """ % REPORT_FILENAME
+except ImportError:
+    runner = unittest.TextTestRunner(verbosity=2)
 
 try:
     import coverage

gpodder-3.3.0.tar.gz/src/gpodder/util.py -> gpodder-3.5.0.tar.gz/src/gpodder/util.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 # Copyright (c) 2011 Neal H. Walfield
 #
 # gPodder is free software; you can redistribute it and/or modify
@@ -67,6 +67,13 @@
 import StringIO
 import xml.dom.minidom
 
+if gpodder.ui.win32:
+    try:
+        import win32file
+    except ImportError:
+        logger.warn('Running on Win32 but win32api/win32file not installed.')
+        win32file = None
+
 _ = gpodder.gettext
 N_ = gpodder.ngettext
 
@@ -85,9 +92,9 @@
         lang = os.environ['LANG']
         (language, encoding) = lang.rsplit('.', 1)
         logger.info('Detected encoding: %s', encoding)
-    elif gpodder.ui.harmattan:
+    elif gpodder.ui.harmattan or gpodder.ui.sailfish:
         encoding = 'utf-8'
-    elif gpodder.win32:
+    elif gpodder.ui.win32:
         # To quote http://docs.python.org/howto/unicode.html:
         # ,,on Windows, Python uses the name "mbcs" to refer
         #   to whatever the currently configured encoding is``
@@ -132,6 +139,7 @@
     ('.flv', 'video/x-flv'),
     ('.mkv', 'video/x-matroska'),
     ('.wmv', 'video/x-ms-wmv'),
+    ('.opus', 'audio/opus'),
 ]
 
 _MIME_TYPES = dict((k, v) for v, k in _MIME_TYPE_LIST)
@@ -411,6 +419,19 @@
         return N_('%(count)d day ago', '%(count)d days ago', days) % {'count':days}
 
 
+def is_system_file(filename):
+    """
+    Checks to see if the given file is a system file.
+    """
+    if gpodder.ui.win32 and win32file is not None:
+        result = win32file.GetFileAttributes(filename)
+        #-1 is returned by GetFileAttributes when an error occurs
+        #0x4 is the FILE_ATTRIBUTE_SYSTEM constant
+        return result != -1 and result & 0x4 != 0
+    else:
+        return False
+
+
 def get_free_disk_space_win32(path):
     """
     Win32-specific code to determine the free disk space remaining
@@ -418,18 +439,13 @@
 
     http://mail.python.org/pipermail/python-list/2003-May/203223.html
     """
+    if win32file is None:
+        # Cannot determine free disk space
+        return 0
 
     drive, tail = os.path.splitdrive(path)
-
-    try:
-        import win32file
-        userFree, userTotal, freeOnDisk = win32file.GetDiskFreeSpaceEx(drive)
-        return userFree
-    except ImportError:
-        logger.warn('Running on Win32 but win32api/win32file not installed.')
-
-    # Cannot determine free disk space
-    return 0
+    userFree, userTotal, freeOnDisk = win32file.GetDiskFreeSpaceEx(drive)
+    return userFree
 
 
 def get_free_disk_space(path):
@@ -444,7 +460,7 @@
     if not os.path.exists(path):
         return 0
 
-    if gpodder.win32:
+    if gpodder.ui.win32:
         return get_free_disk_space_win32(path)
 
     s = os.statvfs(path)
@@ -669,7 +685,7 @@
     'audio/mpeg'
     >>> mimetype_from_extension('.mkv')
     'video/x-matroska'
-    >>> mimetype_from_extension('.abc')
+    >>> mimetype_from_extension('._invalid_file_extension_')
     ''
     """
     if extension in _MIME_TYPES_EXT:
@@ -970,7 +986,7 @@
     return urlparse.urlunsplit(url_parts)
 
 
-def urlopen(url, headers=None, data=None):
+def urlopen(url, headers=None, data=None, timeout=None):
     """
     An URL opener with the User-agent set to gPodder (with version)
     """
@@ -991,7 +1007,10 @@
 
     headers.update({'User-agent': gpodder.user_agent})
     request = urllib2.Request(url, data=data, headers=headers)
-    return opener.open(request)
+    if timeout is None:
+        return opener.open(request)
+    else:
+        return opener.open(request, timeout=timeout)
 
 def get_real_url(url):
     """
@@ -1020,7 +1039,7 @@
 
     for path in os.environ['PATH'].split(os.pathsep):
         command_file = os.path.join(path, command)
-        if gpodder.win32 and not os.path.exists(command_file):
+        if gpodder.ui.win32 and not os.path.exists(command_file):
             for extension in ('.bat', '.exe'):
                 cmd = command_file + extension
                 if os.path.isfile(cmd):
@@ -1144,9 +1163,9 @@
     else:
         return dt.strftime('%H:%M:%S')
 
-
 def parse_time(value):
     """Parse a time string into seconds
+
     >>> parse_time('00:00')
     0
     >>> parse_time('00:00:00')
@@ -1159,16 +1178,30 @@
     3600
     >>> parse_time('03:02:01')
     10921
-    """
+    >>> parse_time('61:08')
+    3668
+    >>> parse_time('25:03:30')
+    90210
+    >>> parse_time('25:3:30')
+    90210
+    >>> parse_time('61.08')
+    3668
+    """
+    if value == '':
+        return 0
+
     if not value:
         raise ValueError('Invalid value: %s' % (str(value),))
 
-    for format in ('%H:%M:%S', '%M:%S'):
-        try:
-            t = time.strptime(value, format)
-            return (t.tm_hour * 60 + t.tm_min) * 60 + t.tm_sec
-        except ValueError, ve:
-            continue
+    m = re.match(r'(\d+)[:.](\d\d?)[:.](\d\d?)', value)
+    if m:
+        hours, minutes, seconds = m.groups()
+        return (int(hours) * 60 + int(minutes)) * 60 + int(seconds)
+
+    m = re.match(r'(\d+)[:.](\d\d?)', value)
+    if m:
+        minutes, seconds = m.groups()
+        return int(minutes) * 60 + int(seconds)
 
     return int(value)
 
@@ -1230,9 +1263,9 @@
        on Win32, os.startfile() is used
     """
     try:
-        if gpodder.win32:
+        if gpodder.ui.win32:
             os.startfile(filename)
-        elif gpodder.osx:
+        elif gpodder.ui.osx:
             subprocess.Popen(['open', filename])
         else:
             subprocess.Popen(['xdg-open', filename])
@@ -1479,7 +1512,7 @@
     Possible return values:
     desktop, laptop, mobile, server, other
     """

gpodder-3.3.0.tar.gz/src/gpodder/vimeo.py -> gpodder-3.5.0.tar.gz/src/gpodder/vimeo.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 VIMEOCOM_RE = re.compile(r'http://vimeo\.com/(\d+)$', re.IGNORECASE)
 MOOGALOOP_RE = re.compile(r'http://vimeo\.com/moogaloop\.swf\?clip_id=(\d+)$', re.IGNORECASE)
-SIGNATURE_RE = re.compile(r'"signature":"([^"]+)","timestamp":(\d+)')
+SIGNATURE_RE = re.compile(r'"timestamp":(\d+),"signature":"([^"]+)"')
 
 class VimeoError(BaseException): pass
 
@@ -54,7 +54,7 @@
     if sig_pair is None:
         raise VimeoError('Cannot get signature pair from Vimeo')
 
-    signature, timestamp = sig_pair.groups()
+    timestamp, signature = sig_pair.groups()
     params = '&'.join('%s=%s' % i for i in [
         ('clip_id', video_id),
         ('sig', signature),

gpodder-3.3.0.tar.gz/src/gpodder/webui/__init__.py -> gpodder-3.5.0.tar.gz/src/gpodder/webui/__init__.py Changed

gpodder-3.3.0.tar.gz/src/gpodder/youtube.py -> gpodder-3.5.0.tar.gz/src/gpodder/youtube.py Changed

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # gPodder - A media aggregator and podcast client
-# Copyright (c) 2005-2012 Thomas Perl and the gPodder Team
+# Copyright (c) 2005-2013 Thomas Perl and the gPodder Team
 #
 # gPodder is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@
 
 from gpodder import util
 
+import os.path
+
 import logging
 logger = logging.getLogger(__name__)
 
@@ -43,31 +45,56 @@
     # Python < 2.6
     from cgi import parse_qs
 
-# See http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs
-# Currently missing: 3GP profile
-supported_formats = [
-    (37, '37/1920x1080/9/0/115', '1920x1080 (HD)'),
-    (22, '22/1280x720/9/0/115', '1280x720 (HD)'),
-    (35, '35/854x480/9/0/115', '854x480'),
-    (34, '34/640x360/9/0/115', '640x360'),
-    (18, '18/640x360/9/0/115', '640x360 (iPod)'),
-    (18, '18/480x360/9/0/115', '480x360 (iPod)'),
-    (5, '5/320x240/7/0/0', '320x240 (FLV)'),
-
-    # WebM formats have lower priority, because "most" players are still less
-    # compatible with WebM than their equivalent MP4 formats above (bug 1336)
-    # If you really want WebM files, set the preferred fmt_id to any of these:
-    (45, '45/1280x720/99/0/0', 'WebM 720p'),
-    (44, '44/854x480/99/0/0', 'WebM 480p'),
-    (43, '43/640x360/99/0/0', 'WebM 360p'),
+# http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs
+# format id, (preferred ids, path(?), description) # video bitrate, audio bitrate
+formats = [
+    # WebM VP8 video, Vorbis audio
+    # Fallback to an MP4 version of same quality.
+    # Try 34 (FLV 360p H.264 AAC) if 18 (MP4 360p) fails.
+    # Fallback to 6 or 5 (FLV Sorenson H.263 MP3) if all fails.
+    (46, ([46, 37, 45, 22, 44, 35, 43, 18, 6, 34, 5], '45/1280x720/99/0/0', 'WebM 1080p (1920x1080)')), # N/A,      192 kbps
+    (45, ([45, 22, 44, 35, 43, 18, 6, 34, 5],         '45/1280x720/99/0/0', 'WebM 720p (1280x720)')),   # 2.0 Mbps, 192 kbps
+    (44, ([44, 35, 43, 18, 6, 34, 5],                 '44/854x480/99/0/0',  'WebM 480p (854x480)')),    # 1.0 Mbps, 128 kbps
+    (43, ([43, 18, 6, 34, 5],                         '43/640x360/99/0/0',  'WebM 360p (640x360)')),    # 0.5 Mbps, 128 kbps
+
+    # MP4 H.264 video, AAC audio
+    # Try 35 (FLV 480p H.264 AAC) between 720p and 360p because there's no MP4 480p.
+    # Try 34 (FLV 360p H.264 AAC) if 18 (MP4 360p) fails.
+    # Fallback to 6 or 5 (FLV Sorenson H.263 MP3) if all fails.
+    (38, ([38, 37, 22, 35, 18, 34, 6, 5], '38/1920x1080/9/0/115', 'MP4 4K 3072p (4096x3072)')), # 5.0 - 3.5 Mbps, 192 kbps
+    (37, ([37, 22, 35, 18, 34, 6, 5],     '37/1920x1080/9/0/115', 'MP4 HD 1080p (1920x1080)')), # 4.3 - 3.0 Mbps, 192 kbps
+    (22, ([22, 35, 18, 34, 6, 5],         '22/1280x720/9/0/115',  'MP4 HD 720p (1280x720)')),   # 2.9 - 2.0 Mbps, 192 kbps
+    (18, ([18, 34, 6, 5],                 '18/640x360/9/0/115',   'MP4 360p (640x360)')),       #       0.5 Mbps,  96 kbps
+
+    # FLV H.264 video, AAC audio
+    # Does not check for 360p MP4.
+    # Fallback to 6 or 5 (FLV Sorenson H.263 MP3) if all fails.
+    (35, ([35, 34, 6, 5], '35/854x480/9/0/115',   'FLV 480p (854x480)')), # 1 - 0.80 Mbps, 128 kbps
+    (34, ([34, 6, 5],     '34/640x360/9/0/115',   'FLV 360p (640x360)')), #     0.50 Mbps, 128 kbps
+
+    # FLV Sorenson H.263 video, MP3 audio
+    (6, ([6, 5],         '5/480x270/7/0/0',      'FLV 270p (480x270)')), #     0.80 Mbps,  64 kbps
+    (5, ([5],            '5/320x240/7/0/0',      'FLV 240p (320x240)')), #     0.25 Mbps,  64 kbps
 ]
+formats_dict = dict(formats)
 
 class YouTubeError(Exception): pass
 
-def get_real_download_url(url, preferred_fmt_id=None):
-    # Default fmt_id when none preferred
-    if preferred_fmt_id is None:
-        preferred_fmt_id = 18
+
+def get_fmt_ids(youtube_config):
+    fmt_ids = youtube_config.preferred_fmt_ids
+    if not fmt_ids:
+        format = formats_dict.get(youtube_config.preferred_fmt_id)
+        if format is None:
+            fmt_ids = []
+        else:
+            fmt_ids, path, description = format
+
+    return fmt_ids
+
+def get_real_download_url(url, preferred_fmt_ids=None):
+    if not preferred_fmt_ids:
+        preferred_fmt_ids, _, _ = formats_dict[22] # MP4 720p
 
     vid = get_youtube_id(url)
     if vid is not None:
@@ -89,67 +116,54 @@
                 fmt_url_map = urllib.unquote(r4.group(1))
                 for fmt_url_encoded in fmt_url_map.split(','):
                     video_info = parse_qs(fmt_url_encoded)
-                    yield int(video_info['itag'][0]), video_info['url'][0]
+                    yield int(video_info['itag'][0]), video_info['url'][0] + "&signature=" + video_info['sig'][0]
             else:
                 error_info = parse_qs(page)
                 error_message = util.remove_html_tags(error_info['reason'][0])
                 raise YouTubeError('Cannot download video: %s' % error_message)
 
         fmt_id_url_map = sorted(find_urls(page), reverse=True)
-        # Default to the highest fmt_id if we don't find a match below
-        if fmt_id_url_map:
-            default_fmt_id, default_url = fmt_id_url_map[0]
-        else:
+
+        if not fmt_id_url_map:
             raise YouTubeError('fmt_url_map not found for video ID "%s"' % vid)
 
+        # Default to the highest fmt_id if we don't find a match below
+        _, url  = fmt_id_url_map[0]
+
         formats_available = set(fmt_id for fmt_id, url in fmt_id_url_map)
         fmt_id_url_map = dict(fmt_id_url_map)
 
-        if gpodder.ui.harmattan:
-            # This provides good quality video, seems to be always available
-            # and is playable fluently in Media Player
-            if preferred_fmt_id == 5:
-                fmt_id = 5
-            else:
-                fmt_id = 18
-        else:
-            # As a fallback, use fmt_id 18 (seems to be always available)
-            fmt_id = 18
-
-            # This will be set to True if the search below has already "seen"
-            # our preferred format, but has not yet found a suitable available
-            # format for the given video.
-            seen_preferred = False
-
-            for id, wanted, description in supported_formats:
-                # If we see our preferred format, accept formats below
-                if id == preferred_fmt_id:
-                    seen_preferred = True
-
-                # If the format is available and preferred (or lower),
-                # use the given format for our fmt_id
-                if id in formats_available and seen_preferred:
-                    logger.info('Found YouTube format: %s (fmt_id=%d)',
-                            description, id)
-                    fmt_id = id
-                    break
-
-        url = fmt_id_url_map.get(fmt_id, None)
-        if url is None:
-            url = default_url
+        # This provides good quality video, seems to be always available
+        # and is playable fluently in Media Player
+        if gpodder.ui.harmattan or gpodder.ui.sailfish:
+            preferred_fmt_ids = [18]
+
+        for id in preferred_fmt_ids:
+            id = int(id)
+            if id in formats_available:
+                format = formats_dict.get(id)
+                if format is not None:
+                    _, _, description = format
+                else:
+                    description = 'Unknown'
+
+                logger.info('Found YouTube format: %s (fmt_id=%d)',
+                        description, id)
+                url = fmt_id_url_map[id]
+                break
 
     return url
 
 def get_youtube_id(url):
-    r = re.compile('http://(?:[a-z]+\.)?youtube\.com/v/(.*)\.swf', re.IGNORECASE).match(url)
+    r = re.compile('http[s]?://(?:[a-z]+\.)?youtube\.com/v/(.*)\.swf', re.IGNORECASE).match(url)
     if r is not None:
         return r.group(1)
 
-    r = re.compile('http://(?:[a-z]+\.)?youtube\.com/watch\?v=([^&]*)', re.IGNORECASE).match(url)
+    r = re.compile('http[s]?://(?:[a-z]+\.)?youtube\.com/watch\?v=([^&]*)', re.IGNORECASE).match(url)
     if r is not None:
         return r.group(1)
 
-    r = re.compile('http://(?:[a-z]+\.)?youtube\.com/v/(.*)[?]', re.IGNORECASE).match(url)
+    r = re.compile('http[s]?://(?:[a-z]+\.)?youtube\.com/v/(.*)[?]', re.IGNORECASE).match(url)
     if r is not None:
         return r.group(1)
 
@@ -208,7 +222,7 @@
 
     seen_users = set()
     for entry in data['feed']['entry']:
-        user = entry['author'][0]['name']['$t']
+        user = os.path.basename(entry['author'][0]['uri']['$t'])
         title = entry['title']['$t']
         url = 'http://www.youtube.com/rss/user/%s/videos.rss' % user
         if user not in seen_users:

gpodder-3.3.0.tar.gz/tools/i18n/generate_commits.py -> gpodder-3.5.0.tar.gz/tools/i18n/generate_commits.py Changed

@@ -33,8 +33,12 @@
                 translators.append(match.group(1))
             else:
                 in_translators = False
+        elif line.startswith('"Last-Translator:'):
+            match = re.search(r'Last-Translator: ([^<]* <[^>]*>)', line)
+            if match:
+                translators.append(match.group(1))
 
-        match = re.match(r'"Language-Team: ([^\(]+) \(http://www.transifex.net/', line)
+        match = re.match(r'"Language-Team: (.+) \(http://www.transifex.com/', line)
         if not match:
             match = re.match(r'"Language-Team: ([^\(]+).*\\n"', line, re.DOTALL)
         if match:
@@ -42,7 +46,7 @@
 
     if translators and language is not None:
         if len(translators) != 1:
-            print '# Warning: %d other translators' % (len(translators) - 1,)
+            print '# Warning: %d other translators: %s' % (len(translators) - 1, ', '.join(translators[1:]))
         print 'git commit --author="%s" --message="Updated %s translation" %s' % (translators[0], language, filename)
     else:
         print '# FIXME (could not parse):', '!'*10, filename, '!'*10

gpodder-3.3.0.tar.gz/tools/i18n/merge-from-transifex.sh -> gpodder-3.5.0.tar.gz/tools/i18n/merge-from-transifex.sh Changed

gpodder-3.3.0.tar.gz/tools/localdepends.py -> gpodder-3.5.0.tar.gz/tools/localdepends.py Changed

gpodder-3.3.0.tar.gz/tools/mac-osx/makefile -> gpodder-3.5.0.tar.gz/tools/mac-osx/makefile Changed

gpodder-3.3.0.tar.gz/tools/win32-launcher/gpodder.c -> gpodder-3.5.0.tar.gz/tools/win32-launcher/gpodder.c Changed

gpodder-3.3.0.tar.gz/tools/win32-launcher/makefile -> gpodder-3.5.0.tar.gz/tools/win32-launcher/makefile Changed

Changes of Revision 10