Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

Signed-off-by: Loui Chang <louipc.ist@gmail.com>

1 files changed, 41 insertions, 7 deletions

diff --git a/AUTHORS b/AUTHORS
index 502438b..89a4101 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,16 +2,17 @@ Current Contributors
 --------------------
 Callan Barrett (wizzo) <wizzomafizzo@gmail.com>
 Loui Chang (louipc) <louipc.ist@gmail.com>
-Eli Janssen (eliott/cactus) <eliott@archlinux.org>
 Simo Leone (simo) <simo@archlinux.org>
 
 Contributors
 --------------------
 Jason Chu (jchu) <jason@archlinux.org>
 Joerie de Gram (Thralas) <j.de.gram@gmail.com>
+Eli Janssen (eliott/cactus) <eliott@archlinux.org>
 Eric Johnson (eric) http://www.coding-zone.com
 Michael Klier <chi@chimeric.de>
 Paul Mattal (pjmattal) <paul@archlinux.org>
+Andrea Scarpino <bash.lnx@gmail.com>
 Douglas Soares de Andrade (dsa) <dsandrade at gmail dot com>
 Jaroslaw Swierczynski (swiergot)
 Sebastian Nowicki (Xilon) <xilonmu@gmail.com>
@@ -20,15 +21,48 @@ dusty
 dp
 
 Translations
---------------------
+====================
+
+Català
+------
+Sergio Jovani Guzman <moret.sjg@gmail.com>
+
+Deutsch
+-------
 Gerhard Brauer <gerbra@archlinux.de>
 Matthias Gorissen <matthias@archlinux.de>
-Mateusz Herych <heniekk@gmail.com>
-Morgan Lefieux
+Lukas Kropatschek
+Niclas Pfeifer
+
+Español
+-------
+Víctor Martínez Romanos <vmromanos@gmail.com>
+
+Français
+--------
+Morgan Lefieux <comete@archlinuxfr.org>
 Cilyan Olowen <gaknar@gmail.com>
+
+Italiano
+--------
+Pierluigi Picciau <pierluigi88@gmail.com>
+Giovanni Scafora (voidnull) <giovanni@archlinux.org>
+Andrea Scarpino <bash.lnx@gmail.com>
+
+Polski
+------
+Mateusz Herych <heniekk@gmail.com>
+Jaroslaw Swierczynski <swiergot@gmail.com>
+
+Português
+---------
+
+Русский
+-------
 Sergej Pupykin
-Víctor Martínez Romanos
-Giovanni Scafora <linuxmania@gmail.com>
 Pierre Schmitz
-voidnull
+
+Türkçe
+------
+H.Gökhan SARI <hsa2@difuzyon.net>