From 78deeea841cf94df7d9f248a917e9666399d88fb Mon Sep 17 00:00:00 2001
From: David Zhang <kiteabpl@outlook.com>
Date: Tue, 4 Aug 2020 23:10:59 +0800
Subject: [PATCH 1/3] added readme_cn in gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index cf61dd4..52a717f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ ranger/folders.conf
 !/.gitignore
 #!/llpp.conf
 !/README.md
+!/README_cn.md
 !/vimium-options.json
 !/zsh
 !/i3status/
@@ -42,4 +43,4 @@ ranger/plugins/devicons_linemode.pyo
 !/pudb/pudb.cfg
 !/bin
 
-jesseduffield/lazynpm/state.yml
\ No newline at end of file
+jesseduffield/lazynpm/state.yml

From 21b11a4cbcb03390e021a7c62df1f0bf6e99791e Mon Sep 17 00:00:00 2001
From: David Zhang <kiteabpl@outlook.com>
Date: Tue, 4 Aug 2020 23:11:05 +0800
Subject: [PATCH 2/3] added chinese readme

---
 README_cn.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 README_cn.md

diff --git a/README_cn.md b/README_cn.md
new file mode 100644
index 0000000..284fb35
--- /dev/null
+++ b/README_cn.md
@@ -0,0 +1,74 @@
+# 我的配置文件...
+此份配置文件包含 `i3` 和 `alacritty` 的配置, 不管怎样, 我现在已在使用 [dwm](https://github.com/theniceboy/dwm) 和 [st](https://github.com/theniceboy/st)
+
+顺便说一句, 我的脚本都在[此仓库中](https://github.com/theniceboy/scripts)
+
+# 重要的东西:
+## Ranger
+使用 `pip install ueberzug` 和 `ranger-git`
+
+## mutt
+在 `~/.gnupg/gpg-agent.conf` 中:
+```
+default-cache-ttl 34560000
+max-cache-ttl 34560000
+```
+如果它不能运行, 请尝试 [pam-gnupg](https://github.com/cruegge/pam-gnupg)
+```
+yay -S pam-gnupg-git
+```
+并在 `/etc/pam.d/system-local-login` 中添加以下行:
+```
+auth     optional  pam_gnupg.so
+session  optional  pam_gnupg.so
+```
+
+## 输入法
+安装: `fcitx` `fcitx-im` `fcitx-googlepinyin` `fcitx-configtool`
+
+并编辑 `/etc/X11/xinit/xinitrc`:
+```
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS="@im=fcitx"
+```
+
+#### Fcitx 用户需把第一输入法设置为键盘 - 布局
+
+## 字体
+#### 本地化
+在 `locale.conf` 中:
+```
+LANG=en_US.UTF-8
+LC_ADDRESS=en_US.UTF-8
+LC_IDENTIFICATION=en_US.UTF-8
+LC_MEASUREMENT=en_US.UTF-8
+LC_MONETARY=en_US.UTF-8
+LC_NAME=en_US.UTF-8
+LC_NUMERIC=en_US.UTF-8
+LC_PAPER=en_US.UTF-8
+LC_TELEPHONE=en_US.UTF-8
+LC_TIME=en_US.UTF-8
+```
+
+#### 我的字体
+我使用 `Source Code Pro` 字体和 `nerd-fonts-source-code-pro`
+
+#### 关于 Noto
+只需要安装 `noto-fonts` (并非 `-all`), 它已经非常臃肿, 检查 `/usr/share/fonts/noto`
+
+#### Emoji
+```
+yay -S ttf-linux-libertine ttf-inconsolata ttf-joypixels ttf-twemoji-color noto-fonts-emoji ttf-liberation ttf-droid
+```
+
+#### 中文
+```
+yay -S wqy-bitmapfont wqy-microhei wqy-microhei-lite wqy-zenhei adobe-source-han-mono-cn-fonts adobe-source-han-sans-cn-fonts adobe-source-han-serif-cn-fonts
+```
+
+## GTK 主题
+我使用 `adapta-gtk-theme` 与 `arc-icon-theme`
+
+## 我安装的 Arch 软件包:
+查看 [my-packages.txt](https://github.com/theniceboy/.config/blob/master/my-packages.txt)

From e55caf0b1627753fd05b992996d2f2d623cf8286 Mon Sep 17 00:00:00 2001
From: David Zhang <kiteabpl@outlook.com>
Date: Wed, 5 Aug 2020 14:56:40 +0800
Subject: [PATCH 3/3] added author & added link to jump in each other

---
 README.md    | 3 +++
 README_cn.md | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index ee0b7ad..12f941e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 # My config...
+
+[中文版](./README_cn.md)
+
 This config folder includes `i3` and `alacritty` config, however, I'm using [dwm](https://github.com/theniceboy/dwm) and [st](https://github.com/theniceboy/st) now.
 
 BTW, my scripts are in [this repo](https://github.com/theniceboy/scripts).
diff --git a/README_cn.md b/README_cn.md
index 284fb35..255abb5 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -1,8 +1,13 @@
 # 我的配置文件...
+
+[English Ver.](./README.md)
+
 此份配置文件包含 `i3` 和 `alacritty` 的配置, 不管怎样, 我现在已在使用 [dwm](https://github.com/theniceboy/dwm) 和 [st](https://github.com/theniceboy/st)
 
 顺便说一句, 我的脚本都在[此仓库中](https://github.com/theniceboy/scripts)
 
+中文翻译: [KiteAB](https://github.com/KiteAB)
+
 # 重要的东西:
 ## Ranger
 使用 `pip install ueberzug` 和 `ranger-git`