Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

English version #7

Open
wants to merge 11 commits into
base: en-readme
Choose a base branch
from
Open

English version #7

wants to merge 11 commits into from

Conversation

jiachiwen
Copy link

No description provided.

Copy link
Owner

@hms5232 hms5232 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

中文和英文之間要有空一行,避免黏在一起喔。
方法是中間那行加上兩個空白(Markdown 語法參考

@hms5232 hms5232 added documentation Improvements or additions to documentation hacktoberfest labels Oct 16, 2020
Copy link
Owner

@hms5232 hms5232 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我 review 一輪囉,不用急,不懂得可以提出來討論。

@@ -19,21 +27,49 @@ Python 3.6 or or latest version (For Python2, you can delete `, encoding='UTF-8'

之後程式會自己尋找`ufw.log`這個檔案並輸出成`[YYYYMMDD_HHMMSS].csv`(可自行替換程式碼中輸出和輸入的檔名以符合自己需求),如果有不正確的地方請調整設定:編碼為**UTF-8**、資料有標題、分隔符號為**逗號**。

About the meanings in every item, check https://askubuntu.com/questions/1116145/understanding-ufw-log
plz put `ufw_log_to_csv.py`and `ufw.log`in the same catalog(copy log or put `ufw_log_to_csv.py`in, I RECOMMAND the former) to execute.
cd [檔案所在位置]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

這邊好像漏掉翻譯囉

README.md Outdated
@@ -3,12 +3,20 @@ Convert UFW log file to csv.

## 緣起 Introduction
在啟用[UFW(Uncomplicated Firewall)](https://zh.wikipedia.org/wiki/Uncomplicated_Firewall)後有時候會打開防火牆產生的日誌看看,但看幾次總覺得原生出來的不太容易閱讀或統計之類的,因此動手寫了一個小程式來幫忙轉成csv。
Why I create this little tool?
Since using [UFW(Uncomplicated Firewall)](https://zh.wikipedia.org/wiki/Uncomplicated_Firewall , I often check the diary(record)generated from the firewall.
Copy link
Owner

@hms5232 hms5232 Oct 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

漏掉一個 ) 所以連結渲染怪怪的對吧

Suggested change
Since using [UFW(Uncomplicated Firewall)](https://zh.wikipedia.org/wiki/Uncomplicated_Firewall , I often check the diary(record)generated from the firewall.
Since using [UFW(Uncomplicated Firewall)](https://zh.wikipedia.org/wiki/Uncomplicated_Firewall) , I often check the diary(record)generated from the firewall.

Comment on lines -33 to +69
1. 當協定為ICMP時有奇怪的紀錄會破壞整個邏輯,詳細見 [issue4](https://github.com/hms5232/ufw-log-to-csv/issues/4)
1. 當協定為ICMP時有奇怪的紀錄會破壞整個邏輯,詳細見 [issue4](https://github.com/hms5232/ufw-log-to-csv/issues/4o
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我的 ) 怎麼變成 o 了QQ

README.md Show resolved Hide resolved
Copy link
Owner

@hms5232 hms5232 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

大致上快完成囉,加油!

話說我有在想是不是英文版要另外拉出來成獨立的 README 會比較好排版和對應,你覺得呢?

@@ -70,8 +70,9 @@ A4: This column is for the exception of the record in brackets. If there is dat
## 已知問題 Known issues
1. 當協定為ICMP時有奇怪的紀錄會破壞整個邏輯,詳細見 [issue4](https://github.com/hms5232/ufw-log-to-csv/issues/4o
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
1. 當協定為ICMP時有奇怪的紀錄會破壞整個邏輯,詳細見 [issue4](https://github.com/hms5232/ufw-log-to-csv/issues/4o
1. 當協定為ICMP時有奇怪的紀錄會破壞整個邏輯,詳細見 [issue4](https://github.com/hms5232/ufw-log-to-csv/issues/4)

我的 ) 你還沒加回來喔(英文版也別忘了)

@jiachiwen
Copy link
Author

jiachiwen commented Oct 21, 2020 via email

@hms5232
Copy link
Owner

hms5232 commented Oct 21, 2020

好啊 可是大致上要完成了是指?

@jiachiwen PR 主軸內容快完成啦,我只是突然想到是不是要拆分成兩個語言版本的 README。還是之後要的話另外再說,這個 PR 就專心處理翻譯部分?

@jiachiwen
Copy link
Author

jiachiwen commented Oct 21, 2020 via email

@hms5232
Copy link
Owner

hms5232 commented Oct 22, 2020

可以再多readme沒關係喔 對於譯者來說,不管哪個領域的翻譯都會有所學習到的!我們也會需要去查資料,所以一切都是新的學習(¯︶¯) .

@jiachiwen OK 那你最後修正下這個,我進行最後的 Review 並 merge 後再來進行多語言版本切分乙事。

@hms5232 hms5232 changed the base branch from master to en-readme October 22, 2020 02:53
@hms5232
Copy link
Owner

hms5232 commented Oct 22, 2020

我開設了一個新分支來處理這事,此 PR 將合併至新分支 en-readme 上,之後完成多語言版本 README 後再 merge 至 master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation hacktoberfest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants