From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 interface/web/admin/lib/lang/it_server.lng |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/interface/web/admin/lib/lang/it_server.lng b/interface/web/admin/lib/lang/it_server.lng
index 0400196..18966e4 100644
--- a/interface/web/admin/lib/lang/it_server.lng
+++ b/interface/web/admin/lib/lang/it_server.lng
@@ -1,11 +1,15 @@
 <?php
 $wb['config_txt'] = 'config';
-$wb['server_name_txt'] = 'Nome Server';
-$wb['mail_server_txt'] = 'Mailserver';
-$wb['web_server_txt'] = 'Webserver';
-$wb['dns_server_txt'] = 'DNS-Server';
-$wb['file_server_txt'] = 'Fileserver';
-$wb['db_server_txt'] = 'DB-Server';
-$wb['vserver_server_txt'] = 'VServer-Server';
+$wb['server_name_txt'] = 'Name Server';
+$wb['mail_server_txt'] = 'Mail server';
+$wb['web_server_txt'] = 'Web server';
+$wb['dns_server_txt'] = 'DNS server';
+$wb['file_server_txt'] = 'File server';
+$wb['db_server_txt'] = 'DB server';
+$wb['vserver_server_txt'] = 'VServer server';
 $wb['active_txt'] = 'Attivo';
+$wb['mirror_server_id_txt'] = 'Mirror del server';
+$wb['- None -'] = '- Nessuno -';
+$wb['proxy_server_txt'] = 'Proxy-Server';
+$wb['firewall_server_txt'] = 'Firewall-Server';
 ?>

--
Gitblit v1.9.1