MeloNX/Ryujinx-ryubing
10
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

conflicts

Browse Source
This commit is contained in:
Evan Husted 2024-12-27 18:04:09 -06:00
parent 34aa1fc8e3
commit 3f78e21ab2
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx/Assets/locales.json
View File

@ -4165,11 +4165,7 @@
"no_NO": "6GB",
"pl_PL": "",
"pt_BR": "",
<<<<<<< HEAD
"ru_RU": "6 ГиБ",
=======
"ru_RU": "6ГиБ",
>>>>>>> b5a9c73bb (ru_Ru locale update)
"th_TH": "",
"tr_TR": "",
"uk_UA": "6Гб",
@ -4193,11 +4189,7 @@
"no_NO": "8GB",
"pl_PL": "",
"pt_BR": "",
<<<<<<< HEAD
"ru_RU": "8 ГиБ",
=======
"ru_RU": "8ГиБ",
>>>>>>> b5a9c73bb (ru_Ru locale update)
"th_TH": "",
"tr_TR": "",
"uk_UA": "8Гб",
@ -4221,11 +4213,7 @@
"no_NO": "12GB",
"pl_PL": "",
"pt_BR": "",
<<<<<<< HEAD
"ru_RU": "12 ГиБ",
=======
"ru_RU": "12ГиБ",
>>>>>>> b5a9c73bb (ru_Ru locale update)
"th_TH": "",
"tr_TR": "",
"uk_UA": "12Гб",