From: lordmulder Date: Fri, 18 Feb 2011 19:14:45 +0000 (+0100) Subject: Added Russian translation by Neonailol . X-Git-Tag: Release_400~9 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=26af88200388f4e0787e2b0f2d2f4451bad0781a;p=lamexp%2FLameXP.git Added Russian translation by Neonailol . --- diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 750766cd..766d5511 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -220,6 +220,8 @@ UninstPage Custom un.LockedListShow ;Spanish !include "..\Translation\LameXP_ES.nsh" +;Russian +!include "..\Translation\LameXP_RU.nsh" ;-------------------------------- ;Installer initialization diff --git a/etc/Translation/LameXP_RU.nsh b/etc/Translation/LameXP_RU.nsh new file mode 100644 index 00000000..f4643308 --- /dev/null +++ b/etc/Translation/LameXP_RU.nsh @@ -0,0 +1,40 @@ +; /////////////////////////////////////////////////////////////////////////////// +; // LameXP - Audio Encoder Front-End +; // Copyright (C) 2004-2011 LoRd_MuldeR +; // +; // This program is free software; you can redistribute it and/or modify +; // it under the terms of the GNU General Public License as published by +; // the Free Software Foundation; either version 2 of the License, or +; // (at your option) any later version. +; // +; // This program is distributed in the hope that it will be useful, +; // but WITHOUT ANY WARRANTY; without even the implied warranty of +; // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; // GNU General Public License for more details. +; // +; // You should have received a copy of the GNU General Public License along +; // with this program; if not, write to the Free Software Foundation, Inc., +; // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +; // +; // http://www.gnu.org/licenses/gpl-2.0.txt +; /////////////////////////////////////////////////////////////////////////////// + +LangString LAMEXP_LANG_STATUS_CLOSING ${LANG_RUSSIAN} "Закрываю работающие копии программы, пожалуйста, подождите..." +LangString LAMEXP_LANG_STATUS_INSTFILES ${LANG_RUSSIAN} "Устанавливаю файлы программы, пожалуйста, подождите..." +LangString LAMEXP_LANG_STATUS_MAKEUNINST ${LANG_RUSSIAN} "Создаю деинсталлятор, пожалуйста, подождите..." +LangString LAMEXP_LANG_STATUS_SHORTCUTS ${LANG_RUSSIAN} "Создаю ярлыки, пожалуйста, подождите..." +LangString LAMEXP_LANG_STATUS_REGISTRY ${LANG_RUSSIAN} "Обновляю значения в реестре, пожалуйста, подождите..." +LangString LAMEXP_LANG_STATUS_UNINSTALL ${LANG_RUSSIAN} "Деинсталляция программы, пожалуйста, подождите..." +LangString LAMEXP_LANG_LOCKEDLIST_HEADER ${LANG_RUSSIAN} "Работающие копии программы" +LangString LAMEXP_LANG_LOCKEDLIST_TEXT ${LANG_RUSSIAN} "Проверка на наличие работающих копий программы LameXP." +LangString LAMEXP_LANG_LOCKEDLIST_HEADING ${LANG_RUSSIAN} "Пожалуйста, закройте следующие программы, для продолжения установки..." +LangString LAMEXP_LANG_LOCKEDLIST_NOPROG ${LANG_RUSSIAN} "No programs that have to be closed are running." +LangString LAMEXP_LANG_LOCKEDLIST_SEARCH ${LANG_RUSSIAN} "Поиск, пожалуйста, подождите..." +LangString LAMEXP_LANG_LOCKEDLIST_COLHDR1 ${LANG_RUSSIAN} "Приложение" +LangString LAMEXP_LANG_LOCKEDLIST_COLHDR2 ${LANG_RUSSIAN} "Выполняю" +LangString LAMEXP_LANG_UNINST_PERSONAL ${LANG_RUSSIAN} "Хотите ли вы удалить свои персональные настройки?" +LangString LAMEXP_LANG_LINK_LICENSE ${LANG_RUSSIAN} "Лицензия" +LangString LAMEXP_LANG_LINK_CHANGELOG ${LANG_RUSSIAN} "История версий" +LangString LAMEXP_LANG_LINK_TRANSLATE ${LANG_RUSSIAN} "Руководство Переводчика" +LangString LAMEXP_LANG_LINK_UNINSTALL ${LANG_RUSSIAN} "Деинсталляция" +LangString LAMEXP_LANG_LINK_FAQ ${LANG_RUSSIAN} "Часто Задаваемые Вопросы" diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts new file mode 100644 index 00000000..11c766db --- /dev/null +++ b/etc/Translation/LameXP_RU.ts @@ -0,0 +1,2094 @@ + + + + + AboutDialog + + + LameXP &minus; Audio Encoder Front-end + + + + + Please visit %1 for news and updates! + + + + + Note: LameXP is free software. Do <b>not</b> pay money to obtain or use LameXP! If some third-party website tries to make you pay for downloading LameXP, you should <b>not</b> respond to the offer !!! + + + + + Special thanks go out to "John33" from %1 for his continuous support. + + + + + About LameXP + О LameXP + + + + Show License Text + Показать текст лицензии + + + + Accept License + Принять лицензию + + + + Decline License + + + + + 3rd Party S/W + + + + + Contributors + + + + + About Qt4 + О Qt4 + + + + + + Discard + Отменить + + + + The following people have contributed to LameXP: + + + + + Translators: + Переводчики: + + + + If you are willing to contribute a LameXP translation, feel free to contact us! + + + + + About Contributors + + + + + The following third-party software is used in LameXP: + + + + + LAME &minus; OpenSource mp3 Encoder + + + + + + + + + + + + + + Released under the terms of the GNU Lesser General Public License. + + + + + OggEnc &minus; Ogg Vorbis Encoder + + + + + Completely open and patent-free audio encoding technology. + + + + + Nero AAC Reference MPEG-4 Encoder + + + + + Freeware state-of-the-art HE-AAC encoder with 2-Pass support. + + + + + Available from vendor web-site as free download: + + + + + FLAC &minus; Free Lossless Audio Codec + + + + + Open and patent-free lossless audio compression technology. + + + + + mpg123 &minus; Fast Console MPEG Audio Player/Decoder + + + + + FAAD &minus; OpenSource MPEG-4 and MPEG-2 AAC Decoder + + + + + Released under the terms of the GNU General Public License. + + + + + AC3Filter Tools &minus; AC3/DTS Decoder + + + + + WavPack &minus; Hybrid Lossless Compression + + + + + Completely open audio compression format. + + + + + Musepack &minus; Living Audio Compression + + + + + Monkey's Audio &minus; Lossless Audio Compressor + + + + + Freely available source code, simple SDK and non-restrictive licensing. + + + + + Shorten &minus; Lossless Audio Compressor + + + + + Speex &minus; Free Codec For Free Speech + + + + + Open Source patent-free audio format designed for speech. + + + + + The True Audio &minus; Lossless Audio Codec + + + + + MediaInfo &minus; Media File Analysis Tool + + + + + SoX &minus; Sound eXchange + + + + + GnuPG &minus; The GNU Privacy Guard + + + + + GNU Wget &minus; Software for retrieving files using HTTP + + + + + Silk Icons &minus; Over 700 icons in PNG format + + + + + By Mark James, released under the Creative Commons 'by' License. + + + + + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of thrird-party software used in LameXP belongs to the individual authors. + + + + + About Third-party Software + + + + + n/a + + + + + AudioFileModel + + + + Profile + + + + + Channels + + + + + Samplerate + + + + + Bitdepth + + + + + Type + + + + + Version + + + + + DecoderRegistry + + + All supported types + Все поддерживаемые типы + + + + Playlists + Плэйлисты + + + + All files + Все файлы + + + + DropBox + + + LameXP - DropBox + LameXP - DropBox + + + + LameXP DropBox + LameXP DropBox + + + + You can add files to LameXP via Drag&amp;Drop here! + Вы можете добавить файлы в LameXP перетащив их сюда! + + + + (Right-click to close the DropBox) + (Для закрытия DropBox нажмите правой кнопкой мыши) + + + + FileListModel + + + Title + + + + + Full Path + + + + + LogViewDialog + + + Log View + + + + + Discard + Отменить + + + + Save to File... + + + + + Copy to Clipboard + + + + + Log File + + + + + The log file shows detailed information about the selected job. + + + + + MainWindow + + + LameXP - Audio Encoder Front-end + + + + + + Source Files + + + + + Add File(s) + + + + + Remove + Удалить + + + + Clear + Очистить + + + + + Show Details + Показать детали + + + + + Output Directory + + + + + Goto Home Folder + + + + + Goto Music Folder + + + + + Goto Desktop Folder + + + + + Make New Folder + + + + + Save output files to the same location where the input file is located + + + + + Prepend relative source file path to output file + + + + + + Meta Data + + + + + Meta Information + + + + + Edit + Изменить + + + + Note: Meta information you enter here will <u>supersede</u> data from the source! + + + + + Reset + + + + + Options + + + + + Automatically generate playlist file (.m3u) + + + + + Write meta information to encoded files + + + + + + Compression + + + + + Encoder / Format + + + + + Lame MP3 + + + + + Ogg Vorbis + + + + + Nero AAC + + + + + Wave (PCM) + + + + + FLAC + + + + + Rate Control Method + + + + + Quality-based (VBR) + + + + + Average Bitrate (ABR) + + + + + Constant Bitrate (CBR) + + + + + Quality / Bitrate + + + + + Minimum + + + + + Maximum + + + + + + Advanced Options + + + + + Bitrate Management (LAME and OggEnc2) + + + + + Enable Bitrate Management + + + + + Minimum (kbps): + + + + + Maximum (kbps): + + + + + LAME Algorithm Quality + + + + + Faster Processing + + + + + Better quality + + + + + Channel Mode / Sampling Rate + + + + + + Auto Select (Default) + + + + + Joint Stereo + + + + + Forced Joint Stereo + + + + + Simple + + + + + Dual Mono + + + + + Mono + + + + + MP3 Channel Mode: + + + + + Sampling Rate (Hz): + + + + + 16.000 + + + + + 22.050 + + + + + 24.000 + + + + + 32.000 + + + + + 44.100 + + + + + 48.000 + + + + + Nero AAC Options + + + + + Enable 2-Pass Processing (ABR Mode) + + + + + Select AAC Profile: + + + + + Auto Select (Recommended) + + + + + Enforce LC-AAC + + + + + Enforce HE-AAC (AAC + SBR) + + + + + Enforce HE-AAC v2 (AAC + SBR + PS) + + + + + Volume Normalization + + + + + Enable Normalization Filter + + + + + Peak Volume (dB): + + + + + Tone Adjustment + + + + + Adjust Treble (dB): + + + + + Adjust Bass (dB): + + + + + Custom Encoder Parameters + + + + + LAME: + + + + + OggEnc2: + + + + + Nero AAC: + + + + + FLAC: + + + + + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! + + + + + Reset Advanced Options + + + + + Encode Now! + + + + + + About... + + + + + Exit Program + + + + + File + + + + + ? + + + + + View + + + + + Style + + + + + Language + + + + + Tools + + + + + Configuration + + + + + Quit + + + + + Open File(s)... + + + + + + Visit Official Web-Site + + + + + + + + Check for Updates + + + + + Open Folder... + + + + + Clear All + + + + + Plastique + + + + + Cleanlooks + + + + + Windows Vista ("Aero") + + + + + Windows Classic + + + + + Windows XP ("Luna") + + + + + + Disable Update Reminder + + + + + + Disable Sound Effects + + + + + + Install WMA Decoder + + + + + Disable Nero AAC Notifications + + + + + Disable WMA Decoder Notifications + + + + + Show DropBox + + + + + From File... + + + + + Encode! + + + + + Disable Shell Integration + + + + + Adding file(s), please wait... + + + + + Access Denied + + + + + %1 file(s) have been rejected, because read access was not granted! + + + + + This usually means the file is locked by another process. + + + + + Files Rejected + + + + + %1 file(s) have been rejected, because the file format could not be recognized! + + + + + This usually means the file is damaged or the file format is not supported. + + + + + Downloading WMA Decoder Setup, please wait... + + + + + + Download Failed + + + + + Failed to download the WMA Decoder setup. Check your internet connection! + + + + + + Try Again + + + + + + + Cancel + + + + + The download seems to be corrupted. Please try again! + + + + + WMA Decoder + + + + + The WMA File Decoder has been installed. Please restart LameXP now! + + + + + Quit LameXP + + + + + + + Postpone + + + + + DEMO VERSION + + + + + You can drop in audio files here! + + + + + Open File in External Application + + + + + Browse File Location + + + + + Browse Selected Folder + + + + + License Declined + + + + + You have declined the license. Consequently the application will exit now! + + + + + Goodbye! + + + + + LameXP - Expired + + + + + This demo (pre-release) version of LameXP has expired at %1. + + + + + LameXP is free software and release versions won't expire. + + + + + + Exit Program + + + + + Urgent Update + + + + + Your version of LameXP is more than a year old. Time for an update! + + + + + + + Update Reminder + + + + + Your last update check was more than 14 days ago. Check for updates now? + + + + + Your did not check for LameXP updates yet. Check for updates now? + + + + + LameXP detected that your version of the Nero AAC encoder is outdated! + + + + + The current version available is %1 (or later), but you still have version %2 installed. + + + + + n/a + + + + + You can download the latest version of the Nero AAC encoder from the Nero website at: + + + + + AAC Encoder Outdated + + + + + The Nero AAC encoder could not be found. AAC encoding support will be disabled. + + + + + Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory! + + + + + Your LameXP directory is located here: + + + + + You can download the Nero AAC encoder for free from the official Nero website at: + + + + + AAC Support Disabled + + + + + LameXP has detected that the WMA File Decoder component is not currently installed on your system. + + + + + You won't be able to process WMA files as input unless the WMA File Decoder component is installed! + + + + + + Do you want to download and install the WMA File Decoder component now? + + + + + WMA Decoder Missing + + + + + + Download && Install + Скачать и Установить + + + + + + LameXP + + + + + You must add at least one file to the list before proceeding! + + + + + Low Diskspace Warning + + + + + There are less than %1 GB of free diskspace available on your system's TEMP folder. + + + + + It is highly recommend to free up more diskspace before proceeding with the encode! + + + + + Your TEMP folder is located at: + + + + + Abort Encoding Process + + + + + Clean Disk Now + + + + + Ignore + + + + + Low Diskspace + + + + + You are proceeding with low diskspace. Problems might occur! + + + + + Sorry, an unsupported encoder has been chosen! + + + + + Cannot write to the selected output directory. + + + + + Please choose a different directory! + + + + + + Add file(s) + + + + + + Add folder + + + + + Load Translation + + + + + Translation Files + + + + + + New Folder + + + + + Enter the name of the new folder: + + + + + Failed to create folder + + + + + The new folder could not be created: + + + + + Drive is read-only or insufficient access rights! + + + + + Already Running + + + + + LameXP is already running, please use the running instance! + + + + + + + Quality Level %1 + + + + + + + Compression %1 + + + + + + + Uncompressed + + + + + Best Quality (Very Slow) + + + + + High Quality (Recommended) + + + + + Average Quality (Default) + + + + + Low Quality (Fast) + + + + + Poor Quality (Very Fast) + + + + + Do you really want to disable the update reminder? + + + + + + + + + Yes + + + + + + + + + No + + + + + The update reminder has been disabled. + + + + + Please remember to check for updates at regular intervals! + + + + + The update reminder has been re-enabled. + + + + + Do you really want to disable all sound effects? + + + + + + Sound Effects + + + + + All sound effects have been disabled. + + + + + The sound effects have been re-enabled. + + + + + + + Nero AAC Notifications + + + + + Do you really want to disable all Nero AAC Encoder notifications? + + + + + All Nero AAC Encoder notifications have been disabled. + + + + + The Nero AAC Encoder notifications have been re-enabled. + + + + + + + WMA Decoder Notifications + + + + + Do you really want to disable all WMA Decoder notifications? + + + + + All WMA Decoder notifications have been disabled. + + + + + The WMA Decoder notifications have been re-enabled. + + + + + + + Shell Integration + + + + + Do you really want to disable the LameXP shell integration? + + + + + The LameXP shell integration has been disabled. + + + + + The LameXP shell integration has been re-enabled. + + + + + MetaInfo + + + Meta Information + Мета Информация + + + + Edit + Изменить + + + + Close + Закрыть + + + + MetaInfoDialog + + + Meta Information + Мета Информация + + + + The following meta information have been extracted from the original file. + Эта мета информация была получена из исходного файла. + + + + MetaInfoModel + + + + Unknown + + + + + + Not Specified + + + + + Full Path + + + + + Format + + + + + Container + + + + + Compression + + + + + Duration + + + + + Title + + + + + Artist + + + + + Album + + + + + Genre + + + + + Year + + + + + Position + + + + + + Generate from list position + + + + + Comment + + + + + Property + + + + + Value + + + + + Unspecified + + + + + OK + + + + + Cancel + + + + + + Edit Title + + + + + Please enter the title for this file: + + + + + The title must not be empty. Generating title from file name! + + + + + Edit Artist + + + + + Please enter the artist for this file: + + + + + Edit Album + + + + + Please enter the album for this file: + + + + + Edit Genre + + + + + Please enter the genre for this file: + + + + + Edit Year + + + + + Please enter the year for this file: + + + + + + Edit Position + + + + + + Please enter the position (track no.) for this file: + + + + + Unspecified (copy from source file) + + + + + Edit Comment + + + + + Please enter the comment for this file: + + + + + + Encoded with LameXP + + + + + Not editable + + + + + Sorry, this property of the source file cannot be edited! + + + + + ProcessThread + + + Starting... + + + + + Not found! + + + + + The format of this file is NOT supported: + + + + + Container Format: + + + + + Audio Format: + + + + + Unsupported! + + + + + Done. + + + + + Aborted! + + + + + Failed! + + + + + Encoding + + + + + Filtering + + + + + Decoding + + + + + The source audio file could not be found: + + + + + The source audio file could not be opened for reading: + + + + + The target output directory doesn't exist and could NOT be created: + + + + + The target output directory is NOT writable: + + + + + ProcessingDialog + + + LameXP - Processing + + + + + Initializing, please wait... + + + + + Abort + + + + + Close + Закрыть + + + + Show details for selected job + + + + + Browse Output File Location + + + + + Encoding Files + + + + + Your files are being encoded, please be patient... + + + + + Encoding files, please wait... + + + + + Multi-threading enabled: Running %1 instances in parallel! + + + + + Aborted! Waiting for running jobs to terminate... + + + + + Encoding: %1 files of %2 completed so far, please wait... + + + + + Creating the playlist file, please wait... + + + + + Process was aborted by the user after %1 file(s)! + + + + + Process was aborted prematurely by the user! + + + + + LameXP - Aborted + + + + + Process was aborted by the user. + + + + + Error: %1 of %2 files failed. Double-click failed items for detailed information! + + + + + LameXP - Error + + + + + At least one file has failed! + + + + + Alle files completed successfully. + + + + + LameXP - Done + + + + + All files completed successfully. + + + + + Playlist creation failed + + + + + The playlist file could not be created: + + + + + ProgressModel + + + Job + Задание + + + + Status + Статус + + + + ShellIntegration + + + Audio File supported by LameXP + Аудио Файл поддерживаетя LameXP + + + + Convert this file with LameXP v%1 + Конвертировать этот файл используя LameXP v%1 + + + + SplashScreen + + + LameXP is launching... + LameXP запускается... + + + + UpdateDialog + + + LameXP Update Manager + Менеджер обновлений LameXP + + + + Please wait... + пожалуйста, подождите... + + + + Latest version available: + Последняя доступная версия: + + + + Currently installed version: + Установленная верися: + + + + Retry + Повторить + + + + Show Log + Показать Лог + + + + Download && Install + Скачать и Установить + + + + Close + Закрыть + + + + + Build + + + + + Unknown + + + + + Testing your internet connection, please wait... + + + + + 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! + Новя версия LameXP доступна! + + + + 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. + + + + diff --git a/res/Flags.qrc b/res/Flags.qrc index c79c1b47..59756948 100644 --- a/res/Flags.qrc +++ b/res/Flags.qrc @@ -1,10 +1,11 @@ - + flags/de.png flags/en.png flags/es.png flags/fr.png flags/it.png - + flags/ru.png + diff --git a/res/Localization.qrc b/res/Localization.qrc index b6480900..449fca73 100644 --- a/res/Localization.qrc +++ b/res/Localization.qrc @@ -1,6 +1,6 @@ - + localization/LameXP_DE.qm localization/LameXP_DE.qm.txt localization/LameXP_FR.qm @@ -9,5 +9,7 @@ localization/LameXP_IT.qm.txt localization/LameXP_ES.qm localization/LameXP_ES.qm.txt + localization/LameXP_RU.qm + localization/LameXP_RU.qm.txt diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm new file mode 100644 index 00000000..77e68a2a Binary files /dev/null and b/res/localization/LameXP_RU.qm differ diff --git a/res/localization/LameXP_RU.qm.txt b/res/localization/LameXP_RU.qm.txt new file mode 100644 index 00000000..667203ad --- /dev/null +++ b/res/localization/LameXP_RU.qm.txt @@ -0,0 +1 @@ +96,русский \ No newline at end of file diff --git a/src/Config.h b/src/Config.h index af1d20de..0aac9052 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 0 -#define VER_LAMEXP_BUILD 320 +#define VER_LAMEXP_BUILD 322 #define VER_LAMEXP_SUFFIX RC-3 /* diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index adcb9136..c10b41ec 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -1,4 +1,4 @@ -/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End // Copyright (C) 2004-2011 LoRd_MuldeR // @@ -49,17 +49,18 @@ const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac- static const struct { char *pcFlag; - char *pcLanguage; - char *pcName; + wchar_t *pcLanguage; + wchar_t *pcName; char *pcMail; } g_lamexp_contributors[] = { - {"en", "Englisch", "LoRd_MuldeR", "MuldeR2@GMX.de" }, - {"de", "Deutsch", "LoRd_MuldeR", "MuldeR2@GMX.de" }, - {"fr", "Française", "Dodich Informatique", "Dodich@live.fr" }, - {"it", "Italiano", "Roberto", "Gulliver_69@libero.it"}, - {"es", "Español", "Rub3nCT", "Rub3nCT@gmail.com" }, + {"en", L"Englisch", L"LoRd_MuldeR", "MuldeR2@GMX.de" }, + {"de", L"Deutsch", L"LoRd_MuldeR", "MuldeR2@GMX.de" }, + {"fr", L"Française", L"Dodich Informatique", "Dodich@live.fr" }, + {"it", L"Italiano", L"Roberto", "Gulliver_69@libero.it"}, + {"es", L"Español", L"Rub3nCT", "Rub3nCT@gmail.com" }, + {"ru", L"русский", L"Neonailol", "Neonailol@gmail.com" }, {NULL, NULL, NULL, NULL} }; @@ -227,8 +228,8 @@ void AboutDialog::showAboutContributors(void) for(int i = 0; g_lamexp_contributors[i].pcName; i++) { contributorsAboutText += QString("  ").arg(g_lamexp_contributors[i].pcFlag); - contributorsAboutText += QString("%2  ").arg(g_lamexp_contributors[i].pcLanguage); - contributorsAboutText += QString("%3  <%4>").arg(g_lamexp_contributors[i].pcName, g_lamexp_contributors[i].pcMail); + contributorsAboutText += QString("%2  ").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcLanguage)); + contributorsAboutText += QString("%3  <%4>").arg(WCHAR2QSTR(g_lamexp_contributors[i].pcName), g_lamexp_contributors[i].pcMail); } contributorsAboutText += ""; contributorsAboutText += "

"; diff --git a/src/Global.h b/src/Global.h index 8911cb6d..03e58e57 100644 --- a/src/Global.h +++ b/src/Global.h @@ -118,6 +118,7 @@ SIZE_T lamexp_dbg_private_bytes(void); #define LAMEXP_DELETE(PTR) if(PTR) { delete PTR; PTR = NULL; } #define LAMEXP_CLOSE(HANDLE) if(HANDLE != NULL && HANDLE != INVALID_HANDLE_VALUE) { CloseHandle(HANDLE); HANDLE = NULL; } #define QWCHAR(STR) reinterpret_cast(STR.utf16()) +#define WCHAR2QSTR(STR) QString::fromUtf16(reinterpret_cast(STR)) #define LAMEXP_DYNCAST(OUT,CLASS,SRC) try { OUT = dynamic_cast(SRC); } catch(std::bad_cast) { OUT = NULL; } #define LAMEXP_BOOL(X) (X ? "1" : "0")