Merge branch 'main' into qt-style

.gitmodules

@@ -119,3 +119,7 @@
 	path = externals/MoltenVK/cereal
 	url = https://github.com/USCiLab/cereal
 	shallow = true
+[submodule "externals/cubeb"]
+	path = externals/cubeb
+	url = https://github.com/mozilla/cubeb
+	shallow = true

CMakeLists.txt

@@ -106,7 +106,7 @@ git_describe(GIT_DESC --always --long --dirty)
 git_branch_name(GIT_BRANCH)
 string(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S")
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp" @ONLY)
+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)
 find_package(FFmpeg 5.1.2 MODULE)
@@ -127,6 +127,7 @@ find_package(xxHash 0.8.2 MODULE)
 find_package(ZLIB 1.3 MODULE)
 find_package(Zydis 5.0.0 CONFIG)
 find_package(pugixml 1.14 CONFIG)
+find_package(cubeb CONFIG)
 
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR NOT MSVC)
     find_package(cryptopp 8.9.0 MODULE)
@@ -198,9 +199,10 @@ set(AUDIO_LIB src/core/libraries/audio/audioin.cpp
               src/core/libraries/audio/audioin.h
               src/core/libraries/audio/audioout.cpp
               src/core/libraries/audio/audioout.h
-              src/core/libraries/audio/sdl_audio.cpp
+              src/core/libraries/audio/audioout_backend.h
-              src/core/libraries/audio/sdl_audio.h
               src/core/libraries/audio/audioout_error.h
+              src/core/libraries/audio/cubeb_audio.cpp
+              src/core/libraries/audio/sdl_audio.cpp
               src/core/libraries/ngs2/ngs2.cpp
               src/core/libraries/ngs2/ngs2.h
 )
@@ -493,6 +495,7 @@ set(COMMON src/common/logging/backend.cpp
            src/common/polyfill_thread.h
            src/common/rdtsc.cpp
            src/common/rdtsc.h
+           src/common/ringbuffer.h
            src/common/signal_context.h
            src/common/signal_context.cpp
            src/common/singleton.h
@@ -517,7 +520,7 @@ set(COMMON src/common/logging/backend.cpp
            src/common/number_utils.cpp
            src/common/memory_patcher.h
            src/common/memory_patcher.cpp
-           src/common/scm_rev.cpp
+           ${CMAKE_CURRENT_BINARY_DIR}/src/common/scm_rev.cpp
            src/common/scm_rev.h
 )
 
@@ -884,7 +887,7 @@ endif()
 create_target_directory_groups(shadps4)
 
 target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG)
