aboutsummaryrefslogtreecommitdiffstats
path: root/view/en
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
committerMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
commit2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (patch)
tree8c569c61c06e50c943addc132286d44c2f8ec178 /view/en
parent188829ed46be6d3c7a91380226e26e8292c327be (diff)
parenta3f08c44be78d4517e9f1619811def09b2ec7e7a (diff)
downloadvolse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.gz
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.bz2
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/en')
-rw-r--r--view/en/follow_notify_eml.tpl10
-rw-r--r--view/en/friend_complete_eml.tpl14
-rw-r--r--view/en/intro_complete_eml.tpl16
-rw-r--r--view/en/lostpass_eml.tpl12
-rw-r--r--view/en/passchanged_eml.tpl10
-rw-r--r--view/en/register_open_eml.tpl14
-rw-r--r--view/en/register_verify_eml.tpl12
-rw-r--r--view/en/request_notify_eml.tpl12
8 files changed, 50 insertions, 50 deletions
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl
index ae758c9a8..917024b84 100644
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Dear $myname,
+Dear $[myname],
-You have a new follower at $sitename - '$requestor'.
+You have a new follower at $[sitename] - '$[requestor]'.
-You may visit their profile at $url.
+You may visit their profile at $[url].
Please login to your site to approve or ignore/cancel the request.
-$siteurl
+$[siteurl]
Regards,
- $sitename administrator \ No newline at end of file
+ $[sitename] administrator
diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index ab12fcb6b..89f578388 100644
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
-Dear $username,
+Dear $[username],
- Great news... '$fn' at '$dfrn_url' has accepted
-your connection request at '$sitename'.
+ Great news... '$[fn]' at '$[dfrn_url]' has accepted
+your connection request at '$[sitename]'.
You are now mutual friends and may exchange status updates, photos, and email
without restriction.
-Please visit your 'Contacts' page at $sitename if you wish to make
+Please visit your 'Contacts' page at $[sitename] if you wish to make
any changes to this relationship.
-$siteurl
+$[siteurl]
[For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '$fn'].
+available to the general public - and assign viewing rights to '$[fn]'].
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator
diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index a60745ec5..cd78b2a15 100644
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Dear $username,
+Dear $[username],
- '$fn' at '$dfrn_url' has accepted
-your connection request at '$sitename'.
+ '$[fn]' at '$[dfrn_url]' has accepted
+your connection request at '$[sitename]'.
- '$fn' has chosen to accept you a "fan", which restricts
+ '$[fn]' has chosen to accept you a "fan", which restricts
some forms of communication - such as private messaging and some profile
interactions. If this is a celebrity or community page, these settings were
applied automatically.
- '$fn' may choose to extend this into a two-way or more permissive
+ '$[fn]' may choose to extend this into a two-way or more permissive
relationship in the future.
- You will start receiving public status updates from '$fn',
+ You will start receiving public status updates from '$[fn]',
which will appear on your 'Network' page at
-$siteurl
+$[siteurl]
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index c350236a4..1330caa12 100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
@@ -1,6 +1,6 @@
-Dear $username,
- A request was recently received at $sitename to reset your account
+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
below or paste it into your web browser address bar.
@@ -12,7 +12,7 @@ issued this request.
Follow this link to verify your identity:
-$reset_link
+$[reset_link]
You will then receive a follow-up message containing the new password.
@@ -20,13 +20,13 @@ You may change that password from your account settings page after logging in.
The login details are as follows:
-Site Location: $siteurl
-Login Name: $email
+Site Location: $[siteurl]
+Login Name: $[email]
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 9692159e1..e7cc0e2dc 100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
@@ -1,5 +1,5 @@
-Dear $username,
+Dear $[username],
Your password has been changed as requested. Please retain this
information for your records (or change your password immediately to
something that you will remember).
@@ -7,14 +7,14 @@ something that you will remember).
Your login details are as follows:
-Site Location: $siteurl
-Login Name: $email
-Password: $new_password
+Site Location: $[siteurl]
+Login Name: $[email]
+Password: $[new_password]
You may change that password from your account settings page after logging in.
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator
diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 221e6ec74..c55ac1e7e 100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
@@ -1,12 +1,12 @@
-Dear $username,
- Thank you for registering at $sitename. Your account has been created.
+Dear $[username],
+ Thank you for registering at $[sitename]. Your account has been created.
The login details are as follows:
-Site Location: $siteurl
-Login Name: $email
-Password: $password
+Site Location: $[siteurl]
+Login Name: $[email]
+Password: $[password]
You may change your password from your account "Settings" page after logging
in.
@@ -26,9 +26,9 @@ If you are new and do not know anybody here, they may help
you to make some new and interesting friends.
-Thank you and welcome to $sitename.
+Thank you and welcome to $[sitename].
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator
diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 60c38d800..73980bb5c 100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
@@ -1,25 +1,25 @@
-A new user registration request was received at $sitename which requires
+A new user registration request was received at $[sitename] which requires
your approval.
The login details are as follows:
-Full Name: $username
-Site Location: $siteurl
-Login Name: $email
+Full Name: $[username]
+Site Location: $[siteurl]
+Login Name: $[email]
To approve this request please visit the following link:
-$siteurl/regmod/allow/$hash
+$[siteurl]/regmod/allow/$[hash]
To deny the request and remove the account, please visit:
-$siteurl/regmod/deny/$hash
+$[siteurl]/regmod/deny/$[hash]
Thank you.
diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl
index 9eef7a61e..ad118a673 100644
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Dear $myname,
+Dear $[myname],
-You have just received a connection request at $sitename
+You have just received a connection request at $[sitename]
-from '$requestor'.
+from '$[requestor]'.
-You may visit their profile at $url.
+You may visit their profile at $[url].
Please login to your site to view the complete introduction
and approve or ignore/cancel the request.
-$siteurl
+$[siteurl]
Regards,
- $sitename administrator \ No newline at end of file
+ $[sitename] administrator