diff -Nru covergloobus-1.7/debian/bzr-builder.manifest covergloobus-1.7/debian/bzr-builder.manifest
--- covergloobus-1.7/debian/bzr-builder.manifest	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/debian/bzr-builder.manifest	2011-10-23 15:00:18.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~353
-lp:covergloobus revid:launchpad_translations_on_behalf_of_gloobus-dev-20111021045715-i9veq6kivqkq7liu
+# bzr-builder format 0.3 deb-version {debupstream}-0~361
+lp:covergloobus revid:cahr.gr@gmail.com-20111022152027-tqz9lx2fsqovb7pp
diff -Nru covergloobus-1.7/debian/changelog covergloobus-1.7/debian/changelog
--- covergloobus-1.7/debian/changelog	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/debian/changelog	2011-10-23 15:00:18.000000000 +0000
@@ -1,8 +1,8 @@
-covergloobus (1.7-0~353~precise1) lucid; urgency=low
+covergloobus (1.7-0~361~precise1) lucid; urgency=low
 
   * Auto build.
 
- -- simon <sausageandeggs@archlinux.us>  Fri, 21 Oct 2011 05:05:28 +0000
+ -- simon <sausageandeggs@archlinux.us>  Sun, 23 Oct 2011 15:00:18 +0000
 
 covergloobus (1.7-6) lucid; urgency=low
 
diff -Nru covergloobus-1.7/src/core/configuration.py covergloobus-1.7/src/core/configuration.py
--- covergloobus-1.7/src/core/configuration.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/configuration.py	2011-10-23 15:00:18.000000000 +0000
@@ -23,6 +23,8 @@
 
 from xdg.BaseDirectory import xdg_config_home
 
+from gettext import gettext as _
+
 import config as CONFIG
 
 import covers
@@ -30,8 +32,6 @@
 import players
 import tabs
 
-from core import _
-#from core import c
 from core import config
 
 from core.common import DBUS_NAME
diff -Nru covergloobus-1.7/src/core/covergloobus.py covergloobus-1.7/src/core/covergloobus.py
--- covergloobus-1.7/src/core/covergloobus.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/covergloobus.py	2011-10-23 15:00:18.000000000 +0000
@@ -23,8 +23,8 @@
 
 from dbus.mainloop.glib import DBusGMainLoop
 
-from core import _
-#from core import c
+from gettext import gettext as _
+
 from core import config
 
 from core.common import COVER, STATE, TIME, TRACK, PLAYER
@@ -43,6 +43,8 @@
 
 c = logging.getLogger(__name__)
 
+EMPTY_TRACK = Track()
+
 class CoverGloobus(object):
     covers = None
     dbus = None
@@ -53,7 +55,8 @@
     cover = None
     time = 0
     state = State.CLOSED
-    track = Track()
+    track = EMPTY_TRACK
+    _last_track = None
 
     _menu = None
     _status_icon = None
@@ -280,10 +283,9 @@
         self.update(STATE, state)
 
     def reset_track(self):
-        self.update(TRACK, Track())
-        #self.update(STATE, State.PAUSED)
-        if self._status_icon:
-            self._status_icon.set_tooltip("CoverGloobus")
+        if not self.track is EMPTY_TRACK:
+            self._last_track = self.track
+        self.update(TRACK, EMPTY_TRACK)
         return False
 
     def update_cover(self, artist, album, cover):
@@ -294,9 +296,15 @@
                 self.cover = cover
 
     def update_state(self, state):
+        c.debug("state update: " + State.toString(state))
         if self.state != state:
             self.state = state
-            if state == State.STARTED:
+            if state == State.PLAYING:
+                if self.track is EMPTY_TRACK and self._last_track:
+                    self.update(TRACK, self._last_track)
+            elif state == State.STOPPED:
+                self.reset_track()
+            elif state == State.STARTED:
                 self.check_song()
                 self.init_timer()
                 self._window.show()
@@ -307,24 +315,30 @@
                     self.dock.reset()
                 if self._hide:
                     self._window.hide()
-            elif state == State.STOPPED:
-                self.reset_track()
 
 
     def update_track(self, track):
-        if not track.cover:
-            track.cover = self.covers.search(track)
-        if track.cover:
-            if self.cover != track.cover:
-                self.update(COVER, track.cover)
-                self.cover = track.cover
-        else:
+        if track is EMPTY_TRACK:
+            c.debug("track update: empty")
+            if self._status_icon:
+                self._status_icon.set_tooltip("CoverGloobus")
             self.update(COVER, None)
             self.cover = None
