diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 88d63941..53704033 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -2868,7 +2868,7 @@ - + Build @@ -2878,96 +2878,96 @@ - + Testing your internet connection, please wait... - - + + It appears that the computer currently is offline! - - + + Please make sure your computer is connected to the internet and try again. - - + + Network connectivity test has failed! - - + + Please make sure your internet connection is working properly and try again. - + Checking for new updates online, please wait... - + Failed to fetch update information from server! - + Sorry, the update server might be busy at this time. Plase try again later. - + More information available at: - + A new version of LameXP is available! - + We highly recommend all users to install this update as soon as possible. - + No new updates available at this time. - + Your version of LameXP is still up-to-date. Please check for updates regularly! - + Your version appears to be newer than the latest release. - + This usually indicates your are currently using a pre-release version of LameXP. - + Update is being downloaded, please be patient... - + Update ready to install. Applicaion will quit... - + Update failed. Please try again or download manually! diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index d30868c2..cb61b47e 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -2868,7 +2868,7 @@ - + Build Build @@ -2878,96 +2878,96 @@ Nieznany - + Testing your internet connection, please wait... Testowanie połączenia internetowego, prosze czekać... - - + + It appears that the computer currently is offline! LameXP wykrył brak dostępu do internetu! - - + + Please make sure your computer is connected to the internet and try again. Upewnij się że komputer jest podłączony do internetu i spróbuj ponownie. - - + + Network connectivity test has failed! Test połączenia internetowego zakończony niepowodzeniem! - - + + Please make sure your internet connection is working properly and try again. Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie. - + Checking for new updates online, please wait... Sprawdzanie aktualizacji online, prosze czekać... - + Failed to fetch update information from server! Pobieranie informacji z serwera zakończone niepowodzeniem! - + Sorry, the update server might be busy at this time. Plase try again later. Serwer aktualizacji wydaje się nie odpowiadać w tej chwili. Prosze spróbować później. - + More information available at: Więcej informacji tutaj: - + A new version of LameXP is available! Dostępna nowa wersja LameXP! - + We highly recommend all users to install this update as soon as possible. Jest wysoce zalecane aby zainstalować tę aktualizację jak najszybciej. - + No new updates available at this time. Nie ma nowych aktualizacji w tej chwili. - + Your version of LameXP is still up-to-date. Please check for updates regularly! Posiadasz najnowszą wersję LameXP. Sprawdzaj aktualizacje regularnie! - + Your version appears to be newer than the latest release. Posiadasz nowszą wersję LameXP niż ostatnie wydanie. - + This usually indicates your are currently using a pre-release version of LameXP. To wskazuje na to, że posiadasz wersję alfa LameXP. - + Update is being downloaded, please be patient... Pobieranie aktualizacji w toku, prosze czekać... - + Update ready to install. Applicaion will quit... Aktualizacja gotowa do instalacji. Teraz program zostanie zamknięty... - + Update failed. Please try again or download manually! Aktualizacja zakończona niepowodzeniem. Prosze spróbować ponownie lub zainstalować ręcznie! diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index 40be0b69..d2b199b1 100644 Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ diff --git a/src/Config.h b/src/Config.h index f4ad280c..badc87fa 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 6 -#define VER_LAMEXP_BUILD 800 +#define VER_LAMEXP_BUILD 801 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp index 1af72b8b..f4c73099 100644 --- a/src/Dialog_Update.cpp +++ b/src/Dialog_Update.cpp @@ -135,7 +135,7 @@ static const char *known_hosts[] = //Taken form: http://www.alexa.com/topsites "http://www.weibo.com/", "http://www.wikipedia.org/", "http://wordpress.com/", - "http://www.yahoo.com/", + "http://us.yahoo.com/", "http://www.yandex.ru/", "http://www.youtube.com/", "http://www.zedo.com/", @@ -398,14 +398,14 @@ void UpdateDialog::checkForUpdates(void) if(getFile(currentHost, outFile, 0, &httpOk)) { connectionScore++; - progressBar->setValue(connectionScore + 1); + progressBar->setValue(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1)); QApplication::processEvents(); Sleep(125); } if(httpOk) { connectionScore++; - progressBar->setValue(connectionScore + 1); + progressBar->setValue(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1)); QApplication::processEvents(); Sleep(125); } @@ -970,8 +970,8 @@ void UpdateDialog::testKnownWebSites(void) int hostCount = hostList.count(); while(!hostList.isEmpty()) { - progressBar->setValue(progressBar->value() + 1); QString currentHost = hostList.takeFirst(); + progressBar->setValue(qRound((static_cast(progressBar->maximum() - 1) / static_cast(hostCount)) * static_cast(connectionScore)) + 1); qDebug("Testing: %s", currentHost.toLatin1().constData()); m_logFile->append(QStringList() << "" << "Testing host:" << currentHost << ""); QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str()); @@ -1003,10 +1003,10 @@ void UpdateDialog::testKnownWebSites(void) retryButton->setEnabled(true); logButton->setEnabled(true); if(frameAnimation->isVisible()) frameAnimation->hide(); - statusLabel->setText(tr("Network connectivity test has failed!")); + statusLabel->setText("At least one host could not be reached!"); progressBar->setValue(progressBar->maximum()); hintIcon->setPixmap(QIcon(":/icons/network_error.png").pixmap(16,16)); - hintLabel->setText(tr("Please make sure your internet connection is working properly and try again.")); + hintLabel->setText("Please make sure your internet connection is working properly and try again."); hintIcon->show(); hintLabel->show(); LAMEXP_DELETE(m_updateInfo);