From 4242ac28e0101a4e9b312939cbefeb151f18a99a Mon Sep 17 00:00:00 2001 From: Wengier Date: Thu, 26 May 2022 22:51:33 -0400 Subject: [PATCH] update languages --- contrib/translations/en/en_US.lng | 19 ++----------------- contrib/translations/es/es_ES.lng | 8 +------- contrib/translations/fr/fr_FR.lng | 16 +++++----------- contrib/translations/ja/ja_JP.lng | 8 +------- contrib/translations/ko/ko_KR.lng | 8 +------- contrib/translations/pt/pt_BR.lng | 8 +------- contrib/translations/tr/tr_TR.lng | 8 +------- contrib/translations/zh/zh_CN.lng | 8 +------- contrib/translations/zh/zh_TW.lng | 8 +------- contrib/windows/installer/DOSBox-X-setup.iss | 2 +- src/hardware/hardware.cpp | 2 +- src/hardware/ide.cpp | 3 +++ src/hardware/mixer.cpp | 6 +++--- src/misc/messages.cpp | 2 -- 14 files changed, 22 insertions(+), 84 deletions(-) diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index fcf91ec2e..f143bfaf2 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. @@ -223,17 +223,11 @@ Empty slot :SLOT Slot . -:PREVIOUS_PAGE -< Previous Page -. -:NEXT_PAGE - Next Page > -. :SELECT_EVENT Select an event to change. . :SELECT_DIFFERENT_EVENT -Select a different event or hit the Add/Del/Next buttons. +Select an event or press Add/Del/Next buttons. . :PRESS_JOYSTICK_KEY Press a key/joystick button or move the joystick. @@ -3454,15 +3448,6 @@ Quick launch program :MAPPER:reboot Reboot DOS system . -:MAPPER:recmtwave -Record to M.T. AVI -. -:MAPPER:recvoldown -Decrease rec. volume -. -:MAPPER:recvolup -Increase rec. volume -. :MAPPER:rescanall Rescan drives . diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index be0d42f27..d3def2206 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. @@ -226,12 +226,6 @@ Slot vacío :SLOT Slot . -:PREVIOUS_PAGE -< Pág anterior -. -:NEXT_PAGE -Pág siguiente > -. :SELECT_EVENT Elige evento a cambiar. . diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index 82a7c5d9b..247ea2bc9 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. @@ -224,12 +224,6 @@ Emplacement vide :SLOT Emplacement . -:PREVIOUS_PAGE -< Page préc. -. -:NEXT_PAGE -Page suivante > -. :SELECT_EVENT Sélectionnez un événement à modifier. . @@ -2308,10 +2302,10 @@ Basculer plein écran Réinit. taille fenêtre . :MENU:mapper_dbcssbcs -CJK : Commutation entre les modes DBCS/SBCS +CJK: Commutation entre les modes DBCS/SBCS . :MENU:mapper_autoboxdraw -CJK : Détection automatique des caractères de type "box-drawing". +CJK: Détection auto. des caractères de boîte dessin . :MENU:mapper_incsize Augmenter taille police @@ -2741,10 +2735,10 @@ Afficher le texte de droite à gauche Utiliser la police actuelle pour l'impression . :MENU:ttf_halfwidthkana -CJK : Autoriser les Katakana japonais en demi-largeur +CJK: Autoriser les Katakana japonais en demi-largeur . :MENU:ttf_extcharset -CJK : Activer le jeu de caractères chinois étendu +CJK: Activer le jeu de caractères chinois étendu . :MENU:VideoPC98Menu PC-98 diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 82f18cafa..505cc72f3 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 @@ -222,12 +222,6 @@ IDE ポジション :SLOT スロット . -:PREVIOUS_PAGE -< 前のページ -. -:NEXT_PAGE - 次のページ > -. :SELECT_EVENT 設定変更するイベントを選択 . diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index a71abdae8..54452ae6c 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. @@ -223,12 +223,6 @@ IDE 위치 :SLOT 슬롯 . -:PREVIOUS_PAGE -< 앞 페이지 -. -:NEXT_PAGE - 다음 페이지 > -. :SELECT_EVENT 설정 변경할 이벤트를 선택 . diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index a9f0e7138..6dad152f1 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. @@ -223,12 +223,6 @@ Compartimento vazio :SLOT Compartimento . -:PREVIOUS_PAGE -< Pág. anterior -. -:NEXT_PAGE -Próx. página > -. :SELECT_EVENT Selecionar evento para alterar. . diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index f42ce5a91..82b051545 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. @@ -223,12 +223,6 @@ Boş slot :SLOT Slot . -:PREVIOUS_PAGE -< Önceki sayfa -. -:NEXT_PAGE -Sonraki sayfa > -. :SELECT_EVENT Değiştirilecek olayı seçin. . diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 52b3a5720..8eab4237a 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. @@ -221,12 +221,6 @@ IDE 位置 :SLOT 存档 . -:PREVIOUS_PAGE -< 上一页 -. -:NEXT_PAGE - 下一页 > -. :SELECT_EVENT 选择要修改的事件. . diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index 34e1cc6a8..9b6c600c4 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:0.83.25 +:DOSBOX-X:VERSION:0.83.26 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印 :AUTOEXEC_CONFIGFILE_HELP 段落中的指令行會在啟動時執行. @@ -221,12 +221,6 @@ IDE 位置 :SLOT 位置 . -:PREVIOUS_PAGE -< 上一頁 -. -:NEXT_PAGE - 下一頁 > -. :SELECT_EVENT 選擇要修改的事件. . diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index a11083f53..28b9a70e3 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "0.83.25" +#define MyAppVersion "0.83.26" #define MyAppBit "(32-bit)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/src/hardware/hardware.cpp b/src/hardware/hardware.cpp index 19bdb8fa5..ac6a2093a 100644 --- a/src/hardware/hardware.cpp +++ b/src/hardware/hardware.cpp @@ -2056,7 +2056,7 @@ void CAPTURE_Init() { MAPPER_AddHandler(CAPTURE_WaveEvent,MK_w,MMODHOST,"recwave","Record audio to WAV", &item); item->set_text("Record audio to WAV"); - MAPPER_AddHandler(CAPTURE_MTWaveEvent,MK_nothing,0,"recmtwave","Record to M.T. AVI", &item); + MAPPER_AddHandler(CAPTURE_MTWaveEvent,MK_nothing,0,"recmtwave","Record to multi-track AVI", &item); item->set_text("Record audio to multi-track AVI"); MAPPER_AddHandler(CAPTURE_MidiEvent,MK_nothing,0,"caprawmidi","Record MIDI output", &item); diff --git a/src/hardware/ide.cpp b/src/hardware/ide.cpp index 868070680..a3025b6a1 100644 --- a/src/hardware/ide.cpp +++ b/src/hardware/ide.cpp @@ -40,6 +40,9 @@ #endif struct IDEEventPack { +#if defined(HX_DOS) || defined(__MINGW32__) + IDEEventPack() = default; +#endif IDEEventPack(const unsigned int interface,const unsigned int device) : v(pack(interface,device)) { } IDEEventPack(const unsigned int nv) : v(nv) { diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp index a3282b6b2..9b04475ed 100644 --- a/src/hardware/mixer.cpp +++ b/src/hardware/mixer.cpp @@ -1149,16 +1149,16 @@ void MAPPER_RecVolumeDown(bool pressed) { void MIXER_Controls_Init() { DOSBoxMenu::item *item; - MAPPER_AddHandler(MAPPER_VolumeUp ,MK_kpplus, MMODHOST,"volup","Increase volume",&item); + MAPPER_AddHandler(MAPPER_VolumeUp,MK_kpplus, MMODHOST,"volup","Increase volume",&item); item->set_text("Increase volume"); MAPPER_AddHandler(MAPPER_VolumeDown,MK_kpminus,MMODHOST,"voldown","Decrease volume",&item); item->set_text("Decrease volume"); - MAPPER_AddHandler(MAPPER_RecVolumeUp ,MK_nothing, 0,"recvolup","Increase rec. volume",&item); + MAPPER_AddHandler(MAPPER_RecVolumeUp,MK_nothing, 0,"recvolup","Increase recording volume",&item); item->set_text("Increase recording volume"); - MAPPER_AddHandler(MAPPER_RecVolumeDown,MK_nothing, 0,"recvoldown","Decrease rec. volume",&item); + MAPPER_AddHandler(MAPPER_RecVolumeDown,MK_nothing, 0,"recvoldown","Decrease recording volume",&item); item->set_text("Decrease recording volume"); } diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp index fc1611c25..799d7c865 100644 --- a/src/misc/messages.cpp +++ b/src/misc/messages.cpp @@ -185,8 +185,6 @@ void AddMessages() { MSG_Add("SWAP_SLOT","Swap slot"); MSG_Add("EMPTY_SLOT","Empty slot"); MSG_Add("SLOT","Slot"); - MSG_Add("PREVIOUS_PAGE","<-"); - MSG_Add("NEXT_PAGE","->"); MSG_Add("SELECT_EVENT", "Select an event to change."); MSG_Add("SELECT_DIFFERENT_EVENT", "Select an event or press Add/Del/Next buttons."); MSG_Add("PRESS_JOYSTICK_KEY", "Press a key/joystick button or move the joystick.");