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/friend_complete_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/friend_complete_eml.tpl')
-rw-r--r-- | view/sv/friend_complete_eml.tpl | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index ab12fcb6b..2b8b0238e 100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl @@ -1,22 +1,17 @@ +$username, -Dear $username, +Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. +Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden +utan begränsningar. -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at $sitename if you wish to make -any changes to this relationship. +Gå in på din sida 'Kontakter' på $sitename om du vill göra några +ändringar när det gäller denna kontakt. $siteurl -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$fn']. - -Sincerely, - - $sitename Administrator +[Du kan exempelvis skapa en separat profil med information som inte +är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. - +Hälsningar, +$sitename admin |