Merge commit 'origin/testing'

Yeah I actually want to work from testing.
Conflicts:

	web/lib/pkgfuncs.inc

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

1 files changed, 3 insertions, 3 deletions

diff --git a/web/lang/it/acctfuncs_po.inc b/web/lang/it/acctfuncs_po.inc
index 26c4d4d2..e08d342d 100644
--- a/web/lang/it/acctfuncs_po.inc
+++ b/web/lang/it/acctfuncs_po.inc
@@ -47,7 +47,7 @@ $_t["it"]["Last Voted"] = "Ultimo votato";
 
 $_t["it"]["Real Name"] = "Nome reale";
 
-$_t["it"]["Edit Account"] = "Modificare l'account";
+$_t["it"]["Edit Account"] = "Modifica l'account";
 
 $_t["it"]["Password fields do not match."] = "I campi password non corrispondono.";
 
@@ -61,11 +61,11 @@ $_t["it"]["No more results to display."] = "Non vi sono ulteriori risultati da v
 
 $_t["it"]["Type"] = "Tipo";
 
-$_t["it"]["Click on the Home link above to login."] = "Fare clic su Inizio per autenticarsi.";
+$_t["it"]["Click on the Home link above to login."] = "Clicca su Inizio per autenticarti.";
 
 $_t["it"]["Sort by"] = "Ordina per";
 
-$_t["it"]["Re-type password"] = "Riscrivere la password";
+$_t["it"]["Re-type password"] = "Riscrivi la password";
 
 $_t["it"]["Language is not currently supported."] = "Lingua attualmente non supportata.";