!14 Merge branch 'master' of https://gitee.com/spark-community-works-collections/wewechat-plus-plus

Merge pull request !14 from Riceneeder/auto-7828755-master-f8496f93

main.js

@@ -148,7 +148,7 @@ let mainMenu = [
         ]
     },
     {
-        label: '群聊',
+        label: '聊天列表',
         submenu: [
             {
                 label: 'Loading...',
@@ -156,7 +156,7 @@ let mainMenu = [
         ],
     },
     {
-        label: '私聊',
+        label: '联系人',
         submenu: [
             {
                 label: 'Loading...',

src/js/pages/Footer/Settings.js

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

src/js/pages/Settings/index.js

@@ -135,6 +135,7 @@ export default class Settings extends Component {
                                 <span>记住上次的聊天内容</span>
                                 <Switch
                                     checked={rememberConversation}
+                                    disabled={true}
                                     id="rememberConversation"
                                     onChange={e => setRememberConversation(e.target.checked)} />
                             </label>
@@ -175,6 +176,7 @@ export default class Settings extends Component {
                     <h2>更新记录:</h2>
 
                     <p>
+                        v1.2.5 修复翻译;纠正反馈邮箱;禁用‘记住上次聊天内容’，此功能等待修复<br />
                         v1.2.4 更多的翻译;为darkmode添加过渡动画;删去不必要的代码，去除自动检查更新;修改托盘图标让其更加明显<br />
                         v1.2.3 增添darkmode，调整优化界面、颜色，以适应darkmode<br />
                         v1.2.2 添加单例运行，在后台时在启动器中启动会拉到前台而不是再启动一个wewechat，更多的汉化<br />