Merge https://github.com/friendica/red into pending_merge

1 files changed, 466 insertions, 404 deletions

diff --git a/util/messages.po b/util/messages.po
index bdce4a72a..847e26c6a 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-08-08.761\n"
+"Project-Id-Version: 2014-08-13.766\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 01:13+0000\n"
+"POT-Creation-Date: 2014-08-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,19 +22,19 @@ msgid "Light (Red Matrix default)"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:99
-#: ../../include/ItemObject.php:583 ../../mod/settings.php:516
-#: ../../mod/settings.php:628 ../../mod/settings.php:656
-#: ../../mod/settings.php:680 ../../mod/settings.php:750
-#: ../../mod/settings.php:928 ../../mod/filestorage.php:137
-#: ../../mod/admin.php:442 ../../mod/admin.php:751 ../../mod/admin.php:886
-#: ../../mod/admin.php:1019 ../../mod/admin.php:1218 ../../mod/admin.php:1305
+#: ../../include/ItemObject.php:583 ../../mod/settings.php:517
+#: ../../mod/settings.php:629 ../../mod/settings.php:657
+#: ../../mod/settings.php:681 ../../mod/settings.php:754
+#: ../../mod/settings.php:934 ../../mod/filestorage.php:137
+#: ../../mod/admin.php:451 ../../mod/admin.php:760 ../../mod/admin.php:895
+#: ../../mod/admin.php:1028 ../../mod/admin.php:1227 ../../mod/admin.php:1314
 #: ../../mod/photos.php:563 ../../mod/photos.php:668 ../../mod/photos.php:956
 #: ../../mod/photos.php:996 ../../mod/photos.php:1083 ../../mod/mood.php:135
 #: ../../mod/pdledit.php:58 ../../mod/connedit.php:518 ../../mod/setup.php:307
-#: ../../mod/setup.php:350 ../../mod/invite.php:156 ../../mod/thing.php:286
+#: ../../mod/setup.php:350 ../../mod/invite.php:142 ../../mod/thing.php:286
 #: ../../mod/thing.php:329 ../../mod/connect.php:92 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/group.php:81 ../../mod/appman.php:99
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/frphotos.php:84 ../../mod/poke.php:166 ../../mod/group.php:81
+#: ../../mod/appman.php:99 ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/import.php:393 ../../mod/mail.php:345 ../../mod/profiles.php:589
 #: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/events.php:511
 msgid "Submit"
@@ -172,63 +172,63 @@ msgstr ""
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
-#: ../../boot.php:1291
+#: ../../boot.php:1296
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1294
+#: ../../boot.php:1299
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1468
+#: ../../boot.php:1473
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1469 ../../include/nav.php:146 ../../mod/register.php:221
+#: ../../boot.php:1474 ../../include/nav.php:146 ../../mod/register.php:221
 msgid "Register"
 msgstr ""
 
-#: ../../boot.php:1492 ../../include/nav.php:81 ../../include/nav.php:108
+#: ../../boot.php:1497 ../../include/nav.php:81 ../../include/nav.php:108
 msgid "Logout"
 msgstr ""
 
-#: ../../boot.php:1493 ../../include/nav.php:106 ../../include/apps.php:126
+#: ../../boot.php:1498 ../../include/nav.php:106 ../../include/apps.php:126
 msgid "Login"
 msgstr ""
 
-#: ../../boot.php:1495 ../../include/contact_selectors.php:79
-#: ../../mod/admin.php:754 ../../mod/admin.php:763
+#: ../../boot.php:1500 ../../include/contact_selectors.php:79
+#: ../../mod/admin.php:763 ../../mod/admin.php:772
 msgid "Email"
 msgstr ""
 
-#: ../../boot.php:1496
+#: ../../boot.php:1501
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1497
+#: ../../boot.php:1502
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1502
+#: ../../boot.php:1507
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1503 ../../mod/lostpass.php:85
+#: ../../boot.php:1508 ../../mod/lostpass.php:85
 msgid "Password Reset"
 msgstr ""
 
-#: ../../boot.php:1567
+#: ../../boot.php:1572
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1568
+#: ../../boot.php:1573
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:1998
+#: ../../boot.php:2003
 msgid "toggle mobile"
 msgstr ""
 
@@ -248,13 +248,13 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../../include/photos.php:15 ../../include/items.php:3704
+#: ../../include/photos.php:15 ../../include/items.php:3711
 #: ../../include/attach.php:119 ../../include/attach.php:166
 #: ../../include/attach.php:229 ../../include/attach.php:243
 #: ../../include/attach.php:283 ../../include/attach.php:297
 #: ../../include/attach.php:322 ../../include/attach.php:513
 #: ../../include/attach.php:585 ../../include/chat.php:116
-#: ../../mod/settings.php:493 ../../mod/filestorage.php:10
+#: ../../mod/settings.php:494 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
 #: ../../mod/filestorage.php:98 ../../mod/webpages.php:40
 #: ../../mod/authtest.php:13 ../../mod/new_channel.php:66
@@ -289,35 +289,35 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/photos.php:51 ../../include/photo/photo_driver.php:643
+#: ../../include/photos.php:51 ../../include/photo/photo_driver.php:653
 #: ../../mod/photos.php:91 ../../mod/photos.php:653 ../../mod/photos.php:675
 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301
 #: ../../mod/profile_photo.php:421
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/photos.php:89
+#: ../../include/photos.php:104
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/photos.php:96
+#: ../../include/photos.php:111
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/photos.php:123 ../../mod/profile_photo.php:216
+#: ../../include/photos.php:140 ../../mod/profile_photo.php:216
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/photos.php:186
+#: ../../include/photos.php:212
 msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/photos.php:313 ../../include/conversation.php:1515
+#: ../../include/photos.php:339 ../../include/conversation.php:1515
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/photos.php:317 ../../mod/photos.php:691
+#: ../../include/photos.php:343 ../../mod/photos.php:691
 #: ../../mod/photos.php:1193
 msgid "Upload New Photos"
 msgstr ""
@@ -329,7 +329,7 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:446
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:455
 msgid "Advanced"
 msgstr ""
 
@@ -423,74 +423,74 @@ msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
 #: ../../include/items.php:295 ../../mod/subthread.php:49
-#: ../../mod/profperm.php:23 ../../mod/group.php:68 ../../mod/like.php:242
-#: ../../index.php:360
+#: ../../mod/profperm.php:23 ../../mod/frphotos.php:69 ../../mod/group.php:68
+#: ../../mod/like.php:242 ../../index.php:360
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:824
+#: ../../include/items.php:830
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:953
+#: ../../include/items.php:959
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:955
+#: ../../include/items.php:961
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:957
+#: ../../include/items.php:963
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:959
+#: ../../include/items.php:965
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:961
+#: ../../include/items.php:967
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:963
+#: ../../include/items.php:969
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:965
+#: ../../include/items.php:971
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:3642 ../../mod/filestorage.php:18
-#: ../../mod/home.php:67 ../../mod/admin.php:159 ../../mod/admin.php:923
-#: ../../mod/admin.php:1126 ../../mod/thing.php:78 ../../mod/display.php:32
+#: ../../include/items.php:3649 ../../mod/filestorage.php:18
+#: ../../mod/home.php:67 ../../mod/admin.php:168 ../../mod/admin.php:932
+#: ../../mod/admin.php:1135 ../../mod/thing.php:78 ../../mod/display.php:32
 #: ../../mod/viewsrc.php:18
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4075 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4082 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4090
+#: ../../include/items.php:4097
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4097
+#: ../../include/items.php:4104
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4108
+#: ../../include/items.php:4115
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4111
+#: ../../include/items.php:4118
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/Contact.php:107 ../../include/identity.php:675
+#: ../../include/Contact.php:107 ../../include/identity.php:706
 #: ../../include/widgets.php:128 ../../include/widgets.php:168
 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51
 #: ../../mod/directory.php:183 ../../mod/match.php:62
@@ -635,118 +635,118 @@ msgid "Requested channel is not available."
 msgstr ""
 
 #: ../../include/identity.php:557 ../../mod/filestorage.php:40
-#: ../../mod/webpages.php:8 ../../mod/profile.php:16 ../../mod/connect.php:13
-#: ../../mod/blocks.php:10 ../../mod/layouts.php:8
+#: ../../mod/webpages.php:8 ../../mod/profile.php:16 ../../mod/hcard.php:8
+#: ../../mod/connect.php:13 ../../mod/blocks.php:10 ../../mod/layouts.php:8
 #: ../../mod/achievements.php:8
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:689 ../../mod/profiles.php:695
+#: ../../include/identity.php:720 ../../mod/profiles.php:695
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:695
+#: ../../include/identity.php:726
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:695
+#: ../../include/identity.php:726
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:696 ../../mod/profiles.php:696
+#: ../../include/identity.php:727 ../../mod/profiles.php:696
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:699 ../../include/nav.php:89
+#: ../../include/identity.php:730 ../../include/nav.php:89
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:710 ../../mod/profiles.php:707
+#: ../../include/identity.php:741 ../../mod/profiles.php:707
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:713
+#: ../../include/identity.php:744
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:714 ../../mod/profiles.php:591
+#: ../../include/identity.php:745 ../../mod/profiles.php:591
 #: ../../mod/profiles.php:711
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:726 ../../include/event.php:40
+#: ../../include/identity.php:757 ../../include/event.php:40
 #: ../../include/bb2diaspora.php:485 ../../mod/dirprofile.php:105
 #: ../../mod/directory.php:156 ../../mod/events.php:504
 msgid "Location:"
 msgstr ""
 
-#: ../../include/identity.php:728 ../../include/identity.php:952
+#: ../../include/identity.php:759 ../../include/identity.php:983
 #: ../../mod/directory.php:158
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:729 ../../include/identity.php:996
+#: ../../include/identity.php:760 ../../include/identity.php:1027
 #: ../../mod/directory.php:160
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:730 ../../include/identity.php:1007
+#: ../../include/identity.php:761 ../../include/identity.php:1038
 #: ../../mod/directory.php:162
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:731 ../../mod/dirprofile.php:151
+#: ../../include/identity.php:762 ../../mod/dirprofile.php:151
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:796 ../../include/identity.php:876
+#: ../../include/identity.php:827 ../../include/identity.php:907
 #: ../../mod/ping.php:298
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:797 ../../include/identity.php:877
+#: ../../include/identity.php:828 ../../include/identity.php:908
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:842 ../../include/identity.php:917
+#: ../../include/identity.php:873 ../../include/identity.php:948
 #: ../../mod/ping.php:320
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:854
+#: ../../include/identity.php:885
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:855
+#: ../../include/identity.php:886
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:910
+#: ../../include/identity.php:941
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:928
+#: ../../include/identity.php:959
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:929
+#: ../../include/identity.php:960
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:942 ../../include/identity.php:1050
+#: ../../include/identity.php:973 ../../include/identity.php:1091
 #: ../../include/apps.php:133 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:950 ../../mod/settings.php:936
+#: ../../include/identity.php:981 ../../mod/settings.php:942
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:957
+#: ../../include/identity.php:988
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:968 ../../include/taxonomy.php:338
+#: ../../include/identity.php:999 ../../include/taxonomy.php:338
 #: ../../include/ItemObject.php:134
 msgctxt "noun"
 msgid "Like"
@@ -754,100 +754,100 @@ msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/identity.php:981
+#: ../../include/identity.php:1012
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:982
+#: ../../include/identity.php:1013
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:989
+#: ../../include/identity.php:1020
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:993
+#: ../../include/identity.php:1024
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1002
+#: ../../include/identity.php:1033
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1005 ../../mod/profiles.php:613
+#: ../../include/identity.php:1036 ../../mod/profiles.php:613
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../mod/profiles.php:615
+#: ../../include/identity.php:1040 ../../mod/profiles.php:615
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1042
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1013 ../../mod/profiles.php:616
+#: ../../include/identity.php:1044 ../../mod/profiles.php:616
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1015
+#: ../../include/identity.php:1046
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1017 ../../mod/directory.php:164
+#: ../../include/identity.php:1048 ../../mod/directory.php:164
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1019
+#: ../../include/identity.php:1050
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1021 ../../mod/profiles.php:619
+#: ../../include/identity.php:1052 ../../mod/profiles.php:619
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1023 ../../mod/profiles.php:620
+#: ../../include/identity.php:1054 ../../mod/profiles.php:620
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1026
+#: ../../include/identity.php:1057
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1028
+#: ../../include/identity.php:1059
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1030
+#: ../../include/identity.php:1061
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1032
+#: ../../include/identity.php:1063
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1034
+#: ../../include/identity.php:1065
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1036
+#: ../../include/identity.php:1067
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1038
+#: ../../include/identity.php:1069
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1040
+#: ../../include/identity.php:1071
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1042
+#: ../../include/identity.php:1073
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1052
+#: ../../include/identity.php:1093
 msgid "Like this thing"
 msgstr ""
 
