From 9a8f8e1c750dc5205a3f78e341ee9df5aca0e1c2 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 8 Apr 2011 14:05:50 +0200 Subject: [PATCH] Small addition to translator's guide. --- doc/Translate.html | 2 +- etc/NSIS/setup.nsi | 12 +++++++++--- etc/Translation/Blank.ts | 2 +- etc/Translation/LameXP_DE.ts | 4 ++-- etc/Translation/LameXP_ES.ts | 2 +- etc/Translation/LameXP_FR.ts | 2 +- etc/Translation/LameXP_IT.ts | 2 +- etc/Translation/LameXP_KR.ts | 2 +- etc/Translation/LameXP_RU.ts | 2 +- etc/Translation/LameXP_UK.ts | 2 +- res/localization/LameXP_DE.qm | Bin 56919 -> 56981 bytes src/Config.h | 2 +- src/Dialog_MainWindow.cpp | 15 +++++++++------ 13 files changed, 29 insertions(+), 20 deletions(-) diff --git a/doc/Translate.html b/doc/Translate.html index a897cce0..a658ca18 100644 --- a/doc/Translate.html +++ b/doc/Translate.html @@ -23,7 +23,7 @@ a:visited { color: #0000EE; }

You can download Qt Linguist as a part of the Qt Framework, which is available as a free download from the Qt download site. You should pick the "LGPL" version and the "Qt: Framework Only" download. If you are using Microsoft Windows, then the "VS 2008" version should be preferred. Moreover people who don't like to download the complete framework (230 MB) can find Qt Linguist for Windows as a stand-alone download at this location (4 MB).


Editing the language file:

-

LameXP v4.xx translations are created as TS (translation) files, which can be edited using the Qt Linguist application. For new translations an empty TS file ("Blank.ts") is provided in the LameXP Git repository. When you open the empty TS file for the first time, Qt Linguist will ask for some basic settings. Here you must keep the "Source language" options at "English" and "Any Country". Change the "Target language" options to whatever language (region) you are going to translate to. Once you have edited all (or some) text strings, you can save your work to a TS file again. It is recommended to save your work to "LameXP_XX.ts", where XX should be replaced with the suitable upper-case ISO 639-1 country code (for example the German translation is saved as "LameXP_DE.ts"). You can re-open your TS file at any time in order to continue with your work. In case you want to improve an existing LameXP translation, simply download the corresponding TS file from the LameXP Git repository and edit it using the Qt Linguist tool.

+

LameXP v4.xx translations are created as TS (translation) files, which can be edited using the Qt Linguist application. For new translations an empty TS file ("Blank.ts") is provided in the LameXP Git repository. When you open the empty TS file for the first time, Qt Linguist will ask for some basic settings. Here you must keep the "Source language" options at "English" and "Any Country". Change the "Target language" options to whatever language (region) you are going to translate to. Once you have edited all (or some) text strings, you can save your work to a TS file again. It is recommended to save your work to "LameXP_XX.ts", where XX should be replaced with the suitable upper-case ISO_3166-1 or ISO 639-1 country/language code (for example the German translation is saved as "LameXP_DE.ts"). You can re-open your TS file at any time in order to continue with your work. In case you want to improve an existing LameXP translation, simply download the corresponding TS file from the LameXP Git repository and edit it using the Qt Linguist tool.

The latest translation (TS) files can always be found in the LameXP Git repository at:
https://github.com/lordmulder/LameXP/tree/master/etc/Translation

(After you have chosen a file from the directory tree, you can download the file by right-clicking on "raw" an choosing "Save Link Target As...")

Important: Before you start translating, always make sure your download the latest "Blank.ts" file from the LameXP Git repository. If you want to edit an existing translation, including translations you have created yourself, make sure your download the latest TS file from the LameXP Git repository. Never ever do any translations based on an old working copy (TS file) from your local system! The translation files in the repository will be updated continuously, as the development proceeds.


diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 0bef9ec3..cdfa2eca 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -267,10 +267,16 @@ Function .onInit MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, the Windows 9x series (including ME) is not supported by this application!" Quit ${EndIf} - + OS_Windows_NT: - ${If} ${AtMostWinNT4} - MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, Windows NT 4.0 (and older) is not supported by this application!" + ${If} ${AtMostWin2000} + MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, Windows 2000 (and older) is not supported by this application!" + Quit + ${EndIf} + + ${If} ${IsWinXP} + ${AndIf} ${AtMostServicePack} 1 + MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application requires at least Windows XP with Service-Pack 2!" Quit ${EndIf} FunctionEnd diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index c57a2367..dfc47139 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -12,7 +12,7 @@ - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index cec9a066..f3c40597 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -196,8 +196,8 @@ Silk Icons &minus; Über 700 Symbole im PNG Format - Note: This demo (pre-release) version of LameXP will expire at %1. - Hinweis: Diese Demo (Test) Version von LameXP läuft am %1 ab. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. + Hinweise: Diese Demo (Test) Version von LameXP läuft am %1 ab. Noch %2 Tage übrig. diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index c0a6af33..5fc1dabe 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -196,7 +196,7 @@ GNU Wget &minus; Software para descarga de archivos mediante HTTP - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 794a8b66..2126fed8 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -200,7 +200,7 @@ GNU Wget &minus; Logiciel permettant de récupérer des fichiers à l'aide du HTTP - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 8e49c3a7..61ac6079 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -196,7 +196,7 @@ - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 1b3edf0d..404d4496 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -196,7 +196,7 @@ 없음 - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 4061f193..24279bd2 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -196,7 +196,7 @@ н/д - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index b32d6b7d..75cf5d02 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -196,7 +196,7 @@ - Note: This demo (pre-release) version of LameXP will expire at %1. + Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 914baa8426612db1d419bc8b3480f23e0622c512..631e29cbfef0205cd006eb2f54a3024030d22b71 100644 GIT binary patch delta 3587 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 diff --git a/src/Config.h b/src/Config.h index 1080c9f0..9dce42b5 100644 --- a/src/Config.h +++ b/src/Config.h @@ -25,7 +25,7 @@ #define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 2 -#define VER_LAMEXP_BUILD 425 +#define VER_LAMEXP_BUILD 426 #define VER_LAMEXP_SUFFIX Alpha-1 /* diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index c09a28dd..20a38d3c 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -1250,13 +1250,16 @@ void MainWindow::tabPageChanged(int idx) if(idx == tabWidget->indexOf(tabOptions) && scrollArea->widget() && this->isVisible()) { - QApplication::processEvents(); - while(scrollArea->viewport()->width() < scrollArea->widget()->width()) + for(int i = 0; i < 2; i++) { - int previousWidth = this->width(); - this->resize(this->width() + 1, this->height()); - if(this->frameGeometry().width() >= maximumWidth) break; - if(this->width() <= previousWidth) break; + QApplication::processEvents(); + while(scrollArea->viewport()->width() < scrollArea->widget()->width()) + { + int previousWidth = this->width(); + this->resize(this->width() + 1, this->height()); + if(this->frameGeometry().width() >= maximumWidth) break; + if(this->width() <= previousWidth) break; + } } } else if(idx == tabWidget->indexOf(tabSourceFiles))