-target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers)
+target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers cubeb::cubeb)
 
 target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h")
 target_compile_definitions(Dear_ImGui PRIVATE IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/src/imgui/imgui_config.h")
@@ -901,11 +904,18 @@ endif()
 if (APPLE)
   if (ENABLE_QT_GUI)
       # Include MoltenVK in the app bundle, along with an ICD file so it can be found by the system Vulkan loader if used for loading layers.
-      target_sources(shadps4 PRIVATE externals/MoltenVK/MoltenVK_icd.json)
+      set(MVK_ICD ${CMAKE_CURRENT_SOURCE_DIR}/externals/MoltenVK/MoltenVK_icd.json)
-      set_source_files_properties(externals/MoltenVK/MoltenVK_icd.json
+      target_sources(shadps4 PRIVATE ${MVK_ICD})
-          PROPERTIES MACOSX_PACKAGE_LOCATION Resources/vulkan/icd.d)
+      set_source_files_properties(${MVK_ICD} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/vulkan/icd.d)
-      add_custom_command(TARGET shadps4 POST_BUILD
+
-          COMMAND cmake -E copy $<TARGET_LINKER_FILE:MoltenVK> $<TARGET_BUNDLE_DIR:shadps4>/Contents/Frameworks/libMoltenVK.dylib)
+      set(MVK_DYLIB_SRC ${CMAKE_CURRENT_BINARY_DIR}/externals/MoltenVK/libMoltenVK.dylib)
+      set(MVK_DYLIB_DST ${CMAKE_CURRENT_BINARY_DIR}/shadps4.app/Contents/Frameworks/libMoltenVK.dylib)
+      add_custom_command(
+          OUTPUT ${MVK_DYLIB_DST}
+          DEPENDS ${MVK_DYLIB_SRC}
+          COMMAND cmake -E copy ${MVK_DYLIB_SRC} ${MVK_DYLIB_DST})
+      add_custom_target(CopyMoltenVK DEPENDS ${MVK_DYLIB_DST})
+      add_dependencies(shadps4 CopyMoltenVK)
       set_property(TARGET shadps4 APPEND PROPERTY BUILD_RPATH "@executable_path/../Frameworks")
   else()
       # For non-bundled SDL build, just do a normal library link.

LICENSES/ISC.txt

@@ -0,0 +1,7 @@
+ISC License
+
+<copyright notice>
+
+Permission to use, copy, modify, and /or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

externals/CMakeLists.txt

@@ -228,6 +228,16 @@ if (NOT TARGET stb::headers)
     add_library(stb::headers ALIAS stb)
 endif()
 
+# cubeb
+if (NOT TARGET cubeb::cubeb)
+    option(BUILD_TESTS "" OFF)
+    option(BUILD_TOOLS "" OFF)
+    option(BUNDLE_SPEEX "" ON)
+    option(USE_SANITIZERS "" OFF)
+    add_subdirectory(cubeb)
+    add_library(cubeb::cubeb ALIAS cubeb)
+endif()
+
 # Apple-only dependencies
 if (APPLE)
     # date

externals/cubeb

@@ -0,0 +1 @@
+Subproject commit 9a9d034c51859a045a34f201334f612c51e6c19d

src/common/config.cpp

@@ -68,6 +68,7 @@ static int cursorHideTimeout = 5; // 5 seconds (default)
 static bool separateupdatefolder = false;
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
+static std::string audioBackend = "cubeb";
 
 // Gui
 std::vector<std::filesystem::path> settings_install_dirs = {};
@@ -244,6 +245,10 @@ bool getCheckCompatibilityOnStartup() {
     return checkCompatibilityOnStartup;
 }
 
+std::string getAudioBackend() {
+    return audioBackend;
+}
+
 void setGpuId(s32 selectedGpuId) {
     gpuId = selectedGpuId;
 }
@@ -380,6 +385,10 @@ void setCheckCompatibilityOnStartup(bool use) {
     checkCompatibilityOnStartup = use;
 }
 
+void setAudioBackend(std::string backend) {
+    audioBackend = backend;
+}
+
 void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h) {
     main_window_geometry_x = x;
     main_window_geometry_y = y;
@@ -620,6 +629,12 @@ void load(const std::filesystem::path& path) {
         vkCrashDiagnostic = toml::find_or<bool>(vk, "crashDiagnostic", false);
     }
 
+    if (data.contains("Audio")) {
+        const toml::value& audio = data.at("Audio");
+
+        audioBackend = toml::find_or<std::string>(audio, "backend", "cubeb");
+    }
+
     if (data.contains("Debug")) {
         const toml::value& debug = data.at("Debug");
 
@@ -719,6 +734,7 @@ void save(const std::filesystem::path& path) {
     data["Vulkan"]["rdocEnable"] = rdocEnable;
     data["Vulkan"]["rdocMarkersEnable"] = vkMarkers;
     data["Vulkan"]["crashDiagnostic"] = vkCrashDiagnostic;
+    data["Audio"]["backend"] = audioBackend;
     data["Debug"]["DebugDump"] = isDebugDump;
     data["Debug"]["CollectShader"] = isShaderDebug;
 
@@ -824,6 +840,7 @@ void setDefaultValues() {
     separateupdatefolder = false;
     compatibilityData = false;
     checkCompatibilityOnStartup = false;
+    audioBackend = "cubeb";
 }
 
 } // namespace Config

src/common/config.h

@@ -24,6 +24,7 @@ bool getEnableDiscordRPC();
 bool getSeparateUpdateEnabled();
 bool getCompatibilityEnabled();
 bool getCheckCompatibilityOnStartup();
+std::string getAudioBackend();
 
 std::string getLogFilter();
 std::string getLogType();
@@ -76,6 +77,7 @@ void setSeparateUpdateEnabled(bool use);
 void setGameInstallDirs(const std::vector<std::filesystem::path>& settings_install_dirs_config);
 void setCompatibilityEnabled(bool use);
 void setCheckCompatibilityOnStartup(bool use);
+void setAudioBackend(std::string backend);
 
 void setCursorState(s16 cursorState);
 void setCursorHideTimeout(int newcursorHideTimeout);

src/common/ringbuffer.h

@@ -0,0 +1,374 @@
+// SPDX-FileCopyrightText: Copyright 2016 Mozilla Foundation
+// SPDX-License-Identifier: ISC
+
+#pragma once
+
+#include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <memory>
+#include <thread>
+#include "common/assert.h"
+
+/**
+ * Single producer single consumer lock-free and wait-free ring buffer.
+ *
+ * This data structure allows producing data from one thread, and consuming it
+ * on another thread, safely and without explicit synchronization. If used on
+ * two threads, this data structure uses atomics for thread safety. It is
+ * possible to disable the use of atomics at compile time and only use this data
+ * structure on one thread.
+ *
+ * The role for the producer and the consumer must be constant, i.e., the
+ * producer should always be on one thread and the consumer should always be on
+ * another thread.
+ *
+ * Some words about the inner workings of this class:
+ * - Capacity is fixed. Only one allocation is performed, in the constructor.
+ *   When reading and writing, the return value of the method allows checking if
+ *   the ring buffer is empty or full.
+ * - We always keep the read index at least one element ahead of the write
+ *   index, so we can distinguish between an empty and a full ring buffer: an
+ *   empty ring buffer is when the write index is at the same position as the
+ *   read index. A full buffer is when the write index is exactly one position
+ *   before the read index.
+ * - We synchronize updates to the read index after having read the data, and
+ *   the write index after having written the data. This means that the each
+ *   thread can only touch a portion of the buffer that is not touched by the
+ *   other thread.
+ * - Callers are expected to provide buffers. When writing to the queue,
+ *   elements are copied into the internal storage from the buffer passed in.
+ *   When reading from the queue, the user is expected to provide a buffer.
+ *   Because this is a ring buffer, data might not be contiguous in memory,
+ *   providing an external buffer to copy into is an easy way to have linear
+ *   data for further processing.
+ */
+template <typename T>
+class RingBuffer {
+public:
+    /**
+     * Constructor for a ring buffer.
+     *
+     * This performs an allocation, but is the only allocation that will happen
+     * for the life time of a `RingBuffer`.
+     *
+     * @param capacity The maximum number of element this ring buffer will hold.
+     */
+    RingBuffer(int capacity)
+        /* One more element to distinguish from empty and full buffer. */
+        : capacity_(capacity + 1) {
+        ASSERT(storage_capacity() < std::numeric_limits<int>::max() / 2 &&
+               "buffer too large for the type of index used.");
+        ASSERT(capacity_ > 0);
+
+        data_.reset(new T[storage_capacity()]);
+        /* If this queue is using atomics, initializing those members as the last
+         * action in the constructor acts as a full barrier, and allow capacity() to
+         * be thread-safe. */
+        write_index_ = 0;
+        read_index_ = 0;
+    }
+    /**
+     * Push `count` zero or default constructed elements in the array.
+     *
+     * Only safely called on the producer thread.
+     *
+     * @param count The number of elements to enqueue.
+     * @return The number of element enqueued.
+     */
+    int enqueue_default(int count) {
+        return enqueue(nullptr, count);
+    }
+    /**
+     * @brief Put an element in the queue
+     *
+     * Only safely called on the producer thread.
+     *
+     * @param element The element to put in the queue.
+     *
+     * @return 1 if the element was inserted, 0 otherwise.
+     */
+    int enqueue(T& element) {
+        return enqueue(&element, 1);
+    }
+    /**
+     * Push `count` elements in the ring buffer.
+     *
+     * Only safely called on the producer thread.
+     *
+     * @param elements a pointer to a buffer containing at least `count` elements.
+     * If `elements` is nullptr, zero or default constructed elements are
+     * enqueued.
+     * @param count The number of elements to read from `elements`
+     * @return The number of elements successfully coped from `elements` and
+     * inserted into the ring buffer.
+     */
+    int enqueue(T* elements, int count) {
+#ifndef NDEBUG
+        assert_correct_thread(producer_id);
+#endif
+
+        int wr_idx = write_index_.load(std::memory_order_relaxed);
+        int rd_idx = read_index_.load(std::memory_order_acquire);
+
+        if (full_internal(rd_idx, wr_idx)) {
+            return 0;
+        }
+
+        int to_write = std::min(available_write_internal(rd_idx, wr_idx), count);
+
+        /* First part, from the write index to the end of the array. */
+        int first_part = std::min(storage_capacity() - wr_idx, to_write);
+        /* Second part, from the beginning of the array */
+        int second_part = to_write - first_part;
+
+        if (elements) {
+            Copy(data_.get() + wr_idx, elements, first_part);
+            Copy(data_.get(), elements + first_part, second_part);
+        } else {
+            ConstructDefault(data_.get() + wr_idx, first_part);
+            ConstructDefault(data_.get(), second_part);
+        }
+
+        write_index_.store(increment_index(wr_idx, to_write), std::memory_order_release);
+
+        return to_write;
+    }
+    /**
+     * Retrieve at most `count` elements from the ring buffer, and copy them to
+     * `elements`, if non-null.
+     *
+     * Only safely called on the consumer side.
+     *
+     * @param elements A pointer to a buffer with space for at least `count`
+     * elements. If `elements` is `nullptr`, `count` element will be discarded.
+     * @param count The maximum number of elements to dequeue.
+     * @return The number of elements written to `elements`.
+     */
+    int dequeue(T* elements, int count) {
+#ifndef NDEBUG
+        assert_correct_thread(consumer_id);
+#endif
+
+        int rd_idx = read_index_.load(std::memory_order_relaxed);
+        int wr_idx = write_index_.load(std::memory_order_acquire);
+
+        if (empty_internal(rd_idx, wr_idx)) {
+            return 0;
+        }
+
+        int to_read = std::min(available_read_internal(rd_idx, wr_idx), count);
+
+        int first_part = std::min(storage_capacity() - rd_idx, to_read);
+        int second_part = to_read - first_part;
+
+        if (elements) {
+            Copy(elements, data_.get() + rd_idx, first_part);
+            Copy(elements + first_part, data_.get(), second_part);
+        }
+
+        read_index_.store(increment_index(rd_idx, to_read), std::memory_order_release);
+
+        return to_read;
+    }
+    /**
+     * Get the number of available element for consuming.
+     *
+     * Only safely called on the consumer thread.
+     *
+     * @return The number of available elements for reading.
+     */
+    int available_read() const {
+#ifndef NDEBUG
+        assert_correct_thread(consumer_id);
+#endif
+        return available_read_internal(read_index_.load(std::memory_order_relaxed),
+                                       write_index_.load(std::memory_order_acquire));
+    }
+    /**
+     * Get the number of available elements for consuming.
+     *
+     * Only safely called on the producer thread.
+     *
+     * @return The number of empty slots in the buffer, available for writing.
+     */
+    int available_write() const {
+#ifndef NDEBUG
+        assert_correct_thread(producer_id);
+#endif
+        return available_write_internal(read_index_.load(std::memory_order_acquire),
+                                        write_index_.load(std::memory_order_relaxed));
+    }
+    /**
+     * Get the total capacity, for this ring buffer.
+     *
+     * Can be called safely on any thread.
+     *
+     * @return The maximum capacity of this ring buffer.
+     */
+    int capacity() const {
+        return storage_capacity() - 1;
+    }
+    /**
+     * Reset the consumer and producer thread identifier, in case the thread are
+     * being changed. This has to be externally synchronized. This is no-op when
+     * asserts are disabled.
+     */
+    void reset_thread_ids() {
+#ifndef NDEBUG
+        consumer_id = producer_id = std::thread::id();
+#endif
+    }
+
+private:
+    /** Return true if the ring buffer is empty.
+     *
+     * @param read_index the read index to consider
+     * @param write_index the write index to consider
+     * @return true if the ring buffer is empty, false otherwise.
+     **/
+    bool empty_internal(int read_index, int write_index) const {
+        return write_index == read_index;
+    }
+    /** Return true if the ring buffer is full.
+     *
+     * This happens if the write index is exactly one element behind the read
+     * index.
+     *
+     * @param read_index the read index to consider
+     * @param write_index the write index to consider
+     * @return true if the ring buffer is full, false otherwise.
+     **/
+    bool full_internal(int read_index, int write_index) const {
+        return (write_index + 1) % storage_capacity() == read_index;
+    }
+    /**
+     * Return the size of the storage. It is one more than the number of elements
+     * that can be stored in the buffer.
+     *
+     * @return the number of elements that can be stored in the buffer.
+     */
+    int storage_capacity() const {
+        return capacity_;
+    }
+    /**
+     * Returns the number of elements available for reading.
+     *
+     * @return the number of available elements for reading.
+     */
+    int available_read_internal(int read_index, int write_index) const {
+        if (write_index >= read_index) {
+            return write_index - read_index;
+        } else {
+            return write_index + storage_capacity() - read_index;
+        }
+    }
+    /**
+     * Returns the number of empty elements, available for writing.
+     *
+     * @return the number of elements that can be written into the array.
+     */
+    int available_write_internal(int read_index, int write_index) const {
+        /* We substract one element here to always keep at least one sample
+         * free in the buffer, to distinguish between full and empty array. */
+        int rv = read_index - write_index - 1;
+        if (write_index >= read_index) {
+            rv += storage_capacity();
+        }
+        return rv;
+    }
+    /**
+     * Increments an index, wrapping it around the storage.
+     *
+     * @param index a reference to the index to increment.
+     * @param increment the number by which `index` is incremented.
+     * @return the new index.
+     */
+    int increment_index(int index, int increment) const {
+        ASSERT(increment >= 0);
+        return (index + increment) % storage_capacity();
+    }
+    /**
+     * @brief This allows checking that enqueue (resp. dequeue) are always called
+     * by the right thread.
+     *
+     * @param id the id of the thread that has called the calling method first.
+     */
+#ifndef NDEBUG
+    static void assert_correct_thread(std::thread::id& id) {
+        if (id == std::thread::id()) {
+            id = std::this_thread::get_id();
+            return;
+        }
+        ASSERT(id == std::this_thread::get_id());
+    }
+#endif
+    /** Similar to memcpy, but accounts for the size of an element. */
+    template <typename CopyT>
+    void PodCopy(CopyT* destination, const CopyT* source, size_t count) {
+        static_assert(std::is_trivial<CopyT>::value, "Requires trivial type");
+        ASSERT(destination && source);
+        memcpy(destination, source, count * sizeof(CopyT));
+    }
+    /** Similar to a memset to zero, but accounts for the size of an element. */
+    template <typename ZeroT>
+    void PodZero(ZeroT* destination, size_t count) {
+        static_assert(std::is_trivial<ZeroT>::value, "Requires trivial type");
+        ASSERT(destination);
+        memset(destination, 0, count * sizeof(ZeroT));
+    }
+    template <typename CopyT, typename Trait>
+    void Copy(CopyT* destination, const CopyT* source, size_t count, Trait) {
+        for (size_t i = 0; i < count; i++) {
+            destination[i] = source[i];
+        }
+    }
+    template <typename CopyT>
+    void Copy(CopyT* destination, const CopyT* source, size_t count, std::true_type) {
+        PodCopy(destination, source, count);
+    }
+    /**
+     * This allows copying a number of elements from a `source` pointer to a
+     * `destination` pointer, using `memcpy` if it is safe to do so, or a loop that
+     * calls the constructors and destructors otherwise.
+     */
+    template <typename CopyT>
+    void Copy(CopyT* destination, const T* source, size_t count) {
+        ASSERT(destination && source);
+        Copy(destination, source, count, typename std::is_trivial<CopyT>::type());
+    }
+    template <typename ConstructT, typename Trait>
+    void ConstructDefault(ConstructT* destination, size_t count, Trait) {
+        for (size_t i = 0; i < count; i++) {
+            destination[i] = ConstructT();
+        }
+    }
+    template <typename ConstructT>
+    void ConstructDefault(ConstructT* destination, size_t count, std::true_type) {
+        PodZero(destination, count);
+    }
+    /**
+     * This allows zeroing (using memset) or default-constructing a number of
+     * elements calling the constructors and destructors if necessary.
+     */
+    template <typename ConstructT>
+    void ConstructDefault(ConstructT* destination, size_t count) {
+        ASSERT(destination);
+        ConstructDefault(destination, count, typename std::is_arithmetic<ConstructT>::type());
+    }
+    /** Index at which the oldest element is at, in samples. */
+    std::atomic<int> read_index_;
+    /** Index at which to write new elements. `write_index` is always at
+     * least one element ahead of `read_index_`. */
+    std::atomic<int> write_index_;
+    /** Maximum number of elements that can be stored in the ring buffer. */
+    const int capacity_;
+    /** Data storage */
+    std::unique_ptr<T[]> data_;
+#ifndef NDEBUG
+    /** The id of the only thread that is allowed to read from the queue. */
+    mutable std::thread::id consumer_id;
+    /** The id of the only thread that is allowed to write from the queue. */
+    mutable std::thread::id producer_id;
+#endif
+};

src/core/libraries/audio/audioout.cpp

@@ -7,26 +7,15 @@
 #include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
+#include "common/config.h"
 #include "common/logging/log.h"
 #include "core/libraries/audio/audioout.h"
+#include "core/libraries/audio/audioout_backend.h"
 #include "core/libraries/audio/audioout_error.h"
-#include "core/libraries/audio/sdl_audio.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::AudioOut {
 
-struct PortOut {
-    void* impl;
-    u32 samples_num;
-    u32 freq;
-    OrbisAudioOutParamFormat format;
-    OrbisAudioOutPort type;
-    int channels_num;
-    bool is_float;
-    std::array<int, 8> volume;
-    u8 sample_size;
-    bool is_open;
-};
 std::shared_mutex ports_mutex;
 std::array<PortOut, SCE_AUDIO_OUT_NUM_PORTS> ports_out{};
 
@@ -104,7 +93,7 @@ static bool IsFormatFloat(const OrbisAudioOutParamFormat format) {
     }
 }
 
-static int GetFormatNumChannels(const OrbisAudioOutParamFormat format) {
+static u8 GetFormatNumChannels(const OrbisAudioOutParamFormat format) {
     switch (format) {
     case OrbisAudioOutParamFormat::S16Mono:
     case OrbisAudioOutParamFormat::FloatMono:
@@ -187,13 +176,11 @@ int PS4_SYSV_ABI sceAudioOutClose(s32 handle) {
 
     std::scoped_lock lock(ports_mutex);
     auto& port = ports_out.at(handle - 1);
-    if (!port.is_open) {
+    if (!port.impl) {
         return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
     }
 
-    audio->Close(port.impl);
     port.impl = nullptr;
-    port.is_open = false;
     return ORBIS_OK;
 }
 
@@ -264,7 +251,7 @@ int PS4_SYSV_ABI sceAudioOutGetPortState(s32 handle, OrbisAudioOutPortState* sta
 
     std::scoped_lock lock(ports_mutex);
     const auto& port = ports_out.at(handle - 1);
-    if (!port.is_open) {
+    if (!port.impl) {
         return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
     }
 
@@ -324,7 +311,16 @@ int PS4_SYSV_ABI sceAudioOutInit() {
     if (audio != nullptr) {
         return ORBIS_AUDIO_OUT_ERROR_ALREADY_INIT;
     }
-    audio = std::make_unique<SDLAudioOut>();
+    const auto backend = Config::getAudioBackend();
+    if (backend == "cubeb") {
+        audio = std::make_unique<CubebAudioOut>();
+    } else if (backend == "sdl") {
+        audio = std::make_unique<SDLAudioOut>();
+    } else {
+        // Cubeb as a default fallback.
+        LOG_ERROR(Lib_AudioOut, "Invalid audio backend '{}', defaulting to cubeb.", backend);
+        audio = std::make_unique<CubebAudioOut>();
+    }
     return ORBIS_OK;
 }
 
@@ -399,23 +395,25 @@ s32 PS4_SYSV_ABI sceAudioOutOpen(UserService::OrbisUserServiceUserId user_id,
     }
 
     std::scoped_lock lock{ports_mutex};
-    const auto port = std::ranges::find(ports_out, false, &PortOut::is_open);
+    const auto port =
+        std::ranges::find_if(ports_out, [&](const PortOut& p) { return p.impl == nullptr; });
     if (port == ports_out.end()) {
         LOG_ERROR(Lib_AudioOut, "Audio ports are full");
         return ORBIS_AUDIO_OUT_ERROR_PORT_FULL;
     }
 
-    port->is_open = true;
     port->type = port_type;
-    port->samples_num = length;
-    port->freq = sample_rate;
     port->format = format;
     port->is_float = IsFormatFloat(format);
-    port->channels_num = GetFormatNumChannels(format);
     port->sample_size = GetFormatSampleSize(format);
+    port->channels_num = GetFormatNumChannels(format);
+    port->samples_num = length;
+    port->frame_size = port->sample_size * port->channels_num;
+    port->buffer_size = port->frame_size * port->samples_num;
+    port->freq = sample_rate;
     port->volume.fill(SCE_AUDIO_OUT_VOLUME_0DB);
+    port->impl = audio->Open(*port);
 
-    port->impl = audio->Open(port->is_float, port->channels_num, port->freq);
     return std::distance(ports_out.begin(), port) + 1;
 }
 
@@ -424,7 +422,7 @@ int PS4_SYSV_ABI sceAudioOutOpenEx() {
     return ORBIS_OK;
 }
 
-s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, const void* ptr) {
+s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, void* ptr) {
     if (handle < 1 || handle > SCE_AUDIO_OUT_NUM_PORTS) {
         return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
     }
@@ -434,12 +432,11 @@ s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, const void* ptr) {
     }
 
     auto& port = ports_out.at(handle - 1);
-    if (!port.is_open) {
+    if (!port.impl) {
         return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
     }
 
-    const size_t data_size = port.samples_num * port.sample_size * port.channels_num;
+    port.impl->Output(ptr, port.buffer_size);
-    audio->Output(port.impl, ptr, data_size);
     return ORBIS_OK;
 }
 
@@ -548,7 +545,7 @@ s32 PS4_SYSV_ABI sceAudioOutSetVolume(s32 handle, s32 flag, s32* vol) {
 
     std::scoped_lock lock(ports_mutex);
     auto& port = ports_out.at(handle - 1);
-    if (!port.is_open) {
+    if (!port.impl) {
         return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
     }
 
@@ -579,7 +576,7 @@ s32 PS4_SYSV_ABI sceAudioOutSetVolume(s32 handle, s32 flag, s32* vol) {
         }
     }
 
-    audio->SetVolume(port.impl, port.volume);
+    port.impl->SetVolume(port.volume);
     return ORBIS_OK;
 }
 

src/core/libraries/audio/audioout.h

@@ -3,12 +3,15 @@
 
 #pragma once
 
-#include "common/bit_field.h"
+#include <memory>
 
+#include "common/bit_field.h"
 #include "core/libraries/system/userservice.h"
 
 namespace Libraries::AudioOut {
 
+class PortBackend;
+
 // Main up to 8 ports, BGM 1 port, voice up to 4 ports,
 // personal up to 4 ports, padspk up to 5 ports, aux 1 port
 constexpr int SCE_AUDIO_OUT_NUM_PORTS = 22;
@@ -43,7 +46,7 @@ union OrbisAudioOutParamExtendedInformation {
 
 struct OrbisAudioOutOutputParam {
     s32 handle;
-    const void* ptr;
+    void* ptr;
 };
 
 struct OrbisAudioOutPortState {
@@ -56,6 +59,21 @@ struct OrbisAudioOutPortState {
     u64 reserved64[2];
 };
 
+struct PortOut {
+    std::unique_ptr<PortBackend> impl{};
+
+    OrbisAudioOutPort type;
+    OrbisAudioOutParamFormat format;
+    bool is_float;
+    u8 sample_size;
+    u8 channels_num;
+    u32 samples_num;
+    u32 frame_size;
+    u32 buffer_size;
+    u32 freq;
+    std::array<int, 8> volume;
+};
+
 int PS4_SYSV_ABI sceAudioOutDeviceIdOpen();
 int PS4_SYSV_ABI sceAudioDeviceControlGet();
 int PS4_SYSV_ABI sceAudioDeviceControlSet();
@@ -94,7 +112,7 @@ s32 PS4_SYSV_ABI sceAudioOutOpen(UserService::OrbisUserServiceUserId user_id,
                                  OrbisAudioOutPort port_type, s32 index, u32 length,
                                  u32 sample_rate, OrbisAudioOutParamExtendedInformation param_type);
 int PS4_SYSV_ABI sceAudioOutOpenEx();
-s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, const void* ptr);
+s32 PS4_SYSV_ABI sceAudioOutOutput(s32 handle, void* ptr);
 s32 PS4_SYSV_ABI sceAudioOutOutputs(OrbisAudioOutOutputParam* param, u32 num);
 int PS4_SYSV_ABI sceAudioOutPtClose();
 int PS4_SYSV_ABI sceAudioOutPtGetLastOutputTime();

src/core/libraries/audio/audioout_backend.h

@@ -3,17 +3,42 @@
 
 #pragma once
 
+typedef struct cubeb cubeb;
+
 namespace Libraries::AudioOut {
 
+struct PortOut;
+
+class PortBackend {
+public:
+    virtual ~PortBackend() = default;
+
+    virtual void Output(void* ptr, size_t size) = 0;
+    virtual void SetVolume(const std::array<int, 8>& ch_volumes) = 0;
+};
+
 class AudioOutBackend {
 public:
     AudioOutBackend() = default;
     virtual ~AudioOutBackend() = default;
 
-    virtual void* Open(bool is_float, int num_channels, u32 sample_rate) = 0;
+    virtual std::unique_ptr<PortBackend> Open(PortOut& port) = 0;
-    virtual void Close(void* impl) = 0;
+};
-    virtual void Output(void* impl, const void* ptr, size_t size) = 0;
+
-    virtual void SetVolume(void* impl, std::array<int, 8> ch_volumes) = 0;
+class CubebAudioOut final : public AudioOutBackend {
+public:
+    CubebAudioOut();
+    ~CubebAudioOut() override;
+
+    std::unique_ptr<PortBackend> Open(PortOut& port) override;
+
+private:
+    cubeb* ctx = nullptr;
+};
+
+class SDLAudioOut final : public AudioOutBackend {
+public:
+    std::unique_ptr<PortBackend> Open(PortOut& port) override;
 };
 
 } // namespace Libraries::AudioOut

src/core/libraries/audio/cubeb_audio.cpp

@@ -0,0 +1,158 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <condition_variable>
+#include <mutex>
+#include <cubeb/cubeb.h>
+
+#include "common/assert.h"
+#include "common/ringbuffer.h"
+#include "core/libraries/audio/audioout.h"
+#include "core/libraries/audio/audioout_backend.h"
+
+namespace Libraries::AudioOut {
+
+constexpr int AUDIO_STREAM_BUFFER_THRESHOLD = 65536; // Define constant for buffer threshold
+
+class CubebPortBackend : public PortBackend {
+public:
+    CubebPortBackend(cubeb* ctx, const PortOut& port)
+        : frame_size(port.frame_size), buffer(static_cast<int>(port.buffer_size) * 4) {
+        if (!ctx) {
+            return;
+        }
+        const auto get_channel_layout = [&port] -> cubeb_channel_layout {
+            switch (port.channels_num) {
+            case 1:
+                return CUBEB_LAYOUT_MONO;
+            case 2:
+                return CUBEB_LAYOUT_STEREO;
+            case 8:
+                return CUBEB_LAYOUT_3F4_LFE;
+            default:
+                UNREACHABLE();
+            }
+        };
+        cubeb_stream_params stream_params = {
+            .format = port.is_float ? CUBEB_SAMPLE_FLOAT32LE : CUBEB_SAMPLE_S16LE,
+            .rate = port.freq,
+            .channels = port.channels_num,
+            .layout = get_channel_layout(),
+            .prefs = CUBEB_STREAM_PREF_NONE,
+        };
+        u32 latency_frames = 512;
+        if (const auto ret = cubeb_get_min_latency(ctx, &stream_params, &latency_frames);
+            ret != CUBEB_OK) {
+            LOG_WARNING(Lib_AudioOut,
+                        "Could not get minimum cubeb audio latency, falling back to default: {}",
+                        ret);
+        }
+        char stream_name[64];
+        snprintf(stream_name, sizeof(stream_name), "shadPS4 stream %p", this);
+        if (const auto ret = cubeb_stream_init(ctx, &stream, stream_name, nullptr, nullptr, nullptr,
+                                               &stream_params, latency_frames, &DataCallback,
+                                               &StateCallback, this);
+            ret != CUBEB_OK) {
+            LOG_ERROR(Lib_AudioOut, "Failed to create cubeb stream: {}", ret);
+            return;
+        }
+        if (const auto ret = cubeb_stream_start(stream); ret != CUBEB_OK) {
+            LOG_ERROR(Lib_AudioOut, "Failed to start cubeb stream: {}", ret);
+            return;
+        }
+    }
+
+    ~CubebPortBackend() override {
+        if (!stream) {
+            return;
+        }
+        if (const auto ret = cubeb_stream_stop(stream); ret != CUBEB_OK) {
+            LOG_WARNING(Lib_AudioOut, "Failed to stop cubeb stream: {}", ret);
+        }
+        cubeb_stream_destroy(stream);
+        stream = nullptr;
+    }
+
+    void Output(void* ptr, size_t size) override {
+        auto* data = static_cast<u8*>(ptr);
+
+        std::unique_lock lock{buffer_mutex};
+        buffer_cv.wait(lock, [&] { return buffer.available_write() >= size; });
+        buffer.enqueue(data, static_cast<int>(size));
+    }
+
+    void SetVolume(const std::array<int, 8>& ch_volumes) override {
+        if (!stream) {
+            return;
+        }
+        // Cubeb does not have per-channel volumes, for now just take the maximum of the channels.
+        const auto vol = *std::ranges::max_element(ch_volumes);
+        if (const auto ret =
+                cubeb_stream_set_volume(stream, static_cast<float>(vol) / SCE_AUDIO_OUT_VOLUME_0DB);
+            ret != CUBEB_OK) {
+            LOG_WARNING(Lib_AudioOut, "Failed to change cubeb stream volume: {}", ret);
+        }
+    }
+
+private:
+    static long DataCallback(cubeb_stream* stream, void* user_data, const void* in, void* out,
+                             long num_frames) {
+        auto* stream_data = static_cast<CubebPortBackend*>(user_data);
+        const auto out_data = static_cast<u8*>(out);
+        const auto requested_size = static_cast<int>(num_frames * stream_data->frame_size);
+
+        std::unique_lock lock{stream_data->buffer_mutex};
+        const auto dequeued_size = stream_data->buffer.dequeue(out_data, requested_size);
+        lock.unlock();
+        stream_data->buffer_cv.notify_one();
+
+        if (dequeued_size < requested_size) {
+            // Need to fill remaining space with silence.
+            std::memset(out_data + dequeued_size, 0, requested_size - dequeued_size);
+        }
+        return num_frames;
+    }
+
+    static void StateCallback(cubeb_stream* stream, void* user_data, cubeb_state state) {
+        switch (state) {
+        case CUBEB_STATE_STARTED:
+            LOG_INFO(Lib_AudioOut, "Cubeb stream started");
+            break;
+        case CUBEB_STATE_STOPPED:
+            LOG_INFO(Lib_AudioOut, "Cubeb stream stopped");
+            break;
+        case CUBEB_STATE_DRAINED:
+            LOG_INFO(Lib_AudioOut, "Cubeb stream drained");
+            break;
+        case CUBEB_STATE_ERROR:
+            LOG_ERROR(Lib_AudioOut, "Cubeb stream encountered an error");
+            break;
+        }
+    }
+
+    size_t frame_size;
+    RingBuffer<u8> buffer;
+    std::mutex buffer_mutex;
+    std::condition_variable buffer_cv;
+    cubeb_stream* stream{};
+};
+
+CubebAudioOut::CubebAudioOut() {
+    if (const auto ret = cubeb_init(&ctx, "shadPS4", nullptr); ret != CUBEB_OK) {
+        LOG_CRITICAL(Lib_AudioOut, "Failed to create cubeb context: {}", ret);
+    }
+}
+
+CubebAudioOut::~CubebAudioOut() {
+    if (!ctx) {
+        return;
+    }
+    cubeb_destroy(ctx);
+    ctx = nullptr;
+}
+
+std::unique_ptr<PortBackend> CubebAudioOut::Open(PortOut& port) {
+    return std::make_unique<CubebPortBackend>(ctx, port);
+}
+
+} // namespace Libraries::AudioOut

src/core/libraries/audio/sdl_audio.cpp

@@ -1,44 +1,60 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <thread>
+
 #include <SDL3/SDL_audio.h>
 #include <SDL3/SDL_init.h>
-#include <SDL3/SDL_timer.h>
 
-#include "common/assert.h"
+#include "common/logging/log.h"
-#include "core/libraries/audio/sdl_audio.h"
+#include "core/libraries/audio/audioout.h"
+#include "core/libraries/audio/audioout_backend.h"
 
 namespace Libraries::AudioOut {
 
 constexpr int AUDIO_STREAM_BUFFER_THRESHOLD = 65536; // Define constant for buffer threshold
 
-void* SDLAudioOut::Open(bool is_float, int num_channels, u32 sample_rate) {
+class SDLPortBackend : public PortBackend {
-    SDL_AudioSpec fmt;
+public:
-    SDL_zero(fmt);
+    explicit SDLPortBackend(const PortOut& port) {
-    fmt.format = is_float ? SDL_AUDIO_F32 : SDL_AUDIO_S16;
+        const SDL_AudioSpec fmt = {
-    fmt.channels = num_channels;
+            .format = port.is_float ? SDL_AUDIO_F32 : SDL_AUDIO_S16,
-    fmt.freq = sample_rate;
+            .channels = port.channels_num,
-
+            .freq = static_cast<int>(port.freq),
-    auto* stream =
+        };
-        SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &fmt, nullptr, nullptr);
+        stream =
-    SDL_ResumeAudioStreamDevice(stream);
+            SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &fmt, nullptr, nullptr);
-    return stream;
+        if (stream == nullptr) {
-}
+            LOG_ERROR(Lib_AudioOut, "Failed to create SDL audio stream: {}", SDL_GetError());
-
+        }
-void SDLAudioOut::Close(void* impl) {
+        SDL_ResumeAudioStreamDevice(stream);
-    SDL_DestroyAudioStream(static_cast<SDL_AudioStream*>(impl));
-}
-
-void SDLAudioOut::Output(void* impl, const void* ptr, size_t size) {
-    auto* stream = static_cast<SDL_AudioStream*>(impl);
-    SDL_PutAudioStreamData(stream, ptr, size);
-    while (SDL_GetAudioStreamAvailable(stream) > AUDIO_STREAM_BUFFER_THRESHOLD) {
-        SDL_Delay(0);
     }
-}
 
-void SDLAudioOut::SetVolume(void* impl, std::array<int, 8> ch_volumes) {
+    ~SDLPortBackend() override {
-    // Not yet implemented
+        if (stream) {
+            SDL_DestroyAudioStream(stream);
+            stream = nullptr;
+        }
+    }
+
+    void Output(void* ptr, size_t size) override {
+        SDL_PutAudioStreamData(stream, ptr, static_cast<int>(size));
+        while (SDL_GetAudioStreamAvailable(stream) > AUDIO_STREAM_BUFFER_THRESHOLD) {
+            // Yield to allow the stream to drain.
+            std::this_thread::yield();
+        }
+    }
+
+    void SetVolume(const std::array<int, 8>& ch_volumes) override {
+        // TODO: Not yet implemented
+    }
+
+private:
+    SDL_AudioStream* stream;
+};
+
+std::unique_ptr<PortBackend> SDLAudioOut::Open(PortOut& port) {
+    return std::make_unique<SDLPortBackend>(port);
 }
 
 } // namespace Libraries::AudioOut

src/core/libraries/audio/sdl_audio.h

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/libraries/audio/audioout_backend.h"
-
-namespace Libraries::AudioOut {
-
-class SDLAudioOut final : public AudioOutBackend {
-public:
-    void* Open(bool is_float, int num_channels, u32 sample_rate) override;
-    void Close(void* impl) override;
-    void Output(void* impl, const void* ptr, size_t size) override;
-    void SetVolume(void* impl, std::array<int, 8> ch_volumes) override;
-};
-
-} // namespace Libraries::AudioOut

src/core/libraries/gnmdriver/gnmdriver.cpp

@@ -29,7 +29,7 @@ namespace Libraries::GnmDriver {
 
 using namespace AmdGpu;
 
-enum GnmEventIdents : u64 {
+enum GnmEventType : u64 {
     Compute0RelMem = 0x00,
     Compute1RelMem = 0x01,
     Compute2RelMem = 0x02,
@@ -337,6 +337,12 @@ static inline u32* ClearContextState(u32* cmdbuf) {
     return cmdbuf + ClearStateSequence.size();
 }
 
+static inline bool IsValidEventType(Platform::InterruptId id) {
+    return (static_cast<u32>(id) >= static_cast<u32>(Platform::InterruptId::Compute0RelMem) &&
+            static_cast<u32>(id) <= static_cast<u32>(Platform::InterruptId::Compute6RelMem)) ||
+           static_cast<u32>(id) == static_cast<u32>(Platform::InterruptId::GfxEop);
+}
+
 s32 PS4_SYSV_ABI sceGnmAddEqEvent(SceKernelEqueue eq, u64 id, void* udata) {
     LOG_TRACE(Lib_GnmDriver, "called");
 
@@ -347,8 +353,7 @@ s32 PS4_SYSV_ABI sceGnmAddEqEvent(SceKernelEqueue eq, u64 id, void* udata) {
     EqueueEvent kernel_event{};
     kernel_event.event.ident = id;
     kernel_event.event.filter = SceKernelEvent::Filter::GraphicsCore;
-    // The library only sets EV_ADD but it is suspected the kernel driver forces EV_CLEAR
+    kernel_event.event.flags = SceKernelEvent::Flags::Add;
-    kernel_event.event.flags = SceKernelEvent::Flags::Clear;
     kernel_event.event.fflags = 0;
     kernel_event.event.data = id;
     kernel_event.event.udata = udata;
@@ -357,11 +362,15 @@ s32 PS4_SYSV_ABI sceGnmAddEqEvent(SceKernelEqueue eq, u64 id, void* udata) {
     Platform::IrqC::Instance()->Register(
         static_cast<Platform::InterruptId>(id),
         [=](Platform::InterruptId irq) {
-            ASSERT_MSG(irq == static_cast<Platform::InterruptId>(id),
+            ASSERT_MSG(irq == static_cast<Platform::InterruptId>(id), "An unexpected IRQ occured");
-                       "An unexpected IRQ occured"); // We need to convert IRQ# to event id and do
+
-                                                     // proper filtering in trigger function
+            // We need to convert IRQ# to event id
-            eq->TriggerEvent(static_cast<GnmEventIdents>(id), SceKernelEvent::Filter::GraphicsCore,
+            if (!IsValidEventType(irq))
-                             nullptr);
+                return;
+
+            // Event data is expected to be an event type as per sceGnmGetEqEventType.
+            eq->TriggerEvent(static_cast<GnmEventType>(id), SceKernelEvent::Filter::GraphicsCore,
+                             reinterpret_cast<void*>(id));
         },
         eq);
     return ORBIS_OK;
@@ -476,7 +485,7 @@ s32 PS4_SYSV_ABI sceGnmDeleteEqEvent(SceKernelEqueue eq, u64 id) {
         return ORBIS_KERNEL_ERROR_EBADF;
     }
 
-    eq->RemoveEvent(id);
+    eq->RemoveEvent(id, SceKernelEvent::Filter::GraphicsCore);
 
     Platform::IrqC::Instance()->Unregister(static_cast<Platform::InterruptId>(id), eq);
     return ORBIS_OK;
@@ -1000,9 +1009,13 @@ int PS4_SYSV_ABI sceGnmGetDebugTimestamp() {
     return ORBIS_OK;
 }
 
-int PS4_SYSV_ABI sceGnmGetEqEventType() {
+int PS4_SYSV_ABI sceGnmGetEqEventType(const SceKernelEvent* ev) {
-    LOG_ERROR(Lib_GnmDriver, "(STUBBED) called");
+    LOG_TRACE(Lib_GnmDriver, "called");
-    return ORBIS_OK;
+
+    auto data = sceKernelGetEventData(ev);
+    ASSERT(static_cast<GnmEventType>(data) == GnmEventType::GfxEop);
+
+    return data;
 }
 
 int PS4_SYSV_ABI sceGnmGetEqTimeStamp() {

src/core/libraries/gnmdriver/gnmdriver.h

@@ -85,7 +85,7 @@ int PS4_SYSV_ABI sceGnmGetCoredumpMode();
 int PS4_SYSV_ABI sceGnmGetCoredumpProtectionFaultTimestamp();
 int PS4_SYSV_ABI sceGnmGetDbgGcHandle();
 int PS4_SYSV_ABI sceGnmGetDebugTimestamp();
-int PS4_SYSV_ABI sceGnmGetEqEventType();
+int PS4_SYSV_ABI sceGnmGetEqEventType(const SceKernelEvent* ev);
 int PS4_SYSV_ABI sceGnmGetEqTimeStamp();
 int PS4_SYSV_ABI sceGnmGetGpuBlockStatus();
 u32 PS4_SYSV_ABI sceGnmGetGpuCoreClockFrequency();

src/core/libraries/kernel/equeue.cpp

@@ -12,6 +12,8 @@
 
 namespace Libraries::Kernel {
 
+// Events are uniquely identified by id and filter.
+
 bool EqueueInternal::AddEvent(EqueueEvent& event) {
     std::scoped_lock lock{m_mutex};
 
@@ -27,12 +29,13 @@ bool EqueueInternal::AddEvent(EqueueEvent& event) {
     return true;
 }
 
-bool EqueueInternal::RemoveEvent(u64 id) {
+bool EqueueInternal::RemoveEvent(u64 id, s16 filter) {
     bool has_found = false;
     std::scoped_lock lock{m_mutex};
 
-    const auto& it =
+    const auto& it = std::ranges::find_if(m_events, [id, filter](auto& ev) {
-        std::ranges::find_if(m_events, [id](auto& ev) { return ev.event.ident == id; });
+        return ev.event.ident == id && ev.event.filter == filter;
+    });
     if (it != m_events.cend()) {
         m_events.erase(it);
         has_found = true;
@@ -68,7 +71,7 @@ int EqueueInternal::WaitForEvents(SceKernelEvent* ev, int num, u32 micros) {
 
     if (ev->flags & SceKernelEvent::Flags::OneShot) {
         for (auto ev_id = 0u; ev_id < count; ++ev_id) {
-            RemoveEvent(ev->ident);
+            RemoveEvent(ev->ident, ev->filter);
         }
     }
 
@@ -94,8 +97,11 @@ int EqueueInternal::GetTriggeredEvents(SceKernelEvent* ev, int num) {
     int count = 0;
     for (auto& event : m_events) {
         if (event.IsTriggered()) {
+            // Event should not trigger again
+            event.ResetTriggerState();
+
             if (event.event.flags & SceKernelEvent::Flags::Clear) {
-                event.Reset();
+                event.Clear();
             }
             ev[count++] = event.event;
             if (count == num) {
@@ -334,7 +340,7 @@ int PS4_SYSV_ABI sceKernelDeleteUserEvent(SceKernelEqueue eq, int id) {
         return ORBIS_KERNEL_ERROR_EBADF;
     }
 
-    if (!eq->RemoveEvent(id)) {
+    if (!eq->RemoveEvent(id, SceKernelEvent::Filter::User)) {
         return ORBIS_KERNEL_ERROR_ENOENT;
     }
     return ORBIS_OK;
@@ -344,6 +350,10 @@ s16 PS4_SYSV_ABI sceKernelGetEventFilter(const SceKernelEvent* ev) {
     return ev->filter;
 }
 
+u64 PS4_SYSV_ABI sceKernelGetEventData(const SceKernelEvent* ev) {
+    return ev->data;
+}
+
 void RegisterEventQueue(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("D0OdFMjp46I", "libkernel", 1, "libkernel", 1, 1, sceKernelCreateEqueue);
     LIB_FUNCTION("jpFjmgAC5AE", "libkernel", 1, "libkernel", 1, 1, sceKernelDeleteEqueue);
@@ -356,6 +366,7 @@ void RegisterEventQueue(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("LJDwdSNTnDg", "libkernel", 1, "libkernel", 1, 1, sceKernelDeleteUserEvent);
     LIB_FUNCTION("mJ7aghmgvfc", "libkernel", 1, "libkernel", 1, 1, sceKernelGetEventId);
     LIB_FUNCTION("23CPPI1tyBY", "libkernel", 1, "libkernel", 1, 1, sceKernelGetEventFilter);
+    LIB_FUNCTION("kwGyyjohI50", "libkernel", 1, "libkernel", 1, 1, sceKernelGetEventData);
 }
 
 } // namespace Libraries::Kernel

src/core/libraries/kernel/equeue.h

@@ -66,8 +66,11 @@ struct EqueueEvent {
     std::chrono::steady_clock::time_point time_added;
     std::unique_ptr<boost::asio::steady_timer> timer;
 
-    void Reset() {
+    void ResetTriggerState() {
         is_triggered = false;
+    }
+
+    void Clear() {
         event.fflags = 0;
         event.data = 0;
     }
@@ -83,7 +86,7 @@ struct EqueueEvent {
     }
 
     bool operator==(const EqueueEvent& ev) const {
-        return ev.event.ident == event.ident;
+        return ev.event.ident == event.ident && ev.event.filter == event.filter;
     }
 
 private:
@@ -99,7 +102,7 @@ public:
     }
 
     bool AddEvent(EqueueEvent& event);
-    bool RemoveEvent(u64 id);
+    bool RemoveEvent(u64 id, s16 filter);
     int WaitForEvents(SceKernelEvent* ev, int num, u32 micros);
     bool TriggerEvent(u64 ident, s16 filter, void* trigger_data);
     int GetTriggeredEvents(SceKernelEvent* ev, int num);
@@ -122,6 +125,8 @@ private:
 using SceKernelUseconds = u32;
 using SceKernelEqueue = EqueueInternal*;
 
+u64 PS4_SYSV_ABI sceKernelGetEventData(const SceKernelEvent* ev);
+
 void RegisterEventQueue(Core::Loader::SymbolsResolver* sym);
 
 } // namespace Libraries::Kernel

src/core/libraries/kernel/threads/pthread.cpp

@@ -244,8 +244,8 @@ int PS4_SYSV_ABI posix_pthread_create_name_np(PthreadT* thread, const PthreadAtt
     new_thread->tid = ++TidCounter;
 
     if (new_thread->attr.stackaddr_attr == 0) {
-        /* Enforce minimum stack size of 64 KB */
+        /* Enforce minimum stack size of 128 KB */
-        static constexpr size_t MinimumStack = 64_KB;
+        static constexpr size_t MinimumStack = 128_KB;
         auto& stacksize = new_thread->attr.stacksize_attr;
         stacksize = std::max(stacksize, MinimumStack);
     }

src/core/memory.cpp

@@ -101,13 +101,17 @@ PAddr MemoryManager::Allocate(PAddr search_start, PAddr search_end, size_t size,
     auto dmem_area = FindDmemArea(search_start);
 
     const auto is_suitable = [&] {
+        if (dmem_area == dmem_map.end()) {
+            return false;
+        }
         const auto aligned_base = Common::AlignUp(dmem_area->second.base, alignment);
         const auto alignment_size = aligned_base - dmem_area->second.base;
         const auto remaining_size =
             dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0;
         return dmem_area->second.is_free && remaining_size >= size;
     };
-    while (!is_suitable() && dmem_area->second.GetEnd() <= search_end) {
+    while (dmem_area != dmem_map.end() && !is_suitable() &&
+           dmem_area->second.GetEnd() <= search_end) {
         ++dmem_area;
     }
     ASSERT_MSG(is_suitable(), "Unable to find free direct memory area: size = {:#x}", size);

src/emulator.cpp

@@ -311,8 +311,9 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file, std::string
             found_modules, [&](const auto& path) { return path.filename() == module_name; });
         if (it != found_modules.end()) {
             LOG_INFO(Loader, "Loading {}", it->string());
-            linker->LoadModule(*it);
+            if (linker->LoadModule(*it) != -1) {
-            continue;
+                continue;
+            }
         }
         if (init_func) {
             LOG_INFO(Loader, "Can't Load {} switching to HLE", module_name);
@@ -321,7 +322,7 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file, std::string
             LOG_INFO(Loader, "No HLE available for {} module", module_name);
         }
     }
-    if (std::filesystem::exists(sys_module_path / game_serial)) {
+    if (!game_serial.empty() && std::filesystem::exists(sys_module_path / game_serial)) {
         for (const auto& entry :
              std::filesystem::directory_iterator(sys_module_path / game_serial)) {
             LOG_INFO(Loader, "Loading {} from game serial file {}", entry.path().string(),

src/qt_gui/game_list_frame.cpp

@@ -133,16 +133,16 @@ void GameListFrame::PopulateGameList() {
 
             QString formattedPlayTime;
             if (hours > 0) {
-                formattedPlayTime += QString("%1h ").arg(hours);
+                formattedPlayTime += QString("%1").arg(hours) + tr("h");
             }
             if (minutes > 0) {
-                formattedPlayTime += QString("%1m ").arg(minutes);
+                formattedPlayTime += QString("%1").arg(minutes) + tr("m");
             }
 
             formattedPlayTime = formattedPlayTime.trimmed();
             m_game_info->m_games[i].play_time = playTime.toStdString();
             if (formattedPlayTime.isEmpty()) {
-                SetTableItem(i, 8, QString("%1s").arg(seconds));
+                SetTableItem(i, 8, QString("%1").arg(seconds) + tr("s"));
             } else {
                 SetTableItem(i, 8, formattedPlayTime);
             }

src/qt_gui/game_list_utils.h

@@ -30,10 +30,11 @@ struct GameInfo {
     CompatibilityEntry compatibility = CompatibilityEntry{CompatibilityStatus::Unknown};
 };
 
-class GameListUtils {
+class GameListUtils : public QObject {
+    Q_OBJECT
 public:
     static QString FormatSize(qint64 size) {
-        static const QStringList suffixes = {"B", "KB", "MB", "GB", "TB"};
+        static const QStringList suffixes = {tr("B"), tr("KB"), tr("MB"), tr("GB"), tr("TB")};
         int suffixIndex = 0;
 
         double gameSize = static_cast<double>(size);

src/qt_gui/main_window.cpp

@@ -78,8 +78,8 @@ bool MainWindow::Init() {
     this->setStatusBar(statusBar.data());
     // Update status bar
     int numGames = m_game_info->m_games.size();
-    QString statusMessage =
+    QString statusMessage = tr("Games: ") + QString::number(numGames) + " (" +
-        "Games: " + QString::number(numGames) + " (" + QString::number(duration.count()) + "ms)";
+                            QString::number(duration.count()) + "ms)";
     statusBar->showMessage(statusMessage);
 
 #ifdef ENABLE_DISCORD_RPC

src/qt_gui/settings_dialog.cpp

@@ -214,6 +214,7 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices,
         ui->enableCompatibilityCheckBox->installEventFilter(this);
         ui->checkCompatibilityOnStartupCheckBox->installEventFilter(this);
         ui->updateCompatibilityButton->installEventFilter(this);
+        ui->audioBackendComboBox->installEventFilter(this);
 
         // Input
         ui->hideCursorGroupBox->installEventFilter(this);
@@ -312,6 +313,8 @@ void SettingsDialog::LoadValuesFromConfig() {
         toml::find_or<bool>(data, "General", "compatibilityEnabled", false));
     ui->checkCompatibilityOnStartupCheckBox->setChecked(
         toml::find_or<bool>(data, "General", "checkCompatibilityOnStartup", false));
+    ui->audioBackendComboBox->setCurrentText(
+        QString::fromStdString(toml::find_or<std::string>(data, "Audio", "backend", "cubeb")));
 
 #ifdef ENABLE_UPDATER
     ui->updateCheckBox->setChecked(toml::find_or<bool>(data, "General", "autoUpdate", false));
@@ -437,6 +440,8 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
         text = tr("checkCompatibilityOnStartupCheckBox");
     } else if (elementName == "updateCompatibilityButton") {
         text = tr("updateCompatibilityButton");
+    } else if (elementName == "audioBackendGroupBox") {
+        text = tr("audioBackendGroupBox");
     }
 
     // Input
@@ -553,6 +558,7 @@ void SettingsDialog::UpdateSettings() {
     Config::setUpdateChannel(ui->updateComboBox->currentText().toStdString());
     Config::setCompatibilityEnabled(ui->enableCompatibilityCheckBox->isChecked());
     Config::setCheckCompatibilityOnStartup(ui->checkCompatibilityOnStartupCheckBox->isChecked());
+    Config::setAudioBackend(ui->audioBackendComboBox->currentText().toStdString());
 
 #ifdef ENABLE_DISCORD_RPC
     auto* rpc = Common::Singleton<DiscordRPCHandler::RPC>::Instance();

src/qt_gui/settings_dialog.ui

@@ -11,7 +11,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>900</width>
+    <width>950</width>
     <height>834</height>
    </rect>
   </property>
@@ -288,6 +288,29 @@
                  </item>
                 </layout>
                </item>
+               <item>
+                <widget class="QGroupBox" name="audioBackendGroupBox">
+                 <property name="title">
+                  <string>Audio Backend</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="audioBackendBoxLayout">
+                  <item>
+                   <widget class="QComboBox" name="audioBackendComboBox">
+                    <item>
+                     <property name="text">
+                      <string>cubeb</string>
+                     </property>
+                    </item>
+                    <item>
+                     <property name="text">
+                      <string>sdl</string>
+                     </property>
+                    </item>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>

src/qt_gui/translations/ar.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>مهلة إخفاء المؤشر عند الخمول</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>الصوت</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>فشل في إنشاء ملف سكريبت التحديث</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/da_DK.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Timeout for skjul markør ved inaktivitet</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Lydstyrke</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Kunne ikke oprette opdateringsscriptfilen</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/de.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Inaktivitätszeitüberschreitung zum Ausblenden des Cursors</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Lautstärke</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Fehler beim Erstellen der Aktualisierungs-Skriptdatei</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/el.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Χρόνος αδράνειας απόκρυψης δείκτη</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>ένταση</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Αποτυχία δημιουργίας του αρχείου σεναρίου ενημέρωσης</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/en.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Hide Cursor Idle Timeout</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1419,6 +1449,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1578,4 +1623,32 @@
 			<translation>Failed to create the update script file</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/es_ES.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Tiempo de espera para ocultar cursor inactivo</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volumen</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>No se pudo crear el archivo del script de actualización</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/fa_IR.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>حذف محتوای اضافی (DLC)</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="173"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>مخفی کردن زمان توقف مکان نما</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>صدا</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>هرگز بازی نشده</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>فایل اسکریپت به روز رسانی ایجاد نشد</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/fi.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Inaktiivisuuden aikaraja kursorin piilottamiselle</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Äänenvoimakkuus</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Päivitysskripttitiedoston luominen epäonnistui</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/fr.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Supprimer DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Délai d'inactivité pour masquer le curseur</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Jamais joué</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Échec de la création du fichier de script de mise à jour</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/hu_HU.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>DLC-k törlése</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="173"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Kurzor inaktivitási időtúllépés</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Hangerő</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>A frissítési szkript fájl létrehozása nem sikerült</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/id.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Batas waktu sembunyikan kursor tidak aktif</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Gagal membuat file skrip pembaruan</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/it.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Elimina DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Timeout inattività per nascondere il cursore</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Mai Giocato</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Impossibile creare il file di script di aggiornamento</translation>
 		</message>
 	</context>
-</TS>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
+</TS>

src/qt_gui/translations/ja_JP.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>カーソル非アクティブタイムアウト</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>音量</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>アップデートスクリプトファイルの作成に失敗しました</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/ko_KR.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Hide Cursor Idle Timeout</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>음량</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Failed to create the update script file</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/lt_LT.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Žymeklio paslėpimo neveikimo laikas</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Garsumas</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Nepavyko sukurti atnaujinimo scenarijaus failo</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/nb.ts

@@ -108,32 +108,32 @@
 		<message>
 			<location filename="../gui_context_menus.h" line="49"/>
 			<source>SFO Viewer</source>
-			<translation>SFO Viser</translation>
+			<translation>SFO viser</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="50"/>
 			<source>Trophy Viewer</source>
-			<translation>Trofé Viser</translation>
+			<translation>Trofé viser</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="49"/>
 			<source>Open Folder...</source>
-			<translation>Åpne Mappen...</translation>
+			<translation>Åpne mappen...</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="50"/>
 			<source>Open Game Folder</source>
-			<translation>Åpne Spillmappen</translation>
+			<translation>Åpne spillmappen</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="51"/>
 			<source>Open Save Data Folder</source>
-			<translation>Åpne Lagrede Data-mappen</translation>
+			<translation>Åpne lagrede datamappen</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="52"/>
 			<source>Open Log Folder</source>
-			<translation>Åpne Loggmappen</translation>
+			<translation>Åpne loggmappen</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="59"/>
@@ -143,17 +143,17 @@
 		<message>
 			<location filename="../gui_context_menus.h" line="60"/>
 			<source>Copy Name</source>
-			<translation>Kopier Navn</translation>
+			<translation>Kopier navn</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="61"/>
 			<source>Copy Serial</source>
-			<translation>Kopier Serienummer</translation>
+			<translation>Kopier serienummer</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="62"/>
 			<source>Copy All</source>
-			<translation>Kopier Alle</translation>
+			<translation>Kopier alle</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="72"/>
@@ -163,18 +163,38 @@
 		<message>
 			<location filename="../gui_context_menus.h" line="73"/>
 			<source>Delete Game</source>
-			<translation>Slett Spill</translation>
+			<translation>Slett spill</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="74"/>
 			<source>Delete Update</source>
-			<translation>Slett Oppdatering</translation>
+			<translation>Slett oppdatering</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="75"/>
 			<source>Delete DLC</source>
 			<translation>Slett DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -251,12 +271,12 @@
 		<message>
 			<location filename="../main_window_ui.h" line="312"/>
 			<source>Install Packages (PKG)</source>
-			<translation>Installer Pakker (PKG)</translation>
+			<translation>Installer pakker (PKG)</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="313"/>
 			<source>Boot Game</source>
-			<translation>Start Spill</translation>
+			<translation>Start spill</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="308"/>
@@ -281,7 +301,7 @@
 		<message>
 			<location filename="../main_window_ui.h" line="320"/>
 			<source>Recent Games</source>
-			<translation>Nylige Spill</translation>
+			<translation>Nylige spill</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="321"/>
@@ -301,12 +321,12 @@
 		<message>
 			<location filename="../main_window_ui.h" line="330"/>
 			<source>Show Game List</source>
-			<translation>Vis Spill-listen</translation>
+			<translation>Vis spill-listen</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="332"/>
 			<source>Game List Refresh</source>
-			<translation>Oppdater Spill-listen</translation>
+			<translation>Oppdater spill-listen</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="333"/>
@@ -351,17 +371,17 @@
 		<message>
 			<location filename="../main_window_ui.h" line="343"/>
 			<source>Download Cheats/Patches</source>
-			<translation>Last ned Juks /Programrettelse </translation>
+			<translation>Last ned juks/programrettelse</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="345"/>
 			<source>Dump Game List</source>
-			<translation>Dump Spill-liste</translation>
+			<translation>Dump spill-liste</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="346"/>
 			<source>PKG Viewer</source>
-			<translation>PKG Viser</translation>
+			<translation>PKG viser</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="348"/>
@@ -381,12 +401,12 @@
 		<message>
 			<location filename="../main_window_ui.h" line="352"/>
 			<source>Game List Icons</source>
-			<translation>Spill-liste Ikoner</translation>
+			<translation>Spill-liste ikoner</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="354"/>
 			<source>Game List Mode</source>
-			<translation>Spill-liste Modus</translation>
+			<translation>Spill-liste modus</translation>
 		</message>
 		<message>
 			<location filename="../main_window_ui.h" line="355"/>
@@ -444,7 +464,7 @@
 		<message>
 			<location filename="../pkg_viewer.cpp" line="32"/>
 			<source>Open Folder</source>
-			<translation>Åpne Mappe</translation>
+			<translation>Åpne mappe</translation>
 		</message>
 	</context>
 	<context>
@@ -452,7 +472,7 @@
 		<message>
 			<location filename="../trophy_viewer.cpp" line="8"/>
 			<source>Trophy Viewer</source>
-			<translation>Trofé Viser</translation>
+			<translation>Trofé viser</translation>
 		</message>
 	</context>
 	<context>
@@ -490,17 +510,17 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="122"/>
 			<source>Enable Fullscreen</source>
-			<translation>Aktiver Fullskjerm</translation>
+			<translation>Aktiver fullskjerm</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="140"/>
 			<source>Enable Separate Update Folder</source>
-			<translation>Aktiver Seperat Oppdateringsmappe</translation>
+			<translation>Aktiver seperat oppdateringsmappe</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="129"/>
 			<source>Show Splash</source>
-			<translation>Vis Velkomstbilde</translation>
+			<translation>Vis velkomstbilde</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="136"/>
@@ -525,12 +545,12 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="199"/>
 			<source>Log Type</source>
-			<translation>Log Type</translation>
+			<translation>Logg type</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="235"/>
 			<source>Log Filter</source>
-			<translation>Log Filter</translation>
+			<translation>Logg filter</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="595"/>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Skjul musepeker ved inaktivitet</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -560,7 +585,7 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="797"/>
 			<source>Back Button Behavior</source>
-			<translation>Tilbakeknapp Atferd</translation>
+			<translation>Tilbakeknapp atferd</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="272"/>
@@ -585,7 +610,7 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="405"/>
 			<source>Vblank Divider</source>
-			<translation>Vblank Skillelinje</translation>
+			<translation>Vblank skillelinje</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="453"/>
@@ -595,7 +620,7 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="462"/>
 			<source>Enable Shaders Dumping</source>
-			<translation>Aktiver Skyggelegger Dumping</translation>
+			<translation>Aktiver dumping av skyggelegger</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="469"/>
@@ -630,22 +655,22 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="537"/>
 			<source>Enable Debug Dumping</source>
-			<translation>Aktiver Feilretting Dumping</translation>
+			<translation>Aktiver dumping av feilretting</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="560"/>
 			<source>Enable Vulkan Validation Layers</source>
-			<translation>Aktiver Vulkan Valideringslag</translation>
+			<translation>Aktiver Vulkan valideringslag</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="567"/>
 			<source>Enable Vulkan Synchronization Validation</source>
-			<translation>Aktiver Vulkan Synkroniseringslag</translation>
+			<translation>Aktiver Vulkan synkroniseringslag</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="574"/>
 			<source>Enable RenderDoc Debugging</source>
-			<translation>Aktiver RenderDoc Feilretting</translation>
+			<translation>Aktiver RenderDoc feilretting</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="274"/>
@@ -670,12 +695,12 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="354"/>
 			<source>GUI Settings</source>
-			<translation>GUI-Innstillinger</translation>
+			<translation>GUI-innstillinger</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="475"/>
 			<source>Disable Trophy Pop-ups</source>
-			<translation>Disable Trophy Pop-ups</translation>
+			<translation>Deaktiver trofé hurtigmeny</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="375"/>
@@ -685,28 +710,33 @@
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Update Compatibility Database On Startup</source>
-			<translation>Update Compatibility Database On Startup</translation>
+			<translation>Oppdater kompatibilitets-database ved oppstart</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Game Compatibility</source>
-			<translation>Game Compatibility</translation>
+			<translation>Spill kompatibilitet</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Display Compatibility Data</source>
-			<translation>Display Compatibility Data</translation>
+			<translation>Vis kompatibilitets-data</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Update Compatibility Database</source>
-			<translation>Update Compatibility Database</translation>
+			<translation>Oppdater kompatibilitets-database</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="394"/>
 			<source>Volume</source>
 			<translation>Volum</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -728,7 +758,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="328"/>
 			<source>Download Patches For All Games</source>
-			<translation>Last ned oppdateringer for alle spill</translation>
+			<translation>Last ned programrettelser for alle spill</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="363"/>
@@ -778,7 +808,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="623"/>
 			<source>PKG Extraction</source>
-			<translation>PKG-ekstraksjon</translation>
+			<translation>PKG-utpakking</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="646"/>
@@ -788,7 +818,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="646"/>
 			<source>PKG and Game versions match: </source>
-			<translation>PKG- og spillversjoner stemmer overens: </translation>
+			<translation>PKG og spillversjoner stemmer overens: </translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="647"/>
@@ -813,7 +843,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="673"/>
 			<source>DLC Installation</source>
-			<translation>DLC-installasjon</translation>
+			<translation>DLC installasjon</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="674"/>
@@ -833,7 +863,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="674"/>
 			<source>PKG is a patch, please install the game first!</source>
-			<translation>PKG er en oppdatering, vennligst installer spillet først!</translation>
+			<translation>PKG er en programrettelse, vennligst installer spillet først!</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="681"/>
@@ -871,7 +901,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="50"/>
 			<source>defaultTextEdit_MSG</source>
-			<translation>Juks/programrettelse er eksperimentelle.\nBruk med forsiktighet.\n\nLast ned juks individuelt ved å velge pakkebrønn og klikke på nedlastingsknappen.\nPå fanen programrettelse kan du laste ned alle programrettelser samtidig, velge hvilke du ønsker å bruke, og lagre valget ditt.\n\nSiden vi ikke utvikler Juksene/Programrettelsene,\nvær vennlig å rapportere problemer til jukse/programrettelse utvikleren.\n\nHar du laget en ny juks? Besøk:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
+			<translation>Juks/programrettelse er eksperimentelle.\nBruk med forsiktighet.\n\nLast ned juks individuelt ved å velge pakkebrønn og klikke på nedlastingsknappen.\nPå fanen programrettelse kan du laste ned alle programrettelser samtidig, velge hvilke du ønsker å bruke, og lagre valget ditt.\n\nSiden vi ikke utvikler Juks/Programrettelse,\nvær vennlig å rapportere problemer til juks/programrettelse utvikleren.\n\nHar du laget en ny juks? Besøk:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="69"/>
@@ -921,7 +951,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="170"/>
 			<source>You can delete the cheats you don't want after downloading them.</source>
-			<translation>Du kan slette juksene du ikke ønsker etter å ha lastet dem ned.</translation>
+			<translation>Du kan slette juks du ikke ønsker etter å ha lastet dem ned.</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="178"/>
@@ -936,7 +966,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="241"/>
 			<source>Download Patches</source>
-			<translation>Last ned programrettelse</translation>
+			<translation>Last ned programrettelser</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="248"/>
@@ -946,7 +976,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="256"/>
 			<source>Cheats</source>
-			<translation>Jukser</translation>
+			<translation>Juks</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="257"/>
@@ -1001,7 +1031,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="470"/>
 			<source>Invalid Source</source>
-			<translation>Ugyldig Kilde</translation>
+			<translation>Ugyldig kilde</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="471"/>
@@ -1011,7 +1041,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="519"/>
 			<source>File Exists</source>
-			<translation>Filen Eksisterer</translation>
+			<translation>Filen eksisterer</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="520"/>
@@ -1031,7 +1061,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="556"/>
 			<source>Cheats Not Found</source>
-			<translation>Fant ikke juksene</translation>
+			<translation>Fant ikke juks</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="556"/>
@@ -1041,12 +1071,12 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="593"/>
 			<source>Cheats Downloaded Successfully</source>
-			<translation>Juksene ble lastet ned</translation>
+			<translation>Juks ble lastet ned</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="594"/>
 			<source>CheatsDownloadedSuccessfully_MSG</source>
-			<translation>Du har lastet ned jukser for denne versjonen av spillet fra den valgte pakkebrønnen. Du kan prøve å laste ned fra en annen pakkebrønn, hvis det er tilgjengelig, vil det også være mulig å bruke det ved å velge filen fra listen.</translation>
+			<translation>Du har lastet ned juks for denne versjonen av spillet fra den valgte pakkebrønnen. Du kan prøve å laste ned fra en annen pakkebrønn, hvis det er tilgjengelig, vil det også være mulig å bruke det ved å velge filen fra listen.</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="747"/>
@@ -1066,7 +1096,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="763"/>
 			<source>DownloadComplete_MSG</source>
-			<translation>Programrettelser ble lastet ned! Alle programrettelsene tilgjengelige for alle spill har blitt lastet ned, det er ikke nødvendig å laste dem ned individuelt for hvert spill som skjer med jukser. Hvis programrettelsen ikke vises, kan det hende at den ikke finnes for den spesifikke serienummeret og versjonen av spillet.</translation>
+			<translation>Programrettelser ble lastet ned! Alle programrettelsene tilgjengelige for alle spill har blitt lastet ned, det er ikke nødvendig å laste dem ned individuelt for hvert spill som skjer med juks. Hvis programrettelsen ikke vises, kan det hende at den ikke finnes for den spesifikke serienummeret og versjonen av spillet.</translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="773"/>
@@ -1136,7 +1166,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="1163"/>
 			<source>Can't apply cheats before the game is started</source>
-			<translation>Kan ikke bruke juksene før spillet er startet.</translation>
+			<translation>Kan ikke bruke juks før spillet er startet.</translation>
 		</message>
 	</context>
 	<context>
@@ -1189,7 +1219,7 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="295"/>
 			<source>showSplashCheckBox</source>
-			<translation>Vis Velkomstbilde:\nViser spillets velkomstbilde (et spesialbilde) når spillet starter.</translation>
+			<translation>Vis velkomstbilde:\nViser spillets velkomstbilde (et spesialbilde) når spillet starter.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="297"/>
@@ -1209,12 +1239,12 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="301"/>
 			<source>logTypeGroupBox</source>
-			<translation>Logtype:\nAngir om loggvinduets utdata skal synkroniseres for ytelse. Kan ha negative effekter for etterligneren.</translation>
+			<translation>Logg type:\nAngir om loggvinduets utdata skal synkroniseres for ytelse. Kan ha negative effekter for etterligneren.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="303"/>
 			<source>logFilter</source>
-			<translation>Loggfilter:\nFiltrerer loggen for å kun skrive ut spesifikk informasjon.\nEksempler: "Core:Trace" "Lib.Pad:Debug Common.Filesystem:Error" "*:Critical" Nivåer: Trace, Debug, Info, Warning, Error, Critical - i denne rekkefølgen, et spesifikt nivå demper alle tidligere nivåer i listen og logger alle nivåer etter det.</translation>
+			<translation>Logg filter:\nFiltrerer loggen for å kun skrive ut spesifikk informasjon.\nEksempler: "Core:Trace" "Lib.Pad:Debug Common.Filesystem:Error" "*:Critical" Nivåer: Trace, Debug, Info, Warning, Error, Critical - i denne rekkefølgen, et spesifikt nivå demper alle tidligere nivåer i listen og logger alle nivåer etter det.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="305"/>
@@ -1229,7 +1259,7 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="267"/>
 			<source>disableTrophycheckBox</source>
-			<translation>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).</translation>
+			<translation>Deaktiver trofé hurtigmeny:\nDeaktiver trofévarsler i spillet. Trofé-fremgang kan fortsatt ved help av troféviseren (høyreklikk på spillet i hovedvinduet).</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="450"/>
@@ -1249,17 +1279,17 @@
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>enableCompatibilityCheckBox</source>
-			<translation>Display Compatibility Data:\nDisplays game compatibility information in table view. Enable "Update Compatibility On Startup" to get up-to-date information.</translation>
+			<translation>Vis kompatibilitets-data:\nViser informasjon om spillkompatibilitet i tabellvisning. Aktiver "Oppdater kompatibilitets-data ved oppstart" for oppdatert informasjon.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>checkCompatibilityOnStartupCheckBox</source>
-			<translation>Update Compatibility On Startup:\nAutomatically update the compatibility database when shadPS4 starts.</translation>
+			<translation>Oppdater kompatibilitets-data ved oppstart:\nOppdaterer kompatibilitets-databasen automatisk når shadPS4 starter.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>updateCompatibilityButton</source>
-			<translation>Update Compatibility Database:\nImmediately update the compatibility database.</translation>
+			<translation>Oppdater kompatibilitets-database:\nOppdater kompatibilitets-databasen nå.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="70"/>
@@ -1299,7 +1329,7 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="312"/>
 			<source>graphicsAdapterGroupBox</source>
-			<translation>Grafikkenhet:\nI systemer med flere GPU-er, velg GPU-en etterligneren skal bruke fra rullegardinlisten,\neller velg "Auto Select" for å bestemme den automatisk.</translation>
+			<translation>Grafikkenhet:\nI systemer med flere GPU-er, velg GPU-en etterligneren skal bruke fra rullegardinlisten,\neller velg "Auto Select" for å velge automatisk.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="314"/>
@@ -1309,12 +1339,12 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="318"/>
 			<source>heightDivider</source>
-			<translation>Vblank Skillelinje:\nBildehastigheten som etterligneren oppdaterer ved, multipliseres med dette tallet. Endring av dette kan ha negative effekter, som å øke hastigheten av spillet, eller ødelegge kritisk spillfunksjonalitet som ikke forventer at dette endres!</translation>
+			<translation>Vblank skillelinje:\nBildehastigheten som etterligneren oppdaterer ved, multipliseres med dette tallet. Endring av dette kan ha negative effekter, som å øke hastigheten av spillet, eller ødelegge kritisk spillfunksjonalitet som ikke forventer at dette endres!</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="320"/>
 			<source>dumpShadersCheckBox</source>
-			<translation>Aktiver skyggelegger-dumping:\nFor teknisk feilsøking lagrer skyggeleggene fra spillet i en mappe mens de gjengis.</translation>
+			<translation>Aktiver dumping av skyggelegger:\nFor teknisk feilsøking lagrer skyggeleggerne fra spillet i en mappe mens de gjengis.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="322"/>
@@ -1377,7 +1407,7 @@
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility</source>
-			<translation>Compatibility</translation>
+			<translation>Kompatibilitet</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp" line="34"/>
@@ -1412,37 +1442,52 @@
 		<message>
 			<location filename="../game_list_frame.cpp" line="108"/>
 			<source>Never Played</source>
-			<translation>Never Played</translation>
+			<translation>Aldri spilt</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
-			<translation>Compatibility is untested</translation>
+			<translation>kompatibilitet er utestet</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game does not initialize properly / crashes the emulator</source>
-			<translation>Game does not initialize properly / crashes the emulator</translation>
+			<translation>Spillet initialiseres ikke riktig / krasjer etterligneren</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game boots, but only displays a blank screen</source>
-			<translation>Game boots, but only displays a blank screen</translation>
+			<translation>Spillet starter, men viser bare en tom skjerm</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game displays an image but does not go past the menu</source>
-			<translation>Game displays an image but does not go past the menu</translation>
+			<translation>Spillet viser et bilde, men går ikke forbi menyen</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game has game-breaking glitches or unplayable performance</source>
-			<translation>Game has game-breaking glitches or unplayable performance</translation>
+			<translation>Spillet har spillbrytende feil eller uspillbar ytelse</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game can be completed with playable performance and no major glitches</source>
-			<translation>Game can be completed with playable performance and no major glitches</translation>
+			<translation>Spillet kan fullføres med spillbar ytelse og ingen store feil</translation>
 		</message>
 	</context>
 	<context>
@@ -1450,7 +1495,7 @@
 		<message>
 			<location filename="../check_update.cpp" line="34"/>
 			<source>Auto Updater</source>
-			<translation>Automatisk oppdaterering</translation>
+			<translation>Automatisk oppdatering</translation>
 		</message>
 		<message>
 			<location filename="../check_update.cpp" line="51"/>
@@ -1465,7 +1510,7 @@
 		<message>
 			<location filename="../check_update.cpp" line="73"/>
 			<source>Failed to parse update information.</source>
-			<translation>Kunne ikke analysere oppdateringsinformasjonen.</translation>
+			<translation>Kunne ikke analysere oppdaterings-informasjonen.</translation>
 		</message>
 		<message>
 			<location filename="../check_update.cpp" line="89"/>
@@ -1545,7 +1590,7 @@
 		<message>
 			<location filename="../check_update.cpp" line="310"/>
 			<source>Network error occurred while trying to access the URL</source>
-			<translation>Nettverksfeil oppstod mens du prøvde å få tilgang til URL</translation>
+			<translation>Nettverksfeil oppstod mens vi prøvde å få tilgang til URL</translation>
 		</message>
 		<message>
 			<location filename="../check_update.cpp" line="330"/>
@@ -1573,4 +1618,32 @@
 			<translation>Kunne ikke opprette oppdateringsskriptfilen</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/nl.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Inactiviteit timeout voor het verbergen van de cursor</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Kon het update-scriptbestand niet maken</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/pl_PL.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Czas oczekiwania na ukrycie kursora przy bezczynności</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Głośność</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Nie udało się utworzyć pliku skryptu aktualizacji</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/pt_BR.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Deletar DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibilidade...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Atualizar banco de dados</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>Ver status</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Enviar status</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Tempo de Inatividade para Ocultar Cursor</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volume</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Backend de Áudio</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Nunca jogado</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Falha ao criar o arquivo de script de atualização</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/ro_RO.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Timeout pentru ascunderea cursorului inactiv</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Volum</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Nu s-a putut crea fișierul script de actualizare</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/ru_RU.ts

@@ -118,7 +118,7 @@
 		<message>
 			<location filename="../gui_context_menus.h" line="49"/>
 			<source>Open Folder...</source>
-			<translation>Открыть Папку...</translation>
+			<translation>Открыть папку...</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="50"/>
@@ -128,12 +128,12 @@
 		<message>
 			<location filename="../gui_context_menus.h" line="51"/>
 			<source>Open Save Data Folder</source>
-			<translation>Открыть Папку Сохранений</translation>
+			<translation>Открыть папку сохранений</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="52"/>
 			<source>Open Log Folder</source>
-			<translation>Открыть Папку Логов</translation>
+			<translation>Открыть папку логов</translation>
 		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="59"/>
@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Удалить DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Совместимость...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Обновить базу данных</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>Посмотреть отчет</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Отправить отчет</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -452,7 +472,7 @@
 		<message>
 			<location filename="../trophy_viewer.cpp" line="8"/>
 			<source>Trophy Viewer</source>
-			<translation>Трофеи</translation>
+			<translation>Просмотр трофеев</translation>
 		</message>
 	</context>
 	<context>
@@ -550,7 +570,12 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="668"/>
 			<source>Hide Cursor Idle Timeout</source>
-			<translation>Тайм-аут скрытия курсора при бездействии</translation>
+			<translation>Время скрытия курсора при бездействии</translation>
+		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>сек</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
@@ -675,7 +700,7 @@
 		<message>
 			<location filename="../settings_dialog.ui" line="475"/>
 			<source>Disable Trophy Pop-ups</source>
-			<translation>Disable Trophy Pop-ups</translation>
+			<translation>Отключить уведомления о трофеях</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="375"/>
@@ -685,28 +710,33 @@
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Update Compatibility Database On Startup</source>
-			<translation>Update Compatibility Database On Startup</translation>
+			<translation>Обновлять базу совместимости при запуске</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Game Compatibility</source>
-			<translation>Game Compatibility</translation>
+			<translation>Совместимость игр</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Display Compatibility Data</source>
-			<translation>Display Compatibility Data</translation>
+			<translation>Показывать данные совместимости</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui"/>
 			<source>Update Compatibility Database</source>
-			<translation>Update Compatibility Database</translation>
+			<translation>Обновить базу совместимости</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="394"/>
 			<source>Volume</source>
 			<translation>Громкость</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Звуковая Подсистема</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -763,7 +793,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="594"/>
 			<source>ELF files (*.bin *.elf *.oelf)</source>
-			<translation>Файл ELF (*.bin *.elf *.oelf)</translation>
+			<translation>Файлы ELF (*.bin *.elf *.oelf)</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="600"/>
@@ -818,7 +848,7 @@
 		<message>
 			<location filename="../main_window.cpp" line="674"/>
 			<source>Would you like to install DLC: %1?</source>
-			<translation>Вы хотите установить DLC: %1??</translation>
+			<translation>Вы хотите установить DLC: %1?</translation>
 		</message>
 		<message>
 			<location filename="../main_window.cpp" line="688"/>
@@ -866,7 +896,7 @@
 		<message>
 			<location filename="../cheats_patches.cpp" line="44"/>
 			<source>Cheats / Patches for </source>
-			<translation>Cheats / Patches for </translation>
+			<translation>Читы и патчи для </translation>
 		</message>
 		<message>
 			<location filename="../cheats_patches.cpp" line="50"/>
@@ -1189,7 +1219,7 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="295"/>
 			<source>showSplashCheckBox</source>
-			<translation>Показывать заставку:\nОтображает заставку игры (специальное изображение) во время запуска игры.</translation>
+			<translation>Показывать заставку:\nОтображает заставку игры (специальное изображение) во время запуска.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="297"/>
@@ -1229,12 +1259,12 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="267"/>
 			<source>disableTrophycheckBox</source>
-			<translation>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).</translation>
+			<translation>Отключить уведомления о трофеях:\nОтключает внутриигровые уведомления о трофеях. Прогресс трофеев по прежнему можно отслеживать в меню Просмотр трофеев (правая кнопка мыши по игре в главном окне).</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="450"/>
 			<source>hideCursorGroupBox</source>
-			<translation>Скрывать курсор:\nВыберите, когда курсор исчезнет:\nНикогда: Вы всегда будете видеть мышь.\nПри бездействии: Установите время, через которое курсор исчезнет при бездействии.\nВсегда: Вы никогда не будете видеть мышь.</translation>
+			<translation>Скрывать курсор:\nВыберите, когда курсор будет скрыт:\nНикогда: Вы всегда будете видеть курсор.\nПри бездействии: Установите время, через которое курсор будет скрыт при бездействии.\nВсегда: Курсор всегда будет скрыт.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="452"/>
@@ -1249,17 +1279,17 @@
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>enableCompatibilityCheckBox</source>
-			<translation>Display Compatibility Data:\nDisplays game compatibility information in table view. Enable "Update Compatibility On Startup" to get up-to-date information.</translation>
+			<translation>Показывать данные совместимости:\nПоказывает информацию о совместимости игр в таблице. Включите «Обновлять базу совместимости при запуске» для получения актуальной информации.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>checkCompatibilityOnStartupCheckBox</source>
-			<translation>Update Compatibility On Startup:\nAutomatically update the compatibility database when shadPS4 starts.</translation>
+			<translation>Обновлять базу совместимости при запуске:\nАвтоматически обновлять базу данных совместимости при запуске shadPS4.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp"/>
 			<source>updateCompatibilityButton</source>
-			<translation>Update Compatibility Database:\nImmediately update the compatibility database.</translation>
+			<translation>Обновить базу совместимости:\nНемедленно обновить базу данных совместимости.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="70"/>
@@ -1299,7 +1329,7 @@
 		<message>
 			<location filename="../settings_dialog.cpp" line="312"/>
 			<source>graphicsAdapterGroupBox</source>
-			<translation>Графическое устройство:\nВ системах с несколькими GPU выберите GPU, который будет использовать эмулятор из выпадающего списка,\nили выберите "Auto Select", чтобы определить его автоматически.</translation>
+			<translation>Графическое устройство:\nВ системах с несколькими GPU выберите GPU, который будет использовать эмулятор.\nВыберите "Auto Select", чтобы определить его автоматически.</translation>
 		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="314"/>
@@ -1377,7 +1407,7 @@
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility</source>
-			<translation>Compatibility</translation>
+			<translation>Совместимость</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp" line="34"/>
@@ -1412,37 +1442,52 @@
 		<message>
 			<location filename="../game_list_frame.cpp" line="108"/>
 			<source>Never Played</source>
-			<translation>Never Played</translation>
+			<translation>Вы не играли</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>ч</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>м</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>с</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
-			<translation>Compatibility is untested</translation>
+			<translation>Совместимость не проверена</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game does not initialize properly / crashes the emulator</source>
-			<translation>Game does not initialize properly / crashes the emulator</translation>
+			<translation>Игра не иницализируется правильно / крашит эмулятор</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game boots, but only displays a blank screen</source>
-			<translation>Game boots, but only displays a blank screen</translation>
+			<translation>Игра запускается, но показывает только пустой экран</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game displays an image but does not go past the menu</source>
-			<translation>Game displays an image but does not go past the menu</translation>
+			<translation>Игра показывает картинку, но не проходит дальше меню</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game has game-breaking glitches or unplayable performance</source>
-			<translation>Game has game-breaking glitches or unplayable performance</translation>
+			<translation>Игра имеет ломающие игру глюки или плохую производительность</translation>
 		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Game can be completed with playable performance and no major glitches</source>
-			<translation>Game can be completed with playable performance and no major glitches</translation>
+			<translation>Игра может быть пройдена с хорошей производительностью и без серьезных сбоев</translation>
 		</message>
 	</context>
 	<context>
@@ -1525,7 +1570,7 @@
 		<message>
 			<location filename="../check_update.cpp" line="199"/>
 			<source>Update</source>
-			<translation>Обновиться</translation>
+			<translation>Обновить</translation>
 		</message>
 		<message>
 			<location filename="../check_update.cpp" line="200"/>
@@ -1573,4 +1618,32 @@
 			<translation>Не удалось создать файл скрипта обновления</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>Б</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>КБ</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>МБ</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>ГБ</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>ТБ</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/sq.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Fshi DLC-në</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Koha për fshehjen e kursorit joaktiv</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Vëllimi i zërit</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Nuk është luajtur kurrë</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Krijimi i skedarit skript të përditësimit dështoi</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/tr_TR.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>İmleç İçin Hareketsizlik Zaman Aşımı</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Ses seviyesi</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Güncelleme betiği dosyası oluşturulamadı</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/uk_UA.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Видалити DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Тайм-аут приховування курсора при бездіяльності</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Гучність</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Не вдалося створити файл скрипта оновлення</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/vi_VN.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>Thời gian chờ ẩn con trỏ</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>Âm lượng</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>Không thể tạo tệp kịch bản cập nhật</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/zh_CN.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>删除DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>光标空闲超时隐藏</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>音量</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>无法创建更新脚本文件</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/qt_gui/translations/zh_TW.ts

@@ -175,6 +175,26 @@
 			<source>Delete DLC</source>
 			<translation>Delete DLC</translation>
 		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="99"/>
+			<source>Compatibility...</source>
+			<translation>Compatibility...</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="100"/>
+			<source>Update database</source>
+			<translation>Update database</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="101"/>
+			<source>View report</source>
+			<translation>View report</translation>
+		</message>
+		<message>
+			<location filename="../gui_context_menus.h" line="102"/>
+			<source>Submit a report</source>
+			<translation>Submit a report</translation>
+		</message>
 		<message>
 			<location filename="../gui_context_menus.h" line="195"/>
 			<source>Shortcut creation</source>
@@ -552,6 +572,11 @@
 			<source>Hide Cursor Idle Timeout</source>
 			<translation>游標空閒超時隱藏</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui" line="816"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.ui" line="767"/>
 			<source>Controller</source>
@@ -707,6 +732,11 @@
 			<source>Volume</source>
 			<translation>音量</translation>
 		</message>
+		<message>
+			<location filename="../settings_dialog.ui"/>
+			<source>Audio Backend</source>
+			<translation>Audio Backend</translation>
+		</message>
 	</context>
 	<context>
 		<name>MainWindow</name>
@@ -1414,6 +1444,21 @@
 			<source>Never Played</source>
 			<translation>Never Played</translation>
 		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>h</source>
+			<translation>h</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>m</source>
+			<translation>m</translation>
+		</message>
+		<message>
+			<location filename="../game_list_frame.cpp"/>
+			<source>s</source>
+			<translation>s</translation>
+		</message>
 		<message>
 			<location filename="../game_list_frame.cpp"/>
 			<source>Compatibility is untested</source>
@@ -1573,4 +1618,32 @@
 			<translation>無法創建更新腳本文件</translation>
 		</message>
 	</context>
+	<context>
+		<name>GameListUtils</name>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>B</source>
+			<translation>B</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>KB</source>
+			<translation>KB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>MB</source>
+			<translation>MB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>GB</source>
+			<translation>GB</translation>
+		</message>
+		<message>
+			<location filename="../game_list_utils.h" line="34"/>
+			<source>TB</source>
+			<translation>TB</translation>
+		</message>		
+	</context>
 </TS>

src/shader_recompiler/backend/spirv/emit_spirv_instructions.h

@@ -304,10 +304,12 @@ Id EmitBitFieldSExtract(EmitContext& ctx, IR::Inst* inst, Id base, Id offset, Id
 Id EmitBitFieldUExtract(EmitContext& ctx, IR::Inst* inst, Id base, Id offset, Id count);
 Id EmitBitReverse32(EmitContext& ctx, Id value);
 Id EmitBitCount32(EmitContext& ctx, Id value);
+Id EmitBitCount64(EmitContext& ctx, Id value);
 Id EmitBitwiseNot32(EmitContext& ctx, Id value);
 Id EmitFindSMsb32(EmitContext& ctx, Id value);
 Id EmitFindUMsb32(EmitContext& ctx, Id value);
 Id EmitFindILsb32(EmitContext& ctx, Id value);
+Id EmitFindILsb64(EmitContext& ctx, Id value);
 Id EmitSMin32(EmitContext& ctx, Id a, Id b);
 Id EmitUMin32(EmitContext& ctx, Id a, Id b);
 Id EmitSMax32(EmitContext& ctx, Id a, Id b);
@@ -318,7 +320,8 @@ Id EmitSLessThan32(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitSLessThan64(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThan32(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThan64(EmitContext& ctx, Id lhs, Id rhs);
-Id EmitIEqual(EmitContext& ctx, Id lhs, Id rhs);
+Id EmitIEqual32(EmitContext& ctx, Id lhs, Id rhs);
+Id EmitIEqual64(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitSLessThanEqual(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThanEqual(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitSGreaterThan(EmitContext& ctx, Id lhs, Id rhs);

src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp

@@ -201,6 +201,10 @@ Id EmitBitCount32(EmitContext& ctx, Id value) {
     return ctx.OpBitCount(ctx.U32[1], value);
 }
 
+Id EmitBitCount64(EmitContext& ctx, Id value) {
+    return ctx.OpBitCount(ctx.U64, value);
+}
+
 Id EmitBitwiseNot32(EmitContext& ctx, Id value) {
     return ctx.OpNot(ctx.U32[1], value);
 }
@@ -217,6 +221,10 @@ Id EmitFindILsb32(EmitContext& ctx, Id value) {
     return ctx.OpFindILsb(ctx.U32[1], value);
 }
 
+Id EmitFindILsb64(EmitContext& ctx, Id value) {
+    return ctx.OpFindILsb(ctx.U64, value);
+}
+
 Id EmitSMin32(EmitContext& ctx, Id a, Id b) {
     return ctx.OpSMin(ctx.U32[1], a, b);
 }
@@ -277,7 +285,11 @@ Id EmitULessThan64(EmitContext& ctx, Id lhs, Id rhs) {
     return ctx.OpULessThan(ctx.U1[1], lhs, rhs);
 }
 
-Id EmitIEqual(EmitContext& ctx, Id lhs, Id rhs) {
+Id EmitIEqual32(EmitContext& ctx, Id lhs, Id rhs) {
+    return ctx.OpIEqual(ctx.U1[1], lhs, rhs);
+}
+
+Id EmitIEqual64(EmitContext& ctx, Id lhs, Id rhs) {
     return ctx.OpIEqual(ctx.U1[1], lhs, rhs);
 }
 

src/shader_recompiler/frontend/translate/scalar_alu.cpp

@@ -100,8 +100,12 @@ void Translator::EmitScalarAlu(const GcnInst& inst) {
             return S_BREV_B32(inst);
         case Opcode::S_BCNT1_I32_B32:
             return S_BCNT1_I32_B32(inst);
+        case Opcode::S_BCNT1_I32_B64:
+            return S_BCNT1_I32_B64(inst);
         case Opcode::S_FF1_I32_B32:
             return S_FF1_I32_B32(inst);
+        case Opcode::S_FF1_I32_B64:
+            return S_FF1_I32_B64(inst);
         case Opcode::S_AND_SAVEEXEC_B64:
             return S_SAVEEXEC_B64(NegateMode::None, false, inst);
         case Opcode::S_ORN2_SAVEEXEC_B64:
@@ -585,12 +589,25 @@ void Translator::S_BCNT1_I32_B32(const GcnInst& inst) {
     ir.SetScc(ir.INotEqual(result, ir.Imm32(0)));
 }
 
+void Translator::S_BCNT1_I32_B64(const GcnInst& inst) {
+    const IR::U32 result = ir.BitCount(GetSrc64(inst.src[0]));
+    SetDst(inst.dst[0], result);
+    ir.SetScc(ir.INotEqual(result, ir.Imm32(0)));
+}
+
 void Translator::S_FF1_I32_B32(const GcnInst& inst) {
     const IR::U32 src0{GetSrc(inst.src[0])};
     const IR::U32 result{ir.Select(ir.IEqual(src0, ir.Imm32(0U)), ir.Imm32(-1), ir.FindILsb(src0))};
     SetDst(inst.dst[0], result);
 }
 
+void Translator::S_FF1_I32_B64(const GcnInst& inst) {
+    const IR::U64 src0{GetSrc64(inst.src[0])};
+    const IR::U32 result{
+        ir.Select(ir.IEqual(src0, ir.Imm64(u64(0))), ir.Imm32(-1), ir.FindILsb(src0))};
+    SetDst(inst.dst[0], result);
+}
+
 void Translator::S_SAVEEXEC_B64(NegateMode negate, bool is_or, const GcnInst& inst) {
     // This instruction normally operates on 64-bit data (EXEC, VCC, SGPRs)
     // However here we flatten it to 1-bit EXEC and 1-bit VCC. For the destination

src/shader_recompiler/frontend/translate/translate.h

@@ -111,7 +111,9 @@ public:
     void S_NOT_B64(const GcnInst& inst);
     void S_BREV_B32(const GcnInst& inst);
     void S_BCNT1_I32_B32(const GcnInst& inst);
+    void S_BCNT1_I32_B64(const GcnInst& inst);
     void S_FF1_I32_B32(const GcnInst& inst);
+    void S_FF1_I32_B64(const GcnInst& inst);
     void S_GETPC_B64(u32 pc, const GcnInst& inst);
     void S_SAVEEXEC_B64(NegateMode negate, bool is_or, const GcnInst& inst);
     void S_ABS_I32(const GcnInst& inst);

src/shader_recompiler/ir/ir_emitter.cpp

@@ -1273,8 +1273,15 @@ U32 IREmitter::BitReverse(const U32& value) {
     return Inst<U32>(Opcode::BitReverse32, value);
 }
 
-U32 IREmitter::BitCount(const U32& value) {
+U32 IREmitter::BitCount(const U32U64& value) {
-    return Inst<U32>(Opcode::BitCount32, value);
+    switch (value.Type()) {
+    case Type::U32:
+        return Inst<U32>(Opcode::BitCount32, value);
+    case Type::U64:
+        return Inst<U32>(Opcode::BitCount64, value);
+    default:
+        ThrowInvalidType(value.Type());
+    }
 }
 
 U32 IREmitter::BitwiseNot(const U32& value) {
@@ -1289,8 +1296,15 @@ U32 IREmitter::FindUMsb(const U32& value) {
     return Inst<U32>(Opcode::FindUMsb32, value);
 }
 
-U32 IREmitter::FindILsb(const U32& value) {
+U32 IREmitter::FindILsb(const U32U64& value) {
-    return Inst<U32>(Opcode::FindILsb32, value);
+    switch (value.Type()) {
+    case Type::U32:
+        return Inst<U32>(Opcode::FindILsb32, value);
+    case Type::U64:
+        return Inst<U32>(Opcode::FindILsb64, value);
+    default:
+        ThrowInvalidType(value.Type());
+    }
 }
 
 U32 IREmitter::SMin(const U32& a, const U32& b) {
@@ -1345,7 +1359,9 @@ U1 IREmitter::IEqual(const U32U64& lhs, const U32U64& rhs) {
     }
     switch (lhs.Type()) {
     case Type::U32:
-        return Inst<U1>(Opcode::IEqual, lhs, rhs);
+        return Inst<U1>(Opcode::IEqual32, lhs, rhs);
+    case Type::U64:
+        return Inst<U1>(Opcode::IEqual64, lhs, rhs);
     default:
         ThrowInvalidType(lhs.Type());
     }

src/shader_recompiler/ir/ir_emitter.h

@@ -229,12 +229,12 @@ public:
     [[nodiscard]] U32 BitFieldExtract(const U32& base, const U32& offset, const U32& count,
                                       bool is_signed = false);
     [[nodiscard]] U32 BitReverse(const U32& value);
-    [[nodiscard]] U32 BitCount(const U32& value);
+    [[nodiscard]] U32 BitCount(const U32U64& value);
     [[nodiscard]] U32 BitwiseNot(const U32& value);
 
     [[nodiscard]] U32 FindSMsb(const U32& value);
     [[nodiscard]] U32 FindUMsb(const U32& value);
-    [[nodiscard]] U32 FindILsb(const U32& value);
+    [[nodiscard]] U32 FindILsb(const U32U64& value);
     [[nodiscard]] U32 SMin(const U32& a, const U32& b);
     [[nodiscard]] U32 UMin(const U32& a, const U32& b);
     [[nodiscard]] U32 IMin(const U32& a, const U32& b, bool is_signed);

src/shader_recompiler/ir/opcodes.inc

@@ -284,11 +284,13 @@ OPCODE(BitFieldSExtract,                                    U32,            U32,
 OPCODE(BitFieldUExtract,                                    U32,            U32,            U32,            U32,                                            )
 OPCODE(BitReverse32,                                        U32,            U32,                                                                            )
 OPCODE(BitCount32,                                          U32,            U32,                                                                            )
+OPCODE(BitCount64,                                          U32,            U64,                                                                            )
 OPCODE(BitwiseNot32,                                        U32,            U32,                                                                            )
 
 OPCODE(FindSMsb32,                                          U32,            U32,                                                                            )
 OPCODE(FindUMsb32,                                          U32,            U32,                                                                            )
 OPCODE(FindILsb32,                                          U32,            U32,                                                                            )
+OPCODE(FindILsb64,                                          U32,            U64,                                                                            )
 OPCODE(SMin32,                                              U32,            U32,            U32,                                                            )
 OPCODE(UMin32,                                              U32,            U32,            U32,                                                            )
 OPCODE(SMax32,                                              U32,            U32,            U32,                                                            )
@@ -299,7 +301,8 @@ OPCODE(SLessThan32,                                         U1,             U32,
 OPCODE(SLessThan64,                                         U1,             U64,            U64,                                                            )
 OPCODE(ULessThan32,                                         U1,             U32,            U32,                                                            )
 OPCODE(ULessThan64,                                         U1,             U64,            U64,                                                            )
-OPCODE(IEqual,                                              U1,             U32,            U32,                                                            )
+OPCODE(IEqual32,                                            U1,             U32,            U32,                                                            )
+OPCODE(IEqual64,                                            U1,             U64,            U64,                                                            )
 OPCODE(SLessThanEqual,                                      U1,             U32,            U32,                                                            )
 OPCODE(ULessThanEqual,                                      U1,             U32,            U32,                                                            )
 OPCODE(SGreaterThan,                                        U1,             U32,            U32,                                                            )

src/shader_recompiler/ir/passes/constant_propagation_pass.cpp

@@ -391,9 +391,12 @@ void ConstantPropagation(IR::Block& block, IR::Inst& inst) {
     case IR::Opcode::UGreaterThanEqual:
         FoldWhenAllImmediates(inst, [](u32 a, u32 b) { return a >= b; });
         return;
-    case IR::Opcode::IEqual:
+    case IR::Opcode::IEqual32:
         FoldWhenAllImmediates(inst, [](u32 a, u32 b) { return a == b; });
         return;
+    case IR::Opcode::IEqual64:
+        FoldWhenAllImmediates(inst, [](u64 a, u64 b) { return a == b; });
+        return;
     case IR::Opcode::INotEqual:
         FoldWhenAllImmediates(inst, [](u32 a, u32 b) { return a != b; });
         return;

src/shader_recompiler/ir/passes/resource_tracking_pass.cpp

@@ -249,7 +249,7 @@ std::pair<const IR::Inst*, bool> TryDisableAnisoLod0(const IR::Inst* inst) {
 
     // Select should be based on zero check
     const auto* prod0 = inst->Arg(0).InstRecursive();
-    if (prod0->GetOpcode() != IR::Opcode::IEqual ||
+    if (prod0->GetOpcode() != IR::Opcode::IEqual32 ||
         !(prod0->Arg(1).IsImmediate() && prod0->Arg(1).U32() == 0u)) {
         return not_found;
     }

src/video_core/amdgpu/resource.h

@@ -364,6 +364,16 @@ enum class Filter : u64 {
     AnisoLinear = 3,
 };
 
+constexpr bool IsAnisoFilter(const Filter filter) {
+    switch (filter) {
+    case Filter::AnisoPoint:
+    case Filter::AnisoLinear:
+        return true;
+    default:
+        return false;
+    }
+}
+
 enum class MipFilter : u64 {
     None = 0,
     Point = 1,
@@ -435,6 +445,23 @@ struct Sampler {
     float MaxLod() const noexcept {
         return static_cast<float>(max_lod.Value()) / 256.0f;
     }
+
+    float MaxAniso() const {
+        switch (max_aniso) {
+        case AnisoRatio::One:
+            return 1.0f;
+        case AnisoRatio::Two:
+            return 2.0f;
+        case AnisoRatio::Four:
+            return 4.0f;
+        case AnisoRatio::Eight:
+            return 8.0f;
+        case AnisoRatio::Sixteen:
+            return 16.0f;
+        default:
+            UNREACHABLE();
+        }
+    }
 };
 
 } // namespace AmdGpu

src/video_core/renderer_vulkan/vk_instance.h

@@ -249,6 +249,11 @@ public:
         return properties.limits.maxSamplerLodBias;
     }
 
+    /// Returns the maximum sampler anisotropy.
+    float MaxSamplerAnisotropy() const {
+        return properties.limits.maxSamplerAnisotropy;
+    }
+
     /// Returns the maximum number of push descriptors.
     u32 MaxPushDescriptors() const {
         return push_descriptor_props.maxPushDescriptors;

src/video_core/renderer_vulkan/vk_platform.cpp

@@ -137,6 +137,7 @@ std::vector<const char*> GetInstanceExtensions(Frontend::WindowSystemType window
     // Add the windowing system specific extension
     std::vector<const char*> extensions;
     extensions.reserve(7);
+    extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME);
 
     switch (window_type) {
     case Frontend::WindowSystemType::Headless:
@@ -347,6 +348,17 @@ vk::UniqueInstance CreateInstance(Frontend::WindowSystemType window_type, bool e
             .valueCount = 1,
             .pValues = &enable_force_barriers,
         },
+#ifdef __APPLE__
+        // MoltenVK debug mode turns on additional device loss error details, so
+        // use the crash diagnostic setting as an indicator of whether to turn it on.
+        vk::LayerSettingEXT{
+            .pLayerName = "MoltenVK",
+            .pSettingName = "MVK_CONFIG_DEBUG",
+            .type = vk::LayerSettingTypeEXT::eBool32,
+            .valueCount = 1,
+            .pValues = &enable_crash_diagnostic,
+        }
+#endif
     };
 
     vk::StructureChain<vk::InstanceCreateInfo, vk::LayerSettingsCreateInfoEXT> instance_ci_chain = {

src/video_core/texture_cache/sampler.cpp

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
+#include "video_core/amdgpu/resource.h"
 #include "video_core/renderer_vulkan/liverpool_to_vk.h"
 #include "video_core/renderer_vulkan/vk_instance.h"
 #include "video_core/texture_cache/sampler.h"
@@ -12,6 +14,11 @@ Sampler::Sampler(const Vulkan::Instance& instance, const AmdGpu::Sampler& sample
         LOG_WARNING(Render_Vulkan, "Texture requires gamma correction");
     }
     using namespace Vulkan;
+    const bool anisotropyEnable = instance.IsAnisotropicFilteringSupported() &&
+                                  (AmdGpu::IsAnisoFilter(sampler.xy_mag_filter) ||
+                                   AmdGpu::IsAnisoFilter(sampler.xy_min_filter));
+    const float maxAnisotropy =
+        std::clamp(sampler.MaxAniso(), 1.0f, instance.MaxSamplerAnisotropy());
     const vk::SamplerCreateInfo sampler_ci = {
         .magFilter = LiverpoolToVK::Filter(sampler.xy_mag_filter),
         .minFilter = LiverpoolToVK::Filter(sampler.xy_min_filter),
@@ -20,6 +27,8 @@ Sampler::Sampler(const Vulkan::Instance& instance, const AmdGpu::Sampler& sample
         .addressModeV = LiverpoolToVK::ClampMode(sampler.clamp_y),
         .addressModeW = LiverpoolToVK::ClampMode(sampler.clamp_z),
         .mipLodBias = std::min(sampler.LodBias(), instance.MaxSamplerLodBias()),
+        .anisotropyEnable = anisotropyEnable,
+        .maxAnisotropy = maxAnisotropy,
         .compareEnable = sampler.depth_compare_func != AmdGpu::DepthCompare::Never,
         .compareOp = LiverpoolToVK::DepthCompare(sampler.depth_compare_func),
         .minLod = sampler.MinLod(),

src/video_core/texture_cache/tile_manager.cpp

@@ -25,6 +25,7 @@ static vk::Format DemoteImageFormatForDetiling(vk::Format format) {
     switch (format) {
     case vk::Format::eR8Uint:
     case vk::Format::eR8Unorm:
+    case vk::Format::eR8Snorm:
         return vk::Format::eR8Uint;
     case vk::Format::eR4G4B4A4UnormPack16:
     case vk::Format::eB5G6R5UnormPack16:
@@ -41,6 +42,7 @@ static vk::Format DemoteImageFormatForDetiling(vk::Format format) {
     case vk::Format::eR8G8B8A8Snorm:
     case vk::Format::eR8G8B8A8Uint:
     case vk::Format::eR32Sfloat:
+    case vk::Format::eD32Sfloat:
     case vk::Format::eR32Uint:
     case vk::Format::eR16G16Sfloat:
     case vk::Format::eR16G16Unorm: