diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index f8348e7cb..87b048c50 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -650,7 +650,7 @@ flashupdate.apply_settings Sollen die aktuellen Einstellungen in das neue Image
 flashupdate.autocheck Beim Start nach Updates suchen
 flashupdate.cantopenfile kann Datei nicht öffnen
 flashupdate.cantopenmtd kann MTD nicht öffnen
-flashupdate.checkupdate_internet Online nach Updates suchen
+flashupdate.checkupdate_internet Online-Update
 flashupdate.checkupdate_local Lokales Update
 flashupdate.copy_image Kopiere Image in den Arbeitsspeicher
 flashupdate.createimage Image speichern
@@ -704,7 +704,7 @@ flashupdate.namemode2_hostname_time <Partition>+<Zeit>+<Hostname>.img
 flashupdate.new_found Updates verfügbar!
 flashupdate.new_notfound Keine Updates verfügbar!
 flashupdate.ng_noflash USB-Image aktiv, Update nicht möglich!
-flashupdate.noversion Bei Updates werden Versionsüberprüfungen derzeit nur über Web-Updates unterstützt.\nWollen Sie das ausgewählte Image wirklich installieren?
+flashupdate.noversion Eine Versionsüberprüfungen ist nur über das Online-Update möglich.\nWollen Sie das ausgewählte Image trotzdem installieren?
 flashupdate.programmingflash programmiere Flash
 flashupdate.proxypassword Passwort
 flashupdate.proxypassword_hint1 Geben sie das Proxy-Passwort ein
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 05a413178..023fcede6 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -650,7 +650,7 @@ flashupdate.apply_settings Import current settings into new image?
 flashupdate.autocheck Auto-check updates on boot
 flashupdate.cantopenfile can't open file
 flashupdate.cantopenmtd can't open MTD
-flashupdate.checkupdate_internet Check for online updates
+flashupdate.checkupdate_internet Online update
 flashupdate.checkupdate_local Local update
 flashupdate.copy_image Copy Image to main memory
 flashupdate.createimage Save image
@@ -704,7 +704,7 @@ flashupdate.namemode2_hostname_time <partition>+<time>+<hostname>.img
 flashupdate.new_found New image found !
 flashupdate.new_notfound No new images found
 flashupdate.ng_noflash USB-Image active, update canceled!
-flashupdate.noversion Version checks are currently only supported when updating over the web.\nAre you sure that you wish to install this image?
+flashupdate.noversion Version check is only supported via Online update.\nAre you sure that you want to install this image?
 flashupdate.programmingflash programming flash
 flashupdate.proxypassword Password
 flashupdate.proxypassword_hint1 enter the proxyserver password
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index 9be812d73..58e2eaaa8 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -1421,9 +1421,9 @@ void CTimerList::paintFoot()
 	footer.enableShadow(CC_SHADOW_ON, -1, true);
 
 	if (timerlist.empty())
-		footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1]), width/(2+1));
+		footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1]));
 	else
-		footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons, width/(c-1));
+		footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons);
 }
 
 void CTimerList::paint()
diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index b289503ce..bd918163d 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -291,7 +291,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 	}
 
 	if((oldmask != newmask) || force_update) {
-		INFO("    ##NI: (oldmask != newmask) || force_update)");
+		//INFO("    ##NI: (oldmask != newmask) || force_update)");
 		cam->setCaMask(newmask);
 		cam->setSource(source);
 		if(newmask != 0 && (!filter_channels || !channel->bUseCI)) {
@@ -301,7 +301,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 	}
 
 	if(newmask == 0) {
-		INFO("    ##NI: (newmask == 0)");
+		//INFO("    ##NI: (newmask == 0)");
 		/* FIXME: back to live channel from playback dont parse pmt and call setCaPmt
 		 * (see CMD_SB_LOCK / UNLOCK PLAYBACK */
 		//channel->setRawPmt(NULL);//FIXME
@@ -326,7 +326,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 		if(start) {
 			if ((tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) || (filter_channels && channel->bUseCI)) {
 				rmode = true;
-				INFO("    ##NI: rmode");
+				//INFO("    ##NI: rmode");
 			}
 
 		} else
@@ -342,7 +342,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 		list = CCam::CAPMT_ADD;
 
 #ifdef BOXMODEL_CS_HD2
-	INFO("    ##NI: channel_map.size() %d",channel_map.size());
+	//INFO("    ##NI: channel_map.size() %d",channel_map.size());
 	int ci_use_count = 0;
 	for (it = channel_map.begin(); it != channel_map.end(); ++it)
 	{
@@ -360,7 +360,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 			ci_use_count++;
 	}
 	if (ci_use_count == 0) {
-		INFO("CI: not used for [%s], disabling TS\n",channel->getName().c_str());
+		INFO("CI: not used for [%s], disabling TS",channel->getName().c_str());
 		cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED);
 	}
 #endif
@@ -384,12 +384,12 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 		cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD);
 
 		if (tunerno >= 0 && tunerno != cDemux::GetSource(cam->getSource())) {
-			INFO("CI: configured tuner %d do not match %d, skip [%s]\n", tunerno, cam->getSource(), channel->getName().c_str());
+			INFO("CI: configured tuner %d do not match %d, skip [%s]", tunerno, cam->getSource(), channel->getName().c_str());
 		} else if (filter_channels && !channel->bUseCI) {
-			INFO("CI: filter enabled, CI not used for [%s]\n", channel->getName().c_str());
+			INFO("CI: filter enabled, CI not used for [%s]", channel->getName().c_str());
 		} else {
 			useCI = true; //NI
-			INFO("CI: use CI for [%s]\n", channel->getName().c_str());
+			INFO("CI: use CI for [%s]", channel->getName().c_str());
 			cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
 		}
 		//list = CCam::CAPMT_MORE;