From bb59fa934931227dd149ad3cafaacf48d328a516 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 29 Jul 2019 16:34:28 +0800
Subject: [PATCH 1/3] * Finish task #6148.
---
module/extension/lang/en.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index ae7cf230b6..c7f1585044 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -118,4 +118,4 @@ $lang->extension->errorInstallDB = 'Database report execution fail
$lang->extension->errorConflicts = 'Conflicted with “%s”!';
$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:
%s';
$lang->extension->errorIncompatible = 'Incompatible with your ZenTao.';
-$lang->extension->errorUninstallDepends = '“%s” is dependent on ts extension. Please do not install it.';
+$lang->extension->errorUninstallDepends = '“%s” is dependent on ts extension. Please do not uninstall it.';
From 5c0a10d51d01888b70bb1ee372a2ccab34f04655 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 29 Jul 2019 16:38:21 +0800
Subject: [PATCH 2/3] * Finish task #6148.
---
module/extension/lang/en.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index c7f1585044..7d5d131465 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -118,4 +118,4 @@ $lang->extension->errorInstallDB = 'Database report execution fail
$lang->extension->errorConflicts = 'Conflicted with “%s”!';
$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:
%s';
$lang->extension->errorIncompatible = 'Incompatible with your ZenTao.';
-$lang->extension->errorUninstallDepends = '“%s” is dependent on ts extension. Please do not uninstall it.';
+$lang->extension->errorUninstallDepends = '“%s” is dependent on this extension. Please do not uninstall it.';
From dca5030a987dd383c6c3f226f1cd6216c1138412 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 29 Jul 2019 16:39:55 +0800
Subject: [PATCH 3/3] * Finish task #6153.
---
module/user/lang/zh-cn.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index f2aea2b414..f88379afa4 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -46,7 +46,7 @@ $lang->user->ranzhi = '然之帐号';
$lang->user->ditto = '同上';
$lang->user->originalPassword = '原密码';
$lang->user->newPassword = '新密码';
-$lang->user->verifyPassword = '您的系统登录密码';
+$lang->user->verifyPassword = '您的密码';
$lang->user->resetPassword = '忘记密码';
$lang->user->legendBasic = '基本资料';