-        if self._status_icon:
-            self._status_icon.set_tooltip(track.title + \
-                                          '\nby ' + track.artist + \
-                                          '\nfrom ' + track.album)
+        else:
+            c.debug("track update: %s by %s" % (track.title, track.artist) )
+            if not track.cover:
+                track.cover = self.covers.search(track)
+            if track.cover:
+                if self.cover != track.cover:
+                    self.update(COVER, track.cover)
+                    self.cover = track.cover
+            else:
+                self.update(COVER, None)
+                self.cover = None
+            if self._status_icon:
+                self._status_icon.set_tooltip(track.title + \
+                                              '\nby ' + track.artist + \
+                                              '\nfrom ' + track.album)
         self.track = track
 
     def update_time(self):
diff -Nru covergloobus-1.7/src/core/coversearch.py covergloobus-1.7/src/core/coversearch.py
--- covergloobus-1.7/src/core/coversearch.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/coversearch.py	2011-10-23 15:00:18.000000000 +0000
@@ -22,9 +22,10 @@
 
 from threading import Thread
 
+from gettext import gettext as _
+
 import common
 
-from core import _
 from core import config
 from core.common import CACHE_PATH
 from core.utils import name_hash
diff -Nru covergloobus-1.7/src/core/crash_handler.py covergloobus-1.7/src/core/crash_handler.py
--- covergloobus-1.7/src/core/crash_handler.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/crash_handler.py	2011-10-23 15:00:18.000000000 +0000
@@ -9,8 +9,8 @@
 import threading
 
 from gettext import gettext as _
-from core.common import REPORT_URL
 
+from core.common import REPORT_URL
 
 class ReportDialog(gtk.Dialog):
     def __init__(self, message, main_thread=True):
diff -Nru covergloobus-1.7/src/core/docky.py covergloobus-1.7/src/core/docky.py
--- covergloobus-1.7/src/core/docky.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/docky.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import dbus
 import cairo
+import dbus
 import gtk
 import gobject
+import logging
 
-from core import _
-from core import c
-from core import config
+from gettext import gettext as _
 
+from core import config
 from core.common import ABS_PATH, ICON_PATH
 from core.common import COVER, STATE, TIME, TRACK
 
+c = logging.getLogger(__name__)
+
 INSTALL_MESSAGE = _('Remember to pin dock icon and restart CoverGloobus if you intend to use it on dock in future')
 
 def Dock(cg):
diff -Nru covergloobus-1.7/src/core/__init__.py covergloobus-1.7/src/core/__init__.py
--- covergloobus-1.7/src/core/__init__.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/__init__.py	2011-10-23 15:00:18.000000000 +0000
@@ -3,6 +3,10 @@
 import logging
 import os
 
+from gettext import gettext as _
+
+import crash_handler
+
 from config import prefix as PREFIX
 from settings import Settings
 
@@ -17,8 +21,6 @@
 gettext.bindtextdomain('covergloobus', PREFIX + '/share/locale/')
 gettext.textdomain('covergloobus')
 
-_ = gettext.gettext
-
 c = logging.getLogger()
 handler = logging.StreamHandler()
 formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s')
@@ -27,8 +29,6 @@
 
 config = Settings()
 
-import crash_handler
-
 # ============================================================================ #
 
 def init():
diff -Nru covergloobus-1.7/src/core/lyricsearch.py covergloobus-1.7/src/core/lyricsearch.py
--- covergloobus-1.7/src/core/lyricsearch.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/lyricsearch.py	2011-10-23 15:00:18.000000000 +0000
@@ -29,8 +29,8 @@
 from threading import Thread
 from threading import Lock
 
-from core import _
-#from core import c
+from gettext import gettext as _
+
 from core import config
 
 from core.common import CACHE_PATH
diff -Nru covergloobus-1.7/src/core/settings.py covergloobus-1.7/src/core/settings.py
--- covergloobus-1.7/src/core/settings.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/settings.py	2011-10-23 15:00:18.000000000 +0000
@@ -1,13 +1,16 @@
+import logging
 import os
-import logging as c
 
 from ConfigParser import SafeConfigParser
 
-from core import _
+from gettext import gettext as _
+
 from core.common import ABS_PATH
 from core.common import CONFIG_PATH
 from core.common import HOME_PATH
 
+c = logging.getLogger(__name__)
+
 class Settings(SafeConfigParser):
     def __init__(self):
         SafeConfigParser.__init__(self)
diff -Nru covergloobus-1.7/src/core/track.py covergloobus-1.7/src/core/track.py
--- covergloobus-1.7/src/core/track.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/track.py	2011-10-23 15:00:18.000000000 +0000
@@ -38,6 +38,21 @@
     CLOSED = 5
 
     @staticmethod
+    def toString(state):
+        if state == State.PLAYING:
+            return 'playing'
+        elif state == State.PAUSED:
+            return 'paused'
+        elif state == State.STOPPED:
+            return 'stopped'
+        elif state == State.STARTED:
+            return 'started'
+        elif state == State.CLOSED:
+            return 'closed'
+        else:
+            return 'unknown'
+
+    @staticmethod
     def get(string):
         if string == 'playing':
             return State.PLAYING
