Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / nl_Latn_NL.ISO-8859-15.php

diff --git a/nucleus/locales/nl_Latn_NL.ISO-8859-15.php b/nucleus/locales/nl_Latn_NL.ISO-8859-15.php
index 1a056ad..4ef6abf 100644 (file)
--- a/nucleus/locales/nl_Latn_NL.ISO-8859-15.php
+++ b/nucleus/locales/nl_Latn_NL.ISO-8859-15.php
@@ -3,6 +3,12 @@
  * Nucleus CMS Translation File
  * Dutch in Netherlands (Latin script)
  *
+<<<<<<< HEAD
+ * Nucleus CMS Translation File
+ * Dutch in Netherlands (Latin script)
+ *
+=======
+>>>>>>> skinnable-master
  * Updates:
  * Oct 7, 2005 - Translation fine-tuned and spellingcorrection by Errie (http://getverd.errie.com
  * - Nucleus v2.5-3.1 Norbert (beckerswna@yahoo.com)
@@ -10,7 +16,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: nl_Latn_NL.ISO-8859-15.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: nl_Latn_NL.ISO-8859-15.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -426,6 +436,13 @@ define('_ARCHIVETYPE_MONTH',               'maand');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Ongeldig ticket.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Plugin kon niet geïnstalleerd worden: vereist ');
+define('_ERROR_DELREQPLUGIN',          'Plugin kon niet verwijderd worden: vereist door ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Cookie Prefix');