Merge branch 'skinnable-master'

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

diff --git a/nucleus/locales/gl_Latn_ES.ISO-8859-1.php b/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
index f60f99f..bf5512b 100644 (file)
--- a/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
+++ b/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: gl_Latn_ES.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: gl_Latn_ES.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Colecci
 define('_ADD_ALIGNLEFT_TT',                    'Alinear á esquerda');
 define('_ADD_ALIGNRIGHT_TT',           'Alinear á derieta');
 define('_ADD_ALIGNCENTER_TT',          'Alinear ó centro');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Incluir en búsquedas');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Erro ó subir');