Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_hebrew/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/admin_activate.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_activate.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- admin_activate.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: çùáåï îùúîù çãù
+ Charset: windows-1255
ùìåí,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/admin_send_email.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_send_email.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- admin_send_email.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: windows-1255
+
äãåàø äàì÷èøåðé äáà ðùìç òì-éãé äîðäì ùì "{SITENAME}". àí äåãòä æå äéà ñôàí, àí äåãòä æå îëéìä òìáåðåú àå äòøåú àçøåú ùàúä îåöà ôåâòåú àðà öåø ÷ùø àí îðäì äìåç áëúåáú äáàä:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/admin_welcome_activated.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_welcome_activated.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- admin_welcome_activated.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: çùáåï äåôòì
+ Charset: windows-1255
ùìåí {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/admin_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin_welcome_inactive.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- admin_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
+ Charset: windows-1255
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/coppa_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** coppa_welcome_inactive.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: windows-1255
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/group_added.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_added.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- group_added.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: öåøôú ì÷áåöú äîùúîùéí äæå
+ Charset: windows-1255
áøëåú,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/group_approved.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_approved.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- group_approved.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: á÷ùúê àåùøä
+ Charset: windows-1255
áøëåú,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/group_request.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** group_request.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- group_request.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: ðòùúä á÷ùä ìäöèøôåú ì÷áåöä ùìê
+ Charset: windows-1255
ìëáåã {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/privmsg_notify.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** privmsg_notify.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- privmsg_notify.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: äåãòä ôøèéú çãùä äâéòä
+ Charset: windows-1255
ùìåí {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/profile_send_email.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** profile_send_email.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- profile_send_email.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: windows-1255
+
ùìåí {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/topic_notify.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** topic_notify.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- topic_notify.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: äåãòä òì úâåáä ìðåùà - {TOPIC_TITLE}
+ Charset: windows-1255
ùìåí {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/user_activate.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_activate.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- user_activate.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: äôòì îçãù àú äçùáåï ùìê
+ Charset: windows-1255
ùìåí {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/user_activate_passwd.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_activate_passwd.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- user_activate_passwd.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: äôòìú ñéñîä çãùä
+ Charset: windows-1255
ùìåí {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/user_welcome.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_welcome.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- user_welcome.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
+ Charset: windows-1255
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/email/Attic/user_welcome_inactive.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** user_welcome_inactive.tpl 19 Apr 2002 22:39:06 -0000 1.1.2.1
--- user_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,4 ----
Subject: áøåëéí äáàéí ìôåøåîé {SITENAME}
+ Charset: windows-1255
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_german/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_german/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Neuer Benutzeraccount
+ Charset: iso-8859-1
Hallo!
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 8 Jan 2002 23:26:23 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:41 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Die folgende Email erhältst du von einem Administrator von {SITENAME}. Wenn diese E-Mail unerwünschten Inhalt (Spam) enthält, dann kontaktiere bitte den Webmaster unter:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account aktiviert
+ Charset: iso-8859-1
Hallo {USERNAME}!
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Willkommen auf {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Willkommen auf {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du bist dieser Gruppe beigetreten
+ Charset: iso-8859-1
Gratulation,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Deine Anfrage wurde akzeptiert
+ Charset: iso-8859-1
Gratulation,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Eine Anfrage zum Beitritt in diese Gruppe wurde erstellt
+ Charset: iso-8859-1
Hallo {GROUP_MODERATOR}!
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Eine neue Private Nachricht ist eingetroffen
+ Charset: iso-8859-1
Hallo {USERNAME}!
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 8 Jan 2002 23:26:23 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:41 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hallo {TO_USERNAME}!
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Benachrichtigen bei Antworten - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hallo {USERNAME}!
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account wieder aktivieren!
+ Charset: iso-8859-1
Hallo {USERNAME}!
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aktivierung des neuen Passwortes
+ Charset: iso-8859-1
Hallo {USERNAME}!
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Willkommen auf {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_german/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Willkommen auf {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_greek/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_greek/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/admin_activate.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** admin_activate.tpl 10 Mar 2002 03:23:55 -0000 1.4
--- admin_activate.tpl 17 May 2002 13:13:41 -0000 1.4.2.1
***************
*** 1,9 ****
! Subject: Ëïãáñéáóìüò íÝïõ ÷ñÞóôç
!
! Ãåéá óáò,
!
! Ï ëïãáñéáóìüò ï ïðïßïò áíÞêåé óôïí ÷ñÞóôç "{USERNAME}" Ý÷åé áðåíåñãïðïéçèåß Þ ìüëéò äçìéïõñãÞèçêå, ðñÝðåé íá åëÝãîåôå ôá óôïé÷åßá áõôïý ôïõ ÷ñÞóôç (åÜí ÷ñåéÜæåôáé) êáé åíåñãïðïéÞóôå ôïí ÷ñçóéìïðïéþíôáò ôçí áêüëïõèç äéáäñïìÞ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Ëïãáñéáóìüò íÝïõ ÷ñÞóôç
! Charset: iso-8859-7
!
! Ãåéá óáò,
!
! Ï ëïãáñéáóìüò ï ïðïßïò áíÞêåé óôïí ÷ñÞóôç "{USERNAME}" Ý÷åé áðåíåñãïðïéçèåß Þ ìüëéò äçìéïõñãÞèçêå, ðñÝðåé íá åëÝãîåôå ôá óôïé÷åßá áõôïý ôïõ ÷ñÞóôç (åÜí ÷ñåéÜæåôáé) êáé åíåñãïðïéÞóôå ôïí ÷ñçóéìïðïéþíôáò ôçí áêüëïõèç äéáäñïìÞ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/admin_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_send_email.tpl 5 Feb 2002 00:12:39 -0000 1.2
--- admin_send_email.tpl 17 May 2002 13:13:41 -0000 1.2.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-7
+
Ôï áêüëïõèï åßíáé Ýíá ìÞíõìá ôï ïðïßï óáò Ý÷åé áðïóôåßëåé Ýíáí äéá÷åéñéóôÞ ôïõ "{SITENAME}". ÅÜí ôï ìÞíõìá áõôü åßíáé áíåðéèýìçôï ìå åíï÷ëçôéêü Þ êáé ðñïóâëçôéêü ðåñéå÷üìåíï óáò ðáñáêáëþ åðéêïéíùíÞóôå ìå ôïí webmaster ôçò Ä.ÓõæÞôçóçò óôçí áêüëïõèç äéåýèõíóç:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ï ëïãáñéáóìüò ÅíåñãïðïéÞèçêå
+ Charset: iso-8859-7
Ãåéá óáò {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ôï {SITENAME} óáò êáëùóïñßæåé óôçí äçìüóéá óõæÞôçóç ôïõ
+ Charset: iso-8859-7
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ôï {SITENAME} óáò êáëùóïñßæåé óôçí äçìüóéá óõæÞôçóç ôïõ
+ Charset: iso-8859-7
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ¸÷åôå ðñïóôåèåß óôçí ëßóôá ÷ñçóôþí áõôÞò ôçò ïìÜäáò
+ Charset: iso-8859-7
Óõã÷áñçôÞñéá,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- group_approved.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ç áßôçóç óáò åãêñßèçêå
+ Charset: iso-8859-7
Óõã÷áñçôÞñéá,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ¸ëÞöèç áßôçóç Ýíôáîçò óôçí ïìÜäá óáò
+ Charset: iso-8859-7
ÁãáðçôÝ-ç {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ¸íá íÝï ðñïóùðéêü ìÞíõìá áöß÷èç
+ Charset: iso-8859-7
Ãåéá óáò {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/profile_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** profile_send_email.tpl 5 Feb 2002 00:12:39 -0000 1.2
--- profile_send_email.tpl 17 May 2002 13:13:42 -0000 1.2.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-7
+
Ãåéá óáò {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ãíùóôïðïßçóç áðÜíôçóçò óå È.Åíüôçôá - {TOPIC_TITLE}
+ Charset: iso-8859-7
Ãåéá óáò {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- user_activate.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÅðáíåñãïðïéÞóôå ôïí ëïãáñéáóìü óáò !
+ Charset: iso-8859-7
Ãåéá óáò {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Åíåñãïðïßçóç íÝïõ êùäéêïý
+ Charset: iso-8859-7
Ãåéá óáò {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ôï {SITENAME} óáò êáëùóïñßæåé óôçí äçìüóéá óõæÞôçóç ôïõ
+ Charset: iso-8859-7
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_greek/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ôï {SITENAME} óáò êáëùóïñßæåé óôçí äçìüóéá óõæÞôçóç ôïõ
+ Charset: iso-8859-7
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_dutch/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_dutch/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Nieuw gebruikers account
+ Charset: iso-8859-1
Hallo,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 24 Dec 2001 13:50:03 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:37 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
De volgende email is verstuurd door een beheerder van "{SITENAME}". Als dit
bericht ongewenste gegevens bevat neem dat contact op het de webmaster van de
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account Geactiveerd
+ Charset: iso-8859-1
Hallo {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welkom op {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welkom op {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Je bent toegevoegd aan deze groep
+ Charset: iso-8859-1
Hallo,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Je aanmelding is goedgekeurd
+ Charset: iso-8859-1
Hallo,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Verzoek om lid te worden van een groep
+ Charset: iso-8859-1
Hallo {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Er is een nieuw bericht
+ Charset: iso-8859-1
Hallo {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 24 Dec 2001 13:50:03 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:37 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hallo {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/topic_notify.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- topic_notify.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Melding van het plaatsen van een reactie - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hallo {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Je moet je account opnieuw activeren!
+ Charset: iso-8859-1
Hallo {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Nieuw wachtwoord activatie
+ Charset: iso-8859-1
Hallo {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welkom op {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welkom op {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:32:01
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hebrew
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_hebrew
Modified Files:
Tag: phpBB-2_0_0
lang_main.php
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hebrew/Attic/lang_main.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** lang_main.php 19 Apr 2002 22:38:47 -0000 1.1.2.1
--- lang_main.php 17 May 2002 13:13:42 -0000 1.1.2.2
***************
*** 33,40 ****
//setlocale(LC_ALL, "he_IL");
! $lang['ENCODING'] = "WINDOWS-1255";
! $lang['DIRECTION'] = "RTL";
! $lang['LEFT'] = "RIGHT";
! $lang['RIGHT'] = "LEFT";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
--- 33,40 ----
//setlocale(LC_ALL, "he_IL");
! $lang['ENCODING'] = "windows-1255";
! $lang['DIRECTION'] = "rtl";
! $lang['LEFT'] = "right";
! $lang['RIGHT'] = "left";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_english/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/admin_activate.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- admin_activate.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: New user account
+ Charset: iso-8859-1
Hello,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/admin_send_email.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_send_email.tpl 24 Dec 2001 13:47:20 -0000 1.3
--- admin_send_email.tpl 17 May 2002 13:13:37 -0000 1.3.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/admin_welcome_activated.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- admin_welcome_activated.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account Activated
+ Charset: iso-8859-1
Hello {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/admin_welcome_inactive.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- admin_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.5
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.5.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/group_added.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- group_added.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: You have been added to this usergroup
+ Charset: iso-8859-1
Congratulations,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/group_approved.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- group_approved.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Your request has been approved
+ Charset: iso-8859-1
Congratulations,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/group_request.tpl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.5
--- group_request.tpl 17 May 2002 13:13:37 -0000 1.5.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: A request to join your group has been made
+ Charset: iso-8859-1
Dear {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/privmsg_notify.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- privmsg_notify.tpl 17 May 2002 13:13:37 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: New Private Message has arrived
+ Charset: iso-8859-1
Hello {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/profile_send_email.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** profile_send_email.tpl 24 Dec 2001 13:47:20 -0000 1.3
--- profile_send_email.tpl 17 May 2002 13:13:37 -0000 1.3.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hello {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/topic_notify.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- topic_notify.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Topic Reply Notification - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hello {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/user_activate.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- user_activate.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Reactivate your account
+ Charset: iso-8859-1
Hello {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/user_activate_passwd.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- user_activate_passwd.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: New password activation
+ Charset: iso-8859-1
Hello {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/user_welcome.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- user_welcome.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/email/user_welcome_inactive.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.4
--- user_welcome_inactive.tpl 17 May 2002 13:13:38 -0000 1.4.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_italian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_italian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account Nuovo Utente
+ Charset: iso-8859-1
Ciao,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 14 Jan 2002 22:44:25 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:43 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
La seguente email ti è stata inviata da un amministratore di "{SITENAME}". Se il messaggio contiene spam, commenti abusivi o altri commenti che tu trovi offensivi per favore contatta il webmaster del forum al seguente indirizzo:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account Attivato
+ Charset: iso-8859-1
Ciao {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Benvenuto nel forum di {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Benvenuto nel forum di {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Sei stato aggiunto a questa gruppo utenti
+ Charset: iso-8859-1
Congratulazioni,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: La tua richiesta è stata approvata
+ Charset: iso-8859-1
Congratulazioni,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: C'è una richiesta di iscrizione al tuo gruppo
+ Charset: iso-8859-1
Caro {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Hai un nuovo messaggio privato
+ Charset: iso-8859-1
Ciao {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 14 Jan 2002 22:44:25 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:44 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Ciao {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Notifica di risposta all'argomento - {TOPIC_TITLE}
+ Charset: iso-8859-1
Ciao {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Riattiva il tuo account!
+ Charset: iso-8859-1
Ciao {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Attivazione nuova password
+ Charset: iso-8859-1
Ciao {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Benvenuto nel forum di {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_italian/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:24 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:44 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Benvenuto nel forum di {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_hungarian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_hungarian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/admin_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_activate.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_activate.tpl 17 May 2002 13:13:42 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Új felhasználói azonosító
!
! Helló,
!
! A "{USERNAME}" azonosító deaktiválva lett, vagy most lett létrehozva. Tekintse meg a felhasználó adatait (ha szükséges) és aktiválja az alábbi weboldal felkeresésével:
!
! {U_ACTIVATE}
!
! {EMAIL_SIG}
--- 1,10 ----
! Subject: Új felhasználói azonosító
! Charset: iso-8859-2
!
! Helló,
!
! A "{USERNAME}" azonosító deaktiválva lett, vagy most lett létrehozva. Tekintse meg a felhasználó adatait (ha szükséges) és aktiválja az alábbi weboldal felkeresésével:
!
! {U_ACTIVATE}
!
! {EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/admin_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_send_email.tpl 10 Mar 2002 03:23:55 -0000 1.2
--- admin_send_email.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,11 ****
! A következõ üzenetet a {SITENAME} fórum egyik adminisztrátora küldte. Ha ez az üzenet spam, sértõ, vagy egyéb módon nemkívánatos, vegye fel a kapcsolatot a fórum üzemeltetõivel az alábbi címen:
!
! {BOARD_EMAIL}
!
! Csatolja hozzá ezt a levelet (különösen a levél fejléceit).
!
! Az üzenet a következõ:
! ~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
!
--- 1,13 ----
! Charset: iso-8859-2
!
! A következõ üzenetet a {SITENAME} fórum egyik adminisztrátora küldte. Ha ez az üzenet spam, sértõ, vagy egyéb módon nemkívánatos, vegye fel a kapcsolatot a fórum üzemeltetõivel az alábbi címen:
!
! {BOARD_EMAIL}
!
! Csatolja hozzá ezt a levelet (különösen a levél fejléceit).
!
! Az üzenet a következõ:
! ~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
!
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,7 ****
! Subject: Azonosító aktiválva
!
! Helló {USERNAME},
!
! Az azonosítója a "{SITENAME}" fórumon aktiválva lett, bejelentkezhet azzal a felhasználónévvel és jelszóval, amit a korábbiakban kapott levélben.
!
! {EMAIL_SIG}
--- 1,8 ----
! Subject: Azonosító aktiválva
! Charset: iso-8859-2
!
! Helló {USERNAME},
!
! Az azonosítója a "{SITENAME}" fórumon aktiválva lett, bejelentkezhet azzal a felhasználónévvel és jelszóval, amit a korábbiakban kapott levélben.
!
! {EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,18 ****
! Subject: Üdvözöljük a {SITENAME} fórumán
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Az azonosítója jelenleg inaktív, és a fórum adminisztrátorának aktiválnia kell, mielõtt használni tudná. Amennyiben ez megtörténik, levélben kap róla értesítést.
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
--- 1,19 ----
! Subject: Üdvözöljük a {SITENAME} fórumán
! Charset: iso-8859-2
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Az azonosítója jelenleg inaktív, és a fórum adminisztrátorának aktiválnia kell, mielõtt használni tudná. Amennyiben ez megtörténik, levélben kap róla értesítést.
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,52 ****
! Subject: Üdvözöljük a {SITENAME} fórumán
!
! {WELCOME_MSG}
!
! A COPPA szabályainak értelmében az azonosítója jelenleg inaktív.
!
! Kérjük nyomtassa ki az alábbi üzenetet, kérje meg a szüleit vagy gondviselõjét, hogy írja alá, majd küldje el faxon az alábbi címre:
!
! {FAX_INFO}
!
! VAGY küldje el levélben:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Engedély a {SITENAME} fórumhoz való csatlakozáshoz
!
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Azonosító: {ICQ}
! AIM Cím: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! Feladó: {FROM}
! Foglalkozás: {OCC}
! Érdeklõdési kör: {INTERESTS}
!
! ELLENÕRIZTEM A GYERMEKEM ÁLTAL MEGADOTT INFORMÁCIÓKAT, ÉS HOZZÁJÁRULOK, HOGY AZ ADATOKAT A {SITENAME} FÓRUMON TÁROLJÁK.
! EGYETÉRTEK AZZAL, HOGY EZEKET AZ ADATOKAT EGY JELSZÓ BEÍRÁSÁVAL BÁRMIKOR MEG LEHET VÁLTOZTATNI.
! EGYETÉRTEK AZZAL, HOGY EZEK AZ ADATOK BÁRMIKOR TÖRÖLHETÕEK A {SITENAME} FÓRUMBÓL.
!
!
! Szülõ vagy Gondviselõ
! (olvasható név): _____________________
!
! (aláírás): __________________
!
! Dátum: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Amint az adminisztrátorok megkapták a fenti engedélyt faxon vagy postán, az azonosítóját aktiválják.
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
--- 1,53 ----
! Subject: Üdvözöljük a {SITENAME} fórumán
! Charset: iso-8859-2
!
! {WELCOME_MSG}
!
! A COPPA szabályainak értelmében az azonosítója jelenleg inaktív.
!
! Kérjük nyomtassa ki az alábbi üzenetet, kérje meg a szüleit vagy gondviselõjét, hogy írja alá, majd küldje el faxon az alábbi címre:
!
! {FAX_INFO}
!
! VAGY küldje el levélben:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Engedély a {SITENAME} fórumhoz való csatlakozáshoz
!
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Azonosító: {ICQ}
! AIM Cím: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! Feladó: {FROM}
! Foglalkozás: {OCC}
! Érdeklõdési kör: {INTERESTS}
!
! ELLENÕRIZTEM A GYERMEKEM ÁLTAL MEGADOTT INFORMÁCIÓKAT, ÉS HOZZÁJÁRULOK, HOGY AZ ADATOKAT A {SITENAME} FÓRUMON TÁROLJÁK.
! EGYETÉRTEK AZZAL, HOGY EZEKET AZ ADATOKAT EGY JELSZÓ BEÍRÁSÁVAL BÁRMIKOR MEG LEHET VÁLTOZTATNI.
! EGYETÉRTEK AZZAL, HOGY EZEK AZ ADATOK BÁRMIKOR TÖRÖLHETÕEK A {SITENAME} FÓRUMBÓL.
!
!
! Szülõ vagy Gondviselõ
! (olvasható név): _____________________
!
! (aláírás): __________________
!
! Dátum: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Amint az adminisztrátorok megkapták a fenti engedélyt faxon vagy postán, az azonosítóját aktiválják.
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,12 ****
! Subject: Sikeresen csatlakozott a csoporthoz
!
! Gratulálunk,
!
! Sikeresen csatlakozott a "{GROUP_NAME}" csoporthoz a {SITENAME} fórumon.
! A csatlakozást a csoport moderátora, vagy a fórum adminisztrátora kezdeményezte. Vegye fel velük a kapcsolatot további információkért.
!
! Csoport tagságáról további információk:
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
--- 1,13 ----
! Subject: Sikeresen csatlakozott a csoporthoz
! Charset: iso-8859-2
!
! Gratulálunk,
!
! Sikeresen csatlakozott a "{GROUP_NAME}" csoporthoz a {SITENAME} fórumon.
! A csatlakozást a csoport moderátora, vagy a fórum adminisztrátora kezdeményezte. Vegye fel velük a kapcsolatot további információkért.
!
! Csoport tagságáról további információk:
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- group_approved.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: A kérése elfogadva
!
! Gratulálunk,
!
! A kérését a "{GROUP_NAME}" csoporthoz való csatlakozáshoz a {SITENAME} fórumon elfogadták.
!
! Csoport tagságáról további információk:
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
--- 1,12 ----
! Subject: A kérése elfogadva
! Charset: iso-8859-2
!
! Gratulálunk,
!
! A kérését a "{GROUP_NAME}" csoporthoz való csatlakozáshoz a {SITENAME} fórumon elfogadták.
!
! Csoport tagságáról további információk:
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: A request to join your group has been made
!
! Kedves {GROUP_MODERATOR},
!
! Egy felhasználó szeretne csatlakozni egy csoporthoz, aminek a moderátora a {SITENAME} fórumon.
! A kérés jóváhagyásához vagy visszautasításához keresse fel az alábbi weboldalt:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
--- 1,12 ----
! Subject: A request to join your group has been made
! Charset: iso-8859-2
!
! Kedves {GROUP_MODERATOR},
!
! Egy felhasználó szeretne csatlakozni egy csoporthoz, aminek a moderátora a {SITENAME} fórumon.
! A kérés jóváhagyásához vagy visszautasításához keresse fel az alábbi weboldalt:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
!
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: Új privát üzenete érkezett
!
! Helló {USERNAME},
!
! Új privát üzenete érkezett a "{SITENAME}" fórumon lévõ azonosítójára. Az eseményrõl a korábbiakban értesítést kért. Az új üzenetet megtekintheti az alábbi linkre kattintva:
!
! {U_INBOX}
!
! Ne felejtse el, hogy ezeket az értesítéseket letilthatja a Profil menüpontban, a beállítások megváltoztatásával.
!
! {EMAIL_SIG}
--- 1,12 ----
! Subject: Új privát üzenete érkezett
! Charset: iso-8859-2
!
! Helló {USERNAME},
!
! Új privát üzenete érkezett a "{SITENAME}" fórumon lévõ azonosítójára. Az eseményrõl a korábbiakban értesítést kért. Az új üzenetet megtekintheti az alábbi linkre kattintva:
!
! {U_INBOX}
!
! Ne felejtse el, hogy ezeket az értesítéseket letilthatja a Profil menüpontban, a beállítások megváltoztatásával.
!
! {EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/profile_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** profile_send_email.tpl 10 Mar 2002 03:23:55 -0000 1.2
--- profile_send_email.tpl 17 May 2002 13:13:43 -0000 1.2.2.1
***************
*** 1,13 ****
! Helló {TO_USERNAME},
!
! A következõ üzenetet {FROM_USERNAME} küldte a {SITENAME} fórumon lévõ azonosítójával. Ha ez az üzenet spam, sértõ, vagy egyéb módon nemkívánatos, vegye fel a kapcsolatot a fórum üzemeltetõivel az alábbi címen:
!
! {BOARD_EMAIL}
!
! Csatolja hozzá ezt a levelet (különösen a levél fejléceit). Megjegyzés: ennek a levélnek a válaszcíme {FROM_USERNAME} címére van beállítva.
!
! Az üzenet a következõ:
! ~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
!
--- 1,15 ----
! Charset: iso-8859-2
!
! Helló {TO_USERNAME},
!
! A következõ üzenetet {FROM_USERNAME} küldte a {SITENAME} fórumon lévõ azonosítójával. Ha ez az üzenet spam, sértõ, vagy egyéb módon nemkívánatos, vegye fel a kapcsolatot a fórum üzemeltetõivel az alábbi címen:
!
! {BOARD_EMAIL}
!
! Csatolja hozzá ezt a levelet (különösen a levél fejléceit). Megjegyzés: ennek a levélnek a válaszcíme {FROM_USERNAME} címére van beállítva.
!
! Az üzenet a következõ:
! ~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
!
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,13 ****
! Subject: Téma hozzászólás-értesítés - {TOPIC_TITLE}
!
! Helló {USERNAME},
!
! Ezt a levelet azért kapta, mert a {SITENAME} fórumon a "{TOPIC_TITLE}" téma figyelését kérte. A témára válasz érkezett, kattintson az alábbi linkre a válasz megtekintéséhez.
!
! {U_TOPIC}
!
! Ha nem kívánja a továbbiakban figyelni ezt a témát, kattintson a "Téma figyelésének megszüntetése" linkre a fenti témánál, vagy keresse fel az alábbi weboldalt:
!
! {U_STOP_WATCHING_TOPIC}
!
! {EMAIL_SIG}
--- 1,14 ----
! Subject: Téma hozzászólás-értesítés - {TOPIC_TITLE}
! Charset: iso-8859-2
!
! Helló {USERNAME},
!
! Ezt a levelet azért kapta, mert a {SITENAME} fórumon a "{TOPIC_TITLE}" téma figyelését kérte. A témára válasz érkezett, kattintson az alábbi linkre a válasz megtekintéséhez.
!
! {U_TOPIC}
!
! Ha nem kívánja a továbbiakban figyelni ezt a témát, kattintson a "Téma figyelésének megszüntetése" linkre a fenti témánál, vagy keresse fel az alábbi weboldalt:
!
! {U_STOP_WATCHING_TOPIC}
!
! {EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- user_activate.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Aktiválja újra az azonosítóját!
!
! Helló {USERNAME},
!
! Az azonosítója a "{SITENAME}" fórumon deaktiválva lett, feltehetõleg azért, mert változtatásokat hajtott végre a profiljában. Az azonosító újra aktiválásához fel kell keresnie az alábbi weboldalt:
!
! {U_ACTIVATE}
!
! {EMAIL_SIG}
--- 1,10 ----
! Subject: Aktiválja újra az azonosítóját!
! Charset: iso-8859-2
!
! Helló {USERNAME},
!
! Az azonosítója a "{SITENAME}" fórumon deaktiválva lett, feltehetõleg azért, mert változtatásokat hajtott végre a profiljában. Az azonosító újra aktiválásához fel kell keresnie az alábbi weboldalt:
!
! {U_ACTIVATE}
!
! {EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,17 ****
! Subject: Új jelszó aktiválása
!
! Helló {USERNAME},
!
! Ezt a levelet azért kapta, mert Ön (vagy valaki Ön helyett) új jelszó elküldését kérte a {SITENAME} fórumon lévõ azonosítójához. Amennyiben nem kérte ezt az levelet, hagyja figyelmen kívül. Ha a továbbiakban is kapna ilyen leveleket, vegye fel a kapcsolatot a fórum adminisztrátorával.
!
! Az új jelszót aktiválnia kell, mielõtt használni tudná. Az aktiváláshoz keresse fel az alábbi webcímet:
!
! {U_ACTIVATE}
!
! Ha elkészült, be tud jelentkezni az alábbi jelszó használatával:
!
! Jelszó: {PASSWORD}
!
! Természetesen a jelszót meg tudja változtatni a profil beállításainál. Ha segítségre van szüksége, vegye fel a kapcsolatot a fórum adminisztrátorával.
!
! {EMAIL_SIG}
--- 1,18 ----
! Subject: Új jelszó aktiválása
! Charset: iso-8859-2
!
! Helló {USERNAME},
!
! Ezt a levelet azért kapta, mert Ön (vagy valaki Ön helyett) új jelszó elküldését kérte a {SITENAME} fórumon lévõ azonosítójához. Amennyiben nem kérte ezt az levelet, hagyja figyelmen kívül. Ha a továbbiakban is kapna ilyen leveleket, vegye fel a kapcsolatot a fórum adminisztrátorával.
!
! Az új jelszót aktiválnia kell, mielõtt használni tudná. Az aktiváláshoz keresse fel az alábbi webcímet:
!
! {U_ACTIVATE}
!
! Ha elkészült, be tud jelentkezni az alábbi jelszó használatával:
!
! Jelszó: {PASSWORD}
!
! Természetesen a jelszót meg tudja változtatni a profil beállításainál. Ha segítségre van szüksége, vegye fel a kapcsolatot a fórum adminisztrátorával.
!
! {EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,16 ****
! Subject: Üdvözöljük a {SITENAME} fórumán
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
--- 1,17 ----
! Subject: Üdvözöljük a {SITENAME} fórumán
! Charset: iso-8859-2
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 10 Mar 2002 03:23:55 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:43 -0000 1.3.2.1
***************
*** 1,20 ****
! Subject: Üdvözöljük a {SITENAME} fórumán
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Az azonosítója jelenleg inaktív, és aktiválnia kell, mielõtt használni tudná. Az aktiváláshoz keresse fel az alábbi webcímet:
!
! {U_ACTIVATE}
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
--- 1,21 ----
! Subject: Üdvözöljük a {SITENAME} fórumán
! Charset: iso-8859-2
!
! {WELCOME_MSG}
!
! Tartsa meg ezt a levelet, hogy a késõbbiekben segítségként felhasználhassa. Az azonosítójának információi az alábbiak:
!
! ----------------------------
! Felhasználónév: {USERNAME}
! Jelszó: {PASSWORD}
! ----------------------------
!
! Az azonosítója jelenleg inaktív, és aktiválnia kell, mielõtt használni tudná. Az aktiváláshoz keresse fel az alábbi webcímet:
!
! {U_ACTIVATE}
!
! Kérjük, tartsa emlékezetében a jelszavát, mert az adatbázisunkban kódolva szerepel, így nincs mód a késõbbiekben a felderítésére. Természetesen ha elfelejtette, igényelhet helyette egy másikat, amelyet hasonlóképpen aktiválnia kell használat elõtt.
!
! Köszönjük a regisztrálást!
!
! {EMAIL_SIG}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:31:59
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv3880
Modified Files:
Tag: phpBB-2_0_0
viewforum.php
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.139.2.4
retrieving revision 1.139.2.5
diff -C2 -r1.139.2.4 -r1.139.2.5
*** viewforum.php 14 May 2002 15:19:20 -0000 1.139.2.4
--- viewforum.php 17 May 2002 13:14:05 -0000 1.139.2.5
***************
*** 258,262 ****
$row = $db->sql_fetchrow($result);
! $topics_count = ( $forum_row['forum_topics'] ) ? $forum_row['forum_topics'] : 1;
$limit_topics_time = "AND p.post_time >= $min_topic_time";
--- 258,262 ----
$row = $db->sql_fetchrow($result);
! $topics_count = ( $row['forum_topics'] ) ? $row['forum_topics'] : 1;
$limit_topics_time = "AND p.post_time >= $min_topic_time";
|
Update of /cvsroot/phpbb/phpBB2/language/lang_russian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_russian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_activate.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- admin_activate.tpl 17 May 2002 13:13:53 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Íîâûé ïîëüçîâàòåëü
!
! Çäðàâñòâóéòå,
!
! Ó÷¸òíàÿ çàïèñü "{USERNAME}" áûëà îòêëþ÷åíà èëè òîëüêî ÷òî ñîçäàíà, âû äîëæíû ïðîâåðèòü èíôîðìàöèþ î ïîëüçîâàòåëå è àêòèâèçèðîâàòü å¸ ïåðåéäÿ ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Íîâûé ïîëüçîâàòåëü
! Charset: windows-1251
!
! Çäðàâñòâóéòå,
!
! Ó÷¸òíàÿ çàïèñü "{USERNAME}" áûëà îòêëþ÷åíà èëè òîëüêî ÷òî ñîçäàíà, âû äîëæíû ïðîâåðèòü èíôîðìàöèþ î ïîëüçîâàòåëå è àêòèâèçèðîâàòü å¸ ïåðåéäÿ ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_send_email.tpl 10 Mar 2002 03:23:56 -0000 1.2
--- admin_send_email.tpl 17 May 2002 13:13:59 -0000 1.2.2.1
***************
*** 1,10 ****
! Ýòî e-mail ñîîáùåíèå ïîñëàíî âàì àäìèíèñòðàòîðîì ñàéòà "{SITENAME}". Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè).
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,12 ----
! Charset: windows-1251
!
! Ýòî e-mail ñîîáùåíèå ïîñëàíî âàì àäìèíèñòðàòîðîì ñàéòà "{SITENAME}". Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè).
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,7 ****
! Subject: Ó÷¸òíàÿ çàïèñü àêòèâèçèðîâàíà
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà ñàéòå "{SITENAME}" áûëà àêòèâèçèðîâàíà, òåïåðü âû ìîæåòå âõîäèòü â ñèñòåìó èñïîëüçóÿ èìÿ è ïàðîëü, ïðèñëàííûå âàì â ïðåäûäóùåì ïèñüìå.
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: Ó÷¸òíàÿ çàïèñü àêòèâèçèðîâàíà
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà ñàéòå "{SITENAME}" áûëà àêòèâèçèðîâàíà, òåïåðü âû ìîæåòå âõîäèòü â ñèñòåìó èñïîëüçóÿ èìÿ è ïàðîëü, ïðèñëàííûå âàì â ïðåäûäóùåì ïèñüìå.
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,18 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà, å¸ äîëæåí àêòèâèçèðîâàòü àäìèíèñòðàòîð ôîðóìîâ. Êàê òîëüêî ýòî ïðîèçîéä¸ò, âàì áóäåò ïðèñëàíî ïèñüìî.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà, å¸ äîëæåí àêòèâèçèðîâàòü àäìèíèñòðàòîð ôîðóìîâ. Êàê òîëüêî ýòî ïðîèçîéä¸ò, âàì áóäåò ïðèñëàíî ïèñüìî.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,52 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
!  ñîîòâåòñòâèè ñ çàêîíîì 'COPPA' âàøà ó÷¸òíàÿ çàïèñü íå áûëà àêòèâèçèðîâàíà.
!
! Ïîæàëóéñòà ðàñïå÷àòàéòå ýòî ñîîáùåíèå è ïîïðîñèòå âàøåãî ðîäèòåëÿ èëè îïåêóíà ïîäïèñàòü åãî è ïîñòàâèòü äàòó. Çàòåì îòïðàâüòå åãî ïî ôàêñó:
!
! {FAX_INFO}
!
! Èëè ïî ïî÷òå:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Permission to Participate at {SITENAME}
!
! Username: {USERNAME}
! Password: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Number: {ICQ}
! AIM Address: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! From: {FROM}
! Occupation: {OCC}
! Interests: {INTERESTS}
!
! I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION.
! I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
! I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
!
!
! Parent or Guardian
! (print your name here): _____________________
!
! (sign here): __________________
!
! Date: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Êàê òîëüêî àäìèíèñòðàòîð ïîëó÷èò ýòó ôîðìó ïî ôàêñó èëè ïî ïî÷òå, âàøà ó÷¸òíàÿ çàïèñü áóäåò àêòèâèçèðîâàíà.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,53 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
! Charset: windows-1251
!
! {WELCOME_MSG}
!
!  ñîîòâåòñòâèè ñ çàêîíîì 'COPPA' âàøà ó÷¸òíàÿ çàïèñü íå áûëà àêòèâèçèðîâàíà.
!
! Ïîæàëóéñòà ðàñïå÷àòàéòå ýòî ñîîáùåíèå è ïîïðîñèòå âàøåãî ðîäèòåëÿ èëè îïåêóíà ïîäïèñàòü åãî è ïîñòàâèòü äàòó. Çàòåì îòïðàâüòå åãî ïî ôàêñó:
!
! {FAX_INFO}
!
! Èëè ïî ïî÷òå:
!
! {MAIL_INFO}
!
! ------------------------------ CUT HERE ------------------------------
! Permission to Participate at {SITENAME}
!
! Username: {USERNAME}
! Password: {PASSWORD}
! Email: {EMAIL_ADDRESS}
!
! ICQ Number: {ICQ}
! AIM Address: {AIM}
! MSN Messenger: {MSN}
! Yahoo Messenger: {YIM}
! Web Site: {WEB_SITE}
! From: {FROM}
! Occupation: {OCC}
! Interests: {INTERESTS}
!
! I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION.
! I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
! I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
!
!
! Parent or Guardian
! (print your name here): _____________________
!
! (sign here): __________________
!
! Date: _______________
!
! ------------------------------ CUT HERE ------------------------------
!
!
! Êàê òîëüêî àäìèíèñòðàòîð ïîëó÷èò ýòó ôîðìó ïî ôàêñó èëè ïî ïî÷òå, âàøà ó÷¸òíàÿ çàïèñü áóäåò àêòèâèçèðîâàíà.
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- group_added.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: Âû áûëè âêëþ÷åíû â ãðóïïó
!
! Ïîçäðàâëÿåì!
!
! Âû áûëè ïðèíÿòû â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME}.
! Ýòî áûëî ïðîäåëàíî ìîäåðàòîðîì ãðóïïû èëè àäìèíèñòðàòîðîì ñàéòà, îáðàòèòåñü ê íèì çà äîïîëíèòåëüíîé èíôîðìàöèåé.
!
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,12 ----
! Subject: Âû áûëè âêëþ÷åíû â ãðóïïó
! Charset: windows-1251
!
! Ïîçäðàâëÿåì!
!
! Âû áûëè ïðèíÿòû â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME}.
! Ýòî áûëî ïðîäåëàíî ìîäåðàòîðîì ãðóïïû èëè àäìèíèñòðàòîðîì ñàéòà, îáðàòèòåñü ê íèì çà äîïîëíèòåëüíîé èíôîðìàöèåé.
!
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- group_approved.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Âàøà ïðîñüáà áûëà óäîâëåòâîðåíà.
!
! Ïîçäðàâëÿåì!
!
! Âàøà ïðîñüáà î âñòóïëåíèè â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME} áûëà óäîâëåòâîðåíà.
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Âàøà ïðîñüáà áûëà óäîâëåòâîðåíà.
! Charset: windows-1251
!
! Ïîçäðàâëÿåì!
!
! Âàøà ïðîñüáà î âñòóïëåíèè â ãðóïïó "{GROUP_NAME}" íà ñàéòå {SITENAME} áûëà óäîâëåòâîðåíà.
! Ïåðåéäèòå ïî ññûëêå, ÷òîáû óâèäåòü èíôîðìàöèþ î âàøåì ÷ëåíñòâå â ãðóïïàõ:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- group_request.tpl 17 May 2002 13:14:00 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Áûëî ïîäàíà ïðîñüáà î âñòóïëåíèè â ãðóïïó.
!
! Óâàæàåìûé(àÿ) {GROUP_MODERATOR}!
!
! Ïîëüçîâàòåëü ïîïðîñèë î âñòóïëåíèè â ãðóïïó (íà ñàéòå {SITENAME}), ìîäåðàòîðîì êîòîðîé âû ÿâëÿåòåñü.
! ×òîáû óäîâëåòâîðèòü èëè îòêëîíèòü ýòó ïðîñüáó ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Áûëî ïîäàíà ïðîñüáà î âñòóïëåíèè â ãðóïïó.
! Charset: windows-1251
!
! Óâàæàåìûé(àÿ) {GROUP_MODERATOR}!
!
! Ïîëüçîâàòåëü ïîïðîñèë î âñòóïëåíèè â ãðóïïó (íà ñàéòå {SITENAME}), ìîäåðàòîðîì êîòîðîé âû ÿâëÿåòåñü.
! ×òîáû óäîâëåòâîðèòü èëè îòêëîíèòü ýòó ïðîñüáó ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:14:01 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: Âàì ïðèøëî íîâîå ëè÷íîå ñîîáùåíèå
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàì áûëî íàïðàâëåíî ëè÷íîå ñîîáùåíèå íà ñàéòå {SITENAME}, à âû ïðîñèëè óâåäîìëÿòü âàñ îá ýòîì. Âû ìîæåòå ïîñìîòðåòü ýòî ñîîáùåíèå ïåðåéäÿ ïî ñëåäóþùåé ññûëêå:
!
! {U_INBOX}
!
! Ïîìíèòå, âû ìîæåòå îòêàçàòüñÿ îò ïîëó÷åíèÿ ïîäîáíûõ óâåäîìëåíèé, åñëè èçìåíèòå íàñòðîéêè â ñâî¸ì ïðîôèëå.
!
{EMAIL_SIG}
--- 1,12 ----
! Subject: Âàì ïðèøëî íîâîå ëè÷íîå ñîîáùåíèå
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàì áûëî íàïðàâëåíî ëè÷íîå ñîîáùåíèå íà ñàéòå {SITENAME}, à âû ïðîñèëè óâåäîìëÿòü âàñ îá ýòîì. Âû ìîæåòå ïîñìîòðåòü ýòî ñîîáùåíèå ïåðåéäÿ ïî ñëåäóþùåé ññûëêå:
!
! {U_INBOX}
!
! Ïîìíèòå, âû ìîæåòå îòêàçàòüñÿ îò ïîëó÷åíèÿ ïîäîáíûõ óâåäîìëåíèé, åñëè èçìåíèòå íàñòðîéêè â ñâî¸ì ïðîôèëå.
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/profile_send_email.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** profile_send_email.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- profile_send_email.tpl 17 May 2002 13:14:01 -0000 1.3.2.1
***************
*** 1,12 ****
! Çäðàâñòâóéòå, {TO_USERNAME}!
!
! Íèæå ñëåäóåò e-mail, ïîñëàííûé âàì ïîëüçîâàòåëåì {FROM_USERNAME} ÷åðåç âàøó ðåãèñòðàöèþ íà ñàéòå {SITENAME}. Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè). Ïîæàëóéñòà ó÷òèòå, ÷òî àäðåñ îòâåòà â ýòîì ñîîáùåíèè ÿâëÿåòñÿ àäðåñîì {FROM_USERNAME}.
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
--- 1,14 ----
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {TO_USERNAME}!
!
! Íèæå ñëåäóåò e-mail, ïîñëàííûé âàì ïîëüçîâàòåëåì {FROM_USERNAME} ÷åðåç âàøó ðåãèñòðàöèþ íà ñàéòå {SITENAME}. Åñëè ýòî ñîîáùåíèå ÿâëÿåòñÿ ñïàìîì, ñîäåðæèò îñêîðáëåíèÿ èëè ïðî÷èå íåïðèÿòíûå âàì êîììåíòàðèè, ïîæàëóéñòà ñâÿæèòåñü ñ âåáìàñòåðîì ïî àäðåñó:
!
! {BOARD_EMAIL}
!
! Âêëþ÷èòå äàííîå ñîîáùåíèå öåëèêîì (îñîáåííî çàãîëîâêè). Ïîæàëóéñòà ó÷òèòå, ÷òî àäðåñ îòâåòà â ýòîì ñîîáùåíèè ÿâëÿåòñÿ àäðåñîì {FROM_USERNAME}.
!
! Ïîñëàííîå âàì ñîîáùåíèå:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
{MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:14:01 -0000 1.3.2.1
***************
*** 1,13 ****
! Subject: Óâåäîìëåíèå îá îòâåòå â òåìå - {TOPIC_TITLE}
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ñîîáùåíèå ïîòîìó, ÷òî ñëåäèòå çà òåìîé "{TOPIC_TITLE}" íà ñàéòå {SITENAME}.  ýòîé òåìå ñî âðåìåíè âàøåãî ïîñëåäíåãî âèçèòà ïîÿâèëîñü íîâîå ñîîáùåíèå. Âû ìîæåòå ïåðåéòè ïî ññûëêå ÷òîáû ïîñìîòðåòü ïîñòóïèâøèå îòâåòû, íîâûå óâåäîìëåíèÿ íå áóäóò ïðèõîäèòü ïîêà âû íå ïðîñìîòðèòå òåìó.
!
! {U_TOPIC}
!
! Åñëè âû áîëüøå íå õîòèòå ñëåäèòü çà òåìîé, òî ëèáî ù¸ëêíèòå ïî ññûëêå "ïåðåñòàòü ñëåäèòü çà òåìîé" âíèçó ñòðàíèöû ñ ýòîé òåìîé, ëèáî ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,14 ----
! Subject: Óâåäîìëåíèå îá îòâåòå â òåìå - {TOPIC_TITLE}
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ñîîáùåíèå ïîòîìó, ÷òî ñëåäèòå çà òåìîé "{TOPIC_TITLE}" íà ñàéòå {SITENAME}.  ýòîé òåìå ñî âðåìåíè âàøåãî ïîñëåäíåãî âèçèòà ïîÿâèëîñü íîâîå ñîîáùåíèå. Âû ìîæåòå ïåðåéòè ïî ññûëêå ÷òîáû ïîñìîòðåòü ïîñòóïèâøèå îòâåòû, íîâûå óâåäîìëåíèÿ íå áóäóò ïðèõîäèòü ïîêà âû íå ïðîñìîòðèòå òåìó.
!
! {U_TOPIC}
!
! Åñëè âû áîëüøå íå õîòèòå ñëåäèòü çà òåìîé, òî ëèáî ù¸ëêíèòå ïî ññûëêå "ïåðåñòàòü ñëåäèòü çà òåìîé" âíèçó ñòðàíèöû ñ ýòîé òåìîé, ëèáî ïåðåéäèòå ïî ñëåäóþùåé ññûëêå:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- user_activate.tpl 17 May 2002 13:14:01 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Âíîâü àêòèâèçèðîâàòü ó÷¸òíóþ çàïèñü
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà {SITENAME} áûëà îòêëþ÷åíà, ñêîðåå âñåãî èç-çà âíåñ¸ííûõ â âàø ïðîôèëü èçìåíåíèé. ×òîáû âíîâü å¸ àêòèâèçèðîâàòü, ù¸ëêíèòå ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Âíîâü àêòèâèçèðîâàòü ó÷¸òíóþ çàïèñü
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âàøà ó÷¸òíàÿ çàïèñü íà {SITENAME} áûëà îòêëþ÷åíà, ñêîðåå âñåãî èç-çà âíåñ¸ííûõ â âàø ïðîôèëü èçìåíåíèé. ×òîáû âíîâü å¸ àêòèâèçèðîâàòü, ù¸ëêíèòå ïî ýòîé ññûëêå:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:14:02 -0000 1.3.2.1
***************
*** 1,17 ****
! Subject: Àêòèâèçàöèÿ íîâîãî ïàðîëÿ
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ïèñüìî ïîòîìó, ÷òî âû (ëèáî êòî-òî, âûäàþùèé ñåáÿ çà âàñ) ïîïðîñèëè âûñëàòü íîâûé ïàðîëü ê âàøåé ó÷¸òíîé çàïèñè íà ñàéòå {SITENAME}. Åñëè âû íå ïðîñèëè âûñëàòü ïàðîëü, íå îáðàùàéòå âíèìàíèÿ íà ýòî ïèñüìî, åñëè æå ïîäîáíûå ïèñüìà áóäóò ïðîäîëæàòü ïðèõîäèòü, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
! Äëÿ òîãî, ÷òîáû èñïîëüçîâàòü íîâûé ïàðîëü âû äîëæíû åãî àêòèâèçèðîâàòü. Äëÿ ýòîãî ïåðåéäèòå ïî ññûëêå:
!
! {U_ACTIVATE}
!
!  ñëó÷àå óñïåøíîé àêòèâèçàöèè âû ñìîæåòå âõîäèòü â ñèñòåìó, èñïîëüçóÿ ñëåäóþùèé ïàðîëü:
!
! Ïàðîëü: {PASSWORD}
!
! Âû ñìîæåòå ñìåíèòü ýòîò ïàðîëü íà ñòðàíèöå ðåäàêòèðîâàíèÿ ïðîôèëÿ. Åñëè ó âàñ âîçíèêíóò êàêèå-òî òðóäíîñòè, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Àêòèâèçàöèÿ íîâîãî ïàðîëÿ
! Charset: windows-1251
!
! Çäðàâñòâóéòå, {USERNAME}!
!
! Âû ïîëó÷èëè ýòî ïèñüìî ïîòîìó, ÷òî âû (ëèáî êòî-òî, âûäàþùèé ñåáÿ çà âàñ) ïîïðîñèëè âûñëàòü íîâûé ïàðîëü ê âàøåé ó÷¸òíîé çàïèñè íà ñàéòå {SITENAME}. Åñëè âû íå ïðîñèëè âûñëàòü ïàðîëü, íå îáðàùàéòå âíèìàíèÿ íà ýòî ïèñüìî, åñëè æå ïîäîáíûå ïèñüìà áóäóò ïðîäîëæàòü ïðèõîäèòü, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
! Äëÿ òîãî, ÷òîáû èñïîëüçîâàòü íîâûé ïàðîëü âû äîëæíû åãî àêòèâèçèðîâàòü. Äëÿ ýòîãî ïåðåéäèòå ïî ññûëêå:
!
! {U_ACTIVATE}
!
!  ñëó÷àå óñïåøíîé àêòèâèçàöèè âû ñìîæåòå âõîäèòü â ñèñòåìó, èñïîëüçóÿ ñëåäóþùèé ïàðîëü:
!
! Ïàðîëü: {PASSWORD}
!
! Âû ñìîæåòå ñìåíèòü ýòîò ïàðîëü íà ñòðàíèöå ðåäàêòèðîâàíèÿ ïðîôèëÿ. Åñëè ó âàñ âîçíèêíóò êàêèå-òî òðóäíîñòè, îáðàòèòåñü ê àäìèíèñòðàòîðó ôîðóìîâ.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:14:02 -0000 1.3.2.1
***************
*** 1,16 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_russian/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 10 Mar 2002 03:23:56 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:14:02 -0000 1.3.2.1
***************
*** 1,20 ****
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà. Âû íå ñìîæåòå èì ïîëüçîâàòüñÿ, ïîêà íå ïåðåéä¸òå ïî ñëåäóþùåé ññûëêå:
!
! {U_ACTIVATE}
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
--- 1,21 ----
! Subject: Äîáðî ïîæàëîâàòü íà ôîðóìû {SITENAME}
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ïîæàëóéñòà ñîõðàíèòå ýòî ñîîáùåíèå. Ïàðàìåòðû âàøåé ó÷¸òíîé çàïèñè òàêîâû:
!
! ----------------------------
! Èìÿ ïîëüçîâàòåëÿ: {USERNAME}
! Ïàðîëü: {PASSWORD}
! ----------------------------
!
! Âàøà ó÷¸òíàÿ çàïèñü ïîêà íå àêòèâíà. Âû íå ñìîæåòå èì ïîëüçîâàòüñÿ, ïîêà íå ïåðåéä¸òå ïî ñëåäóþùåé ññûëêå:
!
! {U_ACTIVATE}
!
! Íå çàáûâàéòå ñâîé ïàðîëü: îí õðàíèòñÿ â íàøåé áàçå â çàøèôðîâàííîì âèäå, è ìû íå ñìîæåì âàì åãî âûñëàòü. Åñëè âû âñ¸ æå çàáóäåòå ñâîé ïàðîëü, òî âû ñìîæåòå çàïðîñèòü íîâûé, êîòîðûé áóäåò àêòèâèçèðîâàí òàêèì æå îáðàçîì, êàê è âàøà ó÷¸òíàÿ çàïèñü.
!
! Ñïàñèáî çà ðåãèñòðàöèþ.
!
{EMAIL_SIG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_korean/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_korean/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:48 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: »õ·Î¿î »ç¿ëÀÚ ¾ÆÀ̵ð
+ Charset: euc-kr
Hello,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 28 Jan 2002 01:30:22 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:48 -0000 1.1.2.1
***************
*** 1,7 ****
! ¾È³çÇϼ¼¿ä... {SITENAME} ÀÔ´Ï´Ù..
! º» ¸ÞÀÏÀº {SITENAME} ȸ¿ø´Ôµé¿¡°Ô º¸³»Áö´Â ¸ÞÀÏÀÔ´Ï´Ù..
!
! {MESSAGE}
! _______________________
! {BOARD_EMAIL}
! http://www.eazycom.net
--- 1,9 ----
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä... {SITENAME} ÀÔ´Ï´Ù..
! º» ¸ÞÀÏÀº {SITENAME} ȸ¿ø´Ôµé¿¡°Ô º¸³»Áö´Â ¸ÞÀÏÀÔ´Ï´Ù..
!
! {MESSAGE}
! _______________________
! {BOARD_EMAIL}
! http://www.eazycom.net
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ¾ÆÀ̵ð È°¼º
+ Charset: euc-kr
Hello {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME}
+ Charset: euc-kr
{WELCOME_MSG} ÀÔ´Ï´Ù.
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: {SITENAME}
+ Charset: euc-kr
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÀÌ À¯Àú±×·ì¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.
+ Charset: euc-kr
Congratulations,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: ¸â¹ö ½ÂÀÎÀÌ µÇ¾úÀ½À» ¾Ë·Áµå¸³´Ï´Ù.
!
! ÃàÇϵ帳´Ï´Ù..
!
! ¿äûÇϽŠ{SITENAME} ÀÇ "{GROUP_NAME}" ¿¡ ¸â¹ö·Î ½ÂÀÎÀÌ µÇ¼Ì½À´Ï´Ù.
! ¾Æ·¡ÀÇ URLÀ» Ŭ¸¯Çϼż È®ÀÎÇغ¸½Ã±â ¹Ù¶ø´Ï´Ù...
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: ¸â¹ö ½ÂÀÎÀÌ µÇ¾úÀ½À» ¾Ë·Áµå¸³´Ï´Ù.
! Charset: euc-kr
!
! ÃàÇϵ帳´Ï´Ù..
!
! ¿äûÇϽŠ{SITENAME} ÀÇ "{GROUP_NAME}" ¿¡ ¸â¹ö·Î ½ÂÀÎÀÌ µÇ¼Ì½À´Ï´Ù.
! ¾Æ·¡ÀÇ URLÀ» Ŭ¸¯Çϼż È®ÀÎÇغ¸½Ã±â ¹Ù¶ø´Ï´Ù...
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,12 ****
! Subject: »õ·Î¿î ¸Þ¹ö´Ô²²¼ µî·Ï½ÅûÀ» Çϼ̽À´Ï´Ù
!
! ¾È³çÇϼ¼¿ä.. {GROUP_MODERATOR} ´Ô..!
!
! º» ¸ÞÀÏÀº {SITENAME} ÀÇ ±×·ì °ü¸®ÀÚ¿¡°Ô º¸³»Áö´Â ¸ÞÀÏÀÔ´Ï´Ù.
!
! {GROUP_MODERATOR} ´ÔÀÇ ±×·ì¿¡ »õ·Î¿î ¸â¹ö´Ô²²¼ µî·Ï ½ÅûÀ» Çϼ̽À´Ï´Ù
! ¾Æ·¡ÀÇ ¸µÅ©·Î À̵¿Çϼż µî·Ï À¯,¹«¸¦ È®ÀÎÇØ Áֽñ⠹ٶø´Ï´Ù..
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,13 ----
! Subject: »õ·Î¿î ¸Þ¹ö´Ô²²¼ µî·Ï½ÅûÀ» Çϼ̽À´Ï´Ù
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä.. {GROUP_MODERATOR} ´Ô..!
!
! º» ¸ÞÀÏÀº {SITENAME} ÀÇ ±×·ì °ü¸®ÀÚ¿¡°Ô º¸³»Áö´Â ¸ÞÀÏÀÔ´Ï´Ù.
!
! {GROUP_MODERATOR} ´ÔÀÇ ±×·ì¿¡ »õ·Î¿î ¸â¹ö´Ô²²¼ µî·Ï ½ÅûÀ» Çϼ̽À´Ï´Ù
! ¾Æ·¡ÀÇ ¸µÅ©·Î À̵¿Çϼż µî·Ï À¯,¹«¸¦ È®ÀÎÇØ Áֽñ⠹ٶø´Ï´Ù..
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,16 ****
! Subject: »õ ÂÊÁö°¡ µµÂøÇß½À´Ï´Ù.
!
! ¾È³çÇϼ¼¿ä.. {USERNAME} ´Ô..!
!
! {SITENAME} ¿¡ {USERNAME} ´Ô¿¡°Ô »õ ÂÊÁö°¡ µµÂøÇß½À´Ï´Ù.
! ¾Æ·¡ÀÇ URL·Î À̵¿Çϼż È®ÀÎ Çغ¸¼¼¿ä..
!
! {U_INBOX}
!
! ÂÊÁö¸¦ ¸ÞÀÏ·Î ¼ö½ÅÀ» ¿øÇÏÁö ¾ÊÀ¸½Ç°æ¿ì¿¡´Â ¾ðÁ¦µçÁö
! {SITENAME} ÀÇ °³ÀÎÁ¤º¸ º¯°æ¿¡¼ º¯°æÇϽǼö ÀÖ½À´Ï´Ù..
!
! ÀÌ»ó {SITENAME} À̾ú½À´Ï´Ù..
! ±×·³ Æò¾ÈÇÑ ÇÏ·ç µÇ¼Ò¼...!!
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: »õ ÂÊÁö°¡ µµÂøÇß½À´Ï´Ù.
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä.. {USERNAME} ´Ô..!
!
! {SITENAME} ¿¡ {USERNAME} ´Ô¿¡°Ô »õ ÂÊÁö°¡ µµÂøÇß½À´Ï´Ù.
! ¾Æ·¡ÀÇ URL·Î À̵¿Çϼż È®ÀÎ Çغ¸¼¼¿ä..
!
! {U_INBOX}
!
! ÂÊÁö¸¦ ¸ÞÀÏ·Î ¼ö½ÅÀ» ¿øÇÏÁö ¾ÊÀ¸½Ç°æ¿ì¿¡´Â ¾ðÁ¦µçÁö
! {SITENAME} ÀÇ °³ÀÎÁ¤º¸ º¯°æ¿¡¼ º¯°æÇϽǼö ÀÖ½À´Ï´Ù..
!
! ÀÌ»ó {SITENAME} À̾ú½À´Ï´Ù..
! ±×·³ Æò¾ÈÇÑ ÇÏ·ç µÇ¼Ò¼...!!
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 28 Jan 2002 01:30:22 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:49 -0000 1.1.2.1
***************
*** 1,8 ****
! ¾È³çÇϼ¼¿ä... {TO_USERNAME} ´Ô!
! {SITENAME} ÀÇ {FROM_USERNAME} ÀÔ´Ï´Ù.
!
! {MESSAGE}
!
! ----------------------
! {BOARD_EMAIL}
http://www.eazycom.net
--- 1,10 ----
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä... {TO_USERNAME} ´Ô!
! {SITENAME} ÀÇ {FROM_USERNAME} ÀÔ´Ï´Ù.
!
! {MESSAGE}
!
! ----------------------
! {BOARD_EMAIL}
http://www.eazycom.net
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,17 ****
! Subject: ´äº¯±ÛÀÌ µî·ÏµÇ¾ú½À´Ï´Ù. - {TOPIC_TITLE}
!
! ¾È³çÇϼ¼¿ä.. {USERNAME}´Ô.!
!
! {SITENAME} ¿¡¼ ÀÛ¼ºÇÑ {TOPIC_TITLE} ¿¡ ´ëÇÑ
! ´äº¯±ÛÀÌ µî·Ï µÇ¾ú½À´Ï´Ù..
! ¾Æ·¡ Url·Î À̵¿ Çϼż ÇÐÀÎÇغ¸½Ã±â ¹Ù¶ø´Ï´Ù.
!
! {U_TOPIC}
!
! If you no longer wish to watch this topic you can either click the
! "Stop watching this topic link" found at the bottom of the topic above,
! or by clicking the following link:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: ´äº¯±ÛÀÌ µî·ÏµÇ¾ú½À´Ï´Ù. - {TOPIC_TITLE}
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä.. {USERNAME}´Ô.!
!
! {SITENAME} ¿¡¼ ÀÛ¼ºÇÑ {TOPIC_TITLE} ¿¡ ´ëÇÑ
! ´äº¯±ÛÀÌ µî·Ï µÇ¾ú½À´Ï´Ù..
! ¾Æ·¡ Url·Î À̵¿ Çϼż ÇÐÀÎÇغ¸½Ã±â ¹Ù¶ø´Ï´Ù.
!
! {U_TOPIC}
!
! If you no longer wish to watch this topic you can either click the
! "Stop watching this topic link" found at the bottom of the topic above,
! or by clicking the following link:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ´ç½ÅÀÇ ¾ÆÀ̵𸦠Ȱ¼ºÈ ½ÃÄÑÁÖ¼¼¿ä!
+ Charset: euc-kr
Hello {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,14 ****
! Subject: ¿äûÇϽŠ»õ ºñ¹Ð¹øÈ£ ÀÔ´Ï´Ù.
!
! ¾È³çÇϼ¼¿ä.. {USERNAME} ´Ô..!
!
! {SITENAME} ¿¡¼ ¿äûÇϽŠ»õ ºñ¹Ð¹øÈ£°¡ ¹ß±ÞµÇ¾ú½À´Ï´Ù.
! Áö±Ý ¾Æ·¡ÀÇ URL·Î À̵¿Çϼż ¿øÇϽô ºñ¹Ð¹øÈ£·Î º¯°æÇϽñ⠹ٶø´Ï´Ù.
!
! {U_ACTIVATE}
!
! »õ·Î ¹ß±ÞµÈ ºñ¹Ð¹øÈ£ ÀÔ´Ï´Ù..
!
! ºñ¹Ð¹øÈ£ : {PASSWORD}
!
! {EMAIL_SIG}
--- 1,15 ----
! Subject: ¿äûÇϽŠ»õ ºñ¹Ð¹øÈ£ ÀÔ´Ï´Ù.
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä.. {USERNAME} ´Ô..!
!
! {SITENAME} ¿¡¼ ¿äûÇϽŠ»õ ºñ¹Ð¹øÈ£°¡ ¹ß±ÞµÇ¾ú½À´Ï´Ù.
! Áö±Ý ¾Æ·¡ÀÇ URL·Î À̵¿Çϼż ¿øÇϽô ºñ¹Ð¹øÈ£·Î º¯°æÇϽñ⠹ٶø´Ï´Ù.
!
! {U_ACTIVATE}
!
! »õ·Î ¹ß±ÞµÈ ºñ¹Ð¹øÈ£ ÀÔ´Ï´Ù..
!
! ºñ¹Ð¹øÈ£ : {PASSWORD}
!
! {EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,21 ****
! Subject: {SITENAME}
!
! ¾È³çÇϼ¼¿ä..{WELCOME_MSG} ÀÔ´Ï´Ù..
! {WELCOME_MSG} ¿¡ °¡ÀÔÇϽŰÍÀ» Áø½ÉÀ¸·Î ȯ¿µÇÕ´Ï´Ù.
! µî·ÏÇϽŠ°èÁ¤Á¤º¸´Â ´ÙÀ½°ú °°½À´Ï´Ù.
!
! ----------------------------
! ¾Æ ÀÌ µð : {USERNAME}
! ºñ¹Ð¹øÈ£ : {PASSWORD}
! ----------------------------
!
! Æнº¿öµå¸¦ ºÐ½ÇÇϼ̴ٸé Æ÷·³¿¡¼ À̸ÞÀÏÀ» ÀÔ·ÂÇϽøé ÀÓÀÇÀÇ Æнº¿öµå¸¦
! ¹ß±Þ¹ÞÀ»¼ö ÀÖ½À´Ï´Ù... ¹ß±Þ¹ÞÀº ºñ¹Ð¹øÈ£·Î ¾Ë±â½¬¿î ºñ¹Ð¹øÈ£·Î Àç º¯°æ
! Çϼż »ç¿ëÇÏ½Ã¸é µË´Ï´Ù..ÀÌ ºñ¹Ð¹øÈ£´Â ½ºÅ©¸³Æ®¿¡ ÀÇÇØ ¾ÏÈ£È µÇ¾îÁö¹Ç·Î
! °ü¸®ÀÚµµ ºñ¹Ð¹øÈ£¸¦ ¾Ë¼ö°¡ ¾ø½À´Ï´Ù.
!
! ÀÚÁÖ µé·ÁÁּż ÁÁÀº ¸»¾¸ ¸¶ÀÌ ÇØÁֽðí ÇÒ¹ßÇÑ ÇÒµ¿ ºÎŹ µå¸³´Ï´Ù.
!
! µî·ÏÇØÁּż °¨»çÇÕ´Ï´Ù.
!
{EMAIL_SIG}
--- 1,22 ----
! Subject: {SITENAME}
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä..{WELCOME_MSG} ÀÔ´Ï´Ù..
! {WELCOME_MSG} ¿¡ °¡ÀÔÇϽŰÍÀ» Áø½ÉÀ¸·Î ȯ¿µÇÕ´Ï´Ù.
! µî·ÏÇϽŠ°èÁ¤Á¤º¸´Â ´ÙÀ½°ú °°½À´Ï´Ù.
!
! ----------------------------
! ¾Æ ÀÌ µð : {USERNAME}
! ºñ¹Ð¹øÈ£ : {PASSWORD}
! ----------------------------
!
! Æнº¿öµå¸¦ ºÐ½ÇÇϼ̴ٸé Æ÷·³¿¡¼ À̸ÞÀÏÀ» ÀÔ·ÂÇϽøé ÀÓÀÇÀÇ Æнº¿öµå¸¦
! ¹ß±Þ¹ÞÀ»¼ö ÀÖ½À´Ï´Ù... ¹ß±Þ¹ÞÀº ºñ¹Ð¹øÈ£·Î ¾Ë±â½¬¿î ºñ¹Ð¹øÈ£·Î Àç º¯°æ
! Çϼż »ç¿ëÇÏ½Ã¸é µË´Ï´Ù..ÀÌ ºñ¹Ð¹øÈ£´Â ½ºÅ©¸³Æ®¿¡ ÀÇÇØ ¾ÏÈ£È µÇ¾îÁö¹Ç·Î
! °ü¸®ÀÚµµ ºñ¹Ð¹øÈ£¸¦ ¾Ë¼ö°¡ ¾ø½À´Ï´Ù.
!
! ÀÚÁÖ µé·ÁÁּż ÁÁÀº ¸»¾¸ ¸¶ÀÌ ÇØÁֽðí ÇÒ¹ßÇÑ ÇÒµ¿ ºÎŹ µå¸³´Ï´Ù.
!
! µî·ÏÇØÁּż °¨»çÇÕ´Ï´Ù.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_korean/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,16 ****
! Subject: {SITENAME}
!
! ¾È³çÇϼ¼¿ä.. {WELCOME_MSG} ÀÔ´Ï´Ù..
!
! Please keep this email for your records. Your account information is as follows:
!
! ----------------------------
! ¾Æ ÀÌ µð : {USERNAME}
! ºñ¹Ð¹øÈ£ : {PASSWORD}
! ----------------------------
!
! Your account is currently inactive. You cannot use it until you visit the following link:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: {SITENAME}
! Charset: euc-kr
!
! ¾È³çÇϼ¼¿ä.. {WELCOME_MSG} ÀÔ´Ï´Ù..
!
! Please keep this email for your records. Your account information is as follows:
!
! ----------------------------
! ¾Æ ÀÌ µð : {USERNAME}
! ºñ¹Ð¹øÈ£ : {PASSWORD}
! ----------------------------
!
! Your account is currently inactive. You cannot use it until you visit the following link:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:31:59
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv3880/includes
Modified Files:
Tag: phpBB-2_0_0
emailer.php functions_admin.php functions_post.php
usercp_email.php
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** emailer.php 7 Apr 2002 00:52:41 -0000 1.15.2.1
--- emailer.php 17 May 2002 13:13:34 -0000 1.15.2.2
***************
*** 39,44 ****
$this->tpl_file = NULL;
$this->address = NULL;
! $this->msg = "";
! $this->mimeOut = "";
}
--- 39,44 ----
$this->tpl_file = NULL;
$this->address = NULL;
! $this->msg = '';
! $this->mimeOut = '';
}
***************
*** 48,56 ****
function reset()
{
! $this->tpl_file = "";
! $this->address = "";
! $this->msg = "";
! $this->memOut = "";
! $this->vars = "";
}
--- 48,56 ----
function reset()
{
! $this->tpl_file = '';
! $this->address = '';
! $this->msg = '';
! $this->memOut = '';
! $this->vars = '';
}
***************
*** 60,70 ****
function email_address($address)
{
-
- $success = true;
-
$this->address = '';
$this->address .= $address;
-
- return $success;
}
--- 60,65 ----
***************
*** 85,112 ****
}
! function use_template($template_file, $template_lang = "")
{
global $board_config, $phpbb_root_path;
! if( $template_lang == "" )
{
$template_lang = $board_config['default_lang'];
}
! $template_file = $phpbb_root_path . "language/lang_" . $template_lang . "/email/" . $template_file . ".tpl";
! if( !file_exists($template_file) )
{
! message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
}
! else
{
! $this->tpl_file = $template_file;
! if( !$this->load_msg() )
! {
! message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);
! }
}
! return TRUE;
}
--- 80,104 ----
}
! function use_template($template_file, $template_lang = '')
{
global $board_config, $phpbb_root_path;
! if ( $template_lang == '' )
{
$template_lang = $board_config['default_lang'];
}
! $this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';
! if ( !file_exists($this->tpl_file) )
{
! message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
}
!
! if ( !$this->load_msg() )
{
! message_die(GENERAL_ERROR, 'Could not load email template file ' . $template_file, '', __LINE__, __FILE__);
}
! return true;
}
***************
*** 116,148 ****
function load_msg()
{
! if ($this->tpl_file == NULL)
{
! message_die(GENERAL_ERROR, "No template file set", "", __LINE__, __FILE__);
}
! else
{
! if(!($fd = fopen($this->tpl_file, 'r')))
! {
! message_die(GENERAL_ERROR, "fopen failed opening template file", "", __LINE__, __FILE__);
! }
! else
! {
! $this->msg .= fread($fd, filesize($this->tpl_file));
! fclose($fd);
! }
}
! return TRUE;
}
function assign_vars($vars)
{
! if(empty($this->vars))
! {
! $this->vars = $vars;
! }
! else
! {
! $this->vars .= $vars;
! }
}
--- 108,130 ----
function load_msg()
{
! if ( $this->tpl_file == NULL )
{
! message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__);
}
!
! if ( !($fd = fopen($this->tpl_file, 'r')) )
{
! message_die(GENERAL_ERROR, 'Failed opening template file', '', __LINE__, __FILE__);
}
!
! $this->msg .= fread($fd, filesize($this->tpl_file));
! fclose($fd);
!
! return true;
}
function assign_vars($vars)
{
! $this->vars = ( empty($this->vars) ) ? $vars : $this->vars . $vars;
}
***************
*** 166,175 ****
//
$match = array();
! preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
! $this->msg = ( isset($match[3]) ) ? trim($match[3]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
! return TRUE;
}
--- 148,158 ----
//
$match = array();
! preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
! $this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
+ $this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : 'iso-8859-1';
! return true;
}
***************
*** 181,223 ****
global $phpEx, $phpbb_root_path;
! if ($this->address == NULL)
{
! message_die(GENERAL_ERROR, "No email address set", "", __LINE__, __FILE__);
}
! else
{
! if(!$this->parse_email())
! {
! return FALSE;
! }
! if($this->use_smtp)
! {
! if(!defined('SMTP_INCLUDED'))
! {
! include($phpbb_root_path . "includes/smtp.".$phpEx);
! }
! if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
! {
! message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__);
! }
! }
! else
{
! @mail($this->address, $this->subject, $this->msg, $this->extra_headers);
}
}
! return TRUE;
}
//
! // Attach files via MIME.
//
! function attachFile($filename, $mimetype="application/octet-stream", $szFromAddress, $szFilenameToDisplay)
{
$mime_boundary = "--==================_846811060==_";
! $this->mailMsg = "--".$mime_boundary."\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n".$this->mailMsg;
if ($mime_filename)
--- 164,214 ----
global $phpEx, $phpbb_root_path;
! if ( $this->address == NULL )
{
! message_die(GENERAL_ERROR, 'No email address set', '', __LINE__, __FILE__);
}
!
! if ( !$this->parse_email() )
{
! return false;
! }
!
! //
! // Add date and encoding type
! //
! $universal_extra = "MIME-Version: 1.0\r\nContent-type: text/plain; charset=" . $this->encoding . "\r\nContent-transfer-encoding: 8bit\r\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\r\n";
! $this->extra_headers = $universal_extra . $this->extra_headers;
!
! if ( $this->use_smtp )
! {
! if ( !defined('SMTP_INCLUDED') )
{
! include($phpbb_root_path . 'includes/smtp.' . $phpEx);
}
+
+ $result = smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers);
+ }
+ else
+ {
+ $result = @mail($this->address, $this->subject, $this->msg, $this->extra_headers);
+ }
+
+ if ( !$result )
+ {
+ message_die(GENERAL_ERROR, 'Failed sending email', '', __LINE__, __FILE__);
}
! return true;
}
//
! // Attach files via MIME.
//
! function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
{
$mime_boundary = "--==================_846811060==_";
! $this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n" . $this->mailMsg;
if ($mime_filename)
***************
*** 235,243 ****
$this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n";
! if ($mimetype == "message/rfc822")
{
$this->mimeOut .= "From: ".$szFromAddress."\n";
$this->mimeOut .= "To: ".$this->emailAddress."\n";
! $this->mimeOut .= "Date: ".date("D, d M Y G:i:s ").$this->getTimeZoneInEmailFormat()."\n";
$this->mimeOut .= "Reply-To:".$szFromAddress."\n";
$this->mimeOut .= "Subject: ".$this->mailSubject."\n";
--- 226,234 ----
$this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n";
! if ( $mimetype == "message/rfc822" )
{
$this->mimeOut .= "From: ".$szFromAddress."\n";
$this->mimeOut .= "To: ".$this->emailAddress."\n";
! $this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n";
$this->mimeOut .= "Reply-To:".$szFromAddress."\n";
$this->mimeOut .= "Subject: ".$this->mailSubject."\n";
Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_admin.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** functions_admin.php 14 May 2002 15:19:20 -0000 1.5.2.1
--- functions_admin.php 17 May 2002 13:13:35 -0000 1.5.2.2
***************
*** 56,60 ****
// Synchronise functions for forums/topics
//
! function sync($type, $id)
{
global $db;
--- 56,60 ----
// Synchronise functions for forums/topics
//
! function sync($type, $id = false)
{
global $db;
Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** functions_post.php 14 May 2002 15:19:20 -0000 1.9.2.4
--- functions_post.php 17 May 2002 13:13:35 -0000 1.9.2.5
***************
*** 268,272 ****
$topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
$sql = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 268,272 ----
$topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
$sql = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 281,285 ****
$edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
$sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
! if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 281,285 ----
$edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
$sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
! if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 292,296 ****
$sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message', bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 292,296 ----
$sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message', bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 305,309 ****
{
$sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 305,309 ----
{
$sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 349,353 ****
$sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 349,353 ----
$sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 360,365 ****
{
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
! WHERE vote_option_id IN ($delete_option_sql)";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql);
--- 360,366 ----
{
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
! WHERE vote_option_id IN ($delete_option_sql)
! AND vote_id = $poll_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql);
***************
*** 396,405 ****
{
! $topic_update_sql .= "topic_replies = topic_replies - 1";
$sql = "SELECT MAX(post_id) AS last_post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 397,406 ----
{
! $topic_update_sql .= 'topic_replies = topic_replies - 1';
$sql = "SELECT MAX(post_id) AS last_post_id
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 417,421 ****
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 418,422 ----
FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 433,437 ****
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 434,438 ----
FROM " . POSTS_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 461,465 ****
$forum_update_sql
WHERE forum_id = $forum_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 462,466 ----
$forum_update_sql
WHERE forum_id = $forum_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 472,476 ****
WHERE topic_id = $topic_id
OR topic_moved_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 473,477 ----
WHERE topic_id = $topic_id
OR topic_moved_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 483,487 ****
SET user_posts = user_posts $sign
WHERE user_id = $user_id";
! if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
--- 484,488 ----
SET user_posts = user_posts $sign
WHERE user_id = $user_id";
! if ( !$db->sql_query($sql, END_TRANSACTION) )
{
message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
***************
*** 506,510 ****
$sql = "DELETE FROM " . POSTS_TABLE . "
WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 507,511 ----
$sql = "DELETE FROM " . POSTS_TABLE . "
WHERE post_id = $post_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 513,517 ****
$sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 514,518 ----
$sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
WHERE post_id = $post_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 526,530 ****
WHERE topic_id = $topic_id
OR topic_moved_id = $topic_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 527,531 ----
WHERE topic_id = $topic_id
OR topic_moved_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 533,537 ****
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
--- 534,538 ----
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
***************
*** 547,551 ****
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
--- 548,552 ----
$sql = "DELETE FROM " . VOTE_DESC_TABLE . "
WHERE topic_id = $topic_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
***************
*** 554,558 ****
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
WHERE vote_id = $poll_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
--- 555,559 ----
$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
WHERE vote_id = $poll_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
***************
*** 561,565 ****
$sql = "DELETE FROM " . VOTE_USERS_TABLE . "
WHERE vote_id = $poll_id";
! if ( !($db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
--- 562,566 ----
$sql = "DELETE FROM " . VOTE_USERS_TABLE . "
WHERE vote_id = $poll_id";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
***************
*** 597,601 ****
$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
--- 598,602 ----
$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
***************
*** 647,651 ****
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$update_watched_sql = '';
--- 648,652 ----
$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
! $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$update_watched_sql = '';
***************
*** 660,664 ****
$emailer->use_template('topic_notify', $row['user_lang']);
$emailer->email_address($row['user_email']);
! $emailer->set_subject();//$lang['Topic_reply_notification']
$emailer->extra_headers($email_headers);
--- 661,665 ----
$emailer->use_template('topic_notify', $row['user_lang']);
$emailer->email_address($row['user_email']);
! $emailer->set_subject();
$emailer->extra_headers($email_headers);
***************
*** 708,712 ****
WHERE topic_id = $topic_id
AND user_id = " . $userdata['user_id'];
! if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql);
--- 709,713 ----
WHERE topic_id = $topic_id
AND user_id = " . $userdata['user_id'];
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql);
***************
*** 717,721 ****
$sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql);
--- 718,722 ----
$sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql);
Index: usercp_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_email.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** usercp_email.php 5 Apr 2002 17:01:53 -0000 1.7.2.1
--- usercp_email.php 17 May 2002 13:13:35 -0000 1.7.2.2
***************
*** 95,107 ****
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'From: ' . $userdata['user_email'] . "\n";
! if ( !empty($HTTP_POST_VARS['cc_email']) )
! {
! $email_headers .= "Cc: " . $userdata['user_email'] . "\n";
! }
! $email_headers .= 'Return-Path: ' . $userdata['user_email'] . "\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
--- 95,102 ----
$emailer = new emailer($board_config['smtp_delivery']);
! $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
! $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
! $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
***************
*** 120,123 ****
--- 115,137 ----
$emailer->send();
$emailer->reset();
+
+ if ( !empty($HTTP_POST_VARS['cc_email']) )
+ {
+ $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
+ $emailer->use_template('profile_send_email');
+ $emailer->email_address($userdata['user_email']);
+ $emailer->set_subject($subject);
+ $emailer->extra_headers($email_headers);
+
+ $emailer->assign_vars(array(
+ 'SITENAME' => $board_config['sitename'],
+ 'BOARD_EMAIL' => $board_config['board_email'],
+ 'FROM_USERNAME' => $userdata['username'],
+ 'TO_USERNAME' => $username,
+ 'MESSAGE' => $message)
+ );
+ $emailer->send();
+ $emailer->reset();
+ }
$template->assign_vars(array(
|
Update of /cvsroot/phpbb/phpBB2/language/lang_arabic/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_arabic/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/admin_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- admin_activate.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ãÔÊÑß ÌÏíÏ
+ Charset: windows-1256
ãÑÍÈÇ,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/admin_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_send_email.tpl 25 Feb 2002 14:49:50 -0000 1.2
--- admin_send_email.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: windows-1256
+
åÐå ÑÓÇáÉ ãä ãÏíÑ "{SITENAME}". ÇÐÇ ßÇäÊ åÐå ÇáÑÓÇáÉ ÇÚáÇäÇÊ, ÊÍÊæí Úáì áÛÉ ÈÐíÆÉ Ãæ Çí ßáÇã ÛíÑ ãáÇÆã ÇáÑÌÇÁ ãÑÇÓáÉ ãÓÄæá ÇáãæÞÚ Úáì ÇáÚäæÇä ÇáÊÇáí:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Êã ÊÔÛíá ÇáÇÔÊÑÇß
+ Charset: windows-1256
ãÑÍÈÇ {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÃåáÇ æÓåáÇ Èßã Ýí ãäÊÏì {SITENAME}
+ Charset: windows-1256
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÃåáÇ æÓåáÇ Èßã Ýí ãäÊÏì {SITENAME}
+ Charset: windows-1256
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Êã ÇÖÇÝÊß ááãÌãæÚÉ
+ Charset: windows-1256
ãÈÑæß,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- group_approved.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÊãÊ ÇáãæÇÝÞÉ Úáì ØáÈß
+ Charset: windows-1256
ãÈÑæß,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Êã ÊÞÏíã ØáÈß ááÇÔÊÑÇß Ýí ÇáãÌãæÚÉ
+ Charset: windows-1256
ÇáÓíÏ/É {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: áÞÏ æÕáÊ ÑÓÇáÉ ÎÇÕÉ
+ Charset: windows-1256
ãÑÍÈÇ {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/profile_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** profile_send_email.tpl 25 Feb 2002 14:49:50 -0000 1.2
--- profile_send_email.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: windows-1256
+
ãÑÍÈÇ {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÇáÊÐßíÑ ÈÇáÑÏæÏ Úáì ÇáãæÇÖíÚ - {TOPIC_TITLE}
+ Charset: windows-1256
ãÑÍÈÇ {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- user_activate.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: v
+ Charset: windows-1256
ãÑÍÈÇ {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: New password activation
+ Charset: windows-1256
ãÑÍÈÇ {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÃåáÇ æÓåáÇ Èßã Ýí ãäÊÏì {SITENAME}
+ Charset: windows-1256
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: ÃåáÇ æÓåáÇ Èßã Ýí ãäÊÏì {SITENAME}
+ Charset: windows-1256
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_polish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_polish/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,9 ****
! Subject: Nowe Konto
!
! Witamy,
!
! Konto o nazwie "{USERNAME}" zosta³o deaktywowane lub nowo utworzone, powiniene¶ sprawdziæ szczegó³y tego u¿ytkownika (je¶li to konieczne) i aktywowaæ konto u¿ywaj±c poni¿szego odno¶nika:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Nowe Konto
! Charset: iso-8859-2
!
! Witamy,
!
! Konto o nazwie "{USERNAME}" zosta³o deaktywowane lub nowo utworzone, powiniene¶ sprawdziæ szczegó³y tego u¿ytkownika (je¶li to konieczne) i aktywowaæ konto u¿ywaj±c poni¿szego odno¶nika:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 1 Jan 2002 14:11:07 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:50 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-2
+
Poni¿ej jest email wys³any do Ciebie przez administratora "{SITENAME}". Je¿eli uznasz go za spam, jest obra¼liwy lub w jakikolwiek sposób Ciê niepokoi skontaktuj siê z webmasterem forum pod poni¿szym adresem:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,7 ****
! Subject: Konto Aktywowane
!
! Witaj {USERNAME},
!
! Twoje konto na "{SITENAME}" zosta³o w³a¶nie aktywowane, mo¿esz zalogowaæ siê korzystaj±c z loginu i has³a, które otrzyma³e¶ w poprzednim email'u.
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: Konto Aktywowane
! Charset: iso-8859-2
!
! Witaj {USERNAME},
!
! Twoje konto na "{SITENAME}" zosta³o w³a¶nie aktywowane, mo¿esz zalogowaæ siê korzystaj±c z loginu i has³a, które otrzyma³e¶ w poprzednim email'u.
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:51 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Witamy na Forum {SITENAME}
+ Charset: iso-8859-2
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:51 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Witamy na Forum {SITENAME}
+ Charset: iso-8859-2
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:51 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Zosta³e¶ dodany do tej grupy
+ Charset: iso-8859-2
Gratulacje,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:51 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Twoja pro¶ba zosta³a zaakceptowana
+ Charset: iso-8859-2
Gratulacje,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: Twoja pro¶ba o przy³±czenie do grupy zosta³a wys³ana
!
! Drogi {GROUP_MODERATOR},
!
! Jeden z u¿ytkowników poprosi³ o cz³onkostwo w Twojej grupie na {SITENAME}.
! Aby przyj±æ lub odrzuciæ t± pro¶bê odwied¼ poni¿sz± stronê:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Twoja pro¶ba o przy³±czenie do grupy zosta³a wys³ana
! Charset: iso-8859-2
!
! Drogi {GROUP_MODERATOR},
!
! Jeden z u¿ytkowników poprosi³ o cz³onkostwo w Twojej grupie na {SITENAME}.
! Aby przyj±æ lub odrzuciæ t± pro¶bê odwied¼ poni¿sz± stronê:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,11 ****
! Subject: Nadesz³a nowa Prywatna Wiadomo¶æ
!
! Witaj {USERNAME},
!
! Otrzyma³e¶ now± Prywatn± Wiadomo¶æ na Twoje konto na "{SITENAME}" i prosi³e¶ by Ciebie o tym powiadomiono. Mo¿esz zobaczyæ now± wiadomo¶æ klikaj±c na poni¿szy odno¶nik:
!
! {U_INBOX}
!
! Pamiêtaj, ¿e mo¿esz zawsze wy³±czyæ powiadamianie o nowych wiadomo¶ciach zmieniaj±c odpowiednie ustawienia w Twoim profilu.
!
{EMAIL_SIG}
--- 1,12 ----
! Subject: Nadesz³a nowa Prywatna Wiadomo¶æ
! Charset: iso-8859-2
!
! Witaj {USERNAME},
!
! Otrzyma³e¶ now± Prywatn± Wiadomo¶æ na Twoje konto na "{SITENAME}" i prosi³e¶ by Ciebie o tym powiadomiono. Mo¿esz zobaczyæ now± wiadomo¶æ klikaj±c na poni¿szy odno¶nik:
!
! {U_INBOX}
!
! Pamiêtaj, ¿e mo¿esz zawsze wy³±czyæ powiadamianie o nowych wiadomo¶ciach zmieniaj±c odpowiednie ustawienia w Twoim profilu.
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 1 Jan 2002 14:11:07 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:52 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-2
+
Witaj {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:25 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:52 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Powiadomienie o Odpowiedzi - {TOPIC_TITLE}
+ Charset: iso-8859-2
Witaj {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Reaktywuj soje konto!
+ Charset: iso-8859-2
Witaj {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,17 ****
! Subject: Aktywacja nowego has³a
!
! Witaj {USERNAME}
!
! Otrzymujesz ten email poniewa¿ Ty (albo kto¶ podaj±cy siê za Ciebie) poprosi³ o nowe has³o dla Twojego konta na {SITENAME}. Je¿eli nie prosi³e¶ o ten email zignoruj go, a je¶li otrzymasz go ponownie skontaktuj siê z administratorem forum.
!
! Aby skorzystaæ z nowego has³a musisz je aktywowaæ. Aby to zrobiæ kliknij odno¶nik poni¿ej.
!
! {U_ACTIVATE}
!
! Gdy to zrobisz bêdziesz móg³ siê logowaæ korzystaj±c z has³a:
!
! Has³o: {PASSWORD}
!
! Mo¿esz oczywi¶cie zmieniæ to has³o w swoim profilu. Je¿eli bêdziesz mia³ problemy skontaktuj siê z administratorem forum.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Aktywacja nowego has³a
! Charset: iso-8859-2
!
! Witaj {USERNAME}
!
! Otrzymujesz ten email poniewa¿ Ty (albo kto¶ podaj±cy siê za Ciebie) poprosi³ o nowe has³o dla Twojego konta na {SITENAME}. Je¿eli nie prosi³e¶ o ten email zignoruj go, a je¶li otrzymasz go ponownie skontaktuj siê z administratorem forum.
!
! Aby skorzystaæ z nowego has³a musisz je aktywowaæ. Aby to zrobiæ kliknij odno¶nik poni¿ej.
!
! {U_ACTIVATE}
!
! Gdy to zrobisz bêdziesz móg³ siê logowaæ korzystaj±c z has³a:
!
! Has³o: {PASSWORD}
!
! Mo¿esz oczywi¶cie zmieniæ to has³o w swoim profilu. Je¿eli bêdziesz mia³ problemy skontaktuj siê z administratorem forum.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Witamy na Forum {SITENAME}
+ Charset: iso-8859-2
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_polish/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:52 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Witamy na Forum {SITENAME}
+ Charset: iso-8859-2
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_chinese_simplified/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,9 ****
! Subject: ÐÂÓû§ÕÊ»§
!
! ÄúºÃ,
!
! Õâ¸ö "{USERNAME}" µÄÕʺſÉÄܱ»¶³½áÁË»òÊǸÕÍê³É×¢²á³ÌÐò. Èç¹ûÓбØÒªµÄ»°, Çë¼ì²éÕâ¸öÓû§µÄÏêϸ×ÊÁϺÍʹÓÃÒÔÏÂÁ´½Ó¼¤»îÕâ¸öÕʺÅ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: ÐÂÓû§ÕÊ»§
! Charset: gb2312
!
! ÄúºÃ,
!
! Õâ¸ö "{USERNAME}" µÄÕʺſÉÄܱ»¶³½áÁË»òÊǸÕÍê³É×¢²á³ÌÐò. Èç¹ûÓбØÒªµÄ»°, Çë¼ì²éÕâ¸öÓû§µÄÏêϸ×ÊÁϺÍʹÓÃÒÔÏÂÁ´½Ó¼¤»îÕâ¸öÕʺÅ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 26 Feb 2002 00:13:03 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,10 ****
! Õâ·âµç×ÓÓʼþÊÇÓÉ"{SITENAME}"¹ÜÀíÔ±¼Ä³öµÄ. ¼ÙÈçÕâ·âµç×ÓÓʼþµÄÄÚÈÝÁîÄã¸Ðµ½²»Óä¿ì, ÉõÖÁÊǶñÒâµÄ¹¥»÷, ÇëʹÓÃÒÔÏÂÁ´½ÓÌá³öÉêËß:
!
! {BOARD_EMAIL}
!
! °üº¬ÍêÕûµÄµç×ÓÓʼþ(ÌرðÊÇÍ·ÐÅÏ¢).
!
! ¸½´ø¸øÄãµÄѶϢÈçÏÂ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,12 ----
! Charset: gb2312
!
! Õâ·âµç×ÓÓʼþÊÇÓÉ"{SITENAME}"¹ÜÀíÔ±¼Ä³öµÄ. ¼ÙÈçÕâ·âµç×ÓÓʼþµÄÄÚÈÝÁîÄã¸Ðµ½²»Óä¿ì, ÉõÖÁÊǶñÒâµÄ¹¥»÷, ÇëʹÓÃÒÔÏÂÁ´½ÓÌá³öÉêËß:
!
! {BOARD_EMAIL}
!
! °üº¬ÍêÕûµÄµç×ÓÓʼþ(ÌرðÊÇÍ·ÐÅÏ¢).
!
! ¸½´ø¸øÄãµÄѶϢÈçÏÂ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,7 ****
! Subject: ÕË»§¼¤»î
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"µÄÕʺÅÒѾ¼¤»î, Äú¿ÉÒÔʹÓÃËùÊÕµ½µÄ»áÔ±Õʺż°ÃÜÂëµÇÈë"{SITENAME}".
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: ÕË»§¼¤»î
! Charset: gb2312
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"µÄÕʺÅÒѾ¼¤»î, Äú¿ÉÒÔʹÓÃËùÊÕµ½µÄ»áÔ±Õʺż°ÃÜÂëµÇÈë"{SITENAME}".
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,18 ****
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÄúµÄÕʺÅÄ¿Ç°ÉÐδ¼¤»î, ϵͳ¹ÜÀíÔ±½«ÎªÄú¿ªÍ¨ÕʺÅ. µ±ÄúµÄÕ˺ż¤»îºóÄú½«»áÊÕµ½Ò»·âÈ·ÈÏÓʼþ.
!
! ÇëÀμÇÄúµÄÃÜÂë, ÓÉÓÚËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶ø, Èç¹ûÄúÍü¼ÇÁËÃÜÂë, ϵͳ½«»á¼Ä·¢Ò»¸öеÄÃÜÂë¸øÄú.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
! Charset: gb2312
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÄúµÄÕʺÅÄ¿Ç°ÉÐδ¼¤»î, ϵͳ¹ÜÀíÔ±½«ÎªÄú¿ªÍ¨ÕʺÅ. µ±ÄúµÄÕ˺ż¤»îºóÄú½«»áÊÕµ½Ò»·âÈ·ÈÏÓʼþ.
!
! ÇëÀμÇÄúµÄÃÜÂë, ÓÉÓÚËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶ø, Èç¹ûÄúÍü¼ÇÁËÃÜÂë, ϵͳ½«»á¼Ä·¢Ò»¸öеÄÃÜÂë¸øÄú.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,53 ****
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
!
! {WELCOME_MSG}
!
! ÒÀÕÕ"ÃÀ¹ú¶ùͯÍø·Òþ˽±£»¤·¨"¹æ¶¨, ÄúµÄÕʺÅÉÐδ¼¤»î.
!
! ÇëÁÐÓ¡ÒÔϱí¸ñ²¢ÇëÄúµÄ¸¸Ä¸»ò¼à»¤ÈËÇ©ÉÏÃû×ÖºÍÈÕÆÚ,½«Æä´«Õæµ½:
!
! {FAX_INFO}
!
! »òÓʼĵ½:
!
! {MAIL_INFO}
!
! ------------------------------ Óɴ˲ÿª ------------------------------
! {SITENAME} »áÔ±×¢²áÉêÇë
!
! ʹÓÃÕßÃû³Æ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! µç×ÓÓʼþ: {EMAIL_ADDRESS}
!
! ICQ 񅧏: {ICQ}
! AIM λַ: {AIM}
! MSN ÐÅʹ: {MSN}
! ÑÅ»¢¼´Ê±Í¨: {YIM}
! ¸öÈËÊ×Ò³: {WEB_SITE}
! À´×Ô: {FROM}
! Ö°Òµ: {OCC}
! ÐËȤ: {INTERESTS}
!
! ÎÒÒÑ¿´¹ý±£»¤¶ùͯµÄÌõÎIJ¢ÇÒÔÊÐí"{SITENAME}"´¢´æÕâЩ×ÊѶ.
! ÎÒÁ˽âÕâЩ×ÊѶ¿ÉÄÜÔÚÈκÎʱºò±»¼üÈëÃÜÂë¸ü¸Ä.
! ÎÒÁ˽âÕâЩ×ÊÁÏÓпÉÄÜÔÚÈκÎʱºòÓÉ"{SITENAME}"ɾ³ý.
!
!
! ¼Ò³¤»ò¼à»¤ÈË
! (ÇëÔÚ´ËÇ©Ãû): _____________________
!
! ±¾ÈË
! (ÇëÔÚ´ËÇ©Ãû): __________________
!
! ÈÕÆÚ: _______________
!
! ------------------------------ Óɴ˲ÿª------------------------------
!
!
! µ±¹ÜÀíÈËÔ±ÊÕµ½ÒÔÉϵÄÉêÇë´«Õæ»òÓʼþ²¢Í¨¹ýÉóºË, ÄúµÄÕʺŲŻᱻ¼¤»î.
!
! ÇëÀμÇÄúµÄÃÜÂë, ÓÉÓÚËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶ø, Èç¹ûÄúÍü¼ÇÁËÃÜÂë, ϵͳ½«»á¼Ä·¢Ò»¸öеÄÃÜÂë¸øÄú.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
--- 1,54 ----
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
! Charset: gb2312
!
! {WELCOME_MSG}
!
! ÒÀÕÕ"ÃÀ¹ú¶ùͯÍø·Òþ˽±£»¤·¨"¹æ¶¨, ÄúµÄÕʺÅÉÐδ¼¤»î.
!
! ÇëÁÐÓ¡ÒÔϱí¸ñ²¢ÇëÄúµÄ¸¸Ä¸»ò¼à»¤ÈËÇ©ÉÏÃû×ÖºÍÈÕÆÚ,½«Æä´«Õæµ½:
!
! {FAX_INFO}
!
! »òÓʼĵ½:
!
! {MAIL_INFO}
!
! ------------------------------ Óɴ˲ÿª ------------------------------
! {SITENAME} »áÔ±×¢²áÉêÇë
!
! ʹÓÃÕßÃû³Æ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! µç×ÓÓʼþ: {EMAIL_ADDRESS}
!
! ICQ 񅧏: {ICQ}
! AIM λַ: {AIM}
! MSN ÐÅʹ: {MSN}
! ÑÅ»¢¼´Ê±Í¨: {YIM}
! ¸öÈËÊ×Ò³: {WEB_SITE}
! À´×Ô: {FROM}
! Ö°Òµ: {OCC}
! ÐËȤ: {INTERESTS}
!
! ÎÒÒÑ¿´¹ý±£»¤¶ùͯµÄÌõÎIJ¢ÇÒÔÊÐí"{SITENAME}"´¢´æÕâЩ×ÊѶ.
! ÎÒÁ˽âÕâЩ×ÊѶ¿ÉÄÜÔÚÈκÎʱºò±»¼üÈëÃÜÂë¸ü¸Ä.
! ÎÒÁ˽âÕâЩ×ÊÁÏÓпÉÄÜÔÚÈκÎʱºòÓÉ"{SITENAME}"ɾ³ý.
!
!
! ¼Ò³¤»ò¼à»¤ÈË
! (ÇëÔÚ´ËÇ©Ãû): _____________________
!
! ±¾ÈË
! (ÇëÔÚ´ËÇ©Ãû): __________________
!
! ÈÕÆÚ: _______________
!
! ------------------------------ Óɴ˲ÿª------------------------------
!
!
! µ±¹ÜÀíÈËÔ±ÊÕµ½ÒÔÉϵÄÉêÇë´«Õæ»òÓʼþ²¢Í¨¹ýÉóºË, ÄúµÄÕʺŲŻᱻ¼¤»î.
!
! ÇëÀμÇÄúµÄÃÜÂë, ÓÉÓÚËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶ø, Èç¹ûÄúÍü¼ÇÁËÃÜÂë, ϵͳ½«»á¼Ä·¢Ò»¸öеÄÃÜÂë¸øÄú.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: ÄúÒѾ±»¼ÓÈëÕâ¸öÍŶÓ
!
! ¹§Ï²,
!
! ÄúÒѾ³É¹¦¼ÓÈë"{SITENAME}"µÄ"{GROUP_NAME}"Õâ¸öȺ×é.
! ÕâÊÇÓÉÍŶӹÜÀíÔ±»òÂÛ̳¹ÜÀíÔ±×÷³öµÄ¾ö¶¨, ÁªÂçËûÃÇÄú¿ÉÒԵõ½¸ü¶àÓйØÐÅÏ¢.
!
! Äú¿ÉÒÔʹÓÃÒÔÏÂÁ´½Ó²é¿´ÍŶÓÐÅÏ¢:
! {U_GROUPCP}
! {EMAIL_SIG}
--- 1,11 ----
! Subject: ÄúÒѾ±»¼ÓÈëÕâ¸öÍŶÓ
! Charset: gb2312
!
! ¹§Ï²,
!
! ÄúÒѾ³É¹¦¼ÓÈë"{SITENAME}"µÄ"{GROUP_NAME}"Õâ¸öȺ×é.
! ÕâÊÇÓÉÍŶӹÜÀíÔ±»òÂÛ̳¹ÜÀíÔ±×÷³öµÄ¾ö¶¨, ÁªÂçËûÃÇÄú¿ÉÒԵõ½¸ü¶àÓйØÐÅÏ¢.
!
! Äú¿ÉÒÔʹÓÃÒÔÏÂÁ´½Ó²é¿´ÍŶÓÐÅÏ¢:
! {U_GROUPCP}
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: ÄúµÄÉêÇëÒѾ±»Åú×¼ÁË
!
! ¹§Ï²Äú,
!
! ÄãÔÚ"{SITENAME}"ËùÉêÇë¼ÓÈëµÄÍŶÓ"{GROUP_NAME}"ÒѾ»ñµÃÅú×¼.
! ÇëʹÓÃÒÔÏÂÁ´½Ó²é¿´ÄúµÄÍŶÓÐÅÏ¢
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: ÄúµÄÉêÇëÒѾ±»Åú×¼ÁË
! Charset: gb2312
!
! ¹§Ï²Äú,
!
! ÄãÔÚ"{SITENAME}"ËùÉêÇë¼ÓÈëµÄÍŶÓ"{GROUP_NAME}"ÒѾ»ñµÃÅú×¼.
! ÇëʹÓÃÒÔÏÂÁ´½Ó²é¿´ÄúµÄÍŶÓÐÅÏ¢
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,10 ****
! Subject: ¼ÓÈëÕâ¸öÍŶӵÄÉêÇëÒѾÌá½»
!
! Ç×°®µÄ {GROUP_MODERATOR},
!
! ÓÐÒ»¸ö»áÔ±Ìá³öÉêÇë¼ÓÈëÄãÔÚ"{SITENAME}"Ëù¹ÜÀíµÄ»áÔ±ÍŶÓ.
! ÇëʹÓÃÒÔÏÂÁ´½ÓÅú×¼»òÊǾܾøÉêÇëµÄ¾ö¶¨:
!
! {U_GROUPCP}
!
{EMAIL_SIG}
--- 1,11 ----
! Subject: ¼ÓÈëÕâ¸öÍŶӵÄÉêÇëÒѾÌá½»
! Charset: gb2312
!
! Ç×°®µÄ {GROUP_MODERATOR},
!
! ÓÐÒ»¸ö»áÔ±Ìá³öÉêÇë¼ÓÈëÄãÔÚ"{SITENAME}"Ëù¹ÜÀíµÄ»áÔ±ÍŶÓ.
! ÇëʹÓÃÒÔÏÂÁ´½ÓÅú×¼»òÊǾܾøÉêÇëµÄ¾ö¶¨:
!
! {U_GROUPCP}
!
{EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,11 ****
! Subject: еÄÕ¾ÄÚÐżþ
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"ÓÐеÄ˽ÈËÏûÏ¢, ÄúÒªÇóϵͳÒÔµç×ÓÓʼþ֪ͨ. Äú¿ÉÒÔʹÓÃÒÔϵÄÁ´½Óä¯ÀÀÄú¸ÕÊÕµ½µÄ˽ÈËÏûÏ¢:
!
! {U_INBOX}
!
! Çë¼ÇµÃÄúËæʱ¶¼¿ÉÒÔÈ¡ÏûÕâÀàµÄµç×ÓÓʼþ֪ͨ, Ïà¹ØÑ¡ÏîÄú¿ÉÒÔÔÚ¸öÈË×ÊÁÏÉ趨Àï¸ü¸Ä.
!
{EMAIL_SIG}
--- 1,12 ----
! Subject: еÄÕ¾ÄÚÐżþ
! Charset: gb2312
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"ÓÐеÄ˽ÈËÏûÏ¢, ÄúÒªÇóϵͳÒÔµç×ÓÓʼþ֪ͨ. Äú¿ÉÒÔʹÓÃÒÔϵÄÁ´½Óä¯ÀÀÄú¸ÕÊÕµ½µÄ˽ÈËÏûÏ¢:
!
! {U_INBOX}
!
! Çë¼ÇµÃÄúËæʱ¶¼¿ÉÒÔÈ¡ÏûÕâÀàµÄµç×ÓÓʼþ֪ͨ, Ïà¹ØÑ¡ÏîÄú¿ÉÒÔÔÚ¸öÈË×ÊÁÏÉ趨Àï¸ü¸Ä.
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 26 Feb 2002 00:13:03 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,12 ****
! {TO_USERNAME} ÄúºÃ,
!
! Õâ·âµç×ÓÓʼþÊÇ"{FROM_USERNAME}"ÀûÓÃÄúÔÚ"{SITENAME}"µÄ»áÔ±×ÊÁÏËù·¢Ë͵Ä. Èç¹ûÕâ·âµç×ÓÓʼþµÄÄÚÈÝÊǶñÒâµÄ¹¥»÷»òÊÇÀ¬»øÓʼþ, ÇëʹÓÃÒÔϵÄÁ´½ÓÌá³öÉêËß:
!
! {BOARD_EMAIL}
!
! Çë°üº¬Õâ·âÍêÕûµÄµç×ÓÓʼþÄÚÈÝ(ÌرðÊÇÍ·ÐÅÏ¢). Çë×¢Òâ»Ø¸²µÄµç×ÓÓʼþµØÖ·ÒÑÉ趨Ϊ"{FROM_USERNAME}".
!
! ѶϢÈçÏÂ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,14 ----
! Charset: gb2312
!
! {TO_USERNAME} ÄúºÃ,
!
! Õâ·âµç×ÓÓʼþÊÇ"{FROM_USERNAME}"ÀûÓÃÄúÔÚ"{SITENAME}"µÄ»áÔ±×ÊÁÏËù·¢Ë͵Ä. Èç¹ûÕâ·âµç×ÓÓʼþµÄÄÚÈÝÊǶñÒâµÄ¹¥»÷»òÊÇÀ¬»øÓʼþ, ÇëʹÓÃÒÔϵÄÁ´½ÓÌá³öÉêËß:
!
! {BOARD_EMAIL}
!
! Çë°üº¬Õâ·âÍêÕûµÄµç×ÓÓʼþÄÚÈÝ(ÌرðÊÇÍ·ÐÅÏ¢). Çë×¢Òâ»Ø¸²µÄµç×ÓÓʼþµØÖ·ÒÑÉ趨Ϊ"{FROM_USERNAME}".
!
! ѶϢÈçÏÂ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,13 ****
! Subject: »ØÌû֪ͨ - {TOPIC_TITLE}
!
! {USERNAME} ÄúºÃ,
!
! ÄúÊÕµ½Õâ·âÕâ·âµç×ÓÓʼþÊÇÒòΪÄúÔÚ"{SITENAME}"¶©ÔÄÁËÖ÷Ìâ"{TOPIC_TITLE}", Õâ¸öÖ÷ÌâÔÚÄúÉÏ´ÎÀ´·ÃºóÓÐеĻظ². Äú¿ÉÒÔʹÓÃÒÔÏÂÁ´½ÓÀ´ÔĶÁ»Ø¸²µÄÄÚÈÝ, ÔÚÄúä¯ÀÀÔÖ÷Ìâ֮ǰ, ²»»áÔÙÓиüеÄѶϢ.
!
! {U_TOPIC}
!
! Èç¹ûÄúÏëÈ¡Ïû¶©ÔÄÕâ¸öÖ÷Ìâ, Äú¿ÉÒÔ°´ÏÂÖ÷ÌâÏ·½µÄÁ´½Ó, »òÖ±½ÓʹÓÃÒÔÏÂÁ´½Ó:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,14 ----
! Subject: »ØÌû֪ͨ - {TOPIC_TITLE}
! Charset: gb2312
!
! {USERNAME} ÄúºÃ,
!
! ÄúÊÕµ½Õâ·âÕâ·âµç×ÓÓʼþÊÇÒòΪÄúÔÚ"{SITENAME}"¶©ÔÄÁËÖ÷Ìâ"{TOPIC_TITLE}", Õâ¸öÖ÷ÌâÔÚÄúÉÏ´ÎÀ´·ÃºóÓÐеĻظ². Äú¿ÉÒÔʹÓÃÒÔÏÂÁ´½ÓÀ´ÔĶÁ»Ø¸²µÄÄÚÈÝ, ÔÚÄúä¯ÀÀÔÖ÷Ìâ֮ǰ, ²»»áÔÙÓиüеÄѶϢ.
!
! {U_TOPIC}
!
! Èç¹ûÄúÏëÈ¡Ïû¶©ÔÄÕâ¸öÖ÷Ìâ, Äú¿ÉÒÔ°´ÏÂÖ÷ÌâÏ·½µÄÁ´½Ó, »òÖ±½ÓʹÓÃÒÔÏÂÁ´½Ó:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,9 ****
! Subject: ÖØ줻îÄúµÄÕË»§!
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"µÄÕʺÅÔÝʱ±»¶³½á, ×îÓпÉÄܵÄÔÒòÊÇÄú¸ü¸ÄÁËÄúµÄ¸öÈË×ÊÁÏ. ÇëʹÓÃÒÔÏÂÁ´½ÓÖØ줻îÄúµÄÕʺÅ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: ÖØ줻îÄúµÄÕË»§!
! Charset: gb2312
!
! {USERNAME} ÄúºÃ,
!
! ÄúÔÚ"{SITENAME}"µÄÕʺÅÔÝʱ±»¶³½á, ×îÓпÉÄܵÄÔÒòÊÇÄú¸ü¸ÄÁËÄúµÄ¸öÈË×ÊÁÏ. ÇëʹÓÃÒÔÏÂÁ´½ÓÖØ줻îÄúµÄÕʺÅ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,17 ****
! Subject: ÐÂÃÜÂ뼤»î
!
! {USERNAME} ÄúºÃ,
!
! ÄúÊÕµ½Õâ·âÕâ·âµç×ÓÓʼþÊÇÒòΪÄú (Ò²¿ÉÄÜÊÇijÈËð³äÄúµÄÃûÒå) ÉêÇëÁËÒ»¸öеÄÃÜÂë. ¼ÙÈçÕâ²»ÊÇÄú±¾ÈËËùÉêÇë, Çë²»ÓÃÀí»áÕâ·âµç×ÓÓʼþ, µ«ÊÇÈç¹ûÄú³ÖÐøÊÕµ½ÕâÀàµÄÐżþɧÈÅ, ÇëÄú¾¡¿ìÁªÂç¹ÜÀíÔ±.
!
! ҪʹÓÃÕâ×éеÄÃÜÂë, ÇëʹÓÃÒÔÏÂÁ¬½áÆôÓÃÃÜÂë.
!
! {U_ACTIVATE}
!
! ÔÚÃÜÂëÆôÓÃÖ®áá, Äú½«¿ÉÒÔʹÓÃеÄÃÜÂëµÇÈë:
!
! ÃÜÂë: {PASSWORD}
!
! Äú¿ÉÒÔÔÚÄúµÄ¸öÈË×ÊÁÏÖÐ×ÔÐиü¸ÄÕʺÅÃÜÂë. Èç¹ûÄú»¹ÓÐÈκεÄÒÉÎÊ, ÇëÓëϵͳ¹ÜÀíÔ±ÁªÂç.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: ÐÂÃÜÂ뼤»î
! Charset: gb2312
!
! {USERNAME} ÄúºÃ,
!
! ÄúÊÕµ½Õâ·âÕâ·âµç×ÓÓʼþÊÇÒòΪÄú (Ò²¿ÉÄÜÊÇijÈËð³äÄúµÄÃûÒå) ÉêÇëÁËÒ»¸öеÄÃÜÂë. ¼ÙÈçÕâ²»ÊÇÄú±¾ÈËËùÉêÇë, Çë²»ÓÃÀí»áÕâ·âµç×ÓÓʼþ, µ«ÊÇÈç¹ûÄú³ÖÐøÊÕµ½ÕâÀàµÄÐżþɧÈÅ, ÇëÄú¾¡¿ìÁªÂç¹ÜÀíÔ±.
!
! ҪʹÓÃÕâ×éеÄÃÜÂë, ÇëʹÓÃÒÔÏÂÁ¬½áÆôÓÃÃÜÂë.
!
! {U_ACTIVATE}
!
! ÔÚÃÜÂëÆôÓÃÖ®áá, Äú½«¿ÉÒÔʹÓÃеÄÃÜÂëµÇÈë:
!
! ÃÜÂë: {PASSWORD}
!
! Äú¿ÉÒÔÔÚÄúµÄ¸öÈË×ÊÁÏÖÐ×ÔÐиü¸ÄÕʺÅÃÜÂë. Èç¹ûÄú»¹ÓÐÈκεÄÒÉÎÊ, ÇëÓëϵͳ¹ÜÀíÔ±ÁªÂç.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,16 ****
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÇëÀμÇÄúµÄÃÜÂë, ÒòΪËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶øÈç¹ûÄúÍü¼ÇÁËÃÜÂë, Äú¿ÉÒÔÖØÐÂÉêÇëÒ»¸öеÄÃÜÂë.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
! Charset: gb2312
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÇëÀμÇÄúµÄÃÜÂë, ÒòΪËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶øÈç¹ûÄúÍü¼ÇÁËÃÜÂë, Äú¿ÉÒÔÖØÐÂÉêÇëÒ»¸öеÄÃÜÂë.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_chinese_simplified/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,20 ****
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÄúµÄÕʺÅÉÐδ¼¤»î, Äú±ØÐëʹÓÃÒÔÏÂÁ´½Ó¼¤»îÄúµÄÕʺÅ:
!
! {U_ACTIVATE}
!
! ÇëÀμÇÄúµÄÃÜÂë, ÒòΪËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶øÈç¹ûÄúÍü¼ÇÁËÃÜÂë, Äú¿ÉÒÔÖØÐÂÉêÇëÒ»¸öеÄÃÜÂë.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
--- 1,21 ----
! Subject: »¶ÓÄú·ÃÎÊ {SITENAME} ÂÛ̳
! Charset: gb2312
!
! {WELCOME_MSG}
!
! ÇëÍ×ÉƱ£ÁôÕâ·âµç×ÓÓʼþ. ÄúµÄÕʺÅ×ÊÁÏÈçÏÂ:
!
! ----------------------------
! ÕʺÅ: {USERNAME}
! ÃÜÂë: {PASSWORD}
! ----------------------------
!
! ÄúµÄÕʺÅÉÐδ¼¤»î, Äú±ØÐëʹÓÃÒÔÏÂÁ´½Ó¼¤»îÄúµÄÕʺÅ:
!
! {U_ACTIVATE}
!
! ÇëÀμÇÄúµÄÃÜÂë, ÒòΪËùÓÐÃÜÂë¾ù¾¹ý¼ÓÃÜ´¦Àí, ϵͳ¹ÜÀíÔ±Ò²ÎÞ·¨È¡µÃ. È»¶øÈç¹ûÄúÍü¼ÇÁËÃÜÂë, Äú¿ÉÒÔÖØÐÂÉêÇëÒ»¸öеÄÃÜÂë.
!
! ¸ÐлÄúµÄ×¢²á.
!
{EMAIL_SIG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_portuguese/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_portuguese/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/admin_activate.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_activate.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- admin_activate.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Novo Registo de Utilizador
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 9 Jan 2002 12:16:50 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:52 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
A mensagem seguinte é um email enviado para si por um administrador em "{SITENAME}". Se a mensagem contém material abusivo, "spam", ou comentários que você ache ofensivos por favor contacte o "webmaster" dos fóruns para o seguinte endereço:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/admin_welcome_activated.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_welcome_activated.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- admin_welcome_activated.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Registo Activo
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** admin_welcome_inactive.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- admin_welcome_inactive.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Benvido a {SITENAME}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** coppa_welcome_inactive.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Benvido a {SITENAME}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/group_added.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_added.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- group_added.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Utilizador Adicionado a Grupo
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/group_approved.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_approved.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- group_approved.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Pedido foi aceite.
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/group_request.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** group_request.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- group_request.tpl 17 May 2002 13:13:52 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Pedido para pertencer ao seu Grupo
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/privmsg_notify.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** privmsg_notify.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- privmsg_notify.tpl 17 May 2002 13:13:53 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Notificação de Mensagem Privada
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 9 Jan 2002 12:16:50 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:53 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Olá {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/topic_notify.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** topic_notify.tpl 5 May 2002 12:17:04 -0000 1.2.2.1
--- topic_notify.tpl 17 May 2002 13:13:53 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Notificação de Resposta a Tópico - {TOPIC_TITLE}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/user_activate.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_activate.tpl 5 May 2002 12:17:05 -0000 1.2.2.1
--- user_activate.tpl 17 May 2002 13:13:53 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Reactivar o seu Registo
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/user_activate_passwd.tpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** user_activate_passwd.tpl 5 May 2002 12:17:05 -0000 1.3.2.1
--- user_activate_passwd.tpl 17 May 2002 13:13:53 -0000 1.3.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Activação de Senha nova
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/user_welcome.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome.tpl 5 May 2002 12:17:05 -0000 1.2.2.1
--- user_welcome.tpl 17 May 2002 13:13:53 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Benvido a {SITENAME}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_portuguese/email/user_welcome_inactive.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** user_welcome_inactive.tpl 5 May 2002 12:17:05 -0000 1.2.2.1
--- user_welcome_inactive.tpl 17 May 2002 13:13:53 -0000 1.2.2.2
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Assunto: Benvido a {SITENAME}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_norwegian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_norwegian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:49 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Nytt medlemskap
+ Charset: iso-8859-1
Hei,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 30 Jan 2002 16:13:14 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:50 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Følgende e-post ble sendt til deg fra en forumadministrator på {SITENAME}.
Hvis denne e-posten er spam, har støtende eller har annet plagsomt innhold vennligst gi beskjed til forumets webmaster på følgende e-post :
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Medlemskapet er aktivert
+ Charset: iso-8859-1
Hei {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til forumene på {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til forumene på {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du er nå lagt til i denne grupppen
+ Charset: iso-8859-1
Gratulerer,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Din søknad er innvilget
+ Charset: iso-8859-1
Gratulerer,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: En søknad om deltagelse i din gruppe er levert
+ Charset: iso-8859-1
Hei {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du har mottatt en Privat Melding
+ Charset: iso-8859-1
Hei {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 30 Jan 2002 16:13:14 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:50 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hei {TO_USERNAME}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Varsel om svar på Tema - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hei {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Reaktiver medlemsskapet ditt!
+ Charset: iso-8859-1
Hei {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aktiver nytt passord
+ Charset: iso-8859-1
Hei {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til forumene på {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_norwegian/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:25 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:50 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til forumene på {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_danish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_danish/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Genaktiver venligst din konto!
+ Charset: iso-8859-1
Hej,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 23 Jan 2002 19:05:15 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:37 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Følgende email er afsendt fra administratoren af "{SITENAME}". Hvis denne email er uønsket, indeholder bandeord, eller andre kommentarer du finder anstødende, så kontakt venligst webmasteren af forumet på følgende adresse:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Konto aktiveret
+ Charset: iso-8859-1
Hej {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_added.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du er nu tilføjet til denne bruger gruppe
+ Charset: iso-8859-1
Tillykke,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_approved.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Din tilmelding er blevet godkendt
+ Charset: iso-8859-1
Tillykke,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- group_request.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: En bruger ønsker at tilmelde sig til din gruppe
+ Charset: iso-8859-1
Kære {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ny Privat besked er ankommet
+ Charset: iso-8859-1
Hej {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 23 Jan 2002 19:05:15 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:37 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hej {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Emnet er besvaret - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hej {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Genaktiver venligst din konto!
+ Charset: iso-8859-1
Hej {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aktivering af nyt kodeord
+ Charset: iso-8859-1
Hej {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_danish/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:13:37 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Velkommen til {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_albanian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_albanian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/admin_activate.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_activate.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- admin_activate.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Llogari e re
+ Charset: iso-8859-1
Përshëndetje,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Mesazhi i mëposhtëm është dërguar nga një administrator i "{SITENAME}". Nqs ky mesazh është i padëshirueshëm, abuzues apo përmban material të pahijshëm ju lutem kontaktoni webmasterin tek adresa:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/admin_welcome_activated.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_welcome_activated.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- admin_welcome_activated.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Llogaria u aktivizia
+ Charset: iso-8859-1
Përshëndetje {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_welcome_inactive.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- admin_welcome_inactive.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Mirsevini tek forumi i {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** coppa_welcome_inactive.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Mirsevini tek forumi i {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/group_added.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_added.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- group_added.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Jeni anëtar i këtij grupi tashmë
+ Charset: iso-8859-1
Urime,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/group_approved.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_approved.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- group_approved.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Kërkesa juaj u aprovua
+ Charset: iso-8859-1
Urime,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/group_request.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_request.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- group_request.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Dikush ka bërë kërkesë për anëtarësim tek grupi juaj
+ Charset: iso-8859-1
I nderuar {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/privmsg_notify.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** privmsg_notify.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- privmsg_notify.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Sapo keni marrë mesazh privat të ri
+ Charset: iso-8859-1
Përshëndetje {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Përshëndetje {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/topic_notify.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** topic_notify.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- topic_notify.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Përgjigje tek tema - {TOPIC_TITLE}
+ Charset: iso-8859-1
Përshëndetje {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/user_activate.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_activate.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- user_activate.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Riaktivizoni llogarinë tuaj
+ Charset: iso-8859-1
Përshëndetje {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/user_activate_passwd.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_activate_passwd.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- user_activate_passwd.tpl 17 May 2002 13:13:35 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aktivizoni fjalëkalimin e ri
+ Charset: iso-8859-1
Përshëndetje {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/user_welcome.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_welcome.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- user_welcome.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Mirsevini tek forumi i {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_albanian/email/user_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_welcome_inactive.tpl 1 Apr 2002 12:45:27 -0000 1.1
--- user_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Mirsevini tek forumi i {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_swedish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_swedish/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/admin_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_activate.tpl 17 May 2002 13:14:03 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Nytt användarkonto
+ Charset: iso-8859-1
Hej,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 1 Mar 2002 15:02:56 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:14:04 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Detta är ett meddelande från administratören av "{SITENAME}". Om meddelandet är ett spam eller innehåller stötande eller på annat sätt grova kommentarer som du tycker är kränkande var god och tar kontakt med webbmastern på följande adress:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/admin_welcome_activated.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_activated.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_activated.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Konto Aktiverat
+ Charset: iso-8859-1
Hej {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- admin_welcome_inactive.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Välkommen till {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- coppa_welcome_inactive.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Välkommen till {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/group_added.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_added.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_added.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du har lagts till i den här användar gruppen
+ Charset: iso-8859-1
Gratulera,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/group_approved.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_approved.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_approved.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Din förfrågan har blivit godkänd
+ Charset: iso-8859-1
Gratulera,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/group_request.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** group_request.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- group_request.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: En förfrågan att om att bli medlem i din grupp har gjorts
+ Charset: iso-8859-1
Hej {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/privmsg_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** privmsg_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- privmsg_notify.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Du har fått ett Privat Meddelande
+ Charset: iso-8859-1
Hej {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 1 Mar 2002 15:02:56 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:14:04 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hej {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/topic_notify.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** topic_notify.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- topic_notify.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Meddelande om svar på inlägg - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hej {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/user_activate.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Återaktivera ditt konto!
+ Charset: iso-8859-1
Hej {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/user_activate_passwd.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_activate_passwd.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_activate_passwd.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Ny lösenords aktivering
+ Charset: iso-8859-1
Hej {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/user_welcome.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Välkommen till {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_swedish/email/user_welcome_inactive.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** user_welcome_inactive.tpl 2 Mar 2002 18:13:26 -0000 1.2
--- user_welcome_inactive.tpl 17 May 2002 13:14:04 -0000 1.2.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Välkommen till {SITENAME} Forum
+ Charset: iso-8859-1
{WELCOME_MSG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_bulgarian/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/admin_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_activate.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- admin_activate.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Íîâ ïîòðåáèòåë
!
! Çäðàâåéòå!
!
! Ïîòðåáèòåëÿ "{USERNAME}" å áèë äåàêòèâèðàí èëè ñúçäàäåí íàñêîðî. Ïðîâåðåòå äåòàéëèòå çà òîçè ïîòðåáèòåë (àêî å íóæíî) è ãî àêòèâèðàéòå ñúñ ñëåäíàòà âðúçêà:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Íîâ ïîòðåáèòåë
! Charset: windows-1251
!
! Çäðàâåéòå!
!
! Ïîòðåáèòåëÿ "{USERNAME}" å áèë äåàêòèâèðàí èëè ñúçäàäåí íàñêîðî. Ïðîâåðåòå äåòàéëèòå çà òîçè ïîòðåáèòåë (àêî å íóæíî) è ãî àêòèâèðàéòå ñúñ ñëåäíàòà âðúçêà:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/admin_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin_send_email.tpl 10 Mar 2002 03:23:54 -0000 1.2
--- admin_send_email.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,8 ****
! Òîâà å ìåéë, ïðàòåí îò àäìèíèñòðàòîðà íà "{SITENAME}". Àêî òîâà ñúîáùåíèå å ñïàì, ñúäúðæà íåïðèëè÷íè èëè äðóãè êîìåíòàðè êîèòî âèå íàìèðàòå çà îáèäíè, ìîëÿ ñâúðæåòå ñå ñ webmaster-à íà ñëåäíèÿ å-ìåéë àäðåñ:
!
! {BOARD_EMAIL}
!
! Ñúîáùåíèåòî ïðàòåíî äî âàñ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,10 ----
! Charset: windows-1251
!
! Òîâà å ìåéë, ïðàòåí îò àäìèíèñòðàòîðà íà "{SITENAME}". Àêî òîâà ñúîáùåíèå å ñïàì, ñúäúðæà íåïðèëè÷íè èëè äðóãè êîìåíòàðè êîèòî âèå íàìèðàòå çà îáèäíè, ìîëÿ ñâúðæåòå ñå ñ webmaster-à íà ñëåäíèÿ å-ìåéë àäðåñ:
!
! {BOARD_EMAIL}
!
! Ñúîáùåíèåòî ïðàòåíî äî âàñ:
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/admin_welcome_activated.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_activated.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- admin_welcome_activated.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,7 ****
! Subject: Ïîòðåáèòåëÿ å àêòèâèðàí
!
! Çäðàâåéòå {USERNAME}!
!
! Âàøèÿ ïîòðåáèòåë "{SITENAME}" å âå÷å àêòèâèðàí. Ìîæåòå äà ãî èçïîëçâàòå ñ ïàðîëàòà êîÿòî âè å ïðàòåíà â ïðåäèøíèÿ ìåéë.
!
{EMAIL_SIG}
--- 1,8 ----
! Subject: Ïîòðåáèòåëÿ å àêòèâèðàí
! Charset: windows-1251
!
! Çäðàâåéòå {USERNAME}!
!
! Âàøèÿ ïîòðåáèòåë "{SITENAME}" å âå÷å àêòèâèðàí. Ìîæåòå äà ãî èçïîëçâàòå ñ ïàðîëàòà êîÿòî âè å ïðàòåíà â ïðåäèøíèÿ ìåéë.
!
{EMAIL_SIG}
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/admin_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** admin_welcome_inactive.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- admin_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,18 ****
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
!
! {WELCOME_MSG}
!
! Ìîëÿ çàïàçåòå òîâà ïèñìî! Òî ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë:
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Âàøèÿ ïîòðåáèòåë â ìîìåíòà å íåàêòèâåí, ùå òðÿáâà äà èç÷àêàòå àäìèíèñòðàòîðà äà ãî àêòèâèðà. Ùå áúäåòå èçâåñòåíè êîãàòî òîâà ñòàíå (ñ äðóãî ïèñìî).
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì.  ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàêòî òàçè.
!
! Áëàãîäàðÿ âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
--- 1,19 ----
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ìîëÿ çàïàçåòå òîâà ïèñìî! Òî ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë:
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Âàøèÿ ïîòðåáèòåë â ìîìåíòà å íåàêòèâåí, ùå òðÿáâà äà èç÷àêàòå àäìèíèñòðàòîðà äà ãî àêòèâèðà. Ùå áúäåòå èçâåñòåíè êîãàòî òîâà ñòàíå (ñ äðóãî ïèñìî).
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì.  ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàêòî òàçè.
!
! Áëàãîäàðÿ âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** coppa_welcome_inactive.tpl 2 Mar 2002 18:13:23 -0000 1.3
--- coppa_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
+ Charset: windows-1251
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/group_added.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_added.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- group_added.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,11 ****
! Subject: Ïðèåò ñòå çà ÷ëåí íà òàçè ãðóïà
!
! Ïîçäðàâëåíèÿ,
!
! Âèå å ñòå äîáàâåí(à) â ãðóïà "{GROUP_NAME}" íà {SITENAME}.
! Òîâà å áèëî íàïðàâåíî îò ìîäåðàòîðà íà ãðóïàòà èëè àäìèíèñòðàòîðà íà ñàéòà, ñâúðæåòå ñå ñ òÿõ çà ïîâå÷å èíôîðìàöèÿ.
!
! Ìîæåòå äà âèäèòå èíôîðìàöèÿòà çà âàøàòà ãðóïà íà ñëåäíèÿ àäðåñ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,12 ----
! Subject: Ïðèåò ñòå çà ÷ëåí íà òàçè ãðóïà
! Charset: windows-1251
!
! Ïîçäðàâëåíèÿ,
!
! Âèå å ñòå äîáàâåí(à) â ãðóïà "{GROUP_NAME}" íà {SITENAME}.
! Òîâà å áèëî íàïðàâåíî îò ìîäåðàòîðà íà ãðóïàòà èëè àäìèíèñòðàòîðà íà ñàéòà, ñâúðæåòå ñå ñ òÿõ çà ïîâå÷å èíôîðìàöèÿ.
!
! Ìîæåòå äà âèäèòå èíôîðìàöèÿòà çà âàøàòà ãðóïà íà ñëåäíèÿ àäðåñ:
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/group_approved.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_approved.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- group_approved.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Âàøàòà êàíäèäàòóðà å îäîáðåíà
!
! Ïîçäðàâëåíèÿ,
!
! Âàøàòà ìîëáà äà ñå ïðèñúåäèíèòå êúì ãðóïàòà "{GROUP_NAME}" íà {SITENAME} å áèëà îäîáðåíà.
! Êëèíêíåòå íà ñëåäíàòà âðúçêà çà äà ïîëó÷èòå ïîâå÷å èíôîðìàöèÿ çà ãðóïàòà:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Âàøàòà êàíäèäàòóðà å îäîáðåíà
! Charset: windows-1251
!
! Ïîçäðàâëåíèÿ,
!
! Âàøàòà ìîëáà äà ñå ïðèñúåäèíèòå êúì ãðóïàòà "{GROUP_NAME}" íà {SITENAME} å áèëà îäîáðåíà.
! Êëèíêíåòå íà ñëåäíàòà âðúçêà çà äà ïîëó÷èòå ïîâå÷å èíôîðìàöèÿ çà ãðóïàòà:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/group_request.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** group_request.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- group_request.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Ïîëó÷åíà å çàÿâêà çà ïðèåìàíå â ãðóïàòà âè
!
! {GROUP_MODERATOR},
!
! Ïîòðåáèòåë å ïîìîëèë äà ñå ïðèñúåäèíè êúì âàøàòà ãðóïà íà {SITENAME}.
! Çà äà ïðèåìåòå èëè îòõâúðëèòå ìîëáàòà ìó, ïîñåòåòå ñëåäíàòà âðúçêà:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
--- 1,11 ----
! Subject: Ïîëó÷åíà å çàÿâêà çà ïðèåìàíå â ãðóïàòà âè
! Charset: windows-1251
!
! {GROUP_MODERATOR},
!
! Ïîòðåáèòåë å ïîìîëèë äà ñå ïðèñúåäèíè êúì âàøàòà ãðóïà íà {SITENAME}.
! Çà äà ïðèåìåòå èëè îòõâúðëèòå ìîëáàòà ìó, ïîñåòåòå ñëåäíàòà âðúçêà:
!
! {U_GROUPCP}
!
! {EMAIL_SIG}
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/privmsg_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** privmsg_notify.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- privmsg_notify.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,10 ****
! Subject: Ïîëó÷èõòå íîâî ëè÷íî ñúîáùåíèÿ
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷èëè ñòå ëè÷íî ñúáîùåíèå "{SITENAME}". Ìîæåòå äà âèäèòå âàøåòî íîâî ñúîáùåíèå íà:
!
! {U_INBOX}
!
!
{EMAIL_SIG}
--- 1,11 ----
! Subject: Ïîëó÷èõòå íîâî ëè÷íî ñúîáùåíèÿ
! Charset: windows-1251
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷èëè ñòå ëè÷íî ñúáîùåíèå "{SITENAME}". Ìîæåòå äà âèäèòå âàøåòî íîâî ñúîáùåíèå íà:
!
! {U_INBOX}
!
!
{EMAIL_SIG}
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/profile_send_email.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** profile_send_email.tpl 10 Mar 2002 03:23:54 -0000 1.2
--- profile_send_email.tpl 17 May 2002 13:13:36 -0000 1.2.2.1
***************
*** 1,10 ****
! Çäðàâåéòå {TO_USERNAME}!
!
! Ñúîáùåíèåòî ïî-äîëó âè å ïðàòåíî îò {FROM_USERNAME} ÷ðåç âàøèÿ ïðîôèë íà {SITENAME}. Àêî òîâà ñúîáùåíèå å ñïàì, ñúäúðæà íåïðèëè÷íè èëè äðóãè êîìåíòàðè êîèòî âèå íàìèðàòå çà îáèäíè, ìîëÿ ñâúðæåòå ñå ñ webmaster-à íà ñëåäíèÿ å-ìåéë àäðåñ:
!
! {BOARD_EMAIL}
!
! Ñúîáùåíèåòî ïðàòåíî äî âàñ
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
--- 1,12 ----
! Charset: windows-1251
!
! Çäðàâåéòå {TO_USERNAME}!
!
! Ñúîáùåíèåòî ïî-äîëó âè å ïðàòåíî îò {FROM_USERNAME} ÷ðåç âàøèÿ ïðîôèë íà {SITENAME}. Àêî òîâà ñúîáùåíèå å ñïàì, ñúäúðæà íåïðèëè÷íè èëè äðóãè êîìåíòàðè êîèòî âèå íàìèðàòå çà îáèäíè, ìîëÿ ñâúðæåòå ñå ñ webmaster-à íà ñëåäíèÿ å-ìåéë àäðåñ:
!
! {BOARD_EMAIL}
!
! Ñúîáùåíèåòî ïðàòåíî äî âàñ
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~
!
! {MESSAGE}
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/topic_notify.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** topic_notify.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- topic_notify.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,13 ****
! Subject: Óâåäåìîÿâàíå çà îòãîâîðè ïî òåìàòà - {TOPIC_TITLE}
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷àâàòå òîçè ìåéë, çàùîòî ñòå èçáðàëè äà áúäåòå èçâåñòÿâàíè çà îòãîâîðè íà òåìàòà "{TOPIC_TITLE}" íà {SITENAME}. Íà òàçè òåìà å áèëî îòãîâîðåíî ñëåä ïîñëåäíîòî âè ïîñåùåíèå. Ìîæåòå äà âèäèòå îòãîâîðèòå íà ñëåäâàùèÿ àäðåñ. Äðóãè èçâåñòèÿ íÿìà äà âè áúäàò èçïðàùàíè, äîêàòî íå ãî ïîñåòèòå.
!
! {U_TOPIC}
!
! Àêî íå èñêàòå äà ïîëó÷àâàòå ïîâå÷å èçâåñòèÿ, ìîæåòå äà ïðîìåíèòå íàñòðîéêèòå îò ñàìàòà òåìàòà èëè êàòî êëèêíåòå íà ñëåäíèÿ ëèíê:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
--- 1,14 ----
! Subject: Óâåäåìîÿâàíå çà îòãîâîðè ïî òåìàòà - {TOPIC_TITLE}
! Charset: windows-1251
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷àâàòå òîçè ìåéë, çàùîòî ñòå èçáðàëè äà áúäåòå èçâåñòÿâàíè çà îòãîâîðè íà òåìàòà "{TOPIC_TITLE}" íà {SITENAME}. Íà òàçè òåìà å áèëî îòãîâîðåíî ñëåä ïîñëåäíîòî âè ïîñåùåíèå. Ìîæåòå äà âèäèòå îòãîâîðèòå íà ñëåäâàùèÿ àäðåñ. Äðóãè èçâåñòèÿ íÿìà äà âè áúäàò èçïðàùàíè, äîêàòî íå ãî ïîñåòèòå.
!
! {U_TOPIC}
!
! Àêî íå èñêàòå äà ïîëó÷àâàòå ïîâå÷å èçâåñòèÿ, ìîæåòå äà ïðîìåíèòå íàñòðîéêèòå îò ñàìàòà òåìàòà èëè êàòî êëèêíåòå íà ñëåäíèÿ ëèíê:
!
! {U_STOP_WATCHING_TOPIC}
!
{EMAIL_SIG}
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/user_activate.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- user_activate.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,9 ****
! Subject: Ðå-àêòèâèðàéòå ïîòðåáèòåëÿ ñè!
!
! Çäðàâåéòå {USERNAME}!
!
! Âàøèÿ ïîòðåáèòåë íà "{SITENAME}" å äåàêòèâèðàí, íàé-âåðîÿòíî â ñëåäñòâèå îò ïðîìÿíà íà âàøèÿ ïðîôèë. Çà äà ãî àêòèâèðàòå îòíîâî, ïîñåòåòå ñëåäíèÿ àäðåñ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
--- 1,10 ----
! Subject: Ðå-àêòèâèðàéòå ïîòðåáèòåëÿ ñè!
! Charset: windows-1251
!
! Çäðàâåéòå {USERNAME}!
!
! Âàøèÿ ïîòðåáèòåë íà "{SITENAME}" å äåàêòèâèðàí, íàé-âåðîÿòíî â ñëåäñòâèå îò ïðîìÿíà íà âàøèÿ ïðîôèë. Çà äà ãî àêòèâèðàòå îòíîâî, ïîñåòåòå ñëåäíèÿ àäðåñ:
!
! {U_ACTIVATE}
!
{EMAIL_SIG}
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/user_activate_passwd.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_activate_passwd.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- user_activate_passwd.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,17 ****
! Subject: Àêòèâèðàíå íà íîâà ïàðîëà
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷àâàòå òîçè å-ìåéë çàùîòî âèå (èëè íÿêîé êîéòî ñå ïðàâè íà âàñ) å ïîèñêàë äà ìó(é) áúäå ïðàòåíà íîâà ïàðîëà çà {SITENAME}. Àêî íå ñòå ïîäàâàëè òàêàâà ìîëáà, íå îáðúùàéòå âíèìàíèå íà ñúîáùåíèåòî, à àêî ïðîäúëæàâàòå äà ïîëó÷àâàòå òàêèâà ñúîáùåíèÿ, ñâúðæåòå ñå ñ àäìèíèñòðàòîðà.
!
! Çà äà èçïîëçâàòå íîâàòà ñè ïàðîëà òðÿáâà äà ÿ àêòèâèðàòå. Çà äà ãî íàïðàâèòå, èçïîëçâàéòå ñëåäíàòà âðúçêà:
!
! {U_ACTIVATE}
!
! Ñëåä êîåòî áè òðÿáâàëî äà ìîæåòå äà âëåçåòå ñúñ ñëåäíàòà ïàðîëà:
!
! Ïàðîëà: {PASSWORD}
!
! Ìîæåòå äà ïðîìåíèòå ïàðîëàòà ñè îò ïðîôèëà âè â {SITENAME}. Àêî èìàòå ïðîáëåìè ñ òîâà, ìîëÿ ñâúðæåòå ñå ñ àäìèíèñòðàòîðà.
!
{EMAIL_SIG}
--- 1,18 ----
! Subject: Àêòèâèðàíå íà íîâà ïàðîëà
! Charset: windows-1251
!
! Çäðàâåéòå {USERNAME}!
!
! Ïîëó÷àâàòå òîçè å-ìåéë çàùîòî âèå (èëè íÿêîé êîéòî ñå ïðàâè íà âàñ) å ïîèñêàë äà ìó(é) áúäå ïðàòåíà íîâà ïàðîëà çà {SITENAME}. Àêî íå ñòå ïîäàâàëè òàêàâà ìîëáà, íå îáðúùàéòå âíèìàíèå íà ñúîáùåíèåòî, à àêî ïðîäúëæàâàòå äà ïîëó÷àâàòå òàêèâà ñúîáùåíèÿ, ñâúðæåòå ñå ñ àäìèíèñòðàòîðà.
!
! Çà äà èçïîëçâàòå íîâàòà ñè ïàðîëà òðÿáâà äà ÿ àêòèâèðàòå. Çà äà ãî íàïðàâèòå, èçïîëçâàéòå ñëåäíàòà âðúçêà:
!
! {U_ACTIVATE}
!
! Ñëåä êîåòî áè òðÿáâàëî äà ìîæåòå äà âëåçåòå ñúñ ñëåäíàòà ïàðîëà:
!
! Ïàðîëà: {PASSWORD}
!
! Ìîæåòå äà ïðîìåíèòå ïàðîëàòà ñè îò ïðîôèëà âè â {SITENAME}. Àêî èìàòå ïðîáëåìè ñ òîâà, ìîëÿ ñâúðæåòå ñå ñ àäìèíèñòðàòîðà.
!
{EMAIL_SIG}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/user_welcome.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- user_welcome.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,16 ****
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
!
! {WELCOME_MSG}
!
! Ìîëÿ ïàçàòå òîçè å-ìåéë. Òîé ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë:
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì. Íî â ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàòî òàçè.
!
! Áëàãîäàðèì âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
--- 1,17 ----
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ìîëÿ ïàçàòå òîçè å-ìåéë. Òîé ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë:
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì. Íî â ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàòî òàçè.
!
! Áëàãîäàðèì âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_bulgarian/email/user_welcome_inactive.tpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** user_welcome_inactive.tpl 10 Mar 2002 03:23:54 -0000 1.3
--- user_welcome_inactive.tpl 17 May 2002 13:13:36 -0000 1.3.2.1
***************
*** 1,20 ****
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
!
! {WELCOME_MSG}
!
! Ìîëÿ ïàçåòå òîçè ìåéë! Òîé ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë.
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Âàøèÿò ïîòðåáèòåë â ìîìåíòà å íåàêòèâåí. Ìîæåòå äà ãî àêòèâèðàòå êàòî ïîñåòèòå ñëåäíèÿ àäðåñ:
!
! {U_ACTIVATE}
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì. Íî â ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàòî òàçè.
!
! Áëàãîäàðèì âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
--- 1,21 ----
! Subject: Äîáðå äîøëè íà {SITENAME} Ôîðóìèòå
! Charset: windows-1251
!
! {WELCOME_MSG}
!
! Ìîëÿ ïàçåòå òîçè ìåéë! Òîé ñúäúðæà èíôîðìàöèÿòà çà âàøèÿ ïîòðåáèòåë.
!
! ----------------------------
! Ïîòðåáèòåë: {USERNAME}
! Ïàðîëà: {PASSWORD}
! ----------------------------
!
! Âàøèÿò ïîòðåáèòåë â ìîìåíòà å íåàêòèâåí. Ìîæåòå äà ãî àêòèâèðàòå êàòî ïîñåòèòå ñëåäíèÿ àäðåñ:
!
! {U_ACTIVATE}
!
! Ìîëÿ íå çàáðàâàéòå âàøàòà ïàðîëà, çàùîòî òÿ å êîäèðàíà è íèå íå ìîæåì äà âè ÿ ïðàòèì. Íî â ñëó÷àé ÷å ÿ çàáðàâèòå, ìîæåòå äà ïîèñêàòå íîâà, êîÿòî ùå âè áúäå ïðàòåíà ïî ñúùèÿ íà÷èí êàòî òàçè.
!
! Áëàãîäàðèì âè, ÷å ñå ðåãèñòðèðàõòå!
!
{EMAIL_SIG}
|
Update of /cvsroot/phpbb/phpBB2/language/lang_spanish/email
In directory usw-pr-cvs1:/tmp/cvs-serv3880/language/lang_spanish/email
Modified Files:
Tag: phpBB-2_0_0
admin_activate.tpl admin_send_email.tpl
admin_welcome_activated.tpl admin_welcome_inactive.tpl
coppa_welcome_inactive.tpl group_added.tpl group_approved.tpl
group_request.tpl privmsg_notify.tpl profile_send_email.tpl
topic_notify.tpl user_activate.tpl user_activate_passwd.tpl
user_welcome.tpl user_welcome_inactive.tpl
Log Message:
More updates ... added Date and Content-type/encoding output for the emails, updated all email templates
Index: admin_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/admin_activate.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_activate.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- admin_activate.tpl 17 May 2002 13:14:02 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: New user account
+ Charset: iso-8859-1
Hello,
Index: admin_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/admin_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_send_email.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- admin_send_email.tpl 17 May 2002 13:14:02 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
Index: admin_welcome_activated.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/admin_welcome_activated.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_welcome_activated.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- admin_welcome_activated.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Account Activated
+ Charset: iso-8859-1
Hello {USERNAME},
Index: admin_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/admin_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** admin_welcome_inactive.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- admin_welcome_inactive.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: coppa_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/coppa_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** coppa_welcome_inactive.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- coppa_welcome_inactive.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Welcome to {SITENAME} Forums
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: group_added.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/group_added.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_added.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- group_added.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: You have been added to this usergroup
+ Charset: iso-8859-1
Congratulations,
Index: group_approved.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/group_approved.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_approved.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- group_approved.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Your request has been approved
+ Charset: iso-8859-1
Congratulations,
Index: group_request.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/group_request.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** group_request.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- group_request.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Se a realizado un pedido para ingresar a tu grupo
+ Charset: iso-8859-1
Estimado {GROUP_MODERATOR},
Index: privmsg_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/privmsg_notify.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** privmsg_notify.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- privmsg_notify.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Tienes un nuevo mensaje privado
+ Charset: iso-8859-1
Hola {USERNAME},
Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** profile_send_email.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- profile_send_email.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,4 ----
+ Charset: iso-8859-1
+
Hola {TO_USERNAME},
Index: topic_notify.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/topic_notify.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** topic_notify.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- topic_notify.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Aviso de respuesta de Tópico - {TOPIC_TITLE}
+ Charset: iso-8859-1
Hola {USERNAME},
Index: user_activate.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/user_activate.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_activate.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- user_activate.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Reactivar tu cuenta
+ Charset: iso-8859-1
Hola {USERNAME},
Index: user_activate_passwd.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/user_activate_passwd.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_activate_passwd.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- user_activate_passwd.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Activación de nueva contraseña
+ Charset: iso-8859-1
Hola {USERNAME}
Index: user_welcome.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/user_welcome.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_welcome.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- user_welcome.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bienvenido a los foros de {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
Index: user_welcome_inactive.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_spanish/email/user_welcome_inactive.tpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** user_welcome_inactive.tpl 6 Mar 2002 00:28:07 -0000 1.1
--- user_welcome_inactive.tpl 17 May 2002 13:14:03 -0000 1.1.2.1
***************
*** 1,3 ****
--- 1,4 ----
Subject: Bienvenido a los foros de {SITENAME}
+ Charset: iso-8859-1
{WELCOME_MSG}
|
|
From: Paul S. O. <ps...@us...> - 2002-05-17 13:08:05
|
Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv32419/develop
Added Files:
Tag: phpBB-2_0_0
encoding_emails.php
Log Message:
Adds relevant Charset: statement to email templates that need don't have it.
--- NEW FILE ---
<?php
/***************************************************************************
* revar_lang_files.php
* -------------------
* begin : Saturday, Feb 13, 2001
* copyright : (C) 2001 The phpBB Group
* email : su...@ph...
*
* $Id: encoding_emails.php,v 1.1.2.1 2002/05/17 13:01:03 psotfx Exp $
*
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
//
// Security message:
//
// This script is potentially dangerous.
// Remove or comment the next line (die(".... ) to enable this script.
// Do NOT FORGET to either remove this script or disable it after you have used it.
//
die("Please read the first lines of this script for instructions on how to enable it");
$dirname = "./../language";
$dir = opendir($dirname);
while ( $file = readdir($dir) )
{
if ( ereg('^lang_', $file) && !is_file($dirname . '/' . $file) && !is_link($dirname . '/' . $file) )
{
include($dirname . '/' . $file . '/lang_main.php');
$lang_dir = opendir($dirname . '/' . $file . '/email');
while ( $email = readdir($lang_dir) )
{
if ( ereg('\.tpl$', $email) && is_file($dirname . '/' . $file . '/email/' . $email) )
{
$fp = fopen($dirname . '/' . $file . '/email/' . $email, 'r+');
$email_file = "";
while ( $line = fread($fp, 100000) )
{
$email_file .= $line;
}
if ( !preg_match('/^Charset: .*?$/m', $email_file) )
{
$email_file = preg_replace('/^((Subject: .*?\n)(\n))?/i', "\\2Charset: " . $lang['ENCODING'] . "\n\n", $email_file);
}
echo '<b>' . $dirname . '/' . $file . '/email/' . $email . "</b><br />\n";
echo nl2br($email_file);
echo "\n\n<br /><br />\n\n";
fseek($fp, 0);
fwrite($fp, $email_file);
fclose($fp);
}
}
echo "\n\n<hr />\n\n";
}
}
?>
|
|
From: Paul S. O. <ps...@us...> - 2002-05-16 12:38:02
|
Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv4029/db/schemas
Modified Files:
Tag: phpBB-2_0_0
mysql_schema.sql
Log Message:
Remove auto_increment from user and group fields since we're not currently using this ...
Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -r1.17.2.1 -r1.17.2.2
*** mysql_schema.sql 8 Apr 2002 00:17:41 -0000 1.17.2.1
--- mysql_schema.sql 16 May 2002 12:33:06 -0000 1.17.2.2
***************
*** 43,47 ****
#
CREATE TABLE phpbb_groups (
! group_id mediumint(8) NOT NULL auto_increment,
group_type tinyint(4) DEFAULT '1' NOT NULL,
group_name varchar(40) NOT NULL,
--- 43,47 ----
#
CREATE TABLE phpbb_groups (
! group_id mediumint(8) NOT NULL,
group_type tinyint(4) DEFAULT '1' NOT NULL,
group_name varchar(40) NOT NULL,
***************
*** 454,458 ****
#
CREATE TABLE phpbb_users (
! user_id mediumint(8) NOT NULL auto_increment,
user_active tinyint(1) DEFAULT '1',
username varchar(25) NOT NULL,
--- 454,458 ----
#
CREATE TABLE phpbb_users (
! user_id mediumint(8) NOT NULL,
user_active tinyint(1) DEFAULT '1',
username varchar(25) NOT NULL,
|
|
From: Paul S. O. <ps...@us...> - 2002-05-16 12:32:04
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv3643
Modified Files:
Tag: phpBB-2_0_0
update_to_201.php
Log Message:
Hopefully add a work-around for user_timezone datatype change ... needs testing really.
Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** update_to_201.php 16 May 2002 01:15:48 -0000 1.1.2.4
--- update_to_201.php 16 May 2002 12:32:00 -0000 1.1.2.5
***************
*** 367,374 ****
break;
case 'postgresql':
! // $sql[] = "ALTER TABLE " . USERS_TABLE . "
! // RENAME COLUMN user_timezone TO user_timezone_old";
! // $sql[] = "ALTER TABLE " . USERS_TABLE . "
! // ADD COLUMN user_timezone decimal(4)";
break;
case 'mssql':
--- 367,374 ----
break;
case 'postgresql':
! $sql[] = "ALTER TABLE " . USERS_TABLE . "
! RENAME COLUMN user_timezone TO user_timezone_old";
! $sql[] = "ALTER TABLE " . USERS_TABLE . "
! ADD COLUMN user_timezone decimal(4)";
break;
case 'mssql':
***************
*** 517,520 ****
--- 517,535 ----
case 'RC-4':
case '.0.0':
+ if ( SQL_LAYER == 'postgresql' )
+ {
+ $sql = "SELECT user_id, user_timezone_old
+ FROM " . USERS_TABLE;
+ _sql($sql, $errored, $error_ary);
+
+ while ( $row = $db->sql_fetchrow($result) )
+ {
+ $sql = "UPDATE " . USERS_TABLE . "
+ SET user_timezone = " . $row['user_timezone_old'] . "
+ WHERE user_id = " . $row['user_id'];
+ _sql($sql, $errored, $error_ary);
+ }
+ }
+
$sql = "SELECT topic_id, topic_moved_id
FROM " . TOPICS_TABLE . "
|
7 messages has been excluded from this view by a project administrator.