@@ -857,8 +857,8 @@ msgstr ""
 
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/menu.php:42 ../../include/reddav.php:1289
-#: ../../include/ItemObject.php:96 ../../include/apps.php:240
-#: ../../mod/settings.php:578 ../../mod/webpages.php:120
+#: ../../include/ItemObject.php:96 ../../include/apps.php:246
+#: ../../mod/settings.php:579 ../../mod/webpages.php:120
 #: ../../mod/connections.php:393 ../../mod/menu.php:59 ../../mod/thing.php:235
 #: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143
 #: ../../mod/blocks.php:94 ../../mod/layouts.php:112
@@ -927,8 +927,8 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/reddav.php:1202 ../../include/apps.php:322
-#: ../../include/apps.php:373 ../../mod/connedit.php:476
+#: ../../include/reddav.php:1202 ../../include/apps.php:328
+#: ../../include/apps.php:379 ../../mod/connedit.php:476
 msgid "Unknown"
 msgstr ""
 
@@ -948,8 +948,8 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: ../../include/reddav.php:1284 ../../mod/settings.php:518
-#: ../../mod/settings.php:544 ../../mod/admin.php:893
+#: ../../include/reddav.php:1284 ../../mod/settings.php:519
+#: ../../mod/settings.php:545 ../../mod/admin.php:902
 msgid "Name"
 msgstr ""
 
@@ -966,8 +966,8 @@ msgid "Last Modified"
 msgstr ""
 
 #: ../../include/reddav.php:1290 ../../include/ItemObject.php:108
-#: ../../include/apps.php:241 ../../include/conversation.php:635
-#: ../../mod/settings.php:579 ../../mod/admin.php:758 ../../mod/admin.php:888
+#: ../../include/apps.php:247 ../../include/conversation.php:635
+#: ../../mod/settings.php:580 ../../mod/admin.php:767 ../../mod/admin.php:897
 #: ../../mod/photos.php:1046 ../../mod/connedit.php:440
 #: ../../mod/thing.php:236 ../../mod/group.php:176
 msgid "Delete"
@@ -1224,6 +1224,10 @@ msgstr ""
 msgid "Can like/dislike stuff"
 msgstr ""
 
+#: ../../include/permissions.php:26
+msgid "Profiles and things other than posts/comments"
+msgstr ""
+
 #: ../../include/permissions.php:28
 msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
@@ -1656,11 +1660,11 @@ msgstr ""
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:634
+#: ../../include/zot.php:638
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:831
+#: ../../include/zot.php:835
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -1685,7 +1689,7 @@ msgstr ""
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/group.php:253 ../../mod/admin.php:763
+#: ../../include/group.php:253 ../../mod/admin.php:772
 msgid "All Channels"
 msgstr ""
 
@@ -2256,8 +2260,8 @@ msgid "Select an alternate language"
 msgstr ""
 
 #: ../../include/text.php:1732 ../../include/conversation.php:120
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:45 ../../mod/like.php:294
+#: ../../include/diaspora.php:1910 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294
 msgid "photo"
 msgstr ""
 
@@ -2267,8 +2271,8 @@ msgid "event"
 msgstr ""
 
 #: ../../include/text.php:1738 ../../include/conversation.php:148
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:53 ../../mod/like.php:294
+#: ../../include/diaspora.php:1910 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294
 msgid "status"
 msgstr ""
 
@@ -2778,8 +2782,8 @@ msgid "Manage Your Channels"
 msgstr ""
 
 #: ../../include/nav.php:198 ../../include/apps.php:129
-#: ../../include/widgets.php:514 ../../mod/admin.php:978
-#: ../../mod/admin.php:1183
+#: ../../include/widgets.php:514 ../../mod/admin.php:987
+#: ../../mod/admin.php:1192
 msgid "Settings"
 msgstr ""
 
