Pre Merge pull request !5 from shenmo/auto-4915358-master-5949a09a

main.js

@@ -203,7 +203,7 @@ let mainMenu = [
                 }
             },
             {
-                label: '显示群聊',
+                label: '显示聊天列表',
                 accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
                 click() {
                     mainWindow.show();

src/js/pages/Footer/Settings.js

@@ -11,7 +11,7 @@ export default class Placeholder extends Component {
                     className={classes.button}
                     href="mailto:var.845541909@qq.com?Subject=WeWeChat%20Feedback"
                     target="_blank">
-                    发送反馈
+                    Send Feedback
                     <i className="icon-ion-ios-email-outline" />
                 </a>