Merge branch 'master' into wjc

wjc

2023-08-21 0a18a8180bc6040c941b07df1be1f7b726b4c155

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string-array name="gateway"></string-array>
    <string-array name="cloud"></string-array>
    <string-array name="app"></string-array>
</resources>