Merge branch 'maint'

Conflicts:

	src/pacman/callback.c

1 files changed, 2 insertions, 0 deletions

diff --git a/TRANSLATORS b/TRANSLATORS
index 249665dd..5bdfdfc6 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -40,4 +40,6 @@ Brazilian Portuguese (pt_BR):
 	Leandro Inácio <leandro@archlinux-br.org>
 Russian (ru):
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
+Simplified Chinese (zh_CN):
+	甘露(Lu.Gan) <rhythm.gan@gmail.com>