X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flocales%2Fzh_Hans_CN.UTF-8.php;h=34438489e339faf1bc143a1bf434cc3815be620f;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hp=258770c18061984f63296cf1c9e6d13f414d2420;hpb=d662fa8749913c8fded8e4b83562a6303878431c;p=nucleus-jp%2Fnucleus-next.git

diff --git a/nucleus/locales/zh_Hans_CN.UTF-8.php b/nucleus/locales/zh_Hans_CN.UTF-8.php
index 258770c..3443848 100644
--- a/nucleus/locales/zh_Hans_CN.UTF-8.php
+++ b/nucleus/locales/zh_Hans_CN.UTF-8.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: zh_Hans_CN.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: zh_Hans_CN.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -1335,6 +1339,7 @@ define('_MOVE_BTN',					'移动文章');
 
 // 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');