Merge branch 'maint'

Also bump the devel version on the master branch to 3.2.0devel.

1 files changed, 16 insertions, 19 deletions

diff --git a/TRANSLATORS b/TRANSLATORS
index 5bdfdfc6..298b5434 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -10,35 +10,32 @@ If your language is not listed here and you wish it was, let the pacman mailing
 list know you are interested in making a translation. We will be happy to add
 your language to the mix.
 
-* indicates the last active translator.
-
 Czech (cs):
-	* Vojtěch Gondžala <vogo@seznam.cz>
+	Vojtěch Gondžala <vogo@seznam.cz>
 German (de):
-	* Matthias Gorissen <matthias@archlinux.de>
-	Pierre Schmitz <pierre@archlinux.de>
+	Matthias Gorissen <matthias@archlinux.de>
+	Benjamin Andresen <benny@in-ulm.de>
 British English (en_GB):
-	* Jeff Bailes <thepizzaking@gmail.com>
+	Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
-	* Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
+	Fernando Lagos <fernando@zerial.org>
+	Juan Pablo Gonzalez <jotapesan@gmail.com>
 French (fr):
-	* Chantry Xavier <shiningxc@gmail.com>
-	solsTiCe d'Hiver <solstice.dhiver@laposte.net>
+	Chantry Xavier <shiningxc@gmail.com>
 Hungarian (hu):
-	* Nagy Gabor <ngaba@bibl.u-szeged.hu>
+	Nagy Gabor <ngaba@bibl.u-szeged.hu>
 Italian (it):
-	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
-	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
+	Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
 Polish (pl):
-	* Mateusz Jędrasik <m.jedrasik@gmail.com>
+	Mateusz Herych <heniekk@gmail.com>
+	Jaroslaw Swierczynski <swiergot@gmail.com>
+	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	* João Felipe Santos <joao.eel@gmail.com>
-	Douglas Soares de Andrade <douglas@archlinux-br.org>
-	Hugo Doria <hugodoria@archlinux-br.org>
-	Lincoln de Sousa <lincoln@archlinux-br.org>
-	Leandro Inácio <leandro@archlinux-br.org>
+	João Felipe Santos <jfsantos@archlinux-br.org>
 Russian (ru):
+	Sergey Tereschenko <serg.partizan@gmail.com>
+	Vitaly Dolgov <ferhiord@gmail.com>
+	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
 Simplified Chinese (zh_CN):
 	甘露(Lu.Gan) <rhythm.gan@gmail.com>