@@ -2787,7 +2791,7 @@ msgstr ""
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:206 ../../mod/admin.php:117
+#: ../../include/nav.php:206 ../../mod/admin.php:123
 msgid "Admin"
 msgstr ""
 
@@ -3070,20 +3074,44 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
-#: ../../include/apps.php:233 ../../mod/settings.php:79
-#: ../../mod/settings.php:542
+#: ../../include/apps.php:145
+msgid "Random Channel"
+msgstr ""
+
+#: ../../include/apps.php:146
+msgid "Invite"
+msgstr ""
+
+#: ../../include/apps.php:147
+msgid "Features"
+msgstr ""
+
+#: ../../include/apps.php:148
+msgid "Language"
+msgstr ""
+
+#: ../../include/apps.php:149
+msgid "Post"
+msgstr ""
+
+#: ../../include/apps.php:150
+msgid "Profile Photo"
+msgstr ""
+
+#: ../../include/apps.php:239 ../../mod/settings.php:79
+#: ../../mod/settings.php:543
 msgid "Update"
 msgstr ""
 
-#: ../../include/apps.php:233
+#: ../../include/apps.php:239
 msgid "Install"
 msgstr ""
 
-#: ../../include/apps.php:238
+#: ../../include/apps.php:244
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/api.php:1016
+#: ../../include/api.php:1036
 msgid "Public Timeline"
 msgstr ""
 
@@ -3111,7 +3139,8 @@ msgstr ""
 msgid "channel"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:331
+#: ../../include/conversation.php:164 ../../include/diaspora.php:1926
+#: ../../mod/like.php:331
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -3396,8 +3425,8 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1159 ../../mod/settings.php:517
-#: ../../mod/settings.php:543 ../../mod/fbrowser.php:82
+#: ../../include/conversation.php:1159 ../../mod/settings.php:518
+#: ../../mod/settings.php:544 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:151
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 msgid "Cancel"
@@ -3460,7 +3489,7 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1491 ../../mod/admin.php:892
+#: ../../include/conversation.php:1491 ../../mod/admin.php:901
 msgid "Channel"
 msgstr ""
 
@@ -3642,6 +3671,19 @@ msgstr ""
 msgid "Suggested Chatrooms"
 msgstr ""
 
+#: ../../include/diaspora.php:610
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr ""
+
+#: ../../include/diaspora.php:693
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: ../../include/diaspora.php:2303
+msgid "Attachments:"
+msgstr ""
+
 #: ../../include/follow.php:23
 msgid "Channel is blocked on this site."
 msgstr ""
@@ -3701,450 +3743,454 @@ msgstr ""
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/settings.php:195
+#: ../../mod/settings.php:196
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:199
+#: ../../mod/settings.php:200
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:213
+#: ../../mod/settings.php:214
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:215
+#: ../../mod/settings.php:216
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:229
+#: ../../mod/settings.php:230
 msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:232
+#: ../../mod/settings.php:233
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:241
+#: ../../mod/settings.php:242
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:444
+#: ../../mod/settings.php:445
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-#: ../../mod/settings.php:577
+#: ../../mod/settings.php:516 ../../mod/settings.php:542
+#: ../../mod/settings.php:578
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:519
 msgid "Name of application"
 msgstr ""
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:520
+#: ../../mod/settings.php:520 ../../mod/settings.php:521
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/settings.php:520 ../../mod/settings.php:546
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:521
+#: ../../mod/settings.php:522
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/settings.php:522 ../../mod/settings.php:548
+#: ../../mod/settings.php:523 ../../mod/settings.php:549
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:522
+#: ../../mod/settings.php:523
 msgid "Optional"
 msgstr ""
 
-#: ../../mod/settings.php:533
+#: ../../mod/settings.php:534
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:580
+#: ../../mod/settings.php:581
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:582
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:582
+#: ../../mod/settings.php:583
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:594
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:602
 msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:627
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:628
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:628
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:629 ../../mod/settings.php:937
+#: ../../mod/settings.php:630 ../../mod/settings.php:943
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:630
+#: ../../mod/settings.php:631
 msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/settings.php:631 ../../mod/settings.php:1000
