Merge branch 'master' into develop

app/menu/tray.js

@@ -149,8 +149,8 @@ function makeTray (app, contents, sys_lang = 'en') {
         let contextMenu = Menu.buildFromTemplate(makeMenu(app, list, contents, sys_lang))
         tray.setContextMenu(contextMenu)
         const { ori = '', show = '', tips = '' } = makeTitle(list)
-+       tray.setTitle(show)
-+       tray.setToolTip(ori ? `\n${lang.current_active_hosts}: \n\n${tips}\n` : 'SwitchHosts!')
+        tray.setTitle(show)
+        tray.setToolTip(ori ? `\n${lang.current_active_hosts}: \n\n${tips}\n` : 'SwitchHosts!')
       })
   })