aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoracid-burn <acidburn@opendreambox.org>2009-10-14 11:06:41 +0000
committeracid-burn <acidburn@opendreambox.org>2009-10-14 11:06:41 +0000
commitcccb35a4aeef1ba919411b35553902c86f57b856 (patch)
tree1cd1a5da7cb17c1d388124ecdd76c3caf81d1573 /lib
parent755936c5114029219a6800b81b74ffdfbcbbfe30 (diff)
parent1562ec44f47fbe9722c95ac1bcc31658c672af2d (diff)
downloadenigma2-cccb35a4aeef1ba919411b35553902c86f57b856.tar.gz
enigma2-cccb35a4aeef1ba919411b35553902c86f57b856.zip
Merge branch 'master' of /git/enigma2
Diffstat (limited to 'lib')
-rw-r--r--lib/dvb/frontend.cpp2
-rwxr-xr-xlib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 0319c4c9..c6bf6aa8 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -804,7 +804,7 @@ int eDVBFrontend::readFrontendData(int type)
ret = (int)(snr_in_db * 100);
}
else if (strstr(m_description, "Alps BSBE1 C01A") ||
- !strcmp(m_description, "Alps -S(STV0288)"))
+ strstr(m_description, "Alps -S(STV0288)"))
{
if (snr == 0)
ret = 0;
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index c10a7e5f..3a1f835f 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -1217,9 +1217,9 @@ class PluginManagerInfo(Screen):
if action == 'install':
return(( _('Installing'), info, installpng, divpng))
elif action == 'remove':
- return(( _('Removeing'), info, removepng, divpng))
+ return(( _('Removing'), info, removepng, divpng))
else:
- return(( _('Upgradeing'), info, upgradepng, divpng))
+ return(( _('Upgrading'), info, upgradepng, divpng))
def exit(self):
self.close(False)