+#: ../../mod/settings.php:632 ../../mod/settings.php:1006
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:648
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:648
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:654
+#: ../../mod/settings.php:655
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:680
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:709 ../../mod/admin.php:390
+#: ../../mod/settings.php:710 ../../mod/admin.php:399
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:718
+#: ../../mod/settings.php:719
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:752
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:754
+#: ../../mod/settings.php:758
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:755
+#: ../../mod/settings.php:759
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:760
+msgid "Enable user zoom on mobile devices"
+msgstr ""
+
+#: ../../mod/settings.php:761
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:761
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:762
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:762
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:763
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:759
+#: ../../mod/settings.php:764
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:800
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:801
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/settings.php:796
+#: ../../mod/settings.php:802
 msgid "Approved connections"
 msgstr ""
 
-#: ../../mod/settings.php:797
+#: ../../mod/settings.php:803
 msgid "Any connections"
 msgstr ""
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:804
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/settings.php:799
+#: ../../mod/settings.php:805
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:806
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:807
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/settings.php:878
+#: ../../mod/settings.php:884
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/settings.php:878 ../../mod/settings.php:883
-#: ../../mod/settings.php:954 ../../mod/admin.php:420
+#: ../../mod/settings.php:884 ../../mod/settings.php:889
+#: ../../mod/settings.php:960 ../../mod/admin.php:429
 #: ../../mod/profiles.php:566 ../../mod/api.php:106
 msgid "No"
 msgstr ""
 
-#: ../../mod/settings.php:878 ../../mod/settings.php:883
-#: ../../mod/settings.php:954 ../../mod/admin.php:422
+#: ../../mod/settings.php:884 ../../mod/settings.php:889
+#: ../../mod/settings.php:960 ../../mod/admin.php:431
 #: ../../mod/profiles.php:565 ../../mod/api.php:105
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:889
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:887 ../../mod/profile_photo.php:365
+#: ../../mod/settings.php:893 ../../mod/profile_photo.php:365
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:898
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/settings.php:926
+#: ../../mod/settings.php:932
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:935
+#: ../../mod/settings.php:941
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:944
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:945
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:945
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../mod/settings.php:940
+#: ../../mod/settings.php:946
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:948
 msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:948
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:950
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:952
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:952
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:954
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:955
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:956
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:957
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:958
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:960
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:960
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:962
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:964
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:964
 msgid "0 or blank prevents expiration"
 msgstr ""
 
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:965
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:965
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:966
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+#: ../../mod/settings.php:967 ../../mod/mitem.php:134 ../../mod/mitem.php:177
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:978
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:978
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:981
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:976
+#: ../../mod/settings.php:982
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:983
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:984
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:985
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:986
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:987
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:988
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:989
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:990
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:991
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:992
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:993
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:994
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:997
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:998
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:1001
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1002
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1004
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1005
 msgid "Remove this channel"
 msgstr ""
 
@@ -4272,605 +4318,609 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:441
+#: ../../mod/admin.php:97 ../../mod/admin.php:450
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:93
+#: ../../mod/admin.php:98
 msgid "Accounts"
 msgstr ""
 
-#: ../../mod/admin.php:94 ../../mod/admin.php:885
+#: ../../mod/admin.php:99 ../../mod/admin.php:894
 msgid "Channels"
 msgstr ""
 
-#: ../../mod/admin.php:95 ../../mod/admin.php:976 ../../mod/admin.php:1018
+#: ../../mod/admin.php:100 ../../mod/admin.php:985 ../../mod/admin.php:1027
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:1181 ../../mod/admin.php:1217
+#: ../../mod/admin.php:101 ../../mod/admin.php:1190 ../../mod/admin.php:1226
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:541
+#: ../../mod/admin.php:102 ../../mod/admin.php:550
 msgid "Server"
 msgstr ""
 
