diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
commit | b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch) | |
tree | 718df6305bcb82c8dcb4b287a7132422e748cdfb /view/en/intro_complete_eml.tpl | |
parent | c2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff) | |
parent | a92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff) | |
download | volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2 volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/en/intro_complete_eml.tpl')
-rw-r--r-- | view/en/intro_complete_eml.tpl | 18 |
1 files changed, 9 insertions, 9 deletions
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 |