claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix keybinds being saved in native/localized form

Browse Source 
Keybinds are now both saved and read in portable form
and only converted to native one for display purposes, fixing
them not being read correctly when certain languages are set.

Also get rid of qPrintable() due to it using the system 8-bit codepage
instead of UTF-8, and some unnecessary QString ↔ C string conversions

Co-Authored-by: Cacodemon345 <wahil1976@outlook.com>
This commit is contained in:
Alexander Babikov
2025-05-07 19:03:10 +05:00
parent 19bfa0b442
commit 5918356719
30 changed files with 159 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/plat.h
View File

@@ -32,8 +32,8 @@
/* String ID numbers. */ /* String ID numbers. */
enum { enum {
STRING_MOUSE_CAPTURE, /* "Click to capture mouse" */ STRING_MOUSE_CAPTURE, /* "Click to capture mouse" */
STRING_MOUSE_RELEASE, /* "Press F8+F12 to release mouse" */ STRING_MOUSE_RELEASE, /* "Press %1 to release mouse" */
STRING_MOUSE_RELEASE_MMB, /* "Press F8+F12 or middle button to release mouse" */ STRING_MOUSE_RELEASE_MMB, /* "Press %1 or middle button to release mouse" */
STRING_INVALID_CONFIG, /* "Invalid configuration" */ STRING_INVALID_CONFIG, /* "Invalid configuration" */
STRING_NO_ST506_ESDI_CDROM, /* "MFM/RLL or ESDI CD-ROM drives never existed" */ STRING_NO_ST506_ESDI_CDROM, /* "MFM/RLL or ESDI CD-ROM drives never existed" */
STRING_NET_ERROR, /* "Failed to initialize network driver" */ STRING_NET_ERROR, /* "Failed to initialize network driver" */

2
src/qt/languages/86box.pot
View File

@@ -630,7 +630,7 @@ msgstr ""
msgid " - PAUSED" msgid " - PAUSED"
msgstr "" msgstr ""
msgid "Press Ctrl+Alt+PgDn to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "" msgstr ""
msgid "Speed" msgid "Speed"

12
src/qt/languages/ca-ES.po
View File

@@ -630,8 +630,8 @@ msgstr "Error fatal"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - EN PAUSA" msgstr " - EN PAUSA"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Premeu %s per tornar al mode de finestra." msgstr "Premeu %1 per tornar al mode de finestra."
msgid "Speed" msgid "Speed"
msgstr "Velocitat" msgstr "Velocitat"
@@ -717,11 +717,11 @@ msgstr "Altres perifèrics"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Feu clic per capturar el ratolí" msgstr "Feu clic per capturar el ratolí"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Premeu %s per alliberar el ratolí" msgstr "Premeu %1 per alliberar el ratolí"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Premeu %s o el botó central per alliberar el ratolí" msgstr "Premeu %1 o el botó central per alliberar el ratolí"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/cs-CZ.po
View File

@@ -630,8 +630,8 @@ msgstr "Kritická chyba"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - POZASTAVENO" msgstr " - POZASTAVENO"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Stiskněte %s pro návrat z režimu celé obrazovky." msgstr "Stiskněte %1 pro návrat z režimu celé obrazovky."
msgid "Speed" msgid "Speed"
msgstr "Rychlost" msgstr "Rychlost"
@@ -717,11 +717,11 @@ msgstr "Jiné příslušenství"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Klikněte pro zabraní myši" msgstr "Klikněte pro zabraní myši"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Stiskněte %s pro uvolnění myši" msgstr "Stiskněte %1 pro uvolnění myši"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Stiskněte %s nebo prostřední tlačítko pro uvolnění myši" msgstr "Stiskněte %1 nebo prostřední tlačítko pro uvolnění myši"
msgid "Bus" msgid "Bus"
msgstr "Sběrnice" msgstr "Sběrnice"

15
src/qt/languages/de-DE.po
View File

@@ -630,8 +630,8 @@ msgstr "Fataler Fehler"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - PAUSIERT" msgstr " - PAUSIERT"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "%s ab, zur Rückkehr in den Fenstermodus." msgstr "%1 ab, zur Rückkehr in den Fenstermodus."
msgid "Speed" msgid "Speed"
msgstr "Geschwindigkeit" msgstr "Geschwindigkeit"
@@ -717,14 +717,11 @@ msgstr "Andere Peripheriegeräte"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Klicken zum Einfangen des Mauszeigers" msgstr "Klicken zum Einfangen des Mauszeigers"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Drücke %s zur Mausfreigabe" msgstr "Drücke %1 zur Mausfreigabe"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Drücke %s oder die mittlere Maustaste zur Mausfreigabe" msgstr "Drücke %1 oder die mittlere Maustaste zur Mausfreigabe"
msgid "Ctrl+End"
msgstr "Strg+Ende"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/es-ES.po
View File

@@ -630,8 +630,8 @@ msgstr "Error fatal"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - EN PAUSA" msgstr " - EN PAUSA"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Pulsa %s para volver a modo ventana." msgstr "Pulsa %1 para volver a modo ventana."
msgid "Speed" msgid "Speed"
msgstr "Velocidad" msgstr "Velocidad"
@@ -717,11 +717,11 @@ msgstr "Otros periféricos"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Haga click para capturar el ratón" msgstr "Haga click para capturar el ratón"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Pulse %s para liberar el ratón" msgstr "Pulse %1 para liberar el ratón"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Pulse %s o el botón central para liberar el ratón" msgstr "Pulse %1 o el botón central para liberar el ratón"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/fi-FI.po
View File

@@ -630,8 +630,8 @@ msgstr "Vakava virhe"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - TAUKO" msgstr " - TAUKO"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Paina %s palataksesi ikkunoituun tilaan." msgstr "Paina %1 palataksesi ikkunoituun tilaan."
msgid "Speed" msgid "Speed"
msgstr "Nopeus" msgstr "Nopeus"
@@ -717,11 +717,11 @@ msgstr "Muut oheislaitteet"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kaappaa hiiri klikkaamalla" msgstr "Kaappaa hiiri klikkaamalla"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Paina %s vapauttaaksesi hiiren" msgstr "Paina %1 vapauttaaksesi hiiren"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Paina %s tai keskipainiketta vapauttaaksesi hiiren" msgstr "Paina %1 tai keskipainiketta vapauttaaksesi hiiren"
msgid "Bus" msgid "Bus"
msgstr "Väylä" msgstr "Väylä"

12
src/qt/languages/fr-FR.po
View File

@@ -630,8 +630,8 @@ msgstr "Erreur fatale"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - EN PAUSE" msgstr " - EN PAUSE"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Appuyez sur %s pour revenir au mode fenêtré." msgstr "Appuyez sur %1 pour revenir au mode fenêtré."
msgid "Speed" msgid "Speed"
msgstr "Vitesse" msgstr "Vitesse"
@@ -717,11 +717,11 @@ msgstr "Autres périfériques"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Cliquer pour capturer la souris" msgstr "Cliquer pour capturer la souris"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Appuyer sur %s pour libérer la souris" msgstr "Appuyer sur %1 pour libérer la souris"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Appuyer sur %s ou le bouton central pour libérer la souris" msgstr "Appuyer sur %1 ou le bouton central pour libérer la souris"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/hr-HR.po
View File

@@ -630,8 +630,8 @@ msgstr "Fatalna greška"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - ZASTAO" msgstr " - ZASTAO"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Pritisnite %s za povratak u prozorski način rada." msgstr "Pritisnite %1 za povratak u prozorski način rada."
msgid "Speed" msgid "Speed"
msgstr "Brzina" msgstr "Brzina"
@@ -717,11 +717,11 @@ msgstr "Ostali periferni uređaji"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kliknite da uhvatite miš" msgstr "Kliknite da uhvatite miš"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Pritisnite %s za otpustanje miša" msgstr "Pritisnite %1 za otpustanje miša"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Pritisnite %s ili srednji gumb miša za otpuštanje miša" msgstr "Pritisnite %1 ili srednji gumb miša za otpuštanje miša"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/hu-HU.po
View File

@@ -630,8 +630,8 @@ msgstr "Végzetes hiba"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - SZÜNETELT" msgstr " - SZÜNETELT"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Használja a %s gombokat az ablakhoz való visszatéréshez." msgstr "Használja a %1 gombokat az ablakhoz való visszatéréshez."
msgid "Speed" msgid "Speed"
msgstr "Sebesség" msgstr "Sebesség"
@@ -717,11 +717,11 @@ msgstr "Egyéb perifériák"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kattintson az egér elfogásához" msgstr "Kattintson az egér elfogásához"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Nyomja meg az %s-t az egér elengédéséhez" msgstr "Nyomja meg az %1-t az egér elengédéséhez"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Nyomja meg az %s-t vagy a középső gombot az egér elengédéséhez" msgstr "Nyomja meg az %1-t vagy a középső gombot az egér elengédéséhez"
msgid "Bus" msgid "Bus"
msgstr "Busz" msgstr "Busz"

12
src/qt/languages/it-IT.po
View File

@@ -630,8 +630,8 @@ msgstr "Errore fatale"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - IN PAUSA" msgstr " - IN PAUSA"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Usa %s per tornare alla modalità finestra." msgstr "Usa %1 per tornare alla modalità finestra."
msgid "Speed" msgid "Speed"
msgstr "Velocità" msgstr "Velocità"
@@ -717,11 +717,11 @@ msgstr "Altre periferiche"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Fare clic per catturare mouse" msgstr "Fare clic per catturare mouse"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Premi %s per rilasciare il mouse" msgstr "Premi %1 per rilasciare il mouse"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Premi %s o pulsante centrale per rilasciare il mouse" msgstr "Premi %1 o pulsante centrale per rilasciare il mouse"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/ja-JP.po
View File

@@ -630,8 +630,8 @@ msgstr "致命的なエラー"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - 一時停止" msgstr " - 一時停止"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "%sでウィンドウ モードに戻ります。" msgstr "%1でウィンドウ モードに戻ります。"
msgid "Speed" msgid "Speed"
msgstr "速度" msgstr "速度"
@@ -717,11 +717,11 @@ msgstr "他の周辺デバイス"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "左クリックでマウスをキャプチャします" msgstr "左クリックでマウスをキャプチャします"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "%sキーでマウスを解放します" msgstr "%1キーでマウスを解放します"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "%sキーまたは中クリックでマウスを解放します" msgstr "%1キーまたは中クリックでマウスを解放します"
msgid "Bus" msgid "Bus"
msgstr "バス" msgstr "バス"

12
src/qt/languages/ko-KR.po
View File

@@ -630,8 +630,8 @@ msgstr "치명적인 오류"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - 일시 중지됨" msgstr " - 일시 중지됨"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "%s 키를 누르면 창 모드로 전환합니다." msgstr "%1 키를 누르면 창 모드로 전환합니다."
msgid "Speed" msgid "Speed"
msgstr "속도" msgstr "속도"
@@ -717,11 +717,11 @@ msgstr "기타 주변기기"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "이 창을 클릭하면 마우스를 사용합니다" msgstr "이 창을 클릭하면 마우스를 사용합니다"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "%s키를 누르면 마우스를 해제합니다" msgstr "%1키를 누르면 마우스를 해제합니다"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "%s키 또는 가운데 버튼을 클릭하면 마우스를 해제합니다" msgstr "%1키 또는 가운데 버튼을 클릭하면 마우스를 해제합니다"
msgid "Bus" msgid "Bus"
msgstr "버스" msgstr "버스"

12
src/qt/languages/nl-NL.po
View File

@@ -630,8 +630,8 @@ msgstr "Fatale fout"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - GEPAUZEERD" msgstr " - GEPAUZEERD"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Druk op %s om terug te gaan naar de venstermodus." msgstr "Druk op %1 om terug te gaan naar de venstermodus."
msgid "Speed" msgid "Speed"
msgstr "Snelheid" msgstr "Snelheid"
@@ -717,11 +717,11 @@ msgstr "Andere randapparatuur"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Klik om muis vast te leggen" msgstr "Klik om muis vast te leggen"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Druk op %s om de muis los te laten" msgstr "Druk op %1 om de muis los te laten"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Druk op %s of middelste knop om de muis los te laten" msgstr "Druk op %1 of middelste knop om de muis los te laten"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/pl-PL.po
View File

@@ -630,8 +630,8 @@ msgstr "Fatalny błąd"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - PAUSED" msgstr " - PAUSED"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Naciśnij klawisze %s aby wrócić to trybu okna." msgstr "Naciśnij klawisze %1 aby wrócić to trybu okna."
msgid "Speed" msgid "Speed"
msgstr "Szybkość" msgstr "Szybkość"
@@ -717,11 +717,11 @@ msgstr "Inne urządzenia peryferyjne"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kliknij w celu przechwycenia myszy" msgstr "Kliknij w celu przechwycenia myszy"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Naciśnij klawisze %s w celu uwolnienia myszy" msgstr "Naciśnij klawisze %1 w celu uwolnienia myszy"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Naciśnij klawisze %s lub środkowy przycisk w celu uwolnienia myszy" msgstr "Naciśnij klawisze %1 lub środkowy przycisk w celu uwolnienia myszy"
msgid "Bus" msgid "Bus"
msgstr "Magistrala" msgstr "Magistrala"

12
src/qt/languages/pt-BR.po
View File

@@ -630,8 +630,8 @@ msgstr "Erro fatal"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - PAUSADO" msgstr " - PAUSADO"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Use %s para retornar ao modo janela." msgstr "Use %1 para retornar ao modo janela."
msgid "Speed" msgid "Speed"
msgstr "Velocidade" msgstr "Velocidade"
@@ -717,11 +717,11 @@ msgstr "Outros periféricos"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Clique para capturar o mouse" msgstr "Clique para capturar o mouse"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Aperte %s para liberar o mouse" msgstr "Aperte %1 para liberar o mouse"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Aperte %s ou botão do meio para liberar o mouse" msgstr "Aperte %1 ou botão do meio para liberar o mouse"
msgid "Bus" msgid "Bus"
msgstr "Barramento" msgstr "Barramento"

12
src/qt/languages/pt-PT.po
View File

@@ -630,8 +630,8 @@ msgstr "Erro fatal"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - EM PAUSA" msgstr " - EM PAUSA"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Pressione %s para voltar ao modo de janela." msgstr "Pressione %1 para voltar ao modo de janela."
msgid "Speed" msgid "Speed"
msgstr "Velocidade" msgstr "Velocidade"
@@ -717,11 +717,11 @@ msgstr "Outros dispositivos"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Clique para capturar o rato" msgstr "Clique para capturar o rato"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Pressione %s para soltar o rato" msgstr "Pressione %1 para soltar o rato"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Pressione %s ou tecla média para soltar o rato" msgstr "Pressione %1 ou tecla média para soltar o rato"
msgid "Bus" msgid "Bus"
msgstr "Barramento" msgstr "Barramento"

12
src/qt/languages/ru-RU.po
View File

@@ -630,8 +630,8 @@ msgstr "Неустранимая ошибка"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - ПАУЗА" msgstr " - ПАУЗА"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Нажмите %s для возврата в оконный режим." msgstr "Нажмите %1 для возврата в оконный режим."
msgid "Speed" msgid "Speed"
msgstr "Скорость" msgstr "Скорость"
@@ -717,11 +717,11 @@ msgstr "Другая периферия"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Щёлкните мышью для захвата курсора" msgstr "Щёлкните мышью для захвата курсора"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Нажмите %s, чтобы освободить курсор" msgstr "Нажмите %1, чтобы освободить курсор"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Нажмите %s или среднюю кнопку мыши, чтобы освободить курсор" msgstr "Нажмите %1 или среднюю кнопку мыши, чтобы освободить курсор"
msgid "Bus" msgid "Bus"
msgstr "Шина" msgstr "Шина"

12
src/qt/languages/sk-SK.po
View File

@@ -630,8 +630,8 @@ msgstr "Kritická chyba"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - POZASTAVENÝ" msgstr " - POZASTAVENÝ"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Stlačte %s pre návrat z režimu celej obrazovky." msgstr "Stlačte %1 pre návrat z režimu celej obrazovky."
msgid "Speed" msgid "Speed"
msgstr "Rýchlosť" msgstr "Rýchlosť"
@@ -717,11 +717,11 @@ msgstr "Iné príslušenstvo"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kliknite pre zabráni myši" msgstr "Kliknite pre zabráni myši"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Stlačte %s pre uvoľnenie myši" msgstr "Stlačte %1 pre uvoľnenie myši"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Stlačte %s alebo prostredné tlačidlo na uvoľnenie myši" msgstr "Stlačte %1 alebo prostredné tlačidlo na uvoľnenie myši"
msgid "Bus" msgid "Bus"
msgstr "Zbernica" msgstr "Zbernica"

12
src/qt/languages/sl-SI.po
View File

@@ -630,8 +630,8 @@ msgstr "Kritična napaka"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - ZAUSTAVLJEN" msgstr " - ZAUSTAVLJEN"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Pritisnite %s za povratek iz celozaslonskega načina." msgstr "Pritisnite %1 za povratek iz celozaslonskega načina."
msgid "Speed" msgid "Speed"
msgstr "Hitrost" msgstr "Hitrost"
@@ -717,11 +717,11 @@ msgstr "Druga periferija"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Kliknite za zajem miške" msgstr "Kliknite za zajem miške"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Pritisnite %s za izpust miške" msgstr "Pritisnite %1 za izpust miške"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Pritisnite %s ali srednji gumb za izpust miške" msgstr "Pritisnite %1 ali srednji gumb za izpust miške"
msgid "Bus" msgid "Bus"
msgstr "Vodilo" msgstr "Vodilo"

12
src/qt/languages/sv-SE.po
View File

@@ -630,8 +630,8 @@ msgstr "Allvarligt fel"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - PAUSAD" msgstr " - PAUSAD"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Tryck på %s för att återvända till fönsterläge." msgstr "Tryck på %1 för att återvända till fönsterläge."
msgid "Speed" msgid "Speed"
msgstr "Hastighet" msgstr "Hastighet"
@@ -717,11 +717,11 @@ msgstr "Andra tillbehör"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Klicka för att fånga upp musen" msgstr "Klicka för att fånga upp musen"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Tryck på %s för att släppa musen" msgstr "Tryck på %1 för att släppa musen"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Tryck på %s eller mellersta musknappen för att släppa musen" msgstr "Tryck på %1 eller mellersta musknappen för att släppa musen"
msgid "Bus" msgid "Bus"
msgstr "Buss" msgstr "Buss"

12
src/qt/languages/tr-TR.po
View File

@@ -630,8 +630,8 @@ msgstr "Kritik hata"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - DURAKLATILDI" msgstr " - DURAKLATILDI"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Pencere moduna geri dönmek için %s tuşlarına basın." msgstr "Pencere moduna geri dönmek için %1 tuşlarına basın."
msgid "Speed" msgid "Speed"
msgstr "Hız" msgstr "Hız"
@@ -717,11 +717,11 @@ msgstr "Diğer cihazlar"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Farenin yakalanması için tıklayın" msgstr "Farenin yakalanması için tıklayın"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Farenin bırakılması için %s tuşlarına basın" msgstr "Farenin bırakılması için %1 tuşlarına basın"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Farenin bırakılması için %s tuşlarına veya tekerlek tuşuna basın" msgstr "Farenin bırakılması için %1 tuşlarına veya tekerlek tuşuna basın"
msgid "Bus" msgid "Bus"
msgstr "Veri yolu" msgstr "Veri yolu"

12
src/qt/languages/uk-UA.po
View File

@@ -630,8 +630,8 @@ msgstr "Непереробна помилка"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - ПРИЗУПИНЕННЯ" msgstr " - ПРИЗУПИНЕННЯ"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Натисніть %s для повернення у віконний режим." msgstr "Натисніть %1 для повернення у віконний режим."
msgid "Speed" msgid "Speed"
msgstr "Швидкість" msgstr "Швидкість"
@@ -717,11 +717,11 @@ msgstr "Інша периферія"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Клацніть мишею для захвату курсора" msgstr "Клацніть мишею для захвату курсора"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Натисніть %s, щоб звільнити курсор" msgstr "Натисніть %1, щоб звільнити курсор"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Натисніть %s або середню кнопку миші, щоб звільнити курсор" msgstr "Натисніть %1 або середню кнопку миші, щоб звільнити курсор"
msgid "Bus" msgid "Bus"
msgstr "Шина" msgstr "Шина"

12
src/qt/languages/vi-VN.po
View File

@@ -630,8 +630,8 @@ msgstr "Lỗi nghiêm trọng"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - TẠM DỪNG" msgstr " - TẠM DỪNG"
msgid "Press %s to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "Bấm %s để quay lại chế độ cửa sổ." msgstr "Bấm %1 để quay lại chế độ cửa sổ."
msgid "Speed" msgid "Speed"
msgstr "Vận tốc" msgstr "Vận tốc"
@@ -717,11 +717,11 @@ msgstr "Thiết bị ngoại vi khác"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "Nhấp vào khung hình để 'nhốt' chuột vào" msgstr "Nhấp vào khung hình để 'nhốt' chuột vào"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "Nhấn %s để thả chuột" msgstr "Nhấn %1 để thả chuột"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "Nhấn %s hoặc nhấp chuột giữa để thả chuột" msgstr "Nhấn %1 hoặc nhấp chuột giữa để thả chuột"
msgid "Bus" msgid "Bus"
msgstr "Bus" msgstr "Bus"

12
src/qt/languages/zh-CN.po
View File

@@ -630,8 +630,8 @@ msgstr "致命错误"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - 已暂停" msgstr " - 已暂停"
msgid "Press Ctrl+Alt+PgDn to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "按下 Ctrl+Alt+PgDn 返回到窗口模式。" msgstr "按下 %1 返回到窗口模式。"
msgid "Speed" msgid "Speed"
msgstr "速度" msgstr "速度"
@@ -717,11 +717,11 @@ msgstr "其他外围设备"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "单击窗口捕捉鼠标" msgstr "单击窗口捕捉鼠标"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "按下 %s 释放鼠标" msgstr "按下 %1 释放鼠标"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "按下 %s 或鼠标中键释放鼠标" msgstr "按下 %1 或鼠标中键释放鼠标"
msgid "Bus" msgid "Bus"
msgstr "总线" msgstr "总线"

12
src/qt/languages/zh-TW.po
View File

@@ -630,8 +630,8 @@ msgstr "致命錯誤"
msgid " - PAUSED" msgid " - PAUSED"
msgstr " - 已暫停" msgstr " - 已暫停"
msgid "Press Ctrl+Alt+PgDn to return to windowed mode." msgid "Press %1 to return to windowed mode."
msgstr "按下 Ctrl+Alt+PgDn 返回到視窗模式。" msgstr "按下 %1 返回到視窗模式。"
msgid "Speed" msgid "Speed"
msgstr "速度" msgstr "速度"
@@ -717,11 +717,11 @@ msgstr "其他周邊裝置"
msgid "Click to capture mouse" msgid "Click to capture mouse"
msgstr "點擊視窗捕捉滑鼠" msgstr "點擊視窗捕捉滑鼠"
msgid "Press %s to release mouse" msgid "Press %1 to release mouse"
msgstr "按下 %s 釋放滑鼠" msgstr "按下 %1 釋放滑鼠"
msgid "Press %s or middle button to release mouse" msgid "Press %1 or middle button to release mouse"
msgstr "按下 %s 或滑鼠中鍵釋放滑鼠" msgstr "按下 %1 或滑鼠中鍵釋放滑鼠"
msgid "Bus" msgid "Bus"
msgstr "匯流排" msgstr "匯流排"

2
src/qt/qt_keybind.cpp
View File

@@ -90,7 +90,7 @@ KeyBinder::BindKey(QWidget* widget, QString CurValue)
KeyBinder kb(widget); KeyBinder kb(widget);
kb.setWindowTitle(tr("Bind Key")); kb.setWindowTitle(tr("Bind Key"));
kb.setFixedSize(kb.minimumSizeHint()); kb.setFixedSize(kb.minimumSizeHint());
kb.findChild<QKeySequenceEdit*>()->setKeySequence(QKeySequence::fromString(CurValue)); kb.findChild<QKeySequenceEdit*>()->setKeySequence(QKeySequence::fromString(CurValue, QKeySequence::NativeText));
kb.setEnabled(true); kb.setEnabled(true);
if (kb.exec() == QDialog::Accepted) { if (kb.exec() == QDialog::Accepted) {

7
src/qt/qt_mainwindow.cpp
View File

@@ -1347,10 +1347,9 @@ MainWindow::on_actionFullscreen_triggered()
if (video_fullscreen_first) { if (video_fullscreen_first) {
bool wasCaptured = mouse_capture == 1; bool wasCaptured = mouse_capture == 1;
char strFullscreen[100]; QMessageBox questionbox(QMessageBox::Icon::Information, tr("Entering fullscreen mode"),
sprintf(strFullscreen, qPrintable(tr("Press %s to return to windowed mode.")), acc_keys[FindAccelerator("fullscreen")].seq); tr("Press %1 to return to windowed mode.").arg(QKeySequence(acc_keys[FindAccelerator("fullscreen")].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)),
QMessageBox::Ok, this);
QMessageBox questionbox(QMessageBox::Icon::Information, tr("Entering fullscreen mode"), QString(strFullscreen), QMessageBox::Ok, this);
QCheckBox *chkbox = new QCheckBox(tr("Don't show this message again")); QCheckBox *chkbox = new QCheckBox(tr("Don't show this message again"));
questionbox.setCheckBox(chkbox); questionbox.setCheckBox(chkbox);
chkbox->setChecked(!video_fullscreen_first); chkbox->setChecked(!video_fullscreen_first);

13
src/qt/qt_platform.cpp
View File

@@ -43,6 +43,7 @@
#include <QTimer> #include <QTimer>
#include <QProcess> #include <QProcess>
#include <QRegularExpression> #include <QRegularExpression>
#include <QKeySequence>
#include <QLibrary> #include <QLibrary>
#include <QElapsedTimer> #include <QElapsedTimer>
@@ -571,8 +572,6 @@ c16stombs(char dst[], const uint16_t src[], int len)
} }
#endif #endif
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
#ifdef _WIN32 #ifdef _WIN32
# if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64) # if defined(__amd64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
# define LIB_NAME_GS "gsdll64.dll" # define LIB_NAME_GS "gsdll64.dll"
@@ -595,14 +594,8 @@ ProgSettings::reloadStrings()
{ {
translatedstrings.clear(); translatedstrings.clear();
translatedstrings[STRING_MOUSE_CAPTURE] = QCoreApplication::translate("", "Click to capture mouse").toStdWString(); translatedstrings[STRING_MOUSE_CAPTURE] = QCoreApplication::translate("", "Click to capture mouse").toStdWString();
translatedstrings[STRING_MOUSE_RELEASE] = QCoreApplication::translate("", "Press %1 to release mouse").arg(QKeySequence(acc_keys[FindAccelerator("release_mouse")].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)).toStdWString();
char mouseCaptureKeyseq[100]; translatedstrings[STRING_MOUSE_RELEASE_MMB] = QCoreApplication::translate("", "Press %1 or middle button to release mouse").arg(QKeySequence(acc_keys[FindAccelerator("release_mouse")].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)).toStdWString();
sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq);
translatedstrings[STRING_MOUSE_RELEASE] = QString(mouseCaptureKeyseq).toStdWString();
sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s or middle button to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq);
translatedstrings[STRING_MOUSE_RELEASE_MMB] = QString(mouseCaptureKeyseq).toStdWString();
translatedstrings[STRING_INVALID_CONFIG] = QCoreApplication::translate("", "Invalid configuration").toStdWString(); translatedstrings[STRING_INVALID_CONFIG] = QCoreApplication::translate("", "Invalid configuration").toStdWString();
translatedstrings[STRING_NO_ST506_ESDI_CDROM] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString(); translatedstrings[STRING_NO_ST506_ESDI_CDROM] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString();
translatedstrings[STRING_PCAP_ERROR_NO_DEVICES] = QCoreApplication::translate("", "No PCap devices found").toStdWString(); translatedstrings[STRING_PCAP_ERROR_NO_DEVICES] = QCoreApplication::translate("", "No PCap devices found").toStdWString();

10
src/qt/qt_settingsinput.cpp
View File

@@ -162,7 +162,7 @@ SettingsInput::refreshInputList()
for (int x=0;x<NUM_ACCELS;x++) { for (int x=0;x<NUM_ACCELS;x++) {
ui->tableKeys->setItem(x, 0, new QTableWidgetItem(tr(acc_keys_t[x].desc))); ui->tableKeys->setItem(x, 0, new QTableWidgetItem(tr(acc_keys_t[x].desc)));
ui->tableKeys->setItem(x, 1, new QTableWidgetItem(acc_keys_t[x].seq)); ui->tableKeys->setItem(x, 1, new QTableWidgetItem(QKeySequence(acc_keys_t[x].seq, QKeySequence::PortableText).toString(QKeySequence::NativeText)));
ui->tableKeys->setItem(x, 2, new QTableWidgetItem(acc_keys_t[x].name)); ui->tableKeys->setItem(x, 2, new QTableWidgetItem(acc_keys_t[x].name));
} }
} }
@@ -201,7 +201,7 @@ SettingsInput::on_tableKeys_cellDoubleClicked(int row, int col)
// so we don't test against shortcuts the user already changed. // so we don't test against shortcuts the user already changed.
for(int x=0;x<NUM_ACCELS;x++) for(int x=0;x<NUM_ACCELS;x++)
{ {
if(QString::fromStdString(acc_keys_t[x].seq) == keyseq.toString(QKeySequence::NativeText)) if(QString::fromStdString(acc_keys_t[x].seq) == keyseq.toString(QKeySequence::PortableText))
{ {
// That key is already in use // That key is already in use
main_window->showMessage(MBX_ANSI & MBX_INFO, "Bind conflict", "This key combo is already in use", false); main_window->showMessage(MBX_ANSI & MBX_INFO, "Bind conflict", "This key combo is already in use", false);
@@ -212,12 +212,12 @@ SettingsInput::on_tableKeys_cellDoubleClicked(int row, int col)
// Go ahead and apply the bind. // Go ahead and apply the bind.
// Find the correct accelerator key entry // Find the correct accelerator key entry
int accKeyID = FindAccelerator(qPrintable(ui->tableKeys->item(row,2)->text())); int accKeyID = FindAccelerator(ui->tableKeys->item(row,2)->text().toUtf8().constData());
if (accKeyID < 0) return; // this should never happen if (accKeyID < 0) return; // this should never happen
// Make the change // Make the change
cell->setText(keyseq.toString(QKeySequence::NativeText)); cell->setText(keyseq.toString(QKeySequence::NativeText));
strcpy(acc_keys_t[accKeyID].seq, qPrintable(keyseq.toString(QKeySequence::NativeText))); strcpy(acc_keys_t[accKeyID].seq, keyseq.toString(QKeySequence::PortableText).toUtf8().constData());
refreshInputList(); refreshInputList();
} }
@@ -242,7 +242,7 @@ SettingsInput::on_pushButtonClearBind_clicked()
cell->setText(""); cell->setText("");
// Find the correct accelerator key entry // Find the correct accelerator key entry
int accKeyID = FindAccelerator(qPrintable(ui->tableKeys->item(cell->row(),2)->text())); int accKeyID = FindAccelerator(ui->tableKeys->item(cell->row(),2)->text().toUtf8().constData());
if (accKeyID < 0) return; // this should never happen if (accKeyID < 0) return; // this should never happen
// Make the change // Make the change