diff --git a/README.md b/README.md
index 459c4d4..208b7e5 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,45 @@
# HackBrowserData
-[English Readme](https://github.com/moonD4rk/HackBrowserData/blob/master/README_EN.md)
+hack-browser-data is an open-source tool that could help you export data from browser. It supports the most popular browsers on the market and runs on Windows, macOS and Linux.
-hack-browser-data 是一个浏览器数据（密码|历史记录|Cookies|书签）导出工具，支持全平台主流浏览器。
-
-### 各平台浏览器支持情况
+### Supported Browser
#### Windows
-
-| 浏览器 | 密码 | Cookie | 书签 | 历史记录 |
-| :--------------------------- | :------: | :----: | :------: | :-----: |
-| Google Chrome (全版本) | ✅ | ✅ | ✅ | ✅ |
-| Firefox | ✅ | ✅ | ✅ | ✅ |
-| Microsoft Edge | ✅ | ✅ | ✅ | ✅ |
-| 360 急速浏览器 | ✅ | ✅ | ✅ | ✅ |
-| QQ 浏览器 | ✅ | ✅ | ✅ | ✅ |
-| IE 浏览器 | ❌ | ❌ | ❌ | ❌ |
+| Browser | Password | Cookie | Bookmark | History |
+| :---------------------------------- | :------: | :----: | :------: | :-----: |
+| Google Chrome (Full Version) | ✅ | ✅ | ✅ | ✅ |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Microsoft Edge | ✅ | ✅ | ✅ | ✅ |
+| 360 Speed Browser | ✅ | ✅ | ✅ | ✅ |
+| QQ Browser | ✅ | ✅ | ✅ | ✅ |
+| Internet Explorer | ❌ | ❌ | ❌ | ❌ |
#### MacOS
-由于 MacOS 的安全性设置，基于 `Chromium` 内核浏览器解密时需要用户密码
+Because of the security policies, some of the browsers require a password.
-| Browser | Password | Cookie | Bookmark | History |
-| :--------------------------- | :------: | :----: | :------: | :-----: |
-| Google Chrome
需要密码 | ✅ | ✅ | ✅ | ✅ |
-| Firefox | ✅ | ✅ | ✅ | ✅ |
-| Microsoft Edge
需要密码 | ✅ | ✅ | ✅ | ✅ |
-| Safari | ❌ | ❌ | ❌ | ❌ |
+| Browser | Password | Cookie | Bookmark | History |
+| :---------------------------------- | :------: | :----: | :------: | :-----: |
+| Google Chrome
Require Password | ✅ | ✅ | ✅ | ✅ |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Microsoft Edge
Require Password | ✅ | ✅ | ✅ | ✅ |
+| Safari | ❌ | ❌ | ❌ | ❌ |
#### Linux
-| Browser | Password | Cookie | Bookmark | History |
-| :------------ | :------: | :----: | :------: | :-----: |
-| Firefox | ✅ | ✅ | ✅ | ✅ |
-| Google Chrome | ❌ | ❌ | ❌ | ❌ |
+| Browser | Password | Cookie | Bookmark | History |
+| :---------------------------------- | :------: | :----: | :------: | :-----: |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Google Chrome | ❌ | ❌ | ❌ | ❌ |
-### 安装运行
+### Install
-基于Golang，如图方便可以下载我编译好的[二进制文件 ](https://github.com/moonD4rk/HackBrowserData/releases) 就行
+Installation of hack-browser-data is dead-simple, just download [the release for your system](https://github.com/moonD4rk/HackBrowserData/releases) and run the binary.
-#### 自己编译
+#### Building from source
-支持版本 `go 1.11+`
+support `go 1.11+`
```bash
git clone https://github.com/moonD4rk/HackBrowserData
@@ -54,7 +51,7 @@ go get -v -t -d ./...
go build
```
-#### 运行
+#### Run
```shell
PS C:\hack> .\hack.exe -h
@@ -74,24 +71,24 @@ GLOBAL OPTIONS:
--help, -h show help (default: false)
PS C:\hack> .\hack.exe -b all -f json -e all --dir windows-results
-[x]: Get 6 history, filename is windows-results/Chrome_cookie.json
+[x]: Get 6 cookies, filename is windows-results/Chrome_cookie.json
[x]: Get 6 history, filename is windows-results/Chrome_history.json
-[x]: Get 1 history, filename is windows-results/Chrome_password.json
-[x]: Get 1 history, filename is windows-results/Microsoft_Edge_password.json
-[x]: Get 45 history, filename is windows-results/Microsoft_Edge_cookie.json
+[x]: Get 1 passwords, filename is windows-results/Chrome_password.json
+[x]: Get 1 passwords, filename is windows-results/Microsoft_Edge_password.json
+[x]: Get 45 cookies, filename is windows-results/Microsoft_Edge_cookie.json
[x]: Get 54 history, filename is windows-results/Microsoft_Edge_history.json
+[x]: Get 19 cookies, filename is windows-results/360speed_cookie.json
[x]: Get 18 history, filename is windows-results/360speed_history.json
[x]: Get 6 bookmarks, filename is windows-results/360speed_bookmark.json
-[x]: Get 1 history, filename is windows-results/360speed_password.json
-[x]: Get 19 history, filename is windows-results/360speed_cookie.json
-[x]: Get 12 bookmarks, filename is windows-results/qq_bookmark.json
-[x]: Get 1 history, filename is windows-results/qq_password.json
-[x]: Get 14 history, filename is windows-results/qq_cookie.json
+[x]: Get 1 passwords, filename is windows-results/360speed_password.json
+[x]: Get 1 passwords, filename is windows-results/qq_password.json
+[x]: Get 14 cookies, filename is windows-results/qq_cookie.json
[x]: Get 12 history, filename is windows-results/qq_history.json
-[x]: Get 10 history, filename is windows-results/Firefox_cookie.json
+[x]: Get 12 bookmarks, filename is windows-results/qq_bookmark.json
+[x]: Get 1 passwords, filename is windows-results/Firefox_password.json
+[x]: Get 10 cookies, filename is windows-results/Firefox_cookie.json
[x]: Get 33 history, filename is windows-results/Firefox_history.json
[x]: Get 28 bookmarks, filename is windows-results/Firefox_bookmark.json
-[x]: Get 1 history, filename is windows-results/Firefox_password.json
```
@@ -99,9 +96,9 @@ PS C:\hack> .\hack.exe -b all -f json -e all --dir windows-results
[Desktop Browser Market Share Worldwide](https://gs.statcounter.com/browser-market-share/desktop/worldwide)
-| Chrome | Safari | Firefox | Edge Legacy | IE | Other |
-| :----: | :----: | :-----: | :---------: | :--: | :---: |
-| 68.33% | 9.4% | 8.91% | 4.41% | 3% | 3% |
+| Chrome | Safari | Firefox | Edge Legacy | IE | Other |
+| :------:| :------: | :----: | :------: | :-----: | :--: |
+| 68.33% | 9.4% | 8.91% | 4.41% | 3% | 3% |
[Desktop Browser Market Share China](https://gs.statcounter.com/browser-market-share/desktop/china)
diff --git a/README_ZH.md b/README_ZH.md
new file mode 100644
index 0000000..19a14b2
--- /dev/null
+++ b/README_ZH.md
@@ -0,0 +1,121 @@
+# HackBrowserData
+
+[中文文档](https://github.com/moonD4rk/HackBrowserData/blob/master/README_ZH.md)
+
+hack-browser-data 是一个浏览器数据（密码|历史记录|Cookies|书签）导出工具，支持全平台主流浏览器。
+
+### 各平台浏览器支持情况
+
+#### Windows
+
+| 浏览器 | 密码 | Cookie | 书签 | 历史记录 |
+| :--------------------------- | :------: | :----: | :------: | :-----: |
+| Google Chrome (全版本) | ✅ | ✅ | ✅ | ✅ |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Microsoft Edge | ✅ | ✅ | ✅ | ✅ |
+| 360 急速浏览器 | ✅ | ✅ | ✅ | ✅ |
+| QQ 浏览器 | ✅ | ✅ | ✅ | ✅ |
+| IE 浏览器 | ❌ | ❌ | ❌ | ❌ |
+
+#### MacOS
+
+由于 MacOS 的安全性设置，基于 `Chromium` 内核浏览器解密时需要用户密码
+
+| Browser | Password | Cookie | Bookmark | History |
+| :--------------------------- | :------: | :----: | :------: | :-----: |
+| Google Chrome
需要密码 | ✅ | ✅ | ✅ | ✅ |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Microsoft Edge
需要密码 | ✅ | ✅ | ✅ | ✅ |
+| Safari | ❌ | ❌ | ❌ | ❌ |
+
+#### Linux
+
+| Browser | Password | Cookie | Bookmark | History |
+| :------------ | :------: | :----: | :------: | :-----: |
+| Firefox | ✅ | ✅ | ✅ | ✅ |
+| Google Chrome | ❌ | ❌ | ❌ | ❌ |
+
+
+### 安装运行
+
+基于Golang，如图方便可以下载我编译好的[二进制文件 ](https://github.com/moonD4rk/HackBrowserData/releases) 就行
+
+#### 自己编译
+
+支持版本 `go 1.11+`
+
+```bash
+git clone https://github.com/moonD4rk/HackBrowserData
+
+cd HackBrowserData
+
+go get -v -t -d ./...
+
+go build
+```
+
+#### 运行
+
+```shell
+PS C:\hack> .\hack.exe -h
+NAME:
+ hack-browser-data - Export passwords/cookies/history/bookmarks from browser
+
+USAGE:
+ [hack-browser-data -b chrome -f json -dir results -e all]
+ Get all data(password/cookie/history/bookmark) from chrome
+
+GLOBAL OPTIONS:
+ --verbose, --vv Verbose (default: false)
+ --browser value, -b value Available browsers: all|360|qq|firefox|chrome|edge (default: "all")
+ --results-dir value, --dir value Export dir (default: "results")
+ --format value, -f value Format, csv|json (default: "csv")
+ --export-data value, -e value all|password|cookie|history|bookmark (default: "all")
+ --help, -h show help (default: false)
+
+
+PS C:\hack> .\hack.exe -b all -f json -e all --dir windows-results
+[x]: Get 6 cookies, filename is windows-results/Chrome_cookie.json
+[x]: Get 6 history, filename is windows-results/Chrome_history.json
+[x]: Get 1 passwords, filename is windows-results/Chrome_password.json
+[x]: Get 1 passwords, filename is windows-results/Microsoft_Edge_password.json
+[x]: Get 45 cookies, filename is windows-results/Microsoft_Edge_cookie.json
+[x]: Get 54 history, filename is windows-results/Microsoft_Edge_history.json
+[x]: Get 19 cookies, filename is windows-results/360speed_cookie.json
+[x]: Get 18 history, filename is windows-results/360speed_history.json
+[x]: Get 6 bookmarks, filename is windows-results/360speed_bookmark.json
+[x]: Get 1 passwords, filename is windows-results/360speed_password.json
+[x]: Get 1 passwords, filename is windows-results/qq_password.json
+[x]: Get 14 cookies, filename is windows-results/qq_cookie.json
+[x]: Get 12 history, filename is windows-results/qq_history.json
+[x]: Get 12 bookmarks, filename is windows-results/qq_bookmark.json
+[x]: Get 1 passwords, filename is windows-results/Firefox_password.json
+[x]: Get 10 cookies, filename is windows-results/Firefox_cookie.json
+[x]: Get 33 history, filename is windows-results/Firefox_history.json
+[x]: Get 28 bookmarks, filename is windows-results/Firefox_bookmark.json
+```
+
+
+### TODO
+
+[Desktop Browser Market Share Worldwide](https://gs.statcounter.com/browser-market-share/desktop/worldwide)
+
+| Chrome | Safari | Firefox | Edge Legacy | IE | Other |
+| :----: | :----: | :-----: | :---------: | :--: | :---: |
+| 68.33% | 9.4% | 8.91% | 4.41% | 3% | 3% |
+
+[Desktop Browser Market Share China](https://gs.statcounter.com/browser-market-share/desktop/china)
+
+| Chrome | 360 Safe | Firefox | QQ Browser | IE | Sogou Explorer |
+| :----- | :------: | :-----: | :--------: | :---: | :------------: |
+| 39.85% | 22.26% | 9.28% | 6.5% | 5.65% | 4.74% |
+
+
+
+- [x] Chrome
+- [x] QQ browser
+- [x] Edge
+- [x] 360 speed browser
+- [x] Firefox
+- [ ] Safari
+- [ ] IE
\ No newline at end of file
diff --git a/core/common/output.go b/core/common/output.go
index cbd9e2d..4c9cef6 100644
--- a/core/common/output.go
+++ b/core/common/output.go
@@ -95,7 +95,7 @@ func (l *Logins) OutPutJson(browser, dir string) error {
log.Error(err)
return err
}
- fmt.Printf("%s Get %d history, filename is %s \n", log.Prefix, len(l.logins), filename)
+ fmt.Printf("%s Get %d passwords, filename is %s \n", log.Prefix, len(l.logins), filename)
return nil
}
@@ -125,7 +125,7 @@ func (c *Cookies) OutPutJson(browser, dir string) error {
log.Error(err)
return err
}
- fmt.Printf("%s Get %d history, filename is %s \n", log.Prefix, len(c.cookies), filename)
+ fmt.Printf("%s Get %d cookies, filename is %s \n", log.Prefix, len(c.cookies), filename)
return nil
}
@@ -169,7 +169,7 @@ func (h *History) OutPutCsv(browser, dir string) error {
return err
}
file.Write(data)
- fmt.Printf("%s Get %d bookmarks, filename is %s \n", log.Prefix, len(h.history), filename)
+ fmt.Printf("%s Get %d history, filename is %s \n", log.Prefix, len(h.history), filename)
return nil
}
@@ -191,7 +191,7 @@ func (l *Logins) OutPutCsv(browser, dir string) error {
return err
}
file.Write(data)
- fmt.Printf("%s Get %d bookmarks, filename is %s \n", log.Prefix, len(l.logins), filename)
+ fmt.Printf("%s Get %d passwords, filename is %s \n", log.Prefix, len(l.logins), filename)
return nil
}