Merge branch 'master' into develop

README.md

@@ -51,7 +51,7 @@ Thanks to [@batkiz](https://github.com/batkiz) for updating the `scoop` version.
 
 ## Backup
 
-SwitchHosts! stores data at `~/.SwitchHosts` (Or folder `.SwitchHosts` under the current user's home path on Windows), the `~/.SwitchHosts/data.json` contains data, while the `~/.SwitchHosts/prefereces.json` contains preferences info.
+SwitchHosts! stores data at `~/.SwitchHosts` (Or folder `.SwitchHosts` under the current user's home path on Windows), the `~/.SwitchHosts/data.json` contains data, while the `~/.SwitchHosts/preferences.json` contains preferences info.
 
 
 ## Run and Build
@@ -90,7 +90,7 @@ SwitchHosts! stores data at `~/.SwitchHosts` (Or folder `.SwitchHosts` under the
 ### Package
 
  - It is recommended to use [electron-builder](https://github.com/electron-userland/electron-builder) for packaging.
- - Go to the `./` folder, run `npm run make` . The packaged file will be the `./dist` folder.
+ - Go to the `./` folder, run `npm run make` . The packaged files will be in the `./dist` folder.
  - This command may take several minutes to finish when you run it the first time, as it needs time to download dependent files. You can download the dependencies manually [here](https://github.com/electron/electron/releases), or [Taobao mirror](https://npm.taobao.org/mirrors/electron/), then save the files to `~/.electron`. You can check the [Electron Docs](http://electron.atom.io/docs/) for more infomation.
 
     ```bash

README_cn.md

@@ -51,7 +51,7 @@ scoop install switchhosts
 
 ## 文件备份
 
-SwitchHosts! 的数据文件在 `~/.SwitchHosts` 目录下（Windows 用户为个人主目录下的 `.SwitchHosts` 目录下），其中 `~/.SwitchHosts/data.json` 是 hosts 数据文件，`~/.SwitchHosts/prefereces.json` 是配置信息。
+SwitchHosts! 的数据文件在 `~/.SwitchHosts` 目录下（Windows 用户为个人主目录下的 `.SwitchHosts` 目录下），其中 `~/.SwitchHosts/data.json` 是 hosts 数据文件，`~/.SwitchHosts/preferences.json` 是配置信息。
 
 
 ## 运行/打包方法
@@ -103,6 +103,10 @@ SwitchHosts! 的数据文件在 `~/.SwitchHosts` 目录下（Windows 用户为
 
 ## 更新历史
 
+### v3.5
+
+ - 2019-08-19 发布 v3.5，启用新 logo，方案列表中增加文件夹支持
+
 ### v3.4
 
  - 2019-07-26 发布 v3.4，样式改进，部分细节重新设计，增加【亮色】、【暗色】主题

app/lang/en.js

@@ -16,7 +16,7 @@ exports.content = {
   , cancel: 'Cancel'
   , check_update: 'Check for updates'
   , check_update_err: 'Something went wrong while checking updates, please try again later. :-('
-  , check_update_found: 'New version ${0} is avaliable, download it now?'
+  , check_update_found: 'New version ${0} is available, download it now?'
   , check_update_nofound: 'Current version ${0} is the latest version.'
   , close: 'Close'
   , comment: 'Comment'