Merge branch 'main' into qtsaves2

This commit is contained in:
georgemoralis 2025-06-19 16:28:53 +03:00 committed by GitHub
commit 1a31c9e4dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 57 additions and 9 deletions

47
CMakePresets.json Normal file
View File

@ -0,0 +1,47 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 24,
"patch": 0
},
"configurePresets": [
{
"name": "x64-Clang-Debug",
"displayName": "Clang x64 Debug",
"generator": "Ninja",
"binaryDir": "${sourceDir}/Build/x64-Clang-Debug",
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/Install/x64-Clang-Debug"
}
},
{
"name": "x64-Clang-Release",
"displayName": "Clang x64 Release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/Build/x64-Clang-Release",
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl",
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/Install/x64-Clang-Release"
}
},
{
"name": "x64-Clang-RelWithDebInfo",
"displayName": "Clang x64 RelWithDebInfo",
"generator": "Ninja",
"binaryDir": "${sourceDir}/Build/x64-Clang-RelWithDebInfo",
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl",
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/Install/x64-Clang-RelWithDebInfo"
}
}
]
}

View File

@ -5,6 +5,7 @@ path = [
"REUSE.toml",
"crowdin.yml",
"CMakeSettings.json",
"CMakePresets.json",
".github/FUNDING.yml",
".github/shadps4.png",
".github/workflows/scripts/update_translation.sh",

View File

@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>No es pot assignar una entrada més d'una vegada. S'han assignat de manera duplicada pels següents botons:
%1</translation>
</message>

View File

@ -337,7 +337,7 @@
</message>
<message>
<source>The update has been downloaded, press OK to install.</source>
<translation>Oppdateringen ble lastet ned, trykk OK for å installere.</translation>
<translation>Oppdateringen er lastet ned, trykk OK for å installere.</translation>
</message>
<message>
<source>Failed to save the update file at</source>
@ -990,7 +990,7 @@
</message>
<message>
<source>unmapped</source>
<translation>Ikke satt opp</translation>
<translation>Ikke tildelt</translation>
</message>
<message>
<source>Left</source>
@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>Kan ikke tildele samme inndata mer enn én gang. Dupliserte inndata tildeles følgende taster:
%1</translation>
</message>

View File

@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>Não é possível atribuir a mesma entrada mais de uma vez. Entradas duplicadas foram atribuídas aos seguintes botões:
%1</translation>
</message>

View File

@ -1138,7 +1138,7 @@
</message>
<message>
<source>This button copies mappings from the Common Config to the currently selected profile, and cannot be used when the currently selected profile is the Common Config.</source>
<translation>Эта кнопка копирует настройки из общего конфига в текущий выбранный профиль, и не может быть использован, когда выбранный профиль это общий конфиг.</translation>
<translation>Эта кнопка копирует настройки из общего конфига в текущий выбранный профиль, и не может быть использован, когда выбранный профиль - это общий конфиг.</translation>
</message>
<message>
<source>Copy values from Common Config</source>
@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>Невозможно привязать уникальный ввод более одного раза. Дублированные вводы назначены на следующие кнопки:
%1</translation>
</message>

View File

@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>Det går inte att binda samma unika inmatning mer än en gång. Dubbla inmatningar har mappats till följande knappar:
%1</translation>
</message>

View File

@ -1184,7 +1184,7 @@
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
%1</source>
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
<translation>
%1</translation>
</message>