aboutsummaryrefslogtreecommitdiffstats
path: root/view/en
diff options
context:
space:
mode:
Diffstat (limited to 'view/en')
-rw-r--r--view/en/smarty3/follow_notify_eml.tpl1
-rw-r--r--view/en/smarty3/friend_complete_eml.tpl1
-rw-r--r--view/en/smarty3/htconfig.tpl3
-rw-r--r--view/en/smarty3/intro_complete_eml.tpl1
-rw-r--r--view/en/smarty3/lostpass_eml.tpl1
-rw-r--r--view/en/smarty3/passchanged_eml.tpl1
-rw-r--r--view/en/smarty3/register_open_eml.tpl1
-rw-r--r--view/en/smarty3/register_verify_eml.tpl1
-rw-r--r--view/en/smarty3/request_notify_eml.tpl1
-rw-r--r--view/en/smarty3/update_fail_eml.tpl3
10 files changed, 12 insertions, 2 deletions
diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl
index 85f989fad..e944aad1a 100644
--- a/view/en/smarty3/follow_notify_eml.tpl
+++ b/view/en/smarty3/follow_notify_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$myname}},
You have a new follower at {{$sitename}} - '{{$requestor}}'.
diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl
index 81cb74e14..8f72027e1 100644
--- a/view/en/smarty3/friend_complete_eml.tpl
+++ b/view/en/smarty3/friend_complete_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$username}},
Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
index 8b4f79272..3af80374f 100644
--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@@ -2,7 +2,8 @@
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
- *}}<?php
+ *}}
+<?php
// Set the following for your MySQL installation
// Copy or rename this file to .htconfig.php
diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl
index 1aee435b4..7cf2dd562 100644
--- a/view/en/smarty3/intro_complete_eml.tpl
+++ b/view/en/smarty3/intro_complete_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$username}},
'{{$fn}}' at '{{$dfrn_url}}' has accepted
diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl
index e66bbe8ff..f739d5252 100644
--- a/view/en/smarty3/lostpass_eml.tpl
+++ b/view/en/smarty3/lostpass_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$username}},
A request was recently received at {{$sitename}} to reset your account
password. In order to confirm this request, please select the verification link
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
index 07abb5255..c17860df6 100644
--- a/view/en/smarty3/passchanged_eml.tpl
+++ b/view/en/smarty3/passchanged_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$username}},
Your password has been changed as requested. Please retain this
information for your records (or change your password immediately to
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
index cf549fe40..377fa8436 100644
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
An account has been created at {{$sitename}} for this email address.
The login details are as follows:
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
index 5f8fd1c9b..43257e78a 100644
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
A new user registration request was received at {{$sitename}} which requires
your approval.
diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl
index 2177fe5e4..26a17b4bc 100644
--- a/view/en/smarty3/request_notify_eml.tpl
+++ b/view/en/smarty3/request_notify_eml.tpl
@@ -3,6 +3,7 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+
Dear {{$myname}},
You have just received a connection request at {{$sitename}}
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
index 9d6e7b6a3..931d9e455 100644
--- a/view/en/smarty3/update_fail_eml.tpl
+++ b/view/en/smarty3/update_fail_eml.tpl
@@ -2,7 +2,8 @@
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
- *}}Hey,
+ *}}
+Hey,
I'm {{$sitename}};
The friendica developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.