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 be8efdc..bf5512b 100644 (file)
--- a/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
+++ b/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
  * Nucleus Translation File
  * Galician in Spain (Latin script)
@@ -8,12 +8,19 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
- * @version $Id: gl_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+<<<<<<< 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
  */
 
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+/* argument value for setlocale() in Microsoft's windows operating system */
+define('_LOCALE_IN_WINDOWS',   'C');
+
 /* labels for date and time measurement unit */
 define('_LABEL_YEAR_UNIT',             'year');
 define('_LABEL_MONTH_UNIT',            'month');
@@ -43,7 +50,7 @@ define('_SKINABLEADMIN_ADMINSETTING_STR',                     ' set editmember is \'admin\'');
 define('_SKINABLEADMIN_NORMALSETTING_STR',                     ' normal');
 define('_SKINABLEADMIN_HELPICONURL_STR',                       ' icon URL');
 define('_SKINABLEADMIN_HELPFILEURL_STR',                       ' help file URL');
-define('_SKINABLEADMIN_ADMINSKINVAR_STR',                      ' ADMIN area skin skinvars');
+define('_SKINABLEADMIN_ADMINSKINVAR_STR',                      ' skinvars');
 define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',      'selectbox used in ADMIN area');
 define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',       'Table for list indication');
 define('_SKINABLEADMIN_PLUGIN_QUICKMENU',                      'Link to admin page of the plugin shown to the quick-menu');
@@ -542,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');
@@ -1332,6 +1345,7 @@ define('_MOVE_BTN',                                       'Mover entrada');
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
+define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');