diff -Nru covergloobus-1.7/src/core/ui.py covergloobus-1.7/src/core/ui.py
--- covergloobus-1.7/src/core/ui.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/core/ui.py	2011-10-23 15:00:18.000000000 +0000
@@ -25,8 +25,8 @@
 
 from xml.dom import minidom
 
-from core import _
-#from core import c
+from gettext import gettext as _
+
 from core import config
 
 from core.common import COVER, STATE, TIME, TRACK, PLAYER
diff -Nru covergloobus-1.7/src/covers/Amazon.py covergloobus-1.7/src/covers/Amazon.py
--- covergloobus-1.7/src/covers/Amazon.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Amazon.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,16 +14,19 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import os
 import re
 import urllib2
 
 from tempfile import NamedTemporaryFile
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from covers import GenericCover
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = 'http://www.albumart.org/index.php?srchkey=%s+%s&searchindex=Music'
 
 class Amazon(GenericCover):
diff -Nru covergloobus-1.7/src/covers/Discogs.py covergloobus-1.7/src/covers/Discogs.py
--- covergloobus-1.7/src/covers/Discogs.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Discogs.py	2011-10-23 15:00:18.000000000 +0000
@@ -16,16 +16,19 @@
 
 import cStringIO
 import gzip
+import logging
 import os
 import urllib2
 
 from tempfile import NamedTemporaryFile
 from xml.dom import minidom
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from covers import GenericCover
 
+c = logging.getLogger(__name__)
+
 class Discogs(GenericCover):
     __title__ = 'Discogs'
     __version__ = '0.1'
diff -Nru covergloobus-1.7/src/covers/Douban.py covergloobus-1.7/src/covers/Douban.py
--- covergloobus-1.7/src/covers/Douban.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Douban.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,13 +15,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import urllib, json, os, traceback
+import logging
+import json
+import os
+import traceback
+import urllib
+
 from tempfile import NamedTemporaryFile
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from covers import GenericCover
 
+c = logging.getLogger(__name__)
+
 class Douban(GenericCover):
     __title__ = 'Douban'
     __version__ = '0.1'
diff -Nru covergloobus-1.7/src/covers/Lastfm.py covergloobus-1.7/src/covers/Lastfm.py
--- covergloobus-1.7/src/covers/Lastfm.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Lastfm.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,6 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import dbus
+import logging
 import os
 import urllib2
 
@@ -22,10 +24,12 @@
 from urllib2 import urlopen
 from xml.dom import minidom
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from covers import GenericCover
 
+c = logging.getLogger(__name__)
+
 class Lastfm(GenericCover):
     __title__ = 'Last.fm'
     __version__ = '0.1'
diff -Nru covergloobus-1.7/src/covers/Location.py covergloobus-1.7/src/covers/Location.py
--- covergloobus-1.7/src/covers/Location.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Location.py	2011-10-23 15:00:18.000000000 +0000
@@ -18,7 +18,8 @@
 import os
 import re
 
-from core import _
+from gettext import gettext as _
+
 from core import config
 from covers import GenericCover
 
diff -Nru covergloobus-1.7/src/covers/Pattern.py covergloobus-1.7/src/covers/Pattern.py
--- covergloobus-1.7/src/covers/Pattern.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/covers/Pattern.py	2011-10-23 15:00:18.000000000 +0000
@@ -17,7 +17,8 @@
 import gtk
 import os
 
-from core import _
+from gettext import gettext as _
+
 from core import config
 from covers import GenericCover
 
diff -Nru covergloobus-1.7/src/lyrics/absolutelyrics.py covergloobus-1.7/src/lyrics/absolutelyrics.py
--- covergloobus-1.7/src/lyrics/absolutelyrics.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/absolutelyrics.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,16 +14,18 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from urllib2 import quote
 from urllib2 import urlopen
+from gettext import gettext as _
 
-from core import _
-from core import c
 from lyrics import GenericLyric
 
-"http://absolutelyrics.com/lyrics/view/%s/%s/"
+c = logging.getLogger(__name__)
+
+URL_TEMPLATE = "http://absolutelyrics.com/lyrics/view/%s/%s/"
 
 class absolutelyrics(GenericLyric):
     __title__ = 'AbsoluteLyrics'
diff -Nru covergloobus-1.7/src/lyrics/lololyrics.py covergloobus-1.7/src/lyrics/lololyrics.py
--- covergloobus-1.7/src/lyrics/lololyrics.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lololyrics.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,14 +14,17 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
+
 from urllib import urlencode
 from urllib2 import urlopen
 from xml.etree.ElementTree import XML
+from gettext import gettext as _
 
