Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Small fix of previous commit.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-12-03 16:10:33 +01:00
parent 1585e6e467
commit 3e2e6f66e6
5 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
etc/Translation/Blank.ts
View File

@ -2868,7 +2868,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="247"/> <location filename="../../src/Dialog_Update.cpp" line="247"/>
<location filename="../../src/Dialog_Update.cpp" line="500"/> <location filename="../../src/Dialog_Update.cpp" line="507"/>
<source>Build</source> <source>Build</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2878,96 +2878,96 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="344"/> <location filename="../../src/Dialog_Update.cpp" line="343"/>
<source>Testing your internet connection, please wait...</source> <source>Testing your internet connection, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="364"/> <location filename="../../src/Dialog_Update.cpp" line="363"/>
<location filename="../../src/Dialog_Update.cpp" line="928"/> <location filename="../../src/Dialog_Update.cpp" line="945"/>
<source>It appears that the computer currently is offline!</source> <source>It appears that the computer currently is offline!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="367"/> <location filename="../../src/Dialog_Update.cpp" line="366"/>
<location filename="../../src/Dialog_Update.cpp" line="931"/> <location filename="../../src/Dialog_Update.cpp" line="948"/>
<source>Please make sure your computer is connected to the internet and try again.</source> <source>Please make sure your computer is connected to the internet and try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="417"/> <location filename="../../src/Dialog_Update.cpp" line="424"/>
<location filename="../../src/Dialog_Update.cpp" line="978"/> <location filename="../../src/Dialog_Update.cpp" line="1006"/>
<source>Network connectivity test has failed!</source> <source>Network connectivity test has failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="420"/> <location filename="../../src/Dialog_Update.cpp" line="427"/>
<location filename="../../src/Dialog_Update.cpp" line="981"/> <location filename="../../src/Dialog_Update.cpp" line="1009"/>
<source>Please make sure your internet connection is working properly and try again.</source> <source>Please make sure your internet connection is working properly and try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="434"/> <location filename="../../src/Dialog_Update.cpp" line="441"/>
<source>Checking for new updates online, please wait...</source> <source>Checking for new updates online, please wait...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="485"/> <location filename="../../src/Dialog_Update.cpp" line="492"/>
<source>Failed to fetch update information from server!</source> <source>Failed to fetch update information from server!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="490"/> <location filename="../../src/Dialog_Update.cpp" line="497"/>
<source>Sorry, the update server might be busy at this time. Plase try again later.</source> <source>Sorry, the update server might be busy at this time. Plase try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="502"/> <location filename="../../src/Dialog_Update.cpp" line="509"/>
<source>More information available at:</source> <source>More information available at:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="508"/> <location filename="../../src/Dialog_Update.cpp" line="515"/>
<source>A new version of LameXP is available!</source> <source>A new version of LameXP is available!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="510"/> <location filename="../../src/Dialog_Update.cpp" line="517"/>
<source>We highly recommend all users to install this update as soon as possible.</source> <source>We highly recommend all users to install this update as soon as possible.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="519"/> <location filename="../../src/Dialog_Update.cpp" line="526"/>
<source>No new updates available at this time.</source> <source>No new updates available at this time.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="521"/> <location filename="../../src/Dialog_Update.cpp" line="528"/>
<source>Your version of LameXP is still up-to-date. Please check for updates regularly!</source> <source>Your version of LameXP is still up-to-date. Please check for updates regularly!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="530"/> <location filename="../../src/Dialog_Update.cpp" line="537"/>
<source>Your version appears to be newer than the latest release.</source> <source>Your version appears to be newer than the latest release.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="532"/> <location filename="../../src/Dialog_Update.cpp" line="539"/>
<source>This usually indicates your are currently using a pre-release version of LameXP.</source> <source>This usually indicates your are currently using a pre-release version of LameXP.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="815"/> <location filename="../../src/Dialog_Update.cpp" line="832"/>
<source>Update is being downloaded, please be patient...</source> <source>Update is being downloaded, please be patient...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="854"/> <location filename="../../src/Dialog_Update.cpp" line="871"/>
<source>Update ready to install. Applicaion will quit...</source> <source>Update ready to install. Applicaion will quit...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="862"/> <location filename="../../src/Dialog_Update.cpp" line="879"/>
<source>Update failed. Please try again or download manually!</source> <source>Update failed. Please try again or download manually!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

