From 52df7f6fe5bbb9a599c3fbc9e9de27a033c65426 Mon Sep 17 00:00:00 2001 From: Missake212 Date: Thu, 30 Jan 2025 21:18:45 +0100 Subject: [PATCH 1/8] add french tl (#2289) --- src/qt_gui/translations/fr.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/qt_gui/translations/fr.ts b/src/qt_gui/translations/fr.ts index b93af15a6..f2ea4fcc7 100644 --- a/src/qt_gui/translations/fr.ts +++ b/src/qt_gui/translations/fr.ts @@ -702,23 +702,23 @@ Enable Crash Diagnostics - Enable Crash Diagnostics + Activer le diagnostic de crash Collect Shaders - Collect Shaders + Collecter les shaders Copy GPU Buffers - Copy GPU Buffers + Copier la mémoire tampon GPU Host Debug Markers - Host Debug Markers + Marqueur de débogage hôte Guest Debug Markers - Guest Debug Markers + Marqueur de débogage invité Update @@ -954,30 +954,30 @@ collectShaderCheckBox - Collect Shaders:\nYou need this enabled to edit shaders with the debug menu (Ctrl + F10). + Collecter les Shaders:\nVous devez activer cette option pour modifier les shaders avec le menu de débogage (Ctrl + F10). crashDiagnosticsCheckBox - Crash Diagnostics:\nCreates a .yaml file with info about the Vulkan state at the time of crashing.\nUseful for debugging 'Device lost' errors. If you have this enabled, you should enable Host AND Guest Debug Markers.\nDoes not work on Intel GPUs.\nYou need Vulkan Validation Layers enabled and the Vulkan SDK for this to work. + Diagnostic de crash:\nCrée un fichier .yaml avec des informations sur l'état de Vulkan au moment du crash.\nUtile pour déboguer les erreurs "Device lost". Si cette option est activée, vous devez aussi activer Marqueur de débogage hôte ET invité.\nNe marche pas pour les GPUs Intel.\nVous devez activer le Vulkan Validation Layers ainsi que le Vulkan SDK pour que cela fonctionne. copyGPUBuffersCheckBox - Copy GPU Buffers:\nGets around race conditions involving GPU submits.\nMay or may not help with PM4 type 0 crashes. + Copier la mémoire tampon GPU:\nContourne les conditions de course impliquant des soumissions GPU.\nPeut aider ou non en cas de crash PM4 type 0. hostMarkersCheckBox - Host Debug Markers:\nInserts emulator-side information like markers for specific AMDGPU commands around Vulkan commands, as well as giving resources debug names.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Marqueur de débogage hôte:\nInsère des informations côté émulateur telles que des marqueurs pour des commandes spécifiques AMDGPU autour des commandes Vulkan, ainsi que donner les noms de débogages des ressources.\nSi cette option est activée, vous devriez activer "Diagnostic de crash".\nUtile pour des programmes comme RenderDoc. guestMarkersCheckBox - Guest Debug Markers:\nInserts any debug markers the game itself has added to the command buffer.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Marqueur de débogage invité:\nInsère tous les marqueurs de débogage que le jeu a ajouté a la commande mémoire tampon.\nSi cette option est activée, vous devriez activer "Diagnostic de crash".\nUtile pour des programmes comme RenderDoc. CheatsPatches Cheats / Patches for - Cheats/Patchs pour + Cheats / Patchs pour defaultTextEdit_MSG From c77f62a7380aa8a504420fa33b80f8fe38f3350c Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Thu, 30 Jan 2025 21:45:49 +0100 Subject: [PATCH 2/8] Detect and log if the user is using a fork (#2219) * Added fork detection * Fallback to "origin" if branch is not found * Add fork names to window titles * clang --- CMakeLists.txt | 24 ++++++++++++++++++++++++ src/common/scm_rev.cpp.in | 12 ++++++++---- src/common/scm_rev.h | 2 ++ src/emulator.cpp | 12 ++++++++++-- src/qt_gui/main_window.cpp | 11 +++++++++-- 5 files changed, 53 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78e3c7997..340715e78 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,30 @@ git_describe(GIT_DESC --always --long --dirty) git_branch_name(GIT_BRANCH) string(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S") +# Get current remote name and branch +execute_process( + COMMAND git rev-parse --abbrev-ref --symbolic-full-name @{u} + OUTPUT_VARIABLE GIT_REMOTE_NAME + RESULT_VARIABLE GIT_BRANCH_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +# Default to origin if branch is not set +if (GIT_BRANCH_RESULT OR GIT_REMOTE_NAME STREQUAL "") + set(GIT_REMOTE_NAME "origin") +else() + # Extract remote name from full name + string(FIND "${GIT_REMOTE_NAME}" "/" INDEX) + string(SUBSTRING "${GIT_REMOTE_NAME}" 0 "${INDEX}" GIT_REMOTE_NAME) +endif() + +# Get remote link +execute_process( + COMMAND git config --get remote.${GIT_REMOTE_NAME}.url + OUTPUT_VARIABLE GIT_REMOTE_URL + OUTPUT_STRIP_TRAILING_WHITESPACE +) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/common/scm_rev.cpp" @ONLY) find_package(Boost 1.84.0 CONFIG) diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 642e6373d..2de04e0be 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in @@ -6,14 +6,18 @@ #define GIT_REV "@GIT_REV@" #define GIT_BRANCH "@GIT_BRANCH@" #define GIT_DESC "@GIT_DESC@" +#define GIT_REMOTE_NAME "@GIT_REMOTE_NAME@" +#define GIT_REMOTE_URL "@GIT_REMOTE_URL@" #define BUILD_DATE "@BUILD_DATE@" namespace Common { -const char g_scm_rev[] = GIT_REV; -const char g_scm_branch[] = GIT_BRANCH; -const char g_scm_desc[] = GIT_DESC; -const char g_scm_date[] = BUILD_DATE; +const char g_scm_rev[] = GIT_REV; +const char g_scm_branch[] = GIT_BRANCH; +const char g_scm_desc[] = GIT_DESC; +const char g_scm_remote_name[] = GIT_REMOTE_NAME; +const char g_scm_remote_url[] = GIT_REMOTE_URL; +const char g_scm_date[] = BUILD_DATE; } // namespace diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h index 005099d2d..f38efff42 100644 --- a/src/common/scm_rev.h +++ b/src/common/scm_rev.h @@ -8,6 +8,8 @@ namespace Common { extern const char g_scm_rev[]; extern const char g_scm_branch[]; extern const char g_scm_desc[]; +extern const char g_scm_remote_name[]; +extern const char g_scm_remote_url[]; extern const char g_scm_date[]; } // namespace Common diff --git a/src/emulator.cpp b/src/emulator.cpp index 81c4d814d..3ab26d484 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -57,6 +57,7 @@ Emulator::Emulator() { LOG_INFO(Loader, "Revision {}", Common::g_scm_rev); LOG_INFO(Loader, "Branch {}", Common::g_scm_branch); LOG_INFO(Loader, "Description {}", Common::g_scm_desc); + LOG_INFO(Loader, "Remote {}", Common::g_scm_remote_url); LOG_INFO(Config, "General LogType: {}", Config::getLogType()); LOG_INFO(Config, "General isNeo: {}", Config::isNeoModeConsole()); @@ -199,8 +200,15 @@ void Emulator::Run(const std::filesystem::path& file, const std::vector( Config::getScreenWidth(), Config::getScreenHeight(), controller, window_title); diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index 3678b3a82..ce7b7b19e 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -57,8 +57,15 @@ bool MainWindow::Init() { if (Common::isRelease) { window_title = fmt::format("shadPS4 v{}", Common::VERSION); } else { - window_title = fmt::format("shadPS4 v{} {} {}", Common::VERSION, Common::g_scm_branch, - Common::g_scm_desc); + std::string remote_url(Common::g_scm_remote_url); + if (remote_url == "https://github.com/shadps4-emu/shadPS4.git") { + window_title = fmt::format("shadPS4 v{} {} {}", Common::VERSION, Common::g_scm_branch, + Common::g_scm_desc); + } else { + std::string remote_host = remote_url.substr(19, remote_url.rfind('/') - 19); + window_title = fmt::format("shadPS4 v{} {}/{} {}", Common::VERSION, remote_host, + Common::g_scm_branch, Common::g_scm_desc); + } } setWindowTitle(QString::fromStdString(window_title)); this->show(); From b5d63a31ccc9eefc98818577e87b418af225005e Mon Sep 17 00:00:00 2001 From: C4ndyF1sh <128715345+C4ndyF1sh@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:05:50 +0100 Subject: [PATCH 3/8] update german ts (#2290) * Update de.ts (p1) * Update de.ts (p2) --- src/qt_gui/translations/de.ts | 110 +++++++++++++++++----------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/qt_gui/translations/de.ts b/src/qt_gui/translations/de.ts index b8fa22881..d1ae21cca 100644 --- a/src/qt_gui/translations/de.ts +++ b/src/qt_gui/translations/de.ts @@ -52,7 +52,7 @@ Select which directory you want to install to. - Select which directory you want to install to. + Wählen Sie das Verzeichnis aus, in das Sie installieren möchten. @@ -130,35 +130,35 @@ Delete... - Delete... + Löschen... Delete Game - Delete Game + Lösche Spiel Delete Update - Delete Update + Lösche Aktualisierung Delete DLC - Delete DLC + Lösche DLC Compatibility... - Compatibility... + Kompatibilität... Update database - Update database + Aktualisiere Datenbank View report - View report + Bericht ansehen Submit a report - Submit a report + Einen Bericht einreichen Shortcut creation @@ -182,23 +182,23 @@ Game - Game + Spiel requiresEnableSeparateUpdateFolder_MSG - This feature requires the 'Enable Separate Update Folder' config option to work. If you want to use this feature, please enable it. + Damit diese Funktion funktioniert, ist die Konfigurationsoption „Separaten Update-Ordner aktivieren“ erforderlich. Wenn Sie diese Funktion nutzen möchten, aktivieren Sie sie bitte. This game has no update to delete! - This game has no update to delete! + Dieses Spiel hat keine Aktualisierung zum löschen! Update - Update + Aktualisieren This game has no DLC to delete! - This game has no DLC to delete! + Dieses Spiel hat kein DLC zum aktualisieren! DLC @@ -206,11 +206,11 @@ Delete %1 - Delete %1 + Lösche %1 Are you sure you want to delete %1's %2 directory? - Are you sure you want to delete %1's %2 directory? + Sind Sie sicher dass Sie %1 %2 Ordner löschen wollen? @@ -249,7 +249,7 @@ Open shadPS4 Folder - Open shadPS4 Folder + Öffne shadPS4 Ordner Exit @@ -305,7 +305,7 @@ Download Cheats/Patches - Cheats / Patches herunterladen + Cheats/Patches herunterladen Dump Game List @@ -313,7 +313,7 @@ PKG Viewer - PKG-Ansicht + PKG-Anschauer Search... @@ -329,11 +329,11 @@ Game List Icons - Game List Icons + Spiellisten-Symbole Game List Mode - Spiellisten-Symoble + Spiellisten-Modus Settings @@ -373,7 +373,7 @@ toolBar - toolBar + Werkzeugleiste Game List @@ -461,7 +461,7 @@ Would you like to install DLC: %1? - Willst du den DLC installieren: %1? + Willst du das DLC installieren: %1? DLC already installed: @@ -546,7 +546,7 @@ Enable Separate Update Folder - Enable Separate Update Folder + Separaten Update-Ordner aktivieren Default tab when opening settings @@ -574,11 +574,11 @@ Trophy Key - Trophy Key + Trophäenschlüssel Trophy - Trophy + Trophäe Logger @@ -702,23 +702,23 @@ Enable Crash Diagnostics - Enable Crash Diagnostics + Absturz-Diagnostik aktivieren Collect Shaders - Collect Shaders + Sammle Shader Copy GPU Buffers - Copy GPU Buffers + Kopiere GPU Puffer Host Debug Markers - Host Debug Markers + Host-Debug-Markierungen Guest Debug Markers - Guest Debug Markers + Guest-Debug-Markierungen Update @@ -746,7 +746,7 @@ Disable Trophy Pop-ups - Disable Trophy Pop-ups + Deaktiviere Trophäen Pop-ups Play title music @@ -754,19 +754,19 @@ Update Compatibility Database On Startup - Update Compatibility Database On Startup + Aktualisiere Kompatibilitätsdatenbank beim Start Game Compatibility - Game Compatibility + Spielkompatibilität Display Compatibility Data - Display Compatibility Data + Zeige Kompatibilitätsdaten Update Compatibility Database - Update Compatibility Database + Aktualisiere Kompatibilitätsdatenbank Volume @@ -810,7 +810,7 @@ separateUpdatesCheckBox - Enable Separate Update Folder:\nEnables installing game updates into a separate folder for easy management. + Separaten Update-Ordner aktivieren:\nErmöglicht die Installation von Spielaktualiserungen in einem separaten Ordner zur einfachen Verwaltung. showSplashCheckBox @@ -866,15 +866,15 @@ enableCompatibilityCheckBox - Display Compatibility Data:\nDisplays game compatibility information in table view. Enable "Update Compatibility On Startup" to get up-to-date information. + Kompatibilitätsdaten anzeigen:\nZeigt Spielkompatibilitätsinformationen in Tabellenansicht an. Aktivieren Sie „Aktualisiere Kompatibilitätsdatenbank beim Start“, um aktuelle Informationen zu erhalten. checkCompatibilityOnStartupCheckBox - Update Compatibility On Startup:\nAutomatically update the compatibility database when shadPS4 starts. + Kompatibilität beim Start aktualisieren:\nAktualisiert die Kompatibilitätsdatenbank automatisch, wenn shadPS4 startet. updateCompatibilityButton - Update Compatibility Database:\nImmediately update the compatibility database. + Aktualisiere Kompatibilitätsdatenbank:\nAktualisiere sofort die Kompatibilitätsdatenbank. Never @@ -954,23 +954,23 @@ collectShaderCheckBox - Collect Shaders:\nYou need this enabled to edit shaders with the debug menu (Ctrl + F10). + Shader sammeln:\nSie müssen diese Option aktivieren, um Shader mit dem Debug-Menü (Strg + F10) bearbeiten zu können. crashDiagnosticsCheckBox - Crash Diagnostics:\nCreates a .yaml file with info about the Vulkan state at the time of crashing.\nUseful for debugging 'Device lost' errors. If you have this enabled, you should enable Host AND Guest Debug Markers.\nDoes not work on Intel GPUs.\nYou need Vulkan Validation Layers enabled and the Vulkan SDK for this to work. + Absturzdiagnose:\nErstellt eine .yaml-Datei mit Informationen über den Vulkan-Status zum Zeitpunkt des Absturzes.\nNützlich zum Debuggen von „Gerät verloren“-Fehlern. Wenn Sie dies aktiviert haben, sollten Sie Host- UND Gast-Debug-Markierungen aktivieren.\nFunktioniert nicht auf Intel-GPUs.\nDamit dies funktioniert, müssen Vulkan Validationsschichten aktiviert und das Vulkan SDK installiert sein. copyGPUBuffersCheckBox - Copy GPU Buffers:\nGets around race conditions involving GPU submits.\nMay or may not help with PM4 type 0 crashes. + GPU-Puffer kopieren:\nUmgeht Race-Bedingungen mit GPU-Übermittlungen.\nKann bei PM4-Abstürzen vom Typ 0 hilfreich sein oder auch nicht. hostMarkersCheckBox - Host Debug Markers:\nInserts emulator-side information like markers for specific AMDGPU commands around Vulkan commands, as well as giving resources debug names.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Host-Debug-Marker:\nFügt emulatorseitige Informationen wie Marker für bestimmte AMDGPU-Befehle rund um Vulkan-Befehle ein und gibt Ressourcen-Debug-Namen an.\nWenn Sie dies aktiviert haben, sollten Sie die Absturzdiagnose aktivieren.\nNützlich für Programme wie RenderDoc. guestMarkersCheckBox - Guest Debug Markers:\nInserts any debug markers the game itself has added to the command buffer.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Gast-Debug-Markierer:\nFügt alle Debug-Markierer, die das Spiel selbst hinzugefügt hat, in den Befehlspuffer ein.\nWenn Sie dies aktiviert haben, sollten Sie die Absturzdiagnose aktivieren.\nNützlich für Programme wie RenderDoc. @@ -1165,7 +1165,7 @@ Failed to open file: - Fehler beim Öffnen der Datei: + Öffnung der Datei fehlgeschlagen: XML ERROR: @@ -1212,7 +1212,7 @@ Compatibility - Compatibility + Kompatibilität Region @@ -1240,7 +1240,7 @@ Never Played - Never Played + Niemals gespielt h @@ -1256,27 +1256,27 @@ Compatibility is untested - Compatibility is untested + Kompatibilität wurde noch nicht getested Game does not initialize properly / crashes the emulator - Game does not initialize properly / crashes the emulator + Das Spiel wird nicht richtig initialisiert / stürzt den Emulator ab Game boots, but only displays a blank screen - Game boots, but only displays a blank screen + Spiel startet, aber zeigt nur einen blanken Bildschirm Game displays an image but does not go past the menu - Game displays an image but does not go past the menu + Spiel zeigt ein Bild aber geht nicht über das Menü hinaus Game has game-breaking glitches or unplayable performance - Game has game-breaking glitches or unplayable performance + Spiel hat spiel-brechende Störungen oder unspielbare Leistung Game can be completed with playable performance and no major glitches - Game can be completed with playable performance and no major glitches + Spiel kann mit spielbarer Leistung und keinen großen Störungen abgeschlossen werden @@ -1405,4 +1405,4 @@ TB - \ No newline at end of file + From be74f65864eb46f86e6b247db63fcc3cba5a4aed Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:14:13 +0100 Subject: [PATCH 4/8] Fix ccrash if remote is not set (#2291) --- CMakeLists.txt | 14 ++++++++++---- src/emulator.cpp | 3 ++- src/qt_gui/main_window.cpp | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 340715e78..e10fcfb98 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,21 +106,27 @@ git_describe(GIT_DESC --always --long --dirty) git_branch_name(GIT_BRANCH) string(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S") -# Get current remote name and branch +# Try to get the upstream remote and branch execute_process( COMMAND git rev-parse --abbrev-ref --symbolic-full-name @{u} OUTPUT_VARIABLE GIT_REMOTE_NAME RESULT_VARIABLE GIT_BRANCH_RESULT + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ) -# Default to origin if branch is not set +# Default to origin if there's no upstream set or if the command failed if (GIT_BRANCH_RESULT OR GIT_REMOTE_NAME STREQUAL "") set(GIT_REMOTE_NAME "origin") else() - # Extract remote name from full name + # Extract remote name if the output contains a remote/branch format string(FIND "${GIT_REMOTE_NAME}" "/" INDEX) - string(SUBSTRING "${GIT_REMOTE_NAME}" 0 "${INDEX}" GIT_REMOTE_NAME) + if (INDEX GREATER -1) + string(SUBSTRING "${GIT_REMOTE_NAME}" 0 "${INDEX}" GIT_REMOTE_NAME) + else() + # If no remote is present (only a branch name), default to origin + set(GIT_REMOTE_NAME "origin") + endif() endif() # Get remote link diff --git a/src/emulator.cpp b/src/emulator.cpp index 3ab26d484..ba8d8917c 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -201,7 +201,8 @@ void Emulator::Run(const std::filesystem::path& file, const std::vector Date: Thu, 30 Jan 2025 19:41:17 -0300 Subject: [PATCH 5/8] Fix minor issue with 'Emulator' group box (#2292) --- src/qt_gui/settings_dialog.ui | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qt_gui/settings_dialog.ui b/src/qt_gui/settings_dialog.ui index 4e7440af5..d15f49efe 100644 --- a/src/qt_gui/settings_dialog.ui +++ b/src/qt_gui/settings_dialog.ui @@ -108,9 +108,6 @@ Emulator - - Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft - false From 647694d1b9eb6c34b4567b627ac8752ffeb468c9 Mon Sep 17 00:00:00 2001 From: bigol83 <38129260+bigol83@users.noreply.github.com> Date: Fri, 31 Jan 2025 07:34:42 +0100 Subject: [PATCH 6/8] Update Italian translation (#2293) * Update it.ts Update Italian translation * Update Italian translation * Update Italian translation --- src/qt_gui/translations/it.ts | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/qt_gui/translations/it.ts b/src/qt_gui/translations/it.ts index 384272137..106d09de0 100644 --- a/src/qt_gui/translations/it.ts +++ b/src/qt_gui/translations/it.ts @@ -146,19 +146,19 @@ Compatibility... - Compatibility... + Compatibilità... Update database - Update database + Aggiorna database View report - View report + Visualizza rapporto Submit a report - Submit a report + Invia rapporto Shortcut creation @@ -194,7 +194,7 @@ Update - Update + Aggiornamento This game has no DLC to delete! @@ -249,7 +249,7 @@ Open shadPS4 Folder - Open shadPS4 Folder + Apri Cartella shadps4 Exit @@ -574,11 +574,11 @@ Trophy Key - Trophy Key + Chiave Trofei Trophy - Trophy + Trofei Logger @@ -702,23 +702,23 @@ Enable Crash Diagnostics - Enable Crash Diagnostics + Abilita Diagnostica Crash Collect Shaders - Collect Shaders + Raccogli Shaders Copy GPU Buffers - Copy GPU Buffers + Copia Buffer GPU Host Debug Markers - Host Debug Markers + Marcatori di Debug dell'Host Guest Debug Markers - Guest Debug Markers + Marcatori di Debug del Guest Update @@ -742,7 +742,7 @@ Title Music - Title Music + Musica del Titolo Disable Trophy Pop-ups @@ -774,7 +774,7 @@ Audio Backend - Audio Backend + Backend Audio Save @@ -830,7 +830,7 @@ TrophyKey - Trophy Key:\nKey used to decrypt trophies. Must be obtained from your jailbroken console.\nMust contain only hex characters. + Chiave Trofei:\nChiave utilizzata per la decrittazione dei trofei. Deve essere estratta dalla vostra console con jailbreak.\nDeve contenere solo caratteri esadecimali. logTypeGroupBox @@ -850,7 +850,7 @@ disableTrophycheckBox - Disable Trophy Pop-ups:\nDisable in-game trophy notifications. Trophy progress can still be tracked using the Trophy Viewer (right-click the game in the main window). + Disabilita Notifica Trofei:\nDisabilita notifiche in gioco dei trofei. Il progresso dei Trofei può ancora essere controllato con il Visualizzatore Trofei (clicca tasto destro sul gioco nella finestra principale). hideCursorGroupBox @@ -954,30 +954,30 @@ collectShaderCheckBox - Collect Shaders:\nYou need this enabled to edit shaders with the debug menu (Ctrl + F10). + Raccogli Shader:\nBisogna attivare questa opzione per poter modificare gli shader nel menu di debug (Ctrl + F10). crashDiagnosticsCheckBox - Crash Diagnostics:\nCreates a .yaml file with info about the Vulkan state at the time of crashing.\nUseful for debugging 'Device lost' errors. If you have this enabled, you should enable Host AND Guest Debug Markers.\nDoes not work on Intel GPUs.\nYou need Vulkan Validation Layers enabled and the Vulkan SDK for this to work. + Diagnostica Crash:\nCrea un file .yaml che contiene informazioni riguardo lo stato del renderer Vulkan nel momento in cui si verifica un crash.\nUtile per poter effettuare il debug degli errori di tipo "Device Lost". Se hai questa opzione attiva dovresti abilitare anche Marcatori di Debug Host e Guest.\nNon è funzionante su GPU Intel.\nVulkan Validation Layers deve essere abilitato e bisogna aver installato l'SDK Vulkan per poter utilizzare questa funzione. copyGPUBuffersCheckBox - Copy GPU Buffers:\nGets around race conditions involving GPU submits.\nMay or may not help with PM4 type 0 crashes. + Copia Buffer GPU:\nCerca di aggirare le race conditions che riguardano gli invii alla GPU.\nPotrebbe aiutare ad evitare crash che riguardano i PM4 di tipo 0. hostMarkersCheckBox - Host Debug Markers:\nInserts emulator-side information like markers for specific AMDGPU commands around Vulkan commands, as well as giving resources debug names.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Marcatori di Debug dell'Host:\nInserisce nel log informazioni ottenute dall'emulatore come ad esempio marcatori per comandi specifici AMDGPU quando si hanno comandi Vulkan e associa nomi di debug per le risorse.\nSe hai questa opzione abilitata dovresti abilitare anche Diagnostica Crash.\nUtile per programmi come RenderDoc. guestMarkersCheckBox - Guest Debug Markers:\nInserts any debug markers the game itself has added to the command buffer.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Marcatori di Debug del Guest:\nInserisce nel log marcatori di debug che il gioco stesso ha aggiunto al buffer dei comandi.\nSe hai abilitato questa opzione dovresti abilitare anche Diagnostica Crash.\nUtile per programmi come RenderDoc. CheatsPatches Cheats / Patches for - Cheats / Patches for + Cheats / Patch per defaultTextEdit_MSG @@ -1244,7 +1244,7 @@ h - h + o m @@ -1405,4 +1405,4 @@ TB - \ No newline at end of file + From 6e58c6c5131a0a1bd27833136e1b50f6a652adbf Mon Sep 17 00:00:00 2001 From: C4ndyF1sh <128715345+C4ndyF1sh@users.noreply.github.com> Date: Fri, 31 Jan 2025 07:35:06 +0100 Subject: [PATCH 7/8] update german ts (#2294) * Update de.ts (p1) * Update de.ts (p2) * Update de.ts (p3) * Update de.ts (p4) --- src/qt_gui/translations/de.ts | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/qt_gui/translations/de.ts b/src/qt_gui/translations/de.ts index d1ae21cca..71ee066c1 100644 --- a/src/qt_gui/translations/de.ts +++ b/src/qt_gui/translations/de.ts @@ -105,7 +105,11 @@ Spielordner öffnen - Open Save Data Folder + Open Update Folder + Öffne Update-Ordner + + + Open Save Data Folder Speicherordner öffnen @@ -139,7 +143,11 @@ Delete Update Lösche Aktualisierung - + + + Delete Save Data + Lösche Speicherdaten + Delete DLC Lösche DLC @@ -513,7 +521,11 @@ SettingsDialog - Settings + Save Data Path + Speicherdaten-Pfad + + + Settings Einstellungen @@ -554,7 +566,7 @@ Show Game Size In List - Zeigen Sie die Spielgröße in der Liste + Zeige Spielgröße in der Liste Show Splash @@ -599,6 +611,10 @@ Input Eingabe + + + Enable Motion Controls + Aktiviere Bewegungssteuerung Cursor @@ -714,11 +730,11 @@ Host Debug Markers - Host-Debug-Markierungen + Host-Debug-Markierer Guest Debug Markers - Guest-Debug-Markierungen + Guest-Debug-Markierer Update @@ -742,7 +758,7 @@ Title Music - Title Music + Titelmusik Disable Trophy Pop-ups @@ -830,7 +846,7 @@ TrophyKey - Trophy Key:\nKey used to decrypt trophies. Must be obtained from your jailbroken console.\nMust contain only hex characters. + Trophäenschlüssel:\nSchlüssel zum Entschlüsseln von Trophäen. Muss von Ihrer gejailbreakten Konsole abgerufen werden.\nDarf nur Hex-Zeichen enthalten. logTypeGroupBox @@ -850,7 +866,7 @@ disableTrophycheckBox - Disable Trophy Pop-ups:\nDisable in-game trophy notifications. Trophy progress can still be tracked using the Trophy Viewer (right-click the game in the main window). + Trophäen-Popups deaktivieren:\nDeaktivieren Sie Trophäenbenachrichtigungen im Spiel. Der Trophäenfortschritt kann weiterhin mit dem Trophäen-Viewer verfolgt werden (klicken Sie mit der rechten Maustaste auf das Spiel im Hauptfenster).. hideCursorGroupBox @@ -977,7 +993,7 @@ CheatsPatches Cheats / Patches for - Cheats / Patches for + Cheats / Patches für defaultTextEdit_MSG From a55cec1954e62ffe2096aa136749283ffcbe6702 Mon Sep 17 00:00:00 2001 From: Martin <67326368+Martini-141@users.noreply.github.com> Date: Fri, 31 Jan 2025 07:35:31 +0100 Subject: [PATCH 8/8] add advdebug translation nb (#2296) * add advdebug translation nb * vvl is a project so no tr --- src/qt_gui/translations/nb.ts | 50 ++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/src/qt_gui/translations/nb.ts b/src/qt_gui/translations/nb.ts index 3e6f5fedd..bce5791af 100644 --- a/src/qt_gui/translations/nb.ts +++ b/src/qt_gui/translations/nb.ts @@ -629,7 +629,7 @@ Grafikk - Gui + GUI Grensesnitt @@ -680,6 +680,22 @@ Remove Fjern + + Save Data Path + Lagrede datamappe + + + Browse + Endre mappe + + + saveDataBox + Lagrede datamappe:\nListe over data shadPS4 lagrer. + + + browseButton + Endre mappe:\nEndrer hvilken mappe shadPS4 skal lagre data til. + Debug Feilretting @@ -690,7 +706,7 @@ Enable Vulkan Validation Layers - Aktiver Vulkan valideringslag + Aktiver Vulkan Validation Layers Enable Vulkan Synchronization Validation @@ -702,23 +718,23 @@ Enable Crash Diagnostics - Enable Crash Diagnostics + Aktiver krasjdiagnostikk Collect Shaders - Collect Shaders + Lagre skyggeleggere Copy GPU Buffers - Copy GPU Buffers + Kopier GPU-buffere Host Debug Markers - Host Debug Markers + Vertsfeilsøkingsmarkører Guest Debug Markers - Guest Debug Markers + Gjestefeilsøkingsmarkører Update @@ -742,7 +758,7 @@ Title Music - Title Music + Tittelmusikk Disable Trophy Pop-ups @@ -926,7 +942,7 @@ gameFoldersBox - Spillmapper:\nListen over mapper som brukes for å se etter installerte spill. + Spillmapper:\nListe over mapper som brukes for å se etter installerte spill. addFolderButton @@ -942,7 +958,7 @@ vkValidationCheckBox - Aktiver Vulkan valideringslag:\nAktiverer et system som validerer tilstanden til Vulkan-gjengiveren og logger informasjon om dens indre tilstand. Dette vil redusere ytelsen og sannsynligvis endre etterlignerens atferd. + Aktiver Vulkan Validation Layers:\nAktiverer et system som validerer tilstanden til Vulkan-gjengiveren og logger informasjon om dens indre tilstand. Dette vil redusere ytelsen og sannsynligvis endre etterlignerens atferd. vkSyncValidationCheckBox @@ -954,23 +970,23 @@ collectShaderCheckBox - Collect Shaders:\nYou need this enabled to edit shaders with the debug menu (Ctrl + F10). + Lagre skyggeleggere:\nDu trenger dette aktivert for å redigere skyggeleggerne med feilsøkingsmenyen (Ctrl + F10). crashDiagnosticsCheckBox - Crash Diagnostics:\nCreates a .yaml file with info about the Vulkan state at the time of crashing.\nUseful for debugging 'Device lost' errors. If you have this enabled, you should enable Host AND Guest Debug Markers.\nDoes not work on Intel GPUs.\nYou need Vulkan Validation Layers enabled and the Vulkan SDK for this to work. + Krasjdiagnostikk:\nOppretter en .yaml-fil med informasjon om Vulkan-tilstanden ved krasj.\nNyttig for feilsøking 'Device lost' feil. Hvis du har dette aktivert, burde du aktivere vert OG gjestefeilsøkingsmarkører.\nFunker ikke med Intel GPU-er.\nDu trenger Vulkan Validation Layers og Vulkan SDK for at dette skal fungere. copyGPUBuffersCheckBox - Copy GPU Buffers:\nGets around race conditions involving GPU submits.\nMay or may not help with PM4 type 0 crashes. + Kopier GPU-buffere:\nKommer rundt løpsforhold som involverer GPU-innsendinger.\nKan muligens hjelpe med PM4 type 0 krasj. hostMarkersCheckBox - Host Debug Markers:\nInserts emulator-side information like markers for specific AMDGPU commands around Vulkan commands, as well as giving resources debug names.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Vertsfeilsøkingsmarkører:\nSetter inn etterligner-side informasjon som markører for spesifikke AMDGPU-kommandoer rundt Vulkan-kommandoer, i tillegg til å gi ressurser feilrettingsnavn.\nHvis du har dette aktivert, burde du aktivere krasjdiagnostikk.\nNyttig for programmer som RenderDoc. guestMarkersCheckBox - Guest Debug Markers:\nInserts any debug markers the game itself has added to the command buffer.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc. + Gjestefeilsøkingsmarkører:\nSetter inn eventuelle feilsøkingsmarkører spillet selv har lagt til kommandobufferen.\nHvis du har dette aktivert, burde du aktivere krasjdiagnostikk.\nNyttig for programmer som RenderDoc. @@ -1015,6 +1031,10 @@ Delete File Slett fil + + Close + Lukk + No files selected. Ingen filer valgt.