diff options
| author | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
| commit | 067626380db6d5ed71d68bd91481ff51cfa76915 (patch) | |
| tree | 15b24c4718891a5a8fbaa0ce9964b0714524c6ed /view/sv/cmnt_received_eml.tpl | |
| parent | 51447932f707e1d0177ee4700266285ed80be2f6 (diff) | |
| parent | ba99ce3d0ab77bd62971cd3962d964be1ddee205 (diff) | |
| download | volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.gz volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.bz2 volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.zip | |
Merge branch 'erikl-master'
Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
Diffstat (limited to 'view/sv/cmnt_received_eml.tpl')
| -rw-r--r-- | view/sv/cmnt_received_eml.tpl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index 60a5711ea..d87c7a1d1 100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl @@ -1,7 +1,7 @@ $username, - '$from' har kommenterat något som du följer. +'$from' har kommenterat något som du följer. ----- $body @@ -11,8 +11,7 @@ Logga in på $siteurl för att se hela konversationen: $display -Tack, - $sitename admin +Hälsningar, +$sitename admin - |