Merge daf2771859 into e104ee6be3

Update: Russian Language (Some missing strings) (#732 )
JoyCon to Joy-Con (#729 )
2025-02-27 19:26:36 -05:00 · 2025-02-27 16:53:18 -06:00 · 2025-02-26 20:00:35 -06:00 · 2025-02-26 15:37:01 -03:00 · 2025-02-26 15:34:26 -03:00
5 changed files with 11 additions and 11 deletions
@@ -5,7 +5,7 @@ If you wish to build the emulator yourself, follow these steps:
 ### Step 1
-Install the [.NET 9.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/9.0).
+Install the [.NET 10.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/10.0).
 Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).
 ### Step 2
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
 </Project>
@@ -97,7 +97,7 @@ If you are planning to contribute or just want to learn more about this project
 - **Input**
-  We currently have support for keyboard, mouse, touch input, JoyCon input support, and nearly all controllers.
+  We currently have support for keyboard, mouse, touch input, Joy-Con input support, and nearly all controllers.
  Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
  In all scenarios, you can set up everything inside the input configuration menu.
@@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100-preview.1.25120.13",
    "rollForward": "latestFeature"
  }
 }
@@ -2763,7 +2763,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Создать пользовательскую конфигурацию",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -2788,7 +2788,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Изменить пользовательскую конфигурацию",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -2863,7 +2863,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Отредактировать существующую независимую конфигурацию для выбранной игры.",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -5013,7 +5013,7 @@
        "no_NO": "Lyd Inn/Ut",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Выход/Вход звука",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -6563,7 +6563,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Ок",
        "sv_SE": "Ok",
        "th_TH": "ตกลง",
        "tr_TR": "Tamam",
@@ -7013,7 +7013,7 @@
        "no_NO": "",
        "pl_PL": "Pro Kontroler",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Pro контроллер",
        "sv_SE": "",
        "th_TH": "โปรคอนโทรลเลอร์",
        "tr_TR": "Profesyonel Kumanda",
@@ -20013,7 +20013,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Амибо",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
Author	SHA1	Message	Date
Marco Carvalho	135ed423a7	Merge `daf2771859` into `e104ee6be3`	2025-02-27 19:26:36 -05:00
Danik2343	e104ee6be3	Update: Russian Language (Some missing strings) (#732 )	2025-02-27 16:53:18 -06:00
Nicola	e65d1ec6c9	JoyCon to Joy-Con (#729 ) Joy-Con is the official name	2025-02-26 20:00:35 -06:00
Marco Carvalho	daf2771859	Update global.json	2025-02-26 15:37:01 -03:00
Marco Carvalho	4c8671ec44	Migrate to .NET 10	2025-02-26 15:34:26 -03:00