X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flocales%2Fes_Latn_ES.UTF-8.php;h=14d7d30849b13be537665e4bc6b36eea46369180;hp=53e33d91712570a4599cf90992e548002e53df07;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=5e0a849885dd876f9f91a50b3aca2b33221431ad

diff --git a/nucleus/locales/es_Latn_ES.UTF-8.php b/nucleus/locales/es_Latn_ES.UTF-8.php
index 53e33d9..14d7d30 100644
--- a/nucleus/locales/es_Latn_ES.UTF-8.php
+++ b/nucleus/locales/es_Latn_ES.UTF-8.php
@@ -10,12 +10,19 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
  * @version $Id: es_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
+ * @version $Id: es_Latn_ES.UTF-8.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',	'esp_esp');
+
 /* labels for date and time measurement unit */
 define('_LABEL_YEAR_UNIT',		'year');
 define('_LABEL_MONTH_UNIT',		'month');
@@ -45,7 +52,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');
@@ -1334,6 +1341,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');