From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/admin/lib/lang/it_language_export.lng |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/it_language_export.lng b/interface/web/admin/lib/lang/it_language_export.lng
index bdecf20..bce6b70 100644
--- a/interface/web/admin/lib/lang/it_language_export.lng
+++ b/interface/web/admin/lib/lang/it_language_export.lng
@@ -1,6 +1,6 @@
 <?php
-$wb["list_head_txt"] = 'Esporta file di lingua';
-$wb["language_select_txt"] = 'Seleziona lingua';
-$wb['btn_save_txt'] = 'Esporta i file della lingua selezionata';
-$wb['btn_cancel_txt'] = 'Indietro';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Export language files';
+$wb['language_select_txt'] = 'Select language';
+$wb['btn_save_txt'] = 'Export the selected language file set';
+$wb['btn_cancel_txt'] = 'Annulla';
+?>

--
Gitblit v1.9.1