Merge branch 'CJL' into temp-wxr

wxr

2021-03-08 797358fee56a79b8c783aebb87b275f2e8ad1334

1
2
3
4
5
<?xml version="1.0" encoding="UTF-8"?>
<resources>
    <string name="app_name">HDL_ON_Pro</string>
    <string name="action_settings">Settings</string>
</resources>