Merge branch 'maint'

Conflicts:

	lib/libalpm/be_files.c
	lib/libalpm/package.c

1 files changed, 3 insertions, 3 deletions

diff --git a/TRANSLATORS b/TRANSLATORS
index d9dea891..249665dd 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -12,7 +12,7 @@ your language to the mix.
 
 * indicates the last active translator.
 
-Czech (cs_CZ):
+Czech (cs):
 	* Vojtěch Gondžala <vogo@seznam.cz>
 German (de):
 	* Matthias Gorissen <matthias@archlinux.de>
@@ -30,7 +30,7 @@ Italian (it):
 	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
 	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
-Polish (pl_PL):
+Polish (pl):
 	* Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
 	* João Felipe Santos <joao.eel@gmail.com>
@@ -38,6 +38,6 @@ Brazilian Portuguese (pt_BR):
 	Hugo Doria <hugodoria@archlinux-br.org>
 	Lincoln de Sousa <lincoln@archlinux-br.org>
 	Leandro Inácio <leandro@archlinux-br.org>
-Russian (ru_RU):
+Russian (ru):
 	Vladimir Bayrakovskiy <4rayven@gmail.com>