From cffc98eae1842fbae28e2ec01b65fc4c15285b6d Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 2 Sep 2012 08:05:03 +0000
Subject: [PATCH]  * adjus the notice of unique, add note of admin-trash page.

---
 module/common/lang/en.php    | 2 +-
 module/common/lang/zh-cn.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 63619ce072..38a4e519ed 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -255,7 +255,7 @@ $lang->menugroup->mail        = 'admin';
 $lang->error->companyNotFound = "The domain %s does not exist.";
 $lang->error->length          = array("『%s』length should be『%s』", "『%s』length should between『%s』and 『%s』.");
 $lang->error->reg             = "『%s』should like『%s』";
-$lang->error->unique          = "『%s』has『%s』already.";
+$lang->error->unique          = "『%s』has『%s』already. If you are sure this record has been deleted, you can restore it in admin panel, trash page.";
 $lang->error->gt              = "『%s』must greater than『%s』.";
 $lang->error->ge              = "『%s』must greater than or equal『%s』.";
 $lang->error->notempty        = "『%s』can not be empty.";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 306cd9eec5..cba4176298 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -255,7 +255,7 @@ $lang->menugroup->mail        = 'admin';
 $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。";
 $lang->error->length          = array("『%s』长度错误，应当为『%s』", "『%s』长度应当不超过『%s』，且不小于『%s』。");
 $lang->error->reg             = "『%s』不符合格式，应当为:『%s』。";
-$lang->error->unique          = "『%s』已经有『%s』这条记录了。";
+$lang->error->unique          = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台管理-回收站还原。。";
 $lang->error->gt              = "『%s』应当大于『%s』。";
 $lang->error->ge              = "『%s』应当不小于『%s』。";
 $lang->error->notempty        = "『%s』不能为空。";