From 22ac9d1e81bfb9c56f93829e3204cba788c76087 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alex=20L=C3=A4tsch?= <lexx911@users.schwerkraft.elitedvb.net>
Date: Sun, 22 Jun 2008 12:57:50 +0000
Subject: [PATCH] translation fixes

---
 vlcplayer/src/VlcMediaList.py  | 10 +++++-----
 vlcplayer/src/VlcServerList.py | 17 ++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/vlcplayer/src/VlcMediaList.py b/vlcplayer/src/VlcMediaList.py
index 1d63e77..95dc3b2 100644
--- a/vlcplayer/src/VlcMediaList.py
+++ b/vlcplayer/src/VlcMediaList.py
@@ -22,7 +22,7 @@ from pyexpat import ExpatError
 from VlcFileList import VlcFileList
 from VlcPlayList import VlcPlayList
 from VlcPlayer import VlcPlayer
-from VlcServerConfig import _
+from . import _
 
 
 class VlcMediaListScreen(Screen):
@@ -39,8 +39,8 @@ class VlcMediaListScreen(Screen):
 			<ePixmap size="551,325" alphatest="on" position="5,30" pixmap="skin_default/border_epg.png" />
 			<widget size="320,25" alphatest="on" position="5,10" zPosition="1" name="filelist_button_sel" pixmap="skin_default/epg_now.png" />
 			<widget size="320,25" alphatest="on" position="5,10" zPosition="1" name="playlist_button_sel" pixmap="skin_default/epg_next.png" />
-			<widget valign="center" transparent="1" size="108,22" backgroundColor="#25062748" position="5,10" zPosition="2" name="filelist_text" halign="center" font="Regular;18" text="Filelist" />
-			<widget valign="center" transparent="1" size="108,22" backgroundColor="#25062748" position="111,10" zPosition="2" name="playlist_text" halign="center" font="Regular;18" text="Playlist" />
+			<widget valign="center" transparent="1" size="108,22" backgroundColor="#25062748" position="5,10" zPosition="2" name="filelist_text" halign="center" font="Regular;18" />
+			<widget valign="center" transparent="1" size="108,22" backgroundColor="#25062748" position="111,10" zPosition="2" name="playlist_text" halign="center" font="Regular;18" />
 			<widget size="540,320" scrollbarMode="showOnDemand" position="11,35" name="filelist" />
 			<widget size="540,320" scrollbarMode="showOnDemand" position="11,35" name="playlist" />
 		</screen>"""
@@ -60,8 +60,8 @@ class VlcMediaListScreen(Screen):
 		self["filelist_button_sel"] = Pixmap()
 		self["playlist_button_sel"] = Pixmap()
 		self["more_button_sel"] = Pixmap()
-		self["filelist_text"] = Label()
-		self["playlist_text"] = Label()
+		self["filelist_text"] = Label(_("Filelist"))
+		self["playlist_text"] = Label(_("Playlist"))
 		self["server_name"] = Label(server.getName())
 		self["current_dir"] = Label()
 		
diff --git a/vlcplayer/src/VlcServerList.py b/vlcplayer/src/VlcServerList.py
index afe5b68..d52509f 100644
--- a/vlcplayer/src/VlcServerList.py
+++ b/vlcplayer/src/VlcServerList.py
@@ -10,26 +10,25 @@
 #===============================================================================
 
 
-from enigma import eListboxPythonMultiContent, RT_HALIGN_LEFT, gFont
-from Components.config import config
-from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
-from Components.Label import Label
 from Components.Button import Button
+from Components.Label import Label
+from Components.MenuList import MenuList
 from Screens.MessageBox import MessageBox
 from Screens.Screen import Screen
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from Tools.LoadPixmap import LoadPixmap
-
+from VlcMediaList import VlcMediaListScreen
 from VlcServerConfig import VlcServerConfig
 from VlcServerConfig import VlcServerConfigScreen
-from VlcMediaList import VlcMediaListScreen
-from VlcServerConfig import vlcPluginInfo, _
+from enigma import eListboxPythonMultiContent, RT_HALIGN_LEFT, gFont
+from . import _
 
 def VlcServerListEntry(vlcServer):
 	res = [ vlcServer ]
 	res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, vlcServer.getName()))
 
-	png = LoadPixmap(vlcPluginInfo.pluginPath + "/vlc.png")
+	png = LoadPixmap(resolveFilename(SCOPE_PLUGINS, "Extensions/VlcPlayer/vlc.png"))
 	if png is not None:
 		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 10, 2, 20, 20, png))
 
@@ -76,7 +75,7 @@ class VlcServerListScreen(Screen):
 		self.serverlist = VlcServerList()
 		self.vlcServerConfig = VlcServerConfig()
 
-		self["serverlabel"] = Label("List of known VLC-Server")
+		self["serverlabel"] = Label(_("List of known VLC-Servers"))
 		self["serverlist"] = self.serverlist
 		self["key_red"] = Button(_("delete server"))
 		self["key_green"] = Button(_("add server"))
-- 
2.7.4