-from core import _
-from core import c
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 API = 'http://api.lololyrics.com/old/getLyric?rawutf8=1&'
 
 class lololyrics(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricscom.py covergloobus-1.7/src/lyrics/lyricscom.py
--- covergloobus-1.7/src/lyrics/lyricscom.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricscom.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,15 +14,17 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from urllib2 import quote
 from urllib2 import urlopen
+from gettext import gettext as _
 
-from core import _
-from core import c
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = "http://lyrics.com/lyrics/%s/%s.html"
 
 class lyricscom(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricsfly.py covergloobus-1.7/src/lyrics/lyricsfly.py
--- covergloobus-1.7/src/lyrics/lyricsfly.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricsfly.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,20 +14,21 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import gtk
 import os
 
 from urllib2 import quote
 from urllib2 import urlopen
-
 from xml.dom import minidom
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core import config
 from core.common import CACHE_PATH
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = "http://api.lyricsfly.com/api/api.php?i=%s&a=%s&t=%s"
 
 class lyricsfly(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricsmirkforce.py covergloobus-1.7/src/lyrics/lyricsmirkforce.py
--- covergloobus-1.7/src/lyrics/lyricsmirkforce.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricsmirkforce.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,13 +14,16 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
+
 from urllib2 import quote
 from urllib2 import urlopen
 
-from core import c
 from core.utils import name_hash
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = "http://lyrics.mirkforce.net/%s/%s.txt"
 
 class lyricsmirkforce(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricsplugin.py covergloobus-1.7/src/lyrics/lyricsplugin.py
--- covergloobus-1.7/src/lyrics/lyricsplugin.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricsplugin.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,16 +14,16 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from urllib2 import quote
 from urllib2 import urlopen
 
-#import string
-
-from core import c
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 # site not working anymore,
 # if starts working uncomment next line and comment one after it
 #class lyricsplugin(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricsvip.py covergloobus-1.7/src/lyrics/lyricsvip.py
--- covergloobus-1.7/src/lyrics/lyricsvip.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricsvip.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,14 +14,16 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from urllib2 import quote
 from urllib2 import urlopen
 
-from core import c
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = 'http://www.lyricsvip.com/%s/%s-Lyrics.html'
 
 class lyricsvip(GenericLyric):
diff -Nru covergloobus-1.7/src/lyrics/lyricswikia2.py covergloobus-1.7/src/lyrics/lyricswikia2.py
--- covergloobus-1.7/src/lyrics/lyricswikia2.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricswikia2.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,6 +14,7 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import os
 import re
 
@@ -21,13 +22,14 @@
 from urllib2 import quote
 from urllib2 import urlopen
 from xml.dom import minidom
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.utils import html_unescape
 from core.utils import name_hash
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 WIKIA = 'http://lyrics.wikia.com/'
 CACHE_PATH = '/tmp/cg_lyricswikia_cache/'
 QUEUE_MAX = 10
diff -Nru covergloobus-1.7/src/lyrics/lyricswikia.py covergloobus-1.7/src/lyrics/lyricswikia.py
--- covergloobus-1.7/src/lyrics/lyricswikia.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/lyrics/lyricswikia.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,17 +14,19 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from string import capwords
 from urllib2 import quote
 from urllib2 import urlopen
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.utils import html_unescape
 from lyrics import GenericLyric
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = "http://lyrics.wikia.com/%s:%s"
 
 class lyricswikia(GenericLyric):
diff -Nru covergloobus-1.7/src/players/Amarok2.py covergloobus-1.7/src/players/Amarok2.py
--- covergloobus-1.7/src/players/Amarok2.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Amarok2.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,15 +14,15 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+from gettext import gettext as _
 
-from core import _
-from generic.Mpris import Mpris
+from generic.Mpris2 import Mpris2
 
-class Amarok2(Mpris):
+class Amarok2(Mpris2):
 
     __title__ = 'Amarok 2'
     __version__ = '0.1'
     __authors__ = 'Jaap Broekhuizen <jaapz.b@gmail.com>, Alexandr Grigorcea <cahr.gr@gmail.com>'
     __desc__ = _('Amarok 2.x music player plugin')
 
-    DBUS_NAME   = 'org.mpris.amarok'
+    DBUS_NAME   = 'org.mpris.MediaPlayer2.amarok'
diff -Nru covergloobus-1.7/src/players/Audacious2.py covergloobus-1.7/src/players/Audacious2.py
--- covergloobus-1.7/src/players/Audacious2.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Audacious2.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,7 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class Audacious2(Mpris):
diff -Nru covergloobus-1.7/src/players/Banshee.py covergloobus-1.7/src/players/Banshee.py
--- covergloobus-1.7/src/players/Banshee.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Banshee.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,21 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import dbus
+import logging
+import os
 
 from urllib import unquote
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class Banshee(Player):
 
     __title__ = 'Banshee'
diff -Nru covergloobus-1.7/src/players/BeatBox.py covergloobus-1.7/src/players/BeatBox.py
--- covergloobus-1.7/src/players/BeatBox.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/BeatBox.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,11 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
-import dbus
+from gettext import gettext as _
 
-from core import _
-from core import c
 from generic.Mpris2 import Mpris2
 
 class BeatBox(Mpris2):
diff -Nru covergloobus-1.7/src/players/Clementine.py covergloobus-1.7/src/players/Clementine.py
--- covergloobus-1.7/src/players/Clementine.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Clementine.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,9 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import dbus
+from gettext import gettext as _
 
-from core import _
 from generic.Mpris2 import Mpris2
 
 class Clementine(Mpris2):
diff -Nru covergloobus-1.7/src/players/DeaDBeeF.py covergloobus-1.7/src/players/DeaDBeeF.py
--- covergloobus-1.7/src/players/DeaDBeeF.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/DeaDBeeF.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import gobject
+import logging
 
 from subprocess import Popen, PIPE
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
 from generic.Cli import Cli
 
+c = logging.getLogger(__name__)
+
 class DeaDBeeF(Cli):
 
     __title__ = 'DeaDBeeF'
diff -Nru covergloobus-1.7/src/players/Decibel.py covergloobus-1.7/src/players/Decibel.py
--- covergloobus-1.7/src/players/Decibel.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Decibel.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,7 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class Decibel(Mpris):
diff -Nru covergloobus-1.7/src/players/Exaile3MPRIS.py covergloobus-1.7/src/players/Exaile3MPRIS.py
--- covergloobus-1.7/src/players/Exaile3MPRIS.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Exaile3MPRIS.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,7 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class Exaile3MPRIS(Mpris):
diff -Nru covergloobus-1.7/src/players/Exaile3.py covergloobus-1.7/src/players/Exaile3.py
--- covergloobus-1.7/src/players/Exaile3.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Exaile3.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,17 +14,19 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import dbus
+import logging
 import urllib
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class Exaile3(Player):
 
     __title__ = 'Exaile 0.3.x'
diff -Nru covergloobus-1.7/src/players/Exaile.py covergloobus-1.7/src/players/Exaile.py
--- covergloobus-1.7/src/players/Exaile.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Exaile.py	2011-10-23 15:00:18.000000000 +0000
@@ -16,14 +16,17 @@
 
 import dbus
 import gobject
+import logging
+
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class Exaile(Player):
 
     __title__ = 'Exaile 0.2.x'
diff -Nru covergloobus-1.7/src/players/generic/Cli.py covergloobus-1.7/src/players/generic/Cli.py
--- covergloobus-1.7/src/players/generic/Cli.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/generic/Cli.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,10 +15,11 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import gobject
+import logging
 import os
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
@@ -26,6 +27,8 @@
 
 from Player import Player
 
+c = logging.getLogger(__name__)
+
 class Cli(Player):
     COMMAND = None
     OBSERVE_TIMEOUT = 5000
diff -Nru covergloobus-1.7/src/players/generic/Mpris2.py covergloobus-1.7/src/players/generic/Mpris2.py
--- covergloobus-1.7/src/players/generic/Mpris2.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/generic/Mpris2.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,11 +15,12 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import dbus
+import logging
 
 from urllib import unquote
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
@@ -27,6 +28,8 @@
 
 from Player import Player
 
+c = logging.getLogger(__name__)
+
 class Mpris2(Player):
     DBUS_OBJECT = '/org/mpris/MediaPlayer2'
 
diff -Nru covergloobus-1.7/src/players/generic/Mpris.py covergloobus-1.7/src/players/generic/Mpris.py
--- covergloobus-1.7/src/players/generic/Mpris.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/generic/Mpris.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,11 +15,12 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import dbus
+import logging
 
 from urllib import unquote
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
@@ -27,6 +28,8 @@
 
 from Player import Player
 
+c = logging.getLogger(__name__)
+
 class Mpris(Player):
     DBUS_OBJECT = '/Player'
 
@@ -90,7 +93,7 @@
         vals = ('title','album','artist', 'genre', 'year', 'tracknumber',
                 'location', 'arturl', 'rating')
         for key in [key for key in vals if key not in data]:
-            c.warning('%s: %s not found in current track' % (self.__title__, key))
+            c.warning('%s: %s not found in current track' % (self.__class__.__name__, key))
             data[key] = ''
 
         track = Track(
diff -Nru covergloobus-1.7/src/players/generic/Player.py covergloobus-1.7/src/players/generic/Player.py
--- covergloobus-1.7/src/players/generic/Player.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/generic/Player.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,12 +15,15 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import dbus
+import logging
+
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.track import State
 from core.common import STATE
 
+c = logging.getLogger(__name__)
+
 class Player(object):
     """ This class has the basic functions for the player,
         There are some of them that must be implemented for each SpecificPlayer,
diff -Nru covergloobus-1.7/src/players/gmusicbrowser.py covergloobus-1.7/src/players/gmusicbrowser.py
--- covergloobus-1.7/src/players/gmusicbrowser.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/gmusicbrowser.py	2011-10-23 15:00:18.000000000 +0000
@@ -16,15 +16,18 @@
 
 import dbus
 import gobject
+import logging
 import os
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class gmusicbrowser(Player):
 
     __title__ = 'gmusicbrowser'
diff -Nru covergloobus-1.7/src/players/Grooveshark.py covergloobus-1.7/src/players/Grooveshark.py
--- covergloobus-1.7/src/players/Grooveshark.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Grooveshark.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,16 +15,19 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import gobject
+import logging
 import os
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
 from core.common import HOME_PATH
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 GF = 'GroovesharkDesktop.7F9BF17D6D9CB2159C78A6A6AB076EA0B1E0497C.1'
 STATE_PATH = '%s/Documents/Grooveshark/currentSong.txt' % HOME_PATH
 CONTROL_PATH = '%s/.appdata/%s/Local Store/shortcutAction.txt' % (HOME_PATH, GF)
diff -Nru covergloobus-1.7/src/players/Guayadeque.py covergloobus-1.7/src/players/Guayadeque.py
--- covergloobus-1.7/src/players/Guayadeque.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Guayadeque.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,7 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class Guayadeque(Mpris):
diff -Nru covergloobus-1.7/src/players/Listen.py covergloobus-1.7/src/players/Listen.py
--- covergloobus-1.7/src/players/Listen.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Listen.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,14 +14,17 @@
 
 import dbus
 import gobject
+import logging
+
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class Listen(Player):
     __title__ = 'Listen'
     __version__ = '0.0'
diff -Nru covergloobus-1.7/src/players/MOC.py covergloobus-1.7/src/players/MOC.py
--- covergloobus-1.7/src/players/MOC.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/MOC.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import gobject
+import logging
 
 from subprocess import Popen, PIPE
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Cli import Cli
 
+c = logging.getLogger(__name__)
+
 class MOC(Cli):
     __title__ = 'MOC'
     __version__ = '0.1'
@@ -100,13 +102,13 @@
 
     def set_position(self, time):
         sec = time - self.get_position()
-        subprocess.Popen(['mocp', '--seek', str(sec)])
+        Popen(['mocp', '--seek', str(sec)])
 
     def previous(self):
-        subprocess.Popen(['mocp', '--previous'])
+        Popen(['mocp', '--previous'])
 
     def next(self):
-        subprocess.Popen(['mocp', '--next'])
+        Popen(['mocp', '--next'])
 
     def play(self):
-        subprocess.Popen(['mocp', '--toggle-pause'])
+        Popen(['mocp', '--toggle-pause'])
diff -Nru covergloobus-1.7/src/players/MPD.py covergloobus-1.7/src/players/MPD.py
--- covergloobus-1.7/src/players/MPD.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/MPD.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import gobject
 import gtk
+import logging
+
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core import config
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 try:
     import mpd
 except ImportError:
@@ -63,18 +65,18 @@
             self._path = self._path[:-1]
         try:
             if self._client:
-                c.debug('MPD: was connected, disconnecting')
+                c.debug('was connected, disconnecting')
                 self._client.disconnect()
             self._client = mpd.MPDClient()
-            c.debug('MPD: connecting')
+            c.debug('connecting')
             self._client.connect(host, port)
             if password != '':
-                c.debug('MPD: using password')
+                c.debug('using password')
                 self._client.password(password)
-            c.debug('MPD: connection done')
+            c.debug('connection done')
             return True
         except:
-            c.debug('MPD: connection failed')
+            c.debug('connection failed')
             return False
 
     def connect(self):
diff -Nru covergloobus-1.7/src/players/Pithos.py covergloobus-1.7/src/players/Pithos.py
--- covergloobus-1.7/src/players/Pithos.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Pithos.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,16 +15,18 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import dbus
-import os
+import logging
+
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core.track import State
 from core.track import Track
 from core.common import COVER, STATE, TIME, TRACK
 from core.common import HOME_PATH
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class Pithos(Player):
     __title__ = 'Pithos'
     __version__ = '0.1'
diff -Nru covergloobus-1.7/src/players/Pogo.py covergloobus-1.7/src/players/Pogo.py
--- covergloobus-1.7/src/players/Pogo.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Pogo.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,15 +14,12 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class Pogo(Mpris):
-    """
-        Audacious 2.x player plugin
-        I was NOT tested with Audacious 1.5!
-        There is no guarantee it will or won't work with Audacious < 2
-    """
+
     __title__ = 'Pogo'
     __version__ = '0.1'
     __authors__ = 'Alexandr Grigorcea <cahr.gr@gmail.com>'
diff -Nru covergloobus-1.7/src/players/QuodLibet.py covergloobus-1.7/src/players/QuodLibet.py
--- covergloobus-1.7/src/players/QuodLibet.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/QuodLibet.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,17 +14,20 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import dbus
+import logging
+import os
 import subprocess
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class QuodLibet(Player):
     """
         QuodLibet player plugin
diff -Nru covergloobus-1.7/src/players/RhythmboxOld.py covergloobus-1.7/src/players/RhythmboxOld.py
--- covergloobus-1.7/src/players/RhythmboxOld.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/RhythmboxOld.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,21 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import dbus
+import logging
+import os
 
 from urllib import unquote
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 class RhythmboxOld(Player):
     """
         Rhythmbox player plugin
diff -Nru covergloobus-1.7/src/players/Rhythmbox.py covergloobus-1.7/src/players/Rhythmbox.py
--- covergloobus-1.7/src/players/Rhythmbox.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Rhythmbox.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,11 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
-import dbus
+from gettext import gettext as _
 
-from core import _
-from core import c
 from generic.Mpris2 import Mpris2
 
 class Rhythmbox(Mpris2):
diff -Nru covergloobus-1.7/src/players/Songbird.py covergloobus-1.7/src/players/Songbird.py
--- covergloobus-1.7/src/players/Songbird.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Songbird.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,7 +15,8 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-from core import _
+from gettext import gettext as _
+
 from core.common import HOME_PATH
 from generic.Mpris import Mpris
 
diff -Nru covergloobus-1.7/src/players/Spotify.py covergloobus-1.7/src/players/Spotify.py
--- covergloobus-1.7/src/players/Spotify.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Spotify.py	2011-10-23 15:00:18.000000000 +0000
@@ -21,12 +21,13 @@
 # Developed by BadChoice (jordi.hernandezp@gmail.com)
 
 import os, time, sys, datetime, string
+import logging
 import urllib2
 import re
 import gobject
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE
@@ -34,6 +35,7 @@
 
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
 
 try:
     from Xlib import X, display, error, Xatom
diff -Nru covergloobus-1.7/src/players/Totem.py covergloobus-1.7/src/players/Totem.py
--- covergloobus-1.7/src/players/Totem.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Totem.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,14 +14,15 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
-from generic.Mpris import Mpris
+from gettext import gettext as _
 
-class Totem(Mpris):
+from generic.Mpris2 import Mpris2
+
+class Totem(Mpris2):
 
     __title__ = 'Totem'
     __version__ = '0.1'
     __authors__ = 'Alexandr Grigorcea <cahr.gr@gmail.com>'
     __desc__ = _('Totem movie player plugin')
 
-    DBUS_NAME   = 'org.mpris.Totem'
+    DBUS_NAME   = 'org.mpris.MediaPlayer2.totem'
diff -Nru covergloobus-1.7/src/players/VLC.py covergloobus-1.7/src/players/VLC.py
--- covergloobus-1.7/src/players/VLC.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/VLC.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,7 +14,8 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from core import _
+from gettext import gettext as _
+
 from generic.Mpris import Mpris
 
 class VLC(Mpris):
diff -Nru covergloobus-1.7/src/players/Xmms2client.py covergloobus-1.7/src/players/Xmms2client.py
--- covergloobus-1.7/src/players/Xmms2client.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/players/Xmms2client.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,21 +14,23 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import os
 import gobject
 import gtk
+import logging
+import os
 
 from subprocess import Popen, PIPE
 from urllib import unquote
+from gettext import gettext as _
 
-from core import _
-from core import c
 from core import config
 from core.track import State
 from core.track import Track
 from core.common import TRACK, STATE, TIME
 from generic.Player import Player
 
+c = logging.getLogger(__name__)
+
 try:
     import xmmsclient
     import xmmsclient.glib
diff -Nru covergloobus-1.7/src/tabs/ultimateguitar.py covergloobus-1.7/src/tabs/ultimateguitar.py
--- covergloobus-1.7/src/tabs/ultimateguitar.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/tabs/ultimateguitar.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,15 +14,18 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+import logging
 import re
 
 from urllib2 import quote
 from urllib2 import urlopen
 
-from core import _
-from core import c
+from gettext import gettext as _
+
 from tabs import GenericTab
 
+c = logging.getLogger(__name__)
+
 URL_TEMPLATE = "http://www.ultimate-guitar.com/tabs/%s/%s/%s_tab.htm"
 
 class ultimateguitar(GenericTab):
diff -Nru covergloobus-1.7/src/widgets/about.py covergloobus-1.7/src/widgets/about.py
--- covergloobus-1.7/src/widgets/about.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/about.py	2011-10-23 15:00:18.000000000 +0000
@@ -17,7 +17,7 @@
 import gtk
 import config
 
-from core import _
+from gettext import gettext as _
 
 class AboutGloobus(gtk.AboutDialog):
     def __init__(self):
diff -Nru covergloobus-1.7/src/widgets/button.py covergloobus-1.7/src/widgets/button.py
--- covergloobus-1.7/src/widgets/button.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/button.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,15 +15,16 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import gobject
+import logging
 import os
 
 from gtk.gdk import pixbuf_new_from_file_at_scale
 from gtk.gdk import pixbuf_get_file_info
 
-from core import c
-
 from widgets import GenericWidget
 
+c = logging.getLogger(__name__)
+
 class Button(GenericWidget):
     __gsignals__ = {
         'clicked' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [])
diff -Nru covergloobus-1.7/src/widgets/image.py covergloobus-1.7/src/widgets/image.py
--- covergloobus-1.7/src/widgets/image.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/image.py	2011-10-23 15:00:18.000000000 +0000
@@ -17,16 +17,18 @@
 import cairo
 import gobject
 import gtk
+import logging
 import os
 
 from gtk.gdk import pixbuf_new_from_file_at_scale
 from gtk.gdk import pixbuf_get_file_info
 
-from core import _
-from core import c
+from gettext import gettext as _
 
 from widgets import GenericWidget
 
+c = logging.getLogger(__name__)
+
 class Image(GenericWidget):
     _path = None
     _surface = None
diff -Nru covergloobus-1.7/src/widgets/pluginview.py covergloobus-1.7/src/widgets/pluginview.py
--- covergloobus-1.7/src/widgets/pluginview.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/pluginview.py	2011-10-23 15:00:18.000000000 +0000
@@ -17,7 +17,7 @@
 import gtk
 import pango
 
-from core import _
+from gettext import gettext as _
 
 PLUGINS_COL_NAME = 0
 PLUGINS_COL_DESCRIPTION = 1
diff -Nru covergloobus-1.7/src/widgets/rating.py covergloobus-1.7/src/widgets/rating.py
--- covergloobus-1.7/src/widgets/rating.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/rating.py	2011-10-23 15:00:18.000000000 +0000
@@ -17,15 +17,16 @@
 import cairo
 import gobject
 import gtk
+import logging
 import os
 
 from gtk.gdk import pixbuf_new_from_file_at_scale
 from gtk.gdk import pixbuf_get_file_info
 
-from core import c
-
 from widgets import GenericWidget
 
+c = logging.getLogger(__name__)
+
 STARS = 5 # number of start
 
 class Rating(GenericWidget):
diff -Nru covergloobus-1.7/src/widgets/seekbar.py covergloobus-1.7/src/widgets/seekbar.py
--- covergloobus-1.7/src/widgets/seekbar.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/seekbar.py	2011-10-23 15:00:18.000000000 +0000
@@ -14,18 +14,19 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#import gtk
 import gobject
+import logging
 import os
 
 from gtk.gdk import pixbuf_new_from_file_at_scale
 from gtk.gdk import pixbuf_get_file_info
 
-from core import _
-from core import c
+from gettext import gettext as _
 
 from widgets import GenericWidget
 
+c = logging.getLogger(__name__)
+
 class Slider(GenericWidget):
     __gsignals__ = {
         'value-changed' : (gobject.SIGNAL_RUN_LAST,
diff -Nru covergloobus-1.7/src/widgets/themeinstallwindow.py covergloobus-1.7/src/widgets/themeinstallwindow.py
--- covergloobus-1.7/src/widgets/themeinstallwindow.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/themeinstallwindow.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,14 +15,16 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import gtk
+import logging
 import tarfile, zipfile
 
 from threading import Thread
 from xml.dom import minidom
 from os import path
 
-from core import _
-from core import c
+from gettext import gettext as _
+
+c = logging.getLogger(__name__)
 
 CANT_READ_FILE_TEXT = "Can't read this file, please select some other file!"
 EXTRACT_PATH = path.expanduser("~/.CoverGloobus/themes")
diff -Nru covergloobus-1.7/src/widgets/themeview.py covergloobus-1.7/src/widgets/themeview.py
--- covergloobus-1.7/src/widgets/themeview.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/themeview.py	2011-10-23 15:00:18.000000000 +0000
@@ -23,7 +23,7 @@
 
 from widgets.themeinstallwindow import ThemeInstallWindow
 
-from core import _
+from gettext import gettext as _
 from core.common import ABS_PATH
 
 THEMES_COL_NAME = 0
diff -Nru covergloobus-1.7/src/widgets/window.py covergloobus-1.7/src/widgets/window.py
--- covergloobus-1.7/src/widgets/window.py	2011-10-21 05:05:28.000000000 +0000
+++ covergloobus-1.7/src/widgets/window.py	2011-10-23 15:00:18.000000000 +0000
@@ -15,17 +15,19 @@
 #Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import cairo
+import gobject
 import gtk
+import logging
 import os
-import gobject
 import pango
 
-from core import _
-from core import c
+from gettext import gettext as _
 
 from core.common import ABS_PATH
 from core.common import ICON_PATH
 
+c = logging.getLogger(__name__)
+
 # ======================= COVERGLOOBUS WINDOW WIDGET ========================= #
 
 class GloobusWindow(gtk.Window):