Locale icon indicating copy to clipboard operation
Locale copied to clipboard

Update ja.json

Open Aesc3625 opened this issue 6 months ago • 6 comments

Aesc3625 avatar Jun 17 '25 20:06 Aesc3625

This has conflicts with the main branch. I do not understand Japanese so I can't really resolve them. Are you able to look please?

Frooxius avatar Aug 20 '25 04:08 Frooxius

Merge rebase is required.

Add remote for this repository and locally merge to the latest commit in base. You need resolve conflicts in local merge before push it into repository.

AntonBoch1244 avatar Aug 20 '25 17:08 AntonBoch1244

the recent update made by @kazu0617 seems to include the string.

medicalwei avatar Aug 22 '25 10:08 medicalwei

@Aesc3625 どちらを優先してもいい気がしますが、Aescさんの方を優先しますか…?その場合は「Resolve conflicts」で自分の変更を消しちゃってください 🙇🏼

kazu0617 avatar Aug 29 '25 03:08 kazu0617

内容を見るに以下の認識です。

  • Aescさん: 項目名が翻訳されていない / 若干翻訳チック
  • kazu: 項目名も翻訳済み / ある程度Resonite触れてない人でもわかるよう意訳チック

kazu0617 avatar Aug 29 '25 03:08 kazu0617

There are still conflicts on this branch, which prevents it from being merged.

Frooxius avatar Nov 24 '25 22:11 Frooxius