From 78142f3468019ccb042d7fb07804ad79c6449106 Mon Sep 17 00:00:00 2001 From: nelsonhef Date: Fri, 22 Aug 2025 17:47:04 -0300 Subject: [PATCH 1/3] Some mnemonics updates for VGA screen types --- src/qt/languages/de-DE.po | 2 +- src/qt/languages/es-ES.po | 2 +- src/qt/languages/it-IT.po | 6 +++--- src/qt/languages/pt-BR.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index d784ebd1c..5ccb0c960 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -145,7 +145,7 @@ msgid "VGA screen &type" msgstr "&VGA-Bildschirmtyp" msgid "RGB &Color" -msgstr "&RGB-Farbe" +msgstr "RGB-&Farbe" msgid "RGB (no brown)" msgstr "RGB (ohne Braun)" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index 32489c7d4..e78a90154 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -157,7 +157,7 @@ msgid "Generic RGBI color monitor" msgstr "Monitor a colores RGBI genérico" msgid "&Amber monitor" -msgstr "Monitor &Ámbar" +msgstr "Monitor Ámb&ar" msgid "&Green monitor" msgstr "Monitor &Verde" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index 07c417142..03d9622f4 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -157,13 +157,13 @@ msgid "Generic RGBI color monitor" msgstr "Monitor a colori RGBI generico" msgid "&Amber monitor" -msgstr "&Monitor ambra" +msgstr "Monitor &ambra" msgid "&Green monitor" -msgstr "&Monitor verde" +msgstr "Monitor &verde" msgid "&White monitor" -msgstr "&Monitor bianco" +msgstr "Monitor &bianco" msgid "Grayscale &conversion type" msgstr "Conversione &scala di grigi" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index fc65088cf..3ace14ecf 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -157,7 +157,7 @@ msgid "Generic RGBI color monitor" msgstr "Monitor colorido RGBI genérico" msgid "&Amber monitor" -msgstr "Monitor &âmbar" +msgstr "Monitor âmb&ar" msgid "&Green monitor" msgstr "Monitor &verde" From b9795aca6d224ae9a5f142d67d712d82bbb72a2f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 22 Aug 2025 18:55:21 -0300 Subject: [PATCH 2/3] Jenkins: Enable macOS hardened runtime --- .ci/build.sh | 4 ++-- src/mac/CMakeLists.txt | 2 +- src/mac/entitlements.plist | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/mac/entitlements.plist diff --git a/.ci/build.sh b/.ci/build.sh index e26bbe8bf..8e26bf6cb 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -472,7 +472,7 @@ then mv "archive_tmp_universal/$merge_src.app" "$app_bundle_name" # Sign final app bundle. - arch -"$(uname -m)" codesign --force --deep -s - "$app_bundle_name" + arch -"$(uname -m)" codesign --force --deep -s - -o runtime --entitlements src/mac/entitlements.plist --timestamp "$app_bundle_name" # Create zip. echo [-] Creating artifact archive @@ -905,7 +905,7 @@ then fi # Sign app bundle, unless we're in an universal build. - [ $skip_archive -eq 0 ] && codesign --force --deep -s - "archive_tmp/"*".app" + [ $skip_archive -eq 0 ] && codesign --force --deep -s - -o runtime --entitlements src/mac/entitlements.plist --timestamp "archive_tmp/"*".app" elif [ "$BUILD_TAG" = "precondition" ] then # Continue with no app bundle on a dry build. diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt index 0562ca01d..c88ddf097 100644 --- a/src/mac/CMakeLists.txt +++ b/src/mac/CMakeLists.txt @@ -52,4 +52,4 @@ set_target_properties(86Box #set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES") #set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-") -#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements) +#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/entitlements.plist) diff --git a/src/mac/entitlements.plist b/src/mac/entitlements.plist new file mode 100644 index 000000000..59a80495d --- /dev/null +++ b/src/mac/entitlements.plist @@ -0,0 +1,10 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.disable-library-validation + + + From 256980bab29c5dec54f738a02f7902b3ff3134e3 Mon Sep 17 00:00:00 2001 From: nelsonhef Date: Fri, 22 Aug 2025 19:06:23 -0300 Subject: [PATCH 3/3] Updates conflicting mnemonics in the Tools menu --- src/qt/languages/86box.pot | 2 +- src/qt/languages/cs-CZ.po | 2 +- src/qt/languages/de-DE.po | 8 ++++---- src/qt/languages/es-ES.po | 6 +++--- src/qt/languages/fr-FR.po | 6 +++--- src/qt/languages/hr-HR.po | 2 +- src/qt/languages/it-IT.po | 8 ++++---- src/qt/languages/ja-JP.po | 4 ++-- src/qt/languages/ko-KR.po | 2 +- src/qt/languages/nl-NL.po | 2 +- src/qt/languages/pl-PL.po | 2 +- src/qt/languages/pt-BR.po | 4 ++-- src/qt/languages/pt-PT.po | 8 ++++---- src/qt/languages/ru-RU.po | 2 +- src/qt/languages/sk-SK.po | 2 +- src/qt/languages/sl-SI.po | 2 +- src/qt/languages/sv-SE.po | 2 +- src/qt/languages/tr-TR.po | 2 +- src/qt/languages/uk-UA.po | 2 +- src/qt/languages/vi-VN.po | 2 +- src/qt/languages/zh-CN.po | 2 +- src/qt/languages/zh-TW.po | 2 +- src/qt/qt_mainwindow.ui | 2 +- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot index 38b8811be..bcce43afd 100644 --- a/src/qt/languages/86box.pot +++ b/src/qt/languages/86box.pot @@ -1215,7 +1215,7 @@ msgstr "" msgid "&Open folder..." msgstr "" -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "" msgid "Set &icon..." diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index bd4860377..061b02ea1 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -1215,7 +1215,7 @@ msgstr "Kontextová nabídka" msgid "&Open folder..." msgstr "&Otevřít složku..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Otevřít zásobník &tiskárny..." msgid "Set &icon..." diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 5ccb0c960..fd4bce317 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -202,7 +202,7 @@ msgid "Take s&creenshot" msgstr "S&creenshot aufnehmen" msgid "S&ound" -msgstr "T&on" +msgstr "&Ton" msgid "&Preferences..." msgstr "&Einstellungen..." @@ -1215,8 +1215,8 @@ msgstr "Kontextmenü" msgid "&Open folder..." msgstr "&Ordner öffnen" -msgid "Open &printer tray..." -msgstr "Druckerausgabe öffnen..." +msgid "Open p&rinter tray..." +msgstr "D&ruckerausgabe öffnen..." msgid "Set &icon..." msgstr "&Symbol setzen" @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Nicht-primäre Monitore anzeigen" msgid "Open screenshots &folder..." -msgstr "Ordner „screenshots“ öffnen..." +msgstr "Ordner „screenshots“ ö&ffnen..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "Vollbild-S&treckmodus aktivieren, wenn das Fenster maximiert ist" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index e78a90154..65fec6bd4 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -199,7 +199,7 @@ msgid "&Update status bar icons" msgstr "&Actualizar iconos en barra de estado" msgid "Take s&creenshot" -msgstr "Tomar c&aptura" +msgstr "Tomar cap&tura" msgid "S&ound" msgstr "S&onido" @@ -1215,7 +1215,7 @@ msgstr "Menú de contexto" msgid "&Open folder..." msgstr "&Abrir carpeta..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Abrir bandeja de la &impresora..." msgid "Set &icon..." @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Mostrar monitores no prim&arios" msgid "Open screenshots &folder..." -msgstr "Abrir la carpeta screenshots..." +msgstr "Abrir la ca&rpeta screenshots..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "&Usar escalado pantalla completa en modalidad maximizada" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 151d3c91d..cd98dceeb 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -199,7 +199,7 @@ msgid "&Update status bar icons" msgstr "Mettre à jour la barre de stat&us" msgid "Take s&creenshot" -msgstr "Copie &d'écran" +msgstr "Copie d'é&cran" msgid "S&ound" msgstr "S&on" @@ -1215,7 +1215,7 @@ msgstr "Menu contextuel" msgid "&Open folder..." msgstr "&Ouvrir le dossier..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Ouvrez le bac de l'&imprimante..." msgid "Set &icon..." @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Afficher les moniteurs non pr&imaires" msgid "Open screenshots &folder..." -msgstr "Ouvrir le dossier des captures d'écran..." +msgstr "Ouvrir le do&ssier des captures d'écran..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "Appli&quer le mode élargi plein écran lorsque la fenêtre est maximisée" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index f903f596f..bdb980839 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -1215,7 +1215,7 @@ msgstr "Kontekstni izbornik" msgid "&Open folder..." msgstr "&Otvori mapu..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Otvori ladicu &pisača..." msgid "Set &icon..." diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index 03d9622f4..b47632c2b 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -199,7 +199,7 @@ msgid "&Update status bar icons" msgstr "&Aggiorna icone della barra di stato" msgid "Take s&creenshot" -msgstr "Cattura schermata" +msgstr "&Cattura schermata" msgid "S&ound" msgstr "A&udio" @@ -208,7 +208,7 @@ msgid "&Preferences..." msgstr "&Preferenze..." msgid "Enable &Discord integration" -msgstr "Abilita &integrazione Discord" +msgstr "Abilita integrazione &Discord" msgid "Sound &gain..." msgstr "Guadagno &suono..." @@ -1215,7 +1215,7 @@ msgstr "Menu contestuale" msgid "&Open folder..." msgstr "&Apri cartella..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Apri vassoio &stampante..." msgid "Set &icon..." @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Mostra i monitor non &primari" msgid "Open screenshots &folder..." -msgstr "Apri la cartella screenshots..." +msgstr "Apri la ca&rtella screenshots..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "Applica adattamento sc&hermo intero in modalità massimizzata" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index ddc6db0e2..2084999a0 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -1215,8 +1215,8 @@ msgstr "コンテキストメニュー" msgid "&Open folder..." msgstr "フォルダーを開く(&O)..." -msgid "Open &printer tray..." -msgstr "プリンタートレイを開く(&P)..." +msgid "Open p&rinter tray..." +msgstr "プリンタートレイを開く(&R)..." msgid "Set &icon..." msgstr "アイコンを設定(&I)..." diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 15a35d64d..bdf7e8c2f 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -1215,7 +1215,7 @@ msgstr "" msgid "&Open folder..." msgstr "" -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "" msgid "Set &icon..." diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po index c6e1c61ec..6408cf21c 100644 --- a/src/qt/languages/nl-NL.po +++ b/src/qt/languages/nl-NL.po @@ -1215,7 +1215,7 @@ msgstr "Contextmenu" msgid "&Open folder..." msgstr "&Open map..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Open &papierlade..." msgid "Set &icon..." diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index a71c66775..8d722817a 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1215,7 +1215,7 @@ msgstr "Menu kontekstowe" msgid "&Open folder..." msgstr "&Otwórz folder..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Otwórz &tackę drukarki..." msgid "Set &icon..." diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 3ace14ecf..9211f7fa7 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -1215,7 +1215,7 @@ msgstr "Menu de contexto" msgid "&Open folder..." msgstr "Abrir &pasta..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Abrir fila da &impressora..." msgid "Set &icon..." @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Mostrar monitores não &primários" msgid "Open screenshots &folder..." -msgstr "Abrir pasta de capturas de tela..." +msgstr "Ab&rir pasta de capturas de tela..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "Apl&icar modo de ampliação em tela cheia quando maximizado" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index 89fef3760..de11d57a3 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -199,7 +199,7 @@ msgid "&Update status bar icons" msgstr "&Atualizar ícones da barra de estado" msgid "Take s&creenshot" -msgstr "Gravar imagem de ecrã" +msgstr "Gravar imagem de &ecrã" msgid "S&ound" msgstr "&Som" @@ -208,7 +208,7 @@ msgid "&Preferences..." msgstr "&Preferências..." msgid "Enable &Discord integration" -msgstr "Ativar integração com &Discord" +msgstr "Ativar integração com D&iscord" msgid "Sound &gain..." msgstr "&Ganho de som..." @@ -1215,7 +1215,7 @@ msgstr "Menu de contexto" msgid "&Open folder..." msgstr "&Abrir pasta..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Abrir &bandeja de impressora..." msgid "Set &icon..." @@ -1642,7 +1642,7 @@ msgid "Show non-&primary monitors" msgstr "Mostrar monitores não &primários" msgid "Open screenshots &folder..." -msgstr "Abrir a pasta de capturas de ecrã..." +msgstr "Abrir a pas&ta de capturas de ecrã..." msgid "Appl&y fullscreen stretch mode when maximized" msgstr "Apl&icar o modo de estiramento na tela cheia quando maximizado" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index 005b58d9c..9b9d3756f 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -1215,7 +1215,7 @@ msgstr "Контекстное меню" msgid "&Open folder..." msgstr "&Открыть папку..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Открыть папку &принтера..." msgid "Set &icon..." diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po index 34f9876c8..a4169fac9 100644 --- a/src/qt/languages/sk-SK.po +++ b/src/qt/languages/sk-SK.po @@ -1215,7 +1215,7 @@ msgstr "Kontextové menu" msgid "&Open folder..." msgstr "&Otvoriť priečinok..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Otvoriť zásobník &tlačiarne..." msgid "Set &icon..." diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 588e30cc6..47a99b915 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -1215,7 +1215,7 @@ msgstr "Kontekstni meni" msgid "&Open folder..." msgstr "&Odpri mapo..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Odpri pladenj &tiskalnika..." msgid "Set &icon..." diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po index 4f98052fb..a0b4a0752 100644 --- a/src/qt/languages/sv-SE.po +++ b/src/qt/languages/sv-SE.po @@ -1215,7 +1215,7 @@ msgstr "Innehållsmeny" msgid "&Open folder..." msgstr "&Öppna mapp..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Öppna &skrivarfack..." msgid "Set &icon..." diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index e2b285d30..4a9109b13 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -1215,7 +1215,7 @@ msgstr "Bağlam Menüsü" msgid "&Open folder..." msgstr "Klas&örü aç..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Yazıcı te&psisini aç..." msgid "Set &icon..." diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index 6e6ed4bfe..dfe8d9d42 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -1215,7 +1215,7 @@ msgstr "Контекстне меню" msgid "&Open folder..." msgstr "&Відкрити папку..." -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Відкрити папку &принтера..." msgid "Set &icon..." diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po index f7a535a65..9a3521afb 100644 --- a/src/qt/languages/vi-VN.po +++ b/src/qt/languages/vi-VN.po @@ -1215,7 +1215,7 @@ msgstr "Menu ngữ cảnh" msgid "&Open folder..." msgstr "Mở thư mục" -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "Mở khay máy in" msgid "Set &icon..." diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 103b67cf5..6b2ac79d9 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -1215,7 +1215,7 @@ msgstr "" msgid "&Open folder..." msgstr "" -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "" msgid "Set &icon..." diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po index 8f6700c0c..2c5d9f310 100644 --- a/src/qt/languages/zh-TW.po +++ b/src/qt/languages/zh-TW.po @@ -1215,7 +1215,7 @@ msgstr "" msgid "&Open folder..." msgstr "" -msgid "Open &printer tray..." +msgid "Open p&rinter tray..." msgstr "" msgid "Set &icon..." diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui index b3f6d1a49..5ad597459 100644 --- a/src/qt/qt_mainwindow.ui +++ b/src/qt/qt_mainwindow.ui @@ -857,7 +857,7 @@ - Open &printer tray... + Open p&rinter tray...