aboutsummaryrefslogtreecommitdiffstats
path: root/view/en/intro_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/intro_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/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