-#: ../../mod/admin.php:98
+#: ../../mod/admin.php:103
+msgid "Profile Config"
+msgstr ""
+
+#: ../../mod/admin.php:104
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:112 ../../mod/admin.php:119 ../../mod/admin.php:1304
+#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1313
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:118
+#: ../../mod/admin.php:124
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/admin.php:120
+#: ../../mod/admin.php:126
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:197
+#: ../../mod/admin.php:206
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:440 ../../mod/admin.php:540
-#: ../../mod/admin.php:749 ../../mod/admin.php:884 ../../mod/admin.php:975
-#: ../../mod/admin.php:1017 ../../mod/admin.php:1180 ../../mod/admin.php:1216
-#: ../../mod/admin.php:1303
+#: ../../mod/admin.php:211 ../../mod/admin.php:449 ../../mod/admin.php:549
+#: ../../mod/admin.php:758 ../../mod/admin.php:893 ../../mod/admin.php:984
+#: ../../mod/admin.php:1026 ../../mod/admin.php:1189 ../../mod/admin.php:1225
+#: ../../mod/admin.php:1312
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:203
+#: ../../mod/admin.php:212
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:205
+#: ../../mod/admin.php:214
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:207 ../../mod/admin.php:544
+#: ../../mod/admin.php:216 ../../mod/admin.php:553
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:208
+#: ../../mod/admin.php:217
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:210 ../../mod/admin.php:545
+#: ../../mod/admin.php:219 ../../mod/admin.php:554
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:370
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:401
 msgid "No special theme for accessibility"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:430
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:436
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:437
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:438
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:439
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:443 ../../mod/register.php:204
+#: ../../mod/admin.php:452 ../../mod/register.php:204
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:453
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:454
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:459
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:460
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:461
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:461
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:462
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:463
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:463
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:464
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:464
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:465
 msgid "Accessibility system theme"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:465
 msgid "Accessibility theme"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:466
 msgid "Channel to use for this website's static pages"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:466
 msgid "Site Channel"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:468
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:468
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:469
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:470
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:471
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:471
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:472
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:472
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:473
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:474
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:474
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:475
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:475
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid "Disable discovery tab"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid ""
 "Check to hide the login form from your sites homepage when visitors arrive "
 "who are not logged in (e.g. when you put the content of the homepage in via "
 "the site channel)."
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:485
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:485
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:541
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:539 ../../mod/admin.php:763
+#: ../../mod/admin.php:548 ../../mod/admin.php:772
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:548
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:548
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:548
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:569
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:579
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:582
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:586
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:589
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:595
+#: ../../mod/admin.php:604
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:608
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:601
+#: ../../mod/admin.php:610
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:611
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:637
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:644
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:675
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:677
+#: ../../mod/admin.php:686
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:695
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:695
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:750 ../../mod/admin.php:762
+#: ../../mod/admin.php:759 ../../mod/admin.php:771
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:752 ../../mod/admin.php:887
+#: ../../mod/admin.php:761 ../../mod/admin.php:896
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:753
+#: ../../mod/admin.php:762
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:754
+#: ../../mod/admin.php:763
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:755
+#: ../../mod/admin.php:764
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:756
+#: ../../mod/admin.php:765
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:757
+#: ../../mod/admin.php:766
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:759 ../../mod/connedit.php:414
+#: ../../mod/admin.php:768 ../../mod/connedit.php:414
 #: ../../mod/connedit.php:557
 msgid "Block"
 msgstr ""
 
-#: ../../mod/admin.php:760 ../../mod/connedit.php:414
+#: ../../mod/admin.php:769 ../../mod/connedit.php:414
 #: ../../mod/connedit.php:557
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/admin.php:763
+#: ../../mod/admin.php:772
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:763
+#: ../../mod/admin.php:772
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:763
+#: ../../mod/admin.php:772
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:763
+#: ../../mod/admin.php:772
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:765
+#: ../../mod/admin.php:774
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:766
+#: ../../mod/admin.php:775
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:799
+#: ../../mod/admin.php:808
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channelss censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:815
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:834
 msgid "Channel not found"
 msgstr ""
 
-#: ../../mod/admin.php:836
+#: ../../mod/admin.php:845
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:846
+#: ../../mod/admin.php:855
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../mod/admin.php:846
+#: ../../mod/admin.php:855
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:898
 msgid "Censor"
 msgstr ""
 
-#: ../../mod/admin.php:890
+#: ../../mod/admin.php:899
 msgid "Uncensor"
 msgstr ""
 
