Resolve merge conflicts

C3204

2026-03-30 302de2f2816565e08371cd5345c3db402d88f54b

1


Forms\LoginForm.resx

Forms\LoginForm.resxÍ/
!Þ

Forms\RenameForm.resx

Forms\RenameForm.resx'RÔSòÝ

UserHSmartWindowControl.resx

UserHSmartWindowControl.resxVùcê$ñÝ

 UserItem.resx

 UserItem.resx»b/0Ý