Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / es_Latn_ES.UTF-8.php

diff --git a/nucleus/locales/es_Latn_ES.UTF-8.php b/nucleus/locales/es_Latn_ES.UTF-8.php
index e1b3aef..14d7d30 100644 (file)
--- a/nucleus/locales/es_Latn_ES.UTF-8.php
+++ b/nucleus/locales/es_Latn_ES.UTF-8.php
@@ -10,12 +10,26 @@
  * 
  * @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');
+define('_LABEL_DAY_UNIT',              'day');
+define('_LABEL_HOUR_UNIT',             'hour');
+define('_LABEL_MINUTE_UNIT',   'minute');
+
 // SkinableAdminArea vars
 define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',                    'Delete ADMIN skin data table on uninstall?');
 define('_SKINABLEADMIN_DEFAULT_SKIN',                          'Choose a skin of the management area of the default.');
@@ -38,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');
@@ -89,6 +103,7 @@ define('_ERROR_BADADMINTEMPLATENAME',                'the name of template for admin area must
 define('_SETTINGS_ADMINSKIN',                          'default skin for admin area');
 define('_SETTINGS_BKMKLTSKIN',                         'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
+define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
 /********************************************
  *        Start New for 3.6x                *
@@ -259,13 +274,7 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
-//ITEM add/edit template (for japanese only)
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
-define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
-define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
-define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
-define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
-define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -1332,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');