-#: ../../mod/admin.php:893
+#: ../../mod/admin.php:902
 msgid "UID"
 msgstr ""
 
-#: ../../mod/admin.php:893 ../../mod/profiles.php:397
+#: ../../mod/admin.php:902 ../../mod/profiles.php:397
 msgid "Address"
 msgstr ""
 
-#: ../../mod/admin.php:895
+#: ../../mod/admin.php:904
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:896
+#: ../../mod/admin.php:905
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:935
+#: ../../mod/admin.php:944
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:939
+#: ../../mod/admin.php:948
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:949 ../../mod/admin.php:1151
+#: ../../mod/admin.php:958 ../../mod/admin.php:1160
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:951 ../../mod/admin.php:1153
+#: ../../mod/admin.php:960 ../../mod/admin.php:1162
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:977 ../../mod/admin.php:1182
+#: ../../mod/admin.php:986 ../../mod/admin.php:1191
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:985 ../../mod/admin.php:1192
+#: ../../mod/admin.php:994 ../../mod/admin.php:1201
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:986 ../../mod/admin.php:1193
+#: ../../mod/admin.php:995 ../../mod/admin.php:1202
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1124
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1183
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1222
+#: ../../mod/admin.php:1231
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1223
+#: ../../mod/admin.php:1232
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1250
+#: ../../mod/admin.php:1259
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1306
+#: ../../mod/admin.php:1315
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1312
+#: ../../mod/admin.php:1321
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1313
+#: ../../mod/admin.php:1322
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1313
+#: ../../mod/admin.php:1322
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1314
+#: ../../mod/admin.php:1323
 msgid "Log level"
 msgstr ""
 
@@ -6259,48 +6309,40 @@ msgstr[1] ""
 msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/invite.php:141
+#: ../../mod/invite.php:129
 msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/invite.php:142
+#: ../../mod/invite.php:130
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/invite.php:143 ../../mod/mail.php:225 ../../mod/mail.php:338
+#: ../../mod/invite.php:131 ../../mod/mail.php:225 ../../mod/mail.php:338
 msgid "Your message:"
 msgstr ""
 
-#: ../../mod/invite.php:144
-msgid ""
-"You are cordially invited to join me and some other close friends on the Red "
-"Matrix - a revolutionary new decentralized communication and information "
-"tool."
+#: ../../mod/invite.php:132
+msgid "Please join my community on RedMatrix."
 msgstr ""
 
-#: ../../mod/invite.php:146
-msgid "You will need to supply this invitation code: $invite_code"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
 msgstr ""
 
-#: ../../mod/invite.php:147
-msgid "Please visit my channel at"
+#: ../../mod/invite.php:135
+msgid "1. Register at any RedMatrix location (they are all inter-connected)"
 msgstr ""
 
-#: ../../mod/invite.php:151
-msgid ""
-"Once you have registered (on ANY Red Matrix site - they are all inter-"
-"connected), please connect with my Red Matrix channel address:"
+#: ../../mod/invite.php:137
+msgid "2. Enter my RedMatrix network address into the site searchbar."
 msgstr ""
 
-#: ../../mod/invite.php:153
-msgid "Click the [Register] link on the following page to join."
+#: ../../mod/invite.php:138
+msgid "or visit "
 msgstr ""
 
-#: ../../mod/invite.php:155
-msgid ""
-"For more information about the Red Matrix Project and why it has the "
-"potential to change the internet as we know it, please visit http://getzot."
-"com"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
 msgstr ""
 
 #: ../../mod/thing.php:98
@@ -6627,6 +6669,26 @@ msgstr ""
 msgid "Make Default"
 msgstr ""
 
+#: ../../mod/frphotos.php:79
+msgid "Friendica Photo Album Import"
+msgstr ""
+
+#: ../../mod/frphotos.php:80
+msgid "This will import all your Friendica photo albums to this Red channel."
+msgstr ""
+
+#: ../../mod/frphotos.php:81
+msgid "Friendica Server base URL"
+msgstr ""
+
+#: ../../mod/frphotos.php:82
+msgid "Friendica Login Username"
+msgstr ""
+
+#: ../../mod/frphotos.php:83
+msgid "Friendica Login Password"
+msgstr ""
+
 #: ../../mod/removeme.php:29
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "