Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Diff of /branches/2.5.4RC1/cgi-bin/yabb2/Languages/English/Email.lng [r1388] .. [r1389] Maximize Restore

  Switch to side-by-side view

--- a/branches/2.5.4RC1/cgi-bin/yabb2/Languages/English/Email.lng
+++ b/branches/2.5.4RC1/cgi-bin/yabb2/Languages/English/Email.lng
@@ -12,9 +12,9 @@
 #               with assistance from the YaBB community.                      #
 ###############################################################################
 
-$emaillngver = 'YaBB 2.5.4 RC1 $Revision: 1322 $';
-
-$emailcharset = 'ISO-8859-1';
+$emaillngver = 'YaBB 2.5.4 RC1 $Revision: 1389 $';
+
+$emailcharset = 'UTF-8';
 
 %yabbtagdesc = (
 # Constant tags
@@ -67,7 +67,7 @@
 
 $yabbtags{'preregemail'} = qq~displayname preregspan cryptusername activationcode~;
 $emaildesc{'preregemail'} = qq~The Registration E-mail that is sent out when using Activation link~;
-$preregemail = qq~Welcome, {yabb displayname}!
+$preregemail = qq~<pre>Welcome, {yabb displayname}!
 Here is your account validation link.
 
 You have been successfully pre-registered at {yabb mbname}.
@@ -75,16 +75,16 @@
 
 Please click on the link below to activate your user account
 
-{yabb scripturl}?action=activate&username={yabb cryptusername}&activationkey={yabb activationcode}
+<a href="{yabb scripturl}?action=activate&username={yabb cryptusername}&activationkey={yabb activationcode}">{yabb scripturl}?action=activate&username={yabb cryptusername}&activationkey={yabb activationcode}</a>
 
 If the link does not work (or if you use AOL or a browser-based e-mail program), copy the link and insert it in the address bar of your Web browser.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'approveregemail'} = qq~username displayname~;
 $emaildesc{'approveregemail'} = qq~The Pending Approval E-mail when not sending a password or Activation link~;
-$approveregemail = qq~Hello, {yabb displayname}!
+$approveregemail = qq~<pre>Hello, {yabb displayname}!
 
 Your application with login ID: "{yabb username}" is pending approval of the {yabb mbname} administration.
 
@@ -92,11 +92,11 @@
 As soon as your application has been reviewed you will be notified.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'instantapprovedemail'} = qq~username displayname reviewer~;
 $emaildesc{'instantapprovedemail'} = qq~The Instant Approval E-mail when not sending a password or Activation link~;
-$instantapprovedemail = qq~Hello, {yabb displayname}!
+$instantapprovedemail = qq~<pre>Hello, {yabb displayname}!
 
 Congratulations and welcome.
 
@@ -104,14 +104,14 @@
 
 You can log in using your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'pwinstantapprovedemail'} = qq~username displayname reviewer password~;
 $emaildesc{'pwinstantapprovedemail'} = qq~The Instant Approval E-mail when sending a password~;
-$pwinstantapprovedemail = qq~Hello, {yabb displayname}!
+$pwinstantapprovedemail = qq~<pre>Hello, {yabb displayname}!
 
 Congratulations and welcome.
 
@@ -120,14 +120,14 @@
 You can log in using your e-mail address, or your user ID ({yabb username}).
 Your current password is : {yabb password}
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'instantrejectedemail'} = qq~username displayname reviewer~;
 $emaildesc{'instantrejectedemail'} = qq~The Instant Decline E-mail when not sending a password or Activation link~;
-$instantrejectedemail = qq~Hello, {yabb displayname}!
+$instantrejectedemail = qq~<pre>Hello, {yabb displayname}!
 
 We regret to inform you that your membership application has been instantly rejected by {yabb reviewer} from the {yabb mbname} administration.
 No specific reason was given for rejecting you, but most likely your registration credentials or registration reason resulted in this decision.
@@ -135,11 +135,11 @@
 If you feel this is an error, you are of course free to apply for membership again using different credentials for review.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'reviewapprovedemail'} = qq~username displayname reviewer~;
 $emaildesc{'reviewapprovedemail'} = qq~The Reviewed Approval E-mail when not sending a password or Activation link~;
-$reviewapprovedemail = qq~Hello, {yabb displayname}!
+$reviewapprovedemail = qq~<pre>Hello, {yabb displayname}!
 
 Congratulations and welcome.
 
@@ -150,14 +150,14 @@
 
 You can log in using your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'pwreviewapprovedemail'} = qq~username displayname reviewer password~;
 $emaildesc{'pwreviewapprovedemail'} = qq~The Reviewed Approval E-mail when sending a password~;
-$pwreviewapprovedemail = qq~Hello, {yabb displayname}!
+$pwreviewapprovedemail = qq~<pre>Hello, {yabb displayname}!
 
 Congratulations and welcome.
 
