aboutsummaryrefslogtreecommitdiffstats
path: root/view/en/intro_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/intro_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/intro_complete_eml.tpl')
-rw-r--r--view/en/intro_complete_eml.tpl16
1 files changed, 8 insertions, 8 deletions
diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index a60745ec5..cd78b2a15 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',
+ You will start receiving public status updates from '$[fn]',
which will appear on your 'Network' page at
-$siteurl
+$[siteurl]
Sincerely,
- $sitename Administrator
+ $[sitename] Administrator