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

Update Thai language locales.json #609

Closed
dekthaiinchina wants to merge 2 commits from master into master
pull from: master
merge into: MeloNX:master
Conversation 19 Commits 2 Files Changed 1 +304 -291
dekthaiinchina commented 2025-02-01 12:47:47 +00:00 (Migrated from github.com)
Copy Link

+ Translate the newly added Thai section
+ Correct the original translation to match the Thai context

// Thai translation team from original project

**_+ Translate the newly added Thai section_** **_+ Correct the original translation to match the Thai context_** **_// Thai translation team from original project_**
LotP1 commented 2025-02-01 12:51:48 +00:00 (Migrated from github.com)
Copy Link

please fix the git merge conflicts in the file

please fix the git merge conflicts in the file
dekthaiinchina commented 2025-02-01 12:55:49 +00:00 (Migrated from github.com)
Copy Link

please fix the git merge conflicts in the file

Please provide me with the objection you mentioned so that I can resolve it more quickly.

> please fix the git merge conflicts in the file Please provide me with the objection you mentioned so that I can resolve it more quickly.
GabCoolDude (Migrated from github.com) requested changes 2025-02-01 13:04:18 +00:00
GabCoolDude (Migrated from github.com) left a comment
Copy Link

Please follow the instructions of the first message for all the other messages too

Please follow the instructions of the first message for all the other messages too
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:02:29 +00:00
Copy Link

Please choose the correct translation and remove the lines that the merge conflict added.

Please choose the correct translation and remove the lines that the merge conflict added.
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:02:43 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
@ -793,2 +770,3 @@
"th_TH": "",
"th_TH": "สแกน อามิโบ (จาก Bin)",
"th_TH": "สแกน Amiibo (จากไฟล์ Bin)",
"tr_TR": "",
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:02:48 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
@ -919,3 +897,4 @@
"th_TH": "ติดตั้งคีย์จากไฟล์ KEYS หรือ ZIP",
"tr_TR": "",
"uk_UA": "Встановити ключі з файлу .KEYS або .ZIP",
"zh_CN": "从 .KEYS 文件或 .ZIP 压缩包安装密匙",
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:02:53 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:02:58 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:03 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
@ -1279,3 +1261,3 @@
"de_DE": "FAQ & Fehlerbehebung Seite",
"de_DE": "",
"el_GR": "",
"en_US": "FAQ & Troubleshooting Page",
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:08 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:11 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
@ -1419,2 +1405,4 @@
"th_TH": "เปิดคู่มือผู้เล่นหลายคนบนวิกิ Ryujinx อย่างเป็นทางการ",
"th_TH": "เปิดคู่มือผู้เล่นหลายคนบนวิกิทางการของ Ryujinx",
"tr_TR": "",
"uk_UA": "Відкриває посібник з налаштування Мультиплеєру на офіційній вікі-сторінці Ryujinx (англійською)",
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:41 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:45 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
@ -1773,7 +1636,7 @@
}
},
{
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:16 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:32 +00:00
Copy Link

same here

same here
src/Ryujinx/Assets/locales.json
GabCoolDude (Migrated from github.com) commented 2025-02-01 13:03:36 +00:00
Copy Link

same here

same here
LotP1 (Migrated from github.com) requested changes 2025-02-01 13:04:49 +00:00
LotP1 (Migrated from github.com) left a comment
Copy Link

please fix the noted merge errors and do a local build to fix duplicate locales

please fix the noted merge errors and do a local build to fix duplicate locales
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 12:58:43 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 12:59:04 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
@ -793,2 +770,3 @@
"th_TH": "",
"th_TH": "สแกน อามิโบ (จาก Bin)",
"th_TH": "สแกน Amiibo (จากไฟล์ Bin)",
"tr_TR": "",
LotP1 (Migrated from github.com) commented 2025-02-01 12:59:18 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
@ -919,3 +897,4 @@
"th_TH": "ติดตั้งคีย์จากไฟล์ KEYS หรือ ZIP",
"tr_TR": "",
"uk_UA": "Встановити ключі з файлу .KEYS або .ZIP",
"zh_CN": "从 .KEYS 文件或 .ZIP 压缩包安装密匙",
LotP1 (Migrated from github.com) commented 2025-02-01 12:59:31 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 12:59:44 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:00:03 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
@ -1279,3 +1261,3 @@
"de_DE": "FAQ & Fehlerbehebung Seite",
"de_DE": "",
"el_GR": "",
"en_US": "FAQ & Troubleshooting Page",
LotP1 (Migrated from github.com) commented 2025-02-01 13:00:31 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:00:43 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
@ -1419,2 +1405,4 @@
"th_TH": "เปิดคู่มือผู้เล่นหลายคนบนวิกิ Ryujinx อย่างเป็นทางการ",
"th_TH": "เปิดคู่มือผู้เล่นหลายคนบนวิกิทางการของ Ryujinx",
"tr_TR": "",
"uk_UA": "Відкриває посібник з налаштування Мультиплеєру на офіційній вікі-сторінці Ryujinx (англійською)",
LotP1 (Migrated from github.com) commented 2025-02-01 13:01:33 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:01:45 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
@ -1773,7 +1636,7 @@
}
},
{
LotP1 (Migrated from github.com) commented 2025-02-01 13:00:57 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:01:10 +00:00
Copy Link

merge conflict

merge conflict
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:01:22 +00:00
Copy Link

merge conflict

merge conflict
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 13:16:10 +00:00
dekthaiinchina (Migrated from github.com) left a comment
Copy Link

Resolve conflicts

Resolve conflicts
dekthaiinchina commented 2025-02-01 13:27:20 +00:00 (Migrated from github.com)
Copy Link

Resolve conflicts

Resolve conflicts successfully.

> Resolve conflicts Resolve conflicts successfully.
LotP1 (Migrated from github.com) reviewed 2025-02-01 13:42:14 +00:00
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:37:52 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:37:23 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:38:12 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1115,7 +1096,7 @@
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
LotP1 (Migrated from github.com) commented 2025-02-01 13:38:29 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:38:39 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1262,10 +1243,11 @@
"ko_KR": "자주 묻는 질문(FAQ) 및 안내",
"no_NO": "Vanlige spørsmål og veiledninger",
"pl_PL": "",
LotP1 (Migrated from github.com) commented 2025-02-01 13:38:49 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:01 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1727,0 +1568,4 @@
"el_GR": "Έκδοση",
"en_US": "Version",
"es_ES": "Versión",
"fr_FR": "",
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:11 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1742,3 +1605,3 @@
"sv_SE": "Speltid",
"th_TH": "เล่นไปแล้ว",
"th_TH": "เวลาที่เล่น",
"tr_TR": "Oynama Süresi",
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:20 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1777,3 +1639,4 @@
"ID": "GameListHeaderFileExtension",
"Translations": {
"ar_SA": "صيغة الملف",
"de_DE": "Dateiformat",
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:36 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:45 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
@ -1949,4 +1713,3 @@
},
{
"ID": "GameListContextMenuOpenUserSaveDirectory",
"Translations": {
LotP1 (Migrated from github.com) commented 2025-02-01 13:39:59 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 13:40:11 +00:00
Copy Link

you should not have 2 entries for the same locale

you should not have 2 entries for the same locale
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:16 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:16 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:24 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:24 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:32 +00:00
src/Ryujinx/Assets/locales.json
@ -1115,7 +1096,7 @@
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:32 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:40 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:40 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:48 +00:00
src/Ryujinx/Assets/locales.json
@ -1742,3 +1605,3 @@
"sv_SE": "Speltid",
"th_TH": "เล่นไปแล้ว",
"th_TH": "เวลาที่เล่น",
"tr_TR": "Oynama Süresi",
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:48 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:54:59 +00:00
src/Ryujinx/Assets/locales.json
@ -1777,3 +1639,4 @@
"ID": "GameListHeaderFileExtension",
"Translations": {
"ar_SA": "صيغة الملف",
"de_DE": "Dateiformat",
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:54:59 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:55:08 +00:00
src/Ryujinx/Assets/locales.json
@ -1949,4 +1713,3 @@
},
{
"ID": "GameListContextMenuOpenUserSaveDirectory",
"Translations": {
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:55:08 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:55:35 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:55:35 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:55:42 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:55:42 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
dekthaiinchina (Migrated from github.com) reviewed 2025-02-01 15:55:48 +00:00
src/Ryujinx/Assets/locales.json
dekthaiinchina (Migrated from github.com) commented 2025-02-01 15:55:48 +00:00
Copy Link

In this section I have revised the translation to fit the context and my language.

In this section I have revised the translation to fit the context and my language.
LotP1 (Migrated from github.com) reviewed 2025-02-01 16:00:37 +00:00
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 16:00:36 +00:00
Copy Link

you misunderstand
you currently have 2 lines with "th_TH"
there should only ever be 1 "th_TH" field in each locale

you misunderstand you currently have 2 lines with `"th_TH"` there should only ever be 1 `"th_TH"` field in each locale
LotP1 (Migrated from github.com) reviewed 2025-02-01 16:00:55 +00:00
src/Ryujinx/Assets/locales.json
LotP1 (Migrated from github.com) commented 2025-02-01 16:00:55 +00:00
Copy Link

you misunderstand
you currently have 2 lines with "th_TH"
there should only ever be 1 "th_TH" field in each locale

you misunderstand you currently have 2 lines with `"th_TH"` there should only ever be 1 `"th_TH"` field in each locale

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
GabCoolDude
LotP1
Labels
Clear labels
audio
Affects Audio playback during emulation
blocked on external progress
This cannot move forward without work on an external project or service.
bug
Something isn't working
cpu
An issue with ARMeilleure, the JIT, or Hypervisor
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
good first issue
Good first issues to work on for new contributors
gpu
Affects GPU emulation
graphics-backend:metal
Affects the Metal Graphics backend
graphics-backend:opengl
Affects the OpenGL Graphics backend
graphics-backend:vulkan
Affects the Vulkan Graphics backend
gui
Affects the Avalonia UI or translations.
help wanted
Extra attention is needed
horizon
Affects the Horizon OS HLE components.
infra
Updates to dependencies
invalid
This doesn't seem right
kernel
Affects the kernel HLE components.
ldn
Affects the LDN functionality
linux
Linux only issue
macOS
macOS only issue
not planned but open to a PR
I do not intend on working on this myself, but I would not be opposed to an implementation.
question
Further information is requested
windows
Windows only issue
wontfix
This will not be worked on
No Label
gui
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MeloNX/Ryujinx-ryubing#609
No description provided.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?