Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'e2/master'

  • Loading branch information...
commit 0bd3484d484b866f03825ef8269727c17fa37383 2 parents e7fbe2f + 6a4937c
@andyblac andyblac authored
View
1  advhdmi/po/Makefile.am
@@ -1,4 +1,3 @@
PLUGIN = AdvHdmi
CATEGORY = SystemPlugins
-LANGS = de
include $(top_srcdir)/Rules-po.mak
View
190 advhdmi/po/it.po
@@ -0,0 +1,190 @@
+# Signed-off-by: Dario Croci <spaeleus@croci.org>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enigma2 plugin - AdvHdmi\n"
+"POT-Creation-Date: 2013-05-09 10:29+0100\n"
+"PO-Revision-Date: 2013-05-09 12:41+0100\n"
+"Last-Translator: Spaeleus <spaeleus@croci.org>\n"
+"Language-Team: www.linsat.net <spaeleus@croci.org>\n"
+"Language: it_IT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .../enigma2-plugins/advhdmi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .../enigma2-plugins/advhdmi\n"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:41
+#: .../enigma2-plugins/advhdmi/src/plugin.py:50
+msgid "Monday"
+msgstr "Lunedì"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:42
+#: .../enigma2-plugins/advhdmi/src/plugin.py:51
+msgid "Tuesday"
+msgstr "Martedì"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:43
+#: .../enigma2-plugins/advhdmi/src/plugin.py:52
+msgid "Wednesday"
+msgstr "Mercoledì"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:44
+#: .../enigma2-plugins/advhdmi/src/plugin.py:53
+msgid "Thursday"
+msgstr "Giovedì"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:45
+#: .../enigma2-plugins/advhdmi/src/plugin.py:54
+msgid "Friday"
+msgstr "Venerdì"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:46
+#: .../enigma2-plugins/advhdmi/src/plugin.py:55
+msgid "Saturday"
+msgstr "Sabato"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:47
+#: .../enigma2-plugins/advhdmi/src/plugin.py:56
+msgid "Sunday"
+msgstr "Domenica"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:64
+msgid "systemmenue"
+msgstr "Menu sistema"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:65
+msgid "pluginmenue"
+msgstr "Menu plugin"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:66
+msgid "extensions"
+msgstr "Estensioni"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:83
+msgid "Advanced HDMI-Cec Setup"
+msgstr "Impostazioni Advanced HDMI-Cec"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:89
+msgid "Cancel"
+msgstr "Annullare"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:90
+msgid "Save"
+msgstr "Salvare"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:123
+msgid "partially disabel HdmiCec"
+msgstr "HdmiCec parzialmente disabiliato"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:123
+msgid ""
+"Partially disabel HDMI-Cec?\n"
+"It can be prevented only the signals that are sent from the Dreambox. "
+"Signals received by the Dreambox will not be prevented."
+msgstr ""
+"Determinare se disabilitare parzialmente HDMI-Cec.\n"
+"Possono essere intercettati solo i segnali inviati dal Dreambox. I segnali "
+"ricevuti dal Dreambox non possono essere intercettati."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:125
+msgid "disable at GUI-start"
+msgstr "Disabilitare all'avvio GUI"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:125
+msgid "Should HDMI-Cec be disabled when GUI service startup?"
+msgstr ""
+"Determinare se disabiliatare HDMI-Cec all'avvio dell'interfaccia grafica."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:126
+msgid "disable from webinterface"
+msgstr "Disabilitare nella interfaccia web"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:126
+msgid ""
+"Should HDMI-Cec be disabled when the commands are sent from the web "
+"interface?"
+msgstr ""
+"determinare se disabilitare HDMI-Cec nei comandi inviati tramite "
+"l'interfaccia web."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:127
+msgid "disable chronologically"
+msgstr "Disabilitare cronologicamente"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:127
+msgid "Should HDMI-Cec be disabled at certain times?"
+msgstr ""
+"Determinare se disabilitare HMI-Cec in determinati intervalli temporali."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:129
+msgid "from weekday"
+msgstr "Dal giorno"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:129
+msgid "From which day of the week, HDMI-Cec should be disabled?"
+msgstr "Giorno della settimana in cui iniziare a disabilitare HDMI-Cec."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:130
+msgid "to weekday"
+msgstr "Al giorno"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:130
+msgid "To what day of the week, HDMI-Cec should be disabled?"
+msgstr "Giorno della settimana in cui cessare la disabilitazione di HDMI-Cec."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:131
+#: .../enigma2-plugins/advhdmi/src/plugin.py:135
+msgid "from (HH:MI)"
+msgstr "Dalle (HH:MM)"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:131
+msgid "At which time, HDMI-Cec should be disabled?"
+msgstr "Ora in cui iniziare a disabilitare HDMI-Cec."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:132
+#: .../enigma2-plugins/advhdmi/src/plugin.py:136
+msgid "to (HH:MI)"
+msgstr "Alle (HH:MM)"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:132
+msgid "Until the time at which, HDMI-Cec should be disabled?"
+msgstr "Ora in cui cessare la disabilitazione diHDMI.Cec."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:133
+msgid "use second timespan"
+msgstr "Usare un secondo intervallo temporale"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:133
+msgid "Do you want a further period of time to be used?"
+msgstr "Determinare se impostare un ulteriore intervallo temporale."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:135
+msgid "Second timespan from"
+msgstr "Secondo intervallo temporale: dalle"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:136
+msgid "Second timespan to"
+msgstr "Secondo intervallo temporale: alle"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:137
+msgid "show in"
+msgstr "Mostrare nel"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:137
+msgid "Where should this setup be displayed?"
+msgstr "Menu nei quali inserire l'accesso alle impostazioni."
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:189
+msgid "Advanced HDMI Cec Setup"
+msgstr "Impostazioni Advanced HDMI Cec"
+
+#: .../enigma2-plugins/advhdmi/src/plugin.py:208
+#: .../enigma2-plugins/advhdmi/src/plugin.py:215
+#: .../enigma2-plugins/advhdmi/src/plugin.py:223
+msgid "manage when HDMI Cec is enabled"
+msgstr "Gestire quando abilitare HDMI-Cec"
View
7 ardmediathek/src/plugin.py
@@ -397,12 +397,7 @@ def downloadThumbnailCallback(self, txt=""):
def buildEntry(self, picInfo=None):
movie = self.movies[0]
- thumb = None
- if picInfo:
- ptr = self.picload.getData()
- if ptr != None:
- thumb = ptr
- self.listMovies.append(ARDMenuListSubEntry(movie, thumb))
+ self.listMovies.append(ARDMenuListSubEntry(movie, self.picload.getData()))
del self.movies[0]
self.buildList()
View
13 fritzcall/src/FritzCallFBF.py
@@ -2,12 +2,14 @@
'''
Created on 30.09.2012
$Author: michael $
-$Revision: 771 $
-$Date: 2013-04-06 12:08:41 +0200 (Sat, 06 Apr 2013) $
-$Id: FritzCallFBF.py 771 2013-04-06 10:08:41Z michael $
+$Revision: 776 $
+$Date: 2013-05-11 13:15:24 +0200 (Sat, 11 May 2013) $
+$Id: FritzCallFBF.py 776 2013-05-11 11:15:24Z michael $
'''
-from . import _, __, debug #@UnresolvedImport # pylint: disable=E0611,F0401
+# pylint: disable=W1401,E0611,F0401
+
+from . import _, __, debug #@UnresolvedImport
from plugin import config, fritzbox, stripCbCPrefix, resolveNumberWithAvon, FBF_IN_CALLS, FBF_OUT_CALLS, FBF_MISSED_CALLS
from Tools import Notifications
from Screens.MessageBox import MessageBox
@@ -1318,7 +1320,8 @@ def _parseFritzBoxPhonebook(self, html):
if found:
charset = found.group(1)
debug("[FritzCallFBF_05_50] _parseFritzBoxPhonebook: found charset: " + charset)
- html = html2unicode(html.replace(chr(0xf6),'').decode(charset)).encode('utf-8')
+ if charset != 'utf-8':
+ html = html2unicode(html.replace(chr(0xf6),'').decode(charset)).encode('utf-8')
else: # this is kind of emergency conversion...
try:
debug("[FritzCallFBF_05_50] _parseFritzBoxPhonebook: try charset utf-8")
View
16 fritzcall/src/plugin.py
@@ -2,9 +2,9 @@
'''
Update rev
$Author: michael $
-$Revision: 773 $
-$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $
-$Id: plugin.py 773 2013-04-07 08:03:55Z michael $
+$Revision: 777 $
+$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $
+$Id: plugin.py 777 2013-05-28 16:34:35Z michael $
'''
@@ -119,7 +119,7 @@ def getMountedDevs():
def handleMountpoint(loc):
# debug("[FritzCall] handleMountpoint: %s" %repr(loc))
mp = loc[0]
- while mp[-1] == '/':
+ while len(mp) > 1 and mp[-1] == '/':
mp = mp[:-1]
#=======================================================================
# if os.path.exists(os.path.join(mp, "PhoneBook.txt")):
@@ -301,8 +301,8 @@ def __init__(self, session):
self["text"] = Label(
"FritzCall Plugin" + "\n\n" +
"$Author: michael $"[1:-2] + "\n" +
- "$Revision: 773 $"[1:-2] + "\n" +
- "$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[1:23] + "\n"
+ "$Revision: 777 $"[1:-2] + "\n" +
+ "$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[1:23] + "\n"
)
self["url"] = Label("http://wiki.blue-panel.com/index.php/FritzCall")
self.onLayoutFinish.append(self.setWindowTitle)
@@ -1884,7 +1884,7 @@ def __init__(self, session, args=None): #@UnusedVariable # pylint: disable=W0613
def setWindowTitle(self):
# TRANSLATORS: this is a window title.
- self.setTitle(_("FritzCall Setup") + " (" + "$Revision: 773 $"[1: - 1] + "$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[7:23] + ")")
+ self.setTitle(_("FritzCall Setup") + " (" + "$Revision: 777 $"[1: - 1] + "$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[7:23] + ")")
def keyLeft(self):
ConfigListScreen.keyLeft(self)
@@ -2407,7 +2407,7 @@ def notifyAndReset(self, number, caller):
class FritzProtocol(LineReceiver):
def __init__(self):
- debug("[FritzProtocol] " + "$Revision: 773 $"[1:-1] + "$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[7:23] + " starting")
+ debug("[FritzProtocol] " + "$Revision: 777 $"[1:-1] + "$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[7:23] + " starting")
global mutedOnConnID
mutedOnConnID = None
self.number = '0'
View
9 movielistpreview/src/plugin.py
@@ -110,11 +110,10 @@ def showPreview(self, movie):
self.picload.startDecode(png)
def showPreviewCallback(self, picInfo=None):
- if picInfo:
- ptr = self.picload.getData()
- if ptr != None:
- self.dialog["preview"].instance.setPixmap(ptr)
- self.dialog.show()
+ ptr = self.picload.getData()
+ if ptr != None:
+ self.dialog["preview"].instance.setPixmap(ptr)
+ self.dialog.show()
self.working = False
def hideDialog(self):
View
2  partnerbox/src/servicewebts/servicewebts.h
@@ -131,7 +131,7 @@ DECLARE_REF(eServiceWebTS);
int getCurrentTrack();
// iAudioChannelSelection
- int getCurrentChannel() { return iAudioChannelSelection_ENUMS::STEREO; };
+ int getCurrentChannel() { return iAudioChannelSelection::STEREO; }
RESULT selectChannel(int i) { return 0; };
private:
View
2  vlcplayer/src/servicets/servicets.h
@@ -105,7 +105,7 @@ DECLARE_REF(eServiceTS);
int getCurrentTrack();
// iAudioChannelSelection
- int getCurrentChannel() { return iAudioChannelSelection_ENUMS::STEREO; };
+ int getCurrentChannel() { return iAudioChannelSelection::STEREO; }
RESULT selectChannel(int i) { return 0; };
private:
View
30 weatherplugin/src/plugin.py
@@ -32,7 +32,7 @@
from twisted.web.client import getPage, downloadPage
from urllib import quote
from Components.Pixmap import Pixmap
-from enigma import ePicLoad, eEnv
+from enigma import eEnv, ePicLoad, eRect, eSize, gPixmapPtr
from os import path as os_path, mkdir as os_mkdir
from Components.AVSwitch import AVSwitch
from Components.config import ConfigSubsection, ConfigSubList, ConfigInteger, config
@@ -299,22 +299,28 @@ def __init__(self):
def onShow(self):
Pixmap.onShow(self)
sc = AVSwitch().getFramebufferScale()
- self.picload.setPara((self.instance.size().width(), self.instance.size().height(), sc[0], sc[1], True, 2, '#ff000000'))
+ self._aspectRatio = eSize(sc[0], sc[1])
+ self._scaleSize = self.instance.size()
+ self.picload.setPara((self._scaleSize.width(), self._scaleSize.height(), sc[0], sc[1], True, 2, '#ff000000'))
def paintIconPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if ptr is not None:
- try:
+ pic_scale_size = eSize()
+ # To be added in the future:
+ if 'scale' in eSize.__dict__ and self._scaleSize.isValid() and self._aspectRatio.isValid():
+ pic_scale_size = ptr.size().scale(self._scaleSize, self._aspectRatio)
+ # To be removed in the future:
+ elif 'scaleSize' in gPixmapPtr.__dict__:
pic_scale_size = ptr.scaleSize()
- if pic_scale_size.isValid():
- pic_scale_width = pic_scale_size.width()
- pic_scale_height = pic_scale_size.height()
- dest_rect = eRect(0, 0, pic_scale_width, pic_scale_height)
- self.instance.setScale(1)
- self.instance.setScaleDest(dest_rect)
- else:
- self.instance.setScale(0)
- except:
+
+ if pic_scale_size.isValid():
+ pic_scale_width = pic_scale_size.width()
+ pic_scale_height = pic_scale_size.height()
+ dest_rect = eRect(0, 0, pic_scale_width, pic_scale_height)
+ self.instance.setScale(1)
+ self.instance.setScaleDest(dest_rect)
+ else:
self.instance.setScale(0)
self.instance.setPixmap(ptr)
else:
Please sign in to comment.
Something went wrong with that request. Please try again.