From 61d440303b587a14d891e948bc57ea8281caec26 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Mon, 15 Oct 2012 00:41:38 +0200 Subject: [PATCH] Small code clean-up. --- doc/Translate.html | 1 + etc/Translation/LameXP_DE.ts | 2 +- src/Config.h | 2 +- src/Dialog_MainWindow.cpp | 2 +- src/Model_Settings.cpp | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Translate.html b/doc/Translate.html index 85d4b3b7..a9a51d07 100644 --- a/doc/Translate.html +++ b/doc/Translate.html @@ -45,6 +45,7 @@ Only language files that have been edited according to the following rules can b

Submitting your translation:

Once you are done with your translation (i.e. all items and all contexts have a green ✔ icon), you can submit it, so it can be integrated into the next LameXP release. You can contact me by e-mail:
mulder2[at]gmx[dot]de

Please do not submit translations that have any items/context with ✔, ?, ? or even ! icon left. Also do not submit QM files, do not compress the submitted file (ZIP, RAR, etc) and do not attach a flag icon file. It is sufficient to submit the translation (TS) file.

+

Legal notice: By submitting LameXP translations, all translators agree that their work will be incorporated into the LameXP software and, from then on, will be published and redistributed under the terms of the GNU General Public License. If you do not agree, please do not submit!

(Note: Advanced translators can get write-access to the Git repository on request, so they can keep their translations up-to-date easily)

IMPORTANT: Before you start to create a new translation, always make sure you downloaded the latest "Blank.ts" file from the LameXP Git repository. Also before you start editing or updating an existing translation, including translations you have created yourself, make sure you downloaded the latest TS file from the LameXP Git repository. Never do any translations based on an old working copy (TS file) from your local system! The translation files (TS) in the Git repository will be updated/extended continuously, as the development proceeds. We cannot accept translations based on an outdated TS file!


diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 9993f335..90139e68 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -285,7 +285,7 @@ UPX - The Ultimate Packer for eXecutables - + diff --git a/src/Config.h b/src/Config.h index 6ae0e1ba..7c7f2171 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 3 -#define VER_LAMEXP_BUILD 1150 +#define VER_LAMEXP_BUILD 1151 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index abd1a66c..c8f137ca 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -818,7 +818,7 @@ void MainWindow::initializeTranslation(void) if(!m_settings->currentLanguageFile().isEmpty()) { const QString qmFilePath = QFileInfo(m_settings->currentLanguageFile()).canonicalFilePath(); - if(QFileInfo(qmFilePath).exists() && QFileInfo(qmFilePath).isFile() && (QFileInfo(qmFilePath).suffix().compare("qm", Qt::CaseInsensitive) == 0)) + if((!qmFilePath.isEmpty()) && QFileInfo(qmFilePath).exists() && QFileInfo(qmFilePath).isFile() && (QFileInfo(qmFilePath).suffix().compare("qm", Qt::CaseInsensitive) == 0)) { if(lamexp_install_translator_from_file(qmFilePath)) { diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp index 5de3b6bf..0b626b6a 100644 --- a/src/Model_Settings.cpp +++ b/src/Model_Settings.cpp @@ -254,9 +254,9 @@ void SettingsModel::validate(void) if(!this->currentLanguageFile().isEmpty()) { const QString qmPath = QFileInfo(this->currentLanguageFile()).canonicalFilePath(); - if(!(QFileInfo(qmPath).exists() && QFileInfo(qmPath).isFile() && (QFileInfo(qmPath).suffix().compare("qm", Qt::CaseInsensitive) == 0))) + if(qmPath.isEmpty() || (!(QFileInfo(qmPath).exists() && QFileInfo(qmPath).isFile() && (QFileInfo(qmPath).suffix().compare("qm", Qt::CaseInsensitive) == 0)))) { - qWarning("Current language file \"%s\" missing, reverting to built-in translator!", qmPath.toUtf8().constData()); + qWarning("Current language file missing, reverting to built-in translator!"); this->currentLanguageFile(QString()); } }