@@ -169,14 +169,14 @@
 You can log in using your e-mail address, or your user ID ({yabb username}).
 Your current password is : {yabb password}
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'reviewrejectedemail'} = qq~username displayname reviewer reason~;
 $emaildesc{'reviewrejectedemail'} = qq~The Reviewed Decline E-mail when not sending a password or Activation link~;
-$reviewrejectedemail = qq~Hello, {yabb displayname}!
+$reviewrejectedemail = qq~<pre>Hello, {yabb displayname}!
 
 We regret to inform you that your membership application has been reviewed and rejected by {yabb reviewer} from the {yabb mbname} administration.
 The following reason was given by {yabb reviewer}:
@@ -186,63 +186,63 @@
 If you feel this is an error, you are of course free to apply for membership again using different credentials for review.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'passwordregemail'} = qq~username password displayname~;
 $emaildesc{'passwordregemail'} = qq~The Registration E-mail when giving the user a random password~;
-$passwordregemail = qq~Welcome, {yabb displayname}!
+$passwordregemail = qq~<pre>Welcome, {yabb displayname}!
 
 Your user ID is {yabb username}, and your password is {yabb password}.
 
 You can log in using your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'welcomeregemail'} = qq~username password displayname~;
 $emaildesc{'welcomeregemail'} = qq~The Registration E-mail when not sending a password or Activation link~;
-$welcomeregemail = qq~Welcome, {yabb displayname}!
+$welcomeregemail = qq~<pre>Welcome, {yabb displayname}!
 
 Your user ID is {yabb username}, and your password is {yabb password}.
 
 You can log in using your your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'activatedpassregemail'} = qq~username password displayname~;
 $emaildesc{'activatedpassregemail'} = qq~The Registration Activation Result E-mail (sending a password)~;
-$activatedpassregemail = qq~Welcome, {yabb displayname}!
+$activatedpassregemail = qq~<pre>Welcome, {yabb displayname}!
 
 Your user ID is {yabb username}, and your password is {yabb password}.
 
 You can log in using your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'activatedwelcomeregemail'} = qq~username password displayname~;
 $emaildesc{'activatedwelcomeregemail'} = qq~The Registration Activation Result E-mail (not sending a password)~;
-$activatedwelcomeregemail = qq~Welcome, {yabb displayname}!
+$activatedwelcomeregemail = qq~<pre>Welcome, {yabb displayname}!
 
 Your user ID is {yabb username}, and your password is {yabb password}.
 
 You can log in using your e-mail address, or your user ID ({yabb username}).
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'newmemberemail'} = qq~displayname username userip useremail~;
 $emaildesc{'newmemberemail'} = qq~The New Member Admin Notification E-mail~;
-$newmemberemail = qq~A new member has registered in your forum.
+$newmemberemail = qq~<pre>A new member has registered in your forum.
 
 Screen Name: {yabb displayname}
 User ID: {yabb username}
@@ -250,86 +250,86 @@
 User E-mail: {yabb useremail}
 
 To verify the registration of the new member please login to your forum and click on the link below.
-{yabb adminurl}?action=view_reglog
+<a href="{yabb adminurl}?action=view_reglog">{yabb adminurl}?action=view_reglog</a>
 
 If the link does not work (or if you use AOL or a browser-based e-mail program), copy the link and insert it in the address bar of your Web browser and confirm with enter.
 
 To examine the profile of the new member please log in to your Forum.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'passwordreminderemail'} = qq~displayname mbname remindercode cryptusername~;
 $emaildesc{'passwordreminderemail'} = qq~The Password Reset E-mail~;
-$passwordreminderemail = qq~Dear {yabb displayname},
+$passwordreminderemail = qq~<pre>Dear {yabb displayname},
 
 A request was made by a visitor at {yabb mbname} to reset your password. If you did not submit a request to reset your password, then please ignore this e-mail.
 
-Otherwise, go here to reset your password: {yabb scripturl}?action=resetpass&ID={yabb remindercode}&user={yabb cryptusername}
-
-Regards,
-The {yabb mbname} team~;
+Otherwise, go here to reset your password: <a href="{yabb scripturl}?action=resetpass&ID={yabb remindercode}&user={yabb cryptusername}">{yabb scripturl}?action=resetpass&ID={yabb remindercode}&user={yabb cryptusername}</a>
+Note: If the link does not work (or if you use AOL or a browser-based e-mail program), copy the link and insert it in the address bar of your Web browser and confirm with enter. Make sure there are no spaces before or after the link in the address bar.
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'boardnewtopicnotificationemail'} = qq~num subject~;
 $emaildesc{'boardnewtopicnotificationemail'} = qq~The Notification E-mail (Board-Level, New Topic)~;
-$boardnewtopicnotificationemail = qq~A new topic, "{yabb subject}", has been posted to a board you are watching.
-
-View it at {yabb scripturl}?num={yabb num}
-
-Regards,
-The {yabb mbname} team~;
+$boardnewtopicnotificationemail = qq~<pre>A new topic, "{yabb subject}", has been posted to a board you are watching.
+
+View it at <a href="{yabb scripturl}?num={yabb num}">{yabb scripturl}?num={yabb num}</a>
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'boardnotificationemail'} = qq~num start subject~;
 $emaildesc{'boardnotificationemail'} = qq~The Notification E-mail (Board-Level, Existing Topic)~;
