Merge branch 'maint'

Conflicts:

	src/pacman/callback.c

1 files changed, 1 insertions, 0 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 955e1fdb..539ddd24 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -9,3 +9,4 @@ it
 pl
 pt_BR
 ru
+zh_CN