wuyaxi d0cfbf5993 Merge branch 'develop_account_password' into develop_reset_guide
# Conflicts:
#	lan/lan_ar.json
#	lan/lan_bg.json
#	lan/lan_bn.json
#	lan/lan_cs.json
#	lan/lan_da.json
#	lan/lan_de.json
#	lan/lan_el.json
#	lan/lan_en.json
#	lan/lan_es.json
#	lan/lan_et.json
#	lan/lan_fi.json
#	lan/lan_fr.json
#	lan/lan_he.json
#	lan/lan_hi.json
#	lan/lan_hk.json
#	lan/lan_hr.json
#	lan/lan_hu.json
#	lan/lan_id.json
#	lan/lan_it.json
#	lan/lan_ja.json
#	lan/lan_keys.json
#	lan/lan_kk.json
#	lan/lan_ko.json
#	lan/lan_lt.json
#	lan/lan_ms.json
#	lan/lan_nl.json
#	lan/lan_pl.json
#	lan/lan_pt.json
#	lan/lan_ro.json
#	lan/lan_ru.json
#	lan/lan_sk.json
#	lan/lan_sr_cyrl.json
#	lan/lan_sv.json
#	lan/lan_th.json
#	lan/lan_tr.json
#	lan/lan_tw.json
#	lan/lan_uk.json
#	lan/lan_ur.json
#	lan/lan_vi.json
#	lan/lan_zh.json
2025-07-17 16:45:14 +08:00
..