Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / ja_Jpan_JP.EUC-JP.php

diff --git a/nucleus/locales/ja_Jpan_JP.EUC-JP.php b/nucleus/locales/ja_Jpan_JP.EUC-JP.php
index bf164ca..2b0b807 100644 (file)
--- a/nucleus/locales/ja_Jpan_JP.EUC-JP.php
+++ b/nucleus/locales/ja_Jpan_JP.EUC-JP.php
@@ -10,12 +10,23 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The NucleusCMS Japan¥Á¡¼¥à
- * @version $Id: ja_Jpan_JP.EUC-JP.php 1887 2012-06-17 08:30:08Z sakamocchi $
+<<<<<<< HEAD
+ * @version $Id: ja_Jpan_JP.EUC-JP.php 1868 2012-05-22 05:10:53Z sakamocchi $
  */
 
 /********************************************
  *        Start New for 4.0                *
+=======
+ * @version $Id: ja_Jpan_JP.EUC-JP.php 1887 2012-06-17 08:30:08Z sakamocchi $
+ */
+
+/********************************************
+ *        Start New for 4.0                 *
+>>>>>>> skinnable-master
  ********************************************/
+/* argument value for setlocale() in Microsoft's windows operating system */
+define('_LOCALE_IN_WINDOWS',   'jpn_jpn');
+
 /* labels for date and time measurement unit */
 define('_LABEL_YEAR_UNIT',             'ǯ');
 define('_LABEL_MONTH_UNIT',            '·î');
@@ -1348,6 +1359,7 @@ define('_MOVE_BTN',                                                                       '
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
+define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          '¥¢¥¤¥Æ¥à/¥³¥á¥ó¥È¤Î¥ê¥¹¥È¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] ¥á¥ó¥Ð¡¼¤¬¥Ö¥í¥°´ÉÍý¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë»þ¤ÎÄɲùàÌÜ');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] ¥á¥ó¥Ð¡¼¤¬ºÇ¹â´ÉÍý¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë»þ¤ÎÄɲùàÌÜ');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤ÎÆþ¼ê¥ê¥ó¥¯');