46
etc/Translation/LameXP_PL.ts
View File

@ -2868,7 +2868,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="247"/> <location filename="../../src/Dialog_Update.cpp" line="247"/>
<location filename="../../src/Dialog_Update.cpp" line="500"/> <location filename="../../src/Dialog_Update.cpp" line="507"/>
<source>Build</source> <source>Build</source>
<translation type="unfinished">Build</translation> <translation type="unfinished">Build</translation>
</message> </message>
@ -2878,96 +2878,96 @@
<translation type="unfinished">Nieznany</translation> <translation type="unfinished">Nieznany</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="344"/> <location filename="../../src/Dialog_Update.cpp" line="343"/>
<source>Testing your internet connection, please wait...</source> <source>Testing your internet connection, please wait...</source>
<translation type="unfinished">Testowanie połączenia internetowego, prosze czekać...</translation> <translation type="unfinished">Testowanie połączenia internetowego, prosze czekać...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="364"/> <location filename="../../src/Dialog_Update.cpp" line="363"/>
<location filename="../../src/Dialog_Update.cpp" line="928"/> <location filename="../../src/Dialog_Update.cpp" line="945"/>
<source>It appears that the computer currently is offline!</source> <source>It appears that the computer currently is offline!</source>
<translation type="unfinished">LameXP wykrył brak dostępu do internetu!</translation> <translation type="unfinished">LameXP wykrył brak dostępu do internetu!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="367"/> <location filename="../../src/Dialog_Update.cpp" line="366"/>
<location filename="../../src/Dialog_Update.cpp" line="931"/> <location filename="../../src/Dialog_Update.cpp" line="948"/>
<source>Please make sure your computer is connected to the internet and try again.</source> <source>Please make sure your computer is connected to the internet and try again.</source>
<translation type="unfinished">Upewnij się że komputer jest podłączony do internetu i spróbuj ponownie.</translation> <translation type="unfinished">Upewnij się że komputer jest podłączony do internetu i spróbuj ponownie.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="417"/> <location filename="../../src/Dialog_Update.cpp" line="424"/>
<location filename="../../src/Dialog_Update.cpp" line="978"/> <location filename="../../src/Dialog_Update.cpp" line="1006"/>
<source>Network connectivity test has failed!</source> <source>Network connectivity test has failed!</source>
<translation type="unfinished">Test połączenia internetowego zakończony niepowodzeniem!</translation> <translation type="unfinished">Test połączenia internetowego zakończony niepowodzeniem!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="420"/> <location filename="../../src/Dialog_Update.cpp" line="427"/>
<location filename="../../src/Dialog_Update.cpp" line="981"/> <location filename="../../src/Dialog_Update.cpp" line="1009"/>
<source>Please make sure your internet connection is working properly and try again.</source> <source>Please make sure your internet connection is working properly and try again.</source>
<translation type="unfinished">Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie.</translation> <translation type="unfinished">Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="434"/> <location filename="../../src/Dialog_Update.cpp" line="441"/>
<source>Checking for new updates online, please wait...</source> <source>Checking for new updates online, please wait...</source>
<translation type="unfinished">Sprawdzanie aktualizacji online, prosze czekać...</translation> <translation type="unfinished">Sprawdzanie aktualizacji online, prosze czekać...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="485"/> <location filename="../../src/Dialog_Update.cpp" line="492"/>
<source>Failed to fetch update information from server!</source> <source>Failed to fetch update information from server!</source>
<translation type="unfinished">Pobieranie informacji z serwera zakończone niepowodzeniem!</translation> <translation type="unfinished">Pobieranie informacji z serwera zakończone niepowodzeniem!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="490"/> <location filename="../../src/Dialog_Update.cpp" line="497"/>
<source>Sorry, the update server might be busy at this time. Plase try again later.</source> <source>Sorry, the update server might be busy at this time. Plase try again later.</source>
<translation type="unfinished">Serwer aktualizacji wydaje się nie odpowiadać w tej chwili. Prosze spróbować później.</translation> <translation type="unfinished">Serwer aktualizacji wydaje się nie odpowiadać w tej chwili. Prosze spróbować później.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="502"/> <location filename="../../src/Dialog_Update.cpp" line="509"/>
<source>More information available at:</source> <source>More information available at:</source>
<translation type="unfinished">Więcej informacji tutaj:</translation> <translation type="unfinished">Więcej informacji tutaj:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="508"/> <location filename="../../src/Dialog_Update.cpp" line="515"/>
<source>A new version of LameXP is available!</source> <source>A new version of LameXP is available!</source>
<translation type="unfinished">Dostępna nowa wersja LameXP!</translation> <translation type="unfinished">Dostępna nowa wersja LameXP!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="510"/> <location filename="../../src/Dialog_Update.cpp" line="517"/>
<source>We highly recommend all users to install this update as soon as possible.</source> <source>We highly recommend all users to install this update as soon as possible.</source>
<translation type="unfinished">Jest wysoce zalecane aby zainstalować tę aktualizację jak najszybciej.</translation> <translation type="unfinished">Jest wysoce zalecane aby zainstalować tę aktualizację jak najszybciej.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="519"/> <location filename="../../src/Dialog_Update.cpp" line="526"/>
<source>No new updates available at this time.</source> <source>No new updates available at this time.</source>
<translation type="unfinished">Nie ma nowych aktualizacji w tej chwili.</translation> <translation type="unfinished">Nie ma nowych aktualizacji w tej chwili.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="521"/> <location filename="../../src/Dialog_Update.cpp" line="528"/>
<source>Your version of LameXP is still up-to-date. Please check for updates regularly!</source> <source>Your version of LameXP is still up-to-date. Please check for updates regularly!</source>
<translation type="unfinished">Posiadasz najnowszą wersję LameXP. Sprawdzaj aktualizacje regularnie!</translation> <translation type="unfinished">Posiadasz najnowszą wersję LameXP. Sprawdzaj aktualizacje regularnie!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="530"/> <location filename="../../src/Dialog_Update.cpp" line="537"/>
<source>Your version appears to be newer than the latest release.</source> <source>Your version appears to be newer than the latest release.</source>
<translation type="unfinished">Posiadasz nowszą wersję LameXP niż ostatnie wydanie.</translation> <translation type="unfinished">Posiadasz nowszą wersję LameXP niż ostatnie wydanie.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="532"/> <location filename="../../src/Dialog_Update.cpp" line="539"/>
<source>This usually indicates your are currently using a pre-release version of LameXP.</source> <source>This usually indicates your are currently using a pre-release version of LameXP.</source>
<translation type="unfinished">To wskazuje na to, że posiadasz wersję alfa LameXP.</translation> <translation type="unfinished">To wskazuje na to, że posiadasz wersję alfa LameXP.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="815"/> <location filename="../../src/Dialog_Update.cpp" line="832"/>
<source>Update is being downloaded, please be patient...</source> <source>Update is being downloaded, please be patient...</source>
<translation type="unfinished">Pobieranie aktualizacji w toku, prosze czekać...</translation> <translation type="unfinished">Pobieranie aktualizacji w toku, prosze czekać...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="854"/> <location filename="../../src/Dialog_Update.cpp" line="871"/>
<source>Update ready to install. Applicaion will quit...</source> <source>Update ready to install. Applicaion will quit...</source>
<translation type="unfinished">Aktualizacja gotowa do instalacji. Teraz program zostanie zamknięty...</translation> <translation type="unfinished">Aktualizacja gotowa do instalacji. Teraz program zostanie zamknięty...</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_Update.cpp" line="862"/> <location filename="../../src/Dialog_Update.cpp" line="879"/>
<source>Update failed. Please try again or download manually!</source> <source>Update failed. Please try again or download manually!</source>
<translation type="unfinished">Aktualizacja zakończona niepowodzeniem. Prosze spróbować ponownie lub zainstalować ręcznie!</translation> <translation type="unfinished">Aktualizacja zakończona niepowodzeniem. Prosze spróbować ponownie lub zainstalować ręcznie!</translation>
</message> </message>

