mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-23 10:35:03 +00:00
Merge branch 'main' into qtsaves2
This commit is contained in:
commit
1a31c9e4dd
47
CMakePresets.json
Normal file
47
CMakePresets.json
Normal 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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -5,6 +5,7 @@ path = [
|
|||||||
"REUSE.toml",
|
"REUSE.toml",
|
||||||
"crowdin.yml",
|
"crowdin.yml",
|
||||||
"CMakeSettings.json",
|
"CMakeSettings.json",
|
||||||
|
"CMakePresets.json",
|
||||||
".github/FUNDING.yml",
|
".github/FUNDING.yml",
|
||||||
".github/shadps4.png",
|
".github/shadps4.png",
|
||||||
".github/workflows/scripts/update_translation.sh",
|
".github/workflows/scripts/update_translation.sh",
|
||||||
|
@ -1184,7 +1184,7 @@
|
|||||||
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%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>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -337,7 +337,7 @@
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>The update has been downloaded, press OK to install.</source>
|
<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>
|
||||||
<message>
|
<message>
|
||||||
<source>Failed to save the update file at</source>
|
<source>Failed to save the update file at</source>
|
||||||
@ -990,7 +990,7 @@
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>unmapped</source>
|
<source>unmapped</source>
|
||||||
<translation>Ikke satt opp</translation>
|
<translation>Ikke tildelt</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Left</source>
|
<source>Left</source>
|
||||||
@ -1184,7 +1184,7 @@
|
|||||||
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%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>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -1184,7 +1184,7 @@
|
|||||||
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%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>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -1138,7 +1138,7 @@
|
|||||||
</message>
|
</message>
|
||||||
<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>
|
<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>
|
||||||
<message>
|
<message>
|
||||||
<source>Copy values from Common Config</source>
|
<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:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%1</source>
|
||||||
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<translation>Невозможно привязать уникальный ввод более одного раза. Дублированные вводы назначены на следующие кнопки:
|
||||||
|
|
||||||
%1</translation>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -1184,7 +1184,7 @@
|
|||||||
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%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>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -1184,7 +1184,7 @@
|
|||||||
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<source>Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
||||||
|
|
||||||
%1</source>
|
%1</source>
|
||||||
<translation type="unfinished">Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons:
|
<translation>不能多次绑定任何同一输入。请重新映射以下按键的输入:
|
||||||
|
|
||||||
%1</translation>
|
%1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
Loading…
Reference in New Issue
Block a user