diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
| commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/en/friend_complete_eml.tpl | |
| parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip | |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'view/en/friend_complete_eml.tpl')
| -rw-r--r--[-rwxr-xr-x] | view/en/friend_complete_eml.tpl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index ab12fcb6b..89f578388 100755..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 |