-$boardnotificationemail = qq~A reply, "{yabb subject}", has been posted to a board you are watching.
-
-View it at {yabb scripturl}?num={yabb num}/{yabb start}
-
-Regards,
-The {yabb mbname} team~;
+$boardnotificationemail = qq~<pre>A reply, "{yabb subject}", has been posted to a board you are watching.
+
+View it at <a href="{yabb scripturl}?num={yabb num}/{yabb start}">{yabb scripturl}?num={yabb num}/{yabb start}</a>
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'topicnotificationemail'} = qq~num subject start~;
 $emaildesc{'topicnotificationemail'} = qq~The Notification E-mail (Topic-Level)~;
-$topicnotificationemail = qq~A reply, "{yabb subject}", has been posted to a topic you are watching.
-
-View it at {yabb scripturl}?num={yabb num}/{yabb start}
+$topicnotificationemail = qq~<pre>A reply, "{yabb subject}", has been posted to a topic you are watching.
+
+View it at <a href="{yabb scripturl}?num={yabb num}/{yabb start}">{yabb scripturl}?num={yabb num}/{yabb start}</a>
 
 No more notifications will be sent until you visit the topic again.
 
 Regards,
-The {yabb mbname} team~;
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'profilenewpasswordemail'} = qq~displayname password~;
 $emaildesc{'profilenewpasswordemail'} = qq~The Profile E-mail for sending a new password when the existing one is changed~;
-$profilenewpasswordemail = qq~Dear {yabb displayname},
+$profilenewpasswordemail = qq~<pre>Dear {yabb displayname},
 
 Your password has been changed. It is now {yabb password}.
 
-You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: {yabb scripturl} and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
-
-Regards,
-The {yabb mbname} team~;
+You may change your password after you login by clicking on the User CP tab at the top of the {yabb mbname} main page: <a href="{yabb scripturl}">{yabb scripturl}</a> and then click the Profile tab, click on Edit Profile (you will need to enter your password as a security measure).
+
+Regards,
+The {yabb mbname} team</pre>~;
 
 $yabbtags{'sendtopicemail'} = qq~toname subject displayname num~;
 $emaildesc{'sendtopicemail'} = qq~The E-mail for sending a Topic~;
-$sendtopicemail = qq~Dear {yabb toname},
-
+$sendtopicemail = qq~<pre>Dear {yabb toname},
 I want you to check out the following topic, "{yabb subject}", on {yabb mbname}. To view it, please click the link below:
 
-{yabb scripturl}?num={yabb num}
+<a href="{yabb scripturl}?num={yabb num}">{yabb scripturl}?num={yabb num}</a>
 
 Thanks,
-{yabb displayname}~;
+{yabb displayname}</pre>~;
 
 $yabbtags{'privatemessagenotificationemail'} = qq~sender subject message~;
 $emaildesc{'privatemessagenotificationemail'} = qq~The Personal Message Notification E-mail~;
-$privatemessagenotificationemail = qq~{yabb sender} has sent you a personal message.
+$privatemessagenotificationemail = qq~<pre>{yabb sender} has sent you a personal message.
 
 Subject: {yabb subject}
 Message: {yabb message}
 {yabb attachments}
 
-This message is also in your personal message inbox at {yabb mbname}\: {yabb scripturl}~;
+This message is also in your personal message inbox at {yabb mbname}\: <a href="{yabb scripturl}">{yabb scripturl}</a></pre>~;
 
 ## for online alert pms.
 %online_alert = (
@@ -341,13 +341,11 @@
 
 $yabbtags{'replyguestmail'} = qq~sender email sendto date subject message~;
 $emaildesc{'replyguestmail'} = qq~The Reply Guest PM to Admin E-mail~;
-$replyguestmail = qq~Dear {yabb sender},
-
-
+$replyguestmail = qq~<pre>Dear {yabb sender},
 
 Regards,
 The {yabb mbname} team
-{yabb scripturl}
+<a href="{yabb scripturl}">{yabb scripturl}</a>
 
 -----------------------------
 ----- Original Message -----
@@ -357,19 +355,19 @@
 Subject: {yabb subject}
 
 {yabb message}
-~;
+</pre>~;
 
 
 $yabbtags{'deleteduseremail'} = q~screen name~;
 $emaildesc{'deleteduseremail'} = q~The Deleted User Notification E-mail~;
 $deletedusersybject = q~Your account deleted on~;
-$deleteduseremail = q~Hello, {yabb displayname}!
+$deleteduseremail = q~<pre>Hello, {yabb displayname}!
 
 Your account on {yabb mbname} is no longer active and has been deleted.
 
 Regards,
 The {yabb mbname} team
-{yabb scripturl}
-~;
+<a href="{yabb scripturl}">{yabb scripturl}</a>
+<pre>~;
 
 1;