aboutsummaryrefslogtreecommitdiffstats
path: root/view/de/follow_notify_eml.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-30 06:02:38 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-30 06:02:38 -0400
commit9b7dac6ce19e99ae9341329f422685626146fbdb (patch)
treedbf505881b60a675492d299d94ec6fb7875c8fac /view/de/follow_notify_eml.tpl
parent34eb843fb486b9487f02553c1b791892bb7615fc (diff)
parent9f18c9d664d44ce4d2bfe092bf1a8a154d31ac5f (diff)
downloadvolse-hubzilla-9b7dac6ce19e99ae9341329f422685626146fbdb.tar.gz
volse-hubzilla-9b7dac6ce19e99ae9341329f422685626146fbdb.tar.bz2
volse-hubzilla-9b7dac6ce19e99ae9341329f422685626146fbdb.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: provide "xxx joined yyy" notifications adding META viewport tag for better look on tablets Update Esperanto to 100% DE update to the strings activitystreams schema constants for "join group" missed a db field typo in profile_selectors, fix remote tagging not all profile selector choices have unique or direct translations log db error strings in all cases admin page to manage failed updates improved db error logging close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) * master:
Diffstat (limited to 'view/de/follow_notify_eml.tpl')
-rw-r--r--view/de/follow_notify_eml.tpl15
1 files changed, 7 insertions, 8 deletions
diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl
index d7259a240..a866a08a2 100644
--- a/view/de/follow_notify_eml.tpl
+++ b/view/de/follow_notify_eml.tpl
@@ -1,15 +1,14 @@
-Hallo $myname,
+Hallo $[myname],
-'$requestor' folgt dir jetzt auf $sitename.
+Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'.
-Du kannst das Profil unter $url abrufen.
+Du kannst das Profil unter $[url] besuchen.
-Bitte melde dich auf deiner Seite an um die Anfrage zu bestätigen, abzulehnen
-oder zu ignorieren.
+Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen.
-$siteurl
+$[siteurl]
-Grüße,
- $sitename Administrator
+beste Grüße,
+ $[sitename] Administrator \ No newline at end of file