aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/lang_chinese_simplified/email
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-03-02 18:13:26 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-03-02 18:13:26 +0000
commitab39e5eb79ccd153bb427e19ca52a57b1547e0ff (patch)
tree2e06a4eeebf00b136f0c2f349c331b8406847f9f /phpBB/language/lang_chinese_simplified/email
parent6172b1c51eace2e7eaf2157aaf06aec081ad5564 (diff)
downloadforums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar
forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.gz
forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.bz2
forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.xz
forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.zip
Changed way subject is sent to email ... handled by templates where necessary ... all translators please note these changes!
git-svn-id: file:///svn/phpbb/trunk@2248 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/lang_chinese_simplified/email')
-rw-r--r--phpBB/language/lang_chinese_simplified/email/admin_activate.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl4
-rw-r--r--phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/group_added.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/group_approved.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/group_request.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/topic_notify.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/user_activate.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/user_welcome.tpl2
-rw-r--r--phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl2
13 files changed, 27 insertions, 1 deletions
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
index aad041cc29..34dff62de3 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: 新用户帐户
+
您好,
这个 "{USERNAME}" 的帐号可能被冻结了或是刚完成注册程序. 如果有必要的话, 请检查这个用户的详细资料和使用以下链接激活这个帐号:
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl b/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
index 107996eb3b..16a1fc8080 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
@@ -1,4 +1,6 @@
- {USERNAME} 您好,
+Subject: 账户激活
+
+{USERNAME} 您好,
您在"{SITENAME}"的帐号已经激活, 您可以使用所收到的会员帐号及密码登入"{SITENAME}".
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
index ab8e8a641e..cd358deafe 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 欢迎您访问 {SITENAME} 论坛
+
{WELCOME_MSG}
请妥善保留这封电子邮件. 您的帐号资料如下:
diff --git a/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
index 9fd5c18624..f16e8edf8c 100644
--- a/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 欢迎您访问 {SITENAME} 论坛
+
{WELCOME_MSG}
依照"美国儿童网路隐私保护法"规定, 您的帐号尚未激活.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_added.tpl b/phpBB/language/lang_chinese_simplified/email/group_added.tpl
index b05100e476..69445c1600 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_added.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: 您已经被加入这个团队
+
恭喜,
您已经成功加入"{SITENAME}"的"{GROUP_NAME}"这个群组.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
index be47bccd18..185f3922df 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: 您的申请已经被批准了
+
恭喜您,
你在"{SITENAME}"所申请加入的团队"{GROUP_NAME}"已经获得批准.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_request.tpl b/phpBB/language/lang_chinese_simplified/email/group_request.tpl
index 99cd2c8052..20d82fde03 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_request.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: 加入这个团队的申请已经提交
+
亲爱的 {GROUP_MODERATOR},
有一个会员提出申请加入你在"{SITENAME}"所管理的会员团队.
diff --git a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
index 084c365987..3563cbad0a 100644
--- a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: 新的站内信件
+
{USERNAME} 您好,
您在"{SITENAME}"有新的私人消息, 您要求系统以电子邮件通知. 您可以使用以下的链接浏览您刚收到的私人消息:
diff --git a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
index eb14b80b52..87190abe24 100644
--- a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: 回帖通知 - {TOPIC_TITLE}
+
{USERNAME} 您好,
您收到这封这封电子邮件是因为您在"{SITENAME}"订阅了主题"{TOPIC_TITLE}", 这个主题在您上次来访后有新的回覆. 您可以使用以下链接来阅读回覆的内容, 在您浏览原主题之前, 不会再有更新的讯息.
diff --git a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
index 0b5a6b0eb1..9c3425f571 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: 重新激活您的账户!
+
{USERNAME} 您好,
您在"{SITENAME}"的帐号暂时被冻结, 最有可能的原因是您更改了您的个人资料. 请使用以下链接重新激活您的帐号:
diff --git a/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl b/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
index 2b3cf8105e..b85804cbbc 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: 新密码激活
+
{USERNAME} 您好,
您收到这封这封电子邮件是因为您 (也可能是某人冒充您的名义) 申请了一个新的密码. 假如这不是您本人所申请, 请不用理会这封电子邮件, 但是如果您持续收到这类的信件骚扰, 请您尽快联络管理员.
diff --git a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
index 217282b3f0..95e9a08507 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: 欢迎您访问 {SITENAME} 论坛
+
{WELCOME_MSG}
请妥善保留这封电子邮件. 您的帐号资料如下:
diff --git a/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
index 542ab09121..7063d5287c 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 欢迎您访问 {SITENAME} 论坛
+
{WELCOME_MSG}
请妥善保留这封电子邮件. 您的帐号资料如下: