aboutsummaryrefslogtreecommitdiffstats
path: root/view/en/friend_complete_eml.tpl
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-20 13:42:33 +0200
committerzottel <github@zottel.net>2012-04-20 13:42:33 +0200
commit9663299da1be50eef4327778fae619fc6f9edef4 (patch)
tree5cd9b93f16c344cf896ac8d4e2a4a818fe21e783 /view/en/friend_complete_eml.tpl
parent041f74dc775424f686a1cd95c00e0d63bfc4b99c (diff)
parent0e25376e4afea4e5d96c233594feef0a35ca314c (diff)
downloadvolse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.gz
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.bz2
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/en/friend_complete_eml.tpl')
-rw-r--r--view/en/friend_complete_eml.tpl14
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 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