diff options
Diffstat (limited to 'src')
137 files changed, 5441 insertions, 2099 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 06e59d1ac..188ef9469 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -82,8 +82,8 @@ android { } val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE") - if (keystoreFile != null) { - signingConfigs { + signingConfigs { + if (keystoreFile != null) { create("release") { storeFile = file(keystoreFile) storePassword = System.getenv("ANDROID_KEYSTORE_PASS") @@ -91,6 +91,12 @@ android { keyPassword = System.getenv("ANDROID_KEYSTORE_PASS") } } + create("default") { + storeFile = file("$projectDir/debug.keystore") + storePassword = "android" + keyAlias = "androiddebugkey" + keyPassword = "android" + } } // Define build types, which are orthogonal to product flavors. @@ -101,7 +107,7 @@ android { signingConfig = if (keystoreFile != null) { signingConfigs.getByName("release") } else { - signingConfigs.getByName("debug") + signingConfigs.getByName("default") } resValue("string", "app_name_suffixed", "yuzu") @@ -118,7 +124,7 @@ android { register("relWithDebInfo") { isDefault = true resValue("string", "app_name_suffixed", "yuzu Debug Release") - signingConfig = signingConfigs.getByName("debug") + signingConfig = signingConfigs.getByName("default") isMinifyEnabled = true isDebuggable = true proguardFiles( @@ -133,6 +139,7 @@ android { // Signed by debug key disallowing distribution on Play Store. // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. debug { + signingConfig = signingConfigs.getByName("default") resValue("string", "app_name_suffixed", "yuzu Debug") isDebuggable = true isJniDebuggable = true diff --git a/src/android/app/debug.keystore b/src/android/app/debug.keystore Binary files differnew file mode 100644 index 000000000..e4e194af9 --- /dev/null +++ b/src/android/app/debug.keystore diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt index b7556e353..c408485c6 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt @@ -21,6 +21,9 @@ import org.yuzu.yuzu_emu.utils.DocumentsTree import org.yuzu.yuzu_emu.utils.FileUtil import org.yuzu.yuzu_emu.utils.Log import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable +import org.yuzu.yuzu_emu.model.InstallResult +import org.yuzu.yuzu_emu.model.Patch +import org.yuzu.yuzu_emu.model.GameVerificationResult /** * Class which contains methods that interact @@ -235,9 +238,12 @@ object NativeLibrary { /** * Installs a nsp or xci file to nand * @param filename String representation of file uri - * @param extension Lowercase string representation of file extension without "." + * @return int representation of [InstallResult] */ - external fun installFileToNand(filename: String, extension: String): Int + external fun installFileToNand( + filename: String, + callback: (max: Long, progress: Long) -> Boolean + ): Int external fun doesUpdateMatchProgram(programId: String, updatePath: String): Boolean @@ -535,9 +541,49 @@ object NativeLibrary { * * @param path Path to game file. Can be a [Uri]. * @param programId String representation of a game's program ID - * @return Array of pairs where the first value is the name of an addon and the second is the version + * @return Array of available patches */ - external fun getAddonsForFile(path: String, programId: String): Array<Pair<String, String>>? + external fun getPatchesForFile(path: String, programId: String): Array<Patch>? + + /** + * Removes an update for a given [programId] + * @param programId String representation of a game's program ID + */ + external fun removeUpdate(programId: String) + + /** + * Removes all DLC for a [programId] + * @param programId String representation of a game's program ID + */ + external fun removeDLC(programId: String) + + /** + * Removes a mod installed for a given [programId] + * @param programId String representation of a game's program ID + * @param name The name of a mod as given by [getPatchesForFile]. This corresponds with the name + * of the mod's directory in a game's load folder. + */ + external fun removeMod(programId: String, name: String) + + /** + * Verifies all installed content + * @param callback UI callback for verification progress. Return true in the callback to cancel. + * @return Array of content that failed verification. Successful if empty. + */ + external fun verifyInstalledContents( + callback: (max: Long, progress: Long) -> Boolean + ): Array<String> + + /** + * Verifies the contents of a game + * @param path String path to a game + * @param callback UI callback for verification progress. Return true in the callback to cancel. + * @return Int that is meant to be converted to a [GameVerificationResult] + */ + external fun verifyGameContents( + path: String, + callback: (max: Long, progress: Long) -> Boolean + ): Int /** * Gets the save location for a specific game @@ -609,15 +655,4 @@ object NativeLibrary { const val RELEASED = 0 const val PRESSED = 1 } - - /** - * Result from installFileToNand - */ - object InstallFileToNandResult { - const val Success = 0 - const val SuccessFileOverwritten = 1 - const val Error = 2 - const val ErrorBaseGame = 3 - const val ErrorFilenameExtension = 4 - } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt index 94c151325..ff254d9b7 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt @@ -6,27 +6,32 @@ package org.yuzu.yuzu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding -import org.yuzu.yuzu_emu.model.Addon +import org.yuzu.yuzu_emu.model.Patch +import org.yuzu.yuzu_emu.model.AddonViewModel import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder -class AddonAdapter : AbstractDiffAdapter<Addon, AddonAdapter.AddonViewHolder>() { +class AddonAdapter(val addonViewModel: AddonViewModel) : + AbstractDiffAdapter<Patch, AddonAdapter.AddonViewHolder>() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AddonViewHolder { ListItemAddonBinding.inflate(LayoutInflater.from(parent.context), parent, false) .also { return AddonViewHolder(it) } } inner class AddonViewHolder(val binding: ListItemAddonBinding) : - AbstractViewHolder<Addon>(binding) { - override fun bind(model: Addon) { + AbstractViewHolder<Patch>(binding) { + override fun bind(model: Patch) { binding.root.setOnClickListener { - binding.addonSwitch.isChecked = !binding.addonSwitch.isChecked + binding.addonCheckbox.isChecked = !binding.addonCheckbox.isChecked } - binding.title.text = model.title + binding.title.text = model.name binding.version.text = model.version - binding.addonSwitch.setOnCheckedChangeListener { _, checked -> + binding.addonCheckbox.setOnCheckedChangeListener { _, checked -> model.enabled = checked } - binding.addonSwitch.isChecked = model.enabled + binding.addonCheckbox.isChecked = model.enabled + binding.buttonDelete.setOnClickListener { + addonViewModel.setAddonToDelete(model) + } } } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt index e26c2e0ab..b4f4d950f 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt @@ -3,9 +3,6 @@ package org.yuzu.yuzu_emu.adapters -import android.content.Intent -import android.graphics.Bitmap -import android.graphics.drawable.LayerDrawable import android.net.Uri import android.text.TextUtils import android.view.LayoutInflater @@ -15,10 +12,6 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutManagerCompat -import androidx.core.content.res.ResourcesCompat -import androidx.core.graphics.drawable.IconCompat -import androidx.core.graphics.drawable.toBitmap -import androidx.core.graphics.drawable.toDrawable import androidx.documentfile.provider.DocumentFile import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -30,7 +23,6 @@ import kotlinx.coroutines.withContext import org.yuzu.yuzu_emu.HomeNavigationDirections import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.YuzuApplication -import org.yuzu.yuzu_emu.activities.EmulationActivity import org.yuzu.yuzu_emu.databinding.CardGameBinding import org.yuzu.yuzu_emu.model.Game import org.yuzu.yuzu_emu.model.GamesViewModel @@ -89,36 +81,13 @@ class GameAdapter(private val activity: AppCompatActivity) : ) .apply() - val openIntent = - Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply { - action = Intent.ACTION_VIEW - data = Uri.parse(game.path) - } - activity.lifecycleScope.launch { withContext(Dispatchers.IO) { - val layerDrawable = ResourcesCompat.getDrawable( - YuzuApplication.appContext.resources, - R.drawable.shortcut, - null - ) as LayerDrawable - layerDrawable.setDrawableByLayerId( - R.id.shortcut_foreground, - GameIconUtils.getGameIcon(activity, game) - .toDrawable(YuzuApplication.appContext.resources) - ) - val inset = YuzuApplication.appContext.resources - .getDimensionPixelSize(R.dimen.icon_inset) - layerDrawable.setLayerInset(1, inset, inset, inset, inset) val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, game.path) .setShortLabel(game.title) - .setIcon( - IconCompat.createWithAdaptiveBitmap( - layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888) - ) - ) - .setIntent(openIntent) + .setIcon(GameIconUtils.getShortcutIcon(activity, game)) + .setIntent(game.launchIntent) .build() ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut) } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt index 16fb87614..71be2d0b2 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt @@ -23,7 +23,8 @@ enum class IntSetting(override val key: String) : AbstractIntSetting { THEME("theme"), THEME_MODE("theme_mode"), OVERLAY_SCALE("control_scale"), - OVERLAY_OPACITY("control_opacity"); + OVERLAY_OPACITY("control_opacity"), + LOCK_DRAWER("lock_drawer"); override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt index 816336820..adb65812c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt @@ -74,7 +74,7 @@ class AddonsFragment : Fragment() { binding.listAddons.apply { layoutManager = LinearLayoutManager(requireContext()) - adapter = AddonAdapter() + adapter = AddonAdapter(addonViewModel) } viewLifecycleOwner.lifecycleScope.apply { @@ -110,6 +110,21 @@ class AddonsFragment : Fragment() { } } } + launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + addonViewModel.addonToDelete.collect { + if (it != null) { + MessageDialogFragment.newInstance( + requireActivity(), + titleId = R.string.confirm_uninstall, + descriptionId = R.string.confirm_uninstall_description, + positiveAction = { addonViewModel.onDeleteAddon(it) } + ).show(parentFragmentManager, MessageDialogFragment.TAG) + addonViewModel.setAddonToDelete(null) + } + } + } + } } binding.buttonInstall.setOnClickListener { @@ -156,22 +171,22 @@ class AddonsFragment : Fragment() { descriptionId = R.string.invalid_directory_description ) if (isValid) { - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.installing_game_content, false - ) { + ) { progressCallback, _ -> val parentDirectoryName = externalAddonDirectory.name val internalAddonDirectory = File(args.game.addonDir + parentDirectoryName) try { - externalAddonDirectory.copyFilesTo(internalAddonDirectory) + externalAddonDirectory.copyFilesTo(internalAddonDirectory, progressCallback) } catch (_: Exception) { return@newInstance errorMessage } addonViewModel.refreshAddons() return@newInstance getString(R.string.addon_installed_successfully) - }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(parentFragmentManager, ProgressDialogFragment.TAG) } else { errorMessage.show(parentFragmentManager, MessageDialogFragment.TAG) } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt index 9dabb9c41..bf017cd7c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt @@ -75,7 +75,7 @@ class DriverManagerFragment : Fragment() { driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global) binding.toolbarDrivers.setOnMenuItemClickListener { when (it.itemId) { - R.id.menu_driver_clear -> { + R.id.menu_driver_use_global -> { StringSetting.DRIVER_PATH.global = true driverViewModel.updateDriverList() (binding.listDrivers.adapter as DriverAdapter) @@ -93,7 +93,7 @@ class DriverManagerFragment : Fragment() { repeatOnLifecycle(Lifecycle.State.STARTED) { driverViewModel.showClearButton.collect { binding.toolbarDrivers.menu - .findItem(R.id.menu_driver_clear).isVisible = it + .findItem(R.id.menu_driver_use_global).isVisible = it } } } @@ -173,11 +173,11 @@ class DriverManagerFragment : Fragment() { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.installing_driver, false - ) { + ) { _, _ -> val driverPath = "${GpuDriverHelper.driverStoragePath}${FileUtil.getFilename(result)}" val driverFile = File(driverPath) @@ -213,6 +213,6 @@ class DriverManagerFragment : Fragment() { } } return@newInstance Any() - }.show(childFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(childFragmentManager, ProgressDialogFragment.TAG) } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt index 47767454a..2a97ae14d 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt @@ -182,11 +182,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { } override fun onDrawerOpened(drawerView: View) { - // No op + binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) } override fun onDrawerClosed(drawerView: View) { - // No op + binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt()) } override fun onDrawerStateChanged(newState: Int) { @@ -196,6 +196,28 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text = game.title + + binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply { + val lockMode = IntSetting.LOCK_DRAWER.getInt() + val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) { + R.string.unlock_drawer + } else { + R.string.lock_drawer + } + val iconId = if (lockMode == DrawerLayout.LOCK_MODE_UNLOCKED) { + R.drawable.ic_unlock + } else { + R.drawable.ic_lock + } + + title = getString(titleId) + icon = ResourcesCompat.getDrawable( + resources, + iconId, + requireContext().theme + ) + } + binding.inGameMenu.setNavigationItemSelectedListener { when (it.itemId) { R.id.menu_pause_emulation -> { @@ -242,6 +264,32 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { true } + R.id.menu_lock_drawer -> { + when (IntSetting.LOCK_DRAWER.getInt()) { + DrawerLayout.LOCK_MODE_UNLOCKED -> { + IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) + it.title = resources.getString(R.string.unlock_drawer) + it.icon = ResourcesCompat.getDrawable( + resources, + R.drawable.ic_lock, + requireContext().theme + ) + } + + DrawerLayout.LOCK_MODE_LOCKED_CLOSED -> { + IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_UNLOCKED) + it.title = resources.getString(R.string.lock_drawer) + it.icon = ResourcesCompat.getDrawable( + resources, + R.drawable.ic_unlock, + requireContext().theme + ) + } + } + NativeConfig.saveGlobalConfig() + true + } + R.id.menu_exit -> { emulationState.stop() emulationViewModel.setIsEmulationStopping(true) @@ -326,7 +374,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { repeatOnLifecycle(Lifecycle.State.CREATED) { emulationViewModel.emulationStarted.collectLatest { if (it) { - binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) + binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt()) ViewUtils.showView(binding.surfaceInputOverlay) ViewUtils.hideView(binding.loadingIndicator) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt index fa2a4c9f9..5aa3f453f 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt @@ -21,8 +21,10 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import com.google.android.material.transition.MaterialSharedAxis +import org.yuzu.yuzu_emu.NativeLibrary import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding +import org.yuzu.yuzu_emu.model.GameVerificationResult import org.yuzu.yuzu_emu.model.HomeViewModel import org.yuzu.yuzu_emu.utils.GameMetadata @@ -101,6 +103,38 @@ class GameInfoFragment : Fragment() { """.trimIndent() copyToClipboard(args.game.title, details) } + + buttonVerifyIntegrity.setOnClickListener { + ProgressDialogFragment.newInstance( + requireActivity(), + R.string.verifying, + true + ) { progressCallback, _ -> + val result = GameVerificationResult.from( + NativeLibrary.verifyGameContents( + args.game.path, + progressCallback + ) + ) + return@newInstance when (result) { + GameVerificationResult.Success -> + MessageDialogFragment.newInstance( + titleId = R.string.verify_success, + descriptionId = R.string.operation_completed_successfully + ) + GameVerificationResult.Failed -> + MessageDialogFragment.newInstance( + titleId = R.string.verify_failure, + descriptionId = R.string.verify_failure_description + ) + GameVerificationResult.NotImplemented -> + MessageDialogFragment.newInstance( + titleId = R.string.verify_no_result, + descriptionId = R.string.verify_no_result_description + ) + } + }.show(parentFragmentManager, ProgressDialogFragment.TAG) + } } setInsets() diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt index b04d1208f..582df0133 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt @@ -4,6 +4,8 @@ package org.yuzu.yuzu_emu.fragments import android.annotation.SuppressLint +import android.content.pm.ShortcutInfo +import android.content.pm.ShortcutManager import android.os.Bundle import android.text.TextUtils import android.view.LayoutInflater @@ -44,7 +46,6 @@ import org.yuzu.yuzu_emu.utils.FileUtil import org.yuzu.yuzu_emu.utils.GameIconUtils import org.yuzu.yuzu_emu.utils.GpuDriverHelper import org.yuzu.yuzu_emu.utils.MemoryUtil -import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.io.File @@ -85,6 +86,24 @@ class GamePropertiesFragment : Fragment() { view.findNavController().popBackStack() } + val shortcutManager = requireActivity().getSystemService(ShortcutManager::class.java) + binding.buttonShortcut.isEnabled = shortcutManager.isRequestPinShortcutSupported + binding.buttonShortcut.setOnClickListener { + viewLifecycleOwner.lifecycleScope.launch { + withContext(Dispatchers.IO) { + val shortcut = ShortcutInfo.Builder(requireContext(), args.game.title) + .setShortLabel(args.game.title) + .setIcon( + GameIconUtils.getShortcutIcon(requireActivity(), args.game) + .toIcon(requireContext()) + ) + .setIntent(args.game.launchIntent) + .build() + shortcutManager.requestPinShortcut(shortcut, null) + } + } + } + GameIconUtils.loadGameIcon(args.game, binding.imageGameScreen) binding.title.text = args.game.title binding.title.postDelayed( @@ -357,27 +376,17 @@ class GamePropertiesFragment : Fragment() { return@registerForActivityResult } - val inputZip = requireContext().contentResolver.openInputStream(result) val savesFolder = File(args.game.saveDir) val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/") cacheSaveDir.mkdir() - if (inputZip == null) { - Toast.makeText( - YuzuApplication.appContext, - getString(R.string.fatal_error), - Toast.LENGTH_LONG - ).show() - return@registerForActivityResult - } - - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.save_files_importing, false - ) { + ) { _, _ -> try { - FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir) + FileUtil.unzipToInternalStorage(result.toString(), cacheSaveDir) val files = cacheSaveDir.listFiles() var savesFolderFile: File? = null if (files != null) { @@ -422,7 +431,7 @@ class GamePropertiesFragment : Fragment() { Toast.LENGTH_LONG ).show() } - }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(parentFragmentManager, ProgressDialogFragment.TAG) } /** @@ -436,11 +445,11 @@ class GamePropertiesFragment : Fragment() { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.save_files_exporting, false - ) { + ) { _, _ -> val saveLocation = args.game.saveDir val zipResult = FileUtil.zipFromInternalStorage( File(saveLocation), @@ -452,6 +461,6 @@ class GamePropertiesFragment : Fragment() { TaskState.Completed -> getString(R.string.export_success) TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed) } - }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(parentFragmentManager, ProgressDialogFragment.TAG) } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt index 6ddd758e6..aefae2938 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt @@ -32,6 +32,7 @@ import org.yuzu.yuzu_emu.BuildConfig import org.yuzu.yuzu_emu.HomeNavigationDirections import org.yuzu.yuzu_emu.NativeLibrary import org.yuzu.yuzu_emu.R +import org.yuzu.yuzu_emu.YuzuApplication import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding import org.yuzu.yuzu_emu.features.DocumentProvider @@ -142,6 +143,38 @@ class HomeSettingsFragment : Fragment() { ) add( HomeSetting( + R.string.verify_installed_content, + R.string.verify_installed_content_description, + R.drawable.ic_check_circle, + { + ProgressDialogFragment.newInstance( + requireActivity(), + titleId = R.string.verifying, + cancellable = true + ) { progressCallback, _ -> + val result = NativeLibrary.verifyInstalledContents(progressCallback) + return@newInstance if (result.isEmpty()) { + MessageDialogFragment.newInstance( + titleId = R.string.verify_success, + descriptionId = R.string.operation_completed_successfully + ) + } else { + val failedNames = result.joinToString("\n") + val errorMessage = YuzuApplication.appContext.getString( + R.string.verification_failed_for, + failedNames + ) + MessageDialogFragment.newInstance( + titleId = R.string.verify_failure, + descriptionString = errorMessage + ) + } + }.show(parentFragmentManager, ProgressDialogFragment.TAG) + } + ) + ) + add( + HomeSetting( R.string.share_log, R.string.share_log_description, R.drawable.ic_log, diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt index 5b4bf2c9f..7df8e6bf4 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt @@ -34,7 +34,6 @@ import org.yuzu.yuzu_emu.model.TaskState import org.yuzu.yuzu_emu.ui.main.MainActivity import org.yuzu.yuzu_emu.utils.DirectoryInitialization import org.yuzu.yuzu_emu.utils.FileUtil -import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.io.File import java.math.BigInteger @@ -195,26 +194,20 @@ class InstallableFragment : Fragment() { return@registerForActivityResult } - val inputZip = requireContext().contentResolver.openInputStream(result) val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/") cacheSaveDir.mkdir() - if (inputZip == null) { - Toast.makeText( - YuzuApplication.appContext, - getString(R.string.fatal_error), - Toast.LENGTH_LONG - ).show() - return@registerForActivityResult - } - - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.save_files_importing, false - ) { + ) { progressCallback, _ -> try { - FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir) + FileUtil.unzipToInternalStorage( + result.toString(), + cacheSaveDir, + progressCallback + ) val files = cacheSaveDir.listFiles() var successfulImports = 0 var failedImports = 0 @@ -287,7 +280,7 @@ class InstallableFragment : Fragment() { Toast.LENGTH_LONG ).show() } - }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(parentFragmentManager, ProgressDialogFragment.TAG) } private val exportSaves = registerForActivityResult( @@ -297,11 +290,11 @@ class InstallableFragment : Fragment() { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( requireActivity(), R.string.save_files_exporting, false - ) { + ) { _, _ -> val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/") cacheSaveDir.mkdir() @@ -338,6 +331,6 @@ class InstallableFragment : Fragment() { TaskState.Completed -> getString(R.string.export_success) TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed) } - }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(parentFragmentManager, ProgressDialogFragment.TAG) } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt index 32062b6fe..620d8db7c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt @@ -69,7 +69,7 @@ class MessageDialogFragment : DialogFragment() { private const val HELP_LINK = "Link" fun newInstance( - activity: FragmentActivity, + activity: FragmentActivity? = null, titleId: Int = 0, titleString: String = "", descriptionId: Int = 0, @@ -86,9 +86,11 @@ class MessageDialogFragment : DialogFragment() { putString(DESCRIPTION_STRING, descriptionString) putInt(HELP_LINK, helpLinkId) } - ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply { - clear() - this.positiveAction = positiveAction + if (activity != null) { + ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply { + clear() + this.positiveAction = positiveAction + } } dialog.arguments = bundle return dialog diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ProgressDialogFragment.kt index 8847e5531..d201cb80c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ProgressDialogFragment.kt @@ -23,11 +23,13 @@ import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding import org.yuzu.yuzu_emu.model.TaskViewModel -class IndeterminateProgressDialogFragment : DialogFragment() { +class ProgressDialogFragment : DialogFragment() { private val taskViewModel: TaskViewModel by activityViewModels() private lateinit var binding: DialogProgressBarBinding + private val PROGRESS_BAR_RESOLUTION = 1000 + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val titleId = requireArguments().getInt(TITLE) val cancellable = requireArguments().getBoolean(CANCELLABLE) @@ -61,6 +63,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + binding.message.isSelected = true viewLifecycleOwner.lifecycleScope.apply { launch { repeatOnLifecycle(Lifecycle.State.CREATED) { @@ -97,6 +100,35 @@ class IndeterminateProgressDialogFragment : DialogFragment() { } } } + launch { + repeatOnLifecycle(Lifecycle.State.CREATED) { + taskViewModel.progress.collect { + if (it != 0.0) { + binding.progressBar.apply { + isIndeterminate = false + progress = ( + (it / taskViewModel.maxProgress.value) * + PROGRESS_BAR_RESOLUTION + ).toInt() + min = 0 + max = PROGRESS_BAR_RESOLUTION + } + } + } + } + } + launch { + repeatOnLifecycle(Lifecycle.State.CREATED) { + taskViewModel.message.collect { + if (it.isEmpty()) { + binding.message.visibility = View.GONE + } else { + binding.message.visibility = View.VISIBLE + binding.message.text = it + } + } + } + } } } @@ -108,6 +140,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() { val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE) negativeButton.setOnClickListener { alertDialog.setTitle(getString(R.string.cancelling)) + binding.progressBar.isIndeterminate = true taskViewModel.setCancelled(true) } } @@ -122,9 +155,12 @@ class IndeterminateProgressDialogFragment : DialogFragment() { activity: FragmentActivity, titleId: Int, cancellable: Boolean = false, - task: suspend () -> Any - ): IndeterminateProgressDialogFragment { - val dialog = IndeterminateProgressDialogFragment() + task: suspend ( + progressCallback: (max: Long, progress: Long) -> Boolean, + messageCallback: (message: String) -> Unit + ) -> Any + ): ProgressDialogFragment { + val dialog = ProgressDialogFragment() val args = Bundle() ViewModelProvider(activity)[TaskViewModel::class.java].task = task args.putInt(TITLE, titleId) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt index 64b295fbd..20b10b1a0 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt @@ -136,14 +136,14 @@ class SearchFragment : Fragment() { baseList.filter { val lastPlayedTime = preferences.getLong(it.keyLastPlayedTime, 0L) lastPlayedTime > (System.currentTimeMillis() - 24 * 60 * 60 * 1000) - } + }.sortedByDescending { preferences.getLong(it.keyLastPlayedTime, 0L) } } R.id.chip_recently_added -> { baseList.filter { val addedTime = preferences.getLong(it.keyAddedToLibraryTime, 0L) addedTime > (System.currentTimeMillis() - 24 * 60 * 60 * 1000) - } + }.sortedByDescending { preferences.getLong(it.keyAddedToLibraryTime, 0L) } } R.id.chip_homebrew -> baseList.filter { it.isHomebrew } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt deleted file mode 100644 index ed79a8b02..000000000 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.yuzu.yuzu_emu.model - -data class Addon( - var enabled: Boolean, - val title: String, - val version: String -) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt index 075252f5b..b9c8e49ca 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt @@ -15,8 +15,8 @@ import org.yuzu.yuzu_emu.utils.NativeConfig import java.util.concurrent.atomic.AtomicBoolean class AddonViewModel : ViewModel() { - private val _addonList = MutableStateFlow(mutableListOf<Addon>()) - val addonList get() = _addonList.asStateFlow() + private val _patchList = MutableStateFlow(mutableListOf<Patch>()) + val addonList get() = _patchList.asStateFlow() private val _showModInstallPicker = MutableStateFlow(false) val showModInstallPicker get() = _showModInstallPicker.asStateFlow() @@ -24,6 +24,9 @@ class AddonViewModel : ViewModel() { private val _showModNoticeDialog = MutableStateFlow(false) val showModNoticeDialog get() = _showModNoticeDialog.asStateFlow() + private val _addonToDelete = MutableStateFlow<Patch?>(null) + val addonToDelete = _addonToDelete.asStateFlow() + var game: Game? = null private val isRefreshing = AtomicBoolean(false) @@ -40,36 +43,47 @@ class AddonViewModel : ViewModel() { isRefreshing.set(true) viewModelScope.launch { withContext(Dispatchers.IO) { - val addonList = mutableListOf<Addon>() - val disabledAddons = NativeConfig.getDisabledAddons(game!!.programId) - NativeLibrary.getAddonsForFile(game!!.path, game!!.programId)?.forEach { - val name = it.first.replace("[D] ", "") - addonList.add(Addon(!disabledAddons.contains(name), name, it.second)) - } - addonList.sortBy { it.title } - _addonList.value = addonList + val patchList = ( + NativeLibrary.getPatchesForFile(game!!.path, game!!.programId) + ?: emptyArray() + ).toMutableList() + patchList.sortBy { it.name } + _patchList.value = patchList isRefreshing.set(false) } } } + fun setAddonToDelete(patch: Patch?) { + _addonToDelete.value = patch + } + + fun onDeleteAddon(patch: Patch) { + when (PatchType.from(patch.type)) { + PatchType.Update -> NativeLibrary.removeUpdate(patch.programId) + PatchType.DLC -> NativeLibrary.removeDLC(patch.programId) + PatchType.Mod -> NativeLibrary.removeMod(patch.programId, patch.name) + } + refreshAddons() + } + fun onCloseAddons() { - if (_addonList.value.isEmpty()) { + if (_patchList.value.isEmpty()) { return } NativeConfig.setDisabledAddons( game!!.programId, - _addonList.value.mapNotNull { + _patchList.value.mapNotNull { if (it.enabled) { null } else { - it.title + it.name } }.toTypedArray() ) NativeConfig.saveGlobalConfig() - _addonList.value.clear() + _patchList.value.clear() game = null } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt index f1ea1e20f..c8a4a2d17 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt @@ -3,6 +3,7 @@ package org.yuzu.yuzu_emu.model +import android.content.Intent import android.net.Uri import android.os.Parcelable import java.util.HashSet @@ -11,6 +12,7 @@ import kotlinx.serialization.Serializable import org.yuzu.yuzu_emu.NativeLibrary import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.YuzuApplication +import org.yuzu.yuzu_emu.activities.EmulationActivity import org.yuzu.yuzu_emu.utils.DirectoryInitialization import org.yuzu.yuzu_emu.utils.FileUtil import java.time.LocalDateTime @@ -61,6 +63,12 @@ class Game( val addonDir: String get() = DirectoryInitialization.userDirectory + "/load/" + programIdHex + "/" + val launchIntent: Intent + get() = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply { + action = Intent.ACTION_VIEW + data = Uri.parse(path) + } + override fun equals(other: Any?): Boolean { if (other !is Game) { return false diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt new file mode 100644 index 000000000..804637fb8 --- /dev/null +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt @@ -0,0 +1,15 @@ +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.yuzu.yuzu_emu.model + +enum class GameVerificationResult(val int: Int) { + Success(0), + Failed(1), + NotImplemented(2); + + companion object { + fun from(int: Int): GameVerificationResult = + entries.firstOrNull { it.int == int } ?: Success + } +} diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt new file mode 100644 index 000000000..0c3cd0521 --- /dev/null +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt @@ -0,0 +1,15 @@ +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.yuzu.yuzu_emu.model + +enum class InstallResult(val int: Int) { + Success(0), + Overwrite(1), + Failure(2), + BaseInstallAttempted(3); + + companion object { + fun from(int: Int): InstallResult = entries.firstOrNull { it.int == int } ?: Success + } +} diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt new file mode 100644 index 000000000..25cb9e365 --- /dev/null +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt @@ -0,0 +1,16 @@ +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.yuzu.yuzu_emu.model + +import androidx.annotation.Keep + +@Keep +data class Patch( + var enabled: Boolean, + val name: String, + val version: String, + val type: Int, + val programId: String, + val titleId: String +) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt new file mode 100644 index 000000000..e9a54162b --- /dev/null +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.yuzu.yuzu_emu.model + +enum class PatchType(val int: Int) { + Update(0), + DLC(1), + Mod(2); + + companion object { + fun from(int: Int): PatchType = entries.firstOrNull { it.int == int } ?: Update + } +} diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt index e59c95733..4361eb972 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt @@ -8,6 +8,7 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch class TaskViewModel : ViewModel() { @@ -23,13 +24,28 @@ class TaskViewModel : ViewModel() { val cancelled: StateFlow<Boolean> get() = _cancelled private val _cancelled = MutableStateFlow(false) - lateinit var task: suspend () -> Any + private val _progress = MutableStateFlow(0.0) + val progress = _progress.asStateFlow() + + private val _maxProgress = MutableStateFlow(0.0) + val maxProgress = _maxProgress.asStateFlow() + + private val _message = MutableStateFlow("") + val message = _message.asStateFlow() + + lateinit var task: suspend ( + progressCallback: (max: Long, progress: Long) -> Boolean, + messageCallback: (message: String) -> Unit + ) -> Any fun clear() { _result.value = Any() _isComplete.value = false _isRunning.value = false _cancelled.value = false + _progress.value = 0.0 + _maxProgress.value = 0.0 + _message.value = "" } fun setCancelled(value: Boolean) { @@ -43,7 +59,16 @@ class TaskViewModel : ViewModel() { _isRunning.value = true viewModelScope.launch(Dispatchers.IO) { - val res = task() + val res = task( + { max, progress -> + _maxProgress.value = max.toDouble() + _progress.value = progress.toDouble() + return@task cancelled.value + }, + { message -> + _message.value = message + } + ) _result.value = res _isComplete.value = true _isRunning.value = false diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index 644289e25..c2cc29961 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt @@ -38,12 +38,13 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity import org.yuzu.yuzu_emu.databinding.ActivityMainBinding import org.yuzu.yuzu_emu.features.settings.model.Settings import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment -import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment +import org.yuzu.yuzu_emu.fragments.ProgressDialogFragment import org.yuzu.yuzu_emu.fragments.MessageDialogFragment import org.yuzu.yuzu_emu.model.AddonViewModel import org.yuzu.yuzu_emu.model.DriverViewModel import org.yuzu.yuzu_emu.model.GamesViewModel import org.yuzu.yuzu_emu.model.HomeViewModel +import org.yuzu.yuzu_emu.model.InstallResult import org.yuzu.yuzu_emu.model.TaskState import org.yuzu.yuzu_emu.model.TaskViewModel import org.yuzu.yuzu_emu.utils.* @@ -369,26 +370,23 @@ class MainActivity : AppCompatActivity(), ThemeProvider { return@registerForActivityResult } - val inputZip = contentResolver.openInputStream(result) - if (inputZip == null) { - Toast.makeText( - applicationContext, - getString(R.string.fatal_error), - Toast.LENGTH_LONG - ).show() - return@registerForActivityResult - } - val filterNCA = FilenameFilter { _, dirName -> dirName.endsWith(".nca") } val firmwarePath = File(DirectoryInitialization.userDirectory + "/nand/system/Contents/registered/") val cacheFirmwareDir = File("${cacheDir.path}/registered/") - val task: () -> Any = { + ProgressDialogFragment.newInstance( + this, + R.string.firmware_installing + ) { progressCallback, _ -> var messageToShow: Any try { - FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir) + FileUtil.unzipToInternalStorage( + result.toString(), + cacheFirmwareDir, + progressCallback + ) val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1 val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2 messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) { @@ -404,18 +402,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider { getString(R.string.save_file_imported_success) } } catch (e: Exception) { + Log.error("[MainActivity] Firmware install failed - ${e.message}") messageToShow = getString(R.string.fatal_error) } finally { cacheFirmwareDir.deleteRecursively() } messageToShow - } - - IndeterminateProgressDialogFragment.newInstance( - this, - R.string.firmware_installing, - task = task - ).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(supportFragmentManager, ProgressDialogFragment.TAG) } val getAmiiboKey = @@ -474,11 +467,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( this@MainActivity, R.string.verifying_content, false - ) { + ) { _, _ -> var updatesMatchProgram = true for (document in documents) { val valid = NativeLibrary.doesUpdateMatchProgram( @@ -501,44 +494,42 @@ class MainActivity : AppCompatActivity(), ThemeProvider { positiveAction = { homeViewModel.setContentToInstall(documents) } ) } - }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(supportFragmentManager, ProgressDialogFragment.TAG) } private fun installContent(documents: List<Uri>) { - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( this@MainActivity, R.string.installing_game_content - ) { + ) { progressCallback, messageCallback -> var installSuccess = 0 var installOverwrite = 0 var errorBaseGame = 0 - var errorExtension = 0 - var errorOther = 0 + var error = 0 documents.forEach { + messageCallback.invoke(FileUtil.getFilename(it)) when ( - NativeLibrary.installFileToNand( - it.toString(), - FileUtil.getExtension(it) + InstallResult.from( + NativeLibrary.installFileToNand( + it.toString(), + progressCallback + ) ) ) { - NativeLibrary.InstallFileToNandResult.Success -> { + InstallResult.Success -> { installSuccess += 1 } - NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> { + InstallResult.Overwrite -> { installOverwrite += 1 } - NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> { + InstallResult.BaseInstallAttempted -> { errorBaseGame += 1 } - NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> { - errorExtension += 1 - } - - else -> { - errorOther += 1 + InstallResult.Failure -> { + error += 1 } } } @@ -565,7 +556,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider { ) installResult.append(separator) } - val errorTotal: Int = errorBaseGame + errorExtension + errorOther + val errorTotal: Int = errorBaseGame + error if (errorTotal > 0) { installResult.append(separator) installResult.append( @@ -582,14 +573,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider { ) installResult.append(separator) } - if (errorExtension > 0) { - installResult.append(separator) - installResult.append( - getString(R.string.install_game_content_failure_file_extension) - ) - installResult.append(separator) - } - if (errorOther > 0) { + if (error > 0) { installResult.append( getString(R.string.install_game_content_failure_description) ) @@ -608,7 +592,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider { descriptionString = installResult.toString().trim() ) } - }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(supportFragmentManager, ProgressDialogFragment.TAG) } val exportUserData = registerForActivityResult( @@ -618,16 +602,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( this, R.string.exporting_user_data, true - ) { + ) { progressCallback, _ -> val zipResult = FileUtil.zipFromInternalStorage( File(DirectoryInitialization.userDirectory!!), DirectoryInitialization.userDirectory!!, BufferedOutputStream(contentResolver.openOutputStream(result)), - taskViewModel.cancelled, + progressCallback, compression = false ) return@newInstance when (zipResult) { @@ -635,7 +619,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider { TaskState.Failed -> R.string.export_failed TaskState.Cancelled -> R.string.user_data_export_cancelled } - }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(supportFragmentManager, ProgressDialogFragment.TAG) } val importUserData = @@ -644,10 +628,10 @@ class MainActivity : AppCompatActivity(), ThemeProvider { return@registerForActivityResult } - IndeterminateProgressDialogFragment.newInstance( + ProgressDialogFragment.newInstance( this, R.string.importing_user_data - ) { + ) { progressCallback, _ -> val checkStream = ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result))) var isYuzuBackup = false @@ -676,8 +660,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider { // Copy archive to internal storage try { FileUtil.unzipToInternalStorage( - BufferedInputStream(contentResolver.openInputStream(result)), - File(DirectoryInitialization.userDirectory!!) + result.toString(), + File(DirectoryInitialization.userDirectory!!), + progressCallback ) } catch (e: Exception) { return@newInstance MessageDialogFragment.newInstance( @@ -694,6 +679,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider { driverViewModel.reloadDriverData() return@newInstance getString(R.string.user_data_import_success) - }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG) + }.show(supportFragmentManager, ProgressDialogFragment.TAG) } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt index b54a19c65..fc2339f5a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt @@ -7,7 +7,6 @@ import android.database.Cursor import android.net.Uri import android.provider.DocumentsContract import androidx.documentfile.provider.DocumentFile -import kotlinx.coroutines.flow.StateFlow import java.io.BufferedInputStream import java.io.File import java.io.IOException @@ -19,6 +18,7 @@ import org.yuzu.yuzu_emu.YuzuApplication import org.yuzu.yuzu_emu.model.MinimalDocumentFile import org.yuzu.yuzu_emu.model.TaskState import java.io.BufferedOutputStream +import java.io.OutputStream import java.lang.NullPointerException import java.nio.charset.StandardCharsets import java.util.zip.Deflater @@ -283,12 +283,34 @@ object FileUtil { /** * Extracts the given zip file into the given directory. + * @param path String representation of a [Uri] or a typical path delimited by '/' + * @param destDir Location to unzip the contents of [path] into + * @param progressCallback Lambda that is called with the total number of files and the current + * progress through the process. Stops execution as soon as possible if this returns true. */ @Throws(SecurityException::class) - fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) { - ZipInputStream(zipStream).use { zis -> + fun unzipToInternalStorage( + path: String, + destDir: File, + progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false } + ) { + var totalEntries = 0L + ZipInputStream(getInputStream(path)).use { zis -> + var tempEntry = zis.nextEntry + while (tempEntry != null) { + tempEntry = zis.nextEntry + totalEntries++ + } + } + + var progress = 0L + ZipInputStream(getInputStream(path)).use { zis -> var entry: ZipEntry? = zis.nextEntry while (entry != null) { + if (progressCallback.invoke(totalEntries, progress)) { + return@use + } + val newFile = File(destDir, entry.name) val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile @@ -304,6 +326,7 @@ object FileUtil { newFile.outputStream().use { fos -> zis.copyTo(fos) } } entry = zis.nextEntry + progress++ } } } @@ -313,14 +336,15 @@ object FileUtil { * @param inputFile File representation of the item that will be zipped * @param rootDir Directory containing the inputFile * @param outputStream Stream where the zip file will be output - * @param cancelled [StateFlow] that reports whether this process has been cancelled + * @param progressCallback Lambda that is called with the total number of files and the current + * progress through the process. Stops execution as soon as possible if this returns true. * @param compression Disables compression if true */ fun zipFromInternalStorage( inputFile: File, rootDir: String, outputStream: BufferedOutputStream, - cancelled: StateFlow<Boolean>? = null, + progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false }, compression: Boolean = true ): TaskState { try { @@ -330,8 +354,10 @@ object FileUtil { zos.setLevel(Deflater.NO_COMPRESSION) } + var count = 0L + val totalFiles = inputFile.walkTopDown().count().toLong() inputFile.walkTopDown().forEach { file -> - if (cancelled?.value == true) { + if (progressCallback.invoke(totalFiles, count)) { return TaskState.Cancelled } @@ -343,6 +369,7 @@ object FileUtil { if (file.isFile) { file.inputStream().use { fis -> fis.copyTo(zos) } } + count++ } } } @@ -356,9 +383,14 @@ object FileUtil { /** * Helper function that copies the contents of a DocumentFile folder into a [File] * @param file [File] representation of the folder to copy into + * @param progressCallback Lambda that is called with the total number of files and the current + * progress through the process. Stops execution as soon as possible if this returns true. * @throws IllegalStateException Fails when trying to copy a folder into a file and vice versa */ - fun DocumentFile.copyFilesTo(file: File) { + fun DocumentFile.copyFilesTo( + file: File, + progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false } + ) { file.mkdirs() if (!this.isDirectory || !file.isDirectory) { throw IllegalStateException( @@ -366,7 +398,13 @@ object FileUtil { ) } + var count = 0L + val totalFiles = this.listFiles().size.toLong() this.listFiles().forEach { + if (progressCallback.invoke(totalFiles, count)) { + return + } + val newFile = File(file, it.name!!) if (it.isDirectory) { newFile.mkdirs() @@ -381,6 +419,7 @@ object FileUtil { newFile.outputStream().use { os -> bos.copyTo(os) } } } + count++ } } @@ -427,6 +466,18 @@ object FileUtil { } } + fun getInputStream(path: String) = if (path.contains("content://")) { + Uri.parse(path).inputStream() + } else { + File(path).inputStream() + } + + fun getOutputStream(path: String) = if (path.contains("content://")) { + Uri.parse(path).outputStream() + } else { + File(path).outputStream() + } + @Throws(IOException::class) fun getStringFromFile(file: File): String = String(file.readBytes(), StandardCharsets.UTF_8) @@ -434,4 +485,19 @@ object FileUtil { @Throws(IOException::class) fun getStringFromInputStream(stream: InputStream): String = String(stream.readBytes(), StandardCharsets.UTF_8) + + fun DocumentFile.inputStream(): InputStream = + YuzuApplication.appContext.contentResolver.openInputStream(uri)!! + + fun DocumentFile.outputStream(): OutputStream = + YuzuApplication.appContext.contentResolver.openOutputStream(uri)!! + + fun Uri.inputStream(): InputStream = + YuzuApplication.appContext.contentResolver.openInputStream(this)!! + + fun Uri.outputStream(): OutputStream = + YuzuApplication.appContext.contentResolver.openOutputStream(this)!! + + fun Uri.asDocumentFile(): DocumentFile? = + DocumentFile.fromSingleUri(YuzuApplication.appContext, this) } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt index 2e9b0beb8..d05020560 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt @@ -5,7 +5,10 @@ package org.yuzu.yuzu_emu.utils import android.graphics.Bitmap import android.graphics.BitmapFactory +import android.graphics.drawable.LayerDrawable import android.widget.ImageView +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.drawable.IconCompat import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable import androidx.lifecycle.LifecycleOwner @@ -85,4 +88,22 @@ object GameIconUtils { return imageLoader.execute(request) .drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888) } + + suspend fun getShortcutIcon(lifecycleOwner: LifecycleOwner, game: Game): IconCompat { + val layerDrawable = ResourcesCompat.getDrawable( + YuzuApplication.appContext.resources, + R.drawable.shortcut, + null + ) as LayerDrawable + layerDrawable.setDrawableByLayerId( + R.id.shortcut_foreground, + getGameIcon(lifecycleOwner, game).toDrawable(YuzuApplication.appContext.resources) + ) + val inset = YuzuApplication.appContext.resources + .getDimensionPixelSize(R.dimen.icon_inset) + layerDrawable.setLayerInset(1, inset, inset, inset, inset) + return IconCompat.createWithAdaptiveBitmap( + layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888) + ) + } } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt index a8f9dcc34..81212cbee 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt @@ -5,7 +5,6 @@ package org.yuzu.yuzu_emu.utils import android.net.Uri import android.os.Build -import java.io.BufferedInputStream import java.io.File import java.io.IOException import org.yuzu.yuzu_emu.NativeLibrary @@ -123,7 +122,7 @@ object GpuDriverHelper { // Unzip the driver. try { FileUtil.unzipToInternalStorage( - BufferedInputStream(copiedFile.inputStream()), + copiedFile.path, File(driverInstallationPath!!) ) } catch (e: SecurityException) { @@ -156,7 +155,7 @@ object GpuDriverHelper { // Unzip the driver to the private installation directory try { FileUtil.unzipToInternalStorage( - BufferedInputStream(driver.inputStream()), + driver.path, File(driverInstallationPath!!) ) } catch (e: SecurityException) { diff --git a/src/android/app/src/main/jni/android_common/android_common.cpp b/src/android/app/src/main/jni/android_common/android_common.cpp index 1e884ffdd..7018a52af 100644 --- a/src/android/app/src/main/jni/android_common/android_common.cpp +++ b/src/android/app/src/main/jni/android_common/android_common.cpp @@ -42,3 +42,19 @@ double GetJDouble(JNIEnv* env, jobject jdouble) { jobject ToJDouble(JNIEnv* env, double value) { return env->NewObject(IDCache::GetDoubleClass(), IDCache::GetDoubleConstructor(), value); } + +s32 GetJInteger(JNIEnv* env, jobject jinteger) { + return env->GetIntField(jinteger, IDCache::GetIntegerValueField()); +} + +jobject ToJInteger(JNIEnv* env, s32 value) { + return env->NewObject(IDCache::GetIntegerClass(), IDCache::GetIntegerConstructor(), value); +} + +bool GetJBoolean(JNIEnv* env, jobject jboolean) { + return env->GetBooleanField(jboolean, IDCache::GetBooleanValueField()); +} + +jobject ToJBoolean(JNIEnv* env, bool value) { + return env->NewObject(IDCache::GetBooleanClass(), IDCache::GetBooleanConstructor(), value); +} diff --git a/src/android/app/src/main/jni/android_common/android_common.h b/src/android/app/src/main/jni/android_common/android_common.h index 8eb803e1b..29a338c0a 100644 --- a/src/android/app/src/main/jni/android_common/android_common.h +++ b/src/android/app/src/main/jni/android_common/android_common.h @@ -6,6 +6,7 @@ #include <string> #include <jni.h> +#include "common/common_types.h" std::string GetJString(JNIEnv* env, jstring jstr); jstring ToJString(JNIEnv* env, std::string_view str); @@ -13,3 +14,9 @@ jstring ToJString(JNIEnv* env, std::u16string_view str); double GetJDouble(JNIEnv* env, jobject jdouble); jobject ToJDouble(JNIEnv* env, double value); + +s32 GetJInteger(JNIEnv* env, jobject jinteger); +jobject ToJInteger(JNIEnv* env, s32 value); + +bool GetJBoolean(JNIEnv* env, jobject jboolean); +jobject ToJBoolean(JNIEnv* env, bool value); diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.h index 559ae83eb..cf93304da 100644 --- a/src/android/app/src/main/jni/android_settings.h +++ b/src/android/app/src/main/jni/android_settings.h @@ -63,6 +63,7 @@ struct Values { Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay", Settings::Category::Overlay}; Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay}; + Settings::Setting<s32> lock_drawer{linkage, false, "lock_drawer", Settings::Category::Overlay}; }; extern Values values; diff --git a/src/android/app/src/main/jni/id_cache.cpp b/src/android/app/src/main/jni/id_cache.cpp index c79ad7d76..96f2ad3d4 100644 --- a/src/android/app/src/main/jni/id_cache.cpp +++ b/src/android/app/src/main/jni/id_cache.cpp @@ -43,10 +43,27 @@ static jfieldID s_overlay_control_data_landscape_position_field; static jfieldID s_overlay_control_data_portrait_position_field; static jfieldID s_overlay_control_data_foldable_position_field; +static jclass s_patch_class; +static jmethodID s_patch_constructor; +static jfieldID s_patch_enabled_field; +static jfieldID s_patch_name_field; +static jfieldID s_patch_version_field; +static jfieldID s_patch_type_field; +static jfieldID s_patch_program_id_field; +static jfieldID s_patch_title_id_field; + static jclass s_double_class; static jmethodID s_double_constructor; static jfieldID s_double_value_field; +static jclass s_integer_class; +static jmethodID s_integer_constructor; +static jfieldID s_integer_value_field; + +static jclass s_boolean_class; +static jmethodID s_boolean_constructor; +static jfieldID s_boolean_value_field; + static constexpr jint JNI_VERSION = JNI_VERSION_1_6; namespace IDCache { @@ -186,6 +203,38 @@ jfieldID GetOverlayControlDataFoldablePositionField() { return s_overlay_control_data_foldable_position_field; } +jclass GetPatchClass() { + return s_patch_class; +} + +jmethodID GetPatchConstructor() { + return s_patch_constructor; +} + +jfieldID GetPatchEnabledField() { + return s_patch_enabled_field; +} + +jfieldID GetPatchNameField() { + return s_patch_name_field; +} + +jfieldID GetPatchVersionField() { + return s_patch_version_field; +} + +jfieldID GetPatchTypeField() { + return s_patch_type_field; +} + +jfieldID GetPatchProgramIdField() { + return s_patch_program_id_field; +} + +jfieldID GetPatchTitleIdField() { + return s_patch_title_id_field; +} + jclass GetDoubleClass() { return s_double_class; } @@ -198,6 +247,30 @@ jfieldID GetDoubleValueField() { return s_double_value_field; } +jclass GetIntegerClass() { + return s_integer_class; +} + +jmethodID GetIntegerConstructor() { + return s_integer_constructor; +} + +jfieldID GetIntegerValueField() { + return s_integer_value_field; +} + +jclass GetBooleanClass() { + return s_boolean_class; +} + +jmethodID GetBooleanConstructor() { + return s_boolean_constructor; +} + +jfieldID GetBooleanValueField() { + return s_boolean_value_field; +} + } // namespace IDCache #ifdef __cplusplus @@ -278,12 +351,37 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;"); env->DeleteLocalRef(overlay_control_data_class); + const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch"); + s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class)); + s_patch_constructor = env->GetMethodID( + patch_class, "<init>", + "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V"); + s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z"); + s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;"); + s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;"); + s_patch_type_field = env->GetFieldID(patch_class, "type", "I"); + s_patch_program_id_field = env->GetFieldID(patch_class, "programId", "Ljava/lang/String;"); + s_patch_title_id_field = env->GetFieldID(patch_class, "titleId", "Ljava/lang/String;"); + env->DeleteLocalRef(patch_class); + const jclass double_class = env->FindClass("java/lang/Double"); s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class)); s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V"); s_double_value_field = env->GetFieldID(double_class, "value", "D"); env->DeleteLocalRef(double_class); + const jclass int_class = env->FindClass("java/lang/Integer"); + s_integer_class = reinterpret_cast<jclass>(env->NewGlobalRef(int_class)); + s_integer_constructor = env->GetMethodID(int_class, "<init>", "(I)V"); + s_integer_value_field = env->GetFieldID(int_class, "value", "I"); + env->DeleteLocalRef(int_class); + + const jclass boolean_class = env->FindClass("java/lang/Boolean"); + s_boolean_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_class)); + s_boolean_constructor = env->GetMethodID(boolean_class, "<init>", "(Z)V"); + s_boolean_value_field = env->GetFieldID(boolean_class, "value", "Z"); + env->DeleteLocalRef(boolean_class); + // Initialize Android Storage Common::FS::Android::RegisterCallbacks(env, s_native_library_class); @@ -309,7 +407,10 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) { env->DeleteGlobalRef(s_string_class); env->DeleteGlobalRef(s_pair_class); env->DeleteGlobalRef(s_overlay_control_data_class); + env->DeleteGlobalRef(s_patch_class); env->DeleteGlobalRef(s_double_class); + env->DeleteGlobalRef(s_integer_class); + env->DeleteGlobalRef(s_boolean_class); // UnInitialize applets SoftwareKeyboard::CleanupJNI(env); diff --git a/src/android/app/src/main/jni/id_cache.h b/src/android/app/src/main/jni/id_cache.h index 784d1412f..a002e705d 100644 --- a/src/android/app/src/main/jni/id_cache.h +++ b/src/android/app/src/main/jni/id_cache.h @@ -43,8 +43,25 @@ jfieldID GetOverlayControlDataLandscapePositionField(); jfieldID GetOverlayControlDataPortraitPositionField(); jfieldID GetOverlayControlDataFoldablePositionField(); +jclass GetPatchClass(); +jmethodID GetPatchConstructor(); +jfieldID GetPatchEnabledField(); +jfieldID GetPatchNameField(); +jfieldID GetPatchVersionField(); +jfieldID GetPatchTypeField(); +jfieldID GetPatchProgramIdField(); +jfieldID GetPatchTitleIdField(); + jclass GetDoubleClass(); jmethodID GetDoubleConstructor(); jfieldID GetDoubleValueField(); +jclass GetIntegerClass(); +jmethodID GetIntegerConstructor(); +jfieldID GetIntegerValueField(); + +jclass GetBooleanClass(); +jmethodID GetBooleanConstructor(); +jfieldID GetBooleanValueField(); + } // namespace IDCache diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index ed3b1353a..963f57380 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -17,6 +17,7 @@ #include <core/file_sys/patch_manager.h> #include <core/file_sys/savedata_factory.h> #include <core/loader/nro.h> +#include <frontend_common/content_manager.h> #include <jni.h> #include "common/detached_tasks.h" @@ -100,67 +101,6 @@ void EmulationSession::SetNativeWindow(ANativeWindow* native_window) { m_native_window = native_window; } -int EmulationSession::InstallFileToNand(std::string filename, std::string file_extension) { - jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, - std::size_t block_size) { - if (src == nullptr || dest == nullptr) { - return false; - } - if (!dest->Resize(src->GetSize())) { - return false; - } - - using namespace Common::Literals; - [[maybe_unused]] std::vector<u8> buffer(1_MiB); - - for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) { - jconst read = src->Read(buffer.data(), buffer.size(), i); - dest->Write(buffer.data(), read, i); - } - return true; - }; - - enum InstallResult { - Success = 0, - SuccessFileOverwritten = 1, - InstallError = 2, - ErrorBaseGame = 3, - ErrorFilenameExtension = 4, - }; - - [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp; - if (file_extension == "nsp") { - nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read)); - if (nsp->IsExtractedType()) { - return InstallError; - } - } else { - return ErrorFilenameExtension; - } - - if (!nsp) { - return InstallError; - } - - if (nsp->GetStatus() != Loader::ResultStatus::Success) { - return InstallError; - } - - jconst res = m_system.GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, - copy_func); - - switch (res) { - case FileSys::InstallResult::Success: - return Success; - case FileSys::InstallResult::OverwriteExisting: - return SuccessFileOverwritten; - case FileSys::InstallResult::ErrorBaseInstall: - return ErrorBaseGame; - default: - return InstallError; - } -} - void EmulationSession::InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir, const std::string& custom_driver_name, @@ -512,10 +452,20 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject } int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance, - jstring j_file, - jstring j_file_extension) { - return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file), - GetJString(env, j_file_extension)); + jstring j_file, jobject jcallback) { + auto jlambdaClass = env->GetObjectClass(jcallback); + auto jlambdaInvokeMethod = env->GetMethodID( + jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); + const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) { + auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod, + ToJDouble(env, max), ToJDouble(env, progress)); + return GetJBoolean(env, jwasCancelled); + }; + + return static_cast<int>( + ContentManager::InstallNSP(&EmulationSession::GetInstance().System(), + EmulationSession::GetInstance().System().GetFilesystem().get(), + GetJString(env, j_file), callback)); } jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* env, jobject jobj, @@ -824,9 +774,9 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env, return true; } -jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env, jobject jobj, - jstring jpath, - jstring jprogramId) { +jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj, + jstring jpath, + jstring jprogramId) { const auto path = GetJString(env, jpath); const auto vFile = Core::GetGameFileFromPath(EmulationSession::GetInstance().System().GetFilesystem(), path); @@ -843,20 +793,77 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env, FileSys::VirtualFile update_raw; loader->ReadUpdateRaw(update_raw); - auto addons = pm.GetPatchVersionNames(update_raw); - auto jemptyString = ToJString(env, ""); - auto jemptyStringPair = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(), - jemptyString, jemptyString); - jobjectArray jaddonsArray = - env->NewObjectArray(addons.size(), IDCache::GetPairClass(), jemptyStringPair); + auto patches = pm.GetPatches(update_raw); + jobjectArray jpatchArray = + env->NewObjectArray(patches.size(), IDCache::GetPatchClass(), nullptr); int i = 0; - for (const auto& addon : addons) { - jobject jaddon = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(), - ToJString(env, addon.first), ToJString(env, addon.second)); - env->SetObjectArrayElement(jaddonsArray, i, jaddon); + for (const auto& patch : patches) { + jobject jpatch = env->NewObject( + IDCache::GetPatchClass(), IDCache::GetPatchConstructor(), patch.enabled, + ToJString(env, patch.name), ToJString(env, patch.version), + static_cast<jint>(patch.type), ToJString(env, std::to_string(patch.program_id)), + ToJString(env, std::to_string(patch.title_id))); + env->SetObjectArrayElement(jpatchArray, i, jpatch); ++i; } - return jaddonsArray; + return jpatchArray; +} + +void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject jobj, + jstring jprogramId) { + auto program_id = EmulationSession::GetProgramId(env, jprogramId); + ContentManager::RemoveUpdate(EmulationSession::GetInstance().System().GetFileSystemController(), + program_id); +} + +void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, + jstring jprogramId) { + auto program_id = EmulationSession::GetProgramId(env, jprogramId); + ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id); +} + +void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId, + jstring jname) { + auto program_id = EmulationSession::GetProgramId(env, jprogramId); + ContentManager::RemoveMod(EmulationSession::GetInstance().System().GetFileSystemController(), + program_id, GetJString(env, jname)); +} + +jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj, + jobject jcallback) { + auto jlambdaClass = env->GetObjectClass(jcallback); + auto jlambdaInvokeMethod = env->GetMethodID( + jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); + const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) { + auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod, + ToJDouble(env, max), ToJDouble(env, progress)); + return GetJBoolean(env, jwasCancelled); + }; + + auto& session = EmulationSession::GetInstance(); + std::vector<std::string> result = ContentManager::VerifyInstalledContents( + &session.System(), session.GetContentProvider(), callback); + jobjectArray jresult = + env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, "")); + for (size_t i = 0; i < result.size(); ++i) { + env->SetObjectArrayElement(jresult, i, ToJString(env, result[i])); + } + return jresult; +} + +jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj, + jstring jpath, jobject jcallback) { + auto jlambdaClass = env->GetObjectClass(jcallback); + auto jlambdaInvokeMethod = env->GetMethodID( + jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); + const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) { + auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod, + ToJDouble(env, max), ToJDouble(env, progress)); + return GetJBoolean(env, jwasCancelled); + }; + auto& session = EmulationSession::GetInstance(); + return static_cast<jint>( + ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback)); } jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj, diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.h index 4a8049578..dadb138ad 100644 --- a/src/android/app/src/main/jni/native.h +++ b/src/android/app/src/main/jni/native.h @@ -7,6 +7,7 @@ #include "core/file_sys/registered_cache.h" #include "core/hle/service/acc/profile_manager.h" #include "core/perf_stats.h" +#include "frontend_common/content_manager.h" #include "jni/applets/software_keyboard.h" #include "jni/emu_window/emu_window.h" #include "video_core/rasterizer_interface.h" @@ -29,7 +30,6 @@ public: void SetNativeWindow(ANativeWindow* native_window); void SurfaceChanged(); - int InstallFileToNand(std::string filename, std::string file_extension); void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir, const std::string& custom_driver_name, const std::string& file_redirect_dir); diff --git a/src/android/app/src/main/res/drawable/ic_lock.xml b/src/android/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 000000000..ef97b1936 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:viewportHeight="24" + android:viewportWidth="24" + android:width="24dp"> + <path + android:fillColor="?attr/colorControlNormal" + android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" /> +</vector> diff --git a/src/android/app/src/main/res/drawable/ic_shortcut.xml b/src/android/app/src/main/res/drawable/ic_shortcut.xml new file mode 100644 index 000000000..06e1983b2 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_shortcut.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:fillColor="?attr/colorControlNormal" + android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v160h-80v-40L280,240v480h400v-40h80v160q0,33 -23.5,56.5T680,920L280,920ZM686,520L480,520v120h-80v-120q0,-33 23.5,-56.5T480,440h206l-62,-64 56,-56 160,160 -160,160 -56,-56 62,-64Z" /> +</vector> diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml b/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml index 0b9633855..551f255c0 100644 --- a/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml +++ b/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml @@ -43,16 +43,35 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - <Button - android:id="@+id/button_back" - style="?attr/materialIconButtonStyle" - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="start" android:layout_margin="8dp" - app:icon="@drawable/ic_back" - app:iconSize="24dp" - app:iconTint="?attr/colorOnSurface" /> + android:orientation="horizontal"> + + <Button + android:id="@+id/button_back" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:icon="@drawable/ic_back" + app:iconSize="24dp" + app:iconTint="?attr/colorOnSurface" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/button_shortcut" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:icon="@drawable/ic_shortcut" + app:iconSize="24dp" + app:iconTint="?attr/colorOnSurface" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.card.MaterialCardView style="?attr/materialCardViewElevatedStyle" diff --git a/src/android/app/src/main/res/layout/card_home_option.xml b/src/android/app/src/main/res/layout/card_home_option.xml index cb667c928..224ec4d89 100644 --- a/src/android/app/src/main/res/layout/card_home_option.xml +++ b/src/android/app/src/main/res/layout/card_home_option.xml @@ -2,16 +2,16 @@ <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - style="?attr/materialCardViewFilledStyle" + style="?attr/materialCardViewElevatedStyle" android:id="@+id/option_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:layout_marginHorizontal="12dp" android:background="?attr/selectableItemBackground" - android:backgroundTint="?attr/colorSurfaceVariant" android:clickable="true" - android:focusable="true"> + android:focusable="true" + app:cardElevation="4dp"> <LinearLayout android:id="@+id/option_layout" diff --git a/src/android/app/src/main/res/layout/dialog_progress_bar.xml b/src/android/app/src/main/res/layout/dialog_progress_bar.xml index 0209ea082..e61aa5294 100644 --- a/src/android/app/src/main/res/layout/dialog_progress_bar.xml +++ b/src/android/app/src/main/res/layout/dialog_progress_bar.xml @@ -1,8 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/progress_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="24dp" - app:trackCornerRadius="4dp" /> + android:orientation="vertical"> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/message" + style="@style/TextAppearance.Material3.BodyMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="12dp" + android:layout_marginBottom="6dp" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:requiresFadingEdge="horizontal" + android:singleLine="true" + android:textAlignment="viewStart" + android:visibility="gone" /> + + <com.google.android.material.progressindicator.LinearProgressIndicator + android:id="@+id/progress_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="24dp" + app:trackCornerRadius="4dp" /> + +</LinearLayout> diff --git a/src/android/app/src/main/res/layout/fragment_game_info.xml b/src/android/app/src/main/res/layout/fragment_game_info.xml index 80ede8a8c..53af15787 100644 --- a/src/android/app/src/main/res/layout/fragment_game_info.xml +++ b/src/android/app/src/main/res/layout/fragment_game_info.xml @@ -118,6 +118,14 @@ android:layout_marginTop="16dp" android:text="@string/copy_details" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/button_verify_integrity" + style="@style/Widget.Material3.Button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:text="@string/verify_integrity" /> + </LinearLayout> </androidx.core.widget.NestedScrollView> diff --git a/src/android/app/src/main/res/layout/fragment_game_properties.xml b/src/android/app/src/main/res/layout/fragment_game_properties.xml index 72ecbde30..cadd0bc4a 100644 --- a/src/android/app/src/main/res/layout/fragment_game_properties.xml +++ b/src/android/app/src/main/res/layout/fragment_game_properties.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -22,16 +21,35 @@ android:orientation="vertical" android:gravity="center_horizontal"> - <Button - android:id="@+id/button_back" - style="?attr/materialIconButtonStyle" - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" - android:layout_gravity="start" - app:icon="@drawable/ic_back" - app:iconSize="24dp" - app:iconTint="?attr/colorOnSurface" /> + android:orientation="horizontal"> + + <Button + android:id="@+id/button_back" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:icon="@drawable/ic_back" + app:iconSize="24dp" + app:iconTint="?attr/colorOnSurface" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/button_shortcut" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:icon="@drawable/ic_shortcut" + app:iconSize="24dp" + app:iconTint="?attr/colorOnSurface" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.card.MaterialCardView style="?attr/materialCardViewElevatedStyle" @@ -45,7 +63,7 @@ android:id="@+id/image_game_screen" android:layout_width="175dp" android:layout_height="175dp" - tools:src="@drawable/default_icon"/> + tools:src="@drawable/default_icon" /> </com.google.android.material.card.MaterialCardView> diff --git a/src/android/app/src/main/res/layout/list_item_addon.xml b/src/android/app/src/main/res/layout/list_item_addon.xml index 74ca04ef1..3a1382fe2 100644 --- a/src/android/app/src/main/res/layout/list_item_addon.xml +++ b/src/android/app/src/main/res/layout/list_item_addon.xml @@ -14,12 +14,11 @@ android:id="@+id/text_container" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="@+id/addon_switch" - app:layout_constraintEnd_toStartOf="@+id/addon_switch" + android:layout_marginEnd="16dp" + app:layout_constraintEnd_toStartOf="@+id/addon_checkbox" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/addon_switch"> + app:layout_constraintTop_toTopOf="parent"> <com.google.android.material.textview.MaterialTextView android:id="@+id/title" @@ -42,16 +41,29 @@ </LinearLayout> - <com.google.android.material.materialswitch.MaterialSwitch - android:id="@+id/addon_switch" + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/addon_checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:focusable="true" android:gravity="center" - android:nextFocusLeft="@id/addon_container" - app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginEnd="8dp" + app:layout_constraintTop_toTopOf="@+id/text_container" + app:layout_constraintBottom_toBottomOf="@+id/text_container" + app:layout_constraintEnd_toStartOf="@+id/button_delete" /> + + <Button + android:id="@+id/button_delete" + style="@style/Widget.Material3.Button.IconButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:contentDescription="@string/delete" + android:tooltipText="@string/delete" + app:icon="@drawable/ic_delete" + app:iconTint="?attr/colorControlNormal" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/text_container" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/addon_checkbox" + app:layout_constraintBottom_toBottomOf="@+id/addon_checkbox" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/src/android/app/src/main/res/layout/list_item_setting.xml b/src/android/app/src/main/res/layout/list_item_setting.xml index 1f80682f1..e13431497 100644 --- a/src/android/app/src/main/res/layout/list_item_setting.xml +++ b/src/android/app/src/main/res/layout/list_item_setting.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:visibility="gone" - android:text="@string/clear" + android:text="@string/use_global_setting" tools:visibility="visible" /> </LinearLayout> diff --git a/src/android/app/src/main/res/layout/list_item_setting_switch.xml b/src/android/app/src/main/res/layout/list_item_setting_switch.xml index 1c08e2e1b..e23337058 100644 --- a/src/android/app/src/main/res/layout/list_item_setting_switch.xml +++ b/src/android/app/src/main/res/layout/list_item_setting_switch.xml @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/clear" + android:text="@string/use_global_setting" android:visibility="gone" tools:visibility="visible" /> diff --git a/src/android/app/src/main/res/menu/menu_driver_manager.xml b/src/android/app/src/main/res/menu/menu_driver_manager.xml index dee5d57b6..0876c2194 100644 --- a/src/android/app/src/main/res/menu/menu_driver_manager.xml +++ b/src/android/app/src/main/res/menu/menu_driver_manager.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_driver_clear" - android:icon="@drawable/ic_clear" - android:title="@string/clear" - app:showAsAction="always" /> + android:id="@+id/menu_driver_use_global" + android:title="@string/use_global_setting" /> </menu> diff --git a/src/android/app/src/main/res/menu/menu_in_game.xml b/src/android/app/src/main/res/menu/menu_in_game.xml index ac6ab06ff..eecb0563b 100644 --- a/src/android/app/src/main/res/menu/menu_in_game.xml +++ b/src/android/app/src/main/res/menu/menu_in_game.xml @@ -22,6 +22,11 @@ android:title="@string/emulation_input_overlay" /> <item + android:id="@+id/menu_lock_drawer" + android:icon="@drawable/ic_unlock" + android:title="@string/emulation_input_overlay" /> + + <item android:id="@+id/menu_exit" android:icon="@drawable/ic_exit" android:title="@string/emulation_exit" /> diff --git a/src/android/app/src/main/res/values-ar/strings.xml b/src/android/app/src/main/res/values-ar/strings.xml index 07dffffe8..53678f465 100644 --- a/src/android/app/src/main/res/values-ar/strings.xml +++ b/src/android/app/src/main/res/values-ar/strings.xml @@ -3,38 +3,39 @@ <string name="emulation_notification_channel_name">المحاكي نشط</string> <string name="emulation_notification_channel_description">اظهار اشعار دائم عندما يكون المحاكي نشطاً</string> - <string name="emulation_notification_running">يوزو يعمل</string> + <string name="emulation_notification_running">يوزو قيد التشغيل</string> <string name="notice_notification_channel_name">الإشعارات والأخطاء</string> <string name="notice_notification_channel_description">اظهار اشعار عند حصول اي مشكلة.</string> <string name="notification_permission_not_granted">لم يتم منح إذن الإشعار</string> <!-- Setup strings --> - <string name="welcome">مرحبًا</string> - <string name="welcome_description">والانتقال إلى المحاكاة <b>يوزو</b> تعرف على كيفية إعداد.</string> + <string name="welcome">مرحبا</string> + <string name="welcome_description">تعرف على كيفية إعداد <b>يوزو</b> والانتقال إلى المحاكاة</string> <string name="get_started">لنبدأ</string> <string name="keys">المفاتيح</string> <string name="keys_description">اختر ملف <b>prod.keys</b> من الزر ادناه</string> <string name="select_keys">إختيار المفاتيح</string> <string name="games">الألعاب</string> - <string name="games_description">اختر مجلد <b>العابك</b> من الزر ادناه.</string> + <string name="games_description">حدد مجلد <b>العابك</b> من الزر ادناه.</string> <string name="done">إنهاء</string> - <string name="done_description">كل شيء جاهز./n استمتع بألعابك!</string> + <string name="done_description">أنت جاهز تمامًا. استمتع بألعابك!</string> <string name="text_continue">استمر</string> <string name="next">التالي</string> <string name="back">عودة</string> <string name="add_games">إضافة ألعاب</string> - <string name="add_games_description">إختار مجلد ألعابك</string> + <string name="add_games_description">حدد مجلد الألعاب الخاص بك</string> <string name="step_complete">مكتمل</string> <!-- Home strings --> <string name="home_games">الألعاب</string> <string name="home_search">البحث</string> <string name="home_settings">الإعدادات</string> - <string name="empty_gamelist">لم يتم العثور على ملفات او لم يتم تحديد مسار العاب.</string> - <string name="search_and_filter_games">بحث وتصفية الألعاب</string> - <string name="select_games_folder">تحديد مجلد الألعاب</string> + <string name="empty_gamelist">لم يتم العثور على ملفات أو لم يتم تحديد مجلد الألعاب حتى الآن.</string> + <string name="search_and_filter_games">البحث وتصفية الألعاب</string> + <string name="select_games_folder">حدد مجلد الألعاب</string> + <string name="manage_game_folders">إدارة مجلدات اللعبة</string> <string name="select_games_folder_description">يسمح لـ يوزو بملء قائمة الألعاب</string> - <string name="add_games_warning">تخطُ اختيار مجلد الالعاب؟</string> + <string name="add_games_warning">تخطي تحديد مجلد الألعاب؟</string> <string name="add_games_warning_description">لن يتم عرض الألعاب في قائمة الألعاب إذا لم يتم تحديد مجلد</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> <string name="home_search_games">البحث عن ألعاب</string> @@ -45,7 +46,7 @@ <string name="install_prod_keys_warning">تخطي إضافة المفاتيح؟</string> <string name="install_prod_keys_warning_description">مطلوب مفاتيح صالحة لمحاكاة ألعاب البيع بالتجزئة. ستعمل تطبيقات البيرة المنزلية فقط إذا تابعت</string> <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string> - <string name="notifications">التنبيهات</string> + <string name="notifications">الإشعارات</string> <string name="notifications_description">امنح إذن الإشعار باستخدام الزر أدناه</string> <string name="give_permission">منح الإذن</string> <string name="notification_warning">تخطي منح إذن الإشعارات؟</string> @@ -62,9 +63,12 @@ <string name="invalid_keys_file">تم تحديد ملف مفاتيح غير صالح</string> <string name="install_keys_success">تم تثبيت المفاتيح بنجاح</string> <string name="reading_keys_failure">خطأ في قراءة مفاتيح التشفير</string> + <string name="install_prod_keys_failure_extension_description">وحاول مرة أخر keys تحقق من أن ملف المفاتيح له امتداد</string> + <string name="install_amiibo_keys_failure_extension_description">وحاول مرة أخر bin تحقق من أن ملف المفاتيح له امتداد</string> <string name="invalid_keys_error">مفاتيح التشفير غير صالحة</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">الملف المحدد غير صحيح أو تالف. يرجى إعادة المفاتيح الخاصة بك</string> + <string name="gpu_driver_manager">GPU مدير برنامج تشغيل</string> <string name="install_gpu_driver">GPU تثبيت برنامج تشغيل</string> <string name="install_gpu_driver_description">قم بتثبيت برامج تشغيل بديلة للحصول على أداء أو دقة أفضل</string> <string name="advanced_settings">إعدادات متقدمة</string> @@ -82,22 +86,27 @@ <string name="notification_no_directory_link_description">الرجاء تحديد موقع مجلد المستخدم باستخدام اللوحة الجانبية لمدير الملفات يدويًا</string> <string name="manage_save_data">إدارة حفظ البيانات</string> <string name="manage_save_data_description">حفظ البيانات التي تم العثور عليها. يرجى اختيار أحد الخيارات التالية</string> + <string name="import_save_warning">استيراد حفظ البيانات</string> + <string name="import_save_warning_description">سيؤدي هذا إلى استبدال جميع بيانات الحفظ الموجودة بالملف المقدم. هل أنت متأكد أنك تريد الاستمرار؟</string> <string name="import_export_saves_description">استيراد أو تصدير ملفات الحفظ</string> + <string name="save_files_importing">جاري استيراد ملفات الحفظ</string> + <string name="save_files_exporting">جاري تصدير ملفات الحفظ</string> <string name="save_file_imported_success">تم الاستيراد بنجاح</string> <string name="save_file_invalid_zip_structure">بنية مجلد الحفظ غير صالحة</string> <string name="save_file_invalid_zip_structure_description">يجب أن يكون اسم المجلد الفرعي الأول هو معرف عنوان اللعبة.</string> <string name="import_saves">استيراد</string> <string name="export_saves">تصدير</string> - <string name="install_firmware">تثبيت البرامج الثابتة</string> - <string name="firmware_installing">تثبيت البرامج الثابتة</string> - <string name="firmware_installed_success">تم تثبيت البرامج الثابتة بنجاح</string> - <string name="firmware_installed_failure">فشل تثبيت البرامج الثابتة</string> + <string name="install_firmware">تثبيت فيرموير</string> + <string name="install_firmware_description">يجب أن يكون فيرموير في أرشيف مضغوط وهو ضروري لتشغيل بعض الألعاب</string> + <string name="firmware_installing">تثبيت فيرموير</string> + <string name="firmware_installed_success">تم تثبيت فيرموير بنجاح</string> + <string name="firmware_installed_failure">فشل تثبيت فيرموير</string> <string name="share_log">مشاركة سجلات التصحيح</string> <string name="share_log_description">مشاركة ملف سجل يوزو لتصحيح المشكلات</string> <string name="share_log_missing">لم يتم العثور على ملف السجل</string> <string name="install_game_content">تثبيت محتوى اللعبة</string> <string name="install_game_content_description">DLC قم بتثبيت تحديثات اللعبة أو</string> - <string name="installing_game_content">جارٍ تثبيت المحتوى</string> + <string name="installing_game_content">جاري تثبيت المحتوى</string> <string name="install_game_content_failure_base">لا يُسمح بتثبيت الألعاب الأساسية لتجنب التعارضات المحتملة.</string> <string name="install_game_content_success_install">%1$d تم التثبيت بنجاح</string> <string name="install_game_content_success_overwrite">%1$d تمت الكتابة فوقه بنجاح</string> @@ -105,19 +114,39 @@ <string name="custom_driver_not_supported">برامج التشغيل المخصصة غير مدعومة</string> <string name="custom_driver_not_supported_description">تحميل برنامج التشغيل المخصص غير معتمد حاليًا لهذا الجهاز.\nحدد هذا الخيار مرة أخرى في المستقبل لمعرفة ما إذا تمت إضافة الدعم!</string> <string name="manage_yuzu_data">إدارة بيانات يوزو</string> - <string name="manage_yuzu_data_description">استيراد/تصدير البرامج الثابتة والمفاتيح وبيانات المستخدم والمزيد!</string> + <string name="manage_yuzu_data_description">استيراد/تصدير فيرموير والمفاتيح وبيانات المستخدم والمزيد</string> <string name="share_save_file">مشاركة ملف الحفظ</string> <string name="export_save_failed">فشل تصدير الحفظ</string> - + <string name="game_folders">مجلدات اللعبة</string> + <string name="deep_scan">فحص عميق</string> + <string name="add_game_folder">إضافة مجلد اللعبة</string> + <string name="folder_already_added">تمت إضافة هذا المجلد بالفعل</string> + <string name="game_folder_properties">خصائص مجلد اللعبة</string> + <string name="no_save_data_found">لم يتم العثور على بيانات الحفظ</string> + + <!-- Applet launcher strings --> + <string name="applets">قائمة التطبيقات المصغرة</string> + <string name="applets_description">قم بتشغيل تطبيقات النظام باستخدام فيرموير المثبت</string> + <string name="applets_error_firmware">فيرموير غير مثبت</string> + <string name="applets_error_applet">التطبيق المصغر غير متوفر</string> + <string name="album_applet">الألبوم</string> + <string name="album_applet_description">شاهد الصور المخزنة في مجلد لقطات شاشة المستخدم باستخدام عارض صور النظام</string> + <string name="mii_edit_applet">تحرير Mii</string> + <string name="mii_edit_applet_description">باستخدام محرر النظام Miis عرض وتحرير</string> + <string name="cabinet_applet_description">تحرير وحذف البيانات المخزنة على أميبو</string> + <string name="cabinet_nickname_and_owner">إعدادات الاسم المستعار والمالك</string> + <string name="cabinet_game_data_eraser">ممحاة بيانات اللعبة</string> <string name="copied_to_clipboard">نسخ إلى الحافظة</string> <string name="about_app_description">محاكي سويتش مفتوح المصدر</string> <string name="contributors">المساهمين</string> + <string name="contributors_description">مصنوع من فريق يوزو</string> <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> <string name="licenses_description">المشاريع التي تجعل تطبيق يوزو لنظام أندرويد ممكنًا</string> <string name="build">البناء</string> <string name="user_data">بيانات المستخدم</string> - <string name="exporting_user_data">جارٍ تصدير بيانات المستخدم</string> - <string name="importing_user_data">جارٍ استيراد بيانات المستخدم</string> + <string name="user_data_description">استيراد/تصدير جميع بيانات التطبيق. عند استيراد بيانات المستخدم، سيتم حذف جميع بيانات المستخدم الحالية!</string> + <string name="exporting_user_data">جاري تصدير بيانات المستخدم</string> + <string name="importing_user_data">جاري استيراد بيانات المستخدم</string> <string name="import_user_data">استيراد بيانات المستخدم</string> <string name="invalid_yuzu_backup">نسخة احتياطية يوزو غير صالحة</string> <string name="user_data_export_success">تم تصدير بيانات المستخدم بنجاح</string> @@ -153,7 +182,7 @@ <string name="use_docked_mode">وضع الإرساء</string> <string name="use_docked_mode_description">زيادة الدقة، وانخفاض الأداء. يتم استخدام الوضع المحمول عند تعطيله، مما يؤدي إلى خفض الدقة وزيادة الأداء.</string> <string name="emulated_region">المنطقة التي تمت محاكاتها</string> - <string name="emulated_language">لغة المحاكاه</string> + <string name="emulated_language">لغة المحاكاة</string> <string name="select_rtc_date">حدد التاريخ و الساعة في الوقت الحقيقي</string> <string name="select_rtc_time">حدد وقت الساعة في الوقت الفعلي</string> <string name="use_custom_rtc">ساعة مخصصة في الوقت الحقيقي</string> @@ -164,7 +193,7 @@ <string name="renderer_accuracy">مستوى الدقة</string> <string name="renderer_resolution">(Handheld/Docked) الدقة</string> <string name="renderer_vsync">VSync وضع</string> - <string name="renderer_screen_layout">الاتجاه</string> + <string name="renderer_screen_layout">اتجاه العرض</string> <string name="renderer_aspect_ratio">تناسب الابعاد</string> <string name="renderer_anti_aliasing">طريقة مكافحة التعرج</string> <string name="renderer_asynchronous_shaders">استخدم تظليل غير متزامن</string> @@ -172,31 +201,32 @@ <string name="renderer_reactive_flushing">استخدم التنظيف التفاعلي</string> <string name="renderer_reactive_flushing_description">تحسين دقة العرض في بعض الألعاب على حساب الأداء</string> <string name="use_disk_shader_cache_description">يقلل من التأتأة عن طريق تخزين وتحميل التظليلات التي تم إنشاؤها محليًا.</string> - <!-- Debug settings strings --> <string name="cpu">وحدة المعالج المركزية</string> <string name="cpu_debug_mode">تصحيح أخطاء وحدة المعالجة المركزية</string> <string name="cpu_debug_mode_description">يضع وحدة المعالجة المركزية في وضع التصحيح البطيء.</string> - <string name="gpu">GPU</string> - <string name="renderer_api">API</string> + <string name="gpu">وحدة معالجة الرسومات</string> + <string name="renderer_api">واجهة برمجة التطبيقات</string> <string name="renderer_debug">تصحيح الأخطاء الرسومية</string> <string name="renderer_debug_description">يضبط واجهة برمجة تطبيقات الرسومات على وضع تصحيح الأخطاء البطيء.</string> <string name="fastmem">Fastmem</string> <!-- Audio settings strings --> <string name="audio_output_engine">محرك الإخراج</string> - <string name="audio_volume">حجم</string> - <string name="audio_volume_description">يحدد حجم إخراج الصوت</string> + <string name="audio_volume">مستوى الصوت</string> + <string name="audio_volume_description">يحدد مستوى إخراج الصوت</string> <!-- Miscellaneous --> <string name="slider_default">افتراضي</string> <string name="ini_saved">الإعدادات المحفوظة</string> <string name="gameid_saved">الإعدادات المحفوظة لـ %1$s</string> + <string name="error_saving">خطأ في حفظ %1$s.ini: %2$s</string> <string name="unimplemented_menu">القائمة غير المنفذة</string> - <string name="loading">جاري تحميل</string> - <string name="shutting_down">إيقاف تشغيل</string> + <string name="loading">جاري التحميل</string> + <string name="shutting_down">إيقاف التشغيل</string> <string name="reset_setting_confirmation">هل تريد إعادة تعيين هذا الإعداد مرة أخرى إلى قيمته الافتراضية؟</string> - <string name="reset_to_default">إعادة تعيين إلى الافتراضي</string> + <string name="reset_to_default">إعادة التعيين إلى الوضع الافتراضي</string> + <string name="reset_to_default_description">إعادة تعيين جميع الإعدادات المتقدمة</string> <string name="reset_all_settings">إعادة تعيين جميع الإعدادات؟</string> <string name="reset_all_settings_description">سيتم إعادة تعيين كافة الإعدادات المتقدمة إلى تكوينها الافتراضي. هذا لا يمكن التراجع عنها.</string> <string name="settings_reset">إعادة تعيين الأعدادات</string> @@ -204,32 +234,77 @@ <string name="learn_more">معرفة المزيد</string> <string name="auto">تلقائي</string> <string name="submit">إرسال</string> - <string name="string_null">قيمه خاليه</string> + <string name="string_null">لا شيء</string> <string name="string_import">استيراد</string> <string name="export">تصدير</string> <string name="export_failed">فشل التصدير</string> <string name="import_failed">فشل الاستيراد</string> <string name="cancelling">إلغاء</string> - + <string name="install">تثبيت</string> + <string name="delete">حذف</string> + <string name="edit">حرر</string> + <string name="export_success">تم التصدير بنجاح</string> + <string name="start">Start</string> + <string name="clear">مسح</string> + <string name="global">عالمي</string> + <string name="custom">مخصص</string> + <string name="notice">إشعار</string> + <string name="import_complete">اكتمل الاستيراد</string> <!-- GPU driver installation --> <string name="select_gpu_driver">GPU حدد برنامج تشغيل</string> <string name="select_gpu_driver_title">الحالي الخاص بك؟ GPU هل ترغب في استبدال برنامج تشغيل</string> <string name="select_gpu_driver_install">تثبيت</string> <string name="select_gpu_driver_default">افتراضي</string> - <string name="select_gpu_driver_use_default">يستخدم تعريف معالج الرسوميات الافتراضي</string> - <string name="select_gpu_driver_error">تم تحديد برنامج تشغيل غير صالح ، باستخدام النظام الافتراضي</string> - <string name="system_gpu_driver">تعريف معالج الرسوميات الخاص بالنظام</string> - <string name="installing_driver">جارٍ تثبيت برنامج التشغيل…</string> + <string name="select_gpu_driver_use_default">يستخدم تعريف معالج الرسومات الافتراضي</string> + <string name="select_gpu_driver_error">تم تحديد برنامج تشغيل غير صالح</string> + <string name="driver_already_installed">برنامج التشغيل مثبت بالفعل</string> + <string name="system_gpu_driver">تعريف معالج الرسومات الخاص بالنظام</string> + <string name="installing_driver">جاري تثبيت برنامج التشغيل…</string> <!-- Preferences Screen --> <string name="preferences_settings">إعدادات</string> <string name="preferences_general">عام</string> <string name="preferences_system">النظام</string> - <string name="preferences_graphics">الرسوميات</string> + <string name="preferences_system_description">وضع الإرساء ،المنطقة ،اللغة</string> + <string name="preferences_graphics">الرسومات</string> + <string name="preferences_graphics_description">مستوى الدقة ،الدقة ،ذاكرة التخزين المؤقت للتظليل</string> <string name="preferences_audio">الصوت</string> + <string name="preferences_audio_description">محرك الإخراج ، حجم الصوت</string> <string name="preferences_theme">السمة واللون</string> <string name="preferences_debug">تصحيح الأخطاء</string> - + <!-- Game properties --> + <string name="info">معلومات</string> + <string name="info_description">معرف البرنامج، المطور، الإصدار</string> + <string name="per_game_settings">إعدادات كل لعبة</string> + <string name="per_game_settings_description">تحرير الإعدادات الخاصة بهذه اللعبة</string> + <string name="launch_options">تشغيل الإعدادات</string> + <string name="path">المسار</string> + <string name="program_id">معرف البرنامج</string> + <string name="developer">المطور</string> + <string name="version">إصدار</string> + <string name="copy_details">نسخ التفاصيل</string> + <string name="add_ons">الإضافات</string> + <string name="add_ons_description">DLCالتعديلات والتحديثات و</string> + <string name="clear_shader_cache">مسح ذاكرة التخزين المؤقت للتظليل</string> + <string name="clear_shader_cache_description">يزيل جميع التظليلات التي تم إنشاؤها أثناء لعب هذه اللعبة</string> + <string name="clear_shader_cache_warning_description">سوف تواجه المزيد من التأتأة مع تجديد ذاكرة التخزين المؤقت للتظليل</string> + <string name="cleared_shaders_successfully">تم مسح التظليل بنجاح</string> + <string name="addons_game">إضافات: %1$s</string> + <string name="save_data">حفظ البيانات</string> + <string name="save_data_description">إدارة حفظ البيانات الخاصة بهذه اللعبة</string> + <string name="delete_save_data">حذف حفظ البيانات</string> + <string name="delete_save_data_description">يزيل كافة البيانات المحفوظة الخاصة بهذه اللعبة</string> + <string name="delete_save_data_warning_description">يؤدي هذا إلى إزالة كافة البيانات المحفوظة لهذه اللعبة بشكل لا يمكن استرداده. هل أنت متأكد أنك تريد الاستمرار؟</string> + <string name="save_data_deleted_successfully">حفظ البيانات تم حذفها بنجاح</string> + <string name="select_content_type">نوع المحتوى</string> + <string name="updates_and_dlc">DLC التحديثات والمحتوى القابل للتنزيل </string> + <string name="mods_and_cheats">تعديل وغش</string> + <string name="addon_notice">إشعار إضافي مهم</string> + <string name="invalid_directory">مجلد غير صالح</string> + <string name="addon_installed_successfully">تم تثبيت الملحق بنجاح</string> + <string name="verifying_content">جاري التحقق من المحتوى</string> + <string name="content_install_notice">إشعار تثبيت المحتوى</string> + <string name="content_install_notice_description">المحتوى الذي حددته لا يتطابق مع هذه اللعبة.هل تريد التثبيت على أية حال؟</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">الخاص بك ROM تم تشفير</string> <string name="loader_error_video_core">حدث خطأ أثناء تهيئة مركز الفيديو</string> @@ -238,24 +313,25 @@ <!-- Emulation Menu --> <string name="emulation_exit">الخروج من المحاكاة</string> - <string name="emulation_done">منجز</string> + <string name="emulation_done">إنهاء</string> <string name="emulation_fps_counter">عداد إطار/ثانية</string> - <string name="emulation_toggle_controls">تبديل عناصر التحكم</string> + <string name="emulation_toggle_controls">عناصر التحكم</string> <string name="emulation_rel_stick_center">مركز العصا النسبي</string> - <string name="emulation_dpad_slide">مزلاق أزرار الاتجاهات</string> + <string name="emulation_dpad_slide">مزلاق الأسهم</string> <string name="emulation_haptics">الاهتزازات الديناميكية</string> <string name="emulation_show_overlay">عرض التراكب</string> - <string name="emulation_toggle_all">تبديل الكل</string> + <string name="emulation_toggle_all">الكل</string> <string name="emulation_control_adjust">ضبط التراكب</string> - <string name="emulation_control_scale">حجم</string> - <string name="emulation_control_opacity">العتامه</string> + <string name="emulation_control_scale">الحجم</string> + <string name="emulation_control_opacity">الشفافية</string> <string name="emulation_touch_overlay_reset">إعادة تعيين التراكب</string> <string name="emulation_touch_overlay_edit">تحرير التراكب</string> <string name="emulation_pause">إيقاف المحاكاة مؤقتًا</string> - <string name="emulation_unpause">إلغاء الإيقاف المؤقت للمضاهاة</string> + <string name="emulation_unpause">إلغاء الإيقاف المؤقت للمحاكاة</string> <string name="emulation_input_overlay">خيارات التراكب</string> + <string name="touchscreen">شاشة اللمس</string> - <string name="load_settings">جارٍ تحميل الإعدادات</string> + <string name="load_settings">جاري تحميل الإعدادات</string> <!-- Software keyboard --> <string name="software_keyboard">لوحة المفاتيح البرمجية</string> @@ -282,6 +358,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -326,10 +403,9 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> - <string name="screen_layout_landscape">افقي</string> - <string name="screen_layout_portrait">عمودي</string> <string name="screen_layout_auto">تلقائي</string> - + <string name="screen_layout_landscape">أفقي</string> + <string name="screen_layout_portrait">عمودي</string> <!-- Aspect Ratios --> <string name="ratio_default">(16:9) افتراضي</string> <string name="ratio_force_four_three">4:3 فرض</string> @@ -337,16 +413,20 @@ <string name="ratio_force_sixteen_ten">16:10 فرض</string> <string name="ratio_stretch">تمتد إلى النافذة</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (بطيء)</string> + <string name="cpu_backend_nce">تنفيذ التعليمات البرمجية الأصلية (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">دقه</string> <string name="cpu_accuracy_unsafe">غير آمن</string> - <string name="cpu_accuracy_paranoid">Paranoid (Slow)</string> + <string name="cpu_accuracy_paranoid">Paranoid (بطيء)</string> <!-- Gamepad Buttons --> - <string name="gamepad_d_pad">أزرار الاتجاهات</string> + <string name="gamepad_d_pad">الأسهم</string> <string name="gamepad_left_stick">العصا اليسرى</string> <string name="gamepad_right_stick">العصا اليمنى</string> - <string name="gamepad_home">شاشة الإستقبال</string> + <string name="gamepad_home">شاشة الرئيسية</string> <string name="gamepad_screenshot">لقطة شاشة</string> <!-- Disk shader cache --> @@ -362,11 +442,16 @@ <string name="change_theme_mode">تغيير وضع السمة</string> <string name="theme_mode_follow_system">اتبع النظام</string> <string name="theme_mode_light">فاتح</string> - <string name="theme_mode_dark">غامق</string> + <string name="theme_mode_dark">داكن</string> - <!-- Audio output engines --> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">خلفيات سوداء</string> <string name="use_black_backgrounds_description">عند استخدام المظهر الداكن، قم بتطبيق خلفيات سوداء.</string> diff --git a/src/android/app/src/main/res/values-ckb/strings.xml b/src/android/app/src/main/res/values-ckb/strings.xml index d2e5fee19..7e1eb2b8d 100644 --- a/src/android/app/src/main/res/values-ckb/strings.xml +++ b/src/android/app/src/main/res/values-ckb/strings.xml @@ -157,7 +157,6 @@ <string name="renderer_reactive_flushing_description">وردی ڕێندەرکردن لە هەندێک یاریدا باشتر دەکات لەسەر تێچووی کارایی.</string> <string name="use_disk_shader_cache">بیرگەخێرای سێبەری دیسک</string> <string name="use_disk_shader_cache_description">پچڕپچڕی کەمدەکاتەوە بە هەڵگرتن و بارکردنی سێبەری دروستکراو لە ناوخۆدا.</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="renderer_api">API گرافیک</string> @@ -183,13 +182,15 @@ <string name="submit">پێشکەشکردن</string> <string name="string_import">هاوردەکردن</string> <string name="export">هەناردەکردن</string> + <string name="install">دامەزراندن</string> + <string name="delete">سڕینەوە</string> + <string name="clear">سڕینەوە</string> <!-- GPU driver installation --> <string name="select_gpu_driver">هەڵبژاردنی وەگەڕخەری GPU</string> <string name="select_gpu_driver_title">حەز دەکەیت وەگەڕخەری GPU ی ئێستات بگۆڕیت؟</string> <string name="select_gpu_driver_install">دامەزراندن</string> <string name="select_gpu_driver_default">بنەڕەت</string> <string name="select_gpu_driver_use_default">بەکارهێنانی وەگەڕخەری GPU ی بنەڕەت</string> - <string name="select_gpu_driver_error">وەگەڕخەری نادروست هەڵبژێردرا، بە بەکارهێنانی بنەڕەتی سیستەم!</string> <string name="system_gpu_driver">وەگەڕخەری GPU ی سیستەم</string> <string name="installing_driver">دامەزراندنی وەگەڕخەر...</string> @@ -201,7 +202,8 @@ <string name="preferences_audio">دەنگ</string> <string name="preferences_theme">ڕەنگ و ڕووکار</string> <string name="preferences_debug">چاککردنەوە</string> - + <string name="path">ڕێڕەو</string> + <string name="version">وەشان</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">ڕۆمەکەت کۆدکراوە</string> <string name="loader_error_encrypted_keys_description"><![CDATA[تکایە دڵنیابەوە لەدامەزراوی <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> فایلەکەت بۆ ئەوەی بتوانرێت یارییەکان کۆد بکرێنەوە.]]></string> @@ -228,6 +230,7 @@ <string name="emulation_pause">وەستاندنی ئیمولەیشن</string> <string name="emulation_unpause">لادانی وەستاندنی ئیمولەیشن</string> <string name="emulation_input_overlay">هەڵبژاردەکانی داپۆشەر</string> + <string name="touchscreen">رووکاری لەمسی</string> <string name="load_settings">بارکردنی ڕێکخستنەکان...</string> @@ -253,6 +256,7 @@ <string name="region_korea">کۆریا</string> <string name="region_taiwan">تایوان</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_gigabyte">GB</string> <!-- Renderer APIs --> <string name="renderer_vulkan">ڤوڵکان</string> @@ -290,8 +294,8 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">خودکار</string> - <!-- Aspect Ratios --> <string name="ratio_default">بنەڕەت (16:9)</string> <string name="ratio_force_four_three">ڕووبەری 4:3</string> @@ -326,6 +330,12 @@ <string name="theme_mode_light">ڕوناکی</string> <string name="theme_mode_dark">تاریک</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">پاشبنەمای ڕەش</string> <string name="use_black_backgrounds_description">لە کاتی بەکارهێنانی ڕووکاری تاریکدا، پاشبنەمای ڕەش دادەنێ.</string> diff --git a/src/android/app/src/main/res/values-cs/strings.xml b/src/android/app/src/main/res/values-cs/strings.xml new file mode 100644 index 000000000..b9a4a11e4 --- /dev/null +++ b/src/android/app/src/main/res/values-cs/strings.xml @@ -0,0 +1,265 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> + + <string name="emulation_notification_channel_name">Emulace je aktivní</string> + <string name="notice_notification_channel_name">Upozornění a chyby</string> + <string name="notice_notification_channel_description">Ukáže oznámení v případě chyby.</string> + <string name="notification_permission_not_granted">Oznámení nejsou oprávněna!</string> + + <!-- Setup strings --> + <string name="welcome">Vítejte!</string> + <string name="get_started">Začít</string> + <string name="keys">Klíče</string> + <string name="select_keys">Vybrat klíče</string> + <string name="games">Hry</string> + <string name="done">Hotovo</string> + <string name="done_description">Vše je připraveno.\nUžijte si vaše hry!</string> + <string name="text_continue">Pokračovat</string> + <string name="next">Další</string> + <string name="back">Zpět</string> + <string name="add_games">Přidat hry</string> + <string name="add_games_description">Vyber svoji složku se hrami</string> + <!-- Home strings --> + <string name="home_games">Hry</string> + <string name="home_search">Hledat</string> + <string name="home_settings">Nastavení</string> + <string name="empty_gamelist">Nebyly nalezeny žádné soubory nebo ještě nebyl vybrán žádný adresář s hrami.</string> + <string name="search_and_filter_games">Hledat a filtrovat hry</string> + <string name="select_games_folder">Vybrat složku s hrami</string> + <string name="manage_game_folders">Spravovat složky s hrami</string> + <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> + <string name="install_prod_keys">Instalovat prod.keys</string> + <string name="install_prod_keys_warning">Přeskočit přidávání klíčů?</string> + <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string> + <string name="notifications">Oznámení</string> + <string name="give_permission">Udělit oprávnění</string> + <string name="notification_warning">Přeskočit udělení oprávnění k oznámení?</string> + <string name="notification_warning_description">yuzu vám nebude schopno oznámit důležité informace.</string> + <string name="permission_denied">Oprávnění zamítnuto</string> + <string name="permission_denied_description">Zamítnul jste toto oprávnění příliš mnohokrát, musíte manuálně udělit oprávnění v nastavení systému.</string> + <string name="about">O aplikaci</string> + <string name="about_description">Verze sestavení, titulky a více</string> + <string name="warning_help">Pomoc</string> + <string name="warning_skip">Přeskočit</string> + <string name="warning_cancel">Zrušit</string> + <string name="install_amiibo_keys">Instalovat Amiibo klíče</string> + <string name="install_amiibo_keys_description">Povinné použití Amiibo ve hře</string> + <string name="invalid_keys_file">Vybrané klíče jsou neplatné</string> + <string name="install_keys_success">Klíče úspěšně nainstalovány</string> + <string name="reading_keys_failure">Chyba při čtení šifrovacích klíčů</string> + <string name="invalid_keys_error">Neplatné šifrovací klíče</string> + <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> + <string name="gpu_driver_manager">Správce ovladače GPU</string> + <string name="install_gpu_driver">Instalovat GPU ovladač</string> + <string name="advanced_settings">Pokročilé nastavení</string> + <string name="settings_description">Konfigurovat nastavení emulátoru</string> + <string name="search_recently_played">Nedávno hrané</string> + <string name="search_recently_added">Nedávno přidané</string> + <string name="search_homebrew">Homebrew</string> + <string name="open_user_folder">Otevřít yuzu složku</string> + <string name="open_user_folder_description">Spravovat soubory yuzu</string> + <string name="no_file_manager">Nenalezen žádný správce souborů</string> + <string name="notification_no_directory_link">Nepovedlo se otevřít yuzu složku</string> + <string name="manage_save_data">Spravovat data postupu ve hře</string> + <string name="manage_save_data_description">Data postupu nalezeny. Prosím vyberte možnost.</string> + <string name="import_export_saves_description">Importovat nebo exportovat data postupu</string> + <string name="save_file_imported_success">Uspěšně importováno</string> + <string name="save_file_invalid_zip_structure">Neplatná struktura dat postupu</string> + <string name="import_saves">Importovat</string> + <string name="export_saves">Exportovat</string> + <string name="install_firmware">Nainstalovat firmware</string> + <string name="firmware_installing">Instalování firmwaru</string> + <string name="firmware_installed_success">Firmware byl úspěšně nainstalován</string> + <string name="firmware_installed_failure">Instalace firmwaru selhala</string> + <string name="install_game_content">Nainstalovat obsah hry</string> + <string name="install_game_content_description">Nainstalovat aktualizace hry nebo DLC</string> + <string name="installing_game_content">Instalování obsahu...</string> + <string name="install_game_content_failure">Chyba při instalaci soubor(ů) do NAND</string> + <string name="manage_yuzu_data">Spravovat data yuzu</string> + <string name="game_folders">Složky s hrami</string> + <string name="folder_already_added">Tato složka byla již přidána!</string> + <string name="game_folder_properties">Vlastnosti složky s hrami</string> + <string name="album_applet_description">Zobrazovat obrázky uložené v uživatelské složce se snímky obrazovky pomocí systémového prohlížeče fotografií</string> + <string name="cabinet_nickname_and_owner">Nastavení přezdívky a vlastníka</string> + <!-- About screen strings --> + <string name="gaia_is_not_real">Gaia není skutečná</string> + <string name="copied_to_clipboard">Zkopírováno do schránky</string> + <string name="about_app_description">Open-source Switch emulátor</string> + <string name="contributors">Přispěvatelé</string> + <string name="contributors_description">Vyrobeno s \u2764 od yuzu týmu</string> + <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> + <string name="build">Číslo sestavení</string> + <string name="user_data">Uživatelská data</string> + <string name="exporting_user_data">Exportování uživatelských dat...</string> + <string name="importing_user_data">Importování uživatelských dat...</string> + <string name="import_user_data">Importovat uživatelská data</string> + <string name="invalid_yuzu_backup">Neplatná záloha yuzu</string> + <string name="user_data_export_success">Uživatelská data byla úspěšně exportována.</string> + <string name="user_data_import_success">Uživatelská data byla úspěšně importována.</string> + <string name="user_data_export_cancelled">Export zrušen</string> + <string name="support_link">https://discord.gg/u77vRWY</string> + <string name="website_link">https://yuzu-emu.org/</string> + <string name="github_link">https://github.com/yuzu-emu</string> + + <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string> + <string name="no_manual_installation">Žádná manuální instalace</string> + <string name="prioritized_support">Prioritní podpora</string> + <string name="our_eternal_gratitude">Naše věčná vděčnost</string> + <string name="are_you_interested">Máte zájem?</string> + + <!-- General settings strings --> + <string name="frame_limit_enable">Omezit rychlost</string> + <string name="cpu_accuracy">CPU přesnost</string> + <string name="emulated_region">Emulovaná oblast</string> + <string name="emulated_language">Emulovaný jazyk</string> + <string name="use_custom_rtc">Vlastní RTC</string> + <!-- Graphics settings strings --> + <string name="renderer_accuracy">Úroveň přesnosti</string> + <string name="renderer_vsync">VSync režim</string> + <string name="renderer_screen_layout">Orientace</string> + <string name="renderer_aspect_ratio">Poměr stran</string> + <!-- Debug settings strings --> + <string name="cpu">CPU</string> + <string name="renderer_api">API</string> + <!-- Audio settings strings --> + <string name="audio_output_engine">Výstupní engine</string> + <string name="audio_volume">Hlasitost</string> + <string name="audio_volume_description">Udává hlasitost zvukového výstupu.</string> + + <!-- Miscellaneous --> + <string name="slider_default">Výchozí</string> + <string name="ini_saved">Nastavení uložena</string> + <string name="gameid_saved">Uložena nastavení pro %1$s</string> + <string name="loading">Načítání...</string> + <string name="shutting_down">Vypínání...</string> + <string name="reset_setting_confirmation">Chcete obnovit toto nastavení zpět na jeho výchozí hodnotu?</string> + <string name="reset_to_default">Navrátit k výchozímu</string> + <string name="reset_all_settings">Resetovat všechna nastavení?</string> + <string name="reset_all_settings_description">Všechna pokročilá nastavení budou obnovena na jejich výchozí konfiguraci. Toto nelze vrátit zpět.</string> + <string name="close">Zavřít</string> + <string name="learn_more">Zjistit více</string> + <string name="auto">Automatické</string> + <string name="string_import">Importovat</string> + <string name="export">Exportovat</string> + <string name="install">Nainstalovat</string> + <string name="delete">Smazat</string> + <string name="export_success">Úspěšně exportováno</string> + <string name="start">Start</string> + <string name="clear">Vymazat</string> + <string name="custom">Vlastní</string> + <!-- GPU driver installation --> + <string name="select_gpu_driver">Vybrat GPU ovladač</string> + <string name="select_gpu_driver_title">Chcete nahradit váš aktuální ovladač GPU?</string> + <string name="select_gpu_driver_install">Nainstalovat</string> + <string name="select_gpu_driver_default">Výchozí</string> + <string name="select_gpu_driver_error">Vybrán neplatný ovladač</string> + <string name="driver_already_installed">Ovladač již nainstalován</string> + <string name="system_gpu_driver">Systémový ovladač GPU</string> + <string name="installing_driver">Instalování ovladače...</string> + + <!-- Preferences Screen --> + <string name="preferences_settings">Nastavení</string> + <string name="preferences_general">Obecné</string> + <string name="preferences_system">Systém</string> + <string name="preferences_graphics">Grafika</string> + <string name="preferences_audio">Zvuk</string> + <string name="preferences_audio_description">Výstupní engine, hlasitost</string> + <string name="preferences_theme">Vzhled a barva</string> + <string name="preferences_debug">Ladění</string> + <!-- Game properties --> + <string name="info">Info</string> + <string name="path">Cesta</string> + <string name="developer">Vývojář</string> + <string name="version">Verze</string> + <string name="copy_details">Zkopírovat podrobnosti</string> + <string name="add_ons">Modifkace</string> + <string name="addons_game">Rozšíření: %1$s</string> + <string name="select_content_type">Typ obsahu</string> + <string name="updates_and_dlc">Aktualizace a DLC</string> + <string name="mods_and_cheats">Módy a cheaty</string> + <string name="addon_installed_successfully">Rozšíření úspěšně nainstalováno</string> + <string name="verifying_content">Ověřování obsahu...</string> + <string name="emulation_done">Hotovo</string> + <string name="emulation_control_scale">Měřítko</string> + <string name="emulation_control_opacity">Průhlednost</string> + <string name="touchscreen">Dotyková obrazovka</string> + + <!-- Errors and warnings --> + <string name="abort_button">Přerušit</string> + <string name="continue_button">Pokračovat</string> + <string name="system_archive_not_found">Systémový Archív Nenalezen</string> + <string name="save_load_error">Ukládací/Načítací chyba</string> + <string name="fatal_error">Fatální Chyba</string> + <!-- Region Names --> + <string name="region_japan">Japonsko</string> + <string name="region_usa">USA</string> + <string name="region_europe">Evropa</string> + <string name="region_australia">Austrálie</string> + <string name="region_china">Čína</string> + <string name="region_korea">Korea</string> + <string name="region_taiwan">Taiwan</string> + + <string name="memory_byte_shorthand">B</string> + <string name="memory_gigabyte">GB</string> + <!-- Renderer APIs --> + <string name="renderer_vulkan">Vulkan</string> + <string name="renderer_none">Žádné</string> + + <!-- Renderer Accuracy --> + <string name="renderer_accuracy_normal">Normální</string> + <string name="renderer_accuracy_high">Vysoká</string> + <!-- Resolutions --> + <string name="resolution_half">0.5X (360p/540p)</string> + <string name="resolution_three_quarter">0.75X (540p/810p)</string> + <string name="resolution_one">1X (720p/1080p)</string> + <string name="resolution_two">2X (1440p/2160p) (Pomalé)</string> + <string name="resolution_three">3X (2160p/3240p) (Pomalé)</string> + <string name="resolution_four">4X (2880p/4320p) (Pomalé)</string> + + <string name="scaling_filter_bilinear">Bilineární</string> + <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolution</string> + + <!-- Anti-Aliasing --> + <string name="anti_aliasing_none">Žádné</string> + <string name="anti_aliasing_fxaa">FXAA</string> + <string name="anti_aliasing_smaa">SMAA</string> + + <!-- Screen Layouts --> + <string name="screen_layout_auto">Automatické</string> + <!-- Aspect Ratios --> + <string name="ratio_default">Výchozí (16:9)</string> + <string name="ratio_force_four_three">Vynutit 4:3</string> + <string name="ratio_force_twenty_one_nine">Vynutit 21:9</string> + <!-- CPU Accuracy --> + <string name="cpu_accuracy_accurate">Přesné</string> + <string name="cpu_accuracy_unsafe">Nebezpečné</string> + <string name="gamepad_home">Home</string> + <string name="building_shaders">Budování shaderů</string> + + <!-- Theme options --> + <string name="change_app_theme">Změnit vzhled aplikace</string> + <string name="theme_default">Výchozí</string> + <string name="theme_material_you">Material You</string> + + <!-- Theme Modes --> + <string name="change_theme_mode">Změnit styl vzhledu</string> + <string name="theme_mode_follow_system">Podle systému</string> + <string name="theme_mode_light">Světlé</string> + <string name="theme_mode_dark">Tmavé</string> + + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + + <!-- Black backgrounds theme --> + <string name="use_black_backgrounds">Černá pozadí</string> + <!-- Picture-In-Picture --> + <string name="picture_in_picture">Obraz v obraze</string> + <string name="mute">Ztlumit</string> + <string name="unmute">Vypnout ztlumení</string> + + <!-- Licenses screen strings --> + <string name="licenses">Licence</string> + </resources> diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml index 9c6590b5e..483ea8c88 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">Es wurden keine Dateien gefunden oder es wurde noch kein Spielverzeichnis ausgewählt.</string> <string name="search_and_filter_games">Spiele suchen und filtern</string> <string name="select_games_folder">Spieleverzeichnis auswählen</string> + <string name="manage_game_folders">Spiele-Ordner verwalten</string> <string name="select_games_folder_description">Erlaubt yuzu die Spieleliste zu füllen</string> <string name="add_games_warning">Auswahl des Spieleverzeichnisses überspringen?</string> <string name="add_games_warning_description">Spiele werden in der Spieleliste nicht angezeigt, wenn kein Ordner ausgewählt ist.</string> @@ -67,9 +68,11 @@ <string name="invalid_keys_error">Ungültige Schlüssel</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">Die ausgewählte Datei ist falsch oder beschädigt. Bitte kopieren Sie Ihre Schlüssel erneut.</string> + <string name="gpu_driver_manager">GPU-Treiber Verwaltung</string> <string name="install_gpu_driver">GPU-Treiber installieren</string> <string name="install_gpu_driver_description">Alternative Treiber für eventuell bessere Leistung oder Genauigkeit installieren</string> <string name="advanced_settings">Erweiterte Einstellungen</string> + <string name="advanced_settings_game">Erweiterte Einstellungen: %1$s</string> <string name="settings_description">Emulatoreinstellungen konfigurieren</string> <string name="search_recently_played">Kürzlich gespielt</string> <string name="search_recently_added">Kürzlich hinzugefügt</string> @@ -83,7 +86,11 @@ <string name="notification_no_directory_link_description">Bitte suche den Benutzerordner manuell über die Seitenleiste des Dateimanagers.</string> <string name="manage_save_data">Speicherdaten verwalten</string> <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string> + <string name="import_save_warning">Speicherdaten importieren</string> + <string name="import_save_warning_description">Das überschreibt alle existierenden Speicherdaten für dieses Spiel mit der ausgewählten Datei. Wirklich fortfahren?</string> <string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string> + <string name="save_files_importing">Importiere Speicherdaten...</string> + <string name="save_files_exporting">Exportiere Speicherdaten...</string> <string name="save_file_imported_success">Erfolgreich importiert</string> <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string> <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string> @@ -98,8 +105,17 @@ <string name="share_log_description">Debug-Logs an yuzu zur Untersuchung absenden</string> <string name="share_log_missing">Keine Log-Datei gefunden</string> <string name="install_game_content">Spiel installieren</string> - <string name="install_game_content_description">Spiel Update oder DLC installieren</string> + <string name="install_game_content_description">Spiel-Updates oder DLCs installieren</string> + <string name="installing_game_content">Installiere...</string> + <string name="install_game_content_failed_count">%1$d Installationsfehler</string> + <string name="install_game_content_success_install">%1$d erfolgreich installiert</string> + <string name="install_game_content_success_overwrite">%1$d erfolgreich überschrieben</string> <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string> + <string name="manage_yuzu_data">yuzu-Daten Verwalten</string> + <string name="share_save_file">Speicherdaten teilen</string> + <string name="game_folders">Spiele-Ordner</string> + <string name="add_game_folder">Spiele-Ordner hinzufügen</string> + <string name="applets_error_firmware">Firmware nicht installiert</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia ist nicht real</string> <string name="copied_to_clipboard">In die Zwischenablage kopiert</string> @@ -110,6 +126,10 @@ <string name="licenses_description">Projekte, die yuzu für Android möglich machen </string> <string name="build">Build</string> <string name="user_data">Nutzerdaten</string> + <string name="importing_user_data">Importiere Nutzerdaten...</string> + <string name="import_user_data">Nutzerdaten importieren</string> + <string name="user_data_export_success">Nutzerdaten erfolgreich exportiert</string> + <string name="user_data_import_success">Nutzerdaten erfolgreich importiert</string> <string name="user_data_export_cancelled">Export abgebrochen</string> <string name="support_link">https://discord.gg/u77vRWY</string> <string name="website_link">https://yuzu-emu.org/</string> @@ -137,7 +157,7 @@ <string name="cpu_accuracy">CPU-Genauigkeit</string> <!-- System settings strings --> <string name="use_docked_mode">Gedockter Modus</string> - <string name="use_docked_mode_description">Der Docked Modus erhöht die Auflösung, verringert die aber die Leistung. Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die Leistung.</string> + <string name="use_docked_mode_description">Der Gedockte-Modus erhöht die Auflösung, verringert aber die Leistung. Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die Leistung.</string> <string name="emulated_region">Emulierte Region</string> <string name="emulated_language">Emulierte Sprache</string> <string name="select_rtc_date">RTC-Datum auswählen</string> @@ -145,10 +165,12 @@ <string name="use_custom_rtc">Benutzerdefinierte Echtzeituhr</string> <!-- Graphics settings strings --> <string name="renderer_accuracy">Genauigkeitsstufe</string> + <string name="renderer_resolution">Auflösung (Mobil/Gedockt)</string> <string name="renderer_vsync">VSync-Modus</string> <string name="renderer_screen_layout">Orientierung</string> <string name="renderer_aspect_ratio">Seitenverhältnis</string> <string name="renderer_scaling_filter">Fensteranpassungsfilter</string> + <string name="renderer_anti_aliasing">Kantenglättung</string> <string name="renderer_force_max_clock">Maximale Taktfrequenz erzwingen (nur Adreno)</string> <string name="renderer_force_max_clock_description">Erzwingt den Betrieb der GPU mit der maximal möglichen Taktfrequenz (Temperaturbeschränkungen werden weiterhin angewendet).</string> <string name="renderer_asynchronous_shaders">Asynchrone Shader nutzen</string> @@ -168,9 +190,12 @@ <string name="error_saving">Fehler beim Speichern von %1$s.ini: %2$s</string> <string name="unimplemented_menu">Unimplementiertes Menü</string> <string name="loading">Lädt...</string> + <string name="shutting_down">Beendet...</string> <string name="reset_setting_confirmation">Möchtest du diese Einstellung auf den Standardwert zurücksetzen?</string> <string name="reset_to_default">Auf Standard zurücksetzen</string> + <string name="reset_to_default_description">Setzt alle erweiterten Einstellungen zurück</string> <string name="reset_all_settings">Alle Einstellungen zurücksetzen?</string> + <string name="reset_all_settings_description">Alle erweiterten Einstellungen werden auf ihren Standardwert zurückgesetzt. Dies kann nicht rückgängig gemacht werden.</string> <string name="settings_reset">Einstellungen zurückgesetzt</string> <string name="close">Schließen</string> <string name="learn_more">Mehr erfahren</string> @@ -182,14 +207,20 @@ <string name="export_failed">Export fehlgeschlagen</string> <string name="import_failed">Import fehlgeschlagen</string> <string name="cancelling">Abbrechen</string> - + <string name="install">Installieren</string> + <string name="delete">Löschen</string> + <string name="edit">Bearbeiten</string> + <string name="export_success">Erfolgreich exportiert</string> + <string name="start">Start</string> + <string name="clear">Löschen</string> + <string name="custom">Benutzerdefiniert</string> <!-- GPU driver installation --> <string name="select_gpu_driver">GPU-Treiber auswählen</string> <string name="select_gpu_driver_title">Möchtest du deinen aktuellen GPU-Treiber ersetzen?</string> <string name="select_gpu_driver_install">Installieren</string> <string name="select_gpu_driver_default">Standard</string> <string name="select_gpu_driver_use_default">Standard GPU-Treiber wird verwendet</string> - <string name="select_gpu_driver_error">Ungültiger Treiber ausgewählt, Standard-Treiber wird verwendet!</string> + <string name="driver_already_installed">Treiber bereits installiert</string> <string name="system_gpu_driver">System GPU-Treiber</string> <string name="installing_driver">Treiber wird installiert...</string> @@ -197,11 +228,37 @@ <string name="preferences_settings">Einstellungen</string> <string name="preferences_general">Allgemein</string> <string name="preferences_system">System</string> + <string name="preferences_system_description">Gedockter Modus, Region, Sprache</string> <string name="preferences_graphics">Grafik</string> + <string name="preferences_graphics_description">Genauigkeitsstufe, Auflösung, Shader-Cache</string> <string name="preferences_audio">Audio</string> + <string name="preferences_audio_description">Ausgabe-Engine, Lautstärke</string> <string name="preferences_theme">Theme und Farbe</string> <string name="preferences_debug">Debug</string> - + <!-- Game properties --> + <string name="info">Info</string> + <string name="info_description">Programm-ID, Entwickler, Version</string> + <string name="per_game_settings">Spieleinstellungen</string> + <string name="per_game_settings_description">Einstellungen für dieses Spiel ändern</string> + <string name="path">Pfad</string> + <string name="program_id">Programm-ID</string> + <string name="developer">Entwickler</string> + <string name="version">Version</string> + <string name="copy_details">Details kopieren</string> + <string name="add_ons">Add-ons</string> + <string name="add_ons_description">Mods, Updates und DLC aktivieren oder deaktivieren</string> + <string name="clear_shader_cache">Shader-Cache löschen</string> + <string name="clear_shader_cache_description">Löscht alle für dieses Spiel erstellten Shader</string> + <string name="cleared_shaders_successfully">Shader erfolgreich gelöscht</string> + <string name="addons_game">Add-ons: %1$s</string> + <string name="save_data">Speicherdaten</string> + <string name="save_data_description">Importiert oder exportiert Speicherdaten für dieses Spiel</string> + <string name="delete_save_data">Speicherdaten löschen</string> + <string name="delete_save_data_description">Löscht alle Speicherdaten für dieses Spiel</string> + <string name="delete_save_data_warning_description">Das löscht unwiederbringlich alle Speicherdaten für dieses Spiel. Wirklich fortfahren?</string> + <string name="save_data_deleted_successfully">Speicherdaten erfolgreich gelöscht</string> + <string name="invalid_directory">Ungültiges Verzeichnis</string> + <string name="addon_installed_successfully">Add-on erfolgreich installiert</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Das ROM ist verschlüsselt</string> <string name="loader_error_encrypted_keys_description"><![CDATA[Bitte stelle sicher dass die <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> Datei installiert ist, damit Spiele entschlüsselt werden können.]]></string> @@ -220,7 +277,10 @@ <string name="emulation_control_opacity">Transparenz</string> <string name="emulation_touch_overlay_reset">Overlay zurücksetzen</string> <string name="emulation_touch_overlay_edit">Overlay bearbeiten</string> + <string name="emulation_pause">Emulation pausieren</string> + <string name="emulation_unpause">Emulation fortsetzen</string> <string name="emulation_input_overlay">Overlay-Optionen</string> + <string name="touchscreen">Touchscreen</string> <string name="load_settings">Lade Einstellungen...</string> @@ -248,6 +308,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -291,9 +352,10 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> - <string name="screen_layout_portrait">Portrait</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">Auto</string> - + <string name="screen_layout_landscape">Horizontal</string> + <string name="screen_layout_portrait">Vertikal</string> <!-- Aspect Ratios --> <string name="ratio_default">Standard (16:9)</string> <string name="ratio_force_four_three">4:3 erzwingen</string> @@ -318,22 +380,27 @@ <string name="building_shaders">Shader werden erstellt</string> <!-- Theme options --> - <string name="change_app_theme">App-Thema ändern</string> + <string name="change_app_theme">Theme</string> <string name="theme_default">Standard</string> <string name="theme_material_you">Material You</string> <!-- Theme Modes --> - <string name="change_theme_mode">Themen-Modus ändern</string> + <string name="change_theme_mode">Design</string> <string name="theme_mode_follow_system">System folgen</string> <string name="theme_mode_light">Hell</string> <string name="theme_mode_dark">Dunkel</string> - <!-- Audio output engines --> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Schwarze Hintergründe</string> - <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Themes, schwarze Hintergründe verwenden.</string> + <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Designs, schwarze Hintergründe verwenden.</string> <!-- Picture-In-Picture --> <string name="picture_in_picture">Bild im Bild</string> diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index 103ac6e65..c3825710b 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -4,7 +4,7 @@ <string name="app_disclaimer">Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o claves no vienen incluidos.<br /><br />Antes de empezar, por favor, localice el archivo <![CDATA[<b> prod.keys </b>]]>en el almacenamiento de su dispositivo..<br /><br /><![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saber más</a>]]></string> <string name="emulation_notification_channel_name">Emulación activa</string> <string name="emulation_notification_channel_description">Muestra una notificación persistente cuando la emulación está activa.</string> - <string name="emulation_notification_running">yuzu esta ejecutándose</string> + <string name="emulation_notification_running">yuzu está ejecutándose</string> <string name="notice_notification_channel_name">Avisos y errores</string> <string name="notice_notification_channel_description">Mostrar notificaciones cuándo algo vaya mal.</string> <string name="notification_permission_not_granted">¡Permisos de notificación no concedidos!</string> @@ -34,6 +34,7 @@ <string name="empty_gamelist">No se ha encontrado ningún archivo o aún no se ha seleccionado ningún directorio de juegos.</string> <string name="search_and_filter_games">Busca y filtra juegos</string> <string name="select_games_folder">Seleccionar carpeta de juegos</string> + <string name="manage_game_folders">Gestionar carpetas de juegos</string> <string name="select_games_folder_description">Permite que yuzu llene la lista de juegos</string> <string name="add_games_warning">¿Omitir la selección de la carpeta de juegos?</string> <string name="add_games_warning_description">No se mostrará ningún juego si no se ha seleccionado una carpeta de juegos.</string> @@ -44,23 +45,23 @@ <string name="install_prod_keys">Instalar prod.keys</string> <string name="install_prod_keys_description">Requerido para descifrar juegos</string> <string name="install_prod_keys_warning">¿Omitir agregar claves?</string> - <string name="install_prod_keys_warning_description">Se requieren claves válidas para emular juegos. Solo las aplicaciones homebrew funcionarán si continúas.</string> + <string name="install_prod_keys_warning_description">Se requieren claves válidas para emular juegos. Solo las aplicaciones homebrew funcionarán si continúas.</string> <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string> <string name="notifications">Notificaciones</string> - <string name="notifications_description">Otorgue el permiso de notificación con el botón de abajo.</string> + <string name="notifications_description">Otorga el permiso de notificación con el botón de abajo.</string> <string name="give_permission">Conceder permiso</string> <string name="notification_warning">¿Omitir conceder el permiso de notificación?</string> <string name="notification_warning_description">yuzu no podrá notificarte información importante.</string> <string name="permission_denied">Permiso denegado</string> - <string name="permission_denied_description">Negó este permiso demasiadas veces y ahora debe otorgarlo manualmente en la configuración del sistema.</string> + <string name="permission_denied_description">Se ha denegado este permiso demasiadas veces y ahora debes otorgarlo de forma manual en la configuración del sistema.</string> <string name="about">Acerca de</string> <string name="about_description">Versión, créditos y más</string> <string name="warning_help">Ayuda</string> <string name="warning_skip">Siguiente</string> <string name="warning_cancel">Cancelar</string> - <string name="install_amiibo_keys">Instalar clave de Amiiboo</string> - <string name="install_amiibo_keys_description">Necesario para usar Amiibo en el juego</string> - <string name="invalid_keys_file">Archivo de claves seleccionado inválido</string> + <string name="install_amiibo_keys">Instalar claves de Amiibo</string> + <string name="install_amiibo_keys_description">Necesario para usar Amiibos en el juego</string> + <string name="invalid_keys_file">Archivo de claves seleccionado no válido</string> <string name="install_keys_success">Claves instaladas correctamente</string> <string name="reading_keys_failure">Error al leer las claves de cifrado</string> <string name="install_prod_keys_failure_extension_description">Compruebe que el archivo de claves tenga una extensión .keys y pruebe otra vez.</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">Claves de cifrado no válidas</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">El archivo seleccionado es incorrecto o está corrupto. Vuelva a redumpear sus claves.</string> + <string name="gpu_driver_manager">Explorador de drivers de GPU</string> <string name="install_gpu_driver">Instalar driver de GPU</string> <string name="install_gpu_driver_description">Instale drivers alternativos para obtener un rendimiento o una precisión potencialmente mejores</string> <string name="advanced_settings">Opciones avanzadas</string> @@ -85,7 +87,11 @@ <string name="notification_no_directory_link_description">Por favor, busque la carpeta user con el panel lateral del explorador de archivos de forma manual.</string> <string name="manage_save_data">Administrar datos de guardado</string> <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string> + <string name="import_save_warning">Importar datos de guardado</string> + <string name="import_save_warning_description">Ésto sobreescribirá todos los datos de guardado existentes con el archivo proporcionado. ¿Está seguro de querer continuar?</string> <string name="import_export_saves_description">Importar o exportar archivos de guardado</string> + <string name="save_files_importing">Importando archivos de guardado...</string> + <string name="save_files_exporting">Exportando archivos de guardado...</string> <string name="save_file_imported_success">Importado correctamente</string> <string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string> <string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string> @@ -95,7 +101,7 @@ <string name="install_firmware_description">El firmware debe estar en un archivo ZIP y es necesario para ejecutar algunos juegos</string> <string name="firmware_installing">Instalando firmware</string> <string name="firmware_installed_success">Firmware instalado con éxito</string> - <string name="firmware_installed_failure">Falló la instalación de firmware</string> + <string name="firmware_installed_failure">Error en la instalación de firmware</string> <string name="firmware_installed_failure_description">Asegúrese de que los archivos nca del firmware estén en la raíz del zip e inténtelo de nuevo.</string> <string name="share_log">Compartir registros de depuración</string> <string name="share_log_description">Comparta el archivo de registro de yuzu para depurar problemas</string> @@ -115,9 +121,43 @@ <string name="custom_driver_not_supported">Drivers personalizados no soportados</string> <string name="custom_driver_not_supported_description">En estos momentos, la carga de drivers personalizados no está disponible para este dispositivo..\n¡Comprueba esta opción en el futuro para ver si ya está añadido el soporte a ese dispositivo!</string> <string name="manage_yuzu_data">Administrar datos de yuzu</string> - <string name="manage_yuzu_data_description">Importa/exporta el firmware, las keys, los datos de usuario, ¡y más!</string> + <string name="manage_yuzu_data_description">Importa/exporta el firmware, las claves, los datos de usuario, ¡y más!</string> <string name="share_save_file">Compartir archivo de guardado</string> - <string name="export_save_failed">La exportación del guardado falló</string> + <string name="export_save_failed">Error al exportar el archivo de guardado</string> + <string name="game_folders">Carpetas de juegos</string> + <string name="deep_scan">Escaneo recursivo </string> + <string name="add_game_folder">Añadir carpeta con juegos</string> + <string name="folder_already_added">¡Está carpeta ya se había añadido!</string> + <string name="game_folder_properties">Propiedades de la carpeta de juegos</string> + <plurals name="saves_import_failed"> + <item quantity="one">No se ha podido importar %d archivo de guardado.</item> + <item quantity="many">No se han podido importar %d archivos de guardado.</item> + <item quantity="other">No se han podido importar %d archivos de guardado.</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">%d archivo de guardado importado con éxito.</item> + <item quantity="many">%d archivos de guardado importados con éxito.</item> + <item quantity="other">%d archivos de guardado importados con éxito.</item> + </plurals> + <string name="no_save_data_found">No hay archivos de guardado</string> + + <!-- Applet launcher strings --> + <string name="applets">Ejecutador de applet</string> + <string name="applets_description">Ejecutar applets de sistema usando el firmware instalado</string> + <string name="applets_error_firmware">Firmware no instalado</string> + <string name="applets_error_applet">Applet no disponible</string> + <string name="applets_error_description"><![CDATA[Asegúrese de que el archivo<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> y el <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> estén instalados e inténtelo de nuevo.]]></string> + <string name="album_applet">Álbum</string> + <string name="album_applet_description">Ver las imágenes que están en la carpeta \"screenshots\" del usuario con el visor de fotos del sistema</string> + <string name="mii_edit_applet">Editor de Mii</string> + <string name="mii_edit_applet_description">Mira y edita Mii con el editor del sistema</string> + <string name="cabinet_applet">Cabinet</string> + <string name="cabinet_applet_description">Edita y borra los datos guardado del amiibo</string> + <string name="cabinet_launcher">Ejecutador de Cabinet</string> + <string name="cabinet_nickname_and_owner">Configuración del apodo y propietario</string> + <string name="cabinet_game_data_eraser">Borrador de datos de juego</string> + <string name="cabinet_restorer">Restaurador</string> + <string name="cabinet_formatter">Formateador</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia no es real</string> @@ -161,6 +201,7 @@ <string name="frame_limit_enable_description">Limita la velocidad de emulación a un porcentaje específico de la velocidad normal.</string> <string name="frame_limit_slider">Limitar porcentaje de velocidad</string> <string name="frame_limit_slider_description">Especifica el porcentaje para limitar la velocidad de emulación. 100% es la velocidad normal. Valores más altos o bajos incrementarán o disminuirán el límite de velocidad.</string> + <string name="cpu_backend">Motor de CPU</string> <string name="cpu_accuracy">Precisión de CPU</string> <string name="value_with_units">%1$s%2$s</string> @@ -186,11 +227,13 @@ <string name="renderer_force_max_clock">Forzar velocidad al máximo (solo Adreno)</string> <string name="renderer_force_max_clock_description">Fuerza a la GPU a ejecutarse a la velocidad máxima de reloj posible (se seguirán aplicando restricciones térmicas).</string> <string name="renderer_asynchronous_shaders">Usar shaders asíncronos</string> - <string name="renderer_asynchronous_shaders_description">Compila shaders de manera asíncrona, reduciendo los parones, pero puede introducir fallos.</string> + <string name="renderer_asynchronous_shaders_description">Compila shaders de manera asíncrona, reduce los parones pero puede introducir fallos.</string> <string name="renderer_reactive_flushing">Usar limpieza reactiva</string> <string name="renderer_reactive_flushing_description">Mejora la precisión de renderizado en algunos juegos, pero reduce el rendimiento.</string> <string name="use_disk_shader_cache">Caché de shaders en disco</string> <string name="use_disk_shader_cache_description">Reduce los parones almacenando y cargando shaders generados.</string> + <string name="anisotropic_filtering">Filtrado anisotrópico</string> + <string name="anisotropic_filtering_description">Mejora la calidad de las texturas al ser observadas desde ángulos oblicuos</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> @@ -217,6 +260,7 @@ <string name="shutting_down">Saliendo...</string> <string name="reset_setting_confirmation">¿Desea restablecer esta configuración a su valor predeterminado?</string> <string name="reset_to_default">Restablecer a predeterminado</string> + <string name="reset_to_default_description">Reinicia todos los ajustes avanzados</string> <string name="reset_all_settings">¿Restablecer todas las configuraciones?</string> <string name="reset_all_settings_description">Todas las opciones avanzadas se restablecerán a su configuración predeterminada. Esta acción no se puede deshacer.</string> <string name="settings_reset">Reiniciar la configuracion</string> @@ -230,14 +274,24 @@ <string name="export_failed">La exportación falló</string> <string name="import_failed">La importación falló</string> <string name="cancelling">Cancelando</string> - + <string name="install">Instalar</string> + <string name="delete">Borrar</string> + <string name="edit">Editar</string> + <string name="export_success">Exportado correctamente</string> + <string name="start">Comenzar</string> + <string name="clear">Limpiar</string> + <string name="global">Global</string> + <string name="custom">Perzonalizado</string> + <string name="notice">Aviso</string> + <string name="import_complete">La importación se completó</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Seleccionar driver GPU</string> <string name="select_gpu_driver_title">¿Quiere reemplazar el driver de GPU actual?</string> <string name="select_gpu_driver_install">Instalar</string> <string name="select_gpu_driver_default">Predeterminado</string> <string name="select_gpu_driver_use_default">Usando el driver de GPU por defecto </string> - <string name="select_gpu_driver_error">¡Driver no válido, utilizando el predeterminado del sistema!</string> + <string name="select_gpu_driver_error">Driver no válido seleccionado</string> + <string name="driver_already_installed">Driver ya instalado</string> <string name="system_gpu_driver">Driver GPU del sistema</string> <string name="installing_driver">Instalando driver...</string> @@ -245,11 +299,52 @@ <string name="preferences_settings">Ajustes</string> <string name="preferences_general">General</string> <string name="preferences_system">Sistema</string> + <string name="preferences_system_description">Modo en Dock, región, idioma</string> <string name="preferences_graphics">Gráficos</string> + <string name="preferences_graphics_description">Nivel de precisión, resolución, caché de shaders</string> <string name="preferences_audio">Audio</string> + <string name="preferences_audio_description">Motor de salida, volumen</string> <string name="preferences_theme">Tema y color</string> <string name="preferences_debug">Depuración</string> - + <string name="preferences_debug_description">CPU/GPU debug, API gráfica, fastMEM</string> + + <!-- Game properties --> + <string name="info">Información</string> + <string name="info_description">ID de programa, desarrollador, versión</string> + <string name="per_game_settings">Configuración por juego</string> + <string name="per_game_settings_description">Editar opciones específicas para este juego</string> + <string name="launch_options">Ejecutar configuración</string> + <string name="path">Ruta</string> + <string name="program_id">ID de programa</string> + <string name="developer">Desarrollador</string> + <string name="version">Versión</string> + <string name="copy_details">Copiar detalles</string> + <string name="add_ons">Extras/Add-ons</string> + <string name="add_ons_description">Activa/desactiva mods, actualizaciones y DLC</string> + <string name="clear_shader_cache">Limpiar la caché de shaders</string> + <string name="clear_shader_cache_description">Elimina todos los shaders construidos mientras se jugaba al juego</string> + <string name="clear_shader_cache_warning_description">Experimentarás más parones mientras que la caché de shaders se regenera</string> + <string name="cleared_shaders_successfully">Shaders limpiados con éxito</string> + <string name="addons_game">Addons: %1$s</string> + <string name="save_data">Datos de guardado</string> + <string name="save_data_description">Controla los datos de guardado de este juego</string> + <string name="delete_save_data">Borrar datos de guardado</string> + <string name="delete_save_data_description">Elimina todos los datos de guardado de este juego</string> + <string name="delete_save_data_warning_description">Ésto elimina de manera permanente todos los datos de guardado de este juego. ¿Seguro que quieres continuar?</string> + <string name="save_data_deleted_successfully">Datos de guardado eliminados con éxito</string> + <string name="select_content_type">Tipo de contenido</string> + <string name="updates_and_dlc">Actualizaciones y DLC</string> + <string name="mods_and_cheats">Mods y trucos</string> + <string name="addon_notice">Aviso importante de addons</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">Para instalar mods y trucos, debes seleccionar una carpeta que contiene los directorios cheats/, romfs/, o exefs/ . ¡No podemos confirmar si éstos serán compatibles con tu juego, así que ten cuidado!</string> + <string name="invalid_directory">Directorio no válido</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Por favor, asegúrese de que el directorio que ha selecionado incluye las carpetas cheats/, romfs/, o exefs/ e inténtelo de nuevo.</string> + <string name="addon_installed_successfully">Addon instalado con éxito</string> + <string name="verifying_content">Verificando contenido...</string> + <string name="content_install_notice">Aviso importante de contenido</string> + <string name="content_install_notice_description">El contenido seleccionado no es de este juego.\n¿Instalar de todas maneras?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Su ROM está encriptada</string> <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga las guías para redumpear<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartuchos de juegos</a> o <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string> @@ -277,6 +372,7 @@ <string name="emulation_pause">Pausar emulación</string> <string name="emulation_unpause">Despausar emulación</string> <string name="emulation_input_overlay">Opciones de overlay</string> + <string name="touchscreen">Pantalla táctil</string> <string name="load_settings">Cargando configuración...</string> @@ -308,6 +404,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -352,9 +449,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Auto</string> + <string name="screen_layout_sensor_landscape">Sensor paisaje</string> <string name="screen_layout_landscape">Paisaje</string> + <string name="screen_layout_reverse_landscape">Paisaje inverso</string> + <string name="screen_layout_sensor_portrait">Sensor retrato</string> <string name="screen_layout_portrait">Retrato</string> - <string name="screen_layout_auto">Auto</string> + <string name="screen_layout_reverse_portrait">Retrato inverso</string> <!-- Aspect Ratios --> <string name="ratio_default">Predeterminado (16:9)</string> @@ -363,6 +464,10 @@ <string name="ratio_force_sixteen_ten">Forzar 16:10</string> <string name="ratio_stretch">Ajustar a la ventana</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">DynARMic (lento)</string> + <string name="cpu_backend_nce">Ejecución nativa de código (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Preciso</string> <string name="cpu_accuracy_unsafe">Impreciso</string> @@ -391,8 +496,15 @@ <string name="theme_mode_dark">Oscuro</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">x2</string> + <string name="multiplier_four">x4</string> + <string name="multiplier_eight">x8</string> + <string name="multiplier_sixteen">x16</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Fondos oscuros</string> <string name="use_black_backgrounds_description">Cuando utilice el modo oscuro, aplique fondos negros.</string> diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml index 5a827c50b..667fe33cb 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">Aucun fichier n\'a été trouvé ou aucun répertoire de jeu n\'a encore été sélectionné.</string> <string name="search_and_filter_games">Rechercher et filtrer les jeux</string> <string name="select_games_folder">Sélectionner le dossier des jeux</string> + <string name="manage_game_folders">Gérer les dossiers de jeux</string> <string name="select_games_folder_description">Permet à yuzu de remplir la liste des jeux</string> <string name="add_games_warning">Ne pas sélectionner le dossier des jeux ?</string> <string name="add_games_warning_description">Les jeux ne seront pas affichés dans la liste des jeux si aucun dossier n\'est sélectionné.</string> @@ -47,7 +48,7 @@ <string name="install_prod_keys_warning_description">Des clés valides sont nécessaires pour émuler des jeux commerciaux. Seules les applications homebrew fonctionneront si vous continuez.</string> <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string> <string name="notifications">Notifications</string> - <string name="notifications_description">Accordez l\'autorisation de notification avec le bouton ci-dessous.</string> + <string name="notifications_description">Accorder la permission de notification avec le bouton ci-dessous.</string> <string name="give_permission">Accorder la permission</string> <string name="notification_warning">Ne pas accorder la permission de notification ?</string> <string name="notification_warning_description">yuzu ne pourra pas vous communiquer d\'informations importantes.</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">Clés de chiffrement invalides</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">Le fichier sélectionné est incorrect ou corrompu. Veuillez dumper à nouveau vos clés.</string> + <string name="gpu_driver_manager">Gestionnaire de pilotes du GPU</string> <string name="install_gpu_driver">Installer le pilote du GPU</string> <string name="install_gpu_driver_description">Installer des pilotes alternatifs pour des performances ou une précision potentiellement meilleures</string> <string name="advanced_settings">Paramètres avancés</string> @@ -85,7 +87,11 @@ <string name="notification_no_directory_link_description">Veuillez localiser manuellement le dossier utilisateur avec le panneau latéral du gestionnaire de fichiers.</string> <string name="manage_save_data">Gérer les données de sauvegarde</string> <string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string> + <string name="import_save_warning">Importer les données de sauvegarde</string> + <string name="import_save_warning_description">Cela écrasera toutes les données de sauvegarde existantes avec le fichier fourni. Êtes-vous sûr de vouloir continuer ?</string> <string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string> + <string name="save_files_importing">Importation des fichiers de sauvegarde...</string> + <string name="save_files_exporting">Exportation des fichiers de sauvegarde...</string> <string name="save_file_imported_success">Importé avec succès</string> <string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string> <string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string> @@ -118,6 +124,40 @@ <string name="manage_yuzu_data_description">Importer/exporter le firmware, les clés, les données utilisateur, et bien plus encore !</string> <string name="share_save_file">Partager le fichier de sauvegarde</string> <string name="export_save_failed">Échec de l\'exportation de la sauvegarde</string> + <string name="game_folders">Dossiers de jeux</string> + <string name="deep_scan">Analyse approfondie</string> + <string name="add_game_folder">Ajouter un dossier de jeu</string> + <string name="folder_already_added">Ce dossier a déjà été ajouté !</string> + <string name="game_folder_properties">Propriétés du dossier du jeu</string> + <plurals name="saves_import_failed"> + <item quantity="one">Échec de l\'importation de %d sauvegarde</item> + <item quantity="many">Échec de l\'importation de %d sauvegardes </item> + <item quantity="other">Échec de l\'importation de %d sauvegardes</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">%d sauvegarde importée avec succès</item> + <item quantity="many">%d sauvegardes importées avec succès</item> + <item quantity="other">%d sauvegardes importées avec succès</item> + </plurals> + <string name="no_save_data_found">Aucune donnée de sauvegarde trouvée</string> + + <!-- Applet launcher strings --> + <string name="applets">Lanceur d\'applets</string> + <string name="applets_description">Lancer des applets système en utilisant le firmware installé</string> + <string name="applets_error_firmware">Firmware non installé</string> + <string name="applets_error_applet">Applet non disponible</string> + <string name="applets_error_description"><![CDATA[Veuillez vous assurer que le fichier <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> et le <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> sont installés et essayez à nouveau.]]></string> + <string name="album_applet">Album</string> + <string name="album_applet_description">Afficher les images stockées dans le dossier de captures d\'écran de l\'utilisateur avec le visualiseur de photos système.</string> + <string name="mii_edit_applet">Éditeur Mii</string> + <string name="mii_edit_applet_description">Visualiser et modifier les Miis avec l\'éditeur système.</string> + <string name="cabinet_applet">Cabinet</string> + <string name="cabinet_applet_description">Modifier et supprimer des données stockées sur un amiibo</string> + <string name="cabinet_launcher">Cabinet</string> + <string name="cabinet_nickname_and_owner">Paramètres du surnom et du propriétaire</string> + <string name="cabinet_game_data_eraser">Effaceur de données de jeu</string> + <string name="cabinet_restorer">Restaurateur</string> + <string name="cabinet_formatter">Formateur</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia n\'est pas réel</string> @@ -157,10 +197,11 @@ <string name="are_you_interested">Es tu intéressé ?</string> <!-- General settings strings --> - <string name="frame_limit_enable">Limitation de vitesse</string> + <string name="frame_limit_enable">Limiter la vitesse</string> <string name="frame_limit_enable_description">Limiter la vitesse d\'émulation à un pourcentage spécifié de la vitesse normale</string> - <string name="frame_limit_slider">Limite en pourcentage de vitesse</string> + <string name="frame_limit_slider">Limiter le pourcentage de vitesse</string> <string name="frame_limit_slider_description">Spécifier le pourcentage pour limiter la vitesse d\'émulation. 100% correspond à la vitesse normale. Des valeurs plus élevées ou plus basses augmenteront ou diminueront la limite de vitesse.</string> + <string name="cpu_backend">Backend du CPU</string> <string name="cpu_accuracy">Précision du CPU</string> <string name="value_with_units">%1$s%2$s</string> @@ -191,6 +232,8 @@ <string name="renderer_reactive_flushing_description">Améliore la précision du rendu dans certains jeux au détriment des performances.</string> <string name="use_disk_shader_cache">Utiliser les shader cache</string> <string name="use_disk_shader_cache_description">Réduire les saccades en stockant et en chargeant localement les shaders générés</string> + <string name="anisotropic_filtering">Filtrage anisotropique</string> + <string name="anisotropic_filtering_description">Améliore la qualité des textures lorsqu\'elles sont visualisées sous des angles obliques</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> @@ -217,7 +260,8 @@ <string name="shutting_down">Extinction en cours...</string> <string name="reset_setting_confirmation">Voulez-vous réinitialiser ce paramètre à sa valeur par défaut ?</string> <string name="reset_to_default">Réinitialiser par défaut</string> - <string name="reset_all_settings">Réinitialiser tous les réglages ?</string> + <string name="reset_to_default_description">Réinitialiser tous les paramètres avancés</string> + <string name="reset_all_settings">Réinitialiser tous les paramètres ?</string> <string name="reset_all_settings_description">Tous les paramètres avancés seront réinitialisés à leur configuration par défaut. Ça ne peut pas être annulé.</string> <string name="settings_reset">Paramètres réinitialisés</string> <string name="close">Fermer</string> @@ -230,14 +274,24 @@ <string name="export_failed">L\'exportation a échoué</string> <string name="import_failed">L\'importation a échoué</string> <string name="cancelling">Annulation</string> - + <string name="install">Installer</string> + <string name="delete">Supprimer</string> + <string name="edit">Éditer</string> + <string name="export_success">Exportation réussie</string> + <string name="start">Start</string> + <string name="clear">Effacer</string> + <string name="global">Global</string> + <string name="custom">Personnalisé</string> + <string name="notice">Avis</string> + <string name="import_complete">Importation terminée</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Sélectionner le pilote du GPU</string> <string name="select_gpu_driver_title">Souhaitez vous remplacer votre pilote actuel ?</string> <string name="select_gpu_driver_install">Installer</string> <string name="select_gpu_driver_default">Par défaut</string> <string name="select_gpu_driver_use_default">Utilisation du pilote du GPU par défaut</string> - <string name="select_gpu_driver_error">Pilote non valide sélectionné, utilisation du paramètre par défaut du système !</string> + <string name="select_gpu_driver_error">Pilote non valide sélectionné</string> + <string name="driver_already_installed">Pilote déjà installé</string> <string name="system_gpu_driver">Pilote du GPU du système</string> <string name="installing_driver">Installation du pilote...</string> @@ -245,11 +299,52 @@ <string name="preferences_settings">Paramètres</string> <string name="preferences_general">Général</string> <string name="preferences_system">Système</string> + <string name="preferences_system_description">Mode TV, région, langue</string> <string name="preferences_graphics">Vidéo</string> + <string name="preferences_graphics_description">Niveau de précision, résolution, cache de shaders</string> <string name="preferences_audio">Audio</string> + <string name="preferences_audio_description">Moteur de sortie, volume</string> <string name="preferences_theme">Thème et couleur</string> <string name="preferences_debug">Débogage</string> - + <string name="preferences_debug_description">Débogage CPU/GPU, API graphique, fastmem</string> + + <!-- Game properties --> + <string name="info">Info</string> + <string name="info_description">ID du programme, développeur, version</string> + <string name="per_game_settings">Paramètres spécifiques au jeu</string> + <string name="per_game_settings_description">Modifier les paramètres spécifiques à ce jeu</string> + <string name="launch_options">Lancer la configuration</string> + <string name="path">Chemin</string> + <string name="program_id">ID du programme</string> + <string name="developer">Développeur</string> + <string name="version">Version</string> + <string name="copy_details">Copier les détails</string> + <string name="add_ons">Extensions</string> + <string name="add_ons_description">Activer les mods, mises à jour et DLC</string> + <string name="clear_shader_cache">Effacer le cache des shaders</string> + <string name="clear_shader_cache_description">Supprime tous les shaders générés en jouant à ce jeu</string> + <string name="clear_shader_cache_warning_description">Vous risquez de rencontrer davantage de saccades pendant que le cache des shaders se régénère.</string> + <string name="cleared_shaders_successfully">Shaders effacés avec succès</string> + <string name="addons_game">Addons : %1$s</string> + <string name="save_data">Données de sauvegarde</string> + <string name="save_data_description">Gérer les données de sauvegarde spécifiques à ce jeu</string> + <string name="delete_save_data">Supprimer les données de sauvegarde</string> + <string name="delete_save_data_description">Supprime toutes les données de sauvegarde spécifiques à ce jeu</string> + <string name="delete_save_data_warning_description">Cela supprime de manière irréversible toutes les données de sauvegarde de ce jeu. Êtes-vous sûr de vouloir continuer ?</string> + <string name="save_data_deleted_successfully">Données de sauvegarde supprimées avec succès</string> + <string name="select_content_type">Type de contenu</string> + <string name="updates_and_dlc">Mises à jour et DLC</string> + <string name="mods_and_cheats">Mods et cheats</string> + <string name="addon_notice">Notification importante concernant l\'addon</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">Pour installer des mods et des cheats, vous devez sélectionner un dossier contenant un répertoire cheats/, romfs/ ou exefs/. Nous ne pouvons pas garantir leur compatibilité avec votre jeu, alors soyez prudent !</string> + <string name="invalid_directory">Répertoire non valide</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Veuillez vous assurer que le répertoire que vous avez sélectionné contient un dossier cheats/, romfs/ ou exefs/, puis réessayez.</string> + <string name="addon_installed_successfully">Addon installé avec succès</string> + <string name="verifying_content">Vérification du contenu...</string> + <string name="content_install_notice">Avis d\'installation du contenu</string> + <string name="content_install_notice_description">Le contenu que vous avez sélectionné ne correspond pas à ce jeu.\nInstaller quand même ?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Votre ROM est cryptée</string> <string name="loader_error_encrypted_roms_description"><![CDATA[Veuillez suivre les guides pour refaire un dump de vos <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartouches de jeu</a> ou de vos <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">titres installés</a>.]]></string> @@ -277,6 +372,7 @@ <string name="emulation_pause">Mettre en pause l\'émulation</string> <string name="emulation_unpause">Reprendre l\'émulation</string> <string name="emulation_input_overlay">Options de l\'overlay</string> + <string name="touchscreen">Écran tactile</string> <string name="load_settings">Chargement des paramètres…</string> @@ -308,6 +404,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Octet</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">Ko</string> <string name="memory_megabyte">Mo</string> <string name="memory_gigabyte">GB</string> @@ -352,9 +449,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Auto</string> + <string name="screen_layout_sensor_landscape">Paysage</string> <string name="screen_layout_landscape">Paysage</string> + <string name="screen_layout_reverse_landscape">Paysage inversé</string> + <string name="screen_layout_sensor_portrait">Portrait</string> <string name="screen_layout_portrait">Portrait</string> - <string name="screen_layout_auto">Auto</string> + <string name="screen_layout_reverse_portrait">Portrait inversé</string> <!-- Aspect Ratios --> <string name="ratio_default">Par défaut (16:9)</string> @@ -363,6 +464,10 @@ <string name="ratio_force_sixteen_ten">Forcer le 16:10</string> <string name="ratio_stretch">Étirer à la fenêtre</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (Lent)</string> + <string name="cpu_backend_nce">Exécution de code natif (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Précis</string> <string name="cpu_accuracy_unsafe">Risqué</string> @@ -391,8 +496,15 @@ <string name="theme_mode_dark">Sombre</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Arrière-plan noir</string> <string name="use_black_backgrounds_description">Lorsque vous utilisez le thème sombre, appliquer un arrière-plan noir.</string> diff --git a/src/android/app/src/main/res/values-he/strings.xml b/src/android/app/src/main/res/values-he/strings.xml index 0af78a57c..41e4450c6 100644 --- a/src/android/app/src/main/res/values-he/strings.xml +++ b/src/android/app/src/main/res/values-he/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">לא נמצאו קבצים או לנבחרה ספריית קבצים בינתיים.</string> <string name="search_and_filter_games">חפש וסנן משחקים</string> <string name="select_games_folder">בחר תיקיית משחקים</string> + <string name="manage_game_folders">נהל את תיקיית המשחקים</string> <string name="select_games_folder_description">אפשר ל yuzu לאכלס את רשימת המשחקים</string> <string name="add_games_warning">לדלג על בחירת תיקיית המשחקים?</string> <string name="add_games_warning_description">משחקים לא יוצגו ברשימת המשחקים אם לנבחרה תיקיית משחקים.</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">מפתחות הצפנה לא חוקיים</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">קבוץ שנבחר מושחת או לא נכון. בבקשה הוצא מחדש את המפתחות שלך.</string> + <string name="gpu_driver_manager">מנהל הדרייברים של המעבד הגרפי</string> <string name="install_gpu_driver">התקן דרייבר למעבד הגרפי</string> <string name="install_gpu_driver_description">התקן דרייברים אחרים בשביל סיכוי לביצועים או דיוק גבוההים יותר</string> <string name="advanced_settings">הגדרות מתקדמות</string> @@ -86,6 +88,7 @@ <string name="manage_save_data">נהל מידע שמור</string> <string name="manage_save_data_description">מידע שמור לא נמצא. בבקשה בחר/י אופציה מלמטה</string> <string name="import_export_saves_description">יבא או יצא קבצי שמירה</string> + <string name="save_files_exporting">מייצא קבצי שמירה...</string> <string name="save_file_imported_success">יובא בהצלחה</string> <string name="save_file_invalid_zip_structure">מבנה ספריית השמירות לא חוקי</string> <string name="save_file_invalid_zip_structure_description">התת תיקייה הראשונה חייב להיות ה title ID של המשחק</string> @@ -118,6 +121,28 @@ <string name="manage_yuzu_data_description">יבא/יצא firmware, keys, מידע של משתמש ועוד!</string> <string name="share_save_file">שתף קובץ שמירה</string> <string name="export_save_failed">נכשל בייצוא שמירה</string> + <string name="game_folders">תיקיית משחקים</string> + <string name="deep_scan">סריקה עמוקה</string> + <string name="add_game_folder">הוסף תיקיית משחקים</string> + <string name="folder_already_added">התיקייה הזו נוספה כבר!</string> + <string name="game_folder_properties">מאפייני תיקיית משחקים</string> + <!-- Applet launcher strings --> + <string name="applets">משגר Applet</string> + <string name="applets_description">מערכת שיגור Applet משתמשת בתוכנה המותקנת</string> + <string name="applets_error_firmware">ה Firmware לא מותקן</string> + <string name="applets_error_applet">Applet לא זמין</string> + <string name="applets_error_description"><![CDATA[בבקשה וודא שקבצי ה - <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a>ו <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a>שלך מותקנים ונסה שוב.]]></string> + <string name="album_applet">אלבום</string> + <string name="album_applet_description">צפה בתמונות השמורות בתיקיית צילומי המסך של המשתמש בעזרת מציג התמונות של המערכת</string> + <string name="mii_edit_applet">עורך Mii</string> + <string name="mii_edit_applet_description">צפה וערוך דמויות Mii בעזרת עורך המערכת</string> + <string name="cabinet_applet">ארון</string> + <string name="cabinet_applet_description">ערוך ומחק מידע השמור על ה amiibo</string> + <string name="cabinet_launcher">משגר ארונות</string> + <string name="cabinet_nickname_and_owner">כינוי והגדרות בעלים</string> + <string name="cabinet_game_data_eraser">מחק של נתוני משחק</string> + <string name="cabinet_restorer">שחזר</string> + <string name="cabinet_formatter">בונה תבניות</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia לא אמיתית</string> @@ -161,6 +186,7 @@ <string name="frame_limit_enable_description">מגביל את מהירות האמולציה לאחוז מהירות המבוקש מהמהירות הרגילה.</string> <string name="frame_limit_slider">הגבל את אחוז המהירות</string> <string name="frame_limit_slider_description">מדייק את אחוז מהירות האמולציה. 100% זה מהירות רגילה. ערכים גדולים או קטנים יאיצו או יאטו את מהירות האמולציה.</string> + <string name="cpu_backend">קצה האחורי של המעבד</string> <string name="cpu_accuracy">דיוק המעבד</string> <string name="value_with_units">%1$s%2$s</string> @@ -185,23 +211,38 @@ <string name="renderer_anti_aliasing">שיטת Anti-aliasing</string> <string name="renderer_force_max_clock">החזק מהירות שעון מקסימלית (רק ל Adreno)</string> <string name="renderer_force_max_clock_description">מכריח לדחוף את מהירויות המעבד הגרפי למקסימום (הגבלות חום ימשיכו לתפקד).</string> + <string name="renderer_asynchronous_shaders">השתמש בשיידרים אסינכרונים</string> + <string name="renderer_asynchronous_shaders_description">מקמפל שיידרים בצורה אסנכרונית, מפחית תקיעות אך עלול לגרום לבעיות גרפיות.</string> + <string name="renderer_reactive_flushing">השתמש בהבהוב תגובתי</string> <string name="renderer_reactive_flushing_description">משפר את הדיוק של האמולציה במשחקים מסויימים במחיר של ביצועים.</string> + <string name="use_disk_shader_cache">מטמון השיידר של הדיסק</string> + <string name="use_disk_shader_cache_description">מפחית בתקיעות על ידי אחסון מקומי וטעינה של שיידרים הנוצרים. </string> <!-- Debug settings strings --> <string name="cpu">מעבד</string> + <string name="cpu_debug_mode">דיבאגינג למעבד</string> <string name="cpu_debug_mode_description">מכניס את המעבד למצב דיבאג איטי</string> <string name="gpu">מעבד גרפי</string> + <string name="renderer_api">ממשק תוכנה</string> + <string name="renderer_debug">דיבאגינג בגרפיקה</string> + <string name="renderer_debug_description">קובע את ממשק התוכנה של הגרפיקות למצב דיבאגינג איטי.</string> + <string name="fastmem">Fastmem</string> + <!-- Audio settings strings --> <string name="audio_output_engine">מנוע פלט</string> <string name="audio_volume">עוצמת שמע</string> + <string name="audio_volume_description">מציין את עוצמת האודיו שיוצא.</string> + <!-- Miscellaneous --> <string name="slider_default">ברירת מחדל</string> <string name="ini_saved">הגדרות שמורות</string> <string name="gameid_saved">הגדרות שמורות עבור %1$s</string> <string name="error_saving">תקלה בשמירת %1$s.ini: %2$s</string> + <string name="unimplemented_menu">תפריט שלא יושם</string> <string name="loading">טוען...</string> <string name="shutting_down">כיבוי...</string> <string name="reset_setting_confirmation">אתה מעוניין לאפס את ההגדרה הזו חזרה לברירת המחדל?</string> <string name="reset_to_default">אפס לברירת המחדל</string> + <string name="reset_to_default_description">מאפס את כל ההגדרות המתקדמות.</string> <string name="reset_all_settings">לאפס את כל ההגדרות?</string> <string name="reset_all_settings_description">כל ההגדרות המתקדמות יאופסו לברירת המחדל. לא ניתן לבטל פעולה זו.</string> <string name="settings_reset">אפס הגדרות</string> @@ -209,19 +250,26 @@ <string name="learn_more">למד עוד</string> <string name="auto">אוטומטי</string> <string name="submit">שלח</string> + <string name="string_null">ריק</string> <string name="string_import">ייבוא</string> <string name="export">ייצוא</string> <string name="export_failed">ייצוא נכשל</string> <string name="import_failed">ייבוא נכשל</string> <string name="cancelling">מבטל</string> - + <string name="install">התקן</string> + <string name="delete">מחק</string> + <string name="edit">ערוך</string> + <string name="export_success">יוצא בהצלחה</string> + <string name="start">התחלה</string> + <string name="clear">נקה</string> <!-- GPU driver installation --> <string name="select_gpu_driver">בחר דרייבר למעבד הגרפי</string> <string name="select_gpu_driver_title">אתה מעוניין להחליף את הדרייבר של המעבד הגרפי שלך?</string> <string name="select_gpu_driver_install">התקן</string> <string name="select_gpu_driver_default">ברירת מחדל</string> <string name="select_gpu_driver_use_default">משתמש בדרייבר ברירת המחדל של המעבד הגרפי</string> - <string name="select_gpu_driver_error">דרייבר לא חוקי נבחר, משתמש בברירת המחדל של המערכת!</string> + <string name="select_gpu_driver_error">נבחר דרייבר לא חוקי</string> + <string name="driver_already_installed">הדרייבר כבר מותקן</string> <string name="system_gpu_driver">דרייבר של המעבד הגרפי של המערכת</string> <string name="installing_driver">מתקין דרייבר...</string> @@ -229,11 +277,27 @@ <string name="preferences_settings">הגדרות</string> <string name="preferences_general">כללי</string> <string name="preferences_system">מערכת</string> + <string name="preferences_system_description">מצב מעוגן, איזור, שפה</string> <string name="preferences_graphics">גרפיקה</string> + <string name="preferences_graphics_description">רמת דיוק, רזולוציה, מטמון שיידרים</string> <string name="preferences_audio">שמע</string> + <string name="preferences_audio_description">מנוע פלט, עוצמת שמע</string> <string name="preferences_theme">צבע ונושא</string> + <string name="preferences_debug">דיבאג</string> + <string name="preferences_debug_description">דיבאגינג עבור מעבד/מעבד גרפי, ממשק תוכנה עבור הגרפיקות, fastmem</string> + + <!-- Game properties --> + <string name="info">מידע</string> + <string name="path">דרך</string> + <string name="developer">מפתח</string> + <string name="version">גרסה</string> + <string name="add_ons">תוספים</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">המשחק שלך מוצפן</string> + <string name="loader_error_encrypted_roms_description"><![CDATA[אנא עקוב אחרי המדריכים כדי לבצע redump של <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">כרטיסי המשחק</a>או <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">הכותרות המותקנות</a> שלך.]]></string> + <string name="loader_error_encrypted_keys_description"><![CDATA[אנא וודא שקובץ ה-<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> מותקן כך שניתן יהיה לפענח משחקים.]]></string> + <string name="loader_error_video_core">התרחשה בעיה באתחול של ליבת הווידאו</string> + <string name="loader_error_video_core_description">זה בדרך כלל נגרם על ידי דרייבר לא מתאים עבור המעבד הגרפי. התקנת דרייבר אשר מתאים למעבד הגרפי יכול לפתור את הבעיה הזו.</string> <string name="loader_error_invalid_format">אין אפשרות לטעון את המשחק</string> <string name="loader_error_file_not_found">קובץ המשחק לא קיים</string> @@ -241,10 +305,22 @@ <string name="emulation_exit">צא מהאמולציה</string> <string name="emulation_done">סיום</string> <string name="emulation_fps_counter">סופר FPS</string> + <string name="emulation_toggle_controls">החלפת בקרים</string> + <string name="emulation_rel_stick_center">מרכז ג׳ויסטיק יחסי</string> + <string name="emulation_dpad_slide">החלקת D-pad</string> + <string name="emulation_haptics">רטט מגע</string> + <string name="emulation_show_overlay">הצג את שכבת-העל</string> + <string name="emulation_toggle_all">החלף הכל</string> + <string name="emulation_control_adjust">התאם את שכבת-העל</string> <string name="emulation_control_scale">קנה מידה</string> <string name="emulation_control_opacity">שקיפות</string> + <string name="emulation_touch_overlay_reset">אפס את שכבת-העל</string> + <string name="emulation_touch_overlay_edit">ערוך שכבת-על</string> <string name="emulation_pause">עצור אמולציה</string> <string name="emulation_unpause">המשך אמולציה</string> + <string name="emulation_input_overlay">אופציות עבור שכבת-על</string> + <string name="touchscreen">מסך מגע</string> + <string name="load_settings">טוען הגדרות...</string> <!-- Software keyboard --> @@ -258,6 +334,8 @@ <string name="system_archive_general">ארכיון מערכת</string> <string name="save_load_error">בעיית שמירה/טעינה</string> <string name="fatal_error">שגיאה חמורה</string> + <string name="fatal_error_message">שגיאה חמורה התרחשה. בדוק את היומן לפרטים./nהמשך הסימולציה עשוי לגרום לקריסות ולבאגים.</string> + <string name="performance_warning">כיבוי הגדרה זו ישפיע משמעותית על ביצועי הסימולציה! לחוויה הטובה ביותר, מומלץ להשאיר את הגדרה זו מופעלת.</string> <string name="device_memory_inadequate">RAM המכשיר: %1$s/nמומלץ: %2$s</string> <string name="memory_formatted">%1$s%2$s</string> <string name="no_game_present">אין משחק שניתן להריץ!</string> @@ -273,6 +351,7 @@ <!-- Memory Sizes --> <string name="memory_byte">בייט</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -297,12 +376,17 @@ <string name="resolution_three">3X (2160p/3240p) (איטי)</string> <string name="resolution_four">4X (2880p/4320p) (איטי)</string> + <!-- Renderer VSync --> + <string name="renderer_vsync_immediate">מיידי (כבוי)</string> <string name="renderer_vsync_mailbox">תיבת דואר</string> <string name="renderer_vsync_fifo">FIFO (On)</string> <string name="renderer_vsync_fifo_relaxed">FIFO נינוח</string> <!-- Scaling Filters --> <string name="scaling_filter_nearest_neighbor">השכן הקרוב ביותר</string> + <string name="scaling_filter_bilinear">ביליניארי</string> + <string name="scaling_filter_bicubic">Bicubic</string> + <string name="scaling_filter_gaussian">Gaussian</string> <string name="scaling_filter_scale_force">ScaleForce</string> <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolution</string> @@ -312,10 +396,9 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">אוטומטי</string> <string name="screen_layout_landscape">לרוחב</string> <string name="screen_layout_portrait">לאורך</string> - <string name="screen_layout_auto">אוטומטי</string> - <!-- Aspect Ratios --> <string name="ratio_default">ברירת מחדל (16:9)</string> <string name="ratio_force_four_three">הכרח 4:3</string> @@ -323,6 +406,10 @@ <string name="ratio_force_sixteen_ten">הכרח 16:10</string> <string name="ratio_stretch">הרחב לגודל המסך</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">דינמי (איטי)</string> + <string name="cpu_backend_nce">ביצוע קוד מקורי (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">מדויק</string> <string name="cpu_accuracy_unsafe">לא בטוח</string> @@ -335,6 +422,10 @@ <string name="gamepad_home">בית</string> <string name="gamepad_screenshot">צילום מסך</string> + <!-- Disk shader cache --> + <string name="preparing_shaders">מכין שיידרים</string> + <string name="building_shaders">בונה שיידרים</string> + <!-- Theme options --> <string name="change_app_theme">שנה את נושא האפליקצייה</string> <string name="theme_default">ברירת מחדל</string> @@ -346,9 +437,14 @@ <string name="theme_mode_light">בהיר</string> <string name="theme_mode_dark">כהה</string> - <!-- Audio output engines --> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">רקעים שחורים</string> <string name="use_black_backgrounds_description">כשמתשמשים במצב כהה, שם רקעים שחורים.</string> diff --git a/src/android/app/src/main/res/values-hu/strings.xml b/src/android/app/src/main/res/values-hu/strings.xml index 6563ba288..554da0816 100644 --- a/src/android/app/src/main/res/values-hu/strings.xml +++ b/src/android/app/src/main/res/values-hu/strings.xml @@ -35,6 +35,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="empty_gamelist">Nem található fájl, vagy még nincs kiválasztva könyvtár.</string> <string name="search_and_filter_games">Játékok keresése és szűrése</string> <string name="select_games_folder">Játékmappa kiválasztása</string> + <string name="manage_game_folders">Játékmappák kezelése</string> <string name="add_games_warning">Kihagyod a játékok mappa kiválasztását?</string> <string name="add_games_warning_description">A játékok nem jelennek meg a Játékok listában, ha egy mappa nincs kijelölve.</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> @@ -68,6 +69,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="invalid_keys_error">Érvénytelen titkosítókulcsok</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">A kiválasztott fájl helytelen, vagy sérült. Állíts össze egy új kulcsot.</string> + <string name="gpu_driver_manager">GPU illesztőprogram-kezelő</string> <string name="install_gpu_driver">GPU illesztőprogram telepítése</string> <string name="install_gpu_driver_description">Alternatív illesztőprogramok telepítése az esetlegesen elérhető teljesítmény és pontosság érdekében</string> <string name="advanced_settings">Haladó beállítások</string> @@ -84,7 +86,11 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="notification_no_directory_link_description">Kérjük, manuálisan keresd meg a felhasználói mappát a fájlkezelő oldalsó paneljével.</string> <string name="manage_save_data">Mentésadatok kezelése</string> <string name="manage_save_data_description">Mentés található. Kérjük, válassz egyet az alábbi opciók közül.</string> + <string name="import_save_warning">Mentési fájlok importálása</string> + <string name="import_save_warning_description">Ezzel felülírod a fájlban lévő mentett adatokat. Biztosan szeretnéd folytatni?</string> <string name="import_export_saves_description">Mentési fájlok importálás vagy exportálása</string> + <string name="save_files_importing">Mentési fájlok importálása...</string> + <string name="save_files_exporting">Mentési fájlok exportálása...</string> <string name="save_file_imported_success">Sikeresen importálva</string> <string name="save_file_invalid_zip_structure">Érvénytelen mentési könyvtárstruktúra</string> <string name="save_file_invalid_zip_structure_description">Az első almappa neve a játék azonosítója kell, hogy legyen.</string> @@ -117,6 +123,38 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="manage_yuzu_data_description">Firmware, kulcsok, felhasználói adatok és egyebek importálása/exportálása</string> <string name="share_save_file">Mentési fájl megosztása</string> <string name="export_save_failed">A mentés exportálása sikertelen</string> + <string name="game_folders">Játékmappák</string> + <string name="deep_scan">Mély szkennelés</string> + <string name="add_game_folder">Játékmappa hozzáadása</string> + <string name="folder_already_added">Ez a mappa már hozzá lett adva!</string> + <string name="game_folder_properties">Játékmappa tulajdonságok</string> + <plurals name="saves_import_failed"> + <item quantity="one">%dmentés importálása sikertelen</item> + <item quantity="other">%dmentés importálása sikertelen</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">%dmentés sikeresen importálva</item> + <item quantity="other">%dmentés sikeresen importálva</item> + </plurals> + <string name="no_save_data_found">Nem található mentett adat</string> + + <!-- Applet launcher strings --> + <string name="applets">Applet indító</string> + <string name="applets_description">Rendszer appletek indítása a telepített firmware-rel</string> + <string name="applets_error_firmware">Firmware nincs telepítve</string> + <string name="applets_error_applet">Applet nem elérhető</string> + <string name="applets_error_description"><![CDATA[Kérjük, győződj meg róla, hogy a <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> fájl és a <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> telepítve van, majd próbáld újra.]]></string> + <string name="album_applet">Album</string> + <string name="album_applet_description">Képernyőképek megtekintése a rendszer fényképnézegetőjével</string> + <string name="mii_edit_applet">Mii szerkesztés</string> + <string name="mii_edit_applet_description">Miik megtekintése és szerkesztése a rendszerszerkesztővel</string> + <string name="cabinet_applet">Kabinet</string> + <string name="cabinet_applet_description">Amiibon tárolt adatok szerkesztése és törlése</string> + <string name="cabinet_launcher">Kabinet indító</string> + <string name="cabinet_nickname_and_owner">Becenév és tulajdonos beállítások</string> + <string name="cabinet_game_data_eraser">Játékadat eltávolító</string> + <string name="cabinet_restorer">Helyreállító</string> + <string name="cabinet_formatter">Formázó</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia nem valódi</string> @@ -158,6 +196,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="frame_limit_enable_description">Korlátozza az emuláció sebességét a normál sebesség adott százalékára.</string> <string name="frame_limit_slider">Sebességkorlát százaléka</string> <string name="frame_limit_slider_description">Az emuláció sebességét határozza meg. 100% a normál sebesség. A magasabb értékek növelik, az alacsonyabbak csökkentik a sebességkorlátot.</string> + <string name="cpu_backend">CPU backend</string> <string name="cpu_accuracy">CPU pontosság</string> <string name="value_with_units">%1$s%2$s</string> @@ -188,7 +227,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="renderer_reactive_flushing_description">Javítja a renderelési pontosságot néhány játékban a teljesítmény rovására.</string> <string name="use_disk_shader_cache">Lemez árnyékoló gyorsítótár</string> <string name="use_disk_shader_cache_description">Csökkenti az akadásokat azáltal, hogy helyileg tárolja és tölti be a generált árnyékolókat.</string> - + <string name="anisotropic_filtering">Anizotropikus szűrés</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="cpu_debug_mode">CPU hibakeresés</string> @@ -196,9 +235,9 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="gpu">GPU</string> <string name="renderer_api">API</string> <string name="renderer_debug">Grafikai hibakeresés</string> - <string name="renderer_debug_description">Lassú hibakeresési módba állítja a grafikus API-t .</string> + <string name="renderer_debug_description">Lassú hibakereső módba állítja a grafikus API-t .</string> <!-- Audio settings strings --> - <string name="audio_output_engine">Kimeneti rendszer</string> + <string name="audio_output_engine">Kimeneti motor</string> <string name="audio_volume">Hangerő</string> <string name="audio_volume_description">Hangkimenet hangerejének megadása</string> @@ -212,6 +251,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="shutting_down">Leállítás...</string> <string name="reset_setting_confirmation">Szeretnéd visszaállítani a beállítások az alapértelmezett értékekre?</string> <string name="reset_to_default">Alaphelyzetbe állítás</string> + <string name="reset_to_default_description">Visszaállítja a haladó beállításokat</string> <string name="reset_all_settings">Alaphelyzetbe állítod a beállításokat?</string> <string name="reset_all_settings_description">Minden haladó beállítás vissza lesz állítva az alapértelmezett konfigurációra. Ez a művelet nem vonható vissza.</string> <string name="settings_reset">Beállítások alaphelyzetbe állítva</string> @@ -219,12 +259,24 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="learn_more">Tudj meg többet</string> <string name="auto">Automatikus</string> <string name="submit">Küldés</string> - <string name="string_null">Nulla</string> + <string name="string_null">Null</string> <string name="string_import">Importálás</string> <string name="export">Exportálás</string> <string name="export_failed">Exportálás sikertelen</string> <string name="import_failed">Importálás sikertelen</string> <string name="cancelling">Megszakítás</string> + <string name="install">Telepítés</string> + <string name="delete">Törlés</string> + <string name="edit">Szerkesztés</string> + <string name="export_success">Sikeresen exportálva</string> + <string name="start">Start</string> + <string name="clear">Törlés</string> + <string name="global">Globális</string> + <string name="custom">Egyéni</string> + <string name="notice">Értesítés</string> + <string name="import_complete">Importálás befejezve</string> + <string name="more_options">További opciók</string> + <string name="use_global_setting">Globális beállítás használata</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Válassz GPU illesztőprogramot</string> @@ -232,7 +284,8 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="select_gpu_driver_install">Telepítés</string> <string name="select_gpu_driver_default">Alapértelmezett</string> <string name="select_gpu_driver_use_default">Alapértelmezett GPU illesztőprogram használata</string> - <string name="select_gpu_driver_error">Érvénytelen driver kiválasztva, a rendszer alapértelmezett lesz használva!</string> + <string name="select_gpu_driver_error">Érvénytelen illesztőprogram kiválasztva</string> + <string name="driver_already_installed">Az illesztőprogram már telepítve van</string> <string name="system_gpu_driver">Rendszer GPU illesztőprogram</string> <string name="installing_driver">Illesztőprogram telepítése...</string> @@ -240,10 +293,54 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="preferences_settings">Beállítások</string> <string name="preferences_general">Általános</string> <string name="preferences_system">Rendszer</string> + <string name="preferences_system_description">Dokkolt mód, régió, nyelv</string> <string name="preferences_graphics">Grafika</string> + <string name="preferences_graphics_description">Pontossági szint, felbontás, árnyékoló gyorsítótár</string> <string name="preferences_audio">Hang</string> + <string name="preferences_audio_description">Kimeneti motor, hangerő</string> <string name="preferences_theme">Téma és színek</string> <string name="preferences_debug">Hibakeresés</string> + <string name="preferences_debug_description">CPU/GPU hibakeresés, grafikus API, fastmem</string> + + <!-- Game properties --> + <string name="info">Infó</string> + <string name="info_description">Program ID, fejlesztő, verzió</string> + <string name="per_game_settings">Játékonkénti beállítások</string> + <string name="per_game_settings_description">Játékspecifikus beállítások szerkesztése</string> + <string name="launch_options">Indítási konfiguráció</string> + <string name="path">Útvonal</string> + <string name="program_id">Program ID</string> + <string name="developer">Fejlesztő</string> + <string name="version">Verzió</string> + <string name="copy_details">Részletek másolása</string> + <string name="add_ons">Kiegészítők</string> + <string name="add_ons_description">Modok, frissítések és DLC váltása</string> + <string name="clear_shader_cache">Árnyékoló gyorsítótár ürítése</string> + <string name="clear_shader_cache_description">Eltávolítja a játék által létrehozott árnyékolókat.</string> + <string name="clear_shader_cache_warning_description">Az árnyékoló gyorsítótár regenerálódása során több akadozást fogsz tapasztalni.</string> + <string name="cleared_shaders_successfully">Árnyékolók sikeresen ürítve</string> + <string name="addons_game">Kiegészítők: %1$s</string> + <string name="save_data">Mentett adatok</string> + <string name="save_data_description">Játékspecifikus mentett adatok kezelése</string> + <string name="delete_save_data">Mentett adatok törlése</string> + <string name="delete_save_data_description">Eltávolítja az összes játékhoz tartozó mentett adatot.</string> + <string name="delete_save_data_warning_description">Ez helyreállíthatatlanul eltávolítja a játék összes mentett adatát. Biztosan szeretnéd folytatni?</string> + <string name="save_data_deleted_successfully">Mentett adatok sikeresen törölve</string> + <string name="select_content_type">Tartalom típusa</string> + <string name="updates_and_dlc">Frissítések és DLC</string> + <string name="mods_and_cheats">Modok és csalások</string> + <string name="addon_notice">Fontos kiegészítő értesítés</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">A modok és csalások telepítéséhez olyan mappát válassz, amely tartalmaz cheats/, romfs/ vagy exefs/ könyvtárat. Nem tudjuk garantálni, hogy ezek kompatibilisek lesznek a játékoddal, ezért légy óvatos!</string> + <string name="invalid_directory">Érvénytelen könyvtár</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Kérjük, győződj meg róla, hogy a kiválasztott könyvtár tartalmazza a cheats/, romfs/ vagy exefs/ mappát, majd próbáld újra.</string> + <string name="addon_installed_successfully">Kiegészítő sikeresen telepítve</string> + <string name="verifying_content">Tartalom ellenőrzése...</string> + <string name="content_install_notice">Tartalom telepítési értesítés</string> + <string name="content_install_notice_description">A kiválasztott tartalom nem ehhez a játékhoz tartozik.\nÍgy is telepíted?</string> + <string name="confirm_uninstall">Eltávolítás megerősítése</string> + <string name="confirm_uninstall_description">Biztosan törölni szeretnéd ezt a kiegészítőt?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">ROM titkosítva</string> @@ -270,6 +367,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="emulation_pause">Emuláció szünetelése</string> <string name="emulation_unpause">Emuláció folytatása</string> <string name="emulation_input_overlay">Átfedés beállításai</string> + <string name="touchscreen">Érintőképernyő</string> <string name="load_settings">Beállítások betöltése...</string> @@ -301,6 +399,7 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <!-- Memory Sizes --> <string name="memory_byte">Bájt</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -345,9 +444,11 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Automatikus</string> <string name="screen_layout_landscape">Fekvő</string> + <string name="screen_layout_reverse_landscape">Fekvő (fejjel lefelé)</string> <string name="screen_layout_portrait">Álló</string> - <string name="screen_layout_auto">Automatikus</string> + <string name="screen_layout_reverse_portrait">Álló (fejjel lefelé)</string> <!-- Aspect Ratios --> <string name="ratio_default">Alapértelmezett (16:9)</string> @@ -356,6 +457,8 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="ratio_force_sixteen_ten">16:10 kényszerítése</string> <string name="ratio_stretch">Ablakhoz nyújtás</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dinamikus (lassú)</string> <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Pontos</string> <string name="cpu_accuracy_unsafe">Nem biztonságos</string> @@ -382,8 +485,15 @@ Válaszd ki a(z) <b>Games</b> mappát az alábbi gombbal.</string> <string name="theme_mode_dark">Sötét</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Fekete háttér</string> <string name="use_black_backgrounds_description">Sötét téma használatakor fekete háttér használata.</string> diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml index 5afebb4c4..61b39f57f 100644 --- a/src/android/app/src/main/res/values-it/strings.xml +++ b/src/android/app/src/main/res/values-it/strings.xml @@ -17,7 +17,7 @@ <string name="keys_description">Seleziona il tuo file <b>prod.keys</b> con il pulsante in basso.</string> <string name="select_keys">Seleziona le chiavi</string> <string name="games">Giochi</string> - <string name="games_description">Seleziona la cartella <b>Games</b> con il pulsante in basso.</string> + <string name="games_description">Seleziona la cartella dei <b>giochi</b> con il pulsante in basso.</string> <string name="done">Fatto</string> <string name="done_description">È tutto pronto.\nDivertiti a giocare!</string> <string name="text_continue">Continua</string> @@ -33,7 +33,7 @@ <string name="home_settings">Impostazioni</string> <string name="empty_gamelist">Non sono stati trovati file o non è stata ancora selezionata alcuna directory di gioco.</string> <string name="search_and_filter_games">Cerca e filtra i giochi</string> - <string name="select_games_folder">Seleziona la cartella di gioco</string> + <string name="select_games_folder">Seleziona la cartella dei giochi</string> <string name="select_games_folder_description">Consente a yuzu di popolare l\'elenco dei giochi</string> <string name="add_games_warning">Saltare la selezione della cartella dei giochi?</string> <string name="add_games_warning_description">I giochi non saranno mostrati nella lista dei giochi se una cartella non è selezionata.</string> @@ -68,6 +68,7 @@ <string name="invalid_keys_error">Chiavi di crittografia non valide</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">Il file selezionato è incorretto o corrotto. Per favore riesegui il dump delle tue chiavi.</string> + <string name="gpu_driver_manager">Gestore driver GPU</string> <string name="install_gpu_driver">Installa i driver GPU</string> <string name="install_gpu_driver_description">Installa driver alternativi per potenziali prestazioni migliori o accuratezza.</string> <string name="advanced_settings">Impostazioni avanzate</string> @@ -118,6 +119,23 @@ <string name="manage_yuzu_data_description">Importa/Esporta il firmware, le keys, i dati utente, e altro!</string> <string name="share_save_file">Condividi i tuoi dati di salvataggio</string> <string name="export_save_failed">Errore durante l\'esportazione del salvataggio</string> + <!-- Applet launcher strings --> + <string name="applets">Avvia applet</string> + <string name="applets_description">Avvia applet di sistema usando il firmware installato</string> + <string name="applets_error_firmware">Firmware non installato</string> + <string name="applets_error_applet">Applet non disponibile</string> + <string name="applets_error_description"><![CDATA[Assicurati che il file <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> e il <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> siano installati e riprova.]]></string> + <string name="album_applet">Album</string> + <string name="album_applet_description">Visualizza le immagini salvate nella cartella screenshots dell\'utente con il visualizzatore immagini di sistema</string> + <string name="mii_edit_applet">Modifica Mii</string> + <string name="mii_edit_applet_description">Visualizza e modifica Mii con l\'editor di sistema</string> + <string name="cabinet_applet">Cabinet</string> + <string name="cabinet_applet_description">Modifica ed elimina i dati salvati sugli amiibo</string> + <string name="cabinet_launcher">Avvia Cabinet</string> + <string name="cabinet_nickname_and_owner">Impostazioni nickname e proprietario</string> + <string name="cabinet_game_data_eraser">Cancella dati di gioco</string> + <string name="cabinet_restorer">Ripristina</string> + <string name="cabinet_formatter">Formatta</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia non è reale</string> @@ -191,7 +209,6 @@ <string name="renderer_reactive_flushing_description">Migliora l\'accuratezza della grafica in alcuni giochi, al costo delle performance.</string> <string name="use_disk_shader_cache">Usa la cache delle shader</string> <string name="use_disk_shader_cache_description">Riduce lo stuttering caricando le shader già compilate all\'avvio.</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="cpu_debug_mode">Debug della CPU</string> @@ -230,14 +247,19 @@ <string name="export_failed">Esportazione Fallita</string> <string name="import_failed">Importazione Fallita</string> <string name="cancelling">Cancellazione</string> - + <string name="install">Installa</string> + <string name="delete">Elimina</string> + <string name="start">Start</string> + <string name="clear">Cancella</string> + <string name="custom">Personalizzato</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Seleziona il driver della GPU</string> <string name="select_gpu_driver_title">Vuoi sostituire il driver della tua GPU attuale?</string> <string name="select_gpu_driver_install">Installa</string> <string name="select_gpu_driver_default">Predefinito</string> <string name="select_gpu_driver_use_default">Utilizza il driver predefinito della GPU.</string> - <string name="select_gpu_driver_error">Il driver selezionato è invalido, è in utilizzo quello predefinito di sistema!</string> + <string name="select_gpu_driver_error">Driver selezionato non valido</string> + <string name="driver_already_installed">Driver già installato</string> <string name="system_gpu_driver">Driver GPU del sistema</string> <string name="installing_driver">Installando i driver...</string> @@ -249,7 +271,12 @@ <string name="preferences_audio">Audio</string> <string name="preferences_theme">Tema e colori</string> <string name="preferences_debug">Debug</string> - + <!-- Game properties --> + <string name="info">Info</string> + <string name="path">Percorso</string> + <string name="developer">Sviluppatore</string> + <string name="version">Versione</string> + <string name="add_ons">Add-on</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">La tua ROM è criptata</string> <string name="loader_error_encrypted_roms_description"><![CDATA[Segui la nostra guida per fare il <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">dump delle tue cartucce di gioco</a>oppure <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">dei titoli già installati</a>.]]></string> @@ -263,20 +290,21 @@ <string name="emulation_exit">Arresta emulazione</string> <string name="emulation_done">Fatto</string> <string name="emulation_fps_counter">Contatore FPS</string> - <string name="emulation_toggle_controls">Controlli a interruttore</string> + <string name="emulation_toggle_controls">Attiva/disattiva comandi</string> <string name="emulation_rel_stick_center">Centro relativo degli Stick</string> <string name="emulation_dpad_slide">DPad A Scorrimento</string> <string name="emulation_haptics">Feedback Aptico</string> - <string name="emulation_show_overlay">Mostra l\'Overlay</string> + <string name="emulation_show_overlay">Mostra l\'overlay</string> <string name="emulation_toggle_all">Attiva/Disattiva tutto</string> - <string name="emulation_control_adjust">Modifica l\'Overlay</string> + <string name="emulation_control_adjust">Regola l\'overlay</string> <string name="emulation_control_scale">Scala</string> <string name="emulation_control_opacity">Opacità</string> - <string name="emulation_touch_overlay_reset">Reimposta l\'Overlay</string> - <string name="emulation_touch_overlay_edit">Modifica l\'Overlay</string> + <string name="emulation_touch_overlay_reset">Reimposta l\'overlay</string> + <string name="emulation_touch_overlay_edit">Modifica l\'overlay</string> <string name="emulation_pause">Sospendi l\'emulazione</string> <string name="emulation_unpause">Riprendi l\'emulazione</string> <string name="emulation_input_overlay">Opzioni overlay</string> + <string name="touchscreen">Touchscreen</string> <string name="load_settings">Carico le impostazioni...</string> @@ -308,6 +336,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">Kb</string> <string name="memory_megabyte">Mb</string> <string name="memory_gigabyte">GB</string> @@ -352,10 +381,9 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Automatico</string> <string name="screen_layout_landscape">Layout Orizzontale</string> <string name="screen_layout_portrait">Layout Verticale</string> - <string name="screen_layout_auto">Automatico</string> - <!-- Aspect Ratios --> <string name="ratio_default">Predefinito (16:9)</string> <string name="ratio_force_four_three">Forza 4:3</string> @@ -390,9 +418,14 @@ <string name="theme_mode_light">Chiaro</string> <string name="theme_mode_dark">Scuro</string> - <!-- Audio output engines --> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Sfondi neri</string> <string name="use_black_backgrounds_description">Quando utilizzi il tema scuro, applica sfondi neri.</string> diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml index 3be4e7d26..0cff40bb6 100644 --- a/src/android/app/src/main/res/values-ja/strings.xml +++ b/src/android/app/src/main/res/values-ja/strings.xml @@ -39,7 +39,7 @@ <string name="add_games_warning_description">フォルダを選択しないと、ゲームがリストに表示されません。</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> <string name="home_search_games">ゲームを検索</string> - <string name="search_settings">検索設定</string> + <string name="search_settings">設定を検索</string> <string name="games_dir_selected">フォルダを選択しました</string> <string name="install_prod_keys">prod.keys</string> <string name="install_prod_keys_description">製品版ゲームの復号化に必要です</string> @@ -68,6 +68,7 @@ <string name="invalid_keys_error">暗号化キーが無効</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">ファイルが間違っているか破損しています。キーを再ダンプしてください。</string> + <string name="gpu_driver_manager">GPUドライバーの管理</string> <string name="install_gpu_driver">GPUドライバー</string> <string name="install_gpu_driver_description">代替ドライバーをインストールしてパフォーマンスや精度を向上させます</string> <string name="advanced_settings">高度な設定</string> @@ -111,6 +112,9 @@ <string name="custom_driver_not_supported">カスタムドライバはサポートされていません</string> <string name="manage_yuzu_data">yuzu データを管理</string> <string name="share_save_file">セーブファイルを共有</string> + <string name="applets_error_firmware">ファームウェア未インストール</string> + <string name="album_applet">アルバム</string> + <string name="cabinet_nickname_and_owner">ニックネームと所有者の設定</string> <!-- About screen strings --> <string name="gaia_is_not_real">ガイアは実在しない</string> <string name="copied_to_clipboard">クリップボードにコピーしました</string> @@ -178,10 +182,9 @@ <string name="renderer_reactive_flushing_description">一部のゲームにおいて、パフォーマンスを犠牲にしながらも、レンダリング精度を向上させます。</string> <string name="use_disk_shader_cache">ディスクシェーダーキャッシュ</string> <string name="use_disk_shader_cache_description">生成したシェーダーを端末に保存して読み込み、コマ落ちを軽減します。</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> - <string name="cpu_debug_mode">CPU デバッギング</string> + <string name="cpu_debug_mode">CPUデバッグ</string> <string name="gpu">GPU</string> <string name="renderer_api">API</string> <string name="renderer_debug">グラフィックデバッグ</string> @@ -215,14 +218,17 @@ <string name="export_failed">エクスポート失敗</string> <string name="import_failed">インポート失敗</string> <string name="cancelling">キャンセル中</string> - + <string name="install">インストール</string> + <string name="delete">削除</string> + <string name="start">開始</string> + <string name="clear">クリア</string> + <string name="custom">カスタム</string> <!-- GPU driver installation --> <string name="select_gpu_driver">GPUドライバを選択</string> <string name="select_gpu_driver_title">現在のGPUドライバを置き換えますか？</string> <string name="select_gpu_driver_install">インストール</string> <string name="select_gpu_driver_default">デフォルト</string> <string name="select_gpu_driver_use_default">デフォルトのドライバを使用します</string> - <string name="select_gpu_driver_error">選択されたドライバが無効、システムのデフォルトを使用します!</string> <string name="system_gpu_driver">システムのGPUドライバ</string> <string name="installing_driver">インストール中…</string> @@ -234,7 +240,12 @@ <string name="preferences_audio">サウンド</string> <string name="preferences_theme">テーマと色</string> <string name="preferences_debug">デバッグ</string> - + <!-- Game properties --> + <string name="info">情報</string> + <string name="path">パス</string> + <string name="developer">開発元</string> + <string name="version">バージョン</string> + <string name="add_ons">アドオン</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">ROMが暗号化されています</string> <string name="loader_error_encrypted_keys_description"><![CDATA[ゲームの復号化に必要な <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> ファイルがインストールされていることを確認してください。]]></string> @@ -261,6 +272,7 @@ <string name="emulation_pause">一時停止</string> <string name="emulation_unpause">再開</string> <string name="emulation_input_overlay">表示オプション</string> + <string name="touchscreen">タッチスクリーン</string> <string name="load_settings">設定をロード中…</string> @@ -292,6 +304,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -336,10 +349,9 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">自動</string> <string name="screen_layout_landscape">横長</string> <string name="screen_layout_portrait">縦長</string> - <string name="screen_layout_auto">自動</string> - <!-- Aspect Ratios --> <string name="ratio_default">デフォルト (16:9)</string> <string name="ratio_force_four_three">強制 4:3</string> @@ -374,9 +386,14 @@ <string name="theme_mode_light">ライト</string> <string name="theme_mode_dark">ダーク</string> - <!-- Audio output engines --> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">完全な黒を使用</string> <string name="use_black_backgrounds_description">ダークテーマの背景色に黒が適用されます。</string> diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml index 1b9160a23..eaa6c23ce 100644 --- a/src/android/app/src/main/res/values-ko/strings.xml +++ b/src/android/app/src/main/res/values-ko/strings.xml @@ -25,6 +25,8 @@ <string name="back">이전</string> <string name="add_games">게임 추가</string> <string name="add_games_description">게임 폴더 선택</string> + <string name="step_complete">완료되었습니다!</string> + <!-- Home strings --> <string name="home_games">게임</string> <string name="home_search">검색</string> @@ -32,11 +34,13 @@ <string name="empty_gamelist">파일을 찾을 수 없거나 아직 게임 디렉터리를 선택하지 않았습니다.</string> <string name="search_and_filter_games">게임 검색 및 필터링</string> <string name="select_games_folder">게임 폴더 선택</string> - <string name="select_games_folder_description">yuzu가 게임 목록을 채울 수 있도록 허용</string> + <string name="manage_game_folders">게임 폴더 관리</string> + <string name="select_games_folder_description">yuzu에 게임 목록 추가하기</string> <string name="add_games_warning">게임 폴더 선택을 건너뛰겠습니까?</string> <string name="add_games_warning_description">폴더를 선택하지 않으면 게임 목록에 게임이 표시되지 않습니다.</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> <string name="home_search_games">게임 검색</string> + <string name="search_settings">검색 설정</string> <string name="games_dir_selected">게임 디렉터리를 설정했습니다.</string> <string name="install_prod_keys">prod.keys 설치</string> <string name="install_prod_keys_description">패키지 게임 암호 해독에 필요</string> @@ -65,9 +69,11 @@ <string name="invalid_keys_error">암호화 키가 올바르지 않음</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">선택한 파일이 잘못되었거나 손상되었습니다. 키를 다시 덤프하세요.</string> + <string name="gpu_driver_manager">GPU 드라이버 관리자</string> <string name="install_gpu_driver">GPU 드라이버 설치</string> - <string name="install_gpu_driver_description">잠재적으로 더 나은 성능 또는 정확성을 위해 대체 드라이버를 설치하세요.</string> + <string name="install_gpu_driver_description">잠재적인 성능 또는 정확도 개선을 위해 대체 드라이버 설치</string> <string name="advanced_settings">고급 설정</string> + <string name="advanced_settings_game">고급 설정: %1$s</string> <string name="settings_description">에뮬레이터 설정 구성</string> <string name="search_recently_played">최근 플레이</string> <string name="search_recently_added">최근 추가</string> @@ -79,9 +85,13 @@ <string name="no_file_manager">파일 관리자를 찾을 수 없음</string> <string name="notification_no_directory_link">yuzu 디렉터리를 열 수 없음</string> <string name="notification_no_directory_link_description">파일 관리자의 사이드 패널에서 사용자 폴더를 수동으로 찾아주세요.</string> - <string name="manage_save_data">저장 데이터 관리</string> - <string name="manage_save_data_description">저장 데이터를 발견했습니다. 아래에서 옵션을 선택하세요.</string> - <string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string> + <string name="manage_save_data">세이브 데이터 관리</string> + <string name="manage_save_data_description">세이브 데이터를 발견했습니다. 아래에서 옵션을 선택하세요.</string> + <string name="import_save_warning">세이브 데이터 가져오기</string> + <string name="import_save_warning_description">이 작업은 기존 데이터 전체를 선택한 파일로 덮어씌웁니다. 계속하시겠습니까?</string> + <string name="import_export_saves_description">세이브 파일 가져오기 또는 내보내기</string> + <string name="save_files_importing">세이브 파일 가져오는 중...</string> + <string name="save_files_exporting">세이브 파일 내보내는 중...</string> <string name="save_file_imported_success">데이터를 불러왔습니다.</string> <string name="save_file_invalid_zip_structure">올바르지 않은 저장 디렉터리 구조</string> <string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string> @@ -89,15 +99,62 @@ <string name="export_saves">내보내기</string> <string name="install_firmware">펌웨어 설치</string> <string name="install_firmware_description">펌웨어는 ZIP 파일이며 일부 게임을 부팅하는 데 필요합니다.</string> - <string name="firmware_installing">펌웨어 설치</string> + <string name="firmware_installing">펌웨어 설치 중...</string> <string name="firmware_installed_success">펌웨어를 설치했습니다.</string> <string name="firmware_installed_failure">펌웨어 설치 실패</string> + <string name="firmware_installed_failure_description">펌웨어 NCA 파일이 ZIP 파일의 루트 디렉토리에 위치한지 확인하고 다시 시도하세요.</string> <string name="share_log">디버그 로그 공유</string> - <string name="share_log_description">yuzu의 로그 파일을 공유하여 문제 디버깅하기</string> + <string name="share_log_description">문제 해결을 위한 yuzu 로그 파일 공유</string> <string name="share_log_missing">로그 파일을 찾을 수 없습니다.</string> <string name="install_game_content">게임 콘텐츠 설치</string> <string name="install_game_content_description">게임 업데이트 또는 DLC 설치</string> + <string name="installing_game_content">콘텐츠 설치 중...</string> + <string name="install_game_content_failure">NAND에 파일을 설치하는 동안 오류 발생</string> + <string name="install_game_content_failure_description">콘텐츠가 유효하고 prod.keys가 설치되었는지 확인하세요.</string> + <string name="install_game_content_failure_base">충돌을 방지하기 위해 기본 게임 설치는 허용되지 않습니다.</string> + <string name="install_game_content_failure_file_extension">NSP 및 XCI 콘텐츠만 지원합니다. 게임 콘텐츠가 유효한지 확인하세요.</string> + <string name="install_game_content_failed_count">%1$d개의 설치 오류</string> + <string name="install_game_content_success">게임 콘텐츠 설치됨</string> + <string name="install_game_content_success_install">%1$d개를 설치했습니다.</string> + <string name="install_game_content_success_overwrite">%1$d개를 덮어씌웠습니다.</string> <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string> + <string name="custom_driver_not_supported">사용자 지정 드라이버는 지원하지 않습니다.</string> + <string name="custom_driver_not_supported_description">이 장치의 사용자 지정 드라이버 로딩은 현재 지원하지 않습니다.\n나중에 이 옵션을 확인하면 지원이 추가되었는지 확인할 수 있습니다.</string> + <string name="manage_yuzu_data">yuzu 데이터 관리</string> + <string name="manage_yuzu_data_description">펌웨어, 키 값, 유저 데이터 등을 가져오기 또는 내보내기</string> + <string name="share_save_file">세이브 파일 공유</string> + <string name="export_save_failed">세이브 내보내기 실패</string> + <string name="game_folders">게임 폴더</string> + <string name="deep_scan">딥 스캔(하위 폴더 탐색)</string> + <string name="add_game_folder">게임 폴더 추가</string> + <string name="folder_already_added">이 폴더는 이미 추가되어 있습니다!</string> + <string name="game_folder_properties">게임 폴더 속성</string> + <plurals name="saves_import_failed"> + <item quantity="other">%d개의 세이브 가져오기 실패</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="other">%d개의 세이브를 가져왔습니다.</item> + </plurals> + <string name="no_save_data_found">세이브 데이터를 찾을 수 없음</string> + + <!-- Applet launcher strings --> + <string name="applets">애플릿 런처</string> + <string name="applets_description">설치된 펌웨어를 사용해 시스템 애플릿을 실행합니다.</string> + <string name="applets_error_firmware">펌웨어가 설치되지 않았습니다.</string> + <string name="applets_error_applet">애플릿을 사용할 수 없음</string> + <string name="applets_error_description"><![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 파일과 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">펌웨어가</a> 설치되었는지 확인하고 다시 시도하세요.]]></string> + <string name="album_applet">앨범</string> + <string name="album_applet_description">시스템 사진 뷰어로 유저 스크린샷 폴더에 저장된 이미지를 확인합니다. </string> + <string name="mii_edit_applet">Mii 편집</string> + <string name="mii_edit_applet_description">시스템 에디터로 Mii를 보고 편집합니다.</string> + <string name="cabinet_applet">캐비닛</string> + <string name="cabinet_applet_description">amiibo에 저장된 데이터를 편집하고 삭제합니다.</string> + <string name="cabinet_launcher">캐비닛 런처</string> + <string name="cabinet_nickname_and_owner">닉네임 및 소유자 설정</string> + <string name="cabinet_game_data_eraser">게임 데이터 삭제</string> + <string name="cabinet_restorer">복원</string> + <string name="cabinet_formatter">포맷터</string> + <!-- About screen strings --> <string name="gaia_is_not_real">가이아는 진짜가 아님</string> <string name="copied_to_clipboard">클립보드에 복사되었습니다.</string> @@ -107,6 +164,16 @@ <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> <string name="licenses_description">Android용 yuzu를 가능하게 하는 프로젝트</string> <string name="build">빌드</string> + <string name="user_data">유저 데이터</string> + <string name="user_data_description">모든 앱 데이터를 가져오거나 내보냅니다.\n\n유저 데이터를 가져올 경우 현재의 모든 데이터는 삭제됩니다.</string> + <string name="exporting_user_data">유저 데이터 내보내는 중...</string> + <string name="importing_user_data">유저 데이터 가져오는 중...</string> + <string name="import_user_data">유저 데이터 가져오기</string> + <string name="invalid_yuzu_backup">올바르지 않은 yuzu 백업 파일</string> + <string name="user_data_export_success">유저 데이터를 내보냈습니다.</string> + <string name="user_data_import_success">유저 데이터를 가져왔습니다.</string> + <string name="user_data_export_cancelled">내보내기 취소됨</string> + <string name="user_data_import_failed_description">유저 데이터 폴더가 ZIP 폴더의 루트 디렉토리에 위치하고 config/config.ini 구성 파일이 있는지 확인하고 다시 시도하세요.</string> <string name="support_link">https://discord.gg/u77vRWY</string> <string name="website_link">https://yuzu-emu.org/</string> <string name="github_link">https://github.com/yuzu-emu</string> @@ -130,7 +197,10 @@ <string name="frame_limit_enable_description">에뮬레이션 속도를 정상 속도의 지정된 비율로 제한합니다.</string> <string name="frame_limit_slider">속도 제한 비율</string> <string name="frame_limit_slider_description">에뮬레이션 속도의 제한 비율을 지정합니다. 100%가 정상 속도입니다. 값이 높거나 낮으면 속도 제한이 증가하거나 감소합니다.</string> + <string name="cpu_backend">CPU 백엔드</string> <string name="cpu_accuracy">CPU 정확도</string> + <string name="value_with_units">%1$s%2$s</string> + <!-- System settings strings --> <string name="use_docked_mode">독 모드</string> <string name="use_docked_mode_description">해상도를 높이며 성능이 저하됩니다. 비활성화시 휴대 모드가 사용되며 해상도는 낮아지고 성능은 향상됩니다.</string> @@ -139,13 +209,14 @@ <string name="select_rtc_date">RTC 날짜 선택</string> <string name="select_rtc_time">RTC 시간 선택</string> <string name="use_custom_rtc">사용자 지정 RTC</string> - <string name="use_custom_rtc_description">현재 시스템 시간과 별도로 사용자 지정 실시간 시계를 설정할 수 있습니다.</string> + <string name="use_custom_rtc_description">현재 시스템 시간과 별도로 사용자 지정 RTC를 설정할 수 있습니다.</string> <string name="set_custom_rtc">사용자 지정 RTC 설정</string> <!-- Graphics settings strings --> <string name="renderer_accuracy">정확도 수준</string> <string name="renderer_resolution">해상도 (휴대 모드/독 모드)</string> <string name="renderer_vsync">수직동기화 모드</string> + <string name="renderer_screen_layout">화면 방향</string> <string name="renderer_aspect_ratio">화면비</string> <string name="renderer_scaling_filter">윈도우 적응 필터</string> <string name="renderer_anti_aliasing">안티에일리어싱 방법</string> @@ -157,12 +228,21 @@ <string name="renderer_reactive_flushing_description">일부 게임에서 성능 저하를 감수하고 렌더링 정확도를 향상합니다.</string> <string name="use_disk_shader_cache">디스크 셰이더 캐시</string> <string name="use_disk_shader_cache_description">생성된 셰이더를 로컬에 저장하고 로드하여 끊김 현상을 줄입니다.</string> + <string name="anisotropic_filtering">비등방성 필터링</string> + <string name="anisotropic_filtering_description">경사각에서 보이는 텍스처의 품질을 향상시킵니다.</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> + <string name="cpu_debug_mode">CPU 디버깅</string> + <string name="cpu_debug_mode_description">CPU를 느린 디버깅 모드로 설정합니다.</string> + <string name="gpu">GPU</string> <string name="renderer_api">API</string> <string name="renderer_debug">그래픽 디버깅</string> <string name="renderer_debug_description">그래픽 API를 느린 디버깅 모드로 설정합니다.</string> + <string name="fastmem">Fastmem</string> + + <!-- Audio settings strings --> + <string name="audio_output_engine">출력 엔진</string> <string name="audio_volume">볼륨</string> <string name="audio_volume_description">오디오 출력의 볼륨을 지정합니다.</string> @@ -171,12 +251,15 @@ <string name="ini_saved">설정이 저장되었습니다.</string> <string name="gameid_saved">%1$s 전용 설정이 저장되었습니다.</string> <string name="error_saving">%1$s.ini 저장 중 오류 발생: %2$s</string> + <string name="unimplemented_menu">구현되지 않은 메뉴</string> <string name="loading">불러오는 중...</string> + <string name="shutting_down">종료하는 중...</string> <string name="reset_setting_confirmation">이 설정을 기본값으로 재설정하겠습니까?</string> <string name="reset_to_default">기본값으로 재설정</string> + <string name="reset_to_default_description">모든 고급 설정 초기화</string> <string name="reset_all_settings">모든 설정을 초기화하겠습니까?</string> <string name="reset_all_settings_description">모든 고급 설정이 기본 구성으로 재설정됩니다. 이 작업은 되돌릴 수 없습니다.</string> - <string name="settings_reset">설정 초기화</string> + <string name="settings_reset">설정을 초기화했습니다.</string> <string name="close">닫기</string> <string name="learn_more">자세히</string> <string name="auto">자동</string> @@ -184,13 +267,30 @@ <string name="string_null">Null</string> <string name="string_import">가져오기</string> <string name="export">내보내기</string> + <string name="export_failed">내보내기 실패</string> + <string name="import_failed">가져오기 실패</string> + <string name="cancelling">취소하는 중</string> + <string name="install">설치</string> + <string name="delete">삭제</string> + <string name="edit">편집</string> + <string name="export_success">데이터를 내보냈습니다.</string> + <string name="start">시작</string> + <string name="clear">초기화</string> + <string name="global">글로벌</string> + <string name="custom">커스텀</string> + <string name="notice">알림</string> + <string name="import_complete">가져오기 완료</string> + <string name="more_options">추가 옵션</string> + <string name="use_global_setting">글로벌 설정 사용</string> + <!-- GPU driver installation --> <string name="select_gpu_driver">GPU 드라이버 선택</string> <string name="select_gpu_driver_title">현재 사용중인 GPU 드라이버를 변경하겠습니까?</string> <string name="select_gpu_driver_install">설치</string> <string name="select_gpu_driver_default">기본값</string> <string name="select_gpu_driver_use_default">기본 GPU 드라이버를 사용합니다.</string> - <string name="select_gpu_driver_error">잘못된 드라이브가 선택되었습니다. 시스템 기본값을 사용합니다.</string> + <string name="select_gpu_driver_error">잘못된 드라이버가 선택되었습니다.</string> + <string name="driver_already_installed">이미 설치된 드라이버입니다.</string> <string name="system_gpu_driver">시스템 GPU 드라이버</string> <string name="installing_driver">드라이버 설치 중...</string> @@ -198,13 +298,58 @@ <string name="preferences_settings">설정</string> <string name="preferences_general">일반</string> <string name="preferences_system">시스템</string> + <string name="preferences_system_description">독 모드, 지역, 언어</string> <string name="preferences_graphics">그래픽</string> + <string name="preferences_graphics_description">정확도 수준, 해상도, 셰이더 캐시</string> <string name="preferences_audio">오디오</string> + <string name="preferences_audio_description">출력 엔진, 불륨</string> <string name="preferences_theme">테마 및 색상</string> <string name="preferences_debug">디버그</string> + <string name="preferences_debug_description">CPU/GPU 디버깅, 그래픽 API, Fastmem</string> + + <!-- Game properties --> + <string name="info">정보</string> + <string name="info_description">프로그램 ID, 개발자, 버전</string> + <string name="per_game_settings">게임별 설정</string> + <string name="per_game_settings_description">현재 게임에 적용되는 설정을 편집합니다.</string> + <string name="launch_options">실행 구성</string> + <string name="path">주소</string> + <string name="program_id">프로그램 ID</string> + <string name="developer">개발자</string> + <string name="version">버전</string> + <string name="copy_details">세부사항 복사</string> + <string name="add_ons">부가 기능</string> + <string name="add_ons_description">모드, 업데이트 및 DLC 전환하기</string> + <string name="clear_shader_cache">셰이더 캐시 비우기</string> + <string name="clear_shader_cache_description">현재 게임을 실행하는 중에 생성된 모든 셰이더를 삭제합니다.</string> + <string name="clear_shader_cache_warning_description">셰이더 캐시가 재생성되어 게임이 버벅일 수 있습니다.</string> + <string name="cleared_shaders_successfully">셰이더를 비웠습니다.</string> + <string name="addons_game">애드온: %1$s</string> + <string name="save_data">세이브 데이터</string> + <string name="save_data_description">현재 게임에 사용되는 세이브 데이터를 관리합니다.</string> + <string name="delete_save_data">세이브 데이터 삭제하기</string> + <string name="delete_save_data_description">현재 게임에 사용되는 모든 세이브 데이터를 삭제합니다.</string> + <string name="delete_save_data_warning_description">이 작업은 현재 게임의 세이브 데이터를 모두 삭제하고 되돌릴 수 없습니다. 계속하시겠습니까?</string> + <string name="save_data_deleted_successfully">세이브 데이터를 삭제했습니다.</string> + <string name="select_content_type">콘텐츠 형태</string> + <string name="updates_and_dlc">업데이트 및 DLC</string> + <string name="mods_and_cheats">모드 및 치트</string> + <string name="addon_notice">중요 애드온 알림</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">모드와 치트를 설치하려면 cheats/, romfs/, 또는 exefs/ 디렉토리를 포함하는 폴더를 선택해야 합니다. 게임과의 호환 여부를 확인할 수 없기 때문에 신중하게 결정하세요.</string> + <string name="invalid_directory">잘못된 디렉토리</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">선택한 디렉토리가 cheats/, romfs/, 또는 exefs/ 폴더를 포함하는지 확인하고 다시 시도하세요.</string> + <string name="addon_installed_successfully">애드온을 설치했습니다.</string> + <string name="verifying_content">콘텐츠 확인 중...</string> + <string name="content_install_notice">콘텐츠 설치 안내</string> + <string name="content_install_notice_description">선택한 콘텐츠가 현재 게임과 일치하지 않습니다.\n무시하고 설치하시겠습니까?</string> + <string name="confirm_uninstall">제거 확인</string> + <string name="confirm_uninstall_description">이 애드온을 제거하시겠습니까?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">롬 파일이 암호화되어있음</string> + <string name="loader_error_encrypted_roms_description"><![CDATA[가이드에 따라 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">게임 카트리지</a> 또는 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">설치된 타이틀</a>을 다시 덤프하세요.]]></string> <string name="loader_error_encrypted_keys_description"><![CDATA[게임을 해독할 수 있도록 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 파일이 설치되어 있는지 확인하세요.]]></string> <string name="loader_error_video_core">비디오 코어를 초기화하는 동안 오류 발생</string> <string name="loader_error_video_core_description">일반적으로 이 문제는 호환되지 않는 GPU 드라이버로 인해 발생합니다. 사용자 지정 GPU 드라이버를 설치하면 이 문제가 해결될 수 있습니다.</string> @@ -229,6 +374,7 @@ <string name="emulation_pause">에뮬레이션 일시 중지</string> <string name="emulation_unpause">에뮬레이션 일시 중지 해제</string> <string name="emulation_input_overlay">화면 오버레이 설정</string> + <string name="touchscreen">터치 스크린</string> <string name="load_settings">설정 불러오는 중...</string> @@ -245,6 +391,10 @@ <string name="fatal_error">치명적 오류</string> <string name="fatal_error_message">치명적 오류가 발생했습니다. 자세한 내용은 로그를 확인하십시오.\n에뮬레이션을 계속하면 충돌 및 버그가 발생할 수 있습니다.</string> <string name="performance_warning">이 설정을 끄면 에뮬레이션 성능이 크게 저하됩니다! 최상의 환경을 위해 이 설정을 활성화된 상태로 두는 것이 좋습니다.</string> + <string name="device_memory_inadequate">장치 RAM: %1$s\n권장: %2$s</string> + <string name="memory_formatted">%1$s %2$s</string> + <string name="no_game_present">실행 가능한 게임이 없습니다!</string> + <!-- Region Names --> <string name="region_japan">일본</string> <string name="region_usa">미국</string> @@ -254,7 +404,16 @@ <string name="region_korea">대한민국</string> <string name="region_taiwan">대만</string> + <!-- Memory Sizes --> + <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> + <string name="memory_kilobyte">KB</string> + <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">영국 하계 표준시(GB)</string> + <string name="memory_terabyte">TB</string> + <string name="memory_petabyte">PB</string> + <string name="memory_exabyte">EB</string> + <!-- Renderer APIs --> <string name="renderer_vulkan">Vulcan</string> <string name="renderer_none">없음</string> @@ -291,7 +450,14 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">자동</string> + <string name="screen_layout_sensor_landscape">가로 고정 (방향 감지)</string> + <string name="screen_layout_landscape">가로</string> + <string name="screen_layout_reverse_landscape">가로 고정 (역방향 고정)</string> + <string name="screen_layout_sensor_portrait">세로 고정 (방향 감지)</string> + <string name="screen_layout_portrait">세로</string> + <string name="screen_layout_reverse_portrait">세로 고정 (역방향 고정)</string> <!-- Aspect Ratios --> <string name="ratio_default">기본 (16:9)</string> @@ -300,6 +466,10 @@ <string name="ratio_force_sixteen_ten">강제 16:10</string> <string name="ratio_stretch">화면에 맞춤</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (느림)</string> + <string name="cpu_backend_nce">네이티브 코드 실행 (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">정확함</string> <string name="cpu_accuracy_unsafe">최적화 (안전하지 않음)</string> @@ -327,14 +497,29 @@ <string name="theme_mode_light">라이트 모드</string> <string name="theme_mode_dark">다크 모드</string> + <!-- Audio output engines --> + <string name="oboe">oboe</string> + <string name="cubeb">cubeb</string> + + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">검정 배경</string> - <string name="use_black_backgrounds_description">어두운 테마를 사용할 때는 검정 배경을 적용합니다.</string> + <string name="use_black_backgrounds_description">어두운 테마 사용 시 검정 배경을 적용합니다.</string> + <!-- Picture-In-Picture --> + <string name="picture_in_picture">픽처 인 픽처 (Picture-in-Picture)</string> + <string name="picture_in_picture_description">앱을 백그라운드에서 실행할 때 창을 최소화합니다.</string> + <string name="pause">일시중지</string> + <string name="play">재생</string> <string name="mute">음소거</string> <string name="unmute">음소거 해제</string> <!-- Licenses screen strings --> <string name="licenses">라이센스</string> - <string name="license_fidelityfx_fsr_description">AMD의 고품질 업스케일링</string> + <string name="license_fidelityfx_fsr_description">AMD 고품질 업스케일링</string> </resources> diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml index 3162a9d41..e92dc62d9 100644 --- a/src/android/app/src/main/res/values-nb/strings.xml +++ b/src/android/app/src/main/res/values-nb/strings.xml @@ -157,7 +157,6 @@ <string name="renderer_reactive_flushing_description">Forbedrer gjengivelsesnøyaktigheten i enkelte spill på bekostning av ytelsen.</string> <string name="use_disk_shader_cache">Disk shader-hurtigbuffer</string> <string name="use_disk_shader_cache_description">Reduserer hakking ved å lagre og laste inn genererte shaders lokalt.</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="renderer_api">API</string> @@ -184,13 +183,16 @@ <string name="string_null">Null</string> <string name="string_import">Importer</string> <string name="export">Eksporter</string> + <string name="install">Installer</string> + <string name="delete">Slett</string> + <string name="start">Start</string> + <string name="clear">Fjern</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Velg GPU-driver</string> <string name="select_gpu_driver_title">Ønsker du å bytte ut din nåværende GPU-driver?</string> <string name="select_gpu_driver_install">Installer</string> <string name="select_gpu_driver_default">Standard</string> <string name="select_gpu_driver_use_default">Bruk av standard GPU-driver</string> - <string name="select_gpu_driver_error">Ugyldig driver valgt, bruker systemstandard!</string> <string name="system_gpu_driver">Systemets GPU-driver</string> <string name="installing_driver">Installerer driver...</string> @@ -202,7 +204,12 @@ <string name="preferences_audio">Lyd</string> <string name="preferences_theme">Tema og farge</string> <string name="preferences_debug">Feilsøk</string> - + <!-- Game properties --> + <string name="info">Info</string> + <string name="path">Sti</string> + <string name="developer">Utvikler</string> + <string name="version">Versjon</string> + <string name="add_ons">Tilleggsprogrammer</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">ROM-en din er kryptert</string> <string name="loader_error_encrypted_keys_description"><![CDATA[Vennligst sørg for at <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> filen er installert slik at spillene kan dekrypteres.]]></string> @@ -229,6 +236,7 @@ <string name="emulation_pause">Pause emulering</string> <string name="emulation_unpause">Ta emuleringen ut av pause</string> <string name="emulation_input_overlay">Overlay-alternativer</string> + <string name="touchscreen">Touch-skjerm</string> <string name="load_settings">Laster inn innstillinger...</string> @@ -254,6 +262,7 @@ <string name="region_korea">Korea</string> <string name="region_taiwan">Taiwan</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_gigabyte">GB</string> <!-- Renderer APIs --> <string name="renderer_vulkan">Vulkan</string> @@ -291,8 +300,8 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">Auto</string> - <!-- Aspect Ratios --> <string name="ratio_default">Standard (16:9)</string> <string name="ratio_force_four_three">Tving 4:3</string> @@ -327,6 +336,12 @@ <string name="theme_mode_light">Lys</string> <string name="theme_mode_dark">Mørk</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Svart bakgrunn</string> <string name="use_black_backgrounds_description">Bruk svart bakgrunn når du bruker det mørke temaet.</string> diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml index f4d9920c2..fbd0ad7e9 100644 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -157,7 +157,6 @@ <string name="renderer_reactive_flushing_description">Poprawia jakość renderowania w kilku grach, kosztem wydajności.</string> <string name="use_disk_shader_cache">Pamięć podręczna shaderów</string> <string name="use_disk_shader_cache_description">Zmniejsza przycięcia przez przechowywanie gotowych wygenerowanych plików oświetlenia w pamięci urządzenia.</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="renderer_api">Interfejs graficzny</string> @@ -183,13 +182,17 @@ <string name="submit">Zatwierdź</string> <string name="string_import">Importuj</string> <string name="export">Eksportuj</string> + <string name="install">Zainstaluj</string> + <string name="delete">Usuń</string> + <string name="start">Start</string> + <string name="clear">Wyczyść</string> + <string name="custom">Losowy</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Wybierz sterownik GPU </string> <string name="select_gpu_driver_title">Chcesz zastąpić obecny sterownik układu graficznego?</string> <string name="select_gpu_driver_install">Zainstaluj</string> <string name="select_gpu_driver_default">Domyślne</string> <string name="select_gpu_driver_use_default">Aktywny domyślny sterownik GPU</string> - <string name="select_gpu_driver_error">Wybrano błędny sterownik, powrót do domyślnego. </string> <string name="system_gpu_driver">Systemowy sterownik GPU</string> <string name="installing_driver">Instalowanie sterownika...</string> @@ -201,7 +204,12 @@ <string name="preferences_audio">Dźwięk</string> <string name="preferences_theme">Motyw i kolor</string> <string name="preferences_debug">Debug</string> - + <!-- Game properties --> + <string name="info">Informacje</string> + <string name="path">Ścieżka</string> + <string name="developer">Deweloper</string> + <string name="version">Wersja</string> + <string name="add_ons">Dodatki</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Twój ROM jest zakodowany</string> <string name="loader_error_encrypted_keys_description"><![CDATA[Upewnij się że plik kluczy <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> jest zainstalowany aby gry mogły zostać odczytane.]]></string> @@ -228,6 +236,7 @@ <string name="emulation_pause">Wstrzymaj emulację</string> <string name="emulation_unpause">Wznów emulację</string> <string name="emulation_input_overlay">Opcje nakładki</string> + <string name="touchscreen">Ekran dotykowy</string> <string name="load_settings">Wczytuję ustawienia...</string> @@ -253,6 +262,7 @@ <string name="region_korea">Korea</string> <string name="region_taiwan">Tajwan</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_gigabyte">GB</string> <!-- Renderer APIs --> <string name="renderer_vulkan">Vulkan</string> @@ -290,8 +300,8 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">Automatyczny</string> - <!-- Aspect Ratios --> <string name="ratio_default">Domyślne (16:9)</string> <string name="ratio_force_four_three">Wymuś 4:3</string> @@ -326,6 +336,12 @@ <string name="theme_mode_light">Jasny</string> <string name="theme_mode_dark">Ciemny</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Czarne tła</string> <string name="use_black_backgrounds_description">Kiedy używany ciemny motyw, tła zostają zastąpione czernią.</string> diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml index 8888fc750..a87eb11e4 100644 --- a/src/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> - <string name="app_disclaimer">Este software executa jogos do console Nintendo Switch. Não estão inclusos nem jogos ou chaves. <br /><br />Antes de começar, por favor localize o arquivo <![CDATA[1 prod.keys 1]]> no armazenamento de seu dispositivo.<br /><br /><![CDATA[2Saiba mais2]]></string> - <string name="emulation_notification_channel_name">Emulação está Ativa</string> + <string name="app_disclaimer">Este software executa jogos do console Nintendo Switch. Não estão inclusos nem jogos ou chaves.<br /><br />Antes de começar, por favor localize o arquivo <![CDATA[<b> prod.keys </b>]]> no armazenamento de seu dispositivo.<br /><br /><![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saiba mais</a>]]></string> + <string name="emulation_notification_channel_name">A emulação está Ativa</string> <string name="emulation_notification_channel_description">Mostra uma notificação permanente enquanto a emulação estiver em andamento.</string> - <string name="emulation_notification_running">Yuzu está em execução </string> + <string name="emulation_notification_running">O Yuzu está em execução </string> <string name="notice_notification_channel_name">Notificações e erros</string> <string name="notice_notification_channel_description">Mostra notificações quando algo dá errado.</string> <string name="notification_permission_not_granted">Acesso às notificações não concedido!</string> @@ -17,7 +17,7 @@ <string name="keys_description">Selecione seu arquivo <b>prod.keys</b> com o botão abaixo.</string> <string name="select_keys">Selecione as Keys</string> <string name="games">Jogos</string> - <string name="games_description">Seleciona sua pasta <b>Jogos</b> com o botão abaixo.</string> + <string name="games_description">Selecione sua pasta <b>Jogos</b> com o botão abaixo.</string> <string name="done">Feito</string> <string name="done_description">Tudo pronto.\nAproveite seus jogos!</string> <string name="text_continue">Continuar</string> @@ -34,61 +34,67 @@ <string name="empty_gamelist">Não foram encontrados jogos ou a pasta de Jogos ainda não foi definida. </string> <string name="search_and_filter_games">Procura e filtra jogos.</string> <string name="select_games_folder">Seleciona a pasta de jogos.</string> + <string name="manage_game_folders">Gerencie as pastas de jogos</string> <string name="select_games_folder_description">Permite que o Yuzu preencha a lista de jogos</string> <string name="add_games_warning">Ignorar a seleção da pasta de jogos?</string> <string name="add_games_warning_description">Os jogos não serão exibidos na lista de jogos se uma pasta não estiver selecionada.</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> <string name="home_search_games">Procurar jogos</string> - <string name="search_settings">Procurar nas definições</string> - <string name="games_dir_selected">Pasta de Jogos selecionada</string> - <string name="install_prod_keys">Instala prod.keys</string> + <string name="search_settings">Procurar nas configurações</string> + <string name="games_dir_selected">Pasta de jogos selecionada</string> + <string name="install_prod_keys">Instalar prod.keys</string> <string name="install_prod_keys_description">Necessário para desencriptar jogos comerciais</string> <string name="install_prod_keys_warning">Ignorar a adição de chaves?</string> <string name="install_prod_keys_warning_description">São necessárias chaves válidas para emular jogos comerciais. Somente aplicativos homebrew funcionarão se você continuar.</string> - <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#Guia de introdução</string> + <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string> <string name="notifications">Notificações</string> <string name="notifications_description">Conceda a permissão de notificação com o botão abaixo.</string> - <string name="give_permission">Conceda permissão</string> - <string name="notification_warning">Saltar a concessão da permissão de notificação?</string> + <string name="give_permission">Conceder permissão</string> + <string name="notification_warning">Ignorar a concessão da permissão de notificação?</string> <string name="notification_warning_description">Yuzu não conseguirá te notificar de informações importantes. </string> <string name="permission_denied">Permissão negada</string> <string name="permission_denied_description">Você negou essa permissão muitas vezes e agora precisa concedê-la manualmente nas configurações do sistema.</string> <string name="about">Sobre</string> <string name="about_description">Versão de compilação, créditos e mais</string> <string name="warning_help">Ajuda</string> - <string name="warning_skip">Saltar</string> + <string name="warning_skip">Ignorar</string> <string name="warning_cancel">Cancelar</string> - <string name="install_amiibo_keys">Instala chaves Amiibo</string> - <string name="install_amiibo_keys_description">Necessário para usares Amiibo no jogo</string> - <string name="invalid_keys_file">Ficheiro de chaves inválido</string> + <string name="install_amiibo_keys">Instalar chaves Amiibo</string> + <string name="install_amiibo_keys_description">Necessário para usar Amiibos em um jogo</string> + <string name="invalid_keys_file">Arquivo de chaves selecionado inválido</string> <string name="install_keys_success">Chaves instaladas com sucesso</string> <string name="reading_keys_failure">Erro ao ler chaves de encriptação</string> - <string name="install_prod_keys_failure_extension_description">Verifique se seu arquivo keys possui a extensão .keys e tente novamente.</string> - <string name="install_amiibo_keys_failure_extension_description">Verifique se seu arquivo keys possui a extensão .bin e tente novamente.</string> + <string name="install_prod_keys_failure_extension_description">Verifique se seu arquivo de chaves possui a extensão .keys e tente novamente.</string> + <string name="install_amiibo_keys_failure_extension_description">Verifique se seu arquivo de chaves possui a extensão .bin e tente novamente.</string> <string name="invalid_keys_error">Chaves de encriptação inválidas</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> - <string name="install_keys_failure_description">O ficheiro selecionado está corrompido. Por favor recarrega as tuas chaves.</string> + <string name="install_keys_failure_description">O arquivo selecionado está incorreto ou corrompido. Por favor extraia suas chaves novamente.</string> + <string name="gpu_driver_manager">Gerenciador de driver de GPU</string> <string name="install_gpu_driver">Instala driver para GPU</string> <string name="install_gpu_driver_description">Instala drivers alternativos para desempenho ou precisão potencialmente melhores</string> - <string name="advanced_settings">Definições avançadas</string> - <string name="advanced_settings_game">Definições avançadas: %1$s</string> - <string name="settings_description">Configura definições do emulador</string> + <string name="advanced_settings">Configurações avançadas</string> + <string name="advanced_settings_game">Configurações avançadas: %1$s</string> + <string name="settings_description">Configure opções do emulador</string> <string name="search_recently_played">Jogado recentemente</string> <string name="search_recently_added">Adicionado recentemente</string> <string name="search_retail">Jogos comerciais</string> <string name="search_homebrew">Homebrew</string> - <string name="open_user_folder">Abre a pasta Yuzu</string> - <string name="open_user_folder_description">Gere os ficheiro internos do Yuzu</string> - <string name="theme_and_color_description">Modifica a aparência da App</string> - <string name="no_file_manager">Nenhum gestor de ficheiros encontrado</string> - <string name="notification_no_directory_link">Impossível abrir pasta Yuzu</string> - <string name="notification_no_directory_link_description">Localiza a pasta de utilizador manualmente com o painel lateral do gestor de ficheiros.</string> - <string name="manage_save_data">Gerir dados guardados</string> - <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string> - <string name="import_export_saves_description">Importa ou exporta dados guardados</string> + <string name="open_user_folder">Abrir a pasta do Yuzu</string> + <string name="open_user_folder_description">Gerencie os arquivos internos do Yuzu</string> + <string name="theme_and_color_description">Altere a aparência do aplicativo</string> + <string name="no_file_manager">Nenhum gerenciador de arquivos encontrado</string> + <string name="notification_no_directory_link">Não foi possível abrir a pasta do Yuzu</string> + <string name="notification_no_directory_link_description">Por favor localize a pasta do usuário com o painel lateral do gerenciador de arquivos manualmente.</string> + <string name="manage_save_data">Gerenciar os dados salvos dos jogos</string> + <string name="manage_save_data_description">Dados salvos encontrados. Por favor selecione uma opção abaixo.</string> + <string name="import_save_warning">Importar dados salvos</string> + <string name="import_save_warning_description">Isso irá sobrescrever seus dados salvos com o arquivo selecionado. Você tem certeza que quer continuar?</string> + <string name="import_export_saves_description">Importa ou exporta arquivos de dados salvos</string> + <string name="save_files_importing">Importando dados salvos...</string> + <string name="save_files_exporting">Exportando arquivos de dados salvos...</string> <string name="save_file_imported_success">Importado com sucesso</string> - <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string> - <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string> + <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados salvos inválida</string> + <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta deve ser a ID do jogo.</string> <string name="import_saves">Importar</string> <string name="export_saves">Exportar</string> <string name="install_firmware">Instalar firmware</string> @@ -96,55 +102,89 @@ <string name="firmware_installing">Instalando firmware</string> <string name="firmware_installed_success">Firmware instalado com sucesso.</string> <string name="firmware_installed_failure">Falha na instalação do firmware</string> - <string name="firmware_installed_failure_description">Cofirma que os ficheiros firmware nca estão no root do finheiro zip e tenta de novo.</string> - <string name="share_log">Compartilhe registros de debug.</string> + <string name="firmware_installed_failure_description">Verifique se os arquivos nca do firmware estão na raiz do arquivo zip e tente novamente.</string> + <string name="share_log">Compartilhar registros de debug</string> <string name="share_log_description">Compartilhe o arquivo de registro do yuzu para obter ajuda com problemas</string> <string name="share_log_missing">Arquivo de registro não encontrado</string> <string name="install_game_content">Instalar conteúdo de jogos</string> - <string name="install_game_content_description">Instalar atualizações de jogos ou DLC</string> - <string name="installing_game_content">A instalar conteúdo...</string> - <string name="install_game_content_failure">Erro ao instalar ficheiro(s) para NAND</string> - <string name="install_game_content_failure_description">Por favor confitma que o conteúdo(s) é válido e que as prod.keys estão instaladas.</string> + <string name="install_game_content_description">Instala atualizações de jogos ou DLC</string> + <string name="installing_game_content">Instalando conteúdo...</string> + <string name="install_game_content_failure">Erro ao instalar arquivo(s) na NAND</string> + <string name="install_game_content_failure_description">Por favor certifique-se de que o(s) conteúdo(s) é (são) válido(s) e que as prod.keys estão instaladas.</string> <string name="install_game_content_failure_base">A instalação de jogos base não é permitida para evitar possíveis conflitos.</string> - <string name="install_game_content_failure_file_extension">Sò conteúdos NSP e XCI são suportados. Por favor verifica que o conteúdo(s) do jogo são válidos.</string> + <string name="install_game_content_failure_file_extension">Somente conteúdos NSP e XCI são suportados. Por favor verifique se o(s) conteúdo(s) do jogo é (são) válido(s).</string> <string name="install_game_content_failed_count">%1$d erro(s) de instalação</string> - <string name="install_game_content_success">Conteúdo(s) de jogo instalados com sucesso</string> + <string name="install_game_content_success">Conteúdo(s) de jogo instalado(s) com sucesso</string> <string name="install_game_content_success_install">%1$d instalado com sucesso</string> - <string name="install_game_content_success_overwrite">%1$d substituída com êxito</string> + <string name="install_game_content_success_overwrite">%1$d substituído com sucesso</string> <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string> <string name="custom_driver_not_supported">Drivers personalizados não suportados</string> - <string name="custom_driver_not_supported_description">Carrea«gamento de drivers personalizados não é suportado pr este dispositivo. \nCheck verifica esta opção de futuro para confirmar se o suporte foi adicionado!</string> - <string name="manage_yuzu_data">Administrar dados yuzu</string> + <string name="custom_driver_not_supported_description">Carregamento de drivers personalizados não suportado para este dispositivo no momento.\nVerifique esse opção novamente no futuro para ver se o suporte foi adicionado!</string> + <string name="manage_yuzu_data">Administrar dados do yuzu</string> <string name="manage_yuzu_data_description">Importa/exporta firmware, chaves, dados do usuário e mais!</string> - <string name="share_save_file">Partilha ficheiro duardado</string> - <string name="export_save_failed">Erro ao exportar dados guardados</string> + <string name="share_save_file">Compartilhar arquivo de dados salvos</string> + <string name="export_save_failed">Erro ao exportar arquivo de dados salvos</string> + <string name="game_folders">Pastas de jogos</string> + <string name="deep_scan">Varredura profunda</string> + <string name="add_game_folder">Adicionar pasta de jogo</string> + <string name="folder_already_added">Esta pasta já foi adicionada!</string> + <string name="game_folder_properties">Propriedades da pasta de jogo</string> + <plurals name="saves_import_failed"> + <item quantity="one">Falha ao importar dado salvo de %d</item> + <item quantity="many">Falha ao importar dados salvos de %d</item> + <item quantity="other">Falha ao importar dados salvos de %d</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">Dado salvo de %d importado com sucesso</item> + <item quantity="many">Dados salvos de %d importados com sucesso</item> + <item quantity="other">Dados salvos de %d importados com sucesso</item> + </plurals> + <string name="no_save_data_found">Dados salvos não encontrados</string> + + <!-- Applet launcher strings --> + <string name="applets">Launcher de miniaplicativos</string> + <string name="applets_description">Inicia miniaplicativos do sistema usando o firmware instalado</string> + <string name="applets_error_firmware">Firmware não instalado</string> + <string name="applets_error_applet">Miniaplicativo não disponível</string> + <string name="applets_error_description"><![CDATA[Por favor verifique se o arquivo 1prod.keys1 e o 2firmware2 estão instalados e tente novamente.]]></string> + <string name="album_applet">Álbum</string> + <string name="album_applet_description">Visualize imagens armazenadas na pasta de capturas de telas do usuário com o visualizador de imagens do sistema</string> + <string name="mii_edit_applet">Editor de Mii</string> + <string name="mii_edit_applet_description">Visualize e edite os Miis com o editor do sistema</string> + <string name="cabinet_applet">Arquivo</string> + <string name="cabinet_applet_description">Edite e delete dados armazenados nos amiibos</string> + <string name="cabinet_launcher">Inicializador do Arquivo</string> + <string name="cabinet_nickname_and_owner">Apelido e configurações do proprietário</string> + <string name="cabinet_game_data_eraser">Apagar dados de jogo</string> + <string name="cabinet_restorer">Restaurar</string> + <string name="cabinet_formatter">Formatar</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia não é real</string> <string name="copied_to_clipboard">Copiado para a área de transferência</string> - <string name="about_app_description">Um emulador Switch de código aberto</string> - <string name="contributors">Contribuidores</string> - <string name="contributors_description">Feito com \u2764 da equipa do Yuzu</string> + <string name="about_app_description">Um emulador de Switch de código aberto</string> + <string name="contributors">Colaboradores</string> + <string name="contributors_description">Feito com \u2764 da equipe do Yuzu</string> <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> <string name="licenses_description">Projetos que tornam o yuzu para Android possível</string> <string name="build">Versão</string> - <string name="user_data">Dado de utilizados</string> - <string name="user_data_description">Importar/exportar todos dados da aplicação data.\n\n Ao importar dados do utilizados, todos os dados existentes do utilizados serão excluídos!</string> - <string name="exporting_user_data">A exportar dados de utilizados...</string> - <string name="importing_user_data">A importar dados de utilizador...</string> - <string name="import_user_data">Importar dados de utilizados...</string> - <string name="invalid_yuzu_backup">Backup yuzu inválido</string> - <string name="user_data_export_success">Dados de utilizados exportados com sucesso</string> - <string name="user_data_import_success">Dados de utilizador importado com sucesso</string> + <string name="user_data">Dados do usuário</string> + <string name="user_data_description">Importar/exportar todos os dados do aplicativo.\n\n Ao importar dados de usuário, todos os dados existentes do usuário serão excluídos!</string> + <string name="exporting_user_data">Exportando dados do usuário...</string> + <string name="importing_user_data">Importando dados do usuário...</string> + <string name="import_user_data">Importar dados do usuário</string> + <string name="invalid_yuzu_backup">Backup do yuzu inválido</string> + <string name="user_data_export_success">Dados de usuário exportados com sucesso</string> + <string name="user_data_import_success">Dados de usuário importados com sucesso</string> <string name="user_data_export_cancelled">Exportação cancelada</string> - <string name="user_data_import_failed_description">Verifiqua se as pastas de dados do utilizados estão na raiz da pasta zip e contêm um arquivo de configuração em config/config.ini e tenta novamente.</string> + <string name="user_data_import_failed_description">Verifiqua se as pastas de dados do usuário estão na raiz da pasta zip e contêm um arquivo de configuração em config/config.ini e tente novamente.</string> <string name="support_link">https://discord.gg/u77vRWY</string> <string name="website_link">https://yuzu-emu.org/</string> <string name="github_link">https://github.com/yuzu-emu</string> <!-- Early access upgrade strings --> - <string name="early_access">Acesso antecipado</string> - <string name="get_early_access">Obtém Acesso Antecipado</string> + <string name="early_access">Acesso Antecipado</string> + <string name="get_early_access">Obtenha o Acesso Antecipado</string> <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string> <string name="get_early_access_description">Recursos de ponta, acesso antecipado a atualizações e muito mais</string> <string name="early_access_benefits">Benefícios do Acesso Antecipado</string> @@ -154,18 +194,19 @@ <string name="prioritized_support">Suporte prioritário</string> <string name="helping_game_preservation">Ajuda na preservação dos jogos</string> <string name="our_eternal_gratitude">A nossa eterna gratidão</string> - <string name="are_you_interested">Estás interessado?</string> + <string name="are_you_interested">Tem interesse?</string> <!-- General settings strings --> <string name="frame_limit_enable">Limite de velocidade</string> <string name="frame_limit_enable_description">Limita a velocidade da emulação a uma porcentagem específica da velocidade normal.</string> - <string name="frame_limit_slider">Percentagem do limite de velocidade</string> + <string name="frame_limit_slider">Porcentagem do limite de velocidade</string> <string name="frame_limit_slider_description">Especifica a porcentagem para limitar a velocidade de emulação. 100% é o normal. Valores mais altos ou mais baixos irão aumentar ou diminuir o limite de velocidade.</string> - <string name="cpu_accuracy">Precisão do CPU</string> + <string name="cpu_backend">Backend da CPU</string> + <string name="cpu_accuracy">Precisão da CPU</string> <string name="value_with_units">%1$s%2$s</string> <!-- System settings strings --> - <string name="use_docked_mode">Modo Ancorado</string> + <string name="use_docked_mode">Modo TV</string> <string name="use_docked_mode_description">Aumenta a resolução, diminuindo o desempenho. O Modo Portátil é utilizado quando estiver desabilitado, diminuindo a resolução e melhorando o desempenho.</string> <string name="emulated_region">Região da emulação</string> <string name="emulated_language">Idioma da emulação</string> @@ -177,20 +218,22 @@ <!-- Graphics settings strings --> <string name="renderer_accuracy">Nível de precisão</string> - <string name="renderer_resolution">Resolução (Portátil/Ancorado)</string> + <string name="renderer_resolution">Resolução (Portátil/Modo TV)</string> <string name="renderer_vsync">Modo VSync</string> <string name="renderer_screen_layout">Oriantação</string> <string name="renderer_aspect_ratio">Proporção da tela</string> <string name="renderer_scaling_filter">Filtro de Adaptação da Janela</string> <string name="renderer_anti_aliasing">Método de Anti-Serrilhado</string> - <string name="renderer_force_max_clock">Força velocidade máxima (Adreno only)</string> - <string name="renderer_force_max_clock_description">Força o GPU a correr à velocidade máxima (restrições térmicas serão aplicadas)</string> - <string name="renderer_asynchronous_shaders">Usa shaders assíncronos </string> + <string name="renderer_force_max_clock">Forçar velocidade máxima (somente Adreno)</string> + <string name="renderer_force_max_clock_description">Força o GPU a rodar na velocidade máxima (restrições térmicas serão aplicadas)</string> + <string name="renderer_asynchronous_shaders">Usar shaders assíncronos </string> <string name="renderer_asynchronous_shaders_description">Compila os shaders de forma assíncrona, reduzindo travamentos, mas pode apresentar problemas.</string> <string name="renderer_reactive_flushing">Usar flushing reativo</string> <string name="renderer_reactive_flushing_description">Melhora a precisão da renderização em alguns jogos ao custo de desempenho.</string> <string name="use_disk_shader_cache">Cache de shaders em disco</string> <string name="use_disk_shader_cache_description">Reduz travamentos ao armazenar e carregar localmente os shaders.</string> + <string name="anisotropic_filtering">Filtragem anisotrópica</string> + <string name="anisotropic_filtering_description">Melhora a qualidade das texturas quando visualizadas de ângulos oblíquos</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> @@ -198,28 +241,29 @@ <string name="cpu_debug_mode_description">Coloca a CPU em um modo de depuração lento.</string> <string name="gpu">GPU</string> <string name="renderer_api">API</string> - <string name="renderer_debug">Ativar depuração de gráficos</string> - <string name="renderer_debug_description">Quando selecionado, a API gráfica entra num modo de depuração mais lento.</string> + <string name="renderer_debug">Depuração de gráficos</string> + <string name="renderer_debug_description">Define a API gráfica para um modo de depuração mais lento.</string> <string name="fastmem">Fastmem</string> <!-- Audio settings strings --> - <string name="audio_output_engine">Motor de saída</string> + <string name="audio_output_engine">Engine de reprodução</string> <string name="audio_volume">Volume</string> - <string name="audio_volume_description">Especifica o volume de saída.</string> + <string name="audio_volume_description">Especifica o volume de reprodução.</string> <!-- Miscellaneous --> <string name="slider_default">Padrão</string> - <string name="ini_saved">Definições guardadas</string> - <string name="gameid_saved">Definições guardadas para %1$s</string> - <string name="error_saving">Erro ao guardar %1$s.ini: %2$s</string> + <string name="ini_saved">Configurações salvas</string> + <string name="gameid_saved">Configurações salvas para %1$s</string> + <string name="error_saving">Erro ao salvar %1$s.ini: %2$s</string> <string name="unimplemented_menu">Menu não implementado</string> - <string name="loading">A carregar...</string> - <string name="shutting_down">A desligar...</string> - <string name="reset_setting_confirmation">Queres reverter esta definição para os valores padrão?</string> - <string name="reset_to_default">Reverter para padrão</string> - <string name="reset_all_settings">Redefinir todas as definições?</string> + <string name="loading">Carregando...</string> + <string name="shutting_down">Encerrando...</string> + <string name="reset_setting_confirmation">Deseja reverter esta configuração para os valores padrões?</string> + <string name="reset_to_default">Reverter para o padrão</string> + <string name="reset_to_default_description">Redefine todas as configurações avançadas</string> + <string name="reset_all_settings">Redefinir todas as configurações?</string> <string name="reset_all_settings_description">Todas as configurações avançadas retornarão ao padrão. Isto não pode ser desfeito.</string> - <string name="settings_reset">Redefinir definições</string> + <string name="settings_reset">Configurações redefinidas</string> <string name="close">Fechar</string> <string name="learn_more">Saiba mais</string> <string name="auto">Automático</string> @@ -227,44 +271,95 @@ <string name="string_null">Nenhum (desativado)</string> <string name="string_import">Importar</string> <string name="export">Exportar</string> - <string name="export_failed">Exportação falhada</string> - <string name="import_failed">IMportação falhada</string> - <string name="cancelling">A cancelar</string> - + <string name="export_failed">Falha ao exportar</string> + <string name="import_failed">Falha ao importar</string> + <string name="cancelling">Cancelando</string> + <string name="install">Instalar</string> + <string name="delete">Deletar</string> + <string name="edit">Editar</string> + <string name="export_success">Exportado com sucesso</string> + <string name="start">Start</string> + <string name="clear">Limpar</string> + <string name="global">Global</string> + <string name="custom">Personalizado</string> + <string name="notice">Aviso</string> + <string name="import_complete">Importação concluída</string> <!-- GPU driver installation --> - <string name="select_gpu_driver">Seleciona a driver para o GPU</string> - <string name="select_gpu_driver_title">Queres substituir o driver do GPU atual? </string> + <string name="select_gpu_driver">Selecione o driver para a GPU</string> + <string name="select_gpu_driver_title">Gostaria de substituir o driver atual da GPU? </string> <string name="select_gpu_driver_install">Instalar</string> <string name="select_gpu_driver_default">Padrão</string> - <string name="select_gpu_driver_use_default">Usar o driver padrão do GPU</string> - <string name="select_gpu_driver_error">Driver selecionado inválido, a usar o padrão do sistema!</string> - <string name="system_gpu_driver">Driver do GPU padrão</string> - <string name="installing_driver">A instalar o Driver...</string> + <string name="select_gpu_driver_use_default">Usar o driver padrão da GPU</string> + <string name="select_gpu_driver_error">Driver selecionado inválido</string> + <string name="driver_already_installed">Driver já instalado</string> + <string name="system_gpu_driver">Driver padrão da GPU</string> + <string name="installing_driver">Instalando driver...</string> <!-- Preferences Screen --> <string name="preferences_settings">Configurações</string> <string name="preferences_general">Geral</string> <string name="preferences_system">Sistema</string> + <string name="preferences_system_description">Modo TV, região, idioma</string> <string name="preferences_graphics">Gráficos</string> + <string name="preferences_graphics_description">Nível de precisão, resolução, cache de shader</string> <string name="preferences_audio">Áudio</string> - <string name="preferences_theme">Cor e tema.</string> + <string name="preferences_audio_description">Engine de reprodução, volume</string> + <string name="preferences_theme">Tema e cor</string> <string name="preferences_debug">Depuração</string> - + <string name="preferences_debug_description">Depuração de CPU/GPU, API gráfica, fastmem</string> + + <!-- Game properties --> + <string name="info">Informações</string> + <string name="info_description">ID do Programa, desenvolvedora, versão</string> + <string name="per_game_settings">Configurações por jogo</string> + <string name="per_game_settings_description">Edite configurações específicas para este jogo</string> + <string name="launch_options">Configurações de inicialização</string> + <string name="path">Caminho</string> + <string name="program_id">ID do Programa</string> + <string name="developer">Desenvolvedora</string> + <string name="version">Versão</string> + <string name="copy_details">Copiar detalhes</string> + <string name="add_ons">Adicionais</string> + <string name="add_ons_description">Gerencie mods, atualizações e DLC</string> + <string name="clear_shader_cache">Excluir cache de shaders</string> + <string name="clear_shader_cache_description">Remove todos os shaders compilados durante a execução do jogo</string> + <string name="clear_shader_cache_warning_description">Você terá mais travamentos enquanto o cache de shaders for recompilado</string> + <string name="cleared_shaders_successfully">Shaders excluídos com sucesso</string> + <string name="addons_game">Adicionais: %1$s</string> + <string name="save_data">Dados salvos</string> + <string name="save_data_description">Gerencie dados salvos específicos deste jogo</string> + <string name="delete_save_data">Deletar dados salvos</string> + <string name="delete_save_data_description">Remove todos os dados salvos específicos deste jogo</string> + <string name="delete_save_data_warning_description">Isso removerá permanentemente todos os dados salvos do jogo. Tem certeza de que quer continuar?</string> + <string name="save_data_deleted_successfully">Dados salvos deletados com sucesso </string> + <string name="select_content_type">Tipo de conteúdo</string> + <string name="updates_and_dlc">Atualizações e DLC</string> + <string name="mods_and_cheats">Mods e cheats</string> + <string name="addon_notice">Aviso importante sobre os adicionais</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">Para instalar mods e cheats, você deve selecionar uma pasta que contenha um diretório cheats/, romfs/ ou exefs. Não podemos verificar se eles são compatíveis com seu jogo, então tenha cuidado!</string> + <string name="invalid_directory">Diretório inválido </string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Por favor verifique se o diretório selecionado contém uma pasta cheats/, romfs/ ou exefs/ e tente novamente.</string> + <string name="addon_installed_successfully">Adicional instalado com sucesso</string> + <string name="verifying_content">Verificando conteúdo...</string> + <string name="content_install_notice">Aviso sobre conteúdo adicional</string> + <string name="content_install_notice_description">O conteúdo que você selecionou não corresponde a este jogo.\nInstalar mesmo assim?</string> <!-- ROM loading errors --> - <string name="loader_error_encrypted">A tua ROM está encriptada</string> - <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga os guias para despejar novamente o seu <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartucho de jogo</a> or <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string> - <string name="loader_error_encrypted_keys_description"><![CDATA[Por favor confirma que o teu ficheiro <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> está instalado para que os jogos possam ser desencriptados.]]></string> + <string name="loader_error_encrypted">Sua ROM está encriptada</string> + <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga os guias para extrair novamente o seu <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartucho de jogo</a> ou <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string> + <string name="loader_error_encrypted_keys_description"><![CDATA[Por favor verifique se o seu arquivo <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> está instalado para que os jogos possam ser decriptados.]]></string> <string name="loader_error_video_core">Ocorreu um erro ao iniciar o núcleo de vídeo.</string> - <string name="loader_error_video_core_description">Isto é normalmente causado por um driver de GPU incompatível. Instalar um driver GPU pode resolver este problema.</string> - <string name="loader_error_invalid_format">Impossível carregar a tua ROM</string> - <string name="loader_error_file_not_found">O ficheiro da ROM não existe</string> + <string name="loader_error_video_core_description">Isto é normalmente causado por um driver de GPU incompatível. Instalar um driver de GPU pode resolver este problema.</string> + <string name="loader_error_invalid_format">Impossível carregar a ROM</string> + <string name="loader_error_file_not_found">O arquivo ROM não existe</string> <!-- Emulation Menu --> - <string name="emulation_exit">Parar emulação</string> + <string name="emulation_exit">Sair da emulação</string> <string name="emulation_done">Feito</string> <string name="emulation_fps_counter">Contador de FPS</string> - <string name="emulation_toggle_controls">Alterar controles</string> - <string name="emulation_rel_stick_center">Centro Relativo de Analógico</string> + <string name="emulation_toggle_controls">Marcar/Desmarcar botões</string> + <string name="emulation_rel_stick_center">Centro Relativo do Analógico</string> <string name="emulation_dpad_slide">Deslizamento dos Botões Direcionais</string> <string name="emulation_haptics">Vibração ao tocar</string> <string name="emulation_show_overlay">Mostrar overlay</string> @@ -272,28 +367,29 @@ <string name="emulation_control_adjust">Ajustar overlay</string> <string name="emulation_control_scale">Escala</string> <string name="emulation_control_opacity">Opacidade</string> - <string name="emulation_touch_overlay_reset">Restaurar overlay padrão</string> + <string name="emulation_touch_overlay_reset">Resetar overlay</string> <string name="emulation_touch_overlay_edit">Editar overlay</string> <string name="emulation_pause">Pausar emulação</string> - <string name="emulation_unpause">Retomar emulação</string> + <string name="emulation_unpause">Retomar a emulação</string> <string name="emulation_input_overlay">Opções de overlay</string> + <string name="touchscreen">Tela de toque</string> <string name="load_settings">Carregando configurações...</string> <!-- Software keyboard --> - <string name="software_keyboard">Teclado de software</string> + <string name="software_keyboard">Teclado do software</string> <!-- Errors and warnings --> <string name="abort_button">Abortar</string> <string name="continue_button">Continuar</string> - <string name="system_archive_not_found">Arquivo do sistema não encontrado</string> - <string name="system_archive_not_found_message">%s está em falta. Por favor apaga os teus ficheiros de sistema.\nContinuar a emulação pode causar erros.</string> + <string name="system_archive_not_found">Arquivo do Sistema Não Encontrado</string> + <string name="system_archive_not_found_message">%s está faltando. Por favor extraia seus arquivos de sistema.\nContinuar a emulação pode causar travamentos e bugs.</string> <string name="system_archive_general">Um arquivo do sistema</string> - <string name="save_load_error">Erro Guardar/Carregar</string> + <string name="save_load_error">Erro de Salvamento/Carregamento</string> <string name="fatal_error">Erro fatal</string> - <string name="fatal_error_message">Ocorreu um erro fatal. Verifica o teu registro para detalhes. \nContinuar a emulação pode causar erros.</string> - <string name="performance_warning">Desligar esta configuração irá reduzir a performance da emulação significantemente! Para a melhor experiência é recomendado que deixes esta configuração ativada.</string> - <string name="device_memory_inadequate">RAM do dispositivo: %1$s\nRecommended: %2$s</string> + <string name="fatal_error_message">Ocorreu um erro fatal. Verifique o arquivo de registro para detalhes.\nContinuar a emulação pode causar travamentos e bugs.</string> + <string name="performance_warning">Desligar esta configuração irá reduzir a performance da emulação significantemente! Para a melhor experiência é recomendado deixar esta configuração ativada.</string> + <string name="device_memory_inadequate">RAM do dispositivo: %1$s\nRecomendada: %2$s</string> <string name="memory_formatted">%1$s %2$s</string> <string name="no_game_present">Nenhum jogo inicializável presente!</string> @@ -308,6 +404,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -316,19 +413,19 @@ <string name="memory_exabyte">EB</string> <!-- Renderer APIs --> - <string name="renderer_vulkan">Vulcano</string> + <string name="renderer_vulkan">Vulkan</string> <string name="renderer_none">Nenhum</string> <!-- Renderer Accuracy --> <string name="renderer_accuracy_normal">Normal</string> <string name="renderer_accuracy_high">Alto</string> - <string name="renderer_accuracy_extreme">Estremo (Lento)</string> + <string name="renderer_accuracy_extreme">Extremo (Lento)</string> <!-- Resolutions --> <string name="resolution_half">0.5X (360p/540p)</string> <string name="resolution_three_quarter">0.75X (540p/810p)</string> <string name="resolution_one">1X (720p/1080p)</string> - <string name="resolution_two">2X (1440p/2160p) (Slow)</string> + <string name="resolution_two">2X (1440p/2160p) (Lento)</string> <string name="resolution_three">3X (2160p/3240p) (Lento)</string> <string name="resolution_four">4X (2880p/4320p) (Lento)</string> @@ -352,9 +449,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> - <string name="screen_layout_landscape">Landscape</string> - <string name="screen_layout_portrait">Portrait</string> - <string name="screen_layout_auto">Automático</string> + <string name="screen_layout_auto">Automática</string> + <string name="screen_layout_sensor_landscape">Paisagem pelo sensor</string> + <string name="screen_layout_landscape">Paisagem</string> + <string name="screen_layout_reverse_landscape">Paisagem invertida</string> + <string name="screen_layout_sensor_portrait">Retrato pelo sensor</string> + <string name="screen_layout_portrait">Retrato</string> + <string name="screen_layout_reverse_portrait">Retrato invertido</string> <!-- Aspect Ratios --> <string name="ratio_default">Padrão (16:9)</string> @@ -363,21 +464,25 @@ <string name="ratio_force_sixteen_ten">Forçar 16:10</string> <string name="ratio_stretch">Esticar à janela</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (Lento)</string> + <string name="cpu_backend_nce">Execução de código nativo (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Preciso</string> <string name="cpu_accuracy_unsafe">Não seguro</string> - <string name="cpu_accuracy_paranoid">Paranoid (Lento)</string> + <string name="cpu_accuracy_paranoid">Paranóico (Lento)</string> <!-- Gamepad Buttons --> <string name="gamepad_d_pad">Botões Direcionais</string> <string name="gamepad_left_stick">Analógico esquerdo</string> <string name="gamepad_right_stick">Analógico direito</string> <string name="gamepad_home">Botão Home</string> - <string name="gamepad_screenshot">Captura de ecrã</string> + <string name="gamepad_screenshot">Captura de tela</string> <!-- Disk shader cache --> - <string name="preparing_shaders">A preparar shaders</string> - <string name="building_shaders">A criar shaders</string> + <string name="preparing_shaders">Preparando shaders</string> + <string name="building_shaders">Criando shaders</string> <!-- Theme options --> <string name="change_app_theme">Mudar o tema do aplicativo</string> @@ -391,19 +496,26 @@ <string name="theme_mode_dark">Escuro</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Plano de fundo preto</string> - <string name="use_black_backgrounds_description">Quando usar tema escuro, aplicar fundos escuros</string> + <string name="use_black_backgrounds_description">Quando usar o tema escuro, aplicar fundos pretos</string> <!-- Picture-In-Picture --> <string name="picture_in_picture">Picture in Picture</string> - <string name="picture_in_picture_description">Minimizar a janela quando colocada em segundo plano</string> - <string name="pause">Pausa</string> - <string name="play">Correr</string> + <string name="picture_in_picture_description">Minimiza a janela quando colocada em segundo plano</string> + <string name="pause">Pausar</string> + <string name="play">Executar</string> <string name="mute">Mudo</string> - <string name="unmute">Unmute</string> + <string name="unmute">Tirar do Mudo</string> <!-- Licenses screen strings --> <string name="licenses">Licenças</string> diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml index 6afea9b03..684a71616 100644 --- a/src/android/app/src/main/res/values-pt-rPT/strings.xml +++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">Não foram encontrados jogos ou a pasta de Jogos ainda não foi definida. </string> <string name="search_and_filter_games">Procura e filtra jogos.</string> <string name="select_games_folder">Seleciona a pasta de jogos.</string> + <string name="manage_game_folders">Gerencie as pastas de jogos</string> <string name="select_games_folder_description">Permite que o Yuzu preencha a lista de jogos</string> <string name="add_games_warning">Ignorar a seleção da pasta de jogos?</string> <string name="add_games_warning_description">Os jogos não serão exibidos na lista de jogos se uma pasta não estiver selecionada.</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">Chaves de encriptação inválidas</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">O ficheiro selecionado está corrompido. Por favor recarrega as tuas chaves.</string> + <string name="gpu_driver_manager">Gerenciador de driver de GPU</string> <string name="install_gpu_driver">Instala driver para GPU</string> <string name="install_gpu_driver_description">Instala drivers alternativos para desempenho ou precisão potencialmente melhores</string> <string name="advanced_settings">Configurações avançadas</string> @@ -85,7 +87,11 @@ <string name="notification_no_directory_link_description">Localiza a pasta de utilizador manualmente com o painel lateral do gestor de ficheiros.</string> <string name="manage_save_data">Gerir dados guardados</string> <string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string> + <string name="import_save_warning">Importar dados salvos</string> + <string name="import_save_warning_description">Isso irá sobrescrever seus dados salvos com o arquivo selecionado. Você tem certeza que quer continuar?</string> <string name="import_export_saves_description">Importa ou exporta dados guardados</string> + <string name="save_files_importing">Importando dados salvos...</string> + <string name="save_files_exporting">Exportando arquivos de dados salvos...</string> <string name="save_file_imported_success">Importado com sucesso</string> <string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string> <string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string> @@ -118,6 +124,40 @@ <string name="manage_yuzu_data_description">Importa/exporta firmware, chaves, dados do usuário e mais!</string> <string name="share_save_file">Partilha ficheiro duardado</string> <string name="export_save_failed">Erro ao exportar dados guardados</string> + <string name="game_folders">Pastas de jogos</string> + <string name="deep_scan">Varredura profunda</string> + <string name="add_game_folder">Adicionar pasta de jogo</string> + <string name="folder_already_added">Esta pasta já foi adicionada!</string> + <string name="game_folder_properties">Propriedades da pasta de jogo</string> + <plurals name="saves_import_failed"> + <item quantity="one">Falha ao importar dado salvo de %d</item> + <item quantity="many">Falha ao importar dados salvos de %d</item> + <item quantity="other">Falha ao importar dados salvos de %d</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">Dado salvo de %d importado com sucesso</item> + <item quantity="many">Dados salvos de %d importados com sucesso</item> + <item quantity="other">Dados salvos de %d importados com sucesso</item> + </plurals> + <string name="no_save_data_found">Dados salvos não encontrados</string> + + <!-- Applet launcher strings --> + <string name="applets">Launcher de miniaplicativos</string> + <string name="applets_description">Inicie miniaplicativos do sistema usando o firmware instalado</string> + <string name="applets_error_firmware">Firmware não instalado</string> + <string name="applets_error_applet">Miniaplicativo não disponível</string> + <string name="applets_error_description"><![CDATA[Por favor verifique se o arquivo 1prod.keys1 e o 2firmware2 estão instalados e tente novamente.]]></string> + <string name="album_applet">Álbum</string> + <string name="album_applet_description">Visualize imagens armazenadas na pasta de capturas de telas do usuário com o visualizador de imagens do sistema</string> + <string name="mii_edit_applet">Editor de Mii</string> + <string name="mii_edit_applet_description">Visualize e edite os Miis com o editor do sistema</string> + <string name="cabinet_applet">Arquivo</string> + <string name="cabinet_applet_description">Edite e delete dados armazenados nos amiibos</string> + <string name="cabinet_launcher">Inicializador do Arquivo</string> + <string name="cabinet_nickname_and_owner">Apelido e configurações do proprietário</string> + <string name="cabinet_game_data_eraser">Apagar dados de jogo</string> + <string name="cabinet_restorer">Restaurar</string> + <string name="cabinet_formatter">Formatar</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia não é real</string> @@ -161,6 +201,7 @@ <string name="frame_limit_enable_description">Limita a velocidade da emulação a uma porcentagem específica da velocidade normal.</string> <string name="frame_limit_slider">Percentagem do limite de velocidade</string> <string name="frame_limit_slider_description">Especifica a porcentagem para limitar a velocidade de emulação. 100% é o normal. Valores mais altos ou mais baixos irão aumentar ou diminuir o limite de velocidade.</string> + <string name="cpu_backend">Backend da CPU</string> <string name="cpu_accuracy">Precisão do CPU</string> <string name="value_with_units">%1$s%2$s</string> @@ -191,6 +232,8 @@ <string name="renderer_reactive_flushing_description">Melhora a precisão da renderização em alguns jogos ao custo de desempenho.</string> <string name="use_disk_shader_cache">Cache de shaders em disco</string> <string name="use_disk_shader_cache_description">Reduz travamentos ao armazenar e carregar localmente os shaders.</string> + <string name="anisotropic_filtering">Filtragem anisotrópica</string> + <string name="anisotropic_filtering_description">Melhora a qualidade das texturas quando visualizadas de ângulos oblíquos</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> @@ -217,6 +260,7 @@ <string name="shutting_down">A desligar...</string> <string name="reset_setting_confirmation">Queres reverter esta definição para os valores padrão?</string> <string name="reset_to_default">Reverter para padrão</string> + <string name="reset_to_default_description">Reverte todas as configurações avançadas</string> <string name="reset_all_settings">Redefinir todas as configurações?</string> <string name="reset_all_settings_description">Todas as configurações avançadas retornarão ao padrão. Isto não pode ser desfeito.</string> <string name="settings_reset">Redefinir configurações </string> @@ -230,14 +274,24 @@ <string name="export_failed">Exportação falhada</string> <string name="import_failed">IMportação falhada</string> <string name="cancelling">A cancelar</string> - + <string name="install">Instalar</string> + <string name="delete">Apagar</string> + <string name="edit">Editar</string> + <string name="export_success">Exportado com sucesso</string> + <string name="start">Começar</string> + <string name="clear">Limpar</string> + <string name="global">Global</string> + <string name="custom">Personalizado</string> + <string name="notice">Aviso</string> + <string name="import_complete">Importação concluída</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Seleciona a driver para o GPU</string> <string name="select_gpu_driver_title">Queres substituir o driver do GPU atual? </string> <string name="select_gpu_driver_install">Instalar</string> <string name="select_gpu_driver_default">Padrão</string> <string name="select_gpu_driver_use_default">Usar o driver padrão do GPU</string> - <string name="select_gpu_driver_error">Driver selecionado inválido, a usar o padrão do sistema!</string> + <string name="select_gpu_driver_error">Driver selecionado inválido</string> + <string name="driver_already_installed">Driver já instalado</string> <string name="system_gpu_driver">Driver do GPU padrão</string> <string name="installing_driver">A instalar o Driver...</string> @@ -245,11 +299,52 @@ <string name="preferences_settings">Configurações</string> <string name="preferences_general">Geral</string> <string name="preferences_system">Sistema</string> + <string name="preferences_system_description">Modo ancorado, região, idioma</string> <string name="preferences_graphics">Gráficos</string> + <string name="preferences_graphics_description">Nível de precisão, resolução, cache de shader</string> <string name="preferences_audio">Audio</string> + <string name="preferences_audio_description">Engine de reprodução, volume</string> <string name="preferences_theme">Cor e tema.</string> <string name="preferences_debug">Depurar</string> - + <string name="preferences_debug_description">Depuração de CPU/GPU, API gráfica, fastmem</string> + + <!-- Game properties --> + <string name="info">Informação</string> + <string name="info_description">ID do programa, desenvolvedor, versão</string> + <string name="per_game_settings">Configurações por jogo</string> + <string name="per_game_settings_description">Editar configurações específicas para este jogo</string> + <string name="launch_options">Iniciar configuração</string> + <string name="path">Caminho</string> + <string name="program_id">ID do programa</string> + <string name="developer">Desenvolvedor</string> + <string name="version">Versão</string> + <string name="copy_details">Copiar detalhes</string> + <string name="add_ons">Add-ons</string> + <string name="add_ons_description">Gerencie mods, atualizações e DLC</string> + <string name="clear_shader_cache">Limpar cache de shaders</string> + <string name="clear_shader_cache_description">Remove todos os shaders compilados enquanto esse jogo era jogado</string> + <string name="clear_shader_cache_warning_description">Você terá mais travamentos enquanto o cache de shaders for recompilado</string> + <string name="cleared_shaders_successfully">Shaders excluídos com sucesso</string> + <string name="addons_game">Adicionais: %1$s</string> + <string name="save_data">Salvar dados</string> + <string name="save_data_description">Gerenciar dados salvos específicos deste jogo</string> + <string name="delete_save_data">Apagar dados salvos</string> + <string name="delete_save_data_description">Remover todos os dados salvos específicos deste jogo</string> + <string name="delete_save_data_warning_description">Isso removerá permanentemente todos os dados salvos do jogo. Tem certeza de que quer continuar?</string> + <string name="save_data_deleted_successfully">Dados salvos removidos com sucesso </string> + <string name="select_content_type">Tipo de conteúdo</string> + <string name="updates_and_dlc">Atualizações e DLC</string> + <string name="mods_and_cheats">Mods e trapaças</string> + <string name="addon_notice">Aviso importante sobre os adicionais</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">Para instalar mods e cheats, você deve selecionar uma pasta que contenha um diretório cheats/, romfs/ ou exefs. Não podemos verificar se eles são compatíveis com seu jogo, então tenha cuidado!</string> + <string name="invalid_directory">Diretório inválido </string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Por favor verifique se o diretório selecionado contém uma pasta cheats/, romfs ou exefs e tente novamente.</string> + <string name="addon_installed_successfully">Adicional instalado com sucesso</string> + <string name="verifying_content">Verificando conteúdo</string> + <string name="content_install_notice">Aviso sobre conteúdo adicional</string> + <string name="content_install_notice_description">O conteúdo que você selecionou não corresponde a este jogo.\nInstalar mesmo assim?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">A tua ROM está encriptada</string> <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga os guias para despejar novamente o seu <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartucho de jogo</a> or <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string> @@ -277,6 +372,7 @@ <string name="emulation_pause">Pausar emulação</string> <string name="emulation_unpause">Despausar emulação</string> <string name="emulation_input_overlay">Opções de overlay</string> + <string name="touchscreen">Ecrã Táctil</string> <string name="load_settings">Carregando configurações...</string> @@ -308,6 +404,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -352,9 +449,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Automático</string> + <string name="screen_layout_sensor_landscape">Paisagem pelo sensor</string> <string name="screen_layout_landscape">Landscape</string> + <string name="screen_layout_reverse_landscape">Paisagem invertida</string> + <string name="screen_layout_sensor_portrait">Retrato pelo sensor</string> <string name="screen_layout_portrait">Portrait</string> - <string name="screen_layout_auto">Automático</string> + <string name="screen_layout_reverse_portrait">Retrato invertido</string> <!-- Aspect Ratios --> <string name="ratio_default">Padrão (16:9)</string> @@ -363,6 +464,10 @@ <string name="ratio_force_sixteen_ten">Forçar 16:10</string> <string name="ratio_stretch">Esticar à janela</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (Lento)</string> + <string name="cpu_backend_nce">Native code execution (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Preciso</string> <string name="cpu_accuracy_unsafe">Inseguro</string> @@ -391,8 +496,15 @@ <string name="theme_mode_dark">Escuro</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Plano de fundo preto</string> <string name="use_black_backgrounds_description">Quando usar tema escuro, aplicar fundos escuros</string> diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml index c614257a8..099b2c9eb 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">Не найдены файлы или еще не выбрана папка с играми.</string> <string name="search_and_filter_games">Поиск и фильтрация игр</string> <string name="select_games_folder">Выберите папку с играми</string> + <string name="manage_game_folders">Управление папками</string> <string name="select_games_folder_description">Позволяет yuzu заполнить список игр</string> <string name="add_games_warning">Пропустить выбор папки с играми?</string> <string name="add_games_warning_description">Игры не будут отображаться в списке Игры, если папка не выбрана.</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">Неверные ключи шифрования</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">Выбранный файл неверен или поврежден. Пожалуйста, пере-дампите ваши ключи.</string> + <string name="gpu_driver_manager">Менеджер драйверов ГП</string> <string name="install_gpu_driver">Установить драйвер ГП</string> <string name="install_gpu_driver_description">Установите альтернативные драйверы для потенциально лучшей производительности и/или точности</string> <string name="advanced_settings">Расширенные настройки</string> @@ -85,7 +87,11 @@ <string name="notification_no_directory_link_description">Пожалуйста, найдите папку пользователя с помощью боковой панели файлового менеджера вручную.</string> <string name="manage_save_data">Управление данными сохранений</string> <string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string> + <string name="import_save_warning">Импортировать сохранения</string> + <string name="import_save_warning_description">Это перезапишет все существующие данные сохранения выбранным файлом. Вы уверены, что хотите продолжить?</string> <string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string> + <string name="save_files_importing">Импорт файлов сохранения…</string> + <string name="save_files_exporting">Экспорт файлов сохранения…</string> <string name="save_file_imported_success">Успешно импортировано</string> <string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string> <string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string> @@ -119,6 +125,42 @@ <string name="manage_yuzu_data_description">Импортируйте/экспортируйте прошивку, ключи, пользовательские данные и многое другое!</string> <string name="share_save_file">Поделиться файлом сохранения</string> <string name="export_save_failed">Не удалось экспортировать сохранение</string> + <string name="game_folders">Папки с играми</string> + <string name="deep_scan">Глубокий анализ</string> + <string name="add_game_folder">Добавить папку с игрой</string> + <string name="folder_already_added">Эта папка уже была добавлена!</string> + <string name="game_folder_properties">Свойства папки игры</string> + <plurals name="saves_import_failed"> + <item quantity="one">Не удалось импортировать %d сохранение</item> + <item quantity="few">Не удалось импортировать %d сохранения</item> + <item quantity="many">Не удалось импортировать %d сохранений</item> + <item quantity="other">Не удалось импортировать %d сохранений</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="one">Импортировано %d сохранение</item> + <item quantity="few">Импортировано %d сохранения</item> + <item quantity="many">Импортировано %d сохранений</item> + <item quantity="other">Импортировано %d сохранений</item> + </plurals> + <string name="no_save_data_found">Не найдены сохраненмия</string> + + <!-- Applet launcher strings --> + <string name="applets">Запуск апплета</string> + <string name="applets_description">Запуск системных апплетов на установленной прошивке</string> + <string name="applets_error_firmware">Прошивка не установлена</string> + <string name="applets_error_applet">Апплет недоступен</string> + <string name="applets_error_description"><![CDATA[Пожалуйста, убедитесь, что ваш<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> и <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> установлены и попробуйте еще раз.]]></string> + <string name="album_applet">Альбом</string> + <string name="album_applet_description">Просмотрите изображения, сохраненные в папке скриншотов пользователя, с помощью системного просмотрщика фотографий.</string> + <string name="mii_edit_applet">Mii редактор</string> + <string name="mii_edit_applet_description">Просмотр и редактирование Mii с помощью системного редактора</string> + <string name="cabinet_applet">Шкаф</string> + <string name="cabinet_applet_description">Редактирование и удаление данных, хранящихся на amiibo</string> + <string name="cabinet_launcher">Запуск шкафа</string> + <string name="cabinet_nickname_and_owner">Никнейм и настройки владельца</string> + <string name="cabinet_game_data_eraser">Удаление игровых данных</string> + <string name="cabinet_restorer">Восстановитель</string> + <string name="cabinet_formatter">Форматтер</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia не существует</string> @@ -162,6 +204,7 @@ <string name="frame_limit_enable_description">Ограничивает скорость эмуляции указанным процентом от нормальной скорости.</string> <string name="frame_limit_slider">Ограничение процента cкорости</string> <string name="frame_limit_slider_description">Указывает процент ограничения скорости эмуляции. 100% - это нормальная скорость. Значения больше или меньше увеличивают или уменьшают ограничение скорости.</string> + <string name="cpu_backend">Бэкэнд ЦП</string> <string name="cpu_accuracy">Точность ЦП</string> <string name="value_with_units">%1$s%2$s</string> @@ -192,6 +235,8 @@ <string name="renderer_reactive_flushing_description">Повышение точности рендеринга в некоторых играх за счет снижения производительности.</string> <string name="use_disk_shader_cache">Кэш шейдеров на диске</string> <string name="use_disk_shader_cache_description">Уменьшение зависаний за счет хранения и загрузки сгенерированных шейдеров.</string> + <string name="anisotropic_filtering">Анизотропная фильтрация</string> + <string name="anisotropic_filtering_description">Улучшает качество текстур под углом</string> <!-- Debug settings strings --> <string name="cpu">ЦП</string> @@ -203,6 +248,8 @@ <string name="renderer_debug_description">Переводит графический API в режим медленной отладки.</string> <string name="fastmem">Fastmem</string> + <!-- Audio settings strings --> + <string name="audio_output_engine">Движок вывода</string> <string name="audio_volume">Громкость</string> <string name="audio_volume_description">Задает громкость аудиовыхода.</string> @@ -216,6 +263,7 @@ <string name="shutting_down">Выключение…</string> <string name="reset_setting_confirmation">Хотите ли вы вернуть этот параметр к значению по умолчанию?</string> <string name="reset_to_default">Сброс к настройкам по умолчанию</string> + <string name="reset_to_default_description">Сбросить все расширенные настройки</string> <string name="reset_all_settings">Сбросить все настройки?</string> <string name="reset_all_settings_description">Все дополнительные настройки будут сброшены к настройке по умолчанию. Это невозможно отменить.</string> <string name="settings_reset">Настройки сброшены</string> @@ -229,14 +277,24 @@ <string name="export_failed">Ошибка экспорта</string> <string name="import_failed">Ошибка импортирования</string> <string name="cancelling">Отменяю</string> - + <string name="install">Установить</string> + <string name="delete">Удалить</string> + <string name="edit">Редактировать</string> + <string name="export_success">Экспорт успешно выполнен</string> + <string name="start">Start</string> + <string name="clear">Очистить</string> + <string name="global">Глобальный</string> + <string name="custom">Другое</string> + <string name="notice">Уведомление</string> + <string name="import_complete">Импорт завершен</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Выбрать драйвер ГП</string> <string name="select_gpu_driver_title">Хотите заменить текущий драйвер ГП?</string> <string name="select_gpu_driver_install">Установить</string> <string name="select_gpu_driver_default">По умолчанию</string> <string name="select_gpu_driver_use_default">Используется стандартный драйвер ГП </string> - <string name="select_gpu_driver_error">Выбран неверный драйвер, используется стандартный системный!</string> + <string name="select_gpu_driver_error">Выбран неподходящий драйвер</string> + <string name="driver_already_installed">Драйвер уже установлен</string> <string name="system_gpu_driver">Системный драйвер ГП</string> <string name="installing_driver">Установка драйвера...</string> @@ -244,11 +302,52 @@ <string name="preferences_settings">Настройки</string> <string name="preferences_general">Общие</string> <string name="preferences_system">Система</string> + <string name="preferences_system_description">Режим дока, регион, язык</string> <string name="preferences_graphics">Графика</string> + <string name="preferences_graphics_description">Уровень точности, разрешение, кэш шейдеров</string> <string name="preferences_audio">Аудио</string> + <string name="preferences_audio_description">Движок вывода, громкость</string> <string name="preferences_theme">Тема и цвет</string> <string name="preferences_debug">Отладка</string> - + <string name="preferences_debug_description">Отладка ЦП/ГП, графический API, fastmem</string> + + <!-- Game properties --> + <string name="info">Информация</string> + <string name="info_description">ID программы, для разработчиков, версия</string> + <string name="per_game_settings">Настройки для каждой игры</string> + <string name="per_game_settings_description">Изменить настройки этой игры</string> + <string name="launch_options">Конфигурация запуска</string> + <string name="path">Путь</string> + <string name="program_id">ID программы</string> + <string name="developer">Разработчик</string> + <string name="version">Версия</string> + <string name="copy_details">Копировать детали</string> + <string name="add_ons">Дополнения</string> + <string name="add_ons_description">Включение модов, обновлений и DLC</string> + <string name="clear_shader_cache">Очистить кэш шейдеров</string> + <string name="clear_shader_cache_description">Удаляет все шейдеры, созданные во время игры.</string> + <string name="clear_shader_cache_warning_description">У вас будет больше лагов во время повторной генерации кэша шейдеров</string> + <string name="cleared_shaders_successfully">Успешно очищены шейдеры</string> + <string name="addons_game">Аддоны: %1$s</string> + <string name="save_data">Сохранить данные</string> + <string name="save_data_description">Управлять сохранениями этой игры.</string> + <string name="delete_save_data">Удалить сохранения</string> + <string name="delete_save_data_description">Удалить все сохранения этой игры</string> + <string name="delete_save_data_warning_description">Это безвозвратно удаляет все сохраненные данные этой игры. Вы уверены, что хотите продолжить?</string> + <string name="save_data_deleted_successfully">Данные успешно удалены</string> + <string name="select_content_type">Тип контента</string> + <string name="updates_and_dlc">Обновления и DLC</string> + <string name="mods_and_cheats">Моды и читы</string> + <string name="addon_notice">Важное уведомление о дополнении</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">Для установки модов и читов необходимо выбрать папку, содержащую каталог cheats/, romfs/ или exefs/. Мы не можем гарантировать их совместимость с вашей игрой, поэтому будьте осторожны!</string> + <string name="invalid_directory">Неверный каталог</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">Пожалуйста, убедитесь, что выбранная вами директория содержит папку cheats/, romfs/ или exefs/ и попробуйте снова.</string> + <string name="addon_installed_successfully">Аддон успешно установлен</string> + <string name="verifying_content">Проверка содержимого...</string> + <string name="content_install_notice">Уведомление об установке контента</string> + <string name="content_install_notice_description">Содержимое, которое вы выбрали, не соответствует этой игре.\nУстановить все равно?</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Ваш ROM зашифрованный</string> <string name="loader_error_encrypted_roms_description"><![CDATA[Следуйте инструкциям, чтобы пере-дампить игровые картриджи <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\"> или <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\"> установленные игры</a>.]]></string> @@ -276,6 +375,7 @@ <string name="emulation_pause">Пауза эмуляции</string> <string name="emulation_unpause">Возобновить эмуляцию</string> <string name="emulation_input_overlay">Настройка оверлея</string> + <string name="touchscreen">Сенсорный экран</string> <string name="load_settings">Загрузка настроек...</string> @@ -307,6 +407,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Байт</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">КБ</string> <string name="memory_megabyte">МБ</string> <string name="memory_gigabyte">GB</string> @@ -351,9 +452,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> + <string name="screen_layout_auto">Авто</string> + <string name="screen_layout_sensor_landscape">Альбомная (сенсор)</string> <string name="screen_layout_landscape">Пейзаж</string> + <string name="screen_layout_reverse_landscape">Обратная альбомная</string> + <string name="screen_layout_sensor_portrait">Портретная (сенсор)</string> <string name="screen_layout_portrait">Портрет</string> - <string name="screen_layout_auto">Авто</string> + <string name="screen_layout_reverse_portrait">Обратная портретная</string> <!-- Aspect Ratios --> <string name="ratio_default">Стандартное (16:9)</string> @@ -362,6 +467,10 @@ <string name="ratio_force_sixteen_ten">Заставить 16:10</string> <string name="ratio_stretch">Растянуть до окна</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">Dynarmic (Медленно)</string> + <string name="cpu_backend_nce">Нативное выполнение (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">Точно</string> <string name="cpu_accuracy_unsafe">Небезопасно</string> @@ -390,8 +499,15 @@ <string name="theme_mode_dark">Темная</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Чёрный фон</string> <string name="use_black_backgrounds_description">При использовании темной темы применяйте черный фон.</string> diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml index 34809dbb8..361f0b726 100644 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -143,13 +143,16 @@ <string name="string_null">Null</string> <string name="string_import">Імпорт</string> <string name="export">Експорт</string> + <string name="install">Встановити</string> + <string name="delete">Видалити</string> + <string name="start">Start</string> + <string name="clear">Очистити</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Вибрати драйвер ГП</string> <string name="select_gpu_driver_title">Хочете замінити поточний драйвер ГП?</string> <string name="select_gpu_driver_install">Встановити</string> <string name="select_gpu_driver_default">За замовчуванням</string> <string name="select_gpu_driver_use_default">Використовується стандартний драйвер ГП</string> - <string name="select_gpu_driver_error">Обрано неправильний драйвер, використовується стандартний системний!</string> <string name="system_gpu_driver">Системний драйвер ГП</string> <string name="installing_driver">Встановлення драйвера...</string> @@ -161,7 +164,12 @@ <string name="preferences_audio">Аудіо</string> <string name="preferences_theme">Тема і колір</string> <string name="preferences_debug">Налагодження</string> - + <!-- Game properties --> + <string name="info">Інформація</string> + <string name="path">Шлях</string> + <string name="developer">Розробник</string> + <string name="version">Версія</string> + <string name="add_ons">Доповнення</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Ваш ROM зашифрований</string> <string name="loader_error_encrypted_keys_description"><![CDATA[Будь ласка, переконайтеся, що ваш файл <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> встановлено, щоб ігри можна було розшифрувати.]]></string> @@ -173,6 +181,8 @@ <string name="emulation_done">Готово</string> <string name="emulation_control_scale">Масштаб</string> <string name="emulation_control_opacity">Непрозорість</string> + <string name="touchscreen">Сенсорний екран</string> + <!-- Errors and warnings --> <string name="abort_button">Перервати</string> <string name="continue_button">Продовжити</string> @@ -192,6 +202,7 @@ <string name="region_korea">Корея</string> <string name="region_taiwan">Тайвань</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_gigabyte">GB</string> <!-- Renderer APIs --> <string name="renderer_vulkan">Vulkan</string> @@ -229,8 +240,8 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">Авто</string> - <!-- Aspect Ratios --> <string name="ratio_default">За замовчуванням (16:9)</string> <string name="ratio_force_four_three">Змусити 4:3</string> @@ -255,6 +266,12 @@ <string name="theme_mode_light">Світла</string> <string name="theme_mode_dark">Темна</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <string name="use_black_backgrounds_description">У разі використання темної теми застосовуйте чорне тло.</string> <string name="mute">Вимкнути звук</string> diff --git a/src/android/app/src/main/res/values-vi/strings.xml b/src/android/app/src/main/res/values-vi/strings.xml index f977db3a2..0a722f329 100644 --- a/src/android/app/src/main/res/values-vi/strings.xml +++ b/src/android/app/src/main/res/values-vi/strings.xml @@ -157,7 +157,6 @@ <string name="renderer_reactive_flushing_description">Cải thiện độ chính xác kết xuất trong một số game nhưng đồng thời giảm hiệu suất.</string> <string name="use_disk_shader_cache">Lưu bộ nhớ đệm shader trên ổ cứng</string> <string name="use_disk_shader_cache_description">Giảm tình trạng giật lag bằng cách lưu trữ và tải các shader được tạo ra nội bộ.</string> - <!-- Debug settings strings --> <string name="cpu">CPU</string> <string name="renderer_api">API</string> @@ -184,13 +183,17 @@ <string name="string_null">Null</string> <string name="string_import">Nhập</string> <string name="export">Xuất</string> + <string name="install">Cài đặt</string> + <string name="delete">Xoá</string> + <string name="start">Bắt đầu</string> + <string name="clear">Xóa</string> + <string name="custom">Tùy chỉnh</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Chọn driver GPU</string> <string name="select_gpu_driver_title">Bạn có muốn thay thế driver GPU hiện tại không?</string> <string name="select_gpu_driver_install">Cài đặt</string> <string name="select_gpu_driver_default">Mặc định</string> <string name="select_gpu_driver_use_default">Dùng driver GPU mặc định</string> - <string name="select_gpu_driver_error">Driver không hợp lệ đã được chọn, dùng mặc định hệ thống!</string> <string name="system_gpu_driver">Driver GPU hệ thống</string> <string name="installing_driver">Đang cài đặt driver...</string> @@ -202,7 +205,12 @@ <string name="preferences_audio">Âm thanh</string> <string name="preferences_theme">Chủ đề và màu sắc</string> <string name="preferences_debug">Gỡ lỗi</string> - + <!-- Game properties --> + <string name="info">Thông tin</string> + <string name="path">Đường dẫn</string> + <string name="developer">Nhà phát triển</string> + <string name="version">Phiên bản</string> + <string name="add_ons">Add-ons</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">ROM của bạn đã bị mã hoá</string> <string name="loader_error_encrypted_keys_description"><![CDATA[Vui lòng đảm bảo tệp <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> đã được cài đặt để các game có thể được giải mã.]]></string> @@ -229,6 +237,7 @@ <string name="emulation_pause">Tạm đừng giả lập</string> <string name="emulation_unpause">Tiếp tục giả lập</string> <string name="emulation_input_overlay">Tuỳ chọn lớp phủ</string> + <string name="touchscreen">Màn hình cảm ứng</string> <string name="load_settings">Đang tải cài đặt...</string> @@ -254,6 +263,7 @@ <string name="region_korea">Hàn Quốc</string> <string name="region_taiwan">Đài Loan</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_gigabyte">GB</string> <!-- Renderer APIs --> <string name="renderer_vulkan">Vulkan</string> @@ -291,8 +301,8 @@ <string name="anti_aliasing_fxaa">FXAA</string> <string name="anti_aliasing_smaa">SMAA</string> + <!-- Screen Layouts --> <string name="screen_layout_auto">Tự động</string> - <!-- Aspect Ratios --> <string name="ratio_default">Mặc định (16:9)</string> <string name="ratio_force_four_three">Dùng 4:3</string> @@ -327,6 +337,12 @@ <string name="theme_mode_light">Sáng</string> <string name="theme_mode_dark">Tối</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">Nền đen</string> <string name="use_black_backgrounds_description">Khi sử dụng chủ đề tối, hãy áp dụng nền đen.</string> diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml index 13455564f..b840591a4 100644 --- a/src/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml @@ -34,6 +34,7 @@ <string name="empty_gamelist">找不到游戏，或者尚未选择游戏文件夹。</string> <string name="search_and_filter_games">搜索游戏</string> <string name="select_games_folder">选择游戏文件夹</string> + <string name="manage_game_folders">管理游戏文件夹</string> <string name="select_games_folder_description">允许 yuzu 填充游戏列表</string> <string name="add_games_warning">跳过选择游戏文件夹？</string> <string name="add_games_warning_description">如果未选择游戏文件夹，游戏将不会显示在游戏列表中。</string> @@ -68,6 +69,7 @@ <string name="invalid_keys_error">无效的加密密钥</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">选择的密钥文件不正确或已损坏。请重新转储密钥文件。</string> + <string name="gpu_driver_manager">GPU 驱动管理器</string> <string name="install_gpu_driver">安装 GPU 驱动</string> <string name="install_gpu_driver_description">安装替代的驱动程序以获得更好的性能和精度</string> <string name="advanced_settings">高级选项</string> @@ -85,8 +87,12 @@ <string name="notification_no_directory_link_description">请使用文件管理器的侧部面板手动定位用户文件夹。</string> <string name="manage_save_data">管理存档数据</string> <string name="manage_save_data_description">已找到存档数据，请选择下方的选项。</string> + <string name="import_save_warning">导入保存数据</string> + <string name="import_save_warning_description">这将用您所提供的保存数据覆盖当前所有的保存数据。您确定要继续吗？</string> <string name="import_export_saves_description">导入或导出存档</string> - <string name="save_file_imported_success">已成功导入存档</string> + <string name="save_files_importing">正在导入存档文件...</string> + <string name="save_files_exporting">正在导出存档文件...</string> + <string name="save_file_imported_success">导入成功</string> <string name="save_file_invalid_zip_structure">无效的存档目录</string> <string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string> <string name="import_saves">导入</string> @@ -118,13 +124,43 @@ <string name="manage_yuzu_data_description">导入/导出固件、密钥、用户数据及其他。</string> <string name="share_save_file">分享存档文件</string> <string name="export_save_failed">导出存档文件失败</string> + <string name="game_folders">游戏文件夹</string> + <string name="deep_scan">深度扫描</string> + <string name="add_game_folder">添加游戏文件夹</string> + <string name="folder_already_added">这个文件夹先前已被添加！</string> + <string name="game_folder_properties">游戏文件夹属性</string> + <plurals name="saves_import_failed"> + <item quantity="other">%d 个存档导入失败</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="other">成功导入 %d 个存档</item> + </plurals> + <string name="no_save_data_found">未找到存档数据</string> + + <!-- Applet launcher strings --> + <string name="applets">小程序启动器</string> + <string name="applets_description">使用已安装的固件启动系统小程序</string> + <string name="applets_error_firmware">未安装固件</string> + <string name="applets_error_applet">小程序不可用</string> + <string name="applets_error_description"><![CDATA[请确保 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 文件和<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">固件</a>已安装，然后再试一次。]]></string> + <string name="album_applet">相册</string> + <string name="album_applet_description">查看存储在用户屏幕截图文件夹中的图像</string> + <string name="mii_edit_applet">Mii edit</string> + <string name="mii_edit_applet_description">查看和编辑 Mii</string> + <string name="cabinet_applet">Cabinet</string> + <string name="cabinet_applet_description">编辑、删除存储在 amiibo 上的数据</string> + <string name="cabinet_launcher">Cabinet 启动器</string> + <string name="cabinet_nickname_and_owner">昵称和所有者设置</string> + <string name="cabinet_game_data_eraser">游戏数据擦除器</string> + <string name="cabinet_restorer">恢复器</string> + <string name="cabinet_formatter">格式化程序</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia 不真实</string> <string name="copied_to_clipboard">已复制到剪贴板</string> <string name="about_app_description">一款开放源代码的 Switch 模拟器</string> <string name="contributors">贡献者</string> - <string name="contributors_description">使用来自 yuzu 团队的 \u2764 制作</string> + <string name="contributors_description">yuzu 团队的用 \u2764 制作</string> <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> <string name="licenses_description">Android 版 yuzu 离不开这些项目的支持</string> <string name="build">构建版本</string> @@ -161,6 +197,7 @@ <string name="frame_limit_enable_description">将运行速度限制为正常速度的指定百分比。</string> <string name="frame_limit_slider">限制速度百分比</string> <string name="frame_limit_slider_description">指定限制运行速度的百分比。100% 为正常速度。更高或更低的值将增加或降低速度限制上限。</string> + <string name="cpu_backend">CPU 后端</string> <string name="cpu_accuracy">CPU 精度</string> <string name="value_with_units">%1$s%2$s</string> @@ -191,6 +228,8 @@ <string name="renderer_reactive_flushing_description">牺牲性能，提高某些游戏的渲染精度。</string> <string name="use_disk_shader_cache">磁盘着色器缓存</string> <string name="use_disk_shader_cache_description">将生成的着色器缓存于磁盘中并进行读取，以减少卡顿。</string> + <string name="anisotropic_filtering">各向异性过滤</string> + <string name="anisotropic_filtering_description">提高斜角的纹理质量</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> @@ -217,6 +256,7 @@ <string name="shutting_down">正在关闭…</string> <string name="reset_setting_confirmation">您要将此设定重设为默认值吗？</string> <string name="reset_to_default">恢复默认</string> + <string name="reset_to_default_description">重置所有高级选项</string> <string name="reset_all_settings">重置所有设置项？</string> <string name="reset_all_settings_description">所有高级选项都将被重设，此动作无法还原。</string> <string name="settings_reset">重设设置项</string> @@ -230,6 +270,18 @@ <string name="export_failed">导出失败</string> <string name="import_failed">导入失败</string> <string name="cancelling">取消中</string> + <string name="install">安装</string> + <string name="delete">删除</string> + <string name="edit">编辑</string> + <string name="export_success">导出成功</string> + <string name="start">开始</string> + <string name="clear">清除</string> + <string name="global">全局</string> + <string name="custom">自定义</string> + <string name="notice">提醒</string> + <string name="import_complete">导入完成</string> + <string name="more_options">更多选项</string> + <string name="use_global_setting">使用全局设置</string> <!-- GPU driver installation --> <string name="select_gpu_driver">选择 GPU 驱动程序</string> @@ -237,7 +289,8 @@ <string name="select_gpu_driver_install">安装</string> <string name="select_gpu_driver_default">系统默认</string> <string name="select_gpu_driver_use_default">使用默认 GPU 驱动程序</string> - <string name="select_gpu_driver_error">选择的驱动程序无效，将使用系统默认的驱动程序！</string> + <string name="select_gpu_driver_error">选择的驱动无效</string> + <string name="driver_already_installed">驱动已安装</string> <string name="system_gpu_driver">系统 GPU 驱动程序</string> <string name="installing_driver">正在安装驱动程序…</string> @@ -245,10 +298,54 @@ <string name="preferences_settings">设置</string> <string name="preferences_general">通用</string> <string name="preferences_system">系统</string> + <string name="preferences_system_description">主机运行模式、区域及语言</string> <string name="preferences_graphics">图形</string> + <string name="preferences_graphics_description">精度等级、分辨率及着色器缓存</string> <string name="preferences_audio">声音</string> + <string name="preferences_audio_description">输出引擎及音量</string> <string name="preferences_theme">主题和色彩</string> <string name="preferences_debug">调试</string> + <string name="preferences_debug_description">CPU/GPU 调试、图形 API 及 fastmem 内存访问</string> + + <!-- Game properties --> + <string name="info">信息</string> + <string name="info_description">游戏 ID、开发者及版本信息</string> + <string name="per_game_settings">游戏单独设置</string> + <string name="per_game_settings_description">编辑此游戏的单独设置项</string> + <string name="launch_options">载入配置</string> + <string name="path">路径</string> + <string name="program_id">游戏 ID</string> + <string name="developer">开发商</string> + <string name="version">版本</string> + <string name="copy_details">复制明细</string> + <string name="add_ons">附加项</string> + <string name="add_ons_description">管理 mod、游戏更新及 DLC</string> + <string name="clear_shader_cache">清除着色器缓存</string> + <string name="clear_shader_cache_description">删除此游戏的所有着色器缓存</string> + <string name="clear_shader_cache_warning_description">由于着色器缓存的重新生成，您将遭遇更多卡顿</string> + <string name="cleared_shaders_successfully">着色器缓存清除成功</string> + <string name="addons_game">附加项: %1$s</string> + <string name="save_data">保存数据</string> + <string name="save_data_description">管理此游戏的保存数据</string> + <string name="delete_save_data">删除保存数据</string> + <string name="delete_save_data_description">删除此游戏的所有保存数据</string> + <string name="delete_save_data_warning_description">这将删除此游戏的所有保存数据且不可撤销。您确定要继续吗？</string> + <string name="save_data_deleted_successfully">保存数据删除成功</string> + <string name="select_content_type">内容类型</string> + <string name="updates_and_dlc">游戏更新和 DLC</string> + <string name="mods_and_cheats">Mod 和金手指</string> + <string name="addon_notice">附加项重要提醒</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">为了安装 mod 和金手指，您必须选择一个包含 cheats/、romfs/ 或 exefs/ 目录的文件夹。我们无法验证这些内容是否与您的游戏兼容，所以请小心使用！</string> + <string name="invalid_directory">无效目录</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">请确保您选择的目录下包含 cheats/、romfs/ 或 exefs/ 文件夹然后重试。</string> + <string name="addon_installed_successfully">附加项安装成功</string> + <string name="verifying_content">验证安装内容...</string> + <string name="content_install_notice">安装提醒</string> + <string name="content_install_notice_description">您选择安装的内容与此游戏不匹配。\n继续安装？</string> + <string name="confirm_uninstall">卸载确认</string> + <string name="confirm_uninstall_description">您确定要卸载此附加项吗？</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">您的 ROM 已加密</string> @@ -277,6 +374,7 @@ <string name="emulation_pause">暂停模拟</string> <string name="emulation_unpause">继续模拟</string> <string name="emulation_input_overlay">虚拟按键选项</string> + <string name="touchscreen">触摸屏</string> <string name="load_settings">正在载入设定…</string> @@ -308,6 +406,7 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> <string name="memory_gigabyte">GB</string> @@ -352,9 +451,13 @@ <string name="anti_aliasing_smaa">子像素形态学抗锯齿</string> <!-- Screen Layouts --> - <string name="screen_layout_landscape">横向大屏</string> - <string name="screen_layout_portrait">纵向屏幕</string> <string name="screen_layout_auto">自动</string> + <string name="screen_layout_sensor_landscape">传感器方向横屏</string> + <string name="screen_layout_landscape">横屏</string> + <string name="screen_layout_reverse_landscape">反向横屏</string> + <string name="screen_layout_sensor_portrait">传感器方向竖屏</string> + <string name="screen_layout_portrait">竖屏</string> + <string name="screen_layout_reverse_portrait">反向竖屏</string> <!-- Aspect Ratios --> <string name="ratio_default">默认 (16:9)</string> @@ -363,6 +466,10 @@ <string name="ratio_force_sixteen_ten">强制 16:10</string> <string name="ratio_stretch">拉伸窗口</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">动态编译 (慢速)</string> + <string name="cpu_backend_nce">本机代码执行 (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">高精度</string> <string name="cpu_accuracy_unsafe">低精度</string> @@ -391,8 +498,15 @@ <string name="theme_mode_dark">深色</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">使用黑色背景</string> <string name="use_black_backgrounds_description">使用深色主题时，套用黑色背景。</string> diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml index b8f468c68..d39255714 100644 --- a/src/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml @@ -34,12 +34,13 @@ <string name="empty_gamelist">找不到檔案，或者尚未選取遊戲目錄。</string> <string name="search_and_filter_games">搜尋並篩選遊戲</string> <string name="select_games_folder">選取遊戲資料夾</string> + <string name="manage_game_folders">管理遊戲資料夾</string> <string name="select_games_folder_description">允許 yuzu 填入遊戲清單</string> <string name="add_games_warning">跳過選取遊戲資料夾？</string> <string name="add_games_warning_description">如果資料夾未選取，遊戲將不會顯示在遊戲清單。</string> <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string> <string name="home_search_games">搜尋遊戲</string> - <string name="search_settings">搜索设置</string> + <string name="search_settings">搜尋設定</string> <string name="games_dir_selected">遊戲目錄已選取</string> <string name="install_prod_keys">安裝 prod.keys</string> <string name="install_prod_keys_description">需要解密零售遊戲</string> @@ -68,10 +69,11 @@ <string name="invalid_keys_error">無效的加密金鑰</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">選取的檔案不正確或已損毀，請重新傾印您的金鑰。</string> + <string name="gpu_driver_manager">GPU 驅動程式管理員</string> <string name="install_gpu_driver">安裝 GPU 驅動程式</string> <string name="install_gpu_driver_description">安裝替代驅動程式以取得潛在的更佳效能或準確度</string> <string name="advanced_settings">進階設定</string> - <string name="advanced_settings_game">高级选项: %1$s</string> + <string name="advanced_settings_game">進階設定：%1$s</string> <string name="settings_description">進行模擬器設定</string> <string name="search_recently_played">最近遊玩</string> <string name="search_recently_added">最近新增</string> @@ -85,7 +87,11 @@ <string name="notification_no_directory_link_description">請使用檔案管理員的側邊面板手動定位到使用者資料夾。</string> <string name="manage_save_data">管理儲存資料</string> <string name="manage_save_data_description">已找到儲存資料，請選取下方的選項。</string> + <string name="import_save_warning">匯入儲存資料</string> + <string name="import_save_warning_description">這將會以提供的檔案覆寫所有現有的儲存資料，您確定要繼續嗎？</string> <string name="import_export_saves_description">匯入或匯出儲存檔案</string> + <string name="save_files_importing">正在匯入儲存檔案…</string> + <string name="save_files_exporting">正在匯出儲存檔案…</string> <string name="save_file_imported_success">已成功匯入</string> <string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string> <string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string> @@ -96,28 +102,58 @@ <string name="firmware_installing">正在安裝韌體</string> <string name="firmware_installed_success">韌體已成功安裝</string> <string name="firmware_installed_failure">韌體安裝失敗</string> - <string name="firmware_installed_failure_description">请确保固件 nca 文件位于 zip 压缩包的根目录，然后重试。</string> + <string name="firmware_installed_failure_description">請確保韌體 nca 檔案位於 zip 壓縮檔的根目錄，然後再試一次。</string> <string name="share_log">分享偵錯記錄</string> <string name="share_log_description">分享 yuzu 的記錄檔以便對相關問題進行偵錯</string> <string name="share_log_missing">找不到記錄檔</string> <string name="install_game_content">安裝遊戲內容</string> <string name="install_game_content_description">安裝遊戲更新或 DLC</string> - <string name="installing_game_content">安装中...</string> - <string name="install_game_content_failure">向 NAND 安装文件时失败</string> - <string name="install_game_content_failure_description">请确保附加内容的有效性，并且 prod.keys 密钥文件已安装。</string> - <string name="install_game_content_failure_base">为避免产生冲突，此功能不能用于安装游戏本体。</string> - <string name="install_game_content_failure_file_extension">只有 NSP 或 XCI 格式的附加内容可以安装。请确保您的游戏附加内容是有效的。</string> - <string name="install_game_content_failed_count">%1$d 安装出错</string> - <string name="install_game_content_success">游戏附加内容已成功安装</string> - <string name="install_game_content_success_install">%1$d 安装成功</string> - <string name="install_game_content_success_overwrite">%1$d 覆盖安装成功</string> + <string name="installing_game_content">正在安裝內容…</string> + <string name="install_game_content_failure">安裝檔案至 NAND 時發生錯誤</string> + <string name="install_game_content_failure_description">請確保內容有效並且 prod.keys 檔案已安裝。</string> + <string name="install_game_content_failure_base">為避免可能的衝突，不允許安裝基礎遊戲。</string> + <string name="install_game_content_failure_file_extension">僅支援 NSP 和 XCI 內容，請驗證遊戲內容是否有效。</string> + <string name="install_game_content_failed_count">%1$d 安裝錯誤</string> + <string name="install_game_content_success">遊戲內容已成功安裝</string> + <string name="install_game_content_success_install">%1$d 安裝成功</string> + <string name="install_game_content_success_overwrite">%1$d 覆寫成功</string> <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string> - <string name="custom_driver_not_supported">不支持自定义驱动</string> - <string name="custom_driver_not_supported_description">此设备不支持自定义驱动。\n请之后再访问此项，查看是否已为此设备添加支持。</string> - <string name="manage_yuzu_data">管理 yuzu 数据</string> - <string name="manage_yuzu_data_description">导入/导出固件、密钥、用户数据及其他。</string> - <string name="share_save_file">分享存档文件</string> - <string name="export_save_failed">导出存档文件失败</string> + <string name="custom_driver_not_supported">不支援自訂的驅動程式</string> + <string name="custom_driver_not_supported_description">此裝置不支援自訂的驅動程式。\n請以後再來查看是否已新增支援！</string> + <string name="manage_yuzu_data">管理 yuzu 資料</string> + <string name="manage_yuzu_data_description">匯入/匯出韌體、金鑰、使用者資料及其他項目！</string> + <string name="share_save_file">分享儲存檔案</string> + <string name="export_save_failed">無法匯出儲存檔案</string> + <string name="game_folders">遊戲資料夾</string> + <string name="deep_scan">深度掃描</string> + <string name="add_game_folder">新增遊戲資料夾</string> + <string name="folder_already_added">這個資料夾已經新增過了！</string> + <string name="game_folder_properties">遊戲資料夾屬性</string> + <plurals name="saves_import_failed"> + <item quantity="other">%d 个存档导入失败</item> + </plurals> + <plurals name="saves_import_success"> + <item quantity="other">成功导入 %d 个存档</item> + </plurals> + <string name="no_save_data_found">未找到存档数据</string> + + <!-- Applet launcher strings --> + <string name="applets">小程式啟動器</string> + <string name="applets_description">使用已安裝的韌體啟動系統小程式</string> + <string name="applets_error_firmware">未安裝韌體</string> + <string name="applets_error_applet">無法使用小程式</string> + <string name="applets_error_description"><![CDATA[請確保您的 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 檔案和<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">韌體</a>已安裝，然後再試一次。]]></string> + <string name="album_applet">相簿</string> + <string name="album_applet_description">使用系統相片檢視器查看儲存在使用者螢幕截圖資料夾中的影像</string> + <string name="mii_edit_applet">Mii 編輯</string> + <string name="mii_edit_applet_description">使用系統編輯器來檢視並編輯 Mii</string> + <string name="cabinet_applet">Cabinet</string> + <string name="cabinet_applet_description">編輯、刪除儲存在 amiibo 上的資料</string> + <string name="cabinet_launcher">Cabinet 啟動器</string> + <string name="cabinet_nickname_and_owner">暱稱和擁有者設定</string> + <string name="cabinet_game_data_eraser">遊戲資料橡皮擦</string> + <string name="cabinet_restorer">還原程式</string> + <string name="cabinet_formatter">格式器</string> <!-- About screen strings --> <string name="gaia_is_not_real">Gaia 不真實</string> @@ -128,16 +164,16 @@ <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string> <string name="licenses_description">這些專案使 yuzu Android 版成為可能</string> <string name="build">組建</string> - <string name="user_data">用户数据</string> - <string name="user_data_description">导入/导出应用程序所有数据。\n\n导入用户数据时，将删除当前所有的用户数据！</string> - <string name="exporting_user_data">正在导出用户数据...</string> - <string name="importing_user_data">正在导入用户数据...</string> - <string name="import_user_data">导入用户数据</string> - <string name="invalid_yuzu_backup">无效的 yuzu 备份</string> - <string name="user_data_export_success">导出用户数据成功</string> - <string name="user_data_import_success">导入用户数据成功</string> - <string name="user_data_export_cancelled">已取消导出数据</string> - <string name="user_data_import_failed_description">请确保用户数据文件夹位于 zip 压缩包的根目录，并在 config/config.ini 路径中包含配置文件，然后重试。</string> + <string name="user_data">使用者資料</string> + <string name="user_data_description">匯入/匯出所有應用程式資料。\n\n匯入使用者資料時，現有的使用者資料將被刪除！</string> + <string name="exporting_user_data">正在匯出使用者資料…</string> + <string name="importing_user_data">正在匯入使用者資料…</string> + <string name="import_user_data">匯入使用者資料</string> + <string name="invalid_yuzu_backup">無效的 yuzu 備份</string> + <string name="user_data_export_success">使用者資料匯出成功</string> + <string name="user_data_import_success">使用者資料匯入成功</string> + <string name="user_data_export_cancelled">匯出已取消</string> + <string name="user_data_import_failed_description">請確保使用者資料夾位於 zip 壓縮檔的根目錄，並在 config/config.ini 路徑中包含組態檔案，並再試一次。</string> <string name="support_link">https://discord.gg/u77vRWY</string> <string name="website_link">https://yuzu-emu.org/</string> <string name="github_link">https://github.com/yuzu-emu</string> @@ -161,6 +197,7 @@ <string name="frame_limit_enable_description">將模擬速度限制在標準速度的指定百分比。</string> <string name="frame_limit_slider">限制速度百分比</string> <string name="frame_limit_slider_description">指定限制模擬速度的百分比。100% 為標準速度，更高或更低的值將會增加或減少速度限制。</string> + <string name="cpu_backend">CPU 後端</string> <string name="cpu_accuracy">CPU 準確度</string> <string name="value_with_units">%1$s%2$s</string> @@ -179,7 +216,7 @@ <string name="renderer_accuracy">準確度層級</string> <string name="renderer_resolution">解析度 (手提/底座)</string> <string name="renderer_vsync">VSync 模式</string> - <string name="renderer_screen_layout">屏幕方向</string> + <string name="renderer_screen_layout">方向</string> <string name="renderer_aspect_ratio">長寬比</string> <string name="renderer_scaling_filter">視窗適應過濾器</string> <string name="renderer_anti_aliasing">消除鋸齒方法</string> @@ -191,11 +228,13 @@ <string name="renderer_reactive_flushing_description">犧牲效能，以改善部分遊戲的轉譯準確度。</string> <string name="use_disk_shader_cache">磁碟著色器快取</string> <string name="use_disk_shader_cache_description">透過將產生的著色器儲存並載入至磁碟，減少中斷。</string> + <string name="anisotropic_filtering">非等向性過濾</string> + <string name="anisotropic_filtering_description">改善斜角檢視時的紋理品質</string> <!-- Debug settings strings --> <string name="cpu">CPU</string> - <string name="cpu_debug_mode">CPU 调试</string> - <string name="cpu_debug_mode_description">将 CPU 设置为较慢的调试模式。</string> + <string name="cpu_debug_mode">CPU 偵錯</string> + <string name="cpu_debug_mode_description">將 CPU 設定為慢速偵錯模式。</string> <string name="gpu">GPU</string> <string name="renderer_api">API</string> <string name="renderer_debug">圖形偵錯</string> @@ -203,7 +242,7 @@ <string name="fastmem">Fastmem</string> <!-- Audio settings strings --> - <string name="audio_output_engine">输出引擎</string> + <string name="audio_output_engine">輸出引擎</string> <string name="audio_volume">音量</string> <string name="audio_volume_description">指定音訊輸出音量。</string> @@ -212,11 +251,12 @@ <string name="ini_saved">已儲存設定</string> <string name="gameid_saved">已儲存 %1$s 設定</string> <string name="error_saving">儲存 %1$s 時發生錯誤 ini: %2$s</string> - <string name="unimplemented_menu">未生效菜单</string> + <string name="unimplemented_menu">未實作的選單</string> <string name="loading">正在載入…</string> - <string name="shutting_down">正在关闭…</string> + <string name="shutting_down">正在關閉…</string> <string name="reset_setting_confirmation">要將此設定重設回預設值嗎？</string> <string name="reset_to_default">重設為預設值</string> + <string name="reset_to_default_description">重設所有進階設定</string> <string name="reset_all_settings">重設所有設定？</string> <string name="reset_all_settings_description">所有進階設定將被重設為預設組態，此動作無法復原。</string> <string name="settings_reset">設定已重設</string> @@ -227,9 +267,21 @@ <string name="string_null">無</string> <string name="string_import">匯入</string> <string name="export">匯出</string> - <string name="export_failed">导出失败</string> - <string name="import_failed">导入失败</string> - <string name="cancelling">取消中</string> + <string name="export_failed">匯出失敗</string> + <string name="import_failed">匯入失敗</string> + <string name="cancelling">正在取消</string> + <string name="install">安裝</string> + <string name="delete">刪除</string> + <string name="edit">編輯</string> + <string name="export_success">已成功匯出</string> + <string name="start">開始</string> + <string name="clear">清除</string> + <string name="global">全域</string> + <string name="custom">自定义</string> + <string name="notice">通知</string> + <string name="import_complete">导入完成</string> + <string name="more_options">更多选项</string> + <string name="use_global_setting">使用全局设置</string> <!-- GPU driver installation --> <string name="select_gpu_driver">選取 GPU 驅動程式</string> @@ -237,7 +289,8 @@ <string name="select_gpu_driver_install">安裝</string> <string name="select_gpu_driver_default">預設</string> <string name="select_gpu_driver_use_default">使用預設 GPU 驅動程式</string> - <string name="select_gpu_driver_error">選取的驅動程式無效，將使用系統預設驅動程式！</string> + <string name="select_gpu_driver_error">選取的驅動程式無效</string> + <string name="driver_already_installed">驅動程式已安裝</string> <string name="system_gpu_driver">系統 GPU 驅動程式</string> <string name="installing_driver">正在安裝驅動程式…</string> @@ -245,14 +298,58 @@ <string name="preferences_settings">設定</string> <string name="preferences_general">一般</string> <string name="preferences_system">系統</string> + <string name="preferences_system_description">底座模式、區域及語言</string> <string name="preferences_graphics">圖形</string> + <string name="preferences_graphics_description">準確度層級、解析度及著色器快取</string> <string name="preferences_audio">音訊</string> + <string name="preferences_audio_description">輸出引擎及音量</string> <string name="preferences_theme">主題和色彩</string> <string name="preferences_debug">偵錯</string> + <string name="preferences_debug_description">CPU/GPU 偵錯、圖形 API 及 fastmem</string> + + <!-- Game properties --> + <string name="info">資訊</string> + <string name="info_description">程式 ID、開發人員及版本資訊</string> + <string name="per_game_settings">個別遊戲設定</string> + <string name="per_game_settings_description">編輯此遊戲的特定設定</string> + <string name="launch_options">啟動組態</string> + <string name="path">路徑</string> + <string name="program_id">程式 ID</string> + <string name="developer">出版商</string> + <string name="version">版本</string> + <string name="copy_details">複製詳細資料</string> + <string name="add_ons">延伸模組</string> + <string name="add_ons_description">切換模組、更新及 DLC</string> + <string name="clear_shader_cache">清除著色器快取</string> + <string name="clear_shader_cache_description">遊玩此遊戲時移除所有著色器組建</string> + <string name="clear_shader_cache_warning_description">由於著色器快取的重新產生，您可能會感到不太順暢</string> + <string name="cleared_shaders_successfully">著色器快取已成功清除</string> + <string name="addons_game">附加元件：%1$s</string> + <string name="save_data">儲存資料</string> + <string name="save_data_description">管理此遊戲特定的儲存資料</string> + <string name="delete_save_data">刪除儲存資料</string> + <string name="delete_save_data_description">移除此遊戲特定的所有儲存資料</string> + <string name="delete_save_data_warning_description">這將會移除此遊戲的所有儲存資料，且無法復原，您確定要繼續嗎？</string> + <string name="save_data_deleted_successfully">儲存資料已成功刪除</string> + <string name="select_content_type">內容類型</string> + <string name="updates_and_dlc">更新及 DLC</string> + <string name="mods_and_cheats">模組及密技</string> + <string name="addon_notice">重要的˙附加元件通知</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="addon_notice_description">若要安裝模組及密技，您必須選取一個包含 cheats/、romfs/ 或 exefs/ 的目錄。我們無法驗證這些內容是否與您的遊戲相容，所以請小心作業！</string> + <string name="invalid_directory">無效的目錄</string> + <!-- "cheats/" "romfs/" and "exefs/ should not be translated --> + <string name="invalid_directory_description">請確保您選取的目錄包含 cheats/、romfs/ 或 exefs/ 資料夾，然後再試一次。</string> + <string name="addon_installed_successfully">附加元件已成功安裝</string> + <string name="verifying_content">正在驗證內容…</string> + <string name="content_install_notice">內容安裝通知</string> + <string name="content_install_notice_description">您選取的內容與此遊戲不相符。\n仍要繼續安裝嗎？</string> + <string name="confirm_uninstall">确认卸载</string> + <string name="confirm_uninstall_description">您确定要卸载此附加项吗？</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">您的 ROM 已加密</string> - <string name="loader_error_encrypted_roms_description"><![CDATA[请按照指南重新转储您的<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">游戏卡带</a>或<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">已安装的游戏</a>。]]></string> + <string name="loader_error_encrypted_roms_description"><![CDATA[請依循指南重新傾印您的<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">遊戲卡匣</a>或<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">已安裝的遊戲</a>。]]></string> <string name="loader_error_encrypted_keys_description"><![CDATA[請確保您的 <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> 檔案已安裝，讓遊戲可以解密。]]></string> <string name="loader_error_video_core">初始化視訊核心時發生錯誤</string> <string name="loader_error_video_core_description">這經常由不相容的 GPU 驅動程式造成，安裝自訂 GPU 驅動程式可能會解決此問題。</string> @@ -277,6 +374,7 @@ <string name="emulation_pause">暫停模擬</string> <string name="emulation_unpause">取消暫停模擬</string> <string name="emulation_input_overlay">覆疊選項</string> + <string name="touchscreen">觸控螢幕</string> <string name="load_settings">正在載入設定…</string> @@ -293,9 +391,9 @@ <string name="fatal_error">嚴重錯誤</string> <string name="fatal_error_message">發生嚴重錯誤，檢查記錄以取得詳細資訊。\n繼續模擬可能會造成當機和錯誤。</string> <string name="performance_warning">關閉此設定會顯著降低模擬效能！如需最佳體驗，建議您將此設定保持為啟用狀態。</string> - <string name="device_memory_inadequate">设备 RAM: %1$s\n推荐 RAM: %2$s</string> + <string name="device_memory_inadequate">裝置 RAM: %1$s\n建議 RAM: %2$s</string> <string name="memory_formatted">%1$s%2$s</string> - <string name="no_game_present">当前没有可启动的游戏！</string> + <string name="no_game_present">目前沒有可啟動的遊戲！</string> <!-- Region Names --> <string name="region_japan">日本</string> @@ -308,9 +406,10 @@ <!-- Memory Sizes --> <string name="memory_byte">Byte</string> + <string name="memory_byte_shorthand">B</string> <string name="memory_kilobyte">KB</string> <string name="memory_megabyte">MB</string> - <string name="memory_gigabyte">英國</string> + <string name="memory_gigabyte">GB</string> <string name="memory_terabyte">TB</string> <string name="memory_petabyte">PB</string> <string name="memory_exabyte">EB</string> @@ -352,9 +451,13 @@ <string name="anti_aliasing_smaa">SMAA</string> <!-- Screen Layouts --> - <string name="screen_layout_landscape">横向大屏</string> - <string name="screen_layout_portrait">纵向屏幕</string> <string name="screen_layout_auto">自動</string> + <string name="screen_layout_sensor_landscape">感應器橫向螢幕</string> + <string name="screen_layout_landscape">橫向</string> + <string name="screen_layout_reverse_landscape">反轉橫向螢幕</string> + <string name="screen_layout_sensor_portrait">感應器直向螢幕</string> + <string name="screen_layout_portrait">直向</string> + <string name="screen_layout_reverse_portrait">反轉直向螢幕</string> <!-- Aspect Ratios --> <string name="ratio_default">預設 (16:9)</string> @@ -363,6 +466,10 @@ <string name="ratio_force_sixteen_ten">強制 16:10</string> <string name="ratio_stretch">延展視窗</string> + <!-- CPU Backend --> + <string name="cpu_backend_dynarmic">動態 (慢)</string> + <string name="cpu_backend_nce">機器碼執行 (NCE)</string> + <!-- CPU Accuracy --> <string name="cpu_accuracy_accurate">高精度</string> <string name="cpu_accuracy_unsafe">低精度</string> @@ -391,17 +498,24 @@ <string name="theme_mode_dark">深色</string> <!-- Audio output engines --> + <string name="oboe">oboe</string> <string name="cubeb">cubeb</string> + <!-- Anisotropic filtering options --> + <string name="multiplier_two">2x</string> + <string name="multiplier_four">4x</string> + <string name="multiplier_eight">8x</string> + <string name="multiplier_sixteen">16x</string> + <!-- Black backgrounds theme --> <string name="use_black_backgrounds">黑色背景</string> <string name="use_black_backgrounds_description">使用深色主題時，套用黑色背景。</string> <!-- Picture-In-Picture --> - <string name="picture_in_picture">画中画</string> - <string name="picture_in_picture_description">模拟器位于后台时最小化窗口</string> - <string name="pause">暂停</string> - <string name="play">开始</string> + <string name="picture_in_picture">子母畫面</string> + <string name="picture_in_picture_description">位於背景時最小化視窗</string> + <string name="pause">暫停</string> + <string name="play">開始</string> <string name="mute">靜音</string> <string name="unmute">取消靜音</string> diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 547752bda..779eb36a8 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -142,6 +142,8 @@ <item quantity="other">Successfully imported %d saves</item> </plurals> <string name="no_save_data_found">No save data found</string> + <string name="verify_installed_content">Verify installed content</string> + <string name="verify_installed_content_description">Checks all installed content for corruption</string> <!-- Applet launcher strings --> <string name="applets">Applet launcher</string> @@ -286,6 +288,9 @@ <string name="custom">Custom</string> <string name="notice">Notice</string> <string name="import_complete">Import complete</string> + <string name="more_options">More options</string> + <string name="use_global_setting">Use global setting</string> + <string name="operation_completed_successfully">The operation completed successfully</string> <!-- GPU driver installation --> <string name="select_gpu_driver">Select GPU driver</string> @@ -348,6 +353,16 @@ <string name="verifying_content">Verifying content…</string> <string name="content_install_notice">Content install notice</string> <string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string> + <string name="confirm_uninstall">Confirm uninstall</string> + <string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string> + <string name="verify_integrity">Verify integrity</string> + <string name="verifying">Verifying…</string> + <string name="verify_success">Integrity verification succeeded!</string> + <string name="verify_failure">Integrity verification failed!</string> + <string name="verify_failure_description">File contents may be corrupt</string> + <string name="verify_no_result">Integrity verification couldn\'t be performed</string> + <string name="verify_no_result_description">File contents were not checked for validity</string> + <string name="verification_failed_for">Verification failed for the following files:\n%1$s</string> <!-- ROM loading errors --> <string name="loader_error_encrypted">Your ROM is encrypted</string> @@ -377,6 +392,8 @@ <string name="emulation_unpause">Unpause emulation</string> <string name="emulation_input_overlay">Overlay options</string> <string name="touchscreen">Touchscreen</string> + <string name="lock_drawer">Lock drawer</string> + <string name="unlock_drawer">Unlock drawer</string> <string name="load_settings">Loading settings…</string> diff --git a/src/common/fs/file.h b/src/common/fs/file.h index 167c4d826..2e2396075 100644 --- a/src/common/fs/file.h +++ b/src/common/fs/file.h @@ -37,7 +37,7 @@ void OpenFileStream(FileStream& file_stream, const std::filesystem::path& path, template <typename FileStream, typename Path> void OpenFileStream(FileStream& file_stream, const Path& path, std::ios_base::openmode open_mode) { if constexpr (IsChar<typename Path::value_type>) { - file_stream.open(ToU8String(path), open_mode); + file_stream.open(std::filesystem::path{ToU8String(path)}, open_mode); } else { file_stream.open(std::filesystem::path{path}, open_mode); } diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0f713ead1..4ff2c1bb7 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -716,22 +716,23 @@ add_library(core STATIC hle/service/server_manager.h hle/service/service.cpp hle/service/service.h - hle/service/set/appln_settings.cpp - hle/service/set/appln_settings.h - hle/service/set/device_settings.cpp - hle/service/set/device_settings.h + hle/service/set/setting_formats/appln_settings.cpp + hle/service/set/setting_formats/appln_settings.h + hle/service/set/setting_formats/device_settings.cpp + hle/service/set/setting_formats/device_settings.h + hle/service/set/setting_formats/system_settings.cpp + hle/service/set/setting_formats/system_settings.h + hle/service/set/setting_formats/private_settings.cpp + hle/service/set/setting_formats/private_settings.h hle/service/set/factory_settings_server.cpp hle/service/set/factory_settings_server.h hle/service/set/firmware_debug_settings_server.cpp hle/service/set/firmware_debug_settings_server.h - hle/service/set/private_settings.cpp - hle/service/set/private_settings.h hle/service/set/settings.cpp hle/service/set/settings.h hle/service/set/settings_server.cpp hle/service/set/settings_server.h - hle/service/set/system_settings.cpp - hle/service/set/system_settings.h + hle/service/set/settings_types.h hle/service/set/system_settings_server.cpp hle/service/set/system_settings_server.h hle/service/sm/sm.cpp diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 4a3dbc6a3..612122224 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -466,12 +466,12 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs return romfs; } -PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile update_raw) const { +std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const { if (title_id == 0) { return {}; } - std::map<std::string, std::string, std::less<>> out; + std::vector<Patch> out; const auto& disabled = Settings::values.disabled_addons[title_id]; // Game Updates @@ -482,20 +482,28 @@ PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile u const auto update_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend(); - const auto update_label = update_disabled ? "[D] Update" : "Update"; + Patch update_patch = {.enabled = !update_disabled, + .name = "Update", + .version = "", + .type = PatchType::Update, + .program_id = title_id, + .title_id = title_id}; if (nacp != nullptr) { - out.insert_or_assign(update_label, nacp->GetVersionString()); + update_patch.version = nacp->GetVersionString(); + out.push_back(update_patch); } else { if (content_provider.HasEntry(update_tid, ContentRecordType::Program)) { const auto meta_ver = content_provider.GetEntryVersion(update_tid); if (meta_ver.value_or(0) == 0) { - out.insert_or_assign(update_label, ""); + out.push_back(update_patch); } else { - out.insert_or_assign(update_label, FormatTitleVersion(*meta_ver)); + update_patch.version = FormatTitleVersion(*meta_ver); + out.push_back(update_patch); } } else if (update_raw != nullptr) { - out.insert_or_assign(update_label, "PACKED"); + update_patch.version = "PACKED"; + out.push_back(update_patch); } } @@ -539,7 +547,12 @@ PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile u const auto mod_disabled = std::find(disabled.begin(), disabled.end(), mod->GetName()) != disabled.end(); - out.insert_or_assign(mod_disabled ? "[D] " + mod->GetName() : mod->GetName(), types); + out.push_back({.enabled = !mod_disabled, + .name = mod->GetName(), + .version = types, + .type = PatchType::Mod, + .program_id = title_id, + .title_id = title_id}); } } @@ -557,7 +570,12 @@ PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile u if (!types.empty()) { const auto mod_disabled = std::find(disabled.begin(), disabled.end(), "SDMC") != disabled.end(); - out.insert_or_assign(mod_disabled ? "[D] SDMC" : "SDMC", types); + out.push_back({.enabled = !mod_disabled, + .name = "SDMC", + .version = types, + .type = PatchType::Mod, + .program_id = title_id, + .title_id = title_id}); } } @@ -584,7 +602,12 @@ PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile u const auto dlc_disabled = std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end(); - out.insert_or_assign(dlc_disabled ? "[D] DLC" : "DLC", std::move(list)); + out.push_back({.enabled = !dlc_disabled, + .name = "DLC", + .version = std::move(list), + .type = PatchType::DLC, + .program_id = title_id, + .title_id = dlc_match.back().title_id}); } return out; diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h index 03e9c7301..2601b8217 100644 --- a/src/core/file_sys/patch_manager.h +++ b/src/core/file_sys/patch_manager.h @@ -26,12 +26,22 @@ class ContentProvider; class NCA; class NACP; +enum class PatchType { Update, DLC, Mod }; + +struct Patch { + bool enabled; + std::string name; + std::string version; + PatchType type; + u64 program_id; + u64 title_id; +}; + // A centralized class to manage patches to games. class PatchManager { public: using BuildID = std::array<u8, 0x20>; using Metadata = std::pair<std::unique_ptr<NACP>, VirtualFile>; - using PatchVersionNames = std::map<std::string, std::string, std::less<>>; explicit PatchManager(u64 title_id_, const Service::FileSystem::FileSystemController& fs_controller_, @@ -66,9 +76,8 @@ public: VirtualFile packed_update_raw = nullptr, bool apply_layeredfs = true) const; - // Returns a vector of pairs between patch names and patch versions. - // i.e. Update 3.2.2 will return {"Update", "3.2.2"} - [[nodiscard]] PatchVersionNames GetPatchVersionNames(VirtualFile update_raw = nullptr) const; + // Returns a vector of patches + [[nodiscard]] std::vector<Patch> GetPatches(VirtualFile update_raw = nullptr) const; // If the game update exists, returns the u32 version field in its Meta-type NCA. If that fails, // it will fallback to the Meta-type NCA of the base game. If that fails, the result will be diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 683f44e27..29a10ad13 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -11,6 +11,7 @@ #include "common/fs/path_util.h" #include "common/polyfill_ranges.h" #include "common/settings.h" +#include "common/string_util.h" #include "core/hle/service/acc/profile_manager.h" namespace Service::Account { @@ -164,6 +165,22 @@ std::optional<std::size_t> ProfileManager::GetUserIndex(const ProfileInfo& user) return GetUserIndex(user.user_uuid); } +/// Returns the first user profile seen based on username (which does not enforce uniqueness) +std::optional<std::size_t> ProfileManager::GetUserIndex(const std::string& username) const { + const auto iter = + std::find_if(profiles.begin(), profiles.end(), [&username](const ProfileInfo& p) { + const std::string profile_username = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast<const char*>(p.username.data()), p.username.size()); + + return username.compare(profile_username) == 0; + }); + if (iter == profiles.end()) { + return std::nullopt; + } + + return static_cast<std::size_t>(std::distance(profiles.begin(), iter)); +} + /// Returns the data structure used by the switch when GetProfileBase is called on acc:* bool ProfileManager::GetProfileBase(std::optional<std::size_t> index, ProfileBase& profile) const { if (!index || index >= MAX_USERS) { diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h index e21863e64..f94157300 100644 --- a/src/core/hle/service/acc/profile_manager.h +++ b/src/core/hle/service/acc/profile_manager.h @@ -70,6 +70,7 @@ public: std::optional<Common::UUID> GetUser(std::size_t index) const; std::optional<std::size_t> GetUserIndex(const Common::UUID& uuid) const; std::optional<std::size_t> GetUserIndex(const ProfileInfo& user) const; + std::optional<std::size_t> GetUserIndex(const std::string& username) const; bool GetProfileBase(std::optional<std::size_t> index, ProfileBase& profile) const; bool GetProfileBase(Common::UUID uuid, ProfileBase& profile) const; bool GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const; diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 4ce0a9834..595a3372e 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -20,12 +20,13 @@ void LoopProcess(Core::System& system) { auto server_manager = std::make_unique<ServerManager>(system); std::shared_ptr<ResourceManager> resource_manager = std::make_shared<ResourceManager>(system); std::shared_ptr<HidFirmwareSettings> firmware_settings = - std::make_shared<HidFirmwareSettings>(); + std::make_shared<HidFirmwareSettings>(system); // TODO: Remove this hack when am is emulated properly. resource_manager->Initialize(); resource_manager->RegisterAppletResourceUserId(system.ApplicationProcess()->GetProcessId(), true); + resource_manager->SetAruidValidForVibration(system.ApplicationProcess()->GetProcessId(), true); server_manager->RegisterNamedService( "hid", std::make_shared<IHidServer>(system, resource_manager, firmware_settings)); diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp index 1951da33b..30afed812 100644 --- a/src/core/hle/service/hid/hid_server.cpp +++ b/src/core/hle/service/hid/hid_server.cpp @@ -22,12 +22,16 @@ #include "hid_core/resources/mouse/mouse.h" #include "hid_core/resources/npad/npad.h" #include "hid_core/resources/npad/npad_types.h" +#include "hid_core/resources/npad/npad_vibration.h" #include "hid_core/resources/palma/palma.h" #include "hid_core/resources/six_axis/console_six_axis.h" #include "hid_core/resources/six_axis/seven_six_axis.h" #include "hid_core/resources/six_axis/six_axis.h" #include "hid_core/resources/touch_screen/gesture.h" #include "hid_core/resources/touch_screen/touch_screen.h" +#include "hid_core/resources/vibration/gc_vibration_device.h" +#include "hid_core/resources/vibration/n64_vibration_device.h" +#include "hid_core/resources/vibration/vibration_device.h" namespace Service::HID { @@ -38,7 +42,7 @@ public: : ServiceFramework{system_, "IActiveVibrationDeviceList"}, resource_manager(resource) { // clang-format off static const FunctionInfo functions[] = { - {0, &IActiveVibrationDeviceList::InitializeVibrationDevice, "InitializeVibrationDevice"}, + {0, &IActiveVibrationDeviceList::ActivateVibrationDevice, "ActivateVibrationDevice"}, }; // clang-format on @@ -46,22 +50,49 @@ public: } private: - void InitializeVibrationDevice(HLERequestContext& ctx) { + void ActivateVibrationDevice(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; - if (resource_manager != nullptr && resource_manager->GetNpad()) { - resource_manager->GetNpad()->InitializeVibrationDevice(vibration_device_handle); - } - LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}", vibration_device_handle.npad_type, vibration_device_handle.npad_id, vibration_device_handle.device_index); + const auto result = ActivateVibrationDeviceImpl(vibration_device_handle); + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } + Result ActivateVibrationDeviceImpl(const Core::HID::VibrationDeviceHandle& handle) { + std::scoped_lock lock{mutex}; + + const Result is_valid = IsVibrationHandleValid(handle); + if (is_valid.IsError()) { + return is_valid; + } + + for (std::size_t i = 0; i < list_size; i++) { + if (handle.device_index == vibration_device_list[i].device_index && + handle.npad_id == vibration_device_list[i].npad_id && + handle.npad_type == vibration_device_list[i].npad_type) { + return ResultSuccess; + } + } + if (list_size == vibration_device_list.size()) { + return ResultVibrationDeviceIndexOutOfRange; + } + const Result result = resource_manager->GetVibrationDevice(handle)->Activate(); + if (result.IsError()) { + return result; + } + vibration_device_list[list_size++] = handle; + return ResultSuccess; + } + + mutable std::mutex mutex; + std::size_t list_size{}; + std::array<Core::HID::VibrationDeviceHandle, 0x100> vibration_device_list{}; std::shared_ptr<ResourceManager> resource_manager; }; @@ -153,7 +184,7 @@ IHidServer::IHidServer(Core::System& system_, std::shared_ptr<ResourceManager> r {209, &IHidServer::BeginPermitVibrationSession, "BeginPermitVibrationSession"}, {210, &IHidServer::EndPermitVibrationSession, "EndPermitVibrationSession"}, {211, &IHidServer::IsVibrationDeviceMounted, "IsVibrationDeviceMounted"}, - {212, nullptr, "SendVibrationValueInBool"}, + {212, &IHidServer::SendVibrationValueInBool, "SendVibrationValueInBool"}, {300, &IHidServer::ActivateConsoleSixAxisSensor, "ActivateConsoleSixAxisSensor"}, {301, &IHidServer::StartConsoleSixAxisSensor, "StartConsoleSixAxisSensor"}, {302, &IHidServer::StopConsoleSixAxisSensor, "StopConsoleSixAxisSensor"}, @@ -1492,59 +1523,13 @@ void IHidServer::ClearNpadCaptureButtonAssignment(HLERequestContext& ctx) { void IHidServer::GetVibrationDeviceInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; - const auto controller = GetResourceManager()->GetNpad(); - - Core::HID::VibrationDeviceInfo vibration_device_info; - bool check_device_index = false; - - switch (vibration_device_handle.npad_type) { - case Core::HID::NpadStyleIndex::Fullkey: - case Core::HID::NpadStyleIndex::Handheld: - case Core::HID::NpadStyleIndex::JoyconDual: - case Core::HID::NpadStyleIndex::JoyconLeft: - case Core::HID::NpadStyleIndex::JoyconRight: - vibration_device_info.type = Core::HID::VibrationDeviceType::LinearResonantActuator; - check_device_index = true; - break; - case Core::HID::NpadStyleIndex::GameCube: - vibration_device_info.type = Core::HID::VibrationDeviceType::GcErm; - break; - case Core::HID::NpadStyleIndex::N64: - vibration_device_info.type = Core::HID::VibrationDeviceType::N64; - break; - default: - vibration_device_info.type = Core::HID::VibrationDeviceType::Unknown; - break; - } - - vibration_device_info.position = Core::HID::VibrationDevicePosition::None; - if (check_device_index) { - switch (vibration_device_handle.device_index) { - case Core::HID::DeviceIndex::Left: - vibration_device_info.position = Core::HID::VibrationDevicePosition::Left; - break; - case Core::HID::DeviceIndex::Right: - vibration_device_info.position = Core::HID::VibrationDevicePosition::Right; - break; - case Core::HID::DeviceIndex::None: - default: - ASSERT_MSG(false, "DeviceIndex should never be None!"); - break; - } - } - LOG_DEBUG(Service_HID, "called, vibration_device_type={}, vibration_device_position={}", - vibration_device_info.type, vibration_device_info.position); - - const auto result = IsVibrationHandleValid(vibration_device_handle); - if (result.IsError()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); - return; - } + Core::HID::VibrationDeviceInfo vibration_device_info{}; + const auto result = GetResourceManager()->GetVibrationDeviceInfo(vibration_device_info, + vibration_device_handle); IPC::ResponseBuilder rb{ctx, 4}; - rb.Push(ResultSuccess); + rb.Push(result); rb.PushRaw(vibration_device_info); } @@ -1560,16 +1545,16 @@ void IHidServer::SendVibrationValue(HLERequestContext& ctx) { const auto parameters{rp.PopRaw<Parameters>()}; - GetResourceManager()->GetNpad()->VibrateController(parameters.applet_resource_user_id, - parameters.vibration_device_handle, - parameters.vibration_value); - LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}", parameters.vibration_device_handle.npad_type, parameters.vibration_device_handle.npad_id, parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id); + GetResourceManager()->SendVibrationValue(parameters.applet_resource_user_id, + parameters.vibration_device_handle, + parameters.vibration_value); + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } @@ -1591,10 +1576,28 @@ void IHidServer::GetActualVibrationValue(HLERequestContext& ctx) { parameters.vibration_device_handle.npad_id, parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id); + bool has_active_aruid{}; + NpadVibrationDevice* device{nullptr}; + Core::HID::VibrationValue vibration_value{}; + Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id, + has_active_aruid); + + if (result.IsSuccess() && has_active_aruid) { + result = IsVibrationHandleValid(parameters.vibration_device_handle); + } + if (result.IsSuccess() && has_active_aruid) { + device = GetResourceManager()->GetNSVibrationDevice(parameters.vibration_device_handle); + } + if (device != nullptr) { + result = device->GetActualVibrationValue(vibration_value); + } + if (result.IsError()) { + vibration_value = Core::HID::DEFAULT_VIBRATION_VALUE; + } + IPC::ResponseBuilder rb{ctx, 6}; rb.Push(ResultSuccess); - rb.PushRaw(GetResourceManager()->GetNpad()->GetLastVibration( - parameters.applet_resource_user_id, parameters.vibration_device_handle)); + rb.PushRaw(vibration_value); } void IHidServer::CreateActiveVibrationDeviceList(HLERequestContext& ctx) { @@ -1609,25 +1612,27 @@ void IHidServer::PermitVibration(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto can_vibrate{rp.Pop<bool>()}; - // nnSDK saves this value as a float. Since it can only be 1.0f or 0.0f we simplify this value - // by converting it to a bool - Settings::values.vibration_enabled.SetValue(can_vibrate); - LOG_DEBUG(Service_HID, "called, can_vibrate={}", can_vibrate); + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->SetVibrationMasterVolume( + can_vibrate ? 1.0f : 0.0f); + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void IHidServer::IsVibrationPermitted(HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called"); - // nnSDK checks if a float is greater than zero. We return the bool we stored earlier - const auto is_enabled = Settings::values.vibration_enabled.GetValue(); + f32 master_volume{}; + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->GetVibrationMasterVolume( + master_volume); IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.Push(is_enabled); + rb.Push(result); + rb.Push(master_volume > 0.0f); } void IHidServer::SendVibrationValues(HLERequestContext& ctx) { @@ -1645,13 +1650,22 @@ void IHidServer::SendVibrationValues(HLERequestContext& ctx) { auto vibration_values = std::span( reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count); - GetResourceManager()->GetNpad()->VibrateControllers(applet_resource_user_id, - vibration_device_handles, vibration_values); - LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); + Result result = ResultSuccess; + if (handle_count != vibration_count) { + result = ResultVibrationArraySizeMismatch; + } + + for (std::size_t i = 0; i < handle_count; i++) { + if (result.IsSuccess()) { + result = GetResourceManager()->SendVibrationValue( + applet_resource_user_id, vibration_device_handles[i], vibration_values[i]); + } + } + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) { @@ -1666,43 +1680,6 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) { const auto parameters{rp.PopRaw<Parameters>()}; - /** - * Note: This uses yuzu-specific behavior such that the StopHard command produces - * vibrations where freq_low == 0.0f and freq_high == 0.0f, as defined below, - * in order to differentiate between Stop and StopHard commands. - * This is done to reuse the controller vibration functions made for regular controllers. - */ - const auto vibration_value = [parameters] { - switch (parameters.gc_erm_command) { - case Core::HID::VibrationGcErmCommand::Stop: - return Core::HID::VibrationValue{ - .low_amplitude = 0.0f, - .low_frequency = 160.0f, - .high_amplitude = 0.0f, - .high_frequency = 320.0f, - }; - case Core::HID::VibrationGcErmCommand::Start: - return Core::HID::VibrationValue{ - .low_amplitude = 1.0f, - .low_frequency = 160.0f, - .high_amplitude = 1.0f, - .high_frequency = 320.0f, - }; - case Core::HID::VibrationGcErmCommand::StopHard: - return Core::HID::VibrationValue{ - .low_amplitude = 0.0f, - .low_frequency = 0.0f, - .high_amplitude = 0.0f, - .high_frequency = 0.0f, - }; - default: - return Core::HID::DEFAULT_VIBRATION_VALUE; - } - }(); - - GetResourceManager()->GetNpad()->VibrateController( - parameters.applet_resource_user_id, parameters.vibration_device_handle, vibration_value); - LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}, " "gc_erm_command={}", @@ -1711,8 +1688,23 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) { parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id, parameters.gc_erm_command); + bool has_active_aruid{}; + NpadGcVibrationDevice* gc_device{nullptr}; + Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id, + has_active_aruid); + + if (result.IsSuccess() && has_active_aruid) { + result = IsVibrationHandleValid(parameters.vibration_device_handle); + } + if (result.IsSuccess() && has_active_aruid) { + gc_device = GetResourceManager()->GetGcVibrationDevice(parameters.vibration_device_handle); + } + if (gc_device != nullptr) { + result = gc_device->SendVibrationGcErmCommand(parameters.gc_erm_command); + } + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) { @@ -1725,33 +1717,31 @@ void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) { const auto parameters{rp.PopRaw<Parameters>()}; - const auto last_vibration = GetResourceManager()->GetNpad()->GetLastVibration( - parameters.applet_resource_user_id, parameters.vibration_device_handle); - - const auto gc_erm_command = [last_vibration] { - if (last_vibration.low_amplitude != 0.0f || last_vibration.high_amplitude != 0.0f) { - return Core::HID::VibrationGcErmCommand::Start; - } - - /** - * Note: This uses yuzu-specific behavior such that the StopHard command produces - * vibrations where freq_low == 0.0f and freq_high == 0.0f, as defined in the HID function - * SendVibrationGcErmCommand, in order to differentiate between Stop and StopHard commands. - * This is done to reuse the controller vibration functions made for regular controllers. - */ - if (last_vibration.low_frequency == 0.0f && last_vibration.high_frequency == 0.0f) { - return Core::HID::VibrationGcErmCommand::StopHard; - } - - return Core::HID::VibrationGcErmCommand::Stop; - }(); - LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}", parameters.vibration_device_handle.npad_type, parameters.vibration_device_handle.npad_id, parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id); + bool has_active_aruid{}; + NpadGcVibrationDevice* gc_device{nullptr}; + Core::HID::VibrationGcErmCommand gc_erm_command{}; + Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id, + has_active_aruid); + + if (result.IsSuccess() && has_active_aruid) { + result = IsVibrationHandleValid(parameters.vibration_device_handle); + } + if (result.IsSuccess() && has_active_aruid) { + gc_device = GetResourceManager()->GetGcVibrationDevice(parameters.vibration_device_handle); + } + if (gc_device != nullptr) { + result = gc_device->GetActualVibrationGcErmCommand(gc_erm_command); + } + if (result.IsError()) { + gc_erm_command = Core::HID::VibrationGcErmCommand::Stop; + } + IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.PushEnum(gc_erm_command); @@ -1761,21 +1751,24 @@ void IHidServer::BeginPermitVibrationSession(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop<u64>()}; - GetResourceManager()->GetNpad()->SetPermitVibrationSession(true); - LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->BeginPermitVibrationSession( + applet_resource_user_id); + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void IHidServer::EndPermitVibrationSession(HLERequestContext& ctx) { - GetResourceManager()->GetNpad()->SetPermitVibrationSession(false); - LOG_DEBUG(Service_HID, "called"); + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->EndPermitVibrationSession(); + IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) { @@ -1795,10 +1788,61 @@ void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) { parameters.vibration_device_handle.npad_id, parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id); + bool is_mounted{}; + NpadVibrationBase* device{nullptr}; + Result result = IsVibrationHandleValid(parameters.vibration_device_handle); + + if (result.IsSuccess()) { + device = GetResourceManager()->GetVibrationDevice(parameters.vibration_device_handle); + } + + if (device != nullptr) { + is_mounted = device->IsVibrationMounted(); + } + IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.Push(GetResourceManager()->GetNpad()->IsVibrationDeviceMounted( - parameters.applet_resource_user_id, parameters.vibration_device_handle)); + rb.Push(result); + rb.Push(is_mounted); +} + +void IHidServer::SendVibrationValueInBool(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + struct Parameters { + Core::HID::VibrationDeviceHandle vibration_device_handle; + INSERT_PADDING_WORDS_NOINIT(1); + u64 applet_resource_user_id; + bool is_vibrating; + }; + static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size."); + + const auto parameters{rp.PopRaw<Parameters>()}; + + LOG_DEBUG(Service_HID, + "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}, " + "is_vibrating={}", + parameters.vibration_device_handle.npad_type, + parameters.vibration_device_handle.npad_id, + parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id, + parameters.is_vibrating); + + bool has_active_aruid{}; + NpadN64VibrationDevice* n64_device{nullptr}; + Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id, + has_active_aruid); + + if (result.IsSuccess() && has_active_aruid) { + result = IsVibrationHandleValid(parameters.vibration_device_handle); + } + if (result.IsSuccess() && has_active_aruid) { + n64_device = + GetResourceManager()->GetN64VibrationDevice(parameters.vibration_device_handle); + } + if (n64_device != nullptr) { + result = n64_device->SendValueInBool(parameters.is_vibrating); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); } void IHidServer::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) { diff --git a/src/core/hle/service/hid/hid_server.h b/src/core/hle/service/hid/hid_server.h index cc7c4ebdd..3a2e0a230 100644 --- a/src/core/hle/service/hid/hid_server.h +++ b/src/core/hle/service/hid/hid_server.h @@ -97,6 +97,7 @@ private: void BeginPermitVibrationSession(HLERequestContext& ctx); void EndPermitVibrationSession(HLERequestContext& ctx); void IsVibrationDeviceMounted(HLERequestContext& ctx); + void SendVibrationValueInBool(HLERequestContext& ctx); void ActivateConsoleSixAxisSensor(HLERequestContext& ctx); void StartConsoleSixAxisSensor(HLERequestContext& ctx); void StopConsoleSixAxisSensor(HLERequestContext& ctx); diff --git a/src/core/hle/service/hid/hid_system_server.cpp b/src/core/hle/service/hid/hid_system_server.cpp index 3a0cb3cb1..bf27ddfbf 100644 --- a/src/core/hle/service/hid/hid_system_server.cpp +++ b/src/core/hle/service/hid/hid_system_server.cpp @@ -7,6 +7,7 @@ #include "hid_core/resource_manager.h" #include "hid_core/resources/npad/npad.h" #include "hid_core/resources/npad/npad_types.h" +#include "hid_core/resources/npad/npad_vibration.h" #include "hid_core/resources/palma/palma.h" #include "hid_core/resources/touch_screen/touch_screen.h" @@ -67,14 +68,14 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour {501, &IHidSystemServer::RegisterAppletResourceUserId, "RegisterAppletResourceUserId"}, {502, &IHidSystemServer::UnregisterAppletResourceUserId, "UnregisterAppletResourceUserId"}, {503, &IHidSystemServer::EnableAppletToGetInput, "EnableAppletToGetInput"}, - {504, nullptr, "SetAruidValidForVibration"}, + {504, &IHidSystemServer::SetAruidValidForVibration, "SetAruidValidForVibration"}, {505, &IHidSystemServer::EnableAppletToGetSixAxisSensor, "EnableAppletToGetSixAxisSensor"}, {506, &IHidSystemServer::EnableAppletToGetPadInput, "EnableAppletToGetPadInput"}, {507, &IHidSystemServer::EnableAppletToGetTouchScreen, "EnableAppletToGetTouchScreen"}, - {510, nullptr, "SetVibrationMasterVolume"}, - {511, nullptr, "GetVibrationMasterVolume"}, - {512, nullptr, "BeginPermitVibrationSession"}, - {513, nullptr, "EndPermitVibrationSession"}, + {510, &IHidSystemServer::SetVibrationMasterVolume, "SetVibrationMasterVolume"}, + {511, &IHidSystemServer::GetVibrationMasterVolume, "GetVibrationMasterVolume"}, + {512, &IHidSystemServer::BeginPermitVibrationSession, "BeginPermitVibrationSession"}, + {513, &IHidSystemServer::EndPermitVibrationSession, "EndPermitVibrationSession"}, {514, nullptr, "Unknown514"}, {520, nullptr, "EnableHandheldHids"}, {521, nullptr, "DisableHandheldHids"}, @@ -156,7 +157,7 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour {1152, nullptr, "SetTouchScreenDefaultConfiguration"}, {1153, &IHidSystemServer::GetTouchScreenDefaultConfiguration, "GetTouchScreenDefaultConfiguration"}, {1154, nullptr, "IsFirmwareAvailableForNotification"}, - {1155, nullptr, "SetForceHandheldStyleVibration"}, + {1155, &IHidSystemServer::SetForceHandheldStyleVibration, "SetForceHandheldStyleVibration"}, {1156, nullptr, "SendConnectionTriggerWithoutTimeoutEvent"}, {1157, nullptr, "CancelConnectionTrigger"}, {1200, nullptr, "IsButtonConfigSupported"}, @@ -532,7 +533,28 @@ void IHidSystemServer::EnableAppletToGetInput(HLERequestContext& ctx) { parameters.is_enabled, parameters.applet_resource_user_id); GetResourceManager()->EnableInput(parameters.applet_resource_user_id, parameters.is_enabled); - // GetResourceManager()->GetNpad()->EnableInput(parameters.applet_resource_user_id); + GetResourceManager()->GetNpad()->EnableAppletToGetInput(parameters.applet_resource_user_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + +void IHidSystemServer::SetAruidValidForVibration(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + struct Parameters { + bool is_enabled; + INSERT_PADDING_WORDS_NOINIT(1); + u64 applet_resource_user_id; + }; + static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); + + const auto parameters{rp.PopRaw<Parameters>()}; + + LOG_INFO(Service_HID, "called, is_enabled={}, applet_resource_user_id={}", + parameters.is_enabled, parameters.applet_resource_user_id); + + GetResourceManager()->SetAruidValidForVibration(parameters.applet_resource_user_id, + parameters.is_enabled); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -574,7 +596,7 @@ void IHidSystemServer::EnableAppletToGetPadInput(HLERequestContext& ctx) { parameters.is_enabled, parameters.applet_resource_user_id); GetResourceManager()->EnablePadInput(parameters.applet_resource_user_id, parameters.is_enabled); - // GetResourceManager()->GetNpad()->EnableInput(parameters.applet_resource_user_id); + GetResourceManager()->GetNpad()->EnableAppletToGetInput(parameters.applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -601,6 +623,57 @@ void IHidSystemServer::EnableAppletToGetTouchScreen(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void IHidSystemServer::SetVibrationMasterVolume(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto master_volume{rp.Pop<f32>()}; + + LOG_INFO(Service_HID, "called, volume={}", master_volume); + + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->SetVibrationMasterVolume( + master_volume); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void IHidSystemServer::GetVibrationMasterVolume(HLERequestContext& ctx) { + f32 master_volume{}; + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->GetVibrationMasterVolume( + master_volume); + + LOG_INFO(Service_HID, "called, volume={}", master_volume); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(result); + rb.Push(master_volume); +} + +void IHidSystemServer::BeginPermitVibrationSession(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto applet_resource_user_id{rp.Pop<u64>()}; + + LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); + + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->BeginPermitVibrationSession( + applet_resource_user_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void IHidSystemServer::EndPermitVibrationSession(HLERequestContext& ctx) { + LOG_INFO(Service_HID, "called"); + + const auto result = + GetResourceManager()->GetNpad()->GetVibrationHandler()->EndPermitVibrationSession(); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + void IHidSystemServer::IsJoyConAttachedOnAllRail(HLERequestContext& ctx) { const bool is_attached = true; @@ -749,6 +822,19 @@ void IHidSystemServer::GetTouchScreenDefaultConfiguration(HLERequestContext& ctx rb.PushRaw(touchscreen_config); } +void IHidSystemServer::SetForceHandheldStyleVibration(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto is_forced{rp.Pop<bool>()}; + + LOG_INFO(Service_HID, "called, is_forced={}", is_forced); + + GetResourceManager()->SetForceHandheldStyleVibration(is_forced); + GetResourceManager()->GetNpad()->UpdateHandheldAbstractState(); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void IHidSystemServer::IsUsingCustomButtonConfig(HLERequestContext& ctx) { const bool is_enabled = false; diff --git a/src/core/hle/service/hid/hid_system_server.h b/src/core/hle/service/hid/hid_system_server.h index 0c2634e3f..90a719f02 100644 --- a/src/core/hle/service/hid/hid_system_server.h +++ b/src/core/hle/service/hid/hid_system_server.h @@ -42,9 +42,14 @@ private: void RegisterAppletResourceUserId(HLERequestContext& ctx); void UnregisterAppletResourceUserId(HLERequestContext& ctx); void EnableAppletToGetInput(HLERequestContext& ctx); + void SetAruidValidForVibration(HLERequestContext& ctx); void EnableAppletToGetSixAxisSensor(HLERequestContext& ctx); void EnableAppletToGetPadInput(HLERequestContext& ctx); void EnableAppletToGetTouchScreen(HLERequestContext& ctx); + void SetVibrationMasterVolume(HLERequestContext& ctx); + void GetVibrationMasterVolume(HLERequestContext& ctx); + void BeginPermitVibrationSession(HLERequestContext& ctx); + void EndPermitVibrationSession(HLERequestContext& ctx); void IsJoyConAttachedOnAllRail(HLERequestContext& ctx); void AcquireConnectionTriggerTimeoutEvent(HLERequestContext& ctx); void AcquireDeviceRegisteredEventForControllerSupport(HLERequestContext& ctx); @@ -61,6 +66,7 @@ private: void FinalizeUsbFirmwareUpdate(HLERequestContext& ctx); void InitializeUsbFirmwareUpdateWithoutMemory(HLERequestContext& ctx); void GetTouchScreenDefaultConfiguration(HLERequestContext& ctx); + void SetForceHandheldStyleVibration(HLERequestContext& ctx); void IsUsingCustomButtonConfig(HLERequestContext& ctx); std::shared_ptr<ResourceManager> GetResourceManager(); diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 31cc87acc..cc7776efc 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -441,7 +441,10 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target device_state = DeviceState::TagMounted; mount_target = mount_target_; - if (!is_corrupted && mount_target != NFP::MountTarget::Rom) { + const bool create_backup = + mount_target == NFP::MountTarget::All || mount_target == NFP::MountTarget::Ram || + (mount_target == NFP::MountTarget::Rom && HasBackup(encrypted_tag_data.uuid).IsError()); + if (!is_corrupted && create_backup) { std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File)); memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); WriteBackupData(encrypted_tag_data.uuid, data); diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp index 423b9aef1..71d6fdb0c 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.cpp +++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp @@ -112,9 +112,7 @@ void Nvnflinger::ShutdownLayers() { { const auto lock_guard = Lock(); for (auto& display : displays) { - for (size_t layer = 0; layer < display.GetNumLayers(); ++layer) { - display.GetLayer(layer).GetConsumer().Abandon(); - } + display.Abandon(); } is_abandoned = true; @@ -176,24 +174,28 @@ void Nvnflinger::CreateLayerAtId(VI::Display& display, u64 layer_id) { display.CreateLayer(layer_id, buffer_id, nvdrv->container); } -void Nvnflinger::OpenLayer(u64 layer_id) { +bool Nvnflinger::OpenLayer(u64 layer_id) { const auto lock_guard = Lock(); for (auto& display : displays) { if (auto* layer = display.FindLayer(layer_id); layer) { - layer->Open(); + return layer->Open(); } } + + return false; } -void Nvnflinger::CloseLayer(u64 layer_id) { +bool Nvnflinger::CloseLayer(u64 layer_id) { const auto lock_guard = Lock(); for (auto& display : displays) { if (auto* layer = display.FindLayer(layer_id); layer) { - layer->Close(); + return layer->Close(); } } + + return false; } void Nvnflinger::DestroyLayer(u64 layer_id) { diff --git a/src/core/hle/service/nvnflinger/nvnflinger.h b/src/core/hle/service/nvnflinger/nvnflinger.h index 871285764..a60e0ae6b 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.h +++ b/src/core/hle/service/nvnflinger/nvnflinger.h @@ -74,10 +74,10 @@ public: [[nodiscard]] std::optional<u64> CreateLayer(u64 display_id); /// Opens a layer on all displays for the given layer ID. - void OpenLayer(u64 layer_id); + bool OpenLayer(u64 layer_id); /// Closes a layer on all displays for the given layer ID. - void CloseLayer(u64 layer_id); + bool CloseLayer(u64 layer_id); /// Destroys the given layer ID. void DestroyLayer(u64 layer_id); diff --git a/src/core/hle/service/set/private_settings.h b/src/core/hle/service/set/private_settings.h deleted file mode 100644 index b63eaf45c..000000000 --- a/src/core/hle/service/set/private_settings.h +++ /dev/null @@ -1,72 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include <array> - -#include "common/bit_field.h" -#include "common/common_funcs.h" -#include "common/common_types.h" -#include "common/uuid.h" -#include "core/hle/service/time/clock_types.h" - -namespace Service::Set { - -/// This is nn::settings::system::InitialLaunchFlag -struct InitialLaunchFlag { - union { - u32 raw{}; - - BitField<0, 1, u32> InitialLaunchCompletionFlag; - BitField<8, 1, u32> InitialLaunchUserAdditionFlag; - BitField<16, 1, u32> InitialLaunchTimestampFlag; - }; -}; -static_assert(sizeof(InitialLaunchFlag) == 4, "InitialLaunchFlag is an invalid size"); - -/// This is nn::settings::system::InitialLaunchSettings -struct InitialLaunchSettings { - InitialLaunchFlag flags; - INSERT_PADDING_BYTES(0x4); - Service::Time::Clock::SteadyClockTimePoint timestamp; -}; -static_assert(sizeof(InitialLaunchSettings) == 0x20, "InitialLaunchSettings is incorrect size"); - -#pragma pack(push, 4) -struct InitialLaunchSettingsPacked { - InitialLaunchFlag flags; - Service::Time::Clock::SteadyClockTimePoint timestamp; -}; -#pragma pack(pop) -static_assert(sizeof(InitialLaunchSettingsPacked) == 0x1C, - "InitialLaunchSettingsPacked is incorrect size"); - -struct PrivateSettings { - std::array<u8, 0x10> reserved_00; - - // nn::settings::system::InitialLaunchSettings - InitialLaunchSettings initial_launch_settings; - - std::array<u8, 0x20> reserved_30; - - Common::UUID external_clock_source_id; - s64 shutdown_rtc_value; - s64 external_steady_clock_internal_offset; - - std::array<u8, 0x60> reserved_70; - - // nn::settings::system::PlatformRegion - std::array<u8, 0x4> platform_region; - - std::array<u8, 0x4> reserved_D4; -}; -static_assert(offsetof(PrivateSettings, initial_launch_settings) == 0x10); -static_assert(offsetof(PrivateSettings, external_clock_source_id) == 0x50); -static_assert(offsetof(PrivateSettings, reserved_70) == 0x70); -static_assert(offsetof(PrivateSettings, platform_region) == 0xD0); -static_assert(sizeof(PrivateSettings) == 0xD8, "PrivateSettings has the wrong size!"); - -PrivateSettings DefaultPrivateSettings(); - -} // namespace Service::Set diff --git a/src/core/hle/service/set/appln_settings.cpp b/src/core/hle/service/set/setting_formats/appln_settings.cpp index a5d802757..f7c7d5b91 100644 --- a/src/core/hle/service/set/appln_settings.cpp +++ b/src/core/hle/service/set/setting_formats/appln_settings.cpp @@ -1,12 +1,16 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/appln_settings.h" +#include "core/hle/service/set/setting_formats/appln_settings.h" namespace Service::Set { ApplnSettings DefaultApplnSettings() { - return {}; + ApplnSettings settings{}; + + settings.mii_author_id = Common::UUID::MakeDefault(); + + return settings; } } // namespace Service::Set diff --git a/src/core/hle/service/set/appln_settings.h b/src/core/hle/service/set/setting_formats/appln_settings.h index 126375860..ba9af998a 100644 --- a/src/core/hle/service/set/appln_settings.h +++ b/src/core/hle/service/set/setting_formats/appln_settings.h @@ -7,24 +7,23 @@ #include <cstddef> #include "common/common_types.h" +#include "common/uuid.h" +#include "core/hle/service/set/settings_types.h" namespace Service::Set { struct ApplnSettings { - std::array<u8, 0x10> reserved_000; + INSERT_PADDING_BYTES(0x10); // Reserved // nn::util::Uuid MiiAuthorId, copied from system settings 0x94B0 - std::array<u8, 0x10> mii_author_id; - - std::array<u8, 0x30> reserved_020; + Common::UUID mii_author_id; + INSERT_PADDING_BYTES(0x30); // Reserved // nn::settings::system::ServiceDiscoveryControlSettings - std::array<u8, 0x4> service_discovery_control_settings; - - std::array<u8, 0x20> reserved_054; + u32 service_discovery_control_settings; + INSERT_PADDING_BYTES(0x20); // Reserved bool in_repair_process_enable_flag; - - std::array<u8, 0x3> pad_075; + INSERT_PADDING_BYTES(0x3); }; static_assert(offsetof(ApplnSettings, mii_author_id) == 0x10); static_assert(offsetof(ApplnSettings, service_discovery_control_settings) == 0x50); diff --git a/src/core/hle/service/set/device_settings.cpp b/src/core/hle/service/set/setting_formats/device_settings.cpp index e423ce38a..5f295404d 100644 --- a/src/core/hle/service/set/device_settings.cpp +++ b/src/core/hle/service/set/setting_formats/device_settings.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/device_settings.h" +#include "core/hle/service/set/setting_formats/device_settings.h" namespace Service::Set { diff --git a/src/core/hle/service/set/device_settings.h b/src/core/hle/service/set/setting_formats/device_settings.h index f291d0ebe..2827756f6 100644 --- a/src/core/hle/service/set/device_settings.h +++ b/src/core/hle/service/set/setting_formats/device_settings.h @@ -7,10 +7,12 @@ #include <cstddef> #include "common/common_types.h" +#include "common/vector_math.h" +#include "core/hle/service/set/settings_types.h" namespace Service::Set { struct DeviceSettings { - std::array<u8, 0x10> reserved_000; + INSERT_PADDING_BYTES(0x10); // Reserved // nn::settings::BatteryLot std::array<u8, 0x18> ptm_battery_lot; @@ -19,26 +21,24 @@ struct DeviceSettings { u8 ptm_battery_version; // nn::settings::system::PtmCycleCountReliability u32 ptm_cycle_count_reliability; - - std::array<u8, 0x48> reserved_048; + INSERT_PADDING_BYTES(0x48); // Reserved // nn::settings::system::AnalogStickUserCalibration L std::array<u8, 0x10> analog_user_stick_calibration_l; // nn::settings::system::AnalogStickUserCalibration R std::array<u8, 0x10> analog_user_stick_calibration_r; - - std::array<u8, 0x20> reserved_0B0; + INSERT_PADDING_BYTES(0x20); // Reserved // nn::settings::system::ConsoleSixAxisSensorAccelerationBias - std::array<u8, 0xC> console_six_axis_sensor_acceleration_bias; + Common::Vec3<f32> console_six_axis_sensor_acceleration_bias; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityBias - std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_bias; + Common::Vec3<f32> console_six_axis_sensor_angular_velocity_bias; // nn::settings::system::ConsoleSixAxisSensorAccelerationGain std::array<u8, 0x24> console_six_axis_sensor_acceleration_gain; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityGain std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_gain; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityTimeBias - std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_time_bias; + Common::Vec3<f32> console_six_axis_sensor_angular_velocity_time_bias; // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration std::array<u8, 0x24> console_six_axis_sensor_angular_acceleration; }; diff --git a/src/core/hle/service/set/private_settings.cpp b/src/core/hle/service/set/setting_formats/private_settings.cpp index 70bf65727..81c362482 100644 --- a/src/core/hle/service/set/private_settings.cpp +++ b/src/core/hle/service/set/setting_formats/private_settings.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/private_settings.h" +#include "core/hle/service/set/setting_formats/private_settings.h" namespace Service::Set { diff --git a/src/core/hle/service/set/setting_formats/private_settings.h b/src/core/hle/service/set/setting_formats/private_settings.h new file mode 100644 index 000000000..6c40f62e1 --- /dev/null +++ b/src/core/hle/service/set/setting_formats/private_settings.h @@ -0,0 +1,39 @@ +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include <array> + +#include "common/common_types.h" +#include "common/uuid.h" +#include "core/hle/service/set/settings_types.h" +#include "core/hle/service/time/clock_types.h" + +namespace Service::Set { + +struct PrivateSettings { + INSERT_PADDING_BYTES(0x10); // Reserved + + InitialLaunchSettings initial_launch_settings; + INSERT_PADDING_BYTES(0x20); // Reserved + + Common::UUID external_clock_source_id; + s64 shutdown_rtc_value; + s64 external_steady_clock_internal_offset; + INSERT_PADDING_BYTES(0x60); // Reserved + + // nn::settings::system::PlatformRegion + s32 platform_region; + INSERT_PADDING_BYTES(0x4); // Reserved +}; +static_assert(offsetof(PrivateSettings, initial_launch_settings) == 0x10); +static_assert(offsetof(PrivateSettings, external_clock_source_id) == 0x50); +static_assert(offsetof(PrivateSettings, shutdown_rtc_value) == 0x60); +static_assert(offsetof(PrivateSettings, external_steady_clock_internal_offset) == 0x68); +static_assert(offsetof(PrivateSettings, platform_region) == 0xD0); +static_assert(sizeof(PrivateSettings) == 0xD8, "PrivateSettings has the wrong size!"); + +PrivateSettings DefaultPrivateSettings(); + +} // namespace Service::Set diff --git a/src/core/hle/service/set/system_settings.cpp b/src/core/hle/service/set/setting_formats/system_settings.cpp index 5977429b2..66e57651e 100644 --- a/src/core/hle/service/set/system_settings.cpp +++ b/src/core/hle/service/set/setting_formats/system_settings.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/system_settings.h" +#include "core/hle/service/set/setting_formats/system_settings.h" namespace Service::Set { @@ -11,6 +11,8 @@ SystemSettings DefaultSystemSettings() { settings.version = 0x140000; settings.flags = 7; + settings.mii_author_id = Common::UUID::MakeDefault(); + settings.color_set_id = ColorSet::BasicWhite; settings.notification_settings = { @@ -45,6 +47,10 @@ SystemSettings DefaultSystemSettings() { settings.device_time_zone_location_name = {"UTC"}; settings.user_system_clock_automatic_correction_enabled = false; + settings.primary_album_storage = PrimaryAlbumStorage::SdCard; + settings.battery_percentage_flag = true; + settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0; + return settings; } diff --git a/src/core/hle/service/set/system_settings.h b/src/core/hle/service/set/setting_formats/system_settings.h index 6ec9e71e7..14654f8b1 100644 --- a/src/core/hle/service/set/system_settings.h +++ b/src/core/hle/service/set/setting_formats/system_settings.h @@ -8,272 +8,14 @@ #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/service/set/private_settings.h" +#include "common/uuid.h" +#include "common/vector_math.h" +#include "core/hle/service/set/setting_formats/private_settings.h" +#include "core/hle/service/set/settings_types.h" #include "core/hle/service/time/clock_types.h" namespace Service::Set { -/// This is "nn::settings::LanguageCode", which is a NUL-terminated string stored in a u64. -enum class LanguageCode : u64 { - JA = 0x000000000000616A, - EN_US = 0x00000053552D6E65, - FR = 0x0000000000007266, - DE = 0x0000000000006564, - IT = 0x0000000000007469, - ES = 0x0000000000007365, - ZH_CN = 0x0000004E432D687A, - KO = 0x0000000000006F6B, - NL = 0x0000000000006C6E, - PT = 0x0000000000007470, - RU = 0x0000000000007572, - ZH_TW = 0x00000057542D687A, - EN_GB = 0x00000042472D6E65, - FR_CA = 0x00000041432D7266, - ES_419 = 0x00003931342D7365, - ZH_HANS = 0x00736E61482D687A, - ZH_HANT = 0x00746E61482D687A, - PT_BR = 0x00000052422D7470, -}; - -/// This is nn::settings::system::ErrorReportSharePermission -enum class ErrorReportSharePermission : u32 { - NotConfirmed, - Granted, - Denied, -}; - -/// This is nn::settings::system::ChineseTraditionalInputMethod -enum class ChineseTraditionalInputMethod : u32 { - Unknown0 = 0, - Unknown1 = 1, - Unknown2 = 2, -}; - -/// This is nn::settings::system::HomeMenuScheme -struct HomeMenuScheme { - u32 main; - u32 back; - u32 sub; - u32 bezel; - u32 extra; -}; -static_assert(sizeof(HomeMenuScheme) == 0x14, "HomeMenuScheme is incorrect size"); - -/// Indicates the current theme set by the system settings -enum class ColorSet : u32 { - BasicWhite = 0, - BasicBlack = 1, -}; - -/// Indicates the current console is a retail or kiosk unit -enum class QuestFlag : u8 { - Retail = 0, - Kiosk = 1, -}; - -/// This is nn::settings::system::RegionCode -enum class RegionCode : u32 { - Japan, - Usa, - Europe, - Australia, - HongKongTaiwanKorea, - China, -}; - -/// This is nn::settings::system::AccountSettings -struct AccountSettings { - u32 flags; -}; -static_assert(sizeof(AccountSettings) == 4, "AccountSettings is an invalid size"); - -/// This is nn::settings::system::NotificationVolume -enum class NotificationVolume : u32 { - Mute, - Low, - High, -}; - -/// This is nn::settings::system::NotificationFlag -struct NotificationFlag { - union { - u32 raw{}; - - BitField<0, 1, u32> RingtoneFlag; - BitField<1, 1, u32> DownloadCompletionFlag; - BitField<8, 1, u32> EnablesNews; - BitField<9, 1, u32> IncomingLampFlag; - }; -}; -static_assert(sizeof(NotificationFlag) == 4, "NotificationFlag is an invalid size"); - -/// This is nn::settings::system::NotificationTime -struct NotificationTime { - u32 hour; - u32 minute; -}; -static_assert(sizeof(NotificationTime) == 0x8, "NotificationTime is an invalid size"); - -/// This is nn::settings::system::NotificationSettings -struct NotificationSettings { - NotificationFlag flags; - NotificationVolume volume; - NotificationTime start_time; - NotificationTime stop_time; -}; -static_assert(sizeof(NotificationSettings) == 0x18, "NotificationSettings is an invalid size"); - -/// This is nn::settings::system::AccountNotificationFlag -struct AccountNotificationFlag { - union { - u32 raw{}; - - BitField<0, 1, u32> FriendOnlineFlag; - BitField<1, 1, u32> FriendRequestFlag; - BitField<8, 1, u32> CoralInvitationFlag; - }; -}; -static_assert(sizeof(AccountNotificationFlag) == 4, "AccountNotificationFlag is an invalid size"); - -/// This is nn::settings::system::FriendPresenceOverlayPermission -enum class FriendPresenceOverlayPermission : u8 { - NotConfirmed, - NoDisplay, - FavoriteFriends, - Friends, -}; - -/// This is nn::settings::system::AccountNotificationSettings -struct AccountNotificationSettings { - Common::UUID uid; - AccountNotificationFlag flags; - FriendPresenceOverlayPermission friend_presence_permission; - FriendPresenceOverlayPermission friend_invitation_permission; - INSERT_PADDING_BYTES(0x2); -}; -static_assert(sizeof(AccountNotificationSettings) == 0x18, - "AccountNotificationSettings is an invalid size"); - -/// This is nn::settings::system::TvFlag -struct TvFlag { - union { - u32 raw{}; - - BitField<0, 1, u32> Allows4k; - BitField<1, 1, u32> Allows3d; - BitField<2, 1, u32> AllowsCec; - BitField<3, 1, u32> PreventsScreenBurnIn; - }; -}; -static_assert(sizeof(TvFlag) == 4, "TvFlag is an invalid size"); - -/// This is nn::settings::system::TvResolution -enum class TvResolution : u32 { - Auto, - Resolution1080p, - Resolution720p, - Resolution480p, -}; - -/// This is nn::settings::system::HdmiContentType -enum class HdmiContentType : u32 { - None, - Graphics, - Cinema, - Photo, - Game, -}; - -/// This is nn::settings::system::RgbRange -enum class RgbRange : u32 { - Auto, - Full, - Limited, -}; - -/// This is nn::settings::system::CmuMode -enum class CmuMode : u32 { - None, - ColorInvert, - HighContrast, - GrayScale, -}; - -/// This is nn::settings::system::TvSettings -struct TvSettings { - TvFlag flags; - TvResolution tv_resolution; - HdmiContentType hdmi_content_type; - RgbRange rgb_range; - CmuMode cmu_mode; - u32 tv_underscan; - f32 tv_gama; - f32 contrast_ratio; -}; -static_assert(sizeof(TvSettings) == 0x20, "TvSettings is an invalid size"); - -/// This is nn::settings::system::PrimaryAlbumStorage -enum class PrimaryAlbumStorage : u32 { - Nand, - SdCard, -}; - -/// This is nn::settings::system::HandheldSleepPlan -enum class HandheldSleepPlan : u32 { - Sleep1Min, - Sleep3Min, - Sleep5Min, - Sleep10Min, - Sleep30Min, - Never, -}; - -/// This is nn::settings::system::ConsoleSleepPlan -enum class ConsoleSleepPlan : u32 { - Sleep1Hour, - Sleep2Hour, - Sleep3Hour, - Sleep6Hour, - Sleep12Hour, - Never, -}; - -/// This is nn::settings::system::SleepFlag -struct SleepFlag { - union { - u32 raw{}; - - BitField<0, 1, u32> SleepsWhilePlayingMedia; - BitField<1, 1, u32> WakesAtPowerStateChange; - }; -}; -static_assert(sizeof(SleepFlag) == 4, "TvFlag is an invalid size"); - -/// This is nn::settings::system::SleepSettings -struct SleepSettings { - SleepFlag flags; - HandheldSleepPlan handheld_sleep_plan; - ConsoleSleepPlan console_sleep_plan; -}; -static_assert(sizeof(SleepSettings) == 0xc, "SleepSettings is incorrect size"); - -/// This is nn::settings::system::EulaVersionClockType -enum class EulaVersionClockType : u32 { - NetworkSystemClock, - SteadyClock, -}; - -/// This is nn::settings::system::EulaVersion -struct EulaVersion { - u32 version; - RegionCode region_code; - EulaVersionClockType clock_type; - INSERT_PADDING_BYTES(0x4); - s64 posix_time; - Time::Clock::SteadyClockTimePoint timestamp; -}; -static_assert(sizeof(EulaVersion) == 0x30, "EulaVersion is incorrect size"); - struct SystemSettings { // 0/unwritten (1.0.0), 0x20000 (2.0.0), 0x30000 (3.0.0-3.0.1), 0x40001 (4.0.0-4.1.0), 0x50000 // (5.0.0-5.1.0), 0x60000 (6.0.0-6.2.0), 0x70000 (7.0.0), 0x80000 (8.0.0-8.1.1), 0x90000 @@ -283,20 +25,16 @@ struct SystemSettings { // 0/unwritten (1.0.0), 1 (6.0.0-8.1.0), 2 (8.1.1), 7 (9.0.0+). // if (flags & 2), defaults are written for AnalogStickUserCalibration u32 flags; + INSERT_PADDING_BYTES(0x8); // Reserved - std::array<u8, 0x8> reserved_00008; - - // nn::settings::LanguageCode LanguageCode language_code; - - std::array<u8, 0x38> reserved_00018; + INSERT_PADDING_BYTES(0x38); // Reserved // nn::settings::system::NetworkSettings u32 network_setting_count; bool wireless_lan_enable_flag; - std::array<u8, 0x3> pad_00055; - - std::array<u8, 0x8> reserved_00058; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x8); // Reserved // nn::settings::system::NetworkSettings std::array<std::array<u8, 0x400>, 32> network_settings_1B0; @@ -304,161 +42,142 @@ struct SystemSettings { // nn::settings::system::BluetoothDevicesSettings std::array<u8, 0x4> bluetooth_device_settings_count; bool bluetooth_enable_flag; - std::array<u8, 0x3> pad_08065; + INSERT_PADDING_BYTES(0x3); bool bluetooth_afh_enable_flag; - std::array<u8, 0x3> pad_08069; + INSERT_PADDING_BYTES(0x3); bool bluetooth_boost_enable_flag; - std::array<u8, 0x3> pad_0806D; + INSERT_PADDING_BYTES(0x3); std::array<std::array<u8, 0x200>, 10> bluetooth_device_settings_first_10; s32 ldn_channel; - - std::array<u8, 0x3C> reserved_09474; + INSERT_PADDING_BYTES(0x3C); // Reserved // nn::util::Uuid MiiAuthorId - std::array<u8, 0x10> mii_author_id; + Common::UUID mii_author_id; - std::array<u8, 0x30> reserved_094C0; + INSERT_PADDING_BYTES(0x30); // Reserved // nn::settings::system::NxControllerSettings u32 nx_controller_settings_count; - std::array<u8, 0xC> reserved_094F4; + INSERT_PADDING_BYTES(0xC); // Reserved // nn::settings::system::NxControllerSettings, // nn::settings::system::NxControllerLegacySettings on 13.0.0+ std::array<std::array<u8, 0x40>, 10> nx_controller_legacy_settings; - - std::array<u8, 0x170> reserved_09780; + INSERT_PADDING_BYTES(0x170); // Reserved bool external_rtc_reset_flag; - std::array<u8, 0x3> pad_098F1; - - std::array<u8, 0x3C> reserved_098F4; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x3C); // Reserved s32 push_notification_activity_mode_on_sleep; + INSERT_PADDING_BYTES(0x3C); // Reserved - std::array<u8, 0x3C> reserved_09934; - - // nn::settings::system::ErrorReportSharePermission ErrorReportSharePermission error_report_share_permission; + INSERT_PADDING_BYTES(0x3C); // Reserved - std::array<u8, 0x3C> reserved_09974; - - // nn::settings::KeyboardLayout - std::array<u8, 0x4> keyboard_layout; - - std::array<u8, 0x3C> reserved_099B4; + KeyboardLayout keyboard_layout; + INSERT_PADDING_BYTES(0x3C); // Reserved bool web_inspector_flag; - std::array<u8, 0x3> pad_099F1; + INSERT_PADDING_BYTES(0x3); // nn::settings::system::AllowedSslHost u32 allowed_ssl_host_count; bool memory_usage_rate_flag; - std::array<u8, 0x3> pad_099F9; - - std::array<u8, 0x34> reserved_099FC; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x34); // Reserved // nn::settings::system::HostFsMountPoint std::array<u8, 0x100> host_fs_mount_point; // nn::settings::system::AllowedSslHost std::array<std::array<u8, 0x100>, 8> allowed_ssl_hosts; - - std::array<u8, 0x6C0> reserved_0A330; + INSERT_PADDING_BYTES(0x6C0); // Reserved // nn::settings::system::BlePairingSettings u32 ble_pairing_settings_count; - std::array<u8, 0xC> reserved_0A9F4; + INSERT_PADDING_BYTES(0xC); // Reserved std::array<std::array<u8, 0x80>, 10> ble_pairing_settings; // nn::settings::system::AccountOnlineStorageSettings u32 account_online_storage_settings_count; - std::array<u8, 0xC> reserved_0AF04; + INSERT_PADDING_BYTES(0xC); // Reserved std::array<std::array<u8, 0x40>, 8> account_online_storage_settings; bool pctl_ready_flag; - std::array<u8, 0x3> pad_0B111; - - std::array<u8, 0x3C> reserved_0B114; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x3C); // Reserved // nn::settings::system::ThemeId std::array<u8, 0x80> theme_id_type0; std::array<u8, 0x80> theme_id_type1; + INSERT_PADDING_BYTES(0x100); // Reserved - std::array<u8, 0x100> reserved_0B250; - - // nn::settings::ChineseTraditionalInputMethod ChineseTraditionalInputMethod chinese_traditional_input_method; - - std::array<u8, 0x3C> reserved_0B354; + INSERT_PADDING_BYTES(0x3C); // Reserved bool zoom_flag; - std::array<u8, 0x3> pad_0B391; - - std::array<u8, 0x3C> reserved_0B394; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x3C); // Reserved // nn::settings::system::ButtonConfigRegisteredSettings u32 button_config_registered_settings_count; - std::array<u8, 0xC> reserved_0B3D4; + INSERT_PADDING_BYTES(0xC); // Reserved // nn::settings::system::ButtonConfigSettings u32 button_config_settings_count; - std::array<u8, 0x4> reserved_0B3E4; + INSERT_PADDING_BYTES(0x4); // Reserved std::array<std::array<u8, 0x5A8>, 5> button_config_settings; - std::array<u8, 0x13B0> reserved_0D030; + INSERT_PADDING_BYTES(0x13B0); // Reserved u32 button_config_settings_embedded_count; - std::array<u8, 0x4> reserved_0E3E4; + INSERT_PADDING_BYTES(0x4); // Reserved std::array<std::array<u8, 0x5A8>, 5> button_config_settings_embedded; - std::array<u8, 0x13B0> reserved_10030; + INSERT_PADDING_BYTES(0x13B0); // Reserved u32 button_config_settings_left_count; - std::array<u8, 0x4> reserved_113E4; + INSERT_PADDING_BYTES(0x4); // Reserved std::array<std::array<u8, 0x5A8>, 5> button_config_settings_left; - std::array<u8, 0x13B0> reserved_13030; + INSERT_PADDING_BYTES(0x13B0); // Reserved u32 button_config_settings_right_count; - std::array<u8, 0x4> reserved_143E4; + INSERT_PADDING_BYTES(0x4); // Reserved std::array<std::array<u8, 0x5A8>, 5> button_config_settings_right; - std::array<u8, 0x73B0> reserved_16030; + INSERT_PADDING_BYTES(0x73B0); // Reserved // nn::settings::system::ButtonConfigRegisteredSettings std::array<u8, 0x5C8> button_config_registered_settings_embedded; std::array<std::array<u8, 0x5C8>, 10> button_config_registered_settings; - - std::array<u8, 0x7FF8> reserved_21378; + INSERT_PADDING_BYTES(0x7FF8); // Reserved // nn::settings::system::ConsoleSixAxisSensorAccelerationBias - std::array<u8, 0xC> console_six_axis_sensor_acceleration_bias; + Common::Vec3<f32> console_six_axis_sensor_acceleration_bias; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityBias - std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_bias; + Common::Vec3<f32> console_six_axis_sensor_angular_velocity_bias; // nn::settings::system::ConsoleSixAxisSensorAccelerationGain std::array<u8, 0x24> console_six_axis_sensor_acceleration_gain; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityGain std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_gain; // nn::settings::system::ConsoleSixAxisSensorAngularVelocityTimeBias - std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_time_bias; + Common::Vec3<f32> console_six_axis_sensor_angular_velocity_time_bias; // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_acceleration; - - std::array<u8, 0x70> reserved_29400; + INSERT_PADDING_BYTES(0x70); // Reserved bool lock_screen_flag; - std::array<u8, 0x3> pad_29471; - - std::array<u8, 0x4> reserved_249274; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x4); // Reserved ColorSet color_set_id; QuestFlag quest_flag; - // nn::settings::system::RegionCode - RegionCode region_code; + SystemRegionCode region_code; // Different to nn::settings::system::InitialLaunchSettings? InitialLaunchSettingsPacked initial_launch_settings_packed; bool battery_percentage_flag; - std::array<u8, 0x3> pad_294A1; + INSERT_PADDING_BYTES(0x3); // BitFlagSet<32, nn::settings::system::AppletLaunchFlag> u32 applet_launch_flag; @@ -469,33 +188,26 @@ struct SystemSettings { std::array<u8, 0x10> theme_key; bool field_testing_flag; - std::array<u8, 0x3> pad_294C1; + INSERT_PADDING_BYTES(0x3); s32 panel_crc_mode; - - std::array<u8, 0x28> reserved_294C8; + INSERT_PADDING_BYTES(0x28); // Reserved // nn::settings::system::BacklightSettings std::array<u8, 0x2C> backlight_settings_mixed_up; + INSERT_PADDING_BYTES(0x64); // Reserved - std::array<u8, 0x64> reserved_2951C; - - // nn::time::SystemClockContext Service::Time::Clock::SystemClockContext user_system_clock_context; Service::Time::Clock::SystemClockContext network_system_clock_context; bool user_system_clock_automatic_correction_enabled; - std::array<u8, 0x3> pad_295C1; - std::array<u8, 0x4> reserved_295C4; - // nn::time::SteadyClockTimePoint + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x4); // Reserved Service::Time::Clock::SteadyClockTimePoint user_system_clock_automatic_correction_updated_time_point; + INSERT_PADDING_BYTES(0x10); // Reserved - std::array<u8, 0x10> reserved_295E0; - - // nn::settings::system::AccountSettings AccountSettings account_settings; - - std::array<u8, 0xFC> reserved_295F4; + INSERT_PADDING_BYTES(0xFC); // Reserved // nn::settings::system::AudioVolume std::array<u8, 0x8> audio_volume_type0; @@ -505,47 +217,42 @@ struct SystemSettings { s32 audio_output_mode_type1; s32 audio_output_mode_type2; bool force_mute_on_headphone_removed; - std::array<u8, 0x3> pad_2970D; + INSERT_PADDING_BYTES(0x3); s32 headphone_volume_warning_count; bool heaphone_volume_update_flag; - std::array<u8, 0x3> pad_29715; + INSERT_PADDING_BYTES(0x3); // nn::settings::system::AudioVolume std::array<u8, 0x8> audio_volume_type2; // nn::settings::system::AudioOutputMode s32 audio_output_mode_type3; s32 audio_output_mode_type4; bool hearing_protection_safeguard_flag; - std::array<u8, 0x3> pad_29729; - std::array<u8, 0x4> reserved_2972C; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x4); // Reserved s64 hearing_protection_safeguard_remaining_time; - std::array<u8, 0x38> reserved_29738; + INSERT_PADDING_BYTES(0x38); // Reserved bool console_information_upload_flag; - std::array<u8, 0x3> pad_29771; - - std::array<u8, 0x3C> reserved_29774; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x3C); // Reserved bool automatic_application_download_flag; - std::array<u8, 0x3> pad_297B1; - - std::array<u8, 0x4> reserved_297B4; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x4); // Reserved - // nn::settings::system::NotificationSettings NotificationSettings notification_settings; - - std::array<u8, 0x60> reserved_297D0; + INSERT_PADDING_BYTES(0x60); // Reserved // nn::settings::system::AccountNotificationSettings u32 account_notification_settings_count; - std::array<u8, 0xC> reserved_29834; + INSERT_PADDING_BYTES(0xC); // Reserved std::array<AccountNotificationSettings, 8> account_notification_settings; - - std::array<u8, 0x140> reserved_29900; + INSERT_PADDING_BYTES(0x140); // Reserved f32 vibration_master_volume; bool usb_full_key_enable_flag; - std::array<u8, 0x3> pad_29A45; + INSERT_PADDING_BYTES(0x3); // nn::settings::system::AnalogStickUserCalibration std::array<u8, 0x10> analog_stick_user_calibration_left; @@ -553,85 +260,68 @@ struct SystemSettings { // nn::settings::system::TouchScreenMode s32 touch_screen_mode; + INSERT_PADDING_BYTES(0x14); // Reserved - std::array<u8, 0x14> reserved_29A6C; - - // nn::settings::system::TvSettings TvSettings tv_settings; // nn::settings::system::Edid std::array<u8, 0x100> edid; - - std::array<u8, 0x2E0> reserved_29BA0; + INSERT_PADDING_BYTES(0x2E0); // Reserved // nn::settings::system::DataDeletionSettings std::array<u8, 0x8> data_deletion_settings; - - std::array<u8, 0x38> reserved_29E88; + INSERT_PADDING_BYTES(0x38); // Reserved // nn::ncm::ProgramId std::array<u8, 0x8> initial_system_applet_program_id; std::array<u8, 0x8> overlay_disp_program_id; - - std::array<u8, 0x4> reserved_29ED0; + INSERT_PADDING_BYTES(0x4); // Reserved bool requires_run_repair_time_reviser; + INSERT_PADDING_BYTES(0x6B); // Reserved - std::array<u8, 0x6B> reserved_29ED5; - - // nn::time::LocationName Service::Time::TimeZone::LocationName device_time_zone_location_name; - std::array<u8, 0x4> reserved_29F64; - // nn::time::SteadyClockTimePoint + INSERT_PADDING_BYTES(0x4); // Reserved Service::Time::Clock::SteadyClockTimePoint device_time_zone_location_updated_time; - - std::array<u8, 0xC0> reserved_29F80; + INSERT_PADDING_BYTES(0xC0); // Reserved // nn::settings::system::PrimaryAlbumStorage PrimaryAlbumStorage primary_album_storage; - - std::array<u8, 0x3C> reserved_2A044; + INSERT_PADDING_BYTES(0x3C); // Reserved bool usb_30_enable_flag; - std::array<u8, 0x3> pad_2A081; + INSERT_PADDING_BYTES(0x3); bool usb_30_host_enable_flag; - std::array<u8, 0x3> pad_2A085; + INSERT_PADDING_BYTES(0x3); bool usb_30_device_enable_flag; - std::array<u8, 0x3> pad_2A089; - - std::array<u8, 0x34> reserved_2A08C; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x34); // Reserved bool nfc_enable_flag; - std::array<u8, 0x3> pad_2A0C1; - - std::array<u8, 0x3C> reserved_2A0C4; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x3C); // Reserved // nn::settings::system::SleepSettings SleepSettings sleep_settings; - - std::array<u8, 0x34> reserved_2A10C; + INSERT_PADDING_BYTES(0x34); // Reserved // nn::settings::system::EulaVersion u32 eula_version_count; - std::array<u8, 0xC> reserved_2A144; + INSERT_PADDING_BYTES(0xC); // Reserved std::array<EulaVersion, 32> eula_versions; - - std::array<u8, 0x200> reserved_2A750; + INSERT_PADDING_BYTES(0x200); // Reserved // nn::settings::system::DeviceNickName std::array<u8, 0x80> device_nick_name; - - std::array<u8, 0x80> reserved_2A9D0; + INSERT_PADDING_BYTES(0x80); // Reserved bool auto_update_enable_flag; - std::array<u8, 0x3> pad_2AA51; - - std::array<u8, 0x4C> reserved_2AA54; + INSERT_PADDING_BYTES(0x3); + INSERT_PADDING_BYTES(0x4C); // Reserved // nn::settings::system::BluetoothDevicesSettings std::array<std::array<u8, 0x200>, 14> bluetooth_device_settings_last_14; - - std::array<u8, 0x2000> reserved_2C6A0; + INSERT_PADDING_BYTES(0x2000); // Reserved // nn::settings::system::NxControllerSettings std::array<std::array<u8, 0x800>, 10> nx_controller_settings_data_from_offset_30; diff --git a/src/core/hle/service/set/settings_server.h b/src/core/hle/service/set/settings_server.h index a4e78db6c..8304e8424 100644 --- a/src/core/hle/service/set/settings_server.h +++ b/src/core/hle/service/set/settings_server.h @@ -4,72 +4,13 @@ #pragma once #include "core/hle/service/service.h" -#include "core/hle/service/set/system_settings.h" +#include "core/hle/service/set/settings_types.h" namespace Core { class System; } namespace Service::Set { -enum class KeyboardLayout : u64 { - Japanese = 0, - EnglishUs = 1, - EnglishUsInternational = 2, - EnglishUk = 3, - French = 4, - FrenchCa = 5, - Spanish = 6, - SpanishLatin = 7, - German = 8, - Italian = 9, - Portuguese = 10, - Russian = 11, - Korean = 12, - ChineseSimplified = 13, - ChineseTraditional = 14, -}; - -constexpr std::array<LanguageCode, 18> available_language_codes = {{ - LanguageCode::JA, - LanguageCode::EN_US, - LanguageCode::FR, - LanguageCode::DE, - LanguageCode::IT, - LanguageCode::ES, - LanguageCode::ZH_CN, - LanguageCode::KO, - LanguageCode::NL, - LanguageCode::PT, - LanguageCode::RU, - LanguageCode::ZH_TW, - LanguageCode::EN_GB, - LanguageCode::FR_CA, - LanguageCode::ES_419, - LanguageCode::ZH_HANS, - LanguageCode::ZH_HANT, - LanguageCode::PT_BR, -}}; - -static constexpr std::array<std::pair<LanguageCode, KeyboardLayout>, 18> language_to_layout{{ - {LanguageCode::JA, KeyboardLayout::Japanese}, - {LanguageCode::EN_US, KeyboardLayout::EnglishUs}, - {LanguageCode::FR, KeyboardLayout::French}, - {LanguageCode::DE, KeyboardLayout::German}, - {LanguageCode::IT, KeyboardLayout::Italian}, - {LanguageCode::ES, KeyboardLayout::Spanish}, - {LanguageCode::ZH_CN, KeyboardLayout::ChineseSimplified}, - {LanguageCode::KO, KeyboardLayout::Korean}, - {LanguageCode::NL, KeyboardLayout::EnglishUsInternational}, - {LanguageCode::PT, KeyboardLayout::Portuguese}, - {LanguageCode::RU, KeyboardLayout::Russian}, - {LanguageCode::ZH_TW, KeyboardLayout::ChineseTraditional}, - {LanguageCode::EN_GB, KeyboardLayout::EnglishUk}, - {LanguageCode::FR_CA, KeyboardLayout::FrenchCa}, - {LanguageCode::ES_419, KeyboardLayout::SpanishLatin}, - {LanguageCode::ZH_HANS, KeyboardLayout::ChineseSimplified}, - {LanguageCode::ZH_HANT, KeyboardLayout::ChineseTraditional}, - {LanguageCode::PT_BR, KeyboardLayout::Portuguese}, -}}; LanguageCode GetLanguageCodeFromIndex(std::size_t idx); diff --git a/src/core/hle/service/set/settings_types.h b/src/core/hle/service/set/settings_types.h new file mode 100644 index 000000000..4dee202d7 --- /dev/null +++ b/src/core/hle/service/set/settings_types.h @@ -0,0 +1,451 @@ +// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include <array> + +#include "common/bit_field.h" +#include "common/common_funcs.h" +#include "common/common_types.h" +#include "common/uuid.h" +#include "core/hle/service/time/clock_types.h" + +namespace Service::Set { + +/// This is nn::settings::system::AudioOutputMode +enum class AudioOutputMode : u32 { + ch_1, + ch_2, + ch_5_1, + ch_7_1, +}; + +/// This is nn::settings::system::AudioOutputModeTarget +enum class AudioOutputModeTarget : u32 { + Hdmi, + Speaker, + Headphone, +}; + +/// This is nn::settings::system::AudioVolumeTarget +enum class AudioVolumeTarget : u32 { + Speaker, + Headphone, +}; + +/// This is nn::settings::system::ClockSourceId +enum class ClockSourceId : u32 { + NetworkSystemClock, + SteadyClock, +}; + +/// This is nn::settings::system::CmuMode +enum class CmuMode : u32 { + None, + ColorInvert, + HighContrast, + GrayScale, +}; + +/// This is nn::settings::system::ChineseTraditionalInputMethod +enum class ChineseTraditionalInputMethod : u32 { + Unknown0 = 0, + Unknown1 = 1, + Unknown2 = 2, +}; + +/// Indicates the current theme set by the system settings +enum class ColorSet : u32 { + BasicWhite = 0, + BasicBlack = 1, +}; + +/// This is nn::settings::system::ConsoleSleepPlan +enum class ConsoleSleepPlan : u32 { + Sleep1Hour, + Sleep2Hour, + Sleep3Hour, + Sleep6Hour, + Sleep12Hour, + Never, +}; + +/// This is nn::settings::system::ErrorReportSharePermission +enum class ErrorReportSharePermission : u32 { + NotConfirmed, + Granted, + Denied, +}; + +/// This is nn::settings::system::EulaVersionClockType +enum class EulaVersionClockType : u32 { + NetworkSystemClock, + SteadyClock, +}; + +/// This is nn::settings::factory::RegionCode +enum class FactoryRegionCode : u32 { + Japan, + Usa, + Europe, + Australia, + China, + Korea, + Taiwan, +}; + +/// This is nn::settings::system::FriendPresenceOverlayPermission +enum class FriendPresenceOverlayPermission : u8 { + NotConfirmed, + NoDisplay, + FavoriteFriends, + Friends, +}; + +enum class GetFirmwareVersionType { + Version1, + Version2, +}; + +/// This is nn::settings::system::HandheldSleepPlan +enum class HandheldSleepPlan : u32 { + Sleep1Min, + Sleep3Min, + Sleep5Min, + Sleep10Min, + Sleep30Min, + Never, +}; + +/// This is nn::settings::system::HdmiContentType +enum class HdmiContentType : u32 { + None, + Graphics, + Cinema, + Photo, + Game, +}; + +enum class KeyboardLayout : u32 { + Japanese = 0, + EnglishUs = 1, + EnglishUsInternational = 2, + EnglishUk = 3, + French = 4, + FrenchCa = 5, + Spanish = 6, + SpanishLatin = 7, + German = 8, + Italian = 9, + Portuguese = 10, + Russian = 11, + Korean = 12, + ChineseSimplified = 13, + ChineseTraditional = 14, +}; + +/// This is "nn::settings::LanguageCode", which is a NUL-terminated string stored in a u64. +enum class LanguageCode : u64 { + JA = 0x000000000000616A, + EN_US = 0x00000053552D6E65, + FR = 0x0000000000007266, + DE = 0x0000000000006564, + IT = 0x0000000000007469, + ES = 0x0000000000007365, + ZH_CN = 0x0000004E432D687A, + KO = 0x0000000000006F6B, + NL = 0x0000000000006C6E, + PT = 0x0000000000007470, + RU = 0x0000000000007572, + ZH_TW = 0x00000057542D687A, + EN_GB = 0x00000042472D6E65, + FR_CA = 0x00000041432D7266, + ES_419 = 0x00003931342D7365, + ZH_HANS = 0x00736E61482D687A, + ZH_HANT = 0x00746E61482D687A, + PT_BR = 0x00000052422D7470, +}; + +/// This is nn::settings::system::NotificationVolume +enum class NotificationVolume : u32 { + Mute, + Low, + High, +}; + +/// This is nn::settings::system::PrimaryAlbumStorage +enum class PrimaryAlbumStorage : u32 { + Nand, + SdCard, +}; + +/// Indicates the current console is a retail or kiosk unit +enum class QuestFlag : u8 { + Retail = 0, + Kiosk = 1, +}; + +/// This is nn::settings::system::RgbRange +enum class RgbRange : u32 { + Auto, + Full, + Limited, +}; + +/// This is nn::settings::system::RegionCode +enum class SystemRegionCode : u32 { + Japan, + Usa, + Europe, + Australia, + HongKongTaiwanKorea, + China, +}; + +/// This is nn::settings::system::TouchScreenMode +enum class TouchScreenMode : u32 { + Stylus, + Standard, +}; + +/// This is nn::settings::system::TvResolution +enum class TvResolution : u32 { + Auto, + Resolution1080p, + Resolution720p, + Resolution480p, +}; + +constexpr std::array<LanguageCode, 18> available_language_codes = {{ + LanguageCode::JA, + LanguageCode::EN_US, + LanguageCode::FR, + LanguageCode::DE, + LanguageCode::IT, + LanguageCode::ES, + LanguageCode::ZH_CN, + LanguageCode::KO, + LanguageCode::NL, + LanguageCode::PT, + LanguageCode::RU, + LanguageCode::ZH_TW, + LanguageCode::EN_GB, + LanguageCode::FR_CA, + LanguageCode::ES_419, + LanguageCode::ZH_HANS, + LanguageCode::ZH_HANT, + LanguageCode::PT_BR, +}}; + +static constexpr std::array<std::pair<LanguageCode, KeyboardLayout>, 18> language_to_layout{{ + {LanguageCode::JA, KeyboardLayout::Japanese}, + {LanguageCode::EN_US, KeyboardLayout::EnglishUs}, + {LanguageCode::FR, KeyboardLayout::French}, + {LanguageCode::DE, KeyboardLayout::German}, + {LanguageCode::IT, KeyboardLayout::Italian}, + {LanguageCode::ES, KeyboardLayout::Spanish}, + {LanguageCode::ZH_CN, KeyboardLayout::ChineseSimplified}, + {LanguageCode::KO, KeyboardLayout::Korean}, + {LanguageCode::NL, KeyboardLayout::EnglishUsInternational}, + {LanguageCode::PT, KeyboardLayout::Portuguese}, + {LanguageCode::RU, KeyboardLayout::Russian}, + {LanguageCode::ZH_TW, KeyboardLayout::ChineseTraditional}, + {LanguageCode::EN_GB, KeyboardLayout::EnglishUk}, + {LanguageCode::FR_CA, KeyboardLayout::FrenchCa}, + {LanguageCode::ES_419, KeyboardLayout::SpanishLatin}, + {LanguageCode::ZH_HANS, KeyboardLayout::ChineseSimplified}, + {LanguageCode::ZH_HANT, KeyboardLayout::ChineseTraditional}, + {LanguageCode::PT_BR, KeyboardLayout::Portuguese}, +}}; + +/// This is nn::settings::system::AccountNotificationFlag +struct AccountNotificationFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> FriendOnlineFlag; + BitField<1, 1, u32> FriendRequestFlag; + BitField<8, 1, u32> CoralInvitationFlag; + }; +}; +static_assert(sizeof(AccountNotificationFlag) == 4, "AccountNotificationFlag is an invalid size"); + +/// This is nn::settings::system::AccountSettings +struct AccountSettings { + u32 flags; +}; +static_assert(sizeof(AccountSettings) == 4, "AccountSettings is an invalid size"); + +/// This is nn::settings::system::DataDeletionFlag +struct DataDeletionFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> AutomaticDeletionFlag; + }; +}; +static_assert(sizeof(DataDeletionFlag) == 4, "DataDeletionFlag is an invalid size"); + +/// This is nn::settings::system::InitialLaunchFlag +struct InitialLaunchFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> InitialLaunchCompletionFlag; + BitField<8, 1, u32> InitialLaunchUserAdditionFlag; + BitField<16, 1, u32> InitialLaunchTimestampFlag; + }; +}; +static_assert(sizeof(InitialLaunchFlag) == 4, "InitialLaunchFlag is an invalid size"); + +/// This is nn::settings::system::SleepFlag +struct SleepFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> SleepsWhilePlayingMedia; + BitField<1, 1, u32> WakesAtPowerStateChange; + }; +}; +static_assert(sizeof(SleepFlag) == 4, "TvFlag is an invalid size"); + +/// This is nn::settings::system::NotificationFlag +struct NotificationFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> RingtoneFlag; + BitField<1, 1, u32> DownloadCompletionFlag; + BitField<8, 1, u32> EnablesNews; + BitField<9, 1, u32> IncomingLampFlag; + }; +}; +static_assert(sizeof(NotificationFlag) == 4, "NotificationFlag is an invalid size"); + +/// This is nn::settings::system::TvFlag +struct TvFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> Allows4k; + BitField<1, 1, u32> Allows3d; + BitField<2, 1, u32> AllowsCec; + BitField<3, 1, u32> PreventsScreenBurnIn; + }; +}; +static_assert(sizeof(TvFlag) == 4, "TvFlag is an invalid size"); + +/// This is nn::settings::system::UserSelectorFlag +struct UserSelectorFlag { + union { + u32 raw{}; + + BitField<0, 1, u32> SkipIfSingleUser; + BitField<31, 1, u32> Unknown; + }; +}; +static_assert(sizeof(UserSelectorFlag) == 4, "UserSelectorFlag is an invalid size"); + +/// This is nn::settings::system::AccountNotificationSettings +struct AccountNotificationSettings { + Common::UUID uid; + AccountNotificationFlag flags; + FriendPresenceOverlayPermission friend_presence_permission; + FriendPresenceOverlayPermission friend_invitation_permission; + INSERT_PADDING_BYTES(0x2); +}; +static_assert(sizeof(AccountNotificationSettings) == 0x18, + "AccountNotificationSettings is an invalid size"); + +/// This is nn::settings::system::EulaVersion +struct EulaVersion { + u32 version; + SystemRegionCode region_code; + EulaVersionClockType clock_type; + INSERT_PADDING_BYTES(0x4); + s64 posix_time; + Time::Clock::SteadyClockTimePoint timestamp; +}; +static_assert(sizeof(EulaVersion) == 0x30, "EulaVersion is incorrect size"); + +struct FirmwareVersionFormat { + u8 major; + u8 minor; + u8 micro; + INSERT_PADDING_BYTES(1); + u8 revision_major; + u8 revision_minor; + INSERT_PADDING_BYTES(2); + std::array<char, 0x20> platform; + std::array<u8, 0x40> version_hash; + std::array<char, 0x18> display_version; + std::array<char, 0x80> display_title; +}; +static_assert(sizeof(FirmwareVersionFormat) == 0x100, "FirmwareVersionFormat is an invalid size"); + +/// This is nn::settings::system::HomeMenuScheme +struct HomeMenuScheme { + u32 main; + u32 back; + u32 sub; + u32 bezel; + u32 extra; +}; +static_assert(sizeof(HomeMenuScheme) == 0x14, "HomeMenuScheme is incorrect size"); + +/// This is nn::settings::system::InitialLaunchSettings +struct InitialLaunchSettings { + InitialLaunchFlag flags; + INSERT_PADDING_BYTES(0x4); + Service::Time::Clock::SteadyClockTimePoint timestamp; +}; +static_assert(sizeof(InitialLaunchSettings) == 0x20, "InitialLaunchSettings is incorrect size"); + +#pragma pack(push, 4) +struct InitialLaunchSettingsPacked { + InitialLaunchFlag flags; + Service::Time::Clock::SteadyClockTimePoint timestamp; +}; +#pragma pack(pop) +static_assert(sizeof(InitialLaunchSettingsPacked) == 0x1C, + "InitialLaunchSettingsPacked is incorrect size"); + +/// This is nn::settings::system::NotificationTime +struct NotificationTime { + u32 hour; + u32 minute; +}; +static_assert(sizeof(NotificationTime) == 0x8, "NotificationTime is an invalid size"); + +/// This is nn::settings::system::NotificationSettings +struct NotificationSettings { + NotificationFlag flags; + NotificationVolume volume; + NotificationTime start_time; + NotificationTime stop_time; +}; +static_assert(sizeof(NotificationSettings) == 0x18, "NotificationSettings is an invalid size"); + +/// This is nn::settings::system::SleepSettings +struct SleepSettings { + SleepFlag flags; + HandheldSleepPlan handheld_sleep_plan; + ConsoleSleepPlan console_sleep_plan; +}; +static_assert(sizeof(SleepSettings) == 0xc, "SleepSettings is incorrect size"); + +/// This is nn::settings::system::TvSettings +struct TvSettings { + TvFlag flags; + TvResolution tv_resolution; + HdmiContentType hdmi_content_type; + RgbRange rgb_range; + CmuMode cmu_mode; + u32 tv_underscan; + f32 tv_gama; + f32 contrast_ratio; +}; +static_assert(sizeof(TvSettings) == 0x20, "TvSettings is an invalid size"); + +} // namespace Service::Set diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index af9348522..2e5785fed 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -97,8 +97,8 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) {3, &ISystemSettingsServer::GetFirmwareVersion, "GetFirmwareVersion"}, {4, &ISystemSettingsServer::GetFirmwareVersion2, "GetFirmwareVersion2"}, {5, nullptr, "GetFirmwareVersionDigest"}, - {7, nullptr, "GetLockScreenFlag"}, - {8, nullptr, "SetLockScreenFlag"}, + {7, &ISystemSettingsServer::GetLockScreenFlag, "GetLockScreenFlag"}, + {8, &ISystemSettingsServer::SetLockScreenFlag, "SetLockScreenFlag"}, {9, nullptr, "GetBacklightSettings"}, {10, nullptr, "SetBacklightSettings"}, {11, nullptr, "SetBluetoothDevicesSettings"}, @@ -157,12 +157,12 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) {66, nullptr, "SetUsb30EnableFlag"}, {67, nullptr, "GetBatteryLot"}, {68, nullptr, "GetSerialNumber"}, - {69, nullptr, "GetNfcEnableFlag"}, - {70, nullptr, "SetNfcEnableFlag"}, + {69, &ISystemSettingsServer::GetNfcEnableFlag, "GetNfcEnableFlag"}, + {70, &ISystemSettingsServer::SetNfcEnableFlag, "SetNfcEnableFlag"}, {71, &ISystemSettingsServer::GetSleepSettings, "GetSleepSettings"}, {72, &ISystemSettingsServer::SetSleepSettings, "SetSleepSettings"}, - {73, nullptr, "GetWirelessLanEnableFlag"}, - {74, nullptr, "SetWirelessLanEnableFlag"}, + {73, &ISystemSettingsServer::GetWirelessLanEnableFlag, "GetWirelessLanEnableFlag"}, + {74, &ISystemSettingsServer::SetWirelessLanEnableFlag, "SetWirelessLanEnableFlag"}, {75, &ISystemSettingsServer::GetInitialLaunchSettings, "GetInitialLaunchSettings"}, {76, &ISystemSettingsServer::SetInitialLaunchSettings, "SetInitialLaunchSettings"}, {77, &ISystemSettingsServer::GetDeviceNickName, "GetDeviceNickName"}, @@ -176,8 +176,8 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) {85, nullptr, "SetPtmBatteryLot"}, {86, nullptr, "GetPtmFuelGaugeParameter"}, {87, nullptr, "SetPtmFuelGaugeParameter"}, - {88, nullptr, "GetBluetoothEnableFlag"}, - {89, nullptr, "SetBluetoothEnableFlag"}, + {88, &ISystemSettingsServer::GetBluetoothEnableFlag, "GetBluetoothEnableFlag"}, + {89, &ISystemSettingsServer::SetBluetoothEnableFlag, "SetBluetoothEnableFlag"}, {90, &ISystemSettingsServer::GetMiiAuthorId, "GetMiiAuthorId"}, {91, nullptr, "SetShutdownRtcValue"}, {92, nullptr, "GetShutdownRtcValue"}, @@ -510,6 +510,25 @@ void ISystemSettingsServer::SetUserSystemClockContext(HLERequestContext& ctx) { rb.Push(res); } +void ISystemSettingsServer::GetLockScreenFlag(HLERequestContext& ctx) { + LOG_INFO(Service_SET, "called, lock_screen_flag={}", m_system_settings.lock_screen_flag); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.Push(m_system_settings.lock_screen_flag); +} + +void ISystemSettingsServer::SetLockScreenFlag(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + m_system_settings.lock_screen_flag = rp.Pop<bool>(); + SetSaveNeeded(); + + LOG_INFO(Service_SET, "called, lock_screen_flag={}", m_system_settings.lock_screen_flag); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void ISystemSettingsServer::GetAccountSettings(HLERequestContext& ctx) { LOG_INFO(Service_SET, "called"); @@ -531,7 +550,7 @@ void ISystemSettingsServer::SetAccountSettings(HLERequestContext& ctx) { } void ISystemSettingsServer::GetEulaVersions(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, "called, elements={}", m_system_settings.eula_version_count); ctx.WriteBuffer(m_system_settings.eula_versions); @@ -557,7 +576,7 @@ void ISystemSettingsServer::SetEulaVersions(HLERequestContext& ctx) { } void ISystemSettingsServer::GetColorSetId(HLERequestContext& ctx) { - LOG_DEBUG(Service_SET, "called"); + LOG_DEBUG(Service_SET, "called, color_set=", m_system_settings.color_set_id); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -576,7 +595,13 @@ void ISystemSettingsServer::SetColorSetId(HLERequestContext& ctx) { } void ISystemSettingsServer::GetNotificationSettings(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, "called, flags={}, volume={}, head_time={}:{}, tailt_time={}:{}", + m_system_settings.notification_settings.flags.raw, + m_system_settings.notification_settings.volume, + m_system_settings.notification_settings.start_time.hour, + m_system_settings.notification_settings.start_time.minute, + m_system_settings.notification_settings.stop_time.hour, + m_system_settings.notification_settings.stop_time.minute); IPC::ResponseBuilder rb{ctx, 8}; rb.Push(ResultSuccess); @@ -601,7 +626,8 @@ void ISystemSettingsServer::SetNotificationSettings(HLERequestContext& ctx) { } void ISystemSettingsServer::GetAccountNotificationSettings(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, "called, elements={}", + m_system_settings.account_notification_settings_count); ctx.WriteBuffer(m_system_settings.account_notification_settings); @@ -645,6 +671,7 @@ using Settings = static Settings GetSettings() { Settings ret; + // AM ret["hbloader"]["applet_heap_size"] = ToBytes(u64{0x0}); ret["hbloader"]["applet_heap_reservation_size"] = ToBytes(u64{0x8600000}); @@ -656,6 +683,24 @@ static Settings GetSettings() { ret["time"]["standard_steady_clock_test_offset_minutes"] = ToBytes(s32{0}); ret["time"]["standard_user_clock_initial_year"] = ToBytes(s32{2023}); + // HID + ret["hid_debug"]["enables_debugpad"] = ToBytes(bool{true}); + ret["hid_debug"]["manages_devices"] = ToBytes(bool{true}); + ret["hid_debug"]["manages_touch_ic_i2c"] = ToBytes(bool{true}); + ret["hid_debug"]["emulate_future_device"] = ToBytes(bool{false}); + ret["hid_debug"]["emulate_mcu_hardware_error"] = ToBytes(bool{false}); + ret["hid_debug"]["enables_rail"] = ToBytes(bool{true}); + ret["hid_debug"]["emulate_firmware_update_failure"] = ToBytes(bool{false}); + ret["hid_debug"]["failure_firmware_update"] = ToBytes(s32{0}); + ret["hid_debug"]["ble_disabled"] = ToBytes(bool{false}); + ret["hid_debug"]["dscale_disabled"] = ToBytes(bool{false}); + ret["hid_debug"]["force_handheld"] = ToBytes(bool{true}); + ret["hid_debug"]["disabled_features_per_id"] = std::vector<u8>(0xa8); + ret["hid_debug"]["touch_firmware_auto_update_disabled"] = ToBytes(bool{false}); + + // Settings + ret["settings_debug"]["is_debug_mode_enabled"] = ToBytes(bool{false}); + return ret; } @@ -708,7 +753,15 @@ void ISystemSettingsServer::GetSettingsItemValue(HLERequestContext& ctx) { } void ISystemSettingsServer::GetTvSettings(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, + "called, flags={}, cmu_mode={}, contrast_ratio={}, hdmi_content_type={}, " + "rgb_range={}, tv_gama={}, tv_resolution={}, tv_underscan={}", + m_system_settings.tv_settings.flags.raw, m_system_settings.tv_settings.cmu_mode, + m_system_settings.tv_settings.contrast_ratio, + m_system_settings.tv_settings.hdmi_content_type, + m_system_settings.tv_settings.rgb_range, m_system_settings.tv_settings.tv_gama, + m_system_settings.tv_settings.tv_resolution, + m_system_settings.tv_settings.tv_underscan); IPC::ResponseBuilder rb{ctx, 10}; rb.Push(ResultSuccess); @@ -735,23 +788,26 @@ void ISystemSettingsServer::SetTvSettings(HLERequestContext& ctx) { } void ISystemSettingsServer::GetDebugModeFlag(HLERequestContext& ctx) { - LOG_DEBUG(Service_SET, "called"); + bool is_debug_mode_enabled = false; + GetSettingsItemValue<bool>(is_debug_mode_enabled, "settings_debug", "is_debug_mode_enabled"); + + LOG_DEBUG(Service_SET, "called, is_debug_mode_enabled={}", is_debug_mode_enabled); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push<u32>(0); + rb.Push(is_debug_mode_enabled); } void ISystemSettingsServer::GetQuestFlag(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "(STUBBED) called"); + LOG_INFO(Service_SET, "called, quest_flag={}", m_system_settings.quest_flag); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.PushEnum(QuestFlag::Retail); + rb.PushEnum(m_system_settings.quest_flag); } void ISystemSettingsServer::GetDeviceTimeZoneLocationName(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called"); + LOG_INFO(Service_SET, "called"); Service::Time::TimeZone::LocationName name{}; auto res = GetDeviceTimeZoneLocationName(name); @@ -762,7 +818,7 @@ void ISystemSettingsServer::GetDeviceTimeZoneLocationName(HLERequestContext& ctx } void ISystemSettingsServer::SetDeviceTimeZoneLocationName(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called"); + LOG_INFO(Service_SET, "called"); IPC::RequestParser rp{ctx}; auto name{rp.PopRaw<Service::Time::TimeZone::LocationName>()}; @@ -775,7 +831,7 @@ void ISystemSettingsServer::SetDeviceTimeZoneLocationName(HLERequestContext& ctx void ISystemSettingsServer::SetRegionCode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - m_system_settings.region_code = rp.PopEnum<RegionCode>(); + m_system_settings.region_code = rp.PopEnum<SystemRegionCode>(); SetSaveNeeded(); LOG_INFO(Service_SET, "called, region_code={}", m_system_settings.region_code); @@ -832,15 +888,38 @@ void ISystemSettingsServer::SetUserSystemClockAutomaticCorrectionEnabled(HLERequ } void ISystemSettingsServer::GetPrimaryAlbumStorage(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "(STUBBED) called"); + LOG_INFO(Service_SET, "called, primary_album_storage={}", + m_system_settings.primary_album_storage); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.PushEnum(m_system_settings.primary_album_storage); +} + +void ISystemSettingsServer::GetNfcEnableFlag(HLERequestContext& ctx) { + LOG_INFO(Service_SET, "called, nfc_enable_flag={}", m_system_settings.nfc_enable_flag); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.PushEnum(PrimaryAlbumStorage::SdCard); + rb.Push<u8>(m_system_settings.nfc_enable_flag); +} + +void ISystemSettingsServer::SetNfcEnableFlag(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + m_system_settings.nfc_enable_flag = rp.Pop<bool>(); + SetSaveNeeded(); + + LOG_INFO(Service_SET, "called, nfc_enable_flag={}", m_system_settings.nfc_enable_flag); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); } void ISystemSettingsServer::GetSleepSettings(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, "called, flags={}, handheld_sleep_plan={}, console_sleep_plan={}", + m_system_settings.sleep_settings.flags.raw, + m_system_settings.sleep_settings.handheld_sleep_plan, + m_system_settings.sleep_settings.console_sleep_plan); IPC::ResponseBuilder rb{ctx, 5}; rb.Push(ResultSuccess); @@ -861,8 +940,32 @@ void ISystemSettingsServer::SetSleepSettings(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void ISystemSettingsServer::GetWirelessLanEnableFlag(HLERequestContext& ctx) { + LOG_INFO(Service_SET, "called, wireless_lan_enable_flag={}", + m_system_settings.wireless_lan_enable_flag); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.Push(m_system_settings.wireless_lan_enable_flag); +} + +void ISystemSettingsServer::SetWirelessLanEnableFlag(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + m_system_settings.wireless_lan_enable_flag = rp.Pop<bool>(); + SetSaveNeeded(); + + LOG_INFO(Service_SET, "called, wireless_lan_enable_flag={}", + m_system_settings.wireless_lan_enable_flag); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void ISystemSettingsServer::GetInitialLaunchSettings(HLERequestContext& ctx) { - LOG_INFO(Service_SET, "called"); + LOG_INFO(Service_SET, "called, flags={}, timestamp={}", + m_system_settings.initial_launch_settings_packed.flags.raw, + m_system_settings.initial_launch_settings_packed.timestamp.time_point); + IPC::ResponseBuilder rb{ctx, 10}; rb.Push(ResultSuccess); rb.PushRaw(m_system_settings.initial_launch_settings_packed); @@ -913,35 +1016,56 @@ void ISystemSettingsServer::GetProductModel(HLERequestContext& ctx) { rb.Push(product_model); } +void ISystemSettingsServer::GetBluetoothEnableFlag(HLERequestContext& ctx) { + LOG_INFO(Service_SET, "called, bluetooth_enable_flag={}", + m_system_settings.bluetooth_enable_flag); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.Push<u8>(m_system_settings.bluetooth_enable_flag); +} + +void ISystemSettingsServer::SetBluetoothEnableFlag(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + m_system_settings.bluetooth_enable_flag = rp.Pop<bool>(); + SetSaveNeeded(); + + LOG_INFO(Service_SET, "called, bluetooth_enable_flag={}", + m_system_settings.bluetooth_enable_flag); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void ISystemSettingsServer::GetMiiAuthorId(HLERequestContext& ctx) { - const auto author_id = Common::UUID::MakeDefault(); + if (m_system_settings.mii_author_id.IsInvalid()) { + m_system_settings.mii_author_id = Common::UUID::MakeDefault(); + SetSaveNeeded(); + } - LOG_WARNING(Service_SET, "(STUBBED) called, author_id={}", author_id.FormattedString()); + LOG_INFO(Service_SET, "called, author_id={}", + m_system_settings.mii_author_id.FormattedString()); IPC::ResponseBuilder rb{ctx, 6}; rb.Push(ResultSuccess); - rb.PushRaw(author_id); + rb.PushRaw(m_system_settings.mii_author_id); } void ISystemSettingsServer::GetAutoUpdateEnableFlag(HLERequestContext& ctx) { - u8 auto_update_flag{}; - - LOG_WARNING(Service_SET, "(STUBBED) called, auto_update_flag={}", auto_update_flag); + LOG_INFO(Service_SET, "called, auto_update_flag={}", m_system_settings.auto_update_enable_flag); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push(auto_update_flag); + rb.Push(m_system_settings.auto_update_enable_flag); } void ISystemSettingsServer::GetBatteryPercentageFlag(HLERequestContext& ctx) { - u8 battery_percentage_flag{1}; - - LOG_WARNING(Service_SET, "(STUBBED) called, battery_percentage_flag={}", - battery_percentage_flag); + LOG_DEBUG(Service_SET, "called, battery_percentage_flag={}", + m_system_settings.battery_percentage_flag); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push(battery_percentage_flag); + rb.Push(m_system_settings.battery_percentage_flag); } void ISystemSettingsServer::SetExternalSteadyClockInternalOffset(HLERequestContext& ctx) { @@ -968,11 +1092,12 @@ void ISystemSettingsServer::GetExternalSteadyClockInternalOffset(HLERequestConte } void ISystemSettingsServer::GetErrorReportSharePermission(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "(STUBBED) called"); + LOG_INFO(Service_SET, "called, error_report_share_permission={}", + m_system_settings.error_report_share_permission); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.PushEnum(ErrorReportSharePermission::Denied); + rb.PushEnum(m_system_settings.error_report_share_permission); } void ISystemSettingsServer::GetAppletLaunchFlags(HLERequestContext& ctx) { @@ -1014,7 +1139,7 @@ void ISystemSettingsServer::GetKeyboardLayout(HLERequestContext& ctx) { } void ISystemSettingsServer::GetDeviceTimeZoneLocationUpdatedTime(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called."); + LOG_INFO(Service_SET, "called"); Service::Time::Clock::SteadyClockTimePoint time_point{}; auto res = GetDeviceTimeZoneLocationUpdatedTime(time_point); @@ -1025,7 +1150,7 @@ void ISystemSettingsServer::GetDeviceTimeZoneLocationUpdatedTime(HLERequestConte } void ISystemSettingsServer::SetDeviceTimeZoneLocationUpdatedTime(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called."); + LOG_INFO(Service_SET, "called"); IPC::RequestParser rp{ctx}; auto time_point{rp.PopRaw<Service::Time::Clock::SteadyClockTimePoint>()}; @@ -1038,7 +1163,7 @@ void ISystemSettingsServer::SetDeviceTimeZoneLocationUpdatedTime(HLERequestConte void ISystemSettingsServer::GetUserSystemClockAutomaticCorrectionUpdatedTime( HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called."); + LOG_INFO(Service_SET, "called"); Service::Time::Clock::SteadyClockTimePoint time_point{}; auto res = GetUserSystemClockAutomaticCorrectionUpdatedTime(time_point); @@ -1050,7 +1175,7 @@ void ISystemSettingsServer::GetUserSystemClockAutomaticCorrectionUpdatedTime( void ISystemSettingsServer::SetUserSystemClockAutomaticCorrectionUpdatedTime( HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "called."); + LOG_INFO(Service_SET, "called"); IPC::RequestParser rp{ctx}; auto time_point{rp.PopRaw<Service::Time::Clock::SteadyClockTimePoint>()}; @@ -1062,11 +1187,12 @@ void ISystemSettingsServer::SetUserSystemClockAutomaticCorrectionUpdatedTime( } void ISystemSettingsServer::GetChineseTraditionalInputMethod(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "(STUBBED) called"); + LOG_INFO(Service_SET, "called, chinese_traditional_input_method={}", + m_system_settings.chinese_traditional_input_method); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.PushEnum(ChineseTraditionalInputMethod::Unknown0); + rb.PushEnum(m_system_settings.chinese_traditional_input_method); } void ISystemSettingsServer::GetHomeMenuScheme(HLERequestContext& ctx) { @@ -1094,11 +1220,11 @@ void ISystemSettingsServer::GetHomeMenuSchemeModel(HLERequestContext& ctx) { } void ISystemSettingsServer::GetFieldTestingFlag(HLERequestContext& ctx) { - LOG_WARNING(Service_SET, "(STUBBED) called"); + LOG_INFO(Service_SET, "called, field_testing_flag={}", m_system_settings.field_testing_flag); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push<u8>(false); + rb.Push(m_system_settings.field_testing_flag); } void ISystemSettingsServer::SetupSettings() { diff --git a/src/core/hle/service/set/system_settings_server.h b/src/core/hle/service/set/system_settings_server.h index 6f587e0b3..32716f567 100644 --- a/src/core/hle/service/set/system_settings_server.h +++ b/src/core/hle/service/set/system_settings_server.h @@ -12,10 +12,11 @@ #include "common/uuid.h" #include "core/hle/result.h" #include "core/hle/service/service.h" -#include "core/hle/service/set/appln_settings.h" -#include "core/hle/service/set/device_settings.h" -#include "core/hle/service/set/private_settings.h" -#include "core/hle/service/set/system_settings.h" +#include "core/hle/service/set/setting_formats/appln_settings.h" +#include "core/hle/service/set/setting_formats/device_settings.h" +#include "core/hle/service/set/setting_formats/private_settings.h" +#include "core/hle/service/set/setting_formats/system_settings.h" +#include "core/hle/service/set/settings_types.h" #include "core/hle/service/time/clock_types.h" #include "core/hle/service/time/time_zone_types.h" @@ -24,25 +25,6 @@ class System; } namespace Service::Set { -enum class GetFirmwareVersionType { - Version1, - Version2, -}; - -struct FirmwareVersionFormat { - u8 major; - u8 minor; - u8 micro; - INSERT_PADDING_BYTES(1); - u8 revision_major; - u8 revision_minor; - INSERT_PADDING_BYTES(2); - std::array<char, 0x20> platform; - std::array<u8, 0x40> version_hash; - std::array<char, 0x18> display_version; - std::array<char, 0x80> display_title; -}; -static_assert(sizeof(FirmwareVersionFormat) == 0x100, "FirmwareVersionFormat is an invalid size"); Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System& system, GetFirmwareVersionType type); @@ -55,6 +37,18 @@ public: Result GetSettingsItemValue(std::vector<u8>& out_value, const std::string& category, const std::string& name); + template <typename T> + Result GetSettingsItemValue(T& value, const std::string& category, const std::string& name) { + std::vector<u8> data; + const auto result = GetSettingsItemValue(data, category, name); + if (result.IsError()) { + return result; + } + ASSERT(data.size() >= sizeof(T)); + std::memcpy(&value, data.data(), sizeof(T)); + return result; + } + Result GetExternalSteadyClockSourceId(Common::UUID& out_id); Result SetExternalSteadyClockSourceId(Common::UUID id); Result GetUserSystemClockContext(Service::Time::Clock::SystemClockContext& out_context); @@ -80,6 +74,8 @@ private: void SetLanguageCode(HLERequestContext& ctx); void GetFirmwareVersion(HLERequestContext& ctx); void GetFirmwareVersion2(HLERequestContext& ctx); + void GetLockScreenFlag(HLERequestContext& ctx); + void SetLockScreenFlag(HLERequestContext& ctx); void GetExternalSteadyClockSourceId(HLERequestContext& ctx); void SetExternalSteadyClockSourceId(HLERequestContext& ctx); void GetUserSystemClockContext(HLERequestContext& ctx); @@ -108,13 +104,19 @@ private: void IsUserSystemClockAutomaticCorrectionEnabled(HLERequestContext& ctx); void SetUserSystemClockAutomaticCorrectionEnabled(HLERequestContext& ctx); void GetPrimaryAlbumStorage(HLERequestContext& ctx); + void GetNfcEnableFlag(HLERequestContext& ctx); + void SetNfcEnableFlag(HLERequestContext& ctx); void GetSleepSettings(HLERequestContext& ctx); void SetSleepSettings(HLERequestContext& ctx); + void GetWirelessLanEnableFlag(HLERequestContext& ctx); + void SetWirelessLanEnableFlag(HLERequestContext& ctx); void GetInitialLaunchSettings(HLERequestContext& ctx); void SetInitialLaunchSettings(HLERequestContext& ctx); void GetDeviceNickName(HLERequestContext& ctx); void SetDeviceNickName(HLERequestContext& ctx); void GetProductModel(HLERequestContext& ctx); + void GetBluetoothEnableFlag(HLERequestContext& ctx); + void SetBluetoothEnableFlag(HLERequestContext& ctx); void GetMiiAuthorId(HLERequestContext& ctx); void GetAutoUpdateEnableFlag(HLERequestContext& ctx); void GetBatteryPercentageFlag(HLERequestContext& ctx); diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp index e2d9cd98a..725311c53 100644 --- a/src/core/hle/service/vi/display/vi_display.cpp +++ b/src/core/hle/service/vi/display/vi_display.cpp @@ -91,6 +91,10 @@ void Display::CreateLayer(u64 layer_id, u32 binder_id, layers.emplace_back(std::make_unique<Layer>(layer_id, binder_id, *core, *producer, std::move(buffer_item_consumer))); + if (is_abandoned) { + this->FindLayer(layer_id)->GetConsumer().Abandon(); + } + hos_binder_driver_server.RegisterProducer(std::move(producer)); } @@ -103,6 +107,13 @@ void Display::DestroyLayer(u64 layer_id) { [layer_id](const auto& layer) { return layer->GetLayerId() == layer_id; }); } +void Display::Abandon() { + for (auto& layer : layers) { + layer->GetConsumer().Abandon(); + } + is_abandoned = true; +} + Layer* Display::FindLayer(u64 layer_id) { const auto itr = std::find_if(layers.begin(), layers.end(), [layer_id](const std::unique_ptr<Layer>& layer) { diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h index 7e68ee79b..8eb8a5155 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/core/hle/service/vi/display/vi_display.h @@ -98,6 +98,8 @@ public: layers.clear(); } + void Abandon(); + /// Attempts to find a layer with the given ID. /// /// @param layer_id The layer ID. @@ -124,6 +126,7 @@ private: std::vector<std::unique_ptr<Layer>> layers; Kernel::KEvent* vsync_event{}; + bool is_abandoned{}; }; } // namespace Service::VI diff --git a/src/core/hle/service/vi/layer/vi_layer.h b/src/core/hle/service/vi/layer/vi_layer.h index 295005e23..f95e2dc71 100644 --- a/src/core/hle/service/vi/layer/vi_layer.h +++ b/src/core/hle/service/vi/layer/vi_layer.h @@ -4,6 +4,7 @@ #pragma once #include <memory> +#include <utility> #include "common/common_types.h" @@ -75,12 +76,12 @@ public: return open; } - void Close() { - open = false; + bool Close() { + return std::exchange(open, false); } - void Open() { - open = true; + bool Open() { + return !std::exchange(open, true); } private: diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 39d5be90d..bfcc27ddc 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -719,7 +719,12 @@ private: return; } - nvnflinger.OpenLayer(layer_id); + if (!nvnflinger.OpenLayer(layer_id)) { + LOG_WARNING(Service_VI, "Tried to open layer which was already open"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultOperationFailed); + return; + } android::OutputParcel parcel; parcel.WriteInterface(NativeWindow{*buffer_queue_id}); @@ -737,7 +742,12 @@ private: LOG_DEBUG(Service_VI, "called. layer_id=0x{:016X}", layer_id); - nvnflinger.CloseLayer(layer_id); + if (!nvnflinger.CloseLayer(layer_id)) { + LOG_WARNING(Service_VI, "Tried to close layer which was not open"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultOperationFailed); + return; + } IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/frontend_common/CMakeLists.txt b/src/frontend_common/CMakeLists.txt index 22e9337c4..94d8cc4c3 100644 --- a/src/frontend_common/CMakeLists.txt +++ b/src/frontend_common/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(frontend_common STATIC config.cpp config.h + content_manager.h ) create_target_directory_groups(frontend_common) diff --git a/src/frontend_common/content_manager.h b/src/frontend_common/content_manager.h new file mode 100644 index 000000000..0b0fee73e --- /dev/null +++ b/src/frontend_common/content_manager.h @@ -0,0 +1,371 @@ +// SPDX-FileCopyrightText: 2024 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include <boost/algorithm/string.hpp> +#include "common/common_types.h" +#include "common/literals.h" +#include "core/core.h" +#include "core/file_sys/common_funcs.h" +#include "core/file_sys/content_archive.h" +#include "core/file_sys/mode.h" +#include "core/file_sys/nca_metadata.h" +#include "core/file_sys/patch_manager.h" +#include "core/file_sys/registered_cache.h" +#include "core/file_sys/submission_package.h" +#include "core/hle/service/filesystem/filesystem.h" +#include "core/loader/loader.h" +#include "core/loader/nca.h" + +namespace ContentManager { + +enum class InstallResult { + Success, + Overwrite, + Failure, + BaseInstallAttempted, +}; + +enum class GameVerificationResult { + Success, + Failed, + NotImplemented, +}; + +/** + * \brief Removes a single installed DLC + * \param fs_controller [FileSystemController] reference from the Core::System instance + * \param title_id Unique title ID representing the DLC which will be removed + * \return 'true' if successful + */ +inline bool RemoveDLC(const Service::FileSystem::FileSystemController& fs_controller, + const u64 title_id) { + return fs_controller.GetUserNANDContents()->RemoveExistingEntry(title_id) || + fs_controller.GetSDMCContents()->RemoveExistingEntry(title_id); +} + +/** + * \brief Removes all DLC for a game + * \param system Raw pointer to the system instance + * \param program_id Program ID for the game that will have all of its DLC removed + * \return Number of DLC removed + */ +inline size_t RemoveAllDLC(Core::System* system, const u64 program_id) { + size_t count{}; + const auto& fs_controller = system->GetFileSystemController(); + const auto dlc_entries = system->GetContentProvider().ListEntriesFilter( + FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); + std::vector<u64> program_dlc_entries; + + for (const auto& entry : dlc_entries) { + if (FileSys::GetBaseTitleID(entry.title_id) == program_id) { + program_dlc_entries.push_back(entry.title_id); + } + } + + for (const auto& entry : program_dlc_entries) { + if (RemoveDLC(fs_controller, entry)) { + ++count; + } + } + return count; +} + +/** + * \brief Removes the installed update for a game + * \param fs_controller [FileSystemController] reference from the Core::System instance + * \param program_id Program ID for the game that will have its installed update removed + * \return 'true' if successful + */ +inline bool RemoveUpdate(const Service::FileSystem::FileSystemController& fs_controller, + const u64 program_id) { + const auto update_id = program_id | 0x800; + return fs_controller.GetUserNANDContents()->RemoveExistingEntry(update_id) || + fs_controller.GetSDMCContents()->RemoveExistingEntry(update_id); +} + +/** + * \brief Removes the base content for a game + * \param fs_controller [FileSystemController] reference from the Core::System instance + * \param program_id Program ID for the game that will have its base content removed + * \return 'true' if successful + */ +inline bool RemoveBaseContent(const Service::FileSystem::FileSystemController& fs_controller, + const u64 program_id) { + return fs_controller.GetUserNANDContents()->RemoveExistingEntry(program_id) || + fs_controller.GetSDMCContents()->RemoveExistingEntry(program_id); +} + +/** + * \brief Removes a mod for a game + * \param fs_controller [FileSystemController] reference from the Core::System instance + * \param program_id Program ID for the game where [mod_name] will be removed + * \param mod_name The name of a mod as given by FileSys::PatchManager::GetPatches. This corresponds + * with the name of the mod's directory in a game's load folder. + * \return 'true' if successful + */ +inline bool RemoveMod(const Service::FileSystem::FileSystemController& fs_controller, + const u64 program_id, const std::string& mod_name) { + // Check general Mods (LayeredFS and IPS) + const auto mod_dir = fs_controller.GetModificationLoadRoot(program_id); + if (mod_dir != nullptr) { + return mod_dir->DeleteSubdirectoryRecursive(mod_name); + } + + // Check SDMC mod directory (RomFS LayeredFS) + const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(program_id); + if (sdmc_mod_dir != nullptr) { + return sdmc_mod_dir->DeleteSubdirectoryRecursive(mod_name); + } + + return false; +} + +/** + * \brief Installs an NSP + * \param system Raw pointer to the system instance + * \param vfs Raw pointer to the VfsFilesystem instance in Core::System + * \param filename Path to the NSP file + * \param callback Callback to report the progress of the installation. The first size_t + * parameter is the total size of the virtual file and the second is the current progress. If you + * return true to the callback, it will cancel the installation as soon as possible. + * \return [InstallResult] representing how the installation finished + */ +inline InstallResult InstallNSP(Core::System* system, FileSys::VfsFilesystem* vfs, + const std::string& filename, + const std::function<bool(size_t, size_t)>& callback) { + const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, + std::size_t block_size) { + if (src == nullptr || dest == nullptr) { + return false; + } + if (!dest->Resize(src->GetSize())) { + return false; + } + + using namespace Common::Literals; + std::vector<u8> buffer(1_MiB); + + for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) { + if (callback(src->GetSize(), i)) { + dest->Resize(0); + return false; + } + const auto read = src->Read(buffer.data(), buffer.size(), i); + dest->Write(buffer.data(), read, i); + } + return true; + }; + + std::shared_ptr<FileSys::NSP> nsp; + FileSys::VirtualFile file = vfs->OpenFile(filename, FileSys::Mode::Read); + if (boost::to_lower_copy(file->GetName()).ends_with(std::string("nsp"))) { + nsp = std::make_shared<FileSys::NSP>(file); + if (nsp->IsExtractedType()) { + return InstallResult::Failure; + } + } else { + return InstallResult::Failure; + } + + if (nsp->GetStatus() != Loader::ResultStatus::Success) { + return InstallResult::Failure; + } + const auto res = + system->GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true, copy); + switch (res) { + case FileSys::InstallResult::Success: + return InstallResult::Success; + case FileSys::InstallResult::OverwriteExisting: + return InstallResult::Overwrite; + case FileSys::InstallResult::ErrorBaseInstall: + return InstallResult::BaseInstallAttempted; + default: + return InstallResult::Failure; + } +} + +/** + * \brief Installs an NCA + * \param vfs Raw pointer to the VfsFilesystem instance in Core::System + * \param filename Path to the NCA file + * \param registered_cache Raw pointer to the registered cache that the NCA will be installed to + * \param title_type Type of NCA package to install + * \param callback Callback to report the progress of the installation. The first size_t + * parameter is the total size of the virtual file and the second is the current progress. If you + * return true to the callback, it will cancel the installation as soon as possible. + * \return [InstallResult] representing how the installation finished + */ +inline InstallResult InstallNCA(FileSys::VfsFilesystem* vfs, const std::string& filename, + FileSys::RegisteredCache* registered_cache, + const FileSys::TitleType title_type, + const std::function<bool(size_t, size_t)>& callback) { + const auto copy = [callback](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, + std::size_t block_size) { + if (src == nullptr || dest == nullptr) { + return false; + } + if (!dest->Resize(src->GetSize())) { + return false; + } + + using namespace Common::Literals; + std::vector<u8> buffer(1_MiB); + + for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) { + if (callback(src->GetSize(), i)) { + dest->Resize(0); + return false; + } + const auto read = src->Read(buffer.data(), buffer.size(), i); + dest->Write(buffer.data(), read, i); + } + return true; + }; + + const auto nca = std::make_shared<FileSys::NCA>(vfs->OpenFile(filename, FileSys::Mode::Read)); + const auto id = nca->GetStatus(); + + // Game updates necessary are missing base RomFS + if (id != Loader::ResultStatus::Success && + id != Loader::ResultStatus::ErrorMissingBKTRBaseRomFS) { + return InstallResult::Failure; + } + + const auto res = registered_cache->InstallEntry(*nca, title_type, true, copy); + if (res == FileSys::InstallResult::Success) { + return InstallResult::Success; + } else if (res == FileSys::InstallResult::OverwriteExisting) { + return InstallResult::Overwrite; + } else { + return InstallResult::Failure; + } +} + +/** + * \brief Verifies the installed contents for a given ManualContentProvider + * \param system Raw pointer to the system instance + * \param provider Raw pointer to the content provider that's tracking indexed games + * \param callback Callback to report the progress of the installation. The first size_t + * parameter is the total size of the installed contents and the second is the current progress. If + * you return true to the callback, it will cancel the installation as soon as possible. + * \return A list of entries that failed to install. Returns an empty vector if successful. + */ +inline std::vector<std::string> VerifyInstalledContents( + Core::System* system, FileSys::ManualContentProvider* provider, + const std::function<bool(size_t, size_t)>& callback) { + // Get content registries. + auto bis_contents = system->GetFileSystemController().GetSystemNANDContents(); + auto user_contents = system->GetFileSystemController().GetUserNANDContents(); + + std::vector<FileSys::RegisteredCache*> content_providers; + if (bis_contents) { + content_providers.push_back(bis_contents); + } + if (user_contents) { + content_providers.push_back(user_contents); + } + + // Get associated NCA files. + std::vector<FileSys::VirtualFile> nca_files; + + // Get all installed IDs. + size_t total_size = 0; + for (auto nca_provider : content_providers) { + const auto entries = nca_provider->ListEntriesFilter(); + + for (const auto& entry : entries) { + auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type); + if (!nca_file) { + continue; + } + + total_size += nca_file->GetSize(); + nca_files.push_back(std::move(nca_file)); + } + } + + // Declare a list of file names which failed to verify. + std::vector<std::string> failed; + + size_t processed_size = 0; + bool cancelled = false; + auto nca_callback = [&](size_t nca_processed, size_t nca_total) { + cancelled = callback(total_size, processed_size + nca_processed); + return !cancelled; + }; + + // Using the NCA loader, determine if all NCAs are valid. + for (auto& nca_file : nca_files) { + Loader::AppLoader_NCA nca_loader(nca_file); + + auto status = nca_loader.VerifyIntegrity(nca_callback); + if (cancelled) { + break; + } + if (status != Loader::ResultStatus::Success) { + FileSys::NCA nca(nca_file); + const auto title_id = nca.GetTitleId(); + std::string title_name = "unknown"; + + const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id), + FileSys::ContentRecordType::Control); + if (control && control->GetStatus() == Loader::ResultStatus::Success) { + const FileSys::PatchManager pm{title_id, system->GetFileSystemController(), + *provider}; + const auto [nacp, logo] = pm.ParseControlNCA(*control); + if (nacp) { + title_name = nacp->GetApplicationName(); + } + } + + if (title_id > 0) { + failed.push_back( + fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name)); + } else { + failed.push_back(fmt::format("{} (unknown)", nca_file->GetName())); + } + } + + processed_size += nca_file->GetSize(); + } + return failed; +} + +/** + * \brief Verifies the contents of a given game + * \param system Raw pointer to the system instance + * \param game_path Patch to the game file + * \param callback Callback to report the progress of the installation. The first size_t + * parameter is the total size of the installed contents and the second is the current progress. If + * you return true to the callback, it will cancel the installation as soon as possible. + * \return GameVerificationResult representing how the verification process finished + */ +inline GameVerificationResult VerifyGameContents( + Core::System* system, const std::string& game_path, + const std::function<bool(size_t, size_t)>& callback) { + const auto loader = Loader::GetLoader( + *system, system->GetFilesystem()->OpenFile(game_path, FileSys::Mode::Read)); + if (loader == nullptr) { + return GameVerificationResult::NotImplemented; + } + + bool cancelled = false; + auto loader_callback = [&](size_t processed, size_t total) { + cancelled = callback(total, processed); + return !cancelled; + }; + + const auto status = loader->VerifyIntegrity(loader_callback); + if (cancelled || status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) { + return GameVerificationResult::NotImplemented; + } + + if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) { + return GameVerificationResult::Failed; + } + return GameVerificationResult::Success; +} + +} // namespace ContentManager diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 2ab93402d..e12e5a77e 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -110,6 +110,7 @@ void EmulatedController::ReloadFromSettings() { original_npad_type = npad_type; } + SetPollingMode(EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active); Disconnect(); if (player.connected) { Connect(); @@ -144,8 +145,8 @@ void EmulatedController::ReloadColorsFromSettings() { void EmulatedController::LoadDevices() { // TODO(german77): Use more buttons to detect the correct device - const auto left_joycon = button_params[Settings::NativeButton::DRight]; - const auto right_joycon = button_params[Settings::NativeButton::A]; + const auto& left_joycon = button_params[Settings::NativeButton::DRight]; + const auto& right_joycon = button_params[Settings::NativeButton::A]; // Triggers for GC controllers trigger_params[LeftIndex] = button_params[Settings::NativeButton::ZL]; @@ -1208,16 +1209,44 @@ void EmulatedController::SetNfc(const Common::Input::CallbackStatus& callback) { controller.nfc_state = controller.nfc_values; } -bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue vibration) { +bool EmulatedController::SetVibration(bool should_vibrate) { + VibrationValue vibration_value = DEFAULT_VIBRATION_VALUE; + if (should_vibrate) { + vibration_value.high_amplitude = 1.0f; + vibration_value.low_amplitude = 1.0f; + } + + return SetVibration(DeviceIndex::Left, vibration_value); +} + +bool EmulatedController::SetVibration(u32 slot, Core::HID::VibrationGcErmCommand erm_command) { + VibrationValue vibration_value = DEFAULT_VIBRATION_VALUE; + if (erm_command == Core::HID::VibrationGcErmCommand::Start) { + vibration_value.high_amplitude = 1.0f; + vibration_value.low_amplitude = 1.0f; + } + + return SetVibration(DeviceIndex::Left, vibration_value); +} + +bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationValue& vibration) { if (!is_initialized) { return false; } - if (device_index >= output_devices.size()) { + if (device_index >= DeviceIndex::MaxDeviceIndex) { return false; } - if (!output_devices[device_index]) { + const std::size_t index = static_cast<std::size_t>(device_index); + if (!output_devices[index]) { + return false; + } + + last_vibration_value = vibration; + + if (!Settings::values.vibration_enabled) { return false; } + const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f; @@ -1239,8 +1268,11 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v .high_frequency = vibration.high_frequency, .type = type, }; - return output_devices[device_index]->SetVibration(status) == - Common::Input::DriverResult::Success; + return output_devices[index]->SetVibration(status) == Common::Input::DriverResult::Success; +} + +VibrationValue EmulatedController::GetActualVibrationValue(DeviceIndex device_index) const { + return last_vibration_value; } bool EmulatedController::IsVibrationEnabled(std::size_t device_index) { diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h index 90e536e07..168abe089 100644 --- a/src/hid_core/frontend/emulated_controller.h +++ b/src/hid_core/frontend/emulated_controller.h @@ -356,10 +356,27 @@ public: const NfcState& GetNfc() const; /** + * Sends an on/off vibration to the left device + * @return true if vibration had no errors + */ + bool SetVibration(bool should_vibrate); + + /** + * Sends an GC vibration to the left device + * @return true if vibration had no errors + */ + bool SetVibration(u32 slot, Core::HID::VibrationGcErmCommand erm_command); + + /** * Sends a specific vibration to the output device * @return true if vibration had no errors */ - bool SetVibration(std::size_t device_index, VibrationValue vibration); + bool SetVibration(DeviceIndex device_index, const VibrationValue& vibration); + + /** + * @return The last sent vibration + */ + VibrationValue GetActualVibrationValue(DeviceIndex device_index) const; /** * Sends a small vibration to the output device @@ -564,6 +581,7 @@ private: f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard}; u32 turbo_button_state{0}; std::size_t nfc_handles{0}; + VibrationValue last_vibration_value{DEFAULT_VIBRATION_VALUE}; // Temporary values to avoid doing changes while the controller is in configuring mode NpadStyleIndex tmp_npad_type{NpadStyleIndex::None}; diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp index 2c5fe6d51..ca824b4a3 100644 --- a/src/hid_core/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -7,6 +7,7 @@ #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/service/ipc_helpers.h" #include "hid_core/hid_core.h" +#include "hid_core/hid_util.h" #include "hid_core/resource_manager.h" #include "hid_core/resources/applet_resource.h" @@ -27,6 +28,10 @@ #include "hid_core/resources/touch_screen/gesture.h" #include "hid_core/resources/touch_screen/touch_screen.h" #include "hid_core/resources/unique_pad/unique_pad.h" +#include "hid_core/resources/vibration/gc_vibration_device.h" +#include "hid_core/resources/vibration/n64_vibration_device.h" +#include "hid_core/resources/vibration/vibration_base.h" +#include "hid_core/resources/vibration/vibration_device.h" namespace Service::HID { @@ -52,6 +57,7 @@ void ResourceManager::Initialize() { system.HIDCore().ReloadInputDevices(); + handheld_config = std::make_shared<HandheldConfig>(); InitializeHidCommonSampler(); InitializeTouchScreenSampler(); InitializeConsoleSixAxisSampler(); @@ -174,7 +180,7 @@ void ResourceManager::InitializeHidCommonSampler() { debug_pad->SetAppletResource(applet_resource, &shared_mutex); digitizer->SetAppletResource(applet_resource, &shared_mutex); keyboard->SetAppletResource(applet_resource, &shared_mutex); - npad->SetNpadExternals(applet_resource, &shared_mutex); + npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config); six_axis->SetAppletResource(applet_resource, &shared_mutex); mouse->SetAppletResource(applet_resource, &shared_mutex); debug_mouse->SetAppletResource(applet_resource, &shared_mutex); @@ -257,6 +263,121 @@ void ResourceManager::EnableTouchScreen(u64 aruid, bool is_enabled) { applet_resource->EnableTouchScreen(aruid, is_enabled); } +NpadVibrationBase* ResourceManager::GetVibrationDevice( + const Core::HID::VibrationDeviceHandle& handle) { + return npad->GetVibrationDevice(handle); +} + +NpadN64VibrationDevice* ResourceManager::GetN64VibrationDevice( + const Core::HID::VibrationDeviceHandle& handle) { + return npad->GetN64VibrationDevice(handle); +} + +NpadVibrationDevice* ResourceManager::GetNSVibrationDevice( + const Core::HID::VibrationDeviceHandle& handle) { + return npad->GetNSVibrationDevice(handle); +} + +NpadGcVibrationDevice* ResourceManager::GetGcVibrationDevice( + const Core::HID::VibrationDeviceHandle& handle) { + return npad->GetGcVibrationDevice(handle); +} + +Result ResourceManager::SetAruidValidForVibration(u64 aruid, bool is_enabled) { + std::scoped_lock lock{shared_mutex}; + const bool has_changed = applet_resource->SetAruidValidForVibration(aruid, is_enabled); + + if (has_changed) { + auto devices = npad->GetAllVibrationDevices(); + for ([[maybe_unused]] auto* device : devices) { + // TODO + } + } + + auto* vibration_handler = npad->GetVibrationHandler(); + if (aruid != vibration_handler->GetSessionAruid()) { + vibration_handler->EndPermitVibrationSession(); + } + + return ResultSuccess; +} + +void ResourceManager::SetForceHandheldStyleVibration(bool is_forced) { + handheld_config->is_force_handheld_style_vibration = is_forced; +} + +Result ResourceManager::IsVibrationAruidActive(u64 aruid, bool& is_active) const { + std::scoped_lock lock{shared_mutex}; + is_active = applet_resource->IsVibrationAruidActive(aruid); + return ResultSuccess; +} + +Result ResourceManager::GetVibrationDeviceInfo(Core::HID::VibrationDeviceInfo& device_info, + const Core::HID::VibrationDeviceHandle& handle) { + bool check_device_index = false; + + const Result is_valid = IsVibrationHandleValid(handle); + if (is_valid.IsError()) { + return is_valid; + } + + switch (handle.npad_type) { + case Core::HID::NpadStyleIndex::Fullkey: + case Core::HID::NpadStyleIndex::Handheld: + case Core::HID::NpadStyleIndex::JoyconDual: + case Core::HID::NpadStyleIndex::JoyconLeft: + case Core::HID::NpadStyleIndex::JoyconRight: + device_info.type = Core::HID::VibrationDeviceType::LinearResonantActuator; + check_device_index = true; + break; + case Core::HID::NpadStyleIndex::GameCube: + device_info.type = Core::HID::VibrationDeviceType::GcErm; + break; + case Core::HID::NpadStyleIndex::N64: + device_info.type = Core::HID::VibrationDeviceType::N64; + break; + default: + device_info.type = Core::HID::VibrationDeviceType::Unknown; + break; + } + + device_info.position = Core::HID::VibrationDevicePosition::None; + if (check_device_index) { + switch (handle.device_index) { + case Core::HID::DeviceIndex::Left: + device_info.position = Core::HID::VibrationDevicePosition::Left; + break; + case Core::HID::DeviceIndex::Right: + device_info.position = Core::HID::VibrationDevicePosition::Right; + break; + case Core::HID::DeviceIndex::None: + default: + ASSERT_MSG(false, "DeviceIndex should never be None!"); + break; + } + } + return ResultSuccess; +} + +Result ResourceManager::SendVibrationValue(u64 aruid, + const Core::HID::VibrationDeviceHandle& handle, + const Core::HID::VibrationValue& value) { + bool has_active_aruid{}; + NpadVibrationDevice* device{nullptr}; + Result result = IsVibrationAruidActive(aruid, has_active_aruid); + + if (result.IsSuccess() && has_active_aruid) { + result = IsVibrationHandleValid(handle); + } + if (result.IsSuccess() && has_active_aruid) { + device = GetNSVibrationDevice(handle); + } + if (device != nullptr) { + result = device->SendVibrationValue(value); + } + return result; +} + void ResourceManager::UpdateControllers(std::chrono::nanoseconds ns_late) { auto& core_timing = system.CoreTiming(); debug_pad->OnUpdate(core_timing); diff --git a/src/hid_core/resource_manager.h b/src/hid_core/resource_manager.h index 7a21d8eb8..128e00125 100644 --- a/src/hid_core/resource_manager.h +++ b/src/hid_core/resource_manager.h @@ -10,6 +10,12 @@ namespace Core { class System; } +namespace Core::HID { +struct VibrationDeviceHandle; +struct VibrationValue; +struct VibrationDeviceInfo; +} // namespace Core::HID + namespace Core::Timing { struct EventType; } @@ -37,6 +43,11 @@ class SixAxis; class SleepButton; class TouchScreen; class UniquePad; +class NpadVibrationBase; +class NpadN64VibrationDevice; +class NpadGcVibrationDevice; +class NpadVibrationDevice; +struct HandheldConfig; class ResourceManager { @@ -79,6 +90,18 @@ public: void EnablePadInput(u64 aruid, bool is_enabled); void EnableTouchScreen(u64 aruid, bool is_enabled); + NpadVibrationBase* GetVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadN64VibrationDevice* GetN64VibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadVibrationDevice* GetNSVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadGcVibrationDevice* GetGcVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + Result SetAruidValidForVibration(u64 aruid, bool is_enabled); + void SetForceHandheldStyleVibration(bool is_forced); + Result IsVibrationAruidActive(u64 aruid, bool& is_active) const; + Result GetVibrationDeviceInfo(Core::HID::VibrationDeviceInfo& device_info, + const Core::HID::VibrationDeviceHandle& handle); + Result SendVibrationValue(u64 aruid, const Core::HID::VibrationDeviceHandle& handle, + const Core::HID::VibrationValue& value); + void UpdateControllers(std::chrono::nanoseconds ns_late); void UpdateNpad(std::chrono::nanoseconds ns_late); void UpdateMouseKeyboard(std::chrono::nanoseconds ns_late); @@ -113,6 +136,8 @@ private: std::shared_ptr<TouchScreen> touch_screen = nullptr; std::shared_ptr<UniquePad> unique_pad = nullptr; + std::shared_ptr<HandheldConfig> handheld_config = nullptr; + // TODO: Create these resources // std::shared_ptr<AudioControl> audio_control = nullptr; // std::shared_ptr<ButtonConfig> button_config = nullptr; diff --git a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp index d4e4181bf..e399edfd7 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp +++ b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp @@ -115,7 +115,7 @@ Result NpadAbstractIrSensorHandler::GetXcdHandleForNpadWithIrSensor(u64& handle) if (sensor_state < NpadIrSensorState::Available) { return ResultIrSensorIsNotReady; } - handle = xcd_handle; + // handle = xcd_handle; return ResultSuccess; } diff --git a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.h b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.h index fe8e005af..997811511 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.h +++ b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.h @@ -7,6 +7,10 @@ #include "core/hle/result.h" #include "hid_core/hid_types.h" +namespace Core::HID { +class EmulatedController; +} + namespace Kernel { class KEvent; class KReadableEvent; @@ -50,7 +54,7 @@ private: s32 ref_counter{}; Kernel::KEvent* ir_sensor_event{nullptr}; - u64 xcd_handle{}; + Core::HID::EmulatedController* xcd_handle{}; NpadIrSensorState sensor_state{}; }; } // namespace Service::HID diff --git a/src/hid_core/resources/abstracted_pad/abstract_pad.cpp b/src/hid_core/resources/abstracted_pad/abstract_pad.cpp index 2c7691d7c..435b095f0 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_pad.cpp +++ b/src/hid_core/resources/abstracted_pad/abstract_pad.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "hid_core/hid_core.h" #include "hid_core/hid_result.h" #include "hid_core/resources/abstracted_pad/abstract_pad.h" #include "hid_core/resources/applet_resource.h" @@ -16,7 +17,7 @@ void AbstractPad::SetExternals(AppletResourceHolder* applet_resource, CaptureButtonResource* capture_button_resource, HomeButtonResource* home_button_resource, SixAxisResource* sixaxis_resource, PalmaResource* palma_resource, - VibrationHandler* vibration) { + NpadVibration* vibration, Core::HID::HIDCore* core) { applet_resource_holder = applet_resource; properties_handler.SetAppletResource(applet_resource_holder); @@ -35,13 +36,14 @@ void AbstractPad::SetExternals(AppletResourceHolder* applet_resource, mcu_handler.SetAbstractPadHolder(&abstract_pad_holder); mcu_handler.SetPropertiesHandler(&properties_handler); - std::array<NpadVibrationDevice*, 2> vibration_devices{&vibration_left, &vibration_right}; vibration_handler.SetAppletResource(applet_resource_holder); vibration_handler.SetAbstractPadHolder(&abstract_pad_holder); vibration_handler.SetPropertiesHandler(&properties_handler); vibration_handler.SetN64Vibration(&vibration_n64); - vibration_handler.SetVibration(vibration_devices); + vibration_handler.SetVibration(&vibration_left, &vibration_right); vibration_handler.SetGcVibration(&vibration_gc); + vibration_handler.SetVibrationHandler(vibration); + vibration_handler.SetHidCore(core); sixaxis_handler.SetAppletResource(applet_resource_holder); sixaxis_handler.SetAbstractPadHolder(&abstract_pad_holder); @@ -239,11 +241,6 @@ NpadVibrationDevice* AbstractPad::GetVibrationDevice(Core::HID::DeviceIndex devi return &vibration_left; } -void AbstractPad::GetLeftRightVibrationDevice(std::vector<NpadVibrationDevice*> list) { - list.emplace_back(&vibration_left); - list.emplace_back(&vibration_right); -} - NpadGcVibrationDevice* AbstractPad::GetGCVibrationDevice() { return &vibration_gc; } diff --git a/src/hid_core/resources/abstracted_pad/abstract_pad.h b/src/hid_core/resources/abstracted_pad/abstract_pad.h index cbdf84af7..329792457 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_pad.h +++ b/src/hid_core/resources/abstracted_pad/abstract_pad.h @@ -32,7 +32,6 @@ class AppletResource; class SixAxisResource; class PalmaResource; class NPadResource; -class AbstractPad; class NpadLastActiveHandler; class NpadIrNfcHandler; class UniquePads; @@ -44,7 +43,6 @@ class NpadGcVibration; class CaptureButtonResource; class HomeButtonResource; -class VibrationHandler; struct HandheldConfig; @@ -57,7 +55,8 @@ public: void SetExternals(AppletResourceHolder* applet_resource, CaptureButtonResource* capture_button_resource, HomeButtonResource* home_button_resource, SixAxisResource* sixaxis_resource, - PalmaResource* palma_resource, VibrationHandler* vibration); + PalmaResource* palma_resource, NpadVibration* vibration, + Core::HID::HIDCore* core); void SetNpadId(Core::HID::NpadIdType npad_id); Result Activate(); @@ -78,7 +77,6 @@ public: NpadN64VibrationDevice* GetN64VibrationDevice(); NpadVibrationDevice* GetVibrationDevice(Core::HID::DeviceIndex device_index); - void GetLeftRightVibrationDevice(std::vector<NpadVibrationDevice*> list); NpadGcVibrationDevice* GetGCVibrationDevice(); Core::HID::NpadIdType GetLastActiveNpad(); diff --git a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp index a00d6c9de..ca64b0a43 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp +++ b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "hid_core/frontend/emulated_controller.h" +#include "hid_core/hid_core.h" #include "hid_core/hid_result.h" #include "hid_core/hid_util.h" #include "hid_core/resources/abstracted_pad/abstract_pad_holder.h" @@ -30,14 +32,22 @@ void NpadAbstractVibrationHandler::SetPropertiesHandler(NpadAbstractPropertiesHa properties_handler = handler; } +void NpadAbstractVibrationHandler::SetVibrationHandler(NpadVibration* handler) { + vibration_handler = handler; +} + +void NpadAbstractVibrationHandler::SetHidCore(Core::HID::HIDCore* core) { + hid_core = core; +} + void NpadAbstractVibrationHandler::SetN64Vibration(NpadN64VibrationDevice* n64_device) { n64_vibration_device = n64_device; } -void NpadAbstractVibrationHandler::SetVibration(std::span<NpadVibrationDevice*> device) { - for (std::size_t i = 0; i < device.size() && i < vibration_device.size(); i++) { - vibration_device[i] = device[i]; - } +void NpadAbstractVibrationHandler::SetVibration(NpadVibrationDevice* left_device, + NpadVibrationDevice* right_device) { + left_vibration_device = left_device; + right_vibration_device = right_device; } void NpadAbstractVibrationHandler::SetGcVibration(NpadGcVibrationDevice* gc_device) { @@ -69,5 +79,29 @@ void NpadAbstractVibrationHandler::UpdateVibrationState() { if (!is_handheld_hid_enabled && is_force_handheld_style_vibration) { // TODO } + + // TODO: This function isn't accurate. It's supposed to get 5 abstracted pads from the + // NpadAbstractPropertiesHandler but this handler isn't fully implemented yet + IAbstractedPad abstracted_pad{}; + const auto npad_id = properties_handler->GetNpadId(); + abstracted_pad.xcd_handle = hid_core->GetEmulatedController(npad_id); + abstracted_pad.internal_flags.is_connected.Assign(abstracted_pad.xcd_handle->IsConnected()); + + if (abstracted_pad.internal_flags.is_connected) { + left_vibration_device->Mount(abstracted_pad, Core::HID::DeviceIndex::Left, + vibration_handler); + right_vibration_device->Mount(abstracted_pad, Core::HID::DeviceIndex::Right, + vibration_handler); + gc_vibration_device->Mount(abstracted_pad, 0, vibration_handler); + gc_vibration_device->Mount(abstracted_pad, 0, vibration_handler); + n64_vibration_device->Mount(abstracted_pad, vibration_handler); + return; + } + + left_vibration_device->Unmount(); + right_vibration_device->Unmount(); + gc_vibration_device->Unmount(); + gc_vibration_device->Unmount(); + n64_vibration_device->Unmount(); } } // namespace Service::HID diff --git a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.h b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.h index aeb07ce86..8bc8129c2 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.h +++ b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.h @@ -9,6 +9,10 @@ #include "core/hle/result.h" #include "hid_core/hid_types.h" +namespace Core::HID { +class HIDCore; +} + namespace Service::HID { struct AppletResourceHolder; class NpadAbstractedPadHolder; @@ -27,9 +31,11 @@ public: void SetAbstractPadHolder(NpadAbstractedPadHolder* holder); void SetAppletResource(AppletResourceHolder* applet_resource); void SetPropertiesHandler(NpadAbstractPropertiesHandler* handler); + void SetVibrationHandler(NpadVibration* handler); + void SetHidCore(Core::HID::HIDCore* core); void SetN64Vibration(NpadN64VibrationDevice* n64_device); - void SetVibration(std::span<NpadVibrationDevice*> device); + void SetVibration(NpadVibrationDevice* left_device, NpadVibrationDevice* right_device); void SetGcVibration(NpadGcVibrationDevice* gc_device); Result IncrementRefCounter(); @@ -41,9 +47,11 @@ private: AppletResourceHolder* applet_resource_holder{nullptr}; NpadAbstractedPadHolder* abstract_pad_holder{nullptr}; NpadAbstractPropertiesHandler* properties_handler{nullptr}; + Core::HID::HIDCore* hid_core{nullptr}; NpadN64VibrationDevice* n64_vibration_device{nullptr}; - std::array<NpadVibrationDevice*, 2> vibration_device{}; + NpadVibrationDevice* left_vibration_device{}; + NpadVibrationDevice* right_vibration_device{}; NpadGcVibrationDevice* gc_vibration_device{nullptr}; NpadVibration* vibration_handler{nullptr}; s32 ref_counter{}; diff --git a/src/hid_core/resources/applet_resource.cpp b/src/hid_core/resources/applet_resource.cpp index a84826050..db4134037 100644 --- a/src/hid_core/resources/applet_resource.cpp +++ b/src/hid_core/resources/applet_resource.cpp @@ -200,6 +200,25 @@ void AppletResource::EnableInput(u64 aruid, bool is_enabled) { data[index].flag.enable_touchscreen.Assign(is_enabled); } +bool AppletResource::SetAruidValidForVibration(u64 aruid, bool is_enabled) { + const u64 index = GetIndexFromAruid(aruid); + if (index >= AruidIndexMax) { + return false; + } + + if (!is_enabled && aruid == active_vibration_aruid) { + active_vibration_aruid = SystemAruid; + return true; + } + + if (is_enabled && aruid != active_vibration_aruid) { + active_vibration_aruid = aruid; + return true; + } + + return false; +} + void AppletResource::EnableSixAxisSensor(u64 aruid, bool is_enabled) { const u64 index = GetIndexFromAruid(aruid); if (index >= AruidIndexMax) { diff --git a/src/hid_core/resources/applet_resource.h b/src/hid_core/resources/applet_resource.h index f3f32bac1..e9710d306 100644 --- a/src/hid_core/resources/applet_resource.h +++ b/src/hid_core/resources/applet_resource.h @@ -101,6 +101,7 @@ public: Result DestroySevenSixAxisTransferMemory(); void EnableInput(u64 aruid, bool is_enabled); + bool SetAruidValidForVibration(u64 aruid, bool is_enabled); void EnableSixAxisSensor(u64 aruid, bool is_enabled); void EnablePadInput(u64 aruid, bool is_enabled); void EnableTouchScreen(u64 aruid, bool is_enabled); diff --git a/src/hid_core/resources/hid_firmware_settings.cpp b/src/hid_core/resources/hid_firmware_settings.cpp index 9fa0db17e..00ceff7e6 100644 --- a/src/hid_core/resources/hid_firmware_settings.cpp +++ b/src/hid_core/resources/hid_firmware_settings.cpp @@ -1,11 +1,14 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "core/hle/service/set/system_settings_server.h" +#include "core/hle/service/sm/sm.h" #include "hid_core/resources/hid_firmware_settings.h" namespace Service::HID { -HidFirmwareSettings::HidFirmwareSettings() { +HidFirmwareSettings::HidFirmwareSettings(Core::System& system) { + m_set_sys = system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys"); LoadSettings(true); } @@ -18,21 +21,25 @@ void HidFirmwareSettings::LoadSettings(bool reload_config) { return; } - // TODO: Use nn::settings::fwdbg::GetSettingsItemValue to load config values - - is_debug_pad_enabled = true; - is_device_managed = true; - is_touch_i2c_managed = is_device_managed; - is_future_devices_emulated = false; - is_mcu_hardware_error_emulated = false; - is_rail_enabled = true; - is_firmware_update_failure_emulated = false; + m_set_sys->GetSettingsItemValue<bool>(is_debug_pad_enabled, "hid_debug", "enables_debugpad"); + m_set_sys->GetSettingsItemValue<bool>(is_device_managed, "hid_debug", "manages_devices"); + m_set_sys->GetSettingsItemValue<bool>(is_touch_i2c_managed, "hid_debug", + "manages_touch_ic_i2c"); + m_set_sys->GetSettingsItemValue<bool>(is_future_devices_emulated, "hid_debug", + "emulate_future_device"); + m_set_sys->GetSettingsItemValue<bool>(is_mcu_hardware_error_emulated, "hid_debug", + "emulate_mcu_hardware_error"); + m_set_sys->GetSettingsItemValue<bool>(is_rail_enabled, "hid_debug", "enables_rail"); + m_set_sys->GetSettingsItemValue<bool>(is_firmware_update_failure_emulated, "hid_debug", + "emulate_firmware_update_failure"); is_firmware_update_failure = {}; - is_ble_disabled = false; - is_dscale_disabled = false; - is_handheld_forced = true; + m_set_sys->GetSettingsItemValue<bool>(is_ble_disabled, "hid_debug", "ble_disabled"); + m_set_sys->GetSettingsItemValue<bool>(is_dscale_disabled, "hid_debug", "dscale_disabled"); + m_set_sys->GetSettingsItemValue<bool>(is_handheld_forced, "hid_debug", "force_handheld"); features_per_id_disabled = {}; - is_touch_firmware_auto_update_disabled = false; + m_set_sys->GetSettingsItemValue<bool>(is_touch_firmware_auto_update_disabled, "hid_debug", + "touch_firmware_auto_update_disabled"); + is_initialized = true; } diff --git a/src/hid_core/resources/hid_firmware_settings.h b/src/hid_core/resources/hid_firmware_settings.h index 00201fd94..3694fa9a3 100644 --- a/src/hid_core/resources/hid_firmware_settings.h +++ b/src/hid_core/resources/hid_firmware_settings.h @@ -5,6 +5,14 @@ #include "common/common_types.h" +namespace Core { +class System; +} + +namespace Service::Set { +class ISystemSettingsServer; +} + namespace Service::HID { /// Loads firmware config from nn::settings::fwdbg @@ -13,7 +21,7 @@ public: using FirmwareSetting = std::array<u8, 4>; using FeaturesPerId = std::array<bool, 0xA8>; - HidFirmwareSettings(); + HidFirmwareSettings(Core::System& system); void Reload(); void LoadSettings(bool reload_config); @@ -49,6 +57,8 @@ private: bool is_touch_firmware_auto_update_disabled{}; FirmwareSetting is_firmware_update_failure{}; FeaturesPerId features_per_id_disabled{}; + + std::shared_ptr<Service::Set::ISystemSettingsServer> m_set_sys; }; } // namespace Service::HID diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp index 97537a2e2..d13a489c9 100644 --- a/src/hid_core/resources/npad/npad.cpp +++ b/src/hid_core/resources/npad/npad.cpp @@ -21,6 +21,7 @@ #include "hid_core/hid_util.h" #include "hid_core/resources/applet_resource.h" #include "hid_core/resources/npad/npad.h" +#include "hid_core/resources/npad/npad_vibration.h" #include "hid_core/resources/shared_memory_format.h" namespace Service::HID { @@ -31,10 +32,6 @@ NPad::NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) { auto& controller = controller_data[aruid_index][i]; controller.device = hid_core.GetEmulatedControllerByIndex(i); - controller.vibration[Core::HID::EmulatedDeviceIndex::LeftIndex].latest_vibration_value = - Core::HID::DEFAULT_VIBRATION_VALUE; - controller.vibration[Core::HID::EmulatedDeviceIndex::RightIndex] - .latest_vibration_value = Core::HID::DEFAULT_VIBRATION_VALUE; Core::HID::ControllerUpdateCallback engine_callback{ .on_change = [this, i](Core::HID::ControllerTriggerType type) { ControllerUpdate(type, i); }, @@ -43,6 +40,10 @@ NPad::NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service controller.callback_key = controller.device->SetCallback(engine_callback); } } + for (std::size_t i = 0; i < abstracted_pads.size(); ++i) { + abstracted_pads[i] = AbstractPad{}; + abstracted_pads[i].SetNpadId(IndexToNpadIdType(i)); + } } NPad::~NPad() { @@ -359,6 +360,7 @@ void NPad::InitNewlyAddedController(u64 aruid, Core::HID::NpadIdType npad_id) { npad_resource.SignalStyleSetUpdateEvent(aruid, npad_id); WriteEmptyEntry(controller.shared_memory); hid_core.SetLastActiveController(npad_id); + abstracted_pads[NpadIdTypeToIndex(npad_id)].Update(); } void NPad::WriteEmptyEntry(NpadInternalState* npad) { @@ -478,6 +480,10 @@ void NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) { continue; } + if (!data->flag.enable_pad_input) { + continue; + } + RequestPadStateUpdate(aruid, controller.device->GetNpadIdType()); auto& pad_state = controller.npad_pad_state; auto& libnx_state = controller.npad_libnx_state; @@ -740,171 +746,6 @@ bool NPad::SetNpadMode(u64 aruid, Core::HID::NpadIdType& new_npad_id, Core::HID: return true; } -bool NPad::VibrateControllerAtIndex(u64 aruid, Core::HID::NpadIdType npad_id, - std::size_t device_index, - const Core::HID::VibrationValue& vibration_value) { - auto& controller = GetControllerFromNpadIdType(aruid, npad_id); - if (!controller.device->IsConnected()) { - return false; - } - - if (!controller.device->IsVibrationEnabled(device_index)) { - if (controller.vibration[device_index].latest_vibration_value.low_amplitude != 0.0f || - controller.vibration[device_index].latest_vibration_value.high_amplitude != 0.0f) { - // Send an empty vibration to stop any vibrations. - Core::HID::VibrationValue vibration{0.0f, 160.0f, 0.0f, 320.0f}; - controller.device->SetVibration(device_index, vibration); - // Then reset the vibration value to its default value. - controller.vibration[device_index].latest_vibration_value = - Core::HID::DEFAULT_VIBRATION_VALUE; - } - - return false; - } - - if (!Settings::values.enable_accurate_vibrations.GetValue()) { - using std::chrono::duration_cast; - using std::chrono::milliseconds; - using std::chrono::steady_clock; - - const auto now = steady_clock::now(); - - // Filter out non-zero vibrations that are within 15ms of each other. - if ((vibration_value.low_amplitude != 0.0f || vibration_value.high_amplitude != 0.0f) && - duration_cast<milliseconds>( - now - controller.vibration[device_index].last_vibration_timepoint) < - milliseconds(15)) { - return false; - } - - controller.vibration[device_index].last_vibration_timepoint = now; - } - - Core::HID::VibrationValue vibration{ - vibration_value.low_amplitude, vibration_value.low_frequency, - vibration_value.high_amplitude, vibration_value.high_frequency}; - return controller.device->SetVibration(device_index, vibration); -} - -void NPad::VibrateController(u64 aruid, - const Core::HID::VibrationDeviceHandle& vibration_device_handle, - const Core::HID::VibrationValue& vibration_value) { - if (IsVibrationHandleValid(vibration_device_handle).IsError()) { - return; - } - - if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) { - return; - } - - auto& controller = GetControllerFromHandle(aruid, vibration_device_handle); - const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index); - - if (!controller.vibration[device_index].device_mounted || !controller.device->IsConnected()) { - return; - } - - if (vibration_device_handle.device_index == Core::HID::DeviceIndex::None) { - ASSERT_MSG(false, "DeviceIndex should never be None!"); - return; - } - - // Some games try to send mismatched parameters in the device handle, block these. - if ((controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconLeft && - (vibration_device_handle.npad_type == Core::HID::NpadStyleIndex::JoyconRight || - vibration_device_handle.device_index == Core::HID::DeviceIndex::Right)) || - (controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconRight && - (vibration_device_handle.npad_type == Core::HID::NpadStyleIndex::JoyconLeft || - vibration_device_handle.device_index == Core::HID::DeviceIndex::Left))) { - return; - } - - // Filter out vibrations with equivalent values to reduce unnecessary state changes. - if (vibration_value.low_amplitude == - controller.vibration[device_index].latest_vibration_value.low_amplitude && - vibration_value.high_amplitude == - controller.vibration[device_index].latest_vibration_value.high_amplitude) { - return; - } - - if (VibrateControllerAtIndex(aruid, controller.device->GetNpadIdType(), device_index, - vibration_value)) { - controller.vibration[device_index].latest_vibration_value = vibration_value; - } -} - -void NPad::VibrateControllers( - u64 aruid, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles, - std::span<const Core::HID::VibrationValue> vibration_values) { - if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) { - return; - } - - ASSERT_OR_EXECUTE_MSG( - vibration_device_handles.size() == vibration_values.size(), { return; }, - "The amount of device handles does not match with the amount of vibration values," - "this is undefined behavior!"); - - for (std::size_t i = 0; i < vibration_device_handles.size(); ++i) { - VibrateController(aruid, vibration_device_handles[i], vibration_values[i]); - } -} - -Core::HID::VibrationValue NPad::GetLastVibration( - u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const { - if (IsVibrationHandleValid(vibration_device_handle).IsError()) { - return {}; - } - - const auto& controller = GetControllerFromHandle(aruid, vibration_device_handle); - const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index); - return controller.vibration[device_index].latest_vibration_value; -} - -void NPad::InitializeVibrationDevice( - const Core::HID::VibrationDeviceHandle& vibration_device_handle) { - if (IsVibrationHandleValid(vibration_device_handle).IsError()) { - return; - } - - const auto aruid = applet_resource_holder.applet_resource->GetActiveAruid(); - const auto npad_index = static_cast<Core::HID::NpadIdType>(vibration_device_handle.npad_id); - const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index); - - if (aruid == 0) { - return; - } - - InitializeVibrationDeviceAtIndex(aruid, npad_index, device_index); -} - -void NPad::InitializeVibrationDeviceAtIndex(u64 aruid, Core::HID::NpadIdType npad_id, - std::size_t device_index) { - auto& controller = GetControllerFromNpadIdType(aruid, npad_id); - if (!Settings::values.vibration_enabled.GetValue()) { - controller.vibration[device_index].device_mounted = false; - return; - } - - controller.vibration[device_index].device_mounted = - controller.device->IsVibrationEnabled(device_index); -} - -void NPad::SetPermitVibrationSession(bool permit_vibration_session) { - permit_vibration_session_enabled = permit_vibration_session; -} - -bool NPad::IsVibrationDeviceMounted( - u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const { - if (IsVibrationHandleValid(vibration_device_handle).IsError()) { - return false; - } - - const auto& controller = GetControllerFromHandle(aruid, vibration_device_handle); - const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index); - return controller.vibration[device_index].device_mounted; -} - Result NPad::AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event, Core::HID::NpadIdType npad_id) { std::scoped_lock lock{mutex}; @@ -936,11 +777,6 @@ Result NPad::DisconnectNpad(u64 aruid, Core::HID::NpadIdType npad_id) { LOG_DEBUG(Service_HID, "Npad disconnected {}", npad_id); auto& controller = GetControllerFromNpadIdType(aruid, npad_id); - for (std::size_t device_idx = 0; device_idx < controller.vibration.size(); ++device_idx) { - // Send an empty vibration to stop any vibrations. - VibrateControllerAtIndex(aruid, npad_id, device_idx, {}); - controller.vibration[device_idx].device_mounted = false; - } auto* shared_memory = controller.shared_memory; // Don't reset shared_memory->assignment_mode this value is persistent @@ -1232,26 +1068,28 @@ Result NPad::RegisterAppletResourceUserId(u64 aruid) { } void NPad::UnregisterAppletResourceUserId(u64 aruid) { + // TODO: Remove this once abstract pad is emulated properly + const auto aruid_index = npad_resource.GetIndexFromAruid(aruid); + for (auto& controller : controller_data[aruid_index]) { + controller.is_connected = false; + controller.shared_memory = nullptr; + } + npad_resource.UnregisterAppletResourceUserId(aruid); } void NPad::SetNpadExternals(std::shared_ptr<AppletResource> resource, - std::recursive_mutex* shared_mutex) { + std::recursive_mutex* shared_mutex, + std::shared_ptr<HandheldConfig> handheld_config) { applet_resource_holder.applet_resource = resource; applet_resource_holder.shared_mutex = shared_mutex; applet_resource_holder.shared_npad_resource = &npad_resource; -} - -NPad::NpadControllerData& NPad::GetControllerFromHandle( - u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) { - const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id); - return GetControllerFromNpadIdType(aruid, npad_id); -} + applet_resource_holder.handheld_config = handheld_config; -const NPad::NpadControllerData& NPad::GetControllerFromHandle( - u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) const { - const auto npad_id = static_cast<Core::HID::NpadIdType>(device_handle.npad_id); - return GetControllerFromNpadIdType(aruid, npad_id); + for (auto& abstract_pad : abstracted_pads) { + abstract_pad.SetExternals(&applet_resource_holder, nullptr, nullptr, nullptr, nullptr, + &vibration_handler, &hid_core); + } } NPad::NpadControllerData& NPad::GetControllerFromHandle( @@ -1389,4 +1227,106 @@ Result NPad::GetLastActiveNpad(Core::HID::NpadIdType& out_npad_id) const { return ResultSuccess; } +NpadVibration* NPad::GetVibrationHandler() { + return &vibration_handler; +} + +std::vector<NpadVibrationBase*> NPad::GetAllVibrationDevices() { + std::vector<NpadVibrationBase*> vibration_devices; + + for (auto& abstract_pad : abstracted_pads) { + auto* left_device = abstract_pad.GetVibrationDevice(Core::HID::DeviceIndex::Left); + auto* right_device = abstract_pad.GetVibrationDevice(Core::HID::DeviceIndex::Right); + auto* n64_device = abstract_pad.GetGCVibrationDevice(); + auto* gc_device = abstract_pad.GetGCVibrationDevice(); + + if (left_device != nullptr) { + vibration_devices.emplace_back(left_device); + } + if (right_device != nullptr) { + vibration_devices.emplace_back(right_device); + } + if (n64_device != nullptr) { + vibration_devices.emplace_back(n64_device); + } + if (gc_device != nullptr) { + vibration_devices.emplace_back(gc_device); + } + } + + return vibration_devices; +} + +NpadVibrationBase* NPad::GetVibrationDevice(const Core::HID::VibrationDeviceHandle& handle) { + if (IsVibrationHandleValid(handle).IsError()) { + return nullptr; + } + + const auto npad_index = NpadIdTypeToIndex(static_cast<Core::HID::NpadIdType>(handle.npad_id)); + const auto style_inde = static_cast<Core::HID::NpadStyleIndex>(handle.npad_type); + if (style_inde == Core::HID::NpadStyleIndex::GameCube) { + return abstracted_pads[npad_index].GetGCVibrationDevice(); + } + if (style_inde == Core::HID::NpadStyleIndex::N64) { + return abstracted_pads[npad_index].GetN64VibrationDevice(); + } + return abstracted_pads[npad_index].GetVibrationDevice(handle.device_index); +} + +NpadN64VibrationDevice* NPad::GetN64VibrationDevice( + const Core::HID::VibrationDeviceHandle& handle) { + if (IsVibrationHandleValid(handle).IsError()) { + return nullptr; + } + + const auto npad_index = NpadIdTypeToIndex(static_cast<Core::HID::NpadIdType>(handle.npad_id)); + const auto style_inde = static_cast<Core::HID::NpadStyleIndex>(handle.npad_type); + if (style_inde != Core::HID::NpadStyleIndex::N64) { + return nullptr; + } + return abstracted_pads[npad_index].GetN64VibrationDevice(); +} + +NpadVibrationDevice* NPad::GetNSVibrationDevice(const Core::HID::VibrationDeviceHandle& handle) { + if (IsVibrationHandleValid(handle).IsError()) { + return nullptr; + } + + const auto npad_index = NpadIdTypeToIndex(static_cast<Core::HID::NpadIdType>(handle.npad_id)); + const auto style_inde = static_cast<Core::HID::NpadStyleIndex>(handle.npad_type); + if (style_inde == Core::HID::NpadStyleIndex::GameCube || + style_inde == Core::HID::NpadStyleIndex::N64) { + return nullptr; + } + + return abstracted_pads[npad_index].GetVibrationDevice(handle.device_index); +} + +NpadGcVibrationDevice* NPad::GetGcVibrationDevice(const Core::HID::VibrationDeviceHandle& handle) { + if (IsVibrationHandleValid(handle).IsError()) { + return nullptr; + } + + const auto npad_index = NpadIdTypeToIndex(static_cast<Core::HID::NpadIdType>(handle.npad_id)); + const auto style_inde = static_cast<Core::HID::NpadStyleIndex>(handle.npad_type); + if (style_inde != Core::HID::NpadStyleIndex::GameCube) { + return nullptr; + } + return abstracted_pads[npad_index].GetGCVibrationDevice(); +} + +void NPad::UpdateHandheldAbstractState() { + std::scoped_lock lock{mutex}; + abstracted_pads[NpadIdTypeToIndex(Core::HID::NpadIdType::Handheld)].Update(); +} + +void NPad::EnableAppletToGetInput(u64 aruid) { + std::scoped_lock lock{mutex}; + std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex}; + + for (auto& abstract_pad : abstracted_pads) { + abstract_pad.EnableAppletToGetInput(aruid); + } +} + } // namespace Service::HID diff --git a/src/hid_core/resources/npad/npad.h b/src/hid_core/resources/npad/npad.h index 01f3dabb1..88289fa2b 100644 --- a/src/hid_core/resources/npad/npad.h +++ b/src/hid_core/resources/npad/npad.h @@ -10,9 +10,15 @@ #include "common/common_types.h" #include "hid_core/hid_types.h" +#include "hid_core/resources/abstracted_pad/abstract_pad.h" #include "hid_core/resources/controller_base.h" #include "hid_core/resources/npad/npad_resource.h" #include "hid_core/resources/npad/npad_types.h" +#include "hid_core/resources/npad/npad_vibration.h" +#include "hid_core/resources/vibration/gc_vibration_device.h" +#include "hid_core/resources/vibration/n64_vibration_device.h" +#include "hid_core/resources/vibration/vibration_base.h" +#include "hid_core/resources/vibration/vibration_device.h" namespace Core::HID { class EmulatedController; @@ -32,6 +38,7 @@ union Result; namespace Service::HID { class AppletResource; +struct HandheldConfig; struct NpadInternalState; struct NpadSixAxisSensorLifo; struct NpadSharedMemoryFormat; @@ -68,31 +75,6 @@ public: bool SetNpadMode(u64 aruid, Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id, NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode); - bool VibrateControllerAtIndex(u64 aruid, Core::HID::NpadIdType npad_id, - std::size_t device_index, - const Core::HID::VibrationValue& vibration_value); - - void VibrateController(u64 aruid, - const Core::HID::VibrationDeviceHandle& vibration_device_handle, - const Core::HID::VibrationValue& vibration_value); - - void VibrateControllers( - u64 aruid, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles, - std::span<const Core::HID::VibrationValue> vibration_values); - - Core::HID::VibrationValue GetLastVibration( - u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const; - - void InitializeVibrationDevice(const Core::HID::VibrationDeviceHandle& vibration_device_handle); - - void InitializeVibrationDeviceAtIndex(u64 aruid, Core::HID::NpadIdType npad_id, - std::size_t device_index); - - void SetPermitVibrationSession(bool permit_vibration_session); - - bool IsVibrationDeviceMounted( - u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const; - Result AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event, Core::HID::NpadIdType npad_id); @@ -145,7 +127,8 @@ public: Result RegisterAppletResourceUserId(u64 aruid); void UnregisterAppletResourceUserId(u64 aruid); void SetNpadExternals(std::shared_ptr<AppletResource> resource, - std::recursive_mutex* shared_mutex); + std::recursive_mutex* shared_mutex, + std::shared_ptr<HandheldConfig> handheld_config); AppletDetailedUiType GetAppletDetailedUiType(Core::HID::NpadIdType npad_id); @@ -161,18 +144,22 @@ public: Result GetLastActiveNpad(Core::HID::NpadIdType& out_npad_id) const; -private: - struct VibrationData { - bool device_mounted{}; - Core::HID::VibrationValue latest_vibration_value{}; - std::chrono::steady_clock::time_point last_vibration_timepoint{}; - }; + NpadVibration* GetVibrationHandler(); + std::vector<NpadVibrationBase*> GetAllVibrationDevices(); + NpadVibrationBase* GetVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadN64VibrationDevice* GetN64VibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadVibrationDevice* GetNSVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + NpadGcVibrationDevice* GetGcVibrationDevice(const Core::HID::VibrationDeviceHandle& handle); + + void UpdateHandheldAbstractState(); + + void EnableAppletToGetInput(u64 aruid); +private: struct NpadControllerData { NpadInternalState* shared_memory = nullptr; Core::HID::EmulatedController* device = nullptr; - std::array<VibrationData, 2> vibration{}; bool is_connected{}; // Dual joycons can have only one side connected @@ -192,10 +179,6 @@ private: void WriteEmptyEntry(NpadInternalState* npad); NpadControllerData& GetControllerFromHandle( - u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle); - const NpadControllerData& GetControllerFromHandle( - u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) const; - NpadControllerData& GetControllerFromHandle( u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle); const NpadControllerData& GetControllerFromHandle( u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const; @@ -215,11 +198,13 @@ private: mutable std::mutex mutex; NPadResource npad_resource; AppletResourceHolder applet_resource_holder{}; + std::array<AbstractPad, MaxSupportedNpadIdTypes> abstracted_pads; + NpadVibration vibration_handler{}; + Kernel::KEvent* input_event{nullptr}; std::mutex* input_mutex{nullptr}; std::atomic<u64> press_state{}; - bool permit_vibration_session_enabled; std::array<std::array<NpadControllerData, MaxSupportedNpadIdTypes>, AruidIndexMax> controller_data{}; }; diff --git a/src/hid_core/resources/npad/npad_types.h b/src/hid_core/resources/npad/npad_types.h index fd86c8e40..92700d69a 100644 --- a/src/hid_core/resources/npad/npad_types.h +++ b/src/hid_core/resources/npad/npad_types.h @@ -8,6 +8,10 @@ #include "common/common_types.h" #include "hid_core/hid_types.h" +namespace Core::HID { +class EmulatedController; +} + namespace Service::HID { static constexpr std::size_t MaxSupportedNpadIdTypes = 10; static constexpr std::size_t StyleIndexCount = 7; @@ -348,7 +352,7 @@ struct IAbstractedPad { u8 indicator; std::vector<f32> virtual_six_axis_sensor_acceleration; std::vector<f32> virtual_six_axis_sensor_angle; - u64 xcd_handle; + Core::HID::EmulatedController* xcd_handle; u64 color; }; } // namespace Service::HID diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp index 7056e8eab..05aad4c54 100644 --- a/src/hid_core/resources/npad/npad_vibration.cpp +++ b/src/hid_core/resources/npad/npad_vibration.cpp @@ -77,4 +77,8 @@ Result NpadVibration::EndPermitVibrationSession() { return ResultSuccess; } +u64 NpadVibration::GetSessionAruid() const { + return session_aruid; +} + } // namespace Service::HID diff --git a/src/hid_core/resources/npad/npad_vibration.h b/src/hid_core/resources/npad/npad_vibration.h index 0748aeffc..d5a95f2a0 100644 --- a/src/hid_core/resources/npad/npad_vibration.h +++ b/src/hid_core/resources/npad/npad_vibration.h @@ -25,6 +25,8 @@ public: Result BeginPermitVibrationSession(u64 aruid); Result EndPermitVibrationSession(); + u64 GetSessionAruid() const; + private: f32 volume{}; u64 session_aruid{}; diff --git a/src/hid_core/resources/vibration/gc_vibration_device.cpp b/src/hid_core/resources/vibration/gc_vibration_device.cpp index f01f81b9a..ad42b9d66 100644 --- a/src/hid_core/resources/vibration/gc_vibration_device.cpp +++ b/src/hid_core/resources/vibration/gc_vibration_device.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_result.h" #include "hid_core/resources/npad/npad_types.h" #include "hid_core/resources/npad/npad_vibration.h" @@ -10,24 +11,25 @@ namespace Service::HID { NpadGcVibrationDevice::NpadGcVibrationDevice() {} -Result NpadGcVibrationDevice::IncrementRefCounter() { +Result NpadGcVibrationDevice::Activate() { if (ref_counter == 0 && is_mounted) { f32 volume = 1.0f; const auto result = vibration_handler->GetVibrationVolume(volume); if (result.IsSuccess()) { - // TODO: SendVibrationGcErmCommand + xcd_handle->SetVibration(adapter_slot, Core::HID::VibrationGcErmCommand::Stop); } } + ref_counter++; return ResultSuccess; } -Result NpadGcVibrationDevice::DecrementRefCounter() { - if (ref_counter == 1 && !is_mounted) { +Result NpadGcVibrationDevice::Deactivate() { + if (ref_counter == 1 && is_mounted) { f32 volume = 1.0f; const auto result = vibration_handler->GetVibrationVolume(volume); if (result.IsSuccess()) { - // TODO: SendVibrationGcErmCommand + xcd_handle->SetVibration(adapter_slot, Core::HID::VibrationGcErmCommand::Stop); } } @@ -38,6 +40,48 @@ Result NpadGcVibrationDevice::DecrementRefCounter() { return ResultSuccess; } +Result NpadGcVibrationDevice::Mount(IAbstractedPad& abstracted_pad, u32 slot, + NpadVibration* handler) { + if (!abstracted_pad.internal_flags.is_connected) { + return ResultSuccess; + } + + // TODO: This device doesn't use a xcd handle instead has an GC adapter handle. This is just to + // keep compatibility with the front end. + xcd_handle = abstracted_pad.xcd_handle; + adapter_slot = slot; + vibration_handler = handler; + is_mounted = true; + + if (ref_counter == 0) { + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(adapter_slot, Core::HID::VibrationGcErmCommand::Stop); + } + + return ResultSuccess; +} + +Result NpadGcVibrationDevice::Unmount() { + if (ref_counter == 0 || !is_mounted) { + is_mounted = false; + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(adapter_slot, Core::HID::VibrationGcErmCommand::Stop); + } + + is_mounted = false; + return ResultSuccess; +} + Result NpadGcVibrationDevice::SendVibrationGcErmCommand(Core::HID::VibrationGcErmCommand command) { if (!is_mounted) { return ResultSuccess; @@ -55,7 +99,7 @@ Result NpadGcVibrationDevice::SendVibrationGcErmCommand(Core::HID::VibrationGcEr return ResultSuccess; } } - // TODO: SendVibrationGcErmCommand + xcd_handle->SetVibration(adapter_slot, command); return ResultSuccess; } diff --git a/src/hid_core/resources/vibration/gc_vibration_device.h b/src/hid_core/resources/vibration/gc_vibration_device.h index 87abca57d..c624cbb28 100644 --- a/src/hid_core/resources/vibration/gc_vibration_device.h +++ b/src/hid_core/resources/vibration/gc_vibration_device.h @@ -20,12 +20,18 @@ class NpadGcVibrationDevice final : public NpadVibrationBase { public: explicit NpadGcVibrationDevice(); - Result IncrementRefCounter() override; - Result DecrementRefCounter() override; + Result Activate() override; + Result Deactivate() override; + + Result Mount(IAbstractedPad& abstracted_pad, u32 slot, NpadVibration* handler); + Result Unmount(); Result SendVibrationGcErmCommand(Core::HID::VibrationGcErmCommand command); Result GetActualVibrationGcErmCommand(Core::HID::VibrationGcErmCommand& out_command); Result SendVibrationNotificationPattern(Core::HID::VibrationGcErmCommand command); + +private: + u32 adapter_slot; }; } // namespace Service::HID diff --git a/src/hid_core/resources/vibration/n64_vibration_device.cpp b/src/hid_core/resources/vibration/n64_vibration_device.cpp index 639f87abf..94ad37c8f 100644 --- a/src/hid_core/resources/vibration/n64_vibration_device.cpp +++ b/src/hid_core/resources/vibration/n64_vibration_device.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_result.h" #include "hid_core/resources/npad/npad_types.h" #include "hid_core/resources/npad/npad_vibration.h" @@ -10,12 +11,12 @@ namespace Service::HID { NpadN64VibrationDevice::NpadN64VibrationDevice() {} -Result NpadN64VibrationDevice::IncrementRefCounter() { +Result NpadN64VibrationDevice::Activate() { if (ref_counter == 0 && is_mounted) { f32 volume = 1.0f; const auto result = vibration_handler->GetVibrationVolume(volume); if (result.IsSuccess()) { - // TODO: SendVibrationInBool + xcd_handle->SetVibration(false); } } @@ -23,19 +24,12 @@ Result NpadN64VibrationDevice::IncrementRefCounter() { return ResultSuccess; } -Result NpadN64VibrationDevice::DecrementRefCounter() { - if (ref_counter == 1) { - if (!is_mounted) { - ref_counter = 0; - if (is_mounted != false) { - // TODO: SendVibrationInBool - } - return ResultSuccess; - } +Result NpadN64VibrationDevice::Deactivate() { + if (ref_counter == 1 && is_mounted) { f32 volume = 1.0f; const auto result = vibration_handler->GetVibrationVolume(volume); if (result.IsSuccess()) { - // TODO + xcd_handle->SetVibration(false); } } @@ -46,6 +40,43 @@ Result NpadN64VibrationDevice::DecrementRefCounter() { return ResultSuccess; } +Result NpadN64VibrationDevice::Mount(IAbstractedPad& abstracted_pad, NpadVibration* handler) { + if (!abstracted_pad.internal_flags.is_connected) { + return ResultSuccess; + } + xcd_handle = abstracted_pad.xcd_handle; + vibration_handler = handler; + is_mounted = true; + + if (ref_counter == 0) { + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(false); + } + + return ResultSuccess; +} + +Result NpadN64VibrationDevice::Unmount() { + if (ref_counter == 0 || !is_mounted) { + is_mounted = false; + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(false); + } + + is_mounted = false; + return ResultSuccess; +} + Result NpadN64VibrationDevice::SendValueInBool(bool is_vibrating) { if (ref_counter < 1) { return ResultVibrationNotInitialized; @@ -56,7 +87,7 @@ Result NpadN64VibrationDevice::SendValueInBool(bool is_vibrating) { if (result.IsError()) { return result; } - // TODO: SendVibrationInBool + xcd_handle->SetVibration(false); } return ResultSuccess; } diff --git a/src/hid_core/resources/vibration/n64_vibration_device.h b/src/hid_core/resources/vibration/n64_vibration_device.h index 54e6efc1a..09de7701c 100644 --- a/src/hid_core/resources/vibration/n64_vibration_device.h +++ b/src/hid_core/resources/vibration/n64_vibration_device.h @@ -14,14 +14,18 @@ namespace Service::HID { class NpadVibration; +struct IAbstractedPad; /// Handles Npad request from HID interfaces class NpadN64VibrationDevice final : public NpadVibrationBase { public: explicit NpadN64VibrationDevice(); - Result IncrementRefCounter() override; - Result DecrementRefCounter() override; + Result Activate() override; + Result Deactivate() override; + + Result Mount(IAbstractedPad& abstracted_pad, NpadVibration* handler); + Result Unmount(); Result SendValueInBool(bool is_vibrating); Result SendVibrationNotificationPattern(u32 pattern); diff --git a/src/hid_core/resources/vibration/vibration_base.cpp b/src/hid_core/resources/vibration/vibration_base.cpp index 350f349c2..f28d30406 100644 --- a/src/hid_core/resources/vibration/vibration_base.cpp +++ b/src/hid_core/resources/vibration/vibration_base.cpp @@ -10,12 +10,12 @@ namespace Service::HID { NpadVibrationBase::NpadVibrationBase() {} -Result NpadVibrationBase::IncrementRefCounter() { +Result NpadVibrationBase::Activate() { ref_counter++; return ResultSuccess; } -Result NpadVibrationBase::DecrementRefCounter() { +Result NpadVibrationBase::Deactivate() { if (ref_counter > 0) { ref_counter--; } diff --git a/src/hid_core/resources/vibration/vibration_base.h b/src/hid_core/resources/vibration/vibration_base.h index c6c5fc4d9..69c26e669 100644 --- a/src/hid_core/resources/vibration/vibration_base.h +++ b/src/hid_core/resources/vibration/vibration_base.h @@ -6,6 +6,10 @@ #include "common/common_types.h" #include "core/hle/result.h" +namespace Core::HID { +class EmulatedController; +} + namespace Service::HID { class NpadVibration; @@ -14,13 +18,13 @@ class NpadVibrationBase { public: explicit NpadVibrationBase(); - virtual Result IncrementRefCounter(); - virtual Result DecrementRefCounter(); + virtual Result Activate(); + virtual Result Deactivate(); bool IsVibrationMounted() const; protected: - u64 xcd_handle{}; + Core::HID::EmulatedController* xcd_handle{nullptr}; s32 ref_counter{}; bool is_mounted{}; NpadVibration* vibration_handler{nullptr}; diff --git a/src/hid_core/resources/vibration/vibration_device.cpp b/src/hid_core/resources/vibration/vibration_device.cpp index 888c3a7ed..08b14591f 100644 --- a/src/hid_core/resources/vibration/vibration_device.cpp +++ b/src/hid_core/resources/vibration/vibration_device.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_result.h" #include "hid_core/resources/npad/npad_types.h" #include "hid_core/resources/npad/npad_vibration.h" @@ -10,12 +11,30 @@ namespace Service::HID { NpadVibrationDevice::NpadVibrationDevice() {} -Result NpadVibrationDevice::IncrementRefCounter() { +Result NpadVibrationDevice::Activate() { + if (ref_counter == 0 && is_mounted) { + f32 volume = 1.0f; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(device_index, Core::HID::DEFAULT_VIBRATION_VALUE); + // TODO: SendNotificationPattern; + } + } + ref_counter++; return ResultSuccess; } -Result NpadVibrationDevice::DecrementRefCounter() { +Result NpadVibrationDevice::Deactivate() { + if (ref_counter == 1 && is_mounted) { + f32 volume = 1.0f; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(device_index, Core::HID::DEFAULT_VIBRATION_VALUE); + // TODO: SendNotificationPattern; + } + } + if (ref_counter > 0) { ref_counter--; } @@ -23,6 +42,45 @@ Result NpadVibrationDevice::DecrementRefCounter() { return ResultSuccess; } +Result NpadVibrationDevice::Mount(IAbstractedPad& abstracted_pad, Core::HID::DeviceIndex index, + NpadVibration* handler) { + if (!abstracted_pad.internal_flags.is_connected) { + return ResultSuccess; + } + xcd_handle = abstracted_pad.xcd_handle; + device_index = index; + vibration_handler = handler; + is_mounted = true; + + if (ref_counter == 0) { + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(false); + } + + return ResultSuccess; +} + +Result NpadVibrationDevice::Unmount() { + if (ref_counter == 0 || !is_mounted) { + is_mounted = false; + return ResultSuccess; + } + + f32 volume{1.0f}; + const auto result = vibration_handler->GetVibrationVolume(volume); + if (result.IsSuccess()) { + xcd_handle->SetVibration(device_index, Core::HID::DEFAULT_VIBRATION_VALUE); + } + + is_mounted = false; + return ResultSuccess; +} + Result NpadVibrationDevice::SendVibrationValue(const Core::HID::VibrationValue& value) { if (ref_counter == 0) { return ResultVibrationNotInitialized; @@ -37,7 +95,7 @@ Result NpadVibrationDevice::SendVibrationValue(const Core::HID::VibrationValue& return result; } if (volume <= 0.0f) { - // TODO: SendVibrationValue + xcd_handle->SetVibration(device_index, Core::HID::DEFAULT_VIBRATION_VALUE); return ResultSuccess; } @@ -45,7 +103,7 @@ Result NpadVibrationDevice::SendVibrationValue(const Core::HID::VibrationValue& vibration_value.high_amplitude *= volume; vibration_value.low_amplitude *= volume; - // TODO: SendVibrationValue + xcd_handle->SetVibration(device_index, vibration_value); return ResultSuccess; } @@ -63,11 +121,11 @@ Result NpadVibrationDevice::SendVibrationNotificationPattern([[maybe_unused]] u3 pattern = 0; } - // return xcd_handle->SendVibrationNotificationPattern(pattern); + // TODO: SendVibrationNotificationPattern; return ResultSuccess; } -Result NpadVibrationDevice::GetActualVibrationValue(Core::HID::VibrationValue& out_value) { +Result NpadVibrationDevice::GetActualVibrationValue(Core::HID::VibrationValue& out_value) const { if (ref_counter < 1) { return ResultVibrationNotInitialized; } @@ -77,7 +135,7 @@ Result NpadVibrationDevice::GetActualVibrationValue(Core::HID::VibrationValue& o return ResultSuccess; } - // TODO: SendVibrationValue + out_value = xcd_handle->GetActualVibrationValue(device_index); return ResultSuccess; } diff --git a/src/hid_core/resources/vibration/vibration_device.h b/src/hid_core/resources/vibration/vibration_device.h index 3574ad60b..c2f9891d3 100644 --- a/src/hid_core/resources/vibration/vibration_device.h +++ b/src/hid_core/resources/vibration/vibration_device.h @@ -12,6 +12,10 @@ #include "hid_core/resources/npad/npad_types.h" #include "hid_core/resources/vibration/vibration_base.h" +namespace Core::HID { +enum class DeviceIndex : u8; +} + namespace Service::HID { class NpadVibration; @@ -20,16 +24,20 @@ class NpadVibrationDevice final : public NpadVibrationBase { public: explicit NpadVibrationDevice(); - Result IncrementRefCounter(); - Result DecrementRefCounter(); + Result Activate(); + Result Deactivate(); + + Result Mount(IAbstractedPad& abstracted_pad, Core::HID::DeviceIndex index, + NpadVibration* handler); + Result Unmount(); Result SendVibrationValue(const Core::HID::VibrationValue& value); Result SendVibrationNotificationPattern(u32 pattern); - Result GetActualVibrationValue(Core::HID::VibrationValue& out_value); + Result GetActualVibrationValue(Core::HID::VibrationValue& out_value) const; private: - u32 device_index{}; + Core::HID::DeviceIndex device_index{}; }; } // namespace Service::HID diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index 800754554..64a4e0e55 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -12,6 +12,11 @@ namespace Shader::Backend::SPIRV { namespace { class ImageOperands { public: + [[maybe_unused]] static constexpr bool ImageSampleOffsetAllowed = false; + [[maybe_unused]] static constexpr bool ImageGatherOffsetAllowed = true; + [[maybe_unused]] static constexpr bool ImageFetchOffsetAllowed = false; + [[maybe_unused]] static constexpr bool ImageGradientOffsetAllowed = false; + explicit ImageOperands(EmitContext& ctx, bool has_bias, bool has_lod, bool has_lod_clamp, Id lod, const IR::Value& offset) { if (has_bias) { @@ -22,7 +27,7 @@ public: const Id lod_value{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod}; Add(spv::ImageOperandsMask::Lod, lod_value); } - AddOffset(ctx, offset); + AddOffset(ctx, offset, ImageSampleOffsetAllowed); if (has_lod_clamp) { const Id lod_clamp{has_bias ? ctx.OpCompositeExtract(ctx.F32[1], lod, 1) : lod}; Add(spv::ImageOperandsMask::MinLod, lod_clamp); @@ -55,20 +60,17 @@ public: Add(spv::ImageOperandsMask::ConstOffsets, offsets); } - explicit ImageOperands(Id offset, Id lod, Id ms) { + explicit ImageOperands(Id lod, Id ms) { if (Sirit::ValidId(lod)) { Add(spv::ImageOperandsMask::Lod, lod); } - if (Sirit::ValidId(offset)) { - Add(spv::ImageOperandsMask::Offset, offset); - } if (Sirit::ValidId(ms)) { Add(spv::ImageOperandsMask::Sample, ms); } } explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives, - u32 num_derivatives, Id offset, Id lod_clamp) { + u32 num_derivatives, const IR::Value& offset, Id lod_clamp) { if (!Sirit::ValidId(derivatives)) { throw LogicError("Derivatives must be present"); } @@ -83,16 +85,14 @@ public: const Id derivatives_Y{ctx.OpCompositeConstruct( ctx.F32[num_derivatives], std::span{deriv_y_accum.data(), deriv_y_accum.size()})}; Add(spv::ImageOperandsMask::Grad, derivatives_X, derivatives_Y); - if (Sirit::ValidId(offset)) { - Add(spv::ImageOperandsMask::Offset, offset); - } + AddOffset(ctx, offset, ImageGradientOffsetAllowed); if (has_lod_clamp) { Add(spv::ImageOperandsMask::MinLod, lod_clamp); } } explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives_1, Id derivatives_2, - Id offset, Id lod_clamp) { + const IR::Value& offset, Id lod_clamp) { if (!Sirit::ValidId(derivatives_1) || !Sirit::ValidId(derivatives_2)) { throw LogicError("Derivatives must be present"); } @@ -111,9 +111,7 @@ public: const Id derivatives_id2{ctx.OpCompositeConstruct( ctx.F32[3], std::span{deriv_2_accum.data(), deriv_2_accum.size()})}; Add(spv::ImageOperandsMask::Grad, derivatives_id1, derivatives_id2); - if (Sirit::ValidId(offset)) { - Add(spv::ImageOperandsMask::Offset, offset); - } + AddOffset(ctx, offset, ImageGradientOffsetAllowed); if (has_lod_clamp) { Add(spv::ImageOperandsMask::MinLod, lod_clamp); } @@ -132,7 +130,7 @@ public: } private: - void AddOffset(EmitContext& ctx, const IR::Value& offset) { + void AddOffset(EmitContext& ctx, const IR::Value& offset, bool runtime_offset_allowed) { if (offset.IsEmpty()) { return; } @@ -165,7 +163,9 @@ private: break; } } - Add(spv::ImageOperandsMask::Offset, ctx.Def(offset)); + if (runtime_offset_allowed) { + Add(spv::ImageOperandsMask::Offset, ctx.Def(offset)); + } } void Add(spv::ImageOperandsMask new_mask, Id value) { @@ -311,6 +311,37 @@ Id ImageGatherSubpixelOffset(EmitContext& ctx, const IR::TextureInstInfo& info, return coords; } } + +void AddOffsetToCoordinates(EmitContext& ctx, const IR::TextureInstInfo& info, Id& coords, + Id offset) { + if (!Sirit::ValidId(offset)) { + return; + } + + Id result_type{}; + switch (info.type) { + case TextureType::Buffer: + case TextureType::Color1D: + case TextureType::ColorArray1D: { + result_type = ctx.U32[1]; + break; + } + case TextureType::Color2D: + case TextureType::Color2DRect: + case TextureType::ColorArray2D: { + result_type = ctx.U32[2]; + break; + } + case TextureType::Color3D: { + result_type = ctx.U32[3]; + break; + } + case TextureType::ColorCube: + case TextureType::ColorArrayCube: + return; + } + coords = ctx.OpIAdd(result_type, coords, offset); +} } // Anonymous namespace Id EmitBindlessImageSampleImplicitLod(EmitContext&) { @@ -496,6 +527,7 @@ Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id offset, Id lod, Id ms) { const auto info{inst->Flags<IR::TextureInstInfo>()}; + AddOffsetToCoordinates(ctx, info, coords, offset); if (info.type == TextureType::Buffer) { lod = Id{}; } @@ -503,7 +535,7 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id c // This image is multisampled, lod must be implicit lod = Id{}; } - const ImageOperands operands(offset, lod, ms); + const ImageOperands operands(lod, ms); return Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, ctx.F32[4], TextureImage(ctx, info, index), coords, operands.MaskOptional(), operands.Span()); } @@ -548,13 +580,13 @@ Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, I } Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, - Id derivatives, Id offset, Id lod_clamp) { + Id derivatives, const IR::Value& offset, Id lod_clamp) { const auto info{inst->Flags<IR::TextureInstInfo>()}; - const auto operands = - info.num_derivatives == 3 - ? ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, offset, {}, lod_clamp) - : ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, info.num_derivatives, offset, - lod_clamp); + const auto operands = info.num_derivatives == 3 + ? ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, + ctx.Def(offset), {}, lod_clamp) + : ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, + info.num_derivatives, offset, lod_clamp); return Emit(&EmitContext::OpImageSparseSampleExplicitLod, &EmitContext::OpImageSampleExplicitLod, ctx, inst, ctx.F32[4], Texture(ctx, info, index), coords, operands.Mask(), operands.Span()); diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h index 7d34575c8..5c01b1012 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h +++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h @@ -543,7 +543,7 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& i const IR::Value& skip_mips); Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords); Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, - Id derivatives, Id offset, Id lod_clamp); + Id derivatives, const IR::Value& offset, Id lod_clamp); Id EmitImageRead(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords); void EmitImageWrite(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id color); Id EmitIsTextureScaled(EmitContext& ctx, const IR::Value& index); diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cpp index 792ed9615..5e7518d96 100644 --- a/src/video_core/renderer_vulkan/vk_present_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp @@ -329,7 +329,7 @@ void PresentManager::CopyToSwapchainImpl(Frame* frame) { // to account for that. const bool is_suboptimal = swapchain.NeedsRecreation(); const bool size_changed = - swapchain.GetWidth() < frame->width || swapchain.GetHeight() < frame->height; + swapchain.GetWidth() != frame->width || swapchain.GetHeight() != frame->height; if (is_suboptimal || size_changed) { RecreateSwapchain(frame); } diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 90278052a..93b03b917 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -351,7 +351,7 @@ if (APPLE) if (NOT USE_SYSTEM_MOLTENVK) set(MOLTENVK_PLATFORM "macOS") - set(MOLTENVK_VERSION "v1.2.5") + set(MOLTENVK_VERSION "v1.2.7") download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION}) endif() find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED) diff --git a/src/yuzu/configuration/configure_per_game_addons.cpp b/src/yuzu/configuration/configure_per_game_addons.cpp index 140a7fe5d..568775027 100644 --- a/src/yuzu/configuration/configure_per_game_addons.cpp +++ b/src/yuzu/configuration/configure_per_game_addons.cpp @@ -122,9 +122,8 @@ void ConfigurePerGameAddons::LoadConfiguration() { const auto& disabled = Settings::values.disabled_addons[title_id]; - for (const auto& patch : pm.GetPatchVersionNames(update_raw)) { - const auto name = - QString::fromStdString(patch.first).replace(QStringLiteral("[D] "), QString{}); + for (const auto& patch : pm.GetPatches(update_raw)) { + const auto name = QString::fromStdString(patch.name); auto* const first_item = new QStandardItem; first_item->setText(name); @@ -136,7 +135,7 @@ void ConfigurePerGameAddons::LoadConfiguration() { first_item->setCheckState(patch_disabled ? Qt::Unchecked : Qt::Checked); list_items.push_back(QList<QStandardItem*>{ - first_item, new QStandardItem{QString::fromStdString(patch.second)}}); + first_item, new QStandardItem{QString::fromStdString(patch.version)}}); item_model->appendRow(list_items.back()); } diff --git a/src/yuzu/configuration/configure_vibration.cpp b/src/yuzu/configuration/configure_vibration.cpp index d898d8acc..6b1f4527b 100644 --- a/src/yuzu/configuration/configure_vibration.cpp +++ b/src/yuzu/configuration/configure_vibration.cpp @@ -116,8 +116,8 @@ void ConfigureVibration::VibrateController(Core::HID::ControllerTriggerType type .high_amplitude = 1.0f, .high_frequency = 320.0f, }; - controller->SetVibration(0, vibration); - controller->SetVibration(1, vibration); + controller->SetVibration(Core::HID::DeviceIndex::Left, vibration); + controller->SetVibration(Core::HID::DeviceIndex::Right, vibration); // Restore previous values player.vibration_enabled = old_vibration_enabled; @@ -127,7 +127,7 @@ void ConfigureVibration::VibrateController(Core::HID::ControllerTriggerType type void ConfigureVibration::StopVibrations() { for (std::size_t i = 0; i < NUM_PLAYERS; ++i) { auto controller = hid_core.GetEmulatedControllerByIndex(i); - controller->SetVibration(0, Core::HID::DEFAULT_VIBRATION_VALUE); - controller->SetVibration(1, Core::HID::DEFAULT_VIBRATION_VALUE); + controller->SetVibration(Core::HID::DeviceIndex::Left, Core::HID::DEFAULT_VIBRATION_VALUE); + controller->SetVibration(Core::HID::DeviceIndex::Right, Core::HID::DEFAULT_VIBRATION_VALUE); } } diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp index dc006832e..9747e3fb3 100644 --- a/src/yuzu/game_list_worker.cpp +++ b/src/yuzu/game_list_worker.cpp @@ -164,18 +164,19 @@ QString FormatPatchNameVersions(const FileSys::PatchManager& patch_manager, QString out; FileSys::VirtualFile update_raw; loader.ReadUpdateRaw(update_raw); - for (const auto& kv : patch_manager.GetPatchVersionNames(update_raw)) { - const bool is_update = kv.first == "Update" || kv.first == "[D] Update"; + for (const auto& patch : patch_manager.GetPatches(update_raw)) { + const bool is_update = patch.name == "Update"; if (!updatable && is_update) { continue; } - const QString type = QString::fromStdString(kv.first); + const QString type = + QString::fromStdString(patch.enabled ? patch.name : "[D] " + patch.name); - if (kv.second.empty()) { + if (patch.version.empty()) { out.append(QStringLiteral("%1\n").arg(type)); } else { - auto ver = kv.second; + auto ver = patch.version; // Display container name for packed updates if (is_update && ver == "PACKED") { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 33756febf..d8b0beadf 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -47,6 +47,7 @@ #include "core/hle/service/am/applet_oe.h" #include "core/hle/service/am/applets/applets.h" #include "core/hle/service/set/system_settings_server.h" +#include "frontend_common/content_manager.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "yuzu/multiplayer/state.h" @@ -518,12 +519,21 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk continue; } + int user_arg_idx = ++i; bool argument_ok; - const std::size_t selected_user = args[++i].toUInt(&argument_ok); + std::size_t selected_user = args[user_arg_idx].toUInt(&argument_ok); if (!argument_ok) { - LOG_ERROR(Frontend, "Invalid user argument"); - continue; + // try to look it up by username, only finds the first username that matches. + const std::string user_arg_str = args[user_arg_idx].toStdString(); + const auto user_idx = system->GetProfileManager().GetUserIndex(user_arg_str); + + if (user_idx == std::nullopt) { + LOG_ERROR(Frontend, "Invalid user argument"); + continue; + } + + selected_user = user_idx.value(); } if (!system->GetProfileManager().UserExistsIndex(selected_user)) { @@ -532,6 +542,8 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk } Settings::values.current_user = static_cast<s32>(selected_user); + + user_flag_cmd_line = true; continue; } @@ -1942,7 +1954,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t Settings::LogSettings(); - if (UISettings::values.select_user_on_boot) { + if (UISettings::values.select_user_on_boot && !user_flag_cmd_line) { const Core::Frontend::ProfileSelectParameters parameters{ .mode = Service::AM::Applets::UiMode::UserSelector, .invalid_uid_list = {}, @@ -1954,6 +1966,11 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t } } + // If the user specifies -u (successfully) on the cmd line, don't prompt for a user on first + // game startup only. If the user stops emulation and starts a new one, go back to the expected + // behavior of asking. + user_flag_cmd_line = false; + if (!LoadROM(filename, program_id, program_index, launch_type)) { return; } @@ -2460,10 +2477,8 @@ void GMainWindow::OnGameListRemoveInstalledEntry(u64 program_id, InstalledEntryT } void GMainWindow::RemoveBaseContent(u64 program_id, InstalledEntryType type) { - const auto& fs_controller = system->GetFileSystemController(); - const auto res = fs_controller.GetUserNANDContents()->RemoveExistingEntry(program_id) || - fs_controller.GetSDMCContents()->RemoveExistingEntry(program_id); - + const auto res = + ContentManager::RemoveBaseContent(system->GetFileSystemController(), program_id); if (res) { QMessageBox::information(this, tr("Successfully Removed"), tr("Successfully removed the installed base game.")); @@ -2475,11 +2490,7 @@ void GMainWindow::RemoveBaseContent(u64 program_id, InstalledEntryType type) { } void GMainWindow::RemoveUpdateContent(u64 program_id, InstalledEntryType type) { - const auto update_id = program_id | 0x800; - const auto& fs_controller = system->GetFileSystemController(); - const auto res = fs_controller.GetUserNANDContents()->RemoveExistingEntry(update_id) || - fs_controller.GetSDMCContents()->RemoveExistingEntry(update_id); - + const auto res = ContentManager::RemoveUpdate(system->GetFileSystemController(), program_id); if (res) { QMessageBox::information(this, tr("Successfully Removed"), tr("Successfully removed the installed update.")); @@ -2490,22 +2501,7 @@ void GMainWindow::RemoveUpdateContent(u64 program_id, InstalledEntryType type) { } void GMainWindow::RemoveAddOnContent(u64 program_id, InstalledEntryType type) { - u32 count{}; - const auto& fs_controller = system->GetFileSystemController(); - const auto dlc_entries = system->GetContentProvider().ListEntriesFilter( - FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); - - for (const auto& entry : dlc_entries) { - if (FileSys::GetBaseTitleID(entry.title_id) == program_id) { - const auto res = - fs_controller.GetUserNANDContents()->RemoveExistingEntry(entry.title_id) || - fs_controller.GetSDMCContents()->RemoveExistingEntry(entry.title_id); - if (res) { - ++count; - } - } - } - + const size_t count = ContentManager::RemoveAllDLC(system.get(), program_id); if (count == 0) { QMessageBox::warning(this, GetGameListErrorRemoving(type), tr("There are no DLC installed for this title.")); @@ -2790,16 +2786,6 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) { QMessageBox::warning(this, tr("Integrity verification couldn't be performed!"), tr("File contents were not checked for validity.")); }; - const auto Failed = [this] { - QMessageBox::critical(this, tr("Integrity verification failed!"), - tr("File contents may be corrupt.")); - }; - - const auto loader = Loader::GetLoader(*system, vfs->OpenFile(game_path, FileSys::Mode::Read)); - if (loader == nullptr) { - NotImplemented(); - return; - } QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this); progress.setWindowModality(Qt::WindowModal); @@ -2807,30 +2793,26 @@ void GMainWindow::OnGameListVerifyIntegrity(const std::string& game_path) { progress.setAutoClose(false); progress.setAutoReset(false); - const auto QtProgressCallback = [&](size_t processed_size, size_t total_size) { - if (progress.wasCanceled()) { - return false; - } - + const auto QtProgressCallback = [&](size_t total_size, size_t processed_size) { progress.setValue(static_cast<int>((processed_size * 100) / total_size)); - return true; + return progress.wasCanceled(); }; - const auto status = loader->VerifyIntegrity(QtProgressCallback); - if (progress.wasCanceled() || - status == Loader::ResultStatus::ErrorIntegrityVerificationNotImplemented) { + const auto result = + ContentManager::VerifyGameContents(system.get(), game_path, QtProgressCallback); + progress.close(); + switch (result) { + case ContentManager::GameVerificationResult::Success: + QMessageBox::information(this, tr("Integrity verification succeeded!"), + tr("The operation completed successfully.")); + break; + case ContentManager::GameVerificationResult::Failed: + QMessageBox::critical(this, tr("Integrity verification failed!"), + tr("File contents may be corrupt.")); + break; + case ContentManager::GameVerificationResult::NotImplemented: NotImplemented(); - return; } - - if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) { - Failed(); - return; - } - - progress.close(); - QMessageBox::information(this, tr("Integrity verification succeeded!"), - tr("The operation completed successfully.")); } void GMainWindow::OnGameListCopyTID(u64 program_id) { @@ -3274,12 +3256,21 @@ void GMainWindow::OnMenuInstallToNAND() { install_progress->setLabelText( tr("Installing file \"%1\"...").arg(QFileInfo(file).fileName())); - QFuture<InstallResult> future; - InstallResult result; + QFuture<ContentManager::InstallResult> future; + ContentManager::InstallResult result; if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) { - - future = QtConcurrent::run([this, &file] { return InstallNSP(file); }); + const auto progress_callback = [this](size_t size, size_t progress) { + emit UpdateInstallProgress(); + if (install_progress->wasCanceled()) { + return true; + } + return false; + }; + future = QtConcurrent::run([this, &file, progress_callback] { + return ContentManager::InstallNSP(system.get(), vfs.get(), file.toStdString(), + progress_callback); + }); while (!future.isFinished()) { QCoreApplication::processEvents(); @@ -3295,16 +3286,16 @@ void GMainWindow::OnMenuInstallToNAND() { std::this_thread::sleep_for(std::chrono::milliseconds(10)); switch (result) { - case InstallResult::Success: + case ContentManager::InstallResult::Success: new_files.append(QFileInfo(file).fileName()); break; - case InstallResult::Overwrite: + case ContentManager::InstallResult::Overwrite: overwritten_files.append(QFileInfo(file).fileName()); break; - case InstallResult::Failure: + case ContentManager::InstallResult::Failure: failed_files.append(QFileInfo(file).fileName()); break; - case InstallResult::BaseInstallAttempted: + case ContentManager::InstallResult::BaseInstallAttempted: failed_files.append(QFileInfo(file).fileName()); detected_base_install = true; break; @@ -3338,96 +3329,7 @@ void GMainWindow::OnMenuInstallToNAND() { ui->action_Install_File_NAND->setEnabled(true); } -InstallResult GMainWindow::InstallNSP(const QString& filename) { - const auto qt_raw_copy = [this](const FileSys::VirtualFile& src, - const FileSys::VirtualFile& dest, std::size_t block_size) { - if (src == nullptr || dest == nullptr) { - return false; - } - if (!dest->Resize(src->GetSize())) { - return false; - } - - std::vector<u8> buffer(CopyBufferSize); - - for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) { - if (install_progress->wasCanceled()) { - dest->Resize(0); - return false; - } - - emit UpdateInstallProgress(); - - const auto read = src->Read(buffer.data(), buffer.size(), i); - dest->Write(buffer.data(), read, i); - } - return true; - }; - - std::shared_ptr<FileSys::NSP> nsp; - if (filename.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) { - nsp = std::make_shared<FileSys::NSP>( - vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read)); - if (nsp->IsExtractedType()) { - return InstallResult::Failure; - } - } else { - return InstallResult::Failure; - } - - if (nsp->GetStatus() != Loader::ResultStatus::Success) { - return InstallResult::Failure; - } - const auto res = system->GetFileSystemController().GetUserNANDContents()->InstallEntry( - *nsp, true, qt_raw_copy); - switch (res) { - case FileSys::InstallResult::Success: - return InstallResult::Success; - case FileSys::InstallResult::OverwriteExisting: - return InstallResult::Overwrite; - case FileSys::InstallResult::ErrorBaseInstall: - return InstallResult::BaseInstallAttempted; - default: - return InstallResult::Failure; - } -} - -InstallResult GMainWindow::InstallNCA(const QString& filename) { - const auto qt_raw_copy = [this](const FileSys::VirtualFile& src, - const FileSys::VirtualFile& dest, std::size_t block_size) { - if (src == nullptr || dest == nullptr) { - return false; - } - if (!dest->Resize(src->GetSize())) { - return false; - } - - std::vector<u8> buffer(CopyBufferSize); - - for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) { - if (install_progress->wasCanceled()) { - dest->Resize(0); - return false; - } - - emit UpdateInstallProgress(); - - const auto read = src->Read(buffer.data(), buffer.size(), i); - dest->Write(buffer.data(), read, i); - } - return true; - }; - - const auto nca = - std::make_shared<FileSys::NCA>(vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read)); - const auto id = nca->GetStatus(); - - // Game updates necessary are missing base RomFS - if (id != Loader::ResultStatus::Success && - id != Loader::ResultStatus::ErrorMissingBKTRBaseRomFS) { - return InstallResult::Failure; - } - +ContentManager::InstallResult GMainWindow::InstallNCA(const QString& filename) { const QStringList tt_options{tr("System Application"), tr("System Archive"), tr("System Application Update"), @@ -3448,7 +3350,7 @@ InstallResult GMainWindow::InstallNCA(const QString& filename) { if (!ok || index == -1) { QMessageBox::warning(this, tr("Failed to Install"), tr("The title type you selected for the NCA is invalid.")); - return InstallResult::Failure; + return ContentManager::InstallResult::Failure; } // If index is equal to or past Game, add the jump in TitleType. @@ -3462,15 +3364,15 @@ InstallResult GMainWindow::InstallNCA(const QString& filename) { auto* registered_cache = is_application ? fs_controller.GetUserNANDContents() : fs_controller.GetSystemNANDContents(); - const auto res = registered_cache->InstallEntry(*nca, static_cast<FileSys::TitleType>(index), - true, qt_raw_copy); - if (res == FileSys::InstallResult::Success) { - return InstallResult::Success; - } else if (res == FileSys::InstallResult::OverwriteExisting) { - return InstallResult::Overwrite; - } else { - return InstallResult::Failure; - } + const auto progress_callback = [this](size_t size, size_t progress) { + emit UpdateInstallProgress(); + if (install_progress->wasCanceled()) { + return true; + } + return false; + }; + return ContentManager::InstallNCA(vfs.get(), filename.toStdString(), registered_cache, + static_cast<FileSys::TitleType>(index), progress_callback); } void GMainWindow::OnMenuRecentFile() { @@ -4205,10 +4107,6 @@ void GMainWindow::OnOpenYuzuFolder() { } void GMainWindow::OnVerifyInstalledContents() { - // Declare sizes. - size_t total_size = 0; - size_t processed_size = 0; - // Initialize a progress dialog. QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this); progress.setWindowModality(Qt::WindowModal); @@ -4216,93 +4114,25 @@ void GMainWindow::OnVerifyInstalledContents() { progress.setAutoClose(false); progress.setAutoReset(false); - // Declare a list of file names which failed to verify. - std::vector<std::string> failed; - // Declare progress callback. - auto QtProgressCallback = [&](size_t nca_processed, size_t nca_total) { - if (progress.wasCanceled()) { - return false; - } - progress.setValue(static_cast<int>(((processed_size + nca_processed) * 100) / total_size)); - return true; + auto QtProgressCallback = [&](size_t total_size, size_t processed_size) { + progress.setValue(static_cast<int>((processed_size * 100) / total_size)); + return progress.wasCanceled(); }; - // Get content registries. - auto bis_contents = system->GetFileSystemController().GetSystemNANDContents(); - auto user_contents = system->GetFileSystemController().GetUserNANDContents(); - - std::vector<FileSys::RegisteredCache*> content_providers; - if (bis_contents) { - content_providers.push_back(bis_contents); - } - if (user_contents) { - content_providers.push_back(user_contents); - } - - // Get associated NCA files. - std::vector<FileSys::VirtualFile> nca_files; - - // Get all installed IDs. - for (auto nca_provider : content_providers) { - const auto entries = nca_provider->ListEntriesFilter(); - - for (const auto& entry : entries) { - auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type); - if (!nca_file) { - continue; - } - - total_size += nca_file->GetSize(); - nca_files.push_back(std::move(nca_file)); - } - } - - // Using the NCA loader, determine if all NCAs are valid. - for (auto& nca_file : nca_files) { - Loader::AppLoader_NCA nca_loader(nca_file); - - auto status = nca_loader.VerifyIntegrity(QtProgressCallback); - if (progress.wasCanceled()) { - break; - } - if (status != Loader::ResultStatus::Success) { - FileSys::NCA nca(nca_file); - const auto title_id = nca.GetTitleId(); - std::string title_name = "unknown"; - - const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id), - FileSys::ContentRecordType::Control); - if (control && control->GetStatus() == Loader::ResultStatus::Success) { - const FileSys::PatchManager pm{title_id, system->GetFileSystemController(), - *provider}; - const auto [nacp, logo] = pm.ParseControlNCA(*control); - if (nacp) { - title_name = nacp->GetApplicationName(); - } - } - - if (title_id > 0) { - failed.push_back( - fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name)); - } else { - failed.push_back(fmt::format("{} (unknown)", nca_file->GetName())); - } - } - - processed_size += nca_file->GetSize(); - } - + const std::vector<std::string> result = + ContentManager::VerifyInstalledContents(system.get(), provider.get(), QtProgressCallback); progress.close(); - if (failed.size() > 0) { - auto failed_names = QString::fromStdString(fmt::format("{}", fmt::join(failed, "\n"))); + if (result.empty()) { + QMessageBox::information(this, tr("Integrity verification succeeded!"), + tr("The operation completed successfully.")); + } else { + const auto failed_names = + QString::fromStdString(fmt::format("{}", fmt::join(result, "\n"))); QMessageBox::critical( this, tr("Integrity verification failed!"), tr("Verification failed for the following files:\n\n%1").arg(failed_names)); - } else { - QMessageBox::information(this, tr("Integrity verification succeeded!"), - tr("The operation completed successfully.")); } } diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 366e806d5..280fae5c3 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -16,6 +16,7 @@ #include "common/announce_multiplayer_room.h" #include "common/common_types.h" #include "configuration/qt_config.h" +#include "frontend_common/content_manager.h" #include "input_common/drivers/tas_input.h" #include "yuzu/compatibility_list.h" #include "yuzu/hotkeys.h" @@ -124,13 +125,6 @@ enum class EmulatedDirectoryTarget { SDMC, }; -enum class InstallResult { - Success, - Overwrite, - Failure, - BaseInstallAttempted, -}; - enum class ReinitializeKeyBehavior { NoWarning, Warning, @@ -427,8 +421,7 @@ private: void RemoveCacheStorage(u64 program_id); bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id, u64* selected_title_id, u8* selected_content_record_type); - InstallResult InstallNSP(const QString& filename); - InstallResult InstallNCA(const QString& filename); + ContentManager::InstallResult InstallNCA(const QString& filename); void MigrateConfigFiles(); void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {}, std::string_view gpu_vendor = {}); @@ -523,6 +516,8 @@ private: std::unique_ptr<EmuThread> emu_thread; // The path to the game currently running QString current_game_path; + // Whether a user was set on the command line (skips UserSelector if it's forced to show up) + bool user_flag_cmd_line = false; bool auto_paused = false; bool auto_muted = false; |