diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 3ae068e32..46da1a908 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -682,6 +682,15 @@ flashupdate.selectimage Dostupné verzie / súbory flashupdate.settings Aktualizácia nastavení flashupdate.titlereadflash Načítavanie pamäte FLASH flashupdate.titlewriteflash Zapisovanie pamäte FLASH +flashupdate.type_addon Doplnok +flashupdate.type_beta Beta +flashupdate.type_internal Interná +flashupdate.type_locale Jazyk +flashupdate.type_release Release +flashupdate.type_settings Nastavenia +flashupdate.type_text Text +flashupdate.type_unknown Neznáma +flashupdate.type_update Aktualizácia flashupdate.update_with_settings_del_skipped Zložka [%s] nebola vymazaná. Zadanie je preskočené. flashupdate.update_with_settings_error Chyba FLASH pamäte!\n \nNový IMAGE má len %ld KB (ostáva %ld KB) do konca. \nnedostatok miesta pre dokončenie operácie.\n \nOperácia prerušená! flashupdate.update_with_settings_processed IMAGE sa spracováva... diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp index 016e5e28a..75fef22d1 100644 --- a/src/driver/screenshot.cpp +++ b/src/driver/screenshot.cpp @@ -266,7 +266,7 @@ bool CScreenShot::SaveJpg() int xres2 = xres1+2; for (int x = 0; x < xres; x++) { int x2 = x*3; - memcpy(pixel_data + x2 + xres1, pixel_data + x*4 + y*xres*4, 3); + memmove(pixel_data + x2 + xres1, pixel_data + x*4 + y*xres*4, 3); SWAP(pixel_data[x2 + xres1], pixel_data[x2 + xres2]); } } diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 2107c9a9f..edc320887 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -1334,7 +1334,6 @@ int CScanSetup::showScanMenuSatFind() //init tempsat menu void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satconfig) { - bool unicable = (dmode == DISEQC_UNICABLE ? true : dmode == DISEQC_UNICABLE2); temp_sat->addIntroItems(); CMenuOptionNumberChooser *diseqc = NULL; @@ -1344,6 +1343,7 @@ void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satcon CMenuOptionNumberChooser *motor = NULL; CMenuOptionChooser *usals = NULL; CMenuForwarder *mf; + bool unicable = (dmode == DISEQC_UNICABLE ? true : dmode == DISEQC_UNICABLE2); if (!unicable) { diseqc = new CMenuOptionNumberChooser(LOCALE_SATSETUP_DISEQC_INPUT, &satconfig.diseqc, ((dmode != NO_DISEQC) && (dmode != DISEQC_ADVANCED)), -1, 15, this, CRCInput::RC_nokey, NULL, 1, -1, LOCALE_OPTIONS_OFF); diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index f7b90b371..589f49fe7 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -158,6 +158,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings ::TIMING_MENU]); + int val = (*value[selected]); switch ( msg ) { case CRCInput::RC_down: { @@ -190,12 +191,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) } case CRCInput::RC_right: { - if ((*value[selected]) < 100) + if (val < 100) { - if ((*value[selected]) < 98) - (*value[selected]) += 2; + if (val < 98) + val += 2; else - (*value[selected]) = 100; + val = 100; paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); setColor(); @@ -204,12 +205,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) } case CRCInput::RC_left: { - if ((*value[selected]) > 0) + if (val > 0) { - if ((*value[selected]) > 2) - (*value[selected]) -= 2; + if (val > 2) + val -= 2; else - (*value[selected]) = 0; + val = 0; paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); setColor(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 55d2fbae3..96580c8c1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -906,7 +906,10 @@ int CNeutrinoApp::loadSetup(const char * fname) // USERMENU -> in system/settings.h //------------------------------------------- - + for(unsigned int i=0; i