Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / it_Latn_IT.ISO-8859-1.php

diff --git a/nucleus/locales/it_Latn_IT.ISO-8859-1.php b/nucleus/locales/it_Latn_IT.ISO-8859-1.php
index ea5f92e..19a370e 100644 (file)
--- a/nucleus/locales/it_Latn_IT.ISO-8859-1.php
+++ b/nucleus/locales/it_Latn_IT.ISO-8859-1.php
@@ -10,7 +10,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: it_Latn_IT.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: it_Latn_IT.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -429,6 +433,13 @@ define('_ARCHIVETYPE_MONTH',               'mese');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Biglietto non valido o scaduto.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Installazione del plugin fallita, richiede ');
+define('_ERROR_DELREQPLUGIN',          'Cancellazione del plugin fallita, è richiesto da ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Prefisso dei Cookie');