diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-22 09:22:16 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-22 09:22:16 +0100 |
| commit | 0dc7e0975a7cd02d8c79dda42c836c31d84c9e24 (patch) | |
| tree | 3667408df97c8d5806d9053603b7f294e7aa04d6 | |
| parent | f54f8ca63ae031c1d444782acd6c141a870ba594 (diff) | |
| parent | 96620520a8be98204ebc5b3023c6a2db9aa5e540 (diff) | |
| download | volse-hubzilla-0dc7e0975a7cd02d8c79dda42c836c31d84c9e24.tar.gz volse-hubzilla-0dc7e0975a7cd02d8c79dda42c836c31d84c9e24.tar.bz2 volse-hubzilla-0dc7e0975a7cd02d8c79dda42c836c31d84c9e24.zip | |
Merge branch 'master' of git://github.com/tobiasd/friendika
| -rw-r--r-- | mod/like.php | 2 | ||||
| -rw-r--r-- | view/de/cmnt_received_eml.tpl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mod/like.php b/mod/like.php index cb4093d5d..f256cd9a1 100644 --- a/mod/like.php +++ b/mod/like.php @@ -150,7 +150,7 @@ EOT; $arr['author-link'] = $contact['url']; $arr['author-avatar'] = $contact['thumb']; $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . t('likes') . ' ' - . '[url=' . $owner['url'] . ']' . $owner['name'] . t('\'s') . '[/url]' . ' ' + . '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' ' . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ; $arr['verb'] = $activity; diff --git a/view/de/cmnt_received_eml.tpl b/view/de/cmnt_received_eml.tpl index 2c7ebaa65..500c93eb4 100644 --- a/view/de/cmnt_received_eml.tpl +++ b/view/de/cmnt_received_eml.tpl @@ -1,8 +1,7 @@ Hallo $username, - '$from' hat ein Ding oder eine Konversation kommentiert welchem/r du - auch folgst. +'$from' hat einen Pinnwandeintrag kommentiert dem du auch folgst. ----- $body |