BIN
res/localization/LameXP_UK.qm
View File

Binary file not shown.

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 6 #define VER_LAMEXP_PATCH 6
#define VER_LAMEXP_BUILD 800 #define VER_LAMEXP_BUILD 801
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

12
src/Dialog_Update.cpp
View File

@ -135,7 +135,7 @@ static const char *known_hosts[] = //Taken form: http://www.alexa.com/topsites
"http://www.weibo.com/", "http://www.weibo.com/",
"http://www.wikipedia.org/", "http://www.wikipedia.org/",
"http://wordpress.com/", "http://wordpress.com/",
"http://www.yahoo.com/", "http://us.yahoo.com/",
"http://www.yandex.ru/", "http://www.yandex.ru/",
"http://www.youtube.com/", "http://www.youtube.com/",
"http://www.zedo.com/", "http://www.zedo.com/",
@ -398,14 +398,14 @@ void UpdateDialog::checkForUpdates(void)
if(getFile(currentHost, outFile, 0, &httpOk)) if(getFile(currentHost, outFile, 0, &httpOk))
{ {
connectionScore++; connectionScore++;
progressBar->setValue(connectionScore + 1); progressBar->setValue(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1));
QApplication::processEvents(); QApplication::processEvents();
Sleep(125); Sleep(125);
} }
if(httpOk) if(httpOk)
{ {
connectionScore++; connectionScore++;
progressBar->setValue(connectionScore + 1); progressBar->setValue(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1));
QApplication::processEvents(); QApplication::processEvents();
Sleep(125); Sleep(125);
} }
@ -970,8 +970,8 @@ void UpdateDialog::testKnownWebSites(void)
int hostCount = hostList.count(); int hostCount = hostList.count();
while(!hostList.isEmpty()) while(!hostList.isEmpty())
{ {
progressBar->setValue(progressBar->value() + 1);
QString currentHost = hostList.takeFirst(); QString currentHost = hostList.takeFirst();
progressBar->setValue(qRound((static_cast<double>(progressBar->maximum() - 1) / static_cast<double>(hostCount)) * static_cast<double>(connectionScore)) + 1);
qDebug("Testing: %s", currentHost.toLatin1().constData()); qDebug("Testing: %s", currentHost.toLatin1().constData());
m_logFile->append(QStringList() << "" << "Testing host:" << currentHost << ""); m_logFile->append(QStringList() << "" << "Testing host:" << currentHost << "");
QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str()); QString outFile = QString("%1/%2.htm").arg(lamexp_temp_folder2(), lamexp_rand_str());
@ -1003,10 +1003,10 @@ void UpdateDialog::testKnownWebSites(void)
retryButton->setEnabled(true); retryButton->setEnabled(true);
logButton->setEnabled(true); logButton->setEnabled(true);
if(frameAnimation->isVisible()) frameAnimation->hide(); 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()); progressBar->setValue(progressBar->maximum());
hintIcon->setPixmap(QIcon(":/icons/network_error.png").pixmap(16,16)); 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(); hintIcon->show();
hintLabel->show(); hintLabel->show();
LAMEXP_DELETE(m_updateInfo); LAMEXP_DELETE(m_updateInfo);