From 3e2e6f66e6de6d294011250aaa548a4eb2549495 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 3 Dec 2011 16:10:33 +0100 Subject: [PATCH] Small fix of previous commit. --- etc/Translation/Blank.ts | 46 +++++++++++++++++----------------- etc/Translation/LameXP_PL.ts | 46 +++++++++++++++++----------------- res/localization/LameXP_UK.qm | Bin 74604 -> 75046 bytes src/Config.h | 2 +- src/Dialog_Update.cpp | 12 ++++----- 5 files changed, 53 insertions(+), 53 deletions(-) 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 40be0b69f24f11da8c5030a1cf4744ea86f1c056..d2b199b1a9d15de0e63e21706341d0f4bdb6985d 100644 GIT binary patch delta 841 zcma)(T}abW7{;G-cDDbv|Gt`Ov}H}HG|W||OVec5?Zi()R z8Jz%1f!aHOwitL2mRbYEP6NwV0AKF+6bxmuOQ_7*1q4r_(h~!28-D1U%J0hfNlIlN zZum%5teRWyQJndm471q8>si3sYL>dt4&-cMlRBS*Y0gqQ@8IS~6z3k!M`)A>xT%Z0 zntk^7*&3^R2uL!Gvporh8#Jo9&vjLl5FMG?5wX-eAK1ED)U|Jyq*4)fRs+Ych^Cev zFnb|YX>U8kN|CJF3+$=U+TI=pjv zRTi-4)TK;guPLDfjQZWWor$|(;tQqgTe4+5=eA+VHf8hQFO zkwME+()*82xbV)GDW-|VVv+EP0#OE+D3@EI$P;r#9$c7#d2s8c2Rb>9WlfEn{L!c@ z5Q>DNL4Un#L!jB;a)66x%xxX?~=hO)wa zfQyt1p>c;=UUmS-vgA+rfX=fNy!06)yu3|J2v?emA}%PwRWT^^Iwz$mU#%>e(M90* z87Y)+0GqqHDt#34bGGG)b~zz;CHDa1{c>;qB8Y5xB$NeapULOW&w#8s&M1{u@kVa+ zP6AiE73=#g;O+%wOV2dWusG&e6@L=!S0kc6&PjDE52$gPYMQzBqWN#_G}lM317m?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);