aboutsummaryrefslogtreecommitdiffstats
path: root/view/en/friend_complete_eml.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-21 19:26:24 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-21 19:26:24 +0200
commit71e2dbf3522dcf076458805ee65dc976fb35a6f3 (patch)
tree5c11d463eff15245458f5033d7d425671df8f1d0 /view/en/friend_complete_eml.tpl
parenta147d6113c081694d4209002fa5e57106d4c6f41 (diff)
parentbdbe068b95e8c302179530dff7583997ff35f246 (diff)
downloadvolse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.gz
volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.bz2
volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.zip
Merge commit '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