diff options
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/en/follow_notify_eml.tpl | 10 | ||||
| -rw-r--r-- | view/en/friend_complete_eml.tpl | 14 | ||||
| -rw-r--r-- | view/en/intro_complete_eml.tpl | 18 | ||||
| -rw-r--r-- | view/en/lostpass_eml.tpl | 12 | ||||
| -rw-r--r-- | view/en/passchanged_eml.tpl | 10 | ||||
| -rw-r--r-- | view/en/register_verify_eml.tpl | 12 | ||||
| -rw-r--r-- | view/en/request_notify_eml.tpl | 12 | ||||
| -rw-r--r-- | view/en/update_fail_eml.tpl | 16 |
9 files changed, 54 insertions, 52 deletions
diff --git a/version.inc b/version.inc index 8fc857f03..cf57809d8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-05-15.314 +2013-05-16.315 diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl index 917024b84..ba07b19da 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 + {{$sitename}} administrator diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index 89f578388..1c647b994 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 'Connnections' 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 cd78b2a15..2c2428d68 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]', -which will appear on your 'Network' page at + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index 1330caa12..3b79d2791 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 e7cc0e2dc..0d94be3c2 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_verify_eml.tpl b/view/en/register_verify_eml.tpl index c23de6a2a..85d9a12d3 100644 --- a/view/en/register_verify_eml.tpl +++ b/view/en/register_verify_eml.tpl @@ -1,24 +1,24 @@ -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: -Site Location: $[siteurl] -Login Name: $[email] -IP Address: $[details] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} 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 ad118a673..d01b8ff27 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 + {{$sitename}} administrator diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl index 548e1a0df..a7df8fc2f 100644 --- a/view/en/update_fail_eml.tpl +++ b/view/en/update_fail_eml.tpl @@ -1,11 +1,13 @@ Hey,
-I'm $sitename;
-The friendica developers released update $update recently,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
-This needs to be fixed soon and I can't do it alone. Please contact a
-friendica developer if you can not help me on your own. My database might be invalid.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-The error message is '$error'.
+The error message is '{{$error}}'.
-I'm sorry,
-your friendica server at $siteurl
\ No newline at end of file +Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file |