From: Friendika Date: Thu, 24 Mar 2011 11:36:53 +0000 (-0700) Subject: Merge branch 'erikl-master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=067626380db6d5ed71d68bd91481ff51cfa76915;p=friendica.git 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 --- 067626380db6d5ed71d68bd91481ff51cfa76915 diff --cc view/sv/profile_edit.tpl index 6c7d74dafc,818e0e2df1..9b66f109e6 --- a/view/sv/profile_edit.tpl +++ b/view/sv/profile_edit.tpl @@@ -134,21 -134,15 +134,20 @@@ $sexua
-
- - -
(Används vid profilsökning, visas inte för andra)
-
- +
- - ++ ++ +
(Used for suggesting potential friends, can be seen by others)
+
+ +
- - -
(Used for searching profiles, never shown to others)
++ ++ ++
(Används vid profilsökning, visas inte för andra)
+
-
- +
diff --cc view/sv/settings.tpl index 2601f48513,9ffe14b910..a1fff52eb4 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@@ -1,9 -1,7 +1,9 @@@ -

Account Settings

+

Kontoinställningar

- + +$uexport + $nickname_block @@@ -91,21 -89,8 +91,21 @@@ $profile_in_net_di
+
+ + +
+
+ + + +
Automatically expire (delete) posts older than days
+
+ + +
- +