merge recent changes from R1 to HEAD

1 files changed, 8 insertions, 8 deletions

diff --git a/lang/zh-cn/language.php b/lang/zh-cn/language.php
index ca2f8e3..e3f1201 100644
--- a/lang/zh-cn/language.php
+++ b/lang/zh-cn/language.php
@@ -336,7 +336,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 '<a href="javascript:genPass(\'genepass\',\'password\',\'password2\');">Générer un mot de passe</a>' => '',
 '<a href="javascript:genPass(\'genepass\',\'password\',\'password2\');">Generate a password</a>' => '',
 '<a href="javascript:genPass(\'genepass\',\'password\',\'password2\');">产生一个密码</a>' => '',
-'<a href="{$gBitLoc.STATS_PKG_URL}users.php">Users</a>' => '',
+'<a href="{$smarty.const.STATS_PKG_URL}users.php">Users</a>' => '',
 '<b>Bolding</b> text is very similiar to <i>italicizing</i> &amp; <u>underlining</u>. To make text bold, surround the __<b>word</b>__ or phrase with __<b>two underscores on either side</b>__.' => '',
 '<b>Description</b>' => '',
 '<b>enable/disable</b>' => '<b>打开/关闭</b>',
@@ -4700,8 +4700,8 @@ All your tables will be replaced with the information in the backup.' => '',
 'Send a <a href="/messages/compose.php?to=helge_karl">personal message</a> to this user' => '',
 'Send a <a href="/messages/compose.php?to=wolff_borg">personal message</a> to this user' => '',
 'Send a <a href="/messages/compose.php?to=xing">personal message</a> to this user' => '',
-'Send a <a href="{$gBitLoc.MESSU_PKG_URL}compose.php?to={$userInfo.login}">personal message</a> to this user' => '',
-'Send a <a href="{$gTikiLoc.MESSU_PKG_URL}compose.php?to={$userInfo.login}">personal message</a> to this user' => '',
+'Send a <a href="{$smarty.const.MESSU_PKG_URL}compose.php?to={$userInfo.login}">personal message</a> to this user' => '',
+'Send a <a href="{$smarty.const.MESSU_PKG_URL}compose.php?to={$userInfo.login}">personal message</a> to this user' => '',
 'Send a message to' => '发送消息至',
 'Send a message to us' => '发送消息给我们',
 'Send all to' => '全部发送到',
@@ -5467,8 +5467,8 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'To date' => '结束日期',
 'To edit the copyright notices' => '要编辑版权宣告',
 'To enter some information here, please <a href="/users/edit_personal_page.php">edit your personal homepage</a>.' => '',
-'To enter some information here, please <a href="{$gBitLoc.USERS_PKG_URL}edit_personal_page.php">edit your personal homepage</a>.' => '',
-'To enter some information here, please <a href="{$gTikiLoc.USERS_PKG_URL}edit_personal_page.php">edit your personal homepage</a>.' => '',
+'To enter some information here, please <a href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">edit your personal homepage</a>.' => '',
+'To enter some information here, please <a href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">edit your personal homepage</a>.' => '',
 'To enter the table of contents manually, you can add WikiPage names on separate lines. Pages that don\'t exist will be added automagically and you can edit them later.' => '在内容列表中，加入Wiki页面的名字（每行一个）。没有的页面将会自动产生，你可以随后编辑。',
 'To find specific pages more easily, you can apply a filter here.' => '',
 'To get the client\'s IP address (default)' => '',
@@ -5490,7 +5490,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'To include any wiki page you can use it\'s page_id number.' => '',
 'to insert a random tagline' => '插入随机的tagline',
 'To install more packages, please run the <a href=\'/install/install.php?step=3\'>installer</a> to choose your desired packages.' => '',
-'To install more packages, please run the <a href=\'{$gTikiLoc.INSTALL_PKG_URL}install.php?step=3\'>installer</a> to choose your desired packages.' => '',
+'To install more packages, please run the <a href=\'{$smarty.const.INSTALL_PKG_URL}install.php?step=3\'>installer</a> to choose your desired packages.' => '',
 'To Points' => '至分数',
 'to say "Use This Default" but Replace this one. - Like this:' => '',
 'To the event:' => '',
@@ -6311,7 +6311,7 @@ this link:
 'You must supply all the information, including title and year.' => '你必须提供所有信息, 包含标题与年份.',
 'you or someone registered this email address at' => '你或是某位注册此 email 地址的人',
 'You should first ask that a calendar is created, so you can create events attached to it.' => '你必须在建立日历时先询问, 以便建立要附加上去的事件',
-'You will need to <a href="`$gBitLoc.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
+'You will need to <a href="`$smarty.const.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
 'You will receive an email with information to login for the first time into this site' => '你将会收到 email 说明初次登录本站的信息',
 'You will receive an email with your password soon' => '你很快就会收到含有密码的 email',
 'You will remove' => '将会移除',
@@ -6394,4 +6394,4 @@ a moderator approves it.' => '你的消息已排入等待核可, 板主核可之
 ' => '',
 '~np~{~/np~ARTICLES(max=>3,topic=>topicName)}{ARTICLES} Insert articles into a wikipage' => '',
 );
-?>
\ No newline at end of file
+?>