summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2011-02-22 13:03:50 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2011-02-22 13:03:50 +0800
commit7f7955c74b1f4d2507800e2805ba49e8f10869cd (patch)
tree5689fb4e76676bbc33cb74a7cac9979eea458008
parentb3af3b8d58be5fc4a0bbccc671633b7da03a1698 (diff)
downloadpttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar.gz
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar.bz2
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar.lz
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar.xz
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.tar.zst
pttbbs-7f7955c74b1f4d2507800e2805ba49e8f10869cd.zip
refine ban msg, and add timecap in help message
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5313 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--pttbbs/mbbsd/acl.c2
-rw-r--r--pttbbs/mbbsd/mail.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/pttbbs/mbbsd/acl.c b/pttbbs/mbbsd/acl.c
index 52b06b25..0ca88289 100644
--- a/pttbbs/mbbsd/acl.c
+++ b/pttbbs/mbbsd/acl.c
@@ -333,7 +333,7 @@ ANSI_COLOR(1) " - 想查看某使用者為何被水桶可用(S)或是(L)再用 / 搜尋\n"
snprintf(xtitle, sizeof(xtitle), "%s 看板禁言通知(水桶)", board);
snprintf(xmsg, sizeof(xmsg),
- "%s 看板已將您放入禁言(水桶)名單\n"
+ "%s 看板已暫時禁止您發表意見 (放入水桶名單)。\n"
"原因: %s\n"
"其它資訊請洽該看板板規與公告。\n", board, reason);
mail_log2id_text(uid, xtitle, xmsg, "[系統通知]", 1);
diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c
index e4633327..2ab7dfe9 100644
--- a/pttbbs/mbbsd/mail.c
+++ b/pttbbs/mbbsd/mail.c
@@ -1456,6 +1456,9 @@ static const char *hlp_mailmove[] = {
" 砍掉待刪信件", "^D",
" 整理水球後寄回", "u",
" 重建信箱", "^G (毀損時才用)",
+#ifdef USE_TIME_CAPSULE
+ " 資源回收筒", "~",
+#endif
NULL,
}, *hlp_mailconf[] = {
"【設定】", NULL,