X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Fmessages.po;h=415934443c906acba093d2ad396c68a08ecb6ad0;hb=e00068334f414b42cd7a25c594a47efb86d5bb2f;hp=223541ad8364993a2d01994f77dc198daf3429cf;hpb=9acccb2b90ff5276c0cc84b3b006c7a393c53786;p=friendica.git

diff --git a/util/messages.po b/util/messages.po
index 223541ad83..415934443c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -1,4 +1,4 @@
-# FRIENDIKA Distribuited Social Network
+# FRIENDIKA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # Mike Macgirvin, 2010
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.933\n"
+"Project-Id-Version: 2.1.961\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-29 17:14-0700\n"
+"POT-Creation-Date: 2011-04-27 04:23-0700\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"
@@ -17,8 +17,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
+msgstr ""
+
+#: ../../mod/crepair.php:42
+msgid "Contact settings applied."
+msgstr ""
+
+#: ../../mod/crepair.php:44
+msgid "Contact update failed."
+msgstr ""
+
+#: ../../mod/crepair.php:54 ../../mod/photos.php:89 ../../mod/photos.php:787
+#: ../../mod/editpost.php:10 ../../mod/install.php:93
+#: ../../mod/notifications.php:56 ../../mod/contacts.php:106
+#: ../../mod/settings.php:15 ../../mod/settings.php:20
+#: ../../mod/settings.php:251 ../../mod/manage.php:75 ../../mod/network.php:6
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:21
+#: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57
+#: ../../mod/item.php:679 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144
+#: ../../mod/profile_photo.php:155 ../../mod/message.php:8
+#: ../../mod/message.php:116 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:54
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:221
+#: ../../wip/photos.php:77 ../../wip/photos.php:723 ../../wip/follow2.php:8
+#: ../../wip/group.php:19 ../../wip/photos-chris.php:97
+#: ../../wip/photos-chris.php:770 ../../index.php:265
+msgid "Permission denied."
+msgstr ""
+
+#: ../../mod/crepair.php:68 ../../mod/contacts.php:214
+#: ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
+msgstr ""
+
+#: ../../mod/crepair.php:74
+msgid "Repair Contact Settings"
+msgstr ""
+
+#: ../../mod/crepair.php:76
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact will stop working."
+msgstr ""
+
+#: ../../mod/crepair.php:77
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr ""
+
+#: ../../mod/crepair.php:85
+msgid "Name"
+msgstr ""
+
+#: ../../mod/crepair.php:86
+msgid "Account Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:87
+msgid "Account URL"
+msgstr ""
+
+#: ../../mod/crepair.php:88
+msgid "Friend Request URL"
+msgstr ""
+
+#: ../../mod/crepair.php:89
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: ../../mod/crepair.php:90
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: ../../mod/crepair.php:91
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: ../../mod/crepair.php:100 ../../mod/photos.php:815 ../../mod/photos.php:872
+#: ../../mod/photos.php:1079 ../../mod/photos.php:1122
+#: ../../mod/install.php:133 ../../mod/contacts.php:264
+#: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76
+#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:68
+#: ../../addon/facebook/facebook.php:262
+#: ../../addon/randplace/randplace.php:179
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
+#: ../../addon/twitter/twitter.php:175 ../../include/conversation.php:384
+#: ../../wip/photos.php:754 ../../wip/photos.php:793 ../../wip/photos.php:954
+#: ../../wip/addon/randplace/randplace.php:178 ../../wip/group.php:99
+#: ../../wip/group.php:176 ../../wip/photos-chris.php:801
+#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
+msgid "Submit"
+msgstr ""
+
+#: ../../mod/help.php:27
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:31 ../../include/nav.php:64
+msgid "Help"
+msgstr ""
+
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
+#: ../../mod/dfrn_request.php:644 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
 msgstr ""
 
@@ -38,62 +145,42 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#: ../../mod/dfrn_poll.php:84 ../../mod/dfrn_poll.php:510
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../mod/photos.php:30 ../../wip/photos.php:31
+#: ../../mod/photos.php:34 ../../wip/photos.php:31
 #: ../../wip/photos-chris.php:41
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
-#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1244 ../../include/Photo.php:225
+#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:795
+#: ../../mod/photos.php:864 ../../mod/photos.php:879 ../../mod/photos.php:1248
+#: ../../mod/photos.php:1259 ../../include/Photo.php:225
 #: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:982 ../../include/items.php:985
-#: ../../include/items.php:988 ../../wip/photos.php:35 ../../wip/photos.php:98
-#: ../../wip/photos.php:731 ../../wip/photos.php:785 ../../wip/photos.php:800
-#: ../../wip/photos.php:1111 ../../wip/photos.php:1122
-#: ../../wip/photos-chris.php:45 ../../wip/photos-chris.php:118
-#: ../../wip/photos-chris.php:778 ../../wip/photos-chris.php:832
-#: ../../wip/photos-chris.php:847 ../../wip/photos-chris.php:1158
-#: ../../wip/photos-chris.php:1169
+#: ../../include/items.php:1026 ../../include/items.php:1029
+#: ../../include/items.php:1032 ../../wip/photos.php:35
+#: ../../wip/photos.php:98 ../../wip/photos.php:731 ../../wip/photos.php:785
+#: ../../wip/photos.php:800 ../../wip/photos.php:1111
+#: ../../wip/photos.php:1122 ../../wip/photos-chris.php:45
+#: ../../wip/photos-chris.php:118 ../../wip/photos-chris.php:778
+#: ../../wip/photos-chris.php:832 ../../wip/photos-chris.php:847
+#: ../../wip/photos-chris.php:1158 ../../wip/photos-chris.php:1169
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:85 ../../mod/photos.php:773 ../../mod/editpost.php:10
-#: ../../mod/install.php:93 ../../mod/notifications.php:56
-#: ../../mod/contacts.php:106 ../../mod/settings.php:15
-#: ../../mod/settings.php:20 ../../mod/settings.php:211
-#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:13 ../../mod/register.php:25
-#: ../../mod/regmod.php:16 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
-#: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8
-#: ../../mod/display.php:308 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110
-#: ../../wip/photos.php:77 ../../wip/photos.php:723
-#: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770
-#: ../../index.php:251
-msgid "Permission denied."
-msgstr ""
-
-#: ../../mod/photos.php:95 ../../wip/photos.php:87
+#: ../../mod/photos.php:99 ../../wip/photos.php:87
 #: ../../wip/photos-chris.php:107
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
-#: ../../mod/photos.php:865 ../../mod/register.php:285
-#: ../../mod/register.php:292 ../../mod/register.php:299
+#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:864
+#: ../../mod/photos.php:879 ../../mod/register.php:288
+#: ../../mod/register.php:295 ../../mod/register.php:302
 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
-#: ../../mod/profile_photo.php:227 ../../mod/profile_photo.php:236
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245
 #: ../../wip/photos.php:98 ../../wip/photos.php:493 ../../wip/photos.php:785
 #: ../../wip/photos.php:800 ../../wip/photos-chris.php:118
 #: ../../wip/photos-chris.php:525 ../../wip/photos-chris.php:832
@@ -101,216 +188,208 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:116 ../../wip/photos.php:108
+#: ../../mod/photos.php:120 ../../wip/photos.php:108
 #: ../../wip/photos-chris.php:128
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:859 ../../wip/photos.php:126
+#: ../../mod/photos.php:138 ../../mod/photos.php:873 ../../wip/photos.php:126
 #: ../../wip/photos.php:794 ../../wip/photos-chris.php:146
 #: ../../wip/photos-chris.php:841
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1067 ../../wip/photos.php:192
+#: ../../mod/photos.php:201 ../../mod/photos.php:1080 ../../wip/photos.php:192
 #: ../../wip/photos.php:955 ../../wip/photos-chris.php:212
 #: ../../wip/photos-chris.php:1002
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../mod/photos.php:473 ../../wip/photos.php:442
 #: ../../wip/photos-chris.php:462
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../mod/like.php:110 ../../wip/photos.php:442
+#: ../../mod/photos.php:473 ../../mod/like.php:110
+#: ../../include/conversation.php:20 ../../wip/photos.php:442
 #: ../../wip/photos-chris.php:462
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../mod/photos.php:473 ../../wip/photos.php:442
 #: ../../wip/photos-chris.php:462
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:563 ../../addon/js_upload/js_upload.php:306
 #: ../../wip/photos.php:511 ../../wip/photos-chris.php:555
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:571 ../../mod/profile_photo.php:118
+#: ../../mod/photos.php:575 ../../mod/profile_photo.php:118
 #: ../../mod/wall_upload.php:65 ../../wip/photos.php:520
 #: ../../wip/photos-chris.php:567
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:589 ../../mod/profile_photo.php:232
+#: ../../mod/photos.php:593 ../../mod/profile_photo.php:241
 #: ../../mod/wall_upload.php:82 ../../wip/photos.php:537
 #: ../../wip/photos-chris.php:585
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:661 ../../wip/photos.php:611
-#: ../../wip/photos-chris.php:658
-msgid "No photos selected"
+#: ../../mod/photos.php:665 ../../mod/dfrn_request.php:591
+#: ../../mod/viewcontacts.php:16 ../../mod/display.php:7
+#: ../../mod/search.php:13 ../../mod/directory.php:18
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
-#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/invite.php:64
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
-#: ../../addon/twitter/twitter.php:175 ../../wip/photos.php:754
-#: ../../wip/photos.php:793 ../../wip/photos.php:954
-#: ../../wip/addon/randplace/randplace.php:178 ../../wip/photos-chris.php:801
-#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
-msgid "Submit"
+#: ../../mod/photos.php:675 ../../wip/photos.php:611
+#: ../../wip/photos-chris.php:658
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:808 ../../wip/photos.php:742
+#: ../../mod/photos.php:822 ../../wip/photos.php:742
 #: ../../wip/photos-chris.php:789
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:811 ../../mod/photos.php:854 ../../wip/photos.php:745
+#: ../../mod/photos.php:825 ../../mod/photos.php:868 ../../wip/photos.php:745
 #: ../../wip/photos.php:789 ../../wip/photos-chris.php:792
 #: ../../wip/photos-chris.php:836
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:812 ../../wip/photos.php:746
+#: ../../mod/photos.php:826 ../../wip/photos.php:746
 #: ../../wip/photos-chris.php:793
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../wip/photos.php:749
+#: ../../mod/photos.php:828 ../../mod/photos.php:1075 ../../wip/photos.php:749
 #: ../../wip/photos-chris.php:796
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:869 ../../wip/photos.php:804
+#: ../../mod/photos.php:883 ../../wip/photos.php:804
 #: ../../wip/photos-chris.php:851
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:879 ../../mod/photos.php:1263 ../../wip/photos.php:814
+#: ../../mod/photos.php:893 ../../mod/photos.php:1277 ../../wip/photos.php:814
 #: ../../wip/photos.php:1141 ../../wip/photos-chris.php:861
 #: ../../wip/photos-chris.php:1188
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:909 ../../wip/photos.php:843
+#: ../../mod/photos.php:922 ../../wip/photos.php:843
 #: ../../wip/photos-chris.php:890
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:956 ../../wip/photos.php:864
+#: ../../mod/photos.php:969 ../../wip/photos.php:864
 #: ../../wip/photos-chris.php:911
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:958
+#: ../../mod/photos.php:971
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:962 ../../mod/network.php:431
-#: ../../mod/profile.php:368 ../../mod/display.php:149
+#: ../../mod/photos.php:975 ../../include/conversation.php:317
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:982
 msgid "<< Prev"
 msgstr ""
 
-#: ../../mod/photos.php:973 ../../wip/photos.php:870
+#: ../../mod/photos.php:986 ../../wip/photos.php:870
 #: ../../wip/photos-chris.php:917
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:977
+#: ../../mod/photos.php:990
 msgid "Next >>"
 msgstr ""
 
-#: ../../mod/photos.php:1036 ../../wip/photos.php:928
+#: ../../mod/photos.php:1049 ../../wip/photos.php:928
 #: ../../wip/photos-chris.php:975
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1046 ../../wip/photos.php:938
+#: ../../mod/photos.php:1059 ../../wip/photos.php:938
 #: ../../wip/photos-chris.php:985
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1055
+#: ../../mod/photos.php:1068
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1058 ../../wip/photos.php:948
+#: ../../mod/photos.php:1071 ../../wip/photos.php:948
 #: ../../wip/photos-chris.php:995
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1060 ../../wip/photos.php:950
+#: ../../mod/photos.php:1073 ../../wip/photos.php:950
 #: ../../wip/photos-chris.php:997
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1064 ../../wip/photos.php:952
+#: ../../mod/photos.php:1077 ../../wip/photos.php:952
 #: ../../wip/photos-chris.php:999
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1084 ../../mod/network.php:475
-#: ../../mod/profile.php:375 ../../mod/display.php:156
+#: ../../mod/photos.php:1097 ../../include/conversation.php:365
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1085 ../../mod/network.php:476
-#: ../../mod/profile.php:376 ../../mod/display.php:157
+#: ../../mod/photos.php:1098 ../../include/conversation.php:366
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1086 ../../mod/network.php:96
-#: ../../mod/network.php:477 ../../mod/profile.php:164
-#: ../../mod/profile.php:377 ../../mod/display.php:158
+#: ../../mod/photos.php:1099 ../../include/conversation.php:367
+#: ../../include/conversation.php:734
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1087 ../../mod/editpost.php:70
-#: ../../mod/network.php:104 ../../mod/network.php:478
-#: ../../mod/message.php:188 ../../mod/message.php:322
-#: ../../mod/profile.php:172 ../../mod/profile.php:378
-#: ../../mod/display.php:159
+#: ../../mod/photos.php:1100 ../../mod/editpost.php:95
+#: ../../mod/message.php:190 ../../mod/message.php:324
+#: ../../include/conversation.php:368 ../../include/conversation.php:743
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1106 ../../mod/photos.php:1146
-#: ../../mod/photos.php:1175 ../../mod/network.php:491
-#: ../../mod/profile.php:390 ../../mod/display.php:171
+#: ../../mod/photos.php:1119 ../../mod/photos.php:1161
+#: ../../mod/photos.php:1190 ../../include/conversation.php:381
 #: ../../wip/photos.php:986 ../../wip/photos.php:1025
 #: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033
 #: ../../wip/photos-chris.php:1072 ../../wip/photos-chris.php:1100
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1203 ../../mod/network.php:500 ../../mod/group.php:137
-#: ../../mod/profile.php:436 ../../mod/display.php:238
+#: ../../mod/photos.php:1121 ../../include/conversation.php:383
+#: ../../boot.php:373
+msgid "Comment"
+msgstr ""
+
+#: ../../mod/photos.php:1218 ../../mod/group.php:146
+#: ../../include/conversation.php:182 ../../include/conversation.php:394
+#: ../../wip/group.php:162
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1249 ../../wip/photos.php:1127
+#: ../../mod/photos.php:1264 ../../wip/photos.php:1127
 #: ../../wip/photos-chris.php:1174
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1253 ../../wip/photos.php:1131
+#: ../../mod/photos.php:1268 ../../wip/photos.php:1131
 #: ../../wip/photos-chris.php:1178
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1269 ../../wip/photos.php:1147
+#: ../../mod/photos.php:1281 ../../wip/photos.php:1147
 #: ../../wip/photos-chris.php:1194
 msgid "View Album"
 msgstr ""
@@ -323,222 +402,240 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:62 ../../mod/network.php:499
-#: ../../mod/profile.php:414 ../../mod/display.php:222
+#: ../../mod/editpost.php:74 ../../include/conversation.php:723
+msgid "Post to Email"
+msgstr ""
+
+#: ../../mod/editpost.php:87 ../../include/group.php:169
+#: ../../include/conversation.php:392
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:63 ../../mod/network.php:97
-#: ../../mod/message.php:186 ../../mod/message.php:320
-#: ../../mod/profile.php:165
+#: ../../mod/editpost.php:88 ../../mod/message.php:188
+#: ../../mod/message.php:322 ../../include/conversation.php:735
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:64 ../../mod/network.php:98
-#: ../../mod/message.php:187 ../../mod/message.php:321
-#: ../../mod/profile.php:166
+#: ../../mod/editpost.php:89 ../../mod/message.php:189
+#: ../../mod/message.php:323 ../../include/conversation.php:736
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:65 ../../mod/network.php:99
-#: ../../mod/profile.php:167
+#: ../../mod/editpost.php:90 ../../include/conversation.php:737
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editpost.php:66 ../../mod/network.php:100
-#: ../../mod/profile.php:168
+#: ../../mod/editpost.php:91 ../../include/conversation.php:738
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editpost.php:67 ../../mod/network.php:101
-#: ../../mod/profile.php:169
+#: ../../mod/editpost.php:92 ../../include/conversation.php:739
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:68 ../../mod/network.php:102
-#: ../../mod/profile.php:170
+#: ../../mod/editpost.php:93 ../../include/conversation.php:740
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:69 ../../mod/network.php:103
-#: ../../mod/profile.php:171
+#: ../../mod/editpost.php:94 ../../include/conversation.php:741
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:71 ../../mod/network.php:105
-#: ../../mod/profile.php:173
+#: ../../mod/editpost.php:96 ../../include/conversation.php:744
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:77 ../../mod/network.php:111
-#: ../../mod/profile.php:180
+#: ../../mod/editpost.php:102 ../../include/conversation.php:750
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:79 ../../mod/network.php:113
-#: ../../mod/profile.php:182
+#: ../../mod/editpost.php:104 ../../include/conversation.php:752
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
+#: ../../mod/dfrn_request.php:96
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/dfrn_request.php:164
+#: ../../mod/dfrn_request.php:168
 msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:188
+#: ../../mod/dfrn_request.php:192
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:216
+#: ../../mod/dfrn_request.php:220
 msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:241
+#: ../../mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:242
+#: ../../mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:243
+#: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:273
+#: ../../mod/dfrn_request.php:277
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:292
+#: ../../mod/dfrn_request.php:296
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:305
+#: ../../mod/dfrn_request.php:309
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/dfrn_request.php:313
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:330
+#: ../../mod/dfrn_request.php:334
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:336
+#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:16
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
+#: ../../mod/dfrn_request.php:406 ../../mod/contacts.php:90
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:423
+#: ../../mod/dfrn_request.php:427
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:477
+#: ../../mod/dfrn_request.php:481
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:491
+#: ../../mod/dfrn_request.php:495
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
+#: ../../mod/dfrn_request.php:507
+#, php-format
+msgid "Welcome home %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:508
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:509
+msgid "Confirm"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:542 ../../include/items.php:1409
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:543
+#: ../../mod/dfrn_request.php:549
 msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39
-#: ../../mod/register.php:329 ../../mod/register.php:366
-#: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498
-#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
-#: ../../mod/dfrn_notify.php:475 ../../mod/dfrn_confirm.php:649
-#: ../../include/items.php:1373
+#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
+#: ../../mod/lostpass.php:102 ../../mod/register.php:333
+#: ../../mod/register.php:373 ../../mod/regmod.php:94 ../../mod/item.php:480
+#: ../../mod/item.php:506 ../../mod/dfrn_notify.php:189
+#: ../../mod/dfrn_notify.php:405 ../../mod/dfrn_notify.php:495
+#: ../../mod/dfrn_confirm.php:657 ../../include/items.php:1418
 msgid "Administrator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:615
+#: ../../mod/dfrn_request.php:630
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:616
+#: ../../mod/dfrn_request.php:631
+msgid ""
+"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:632
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
+#: ../../mod/dfrn_request.php:633
 msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:618 ../../mod/register.php:436
+#: ../../mod/dfrn_request.php:634 ../../mod/settings.php:350
+#: ../../mod/settings.php:362 ../../mod/register.php:444
+#: ../../mod/profiles.php:355
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:619 ../../mod/register.php:437
+#: ../../mod/dfrn_request.php:635 ../../mod/settings.php:351
+#: ../../mod/settings.php:363 ../../mod/register.php:445
+#: ../../mod/profiles.php:356
 msgid "No"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:620
+#: ../../mod/dfrn_request.php:636
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/dfrn_request.php:637
 msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:622
+#: ../../mod/dfrn_request.php:638
 msgid "Friendika"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
+#: ../../mod/dfrn_request.php:639
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
+#: ../../mod/dfrn_request.php:640
 msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
+#: ../../mod/dfrn_request.php:641
 msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
-msgid "Your profile address:"
+#: ../../mod/dfrn_request.php:642
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:643
 msgid "Submit Request"
 msgstr ""
 
@@ -563,7 +660,7 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
@@ -585,92 +682,137 @@ msgstr ""
 msgid "Welcome to Friendika."
 msgstr ""
 
-#: ../../mod/install.php:138
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
+msgstr ""
+
+#: ../../mod/install.php:122
+msgid "Installation"
+msgstr ""
+
+#: ../../mod/install.php:123
+msgid ""
+"In order to install Friendika we need to know how to contact your database."
+msgstr ""
+
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../mod/install.php:125
+msgid ""
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../mod/install.php:126
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../mod/install.php:127
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../mod/install.php:128
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../mod/install.php:129
+msgid "Database Name"
+msgstr ""
+
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../mod/install.php:148
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/install.php:139
+#: ../../mod/install.php:149
 msgid ""
 "This is required. Please adjust the configuration file .htconfig.php "
 "accordingly."
 msgstr ""
 
-#: ../../mod/install.php:146
+#: ../../mod/install.php:156
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/install.php:147
+#: ../../mod/install.php:157
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/install.php:169
+#: ../../mod/install.php:179
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:170
+#: ../../mod/install.php:180
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/install.php:179
+#: ../../mod/install.php:189
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:181
+#: ../../mod/install.php:191
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:183
+#: ../../mod/install.php:193
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:185
+#: ../../mod/install.php:195
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:187
+#: ../../mod/install.php:197
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:198
+#: ../../mod/install.php:208
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:199
+#: ../../mod/install.php:209
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:200
+#: ../../mod/install.php:210
 msgid ""
 "Please check with your site documentation or support people to see if this "
 "situation can be corrected."
 msgstr ""
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:211
 msgid ""
 "If not, you may be required to perform a manual installation. Please see the "
 "file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:210
+#: ../../mod/install.php:220
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:235
 msgid "Errors encountered creating database tables."
 msgstr ""
 
@@ -755,7 +897,7 @@ msgstr ""
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:130
+#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
 msgid "Approve"
 msgstr ""
 
@@ -767,7 +909,11 @@ msgstr ""
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/notifications.php:163
+#: ../../mod/notifications.php:154
+msgid "Deny"
+msgstr ""
+
+#: ../../mod/notifications.php:159
 msgid "No registrations."
 msgstr ""
 
@@ -827,19 +973,15 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
-msgstr ""
-
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:363
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:367
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:371
 msgid "you are a fan of"
 msgstr ""
 
@@ -867,92 +1009,195 @@ msgstr ""
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
+msgstr ""
+
+#: ../../mod/contacts.php:266
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
+msgstr ""
+
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
+msgstr ""
+
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
+msgstr ""
+
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
+msgstr ""
+
+#: ../../mod/contacts.php:271
+msgid ""
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
+msgstr ""
+
+#: ../../mod/contacts.php:272
 msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:273
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:266
+#: ../../mod/contacts.php:274
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
+msgid "Repair contact URL settings"
+msgstr ""
+
+#: ../../mod/contacts.php:276
+msgid "Repair contact URL settings (WARNING: Advanced)"
+msgstr ""
+
+#: ../../mod/contacts.php:277
+msgid "View conversations"
+msgstr ""
+
+#: ../../mod/contacts.php:278
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:269
+#: ../../mod/contacts.php:280
 msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:281
 msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:283
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:286
 msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:286
 msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:287
 msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:287
 msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:279
+#: ../../mod/contacts.php:290
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:291
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:311 ../../include/nav.php:111
-#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
+#: ../../mod/contacts.php:322 ../../include/nav.php:110
+#: ../../include/acl_selectors.php:141 ../../include/acl_selectors.php:156
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:324
 msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:324
 msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/directory.php:38
+#: ../../mod/contacts.php:326 ../../mod/directory.php:44
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:316
+#: ../../mod/contacts.php:327 ../../mod/directory.php:46
 msgid "Find"
 msgstr ""
 
-#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52
 msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:377
+#: ../../mod/contacts.php:388 ../../include/conversation.php:604
 msgid "Edit contact"
 msgstr ""
 
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
 #: ../../mod/lostpass.php:38
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
+#: ../../mod/lostpass.php:60
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../mod/lostpass.php:78 ../../boot.php:839
+msgid "Password Reset"
+msgstr ""
+
+#: ../../mod/lostpass.php:79
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../mod/lostpass.php:80
+msgid "Your new password is"
+msgstr ""
+
+#: ../../mod/lostpass.php:81
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../mod/lostpass.php:82
+msgid "click here to login"
+msgstr ""
+
+#: ../../mod/lostpass.php:83
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../mod/lostpass.php:114
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../mod/lostpass.php:115
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../mod/lostpass.php:116
+msgid "Nickname or Email: "
+msgstr ""
+
+#: ../../mod/lostpass.php:117
+msgid "Reset"
+msgstr ""
+
 #: ../../mod/settings.php:38
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
@@ -969,58 +1214,252 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:98
+#: ../../mod/settings.php:138
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:100
+#: ../../mod/settings.php:140
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:106
+#: ../../mod/settings.php:146
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:108
+#: ../../mod/settings.php:148
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:166
+#: ../../mod/settings.php:206
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:256 ../../mod/settings.php:418
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:217
+#: ../../mod/settings.php:257 ../../mod/settings.php:417
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:223
+#: ../../mod/settings.php:263
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:270
+#: ../../mod/settings.php:323
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/settings.php:324
+msgid "This account is a normal personal profile"
+msgstr ""
+
+#: ../../mod/settings.php:325
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/settings.php:326
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr ""
+
+#: ../../mod/settings.php:327
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/settings.php:328
+msgid "Automatically approve all connection/friend requests as read-write fans"
+msgstr ""
+
+#: ../../mod/settings.php:329
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: ../../mod/settings.php:330
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr ""
+
+#: ../../mod/settings.php:339
 msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/settings.php:270
+#: ../../mod/settings.php:339
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:302
+#: ../../mod/settings.php:349
+msgid "Publish your default profile in site directory?"
+msgstr ""
+
+#: ../../mod/settings.php:361
+msgid "Publish your default profile in global social directory?"
+msgstr ""
+
+#: ../../mod/settings.php:377
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:345
+#: ../../mod/settings.php:398 ../../mod/profile_photo.php:196
+msgid "or"
+msgstr ""
+
+#: ../../mod/settings.php:403
+msgid "Your Identity Address is"
+msgstr ""
+
+#: ../../mod/settings.php:413
 msgid "Export Personal Data"
 msgstr ""
 
-#: ../../mod/settings.php:363
+#: ../../mod/settings.php:419
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10
+msgid "Full Name:"
+msgstr ""
+
+#: ../../mod/settings.php:421
+msgid "Email Address:"
+msgstr ""
+
+#: ../../mod/settings.php:422
+msgid "Your Timezone:"
+msgstr ""
+
+#: ../../mod/settings.php:423
+msgid "Default Post Location:"
+msgstr ""
+
+#: ../../mod/settings.php:424
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:425
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:427
+msgid "Security and Privacy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:428
+msgid "Maximum Friend Requests/Day:"
+msgstr ""
+
+#: ../../mod/settings.php:429
+msgid "(to prevent spam abuse)"
+msgstr ""
+
+#: ../../mod/settings.php:430
+msgid "Allow friends to post to your profile page:"
+msgstr ""
+
+#: ../../mod/settings.php:431
+msgid "Automatically expire (delete) posts older than"
+msgstr ""
+
+#: ../../mod/settings.php:432 ../../include/datetime.php:154
+msgid "days"
+msgstr ""
+
+#: ../../mod/settings.php:433
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:434
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:435
+msgid "You receive an introduction"
+msgstr ""
+
+#: ../../mod/settings.php:436
+msgid "Your introductions are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:437
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:438
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:439
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:440
+msgid "Password Settings"
+msgstr ""
+
+#: ../../mod/settings.php:441
+msgid "Leave password fields blank unless changing"
+msgstr ""
+
+#: ../../mod/settings.php:442
+msgid "New Password:"
+msgstr ""
+
+#: ../../mod/settings.php:443
+msgid "Confirm:"
+msgstr ""
+
+#: ../../mod/settings.php:444
+msgid "Advanced Page Settings"
+msgstr ""
+
+#: ../../mod/settings.php:459
 msgid "Default Post Permissions"
 msgstr ""
 
+#: ../../mod/settings.php:460
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../mod/settings.php:473
+msgid "Email/Mailbox Setup"
+msgstr ""
+
+#: ../../mod/settings.php:474
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr ""
+
+#: ../../mod/settings.php:475
+msgid "IMAP server name:"
+msgstr ""
+
+#: ../../mod/settings.php:477
+msgid "IMAP port:"
+msgstr ""
+
+#: ../../mod/settings.php:479
+msgid "Security (TLS or SSL):"
+msgstr ""
+
+#: ../../mod/settings.php:481
+msgid "Email login name:"
+msgstr ""
+
+#: ../../mod/settings.php:483
+msgid "Email password:"
+msgstr ""
+
+#: ../../mod/settings.php:484
+msgid "Reply-to address (Optional):"
+msgstr ""
+
+#: ../../mod/settings.php:486
+msgid "Send public posts to all email contacts:"
+msgstr ""
+
+#: ../../mod/settings.php:488
+msgid "Email access is disabled on this site."
+msgstr ""
+
 #: ../../mod/manage.php:37
 #, php-format
 msgid "Welcome back %s"
@@ -1048,118 +1487,134 @@ msgstr ""
 msgid "New Item View"
 msgstr ""
 
-#: ../../mod/network.php:69 ../../mod/message.php:172
-#: ../../mod/profile.php:137
-msgid "Please enter a link URL:"
+#: ../../mod/network.php:64
+#, php-format
+msgid "%d member"
+msgid_plural "%d members"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/network.php:65
+#, php-format
+msgid "Warning: This group contains %s from an insecure network."
 msgstr ""
 
-#: ../../mod/network.php:70 ../../mod/profile.php:138
-msgid "Please enter a YouTube link:"
+#: ../../mod/network.php:66
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:71 ../../mod/profile.php:139
-msgid "Please enter a video(.ogg) link/URL:"
+#: ../../mod/network.php:126
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:72 ../../mod/profile.php:140
-msgid "Please enter an audio(.ogg) link/URL:"
+#: ../../mod/network.php:137
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:73 ../../mod/profile.php:141
-msgid "Where are you right now?"
+#: ../../mod/network.php:141
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:156
-msgid "No such group"
+#: ../../mod/network.php:151
+msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:167
-msgid "Group is empty"
+#: ../../mod/network.php:153
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:171
-msgid "Group: "
+#: ../../mod/network.php:158
+msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/network.php:319 ../../mod/network.php:548
-#: ../../mod/profile.php:457 ../../mod/display.php:262
-#: ../../mod/search.php:116
-msgid "View $name's profile"
+#: ../../mod/network.php:257 ../../mod/register.php:450
+#: ../../mod/profile.php:262 ../../mod/display.php:147
+msgid ""
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../mod/network.php:334 ../../mod/search.php:131
-msgid "View in context"
+#: ../../mod/group.php:27 ../../wip/group.php:29
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/network.php:397
-msgid "See more posts like this"
+#: ../../mod/group.php:33 ../../wip/group.php:35
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/network.php:416 ../../mod/profile.php:357
-#, php-format
-msgid "See all %d comments"
+#: ../../mod/group.php:43 ../../mod/group.php:115 ../../wip/group.php:45
+#: ../../wip/group.php:137
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/network.php:549 ../../mod/display.php:263
-msgid "View $owner_name's profile"
+#: ../../mod/group.php:56 ../../wip/group.php:58
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/network.php:550 ../../mod/display.php:264
-msgid "to"
+#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../wip/group.php:90
+#: ../../index.php:264
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/network.php:551 ../../mod/display.php:265
-msgid "Wall-to-Wall"
+#: ../../mod/group.php:74 ../../wip/group.php:97
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/network.php:552 ../../mod/display.php:266
-msgid "via Wall-To-Wall:"
+#: ../../mod/group.php:75 ../../mod/group.php:158 ../../wip/group.php:98
+#: ../../wip/group.php:174
+msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/network.php:593 ../../mod/register.php:442
-#: ../../mod/profile.php:490 ../../mod/display.php:317
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/group.php:90 ../../wip/group.php:113
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../mod/group.php:92 ../../wip/group.php:115
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../mod/group.php:156 ../../mod/profperm.php:96
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../mod/group.php:157 ../../wip/group.php:173
+msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../mod/group.php:169
+msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
+#: ../../mod/group.php:183
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/group.php:88 ../../index.php:250
-msgid "Permission denied"
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:46
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Group removed."
+#: ../../mod/profperm.php:92
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/group.php:109
-msgid "Unable to remove group."
+#: ../../mod/profperm.php:94 ../../mod/profile.php:113
+#: ../../include/profile_advanced.php:7
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:17 ../../boot.php:2041
+#: ../../mod/profperm.php:105
+msgid "Visible To"
+msgstr ""
+
+#: ../../mod/profperm.php:116
+msgid "All Contacts (with secure profile access)"
+msgstr ""
+
+#: ../../mod/viewcontacts.php:25 ../../boot.php:1999
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
+#: ../../mod/viewcontacts.php:40
 msgid "No contacts."
 msgstr ""
 
@@ -1179,128 +1634,130 @@ msgstr ""
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:89
-msgid "That doesn\\'t appear to be your full (First Last) name."
+#: ../../mod/register.php:91
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:92
+#: ../../mod/register.php:95
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:95
+#: ../../mod/register.php:98
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:104
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:109
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:112 ../../mod/register.php:212
+#: ../../mod/register.php:115 ../../mod/register.php:215
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:131
+#: ../../mod/register.php:134
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:198
+#: ../../mod/register.php:201
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:237
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:328 ../../mod/regmod.php:92
+#: ../../mod/register.php:331 ../../mod/regmod.php:92
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:333
+#: ../../mod/register.php:339
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:337
+#: ../../mod/register.php:343
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:342
+#: ../../mod/register.php:348
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:365
+#: ../../mod/register.php:371
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:369
+#: ../../mod/register.php:377
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:417
+#: ../../mod/register.php:425
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:418
+#: ../../mod/register.php:426
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:419
+#: ../../mod/register.php:427
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:433
+#: ../../mod/register.php:441
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:449
+#: ../../mod/register.php:457
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:457
+#: ../../mod/register.php:465
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:458
+#: ../../mod/register.php:466
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:459
+#: ../../mod/register.php:467
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:460
+#: ../../mod/register.php:468
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:463 ../../include/nav.php:61 ../../boot.php:811
+#: ../../mod/register.php:471 ../../include/nav.php:59 ../../boot.php:822
 msgid "Register"
 msgstr ""
 
-#: ../../mod/like.php:110
+#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:679
+#: ../../include/conversation.php:20
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:127
+#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:683
+#: ../../include/conversation.php:25
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:129
+#: ../../mod/like.php:129 ../../include/conversation.php:28
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
@@ -1353,7 +1810,7 @@ msgstr ""
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/regmod.php:96
+#: ../../mod/regmod.php:99
 msgid "Account approved."
 msgstr ""
 
@@ -1361,52 +1818,53 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:126
+#: ../../mod/item.php:128
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:212 ../../mod/message.php:93
+#: ../../mod/item.php:214 ../../mod/message.php:93
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
 #: ../../mod/wall_upload.php:95
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:474
+#: ../../mod/item.php:478
 #, php-format
 msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/item.php:497
+#: ../../mod/item.php:504
 #, php-format
 msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/item.php:523
+#: ../../mod/item.php:534
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:541
+#: ../../mod/item.php:553
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/item.php:543
-msgid "You may visit them online at"
+#: ../../mod/item.php:555
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:545
+#: ../../mod/item.php:556
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:547
+#: ../../mod/item.php:558
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:312
+#: ../../mod/item.php:609 ../../mod/display.php:25 ../../mod/display.php:142
 msgid "Item not found."
 msgstr ""
 
@@ -1414,34 +1872,54 @@ msgstr ""
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:239
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr ""
+
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/profile_photo.php:193
+msgid "Upload File:"
+msgstr ""
+
+#: ../../mod/profile_photo.php:194
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../mod/profile_photo.php:195
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/profile_photo.php:196
+msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/profile_photo.php:196
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:200
+#: ../../mod/profile_photo.php:209
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:201
+#: ../../mod/profile_photo.php:210
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:202
+#: ../../mod/profile_photo.php:211
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:230
+#: ../../mod/profile_photo.php:239
 msgid "Image uploaded successfully."
 msgstr ""
 
@@ -1479,7 +1957,7 @@ msgstr ""
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/message.php:125 ../../include/nav.php:100
+#: ../../mod/message.php:125 ../../include/nav.php:102
 msgid "Messages"
 msgstr ""
 
@@ -1503,98 +1981,110 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:178
+#: ../../mod/message.php:172 ../../include/conversation.php:690
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/message.php:180
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/message.php:179 ../../mod/message.php:313
+#: ../../mod/message.php:181 ../../mod/message.php:315
 msgid "To:"
 msgstr ""
 
-#: ../../mod/message.php:180 ../../mod/message.php:314
+#: ../../mod/message.php:182 ../../mod/message.php:316
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
+#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:63
 msgid "Your message:"
 msgstr ""
 
-#: ../../mod/message.php:222
+#: ../../mod/message.php:224
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:235
+#: ../../mod/message.php:237
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:265
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:267
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:302
+#: ../../mod/message.php:304
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:312
+#: ../../mod/message.php:314
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/profile.php:8 ../../boot.php:2213
+#: ../../mod/profile.php:11 ../../boot.php:2201
 msgid "No profile"
 msgstr ""
 
-#: ../../mod/profile.php:102
+#: ../../mod/profile.php:112
 msgid "Status"
 msgstr ""
 
-#: ../../mod/profile.php:103
-msgid "Profile"
-msgstr ""
-
-#: ../../mod/profile.php:104
+#: ../../mod/profile.php:114
 msgid "Photos"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../mod/openid.php:62 ../../mod/openid.php:118 ../../include/auth.php:105
 #: ../../include/auth.php:130 ../../include/auth.php:183
 msgid "Login failed."
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
+#: ../../mod/openid.php:78 ../../include/auth.php:199
+msgid "Welcome "
+msgstr ""
+
+#: ../../mod/openid.php:79 ../../include/auth.php:200
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../mod/openid.php:82 ../../include/auth.php:203
 msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/follow.php:173
+#: ../../mod/follow.php:39 ../../wip/follow2.php:186
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/follow.php:179
+#: ../../mod/follow.php:45 ../../wip/follow2.php:192
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: ../../mod/follow.php:230
+#: ../../mod/follow.php:100 ../../wip/follow2.php:247
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/follow.php:276
+#: ../../mod/follow.php:146 ../../wip/follow2.php:293
 msgid "following"
 msgstr ""
 
-#: ../../mod/display.php:305
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:179
+#: ../../mod/dfrn_notify.php:191
 msgid "noreply"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:237
+#: ../../mod/dfrn_notify.php:249
 msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:493
 #, php-format
 msgid "%s commented on an item at %s"
 msgstr ""
@@ -1603,11 +2093,11 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
-#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2058
+#: ../../mod/search.php:26 ../../include/nav.php:71 ../../boot.php:2045
 msgid "Search"
 msgstr ""
 
-#: ../../mod/search.php:54
+#: ../../mod/search.php:69
 msgid "No results."
 msgstr ""
 
@@ -1640,29 +2130,205 @@ msgstr ""
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:370
+#: ../../mod/profiles.php:354
+msgid "Hide my contact/friend list from viewers of this profile?"
+msgstr ""
+
+#: ../../mod/profiles.php:369
+msgid "Edit Profile Details"
+msgstr ""
+
+#: ../../mod/profiles.php:371
+msgid "View this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:372
+msgid "Create a new profile using these settings"
+msgstr ""
+
+#: ../../mod/profiles.php:373
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:374
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:375
+msgid "Profile Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:376
+msgid "Your Full Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:377
+msgid "Title/Description:"
+msgstr ""
+
+#: ../../mod/profiles.php:378
+msgid "Your Gender:"
+msgstr ""
+
+#: ../../mod/profiles.php:379
+msgid "Birthday (y/m/d):"
+msgstr ""
+
+#: ../../mod/profiles.php:380
+msgid "Street Address:"
+msgstr ""
+
+#: ../../mod/profiles.php:381
+msgid "Locality/City:"
+msgstr ""
+
+#: ../../mod/profiles.php:382
+msgid "Postal/Zip Code:"
+msgstr ""
+
+#: ../../mod/profiles.php:383
+msgid "Country:"
+msgstr ""
+
+#: ../../mod/profiles.php:384
+msgid "Region/State:"
+msgstr ""
+
+#: ../../mod/profiles.php:385
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr ""
+
+#: ../../mod/profiles.php:386
+msgid "Who: (if applicable)"
+msgstr ""
+
+#: ../../mod/profiles.php:387
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../mod/profiles.php:389
+msgid "Homepage URL:"
+msgstr ""
+
+#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
+msgid "Political Views:"
+msgstr ""
+
+#: ../../mod/profiles.php:391
+msgid "Religious Views:"
+msgstr ""
+
+#: ../../mod/profiles.php:392
+msgid "Public Keywords:"
+msgstr ""
+
+#: ../../mod/profiles.php:393
+msgid "Private Keywords:"
+msgstr ""
+
+#: ../../mod/profiles.php:394
+msgid "Example: fishing photography software"
+msgstr ""
+
+#: ../../mod/profiles.php:395
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr ""
+
+#: ../../mod/profiles.php:396
+msgid "(Used for searching profiles, never shown to others)"
+msgstr ""
+
+#: ../../mod/profiles.php:397
+msgid "Tell us about yourself..."
+msgstr ""
+
+#: ../../mod/profiles.php:398
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:399
+msgid "Contact information and Social Networks"
+msgstr ""
+
+#: ../../mod/profiles.php:400
+msgid "Musical interests"
+msgstr ""
+
+#: ../../mod/profiles.php:401
+msgid "Books, literature"
+msgstr ""
+
+#: ../../mod/profiles.php:402
+msgid "Television"
+msgstr ""
+
+#: ../../mod/profiles.php:403
+msgid "Film/dance/culture/entertainment"
+msgstr ""
+
+#: ../../mod/profiles.php:404
+msgid "Love/romance"
+msgstr ""
+
+#: ../../mod/profiles.php:405
+msgid "Work/employment"
+msgstr ""
+
+#: ../../mod/profiles.php:406
+msgid "School/education"
+msgstr ""
+
+#: ../../mod/profiles.php:411
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:380 ../../mod/directory.php:89
+#: ../../mod/profiles.php:421 ../../mod/directory.php:97
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:422
+#: ../../mod/profiles.php:456 ../../include/nav.php:109
+msgid "Profiles"
+msgstr ""
+
+#: ../../mod/profiles.php:457
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../mod/profiles.php:458
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../mod/profiles.php:468
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/directory.php:32
+#: ../../mod/profiles.php:470
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../mod/profiles.php:471
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../mod/directory.php:38
 msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:92
+#: ../../mod/directory.php:45
+msgid "Site Directory"
+msgstr ""
+
+#: ../../mod/directory.php:100
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:118
+#: ../../mod/directory.php:126
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -1676,36 +2342,36 @@ msgstr ""
 msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/invite.php:38
+#: ../../mod/invite.php:42
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/invite.php:42
+#: ../../mod/invite.php:46
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/invite.php:57
+#: ../../mod/invite.php:61
 msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/invite.php:58
+#: ../../mod/invite.php:62
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/invite.php:60
+#: ../../mod/invite.php:64
 #, php-format
 msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/invite.php:61
+#: ../../mod/invite.php:65
 msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/invite.php:62
+#: ../../mod/invite.php:66
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
@@ -1739,86 +2405,97 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:426
-msgid "is now friends with"
+#: ../../mod/dfrn_confirm.php:430 ../../include/conversation.php:61
+#, php-format
+msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:494
+#: ../../mod/dfrn_confirm.php:501
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:504
+#: ../../mod/dfrn_confirm.php:511
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:515
+#: ../../mod/dfrn_confirm.php:522
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:527
+#: ../../mod/dfrn_confirm.php:534
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:555
+#: ../../mod/dfrn_confirm.php:562
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:566
+#: ../../mod/dfrn_confirm.php:573
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:626
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:648
+#: ../../mod/dfrn_confirm.php:655
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:116
+#: ../../addon/facebook/facebook.php:227
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:124
+#: ../../addon/facebook/facebook.php:235
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:131
+#: ../../addon/facebook/facebook.php:242
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
+#: ../../addon/facebook/facebook.php:248
+msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
+#: ../../addon/facebook/facebook.php:255
+msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:150
+#: ../../addon/facebook/facebook.php:261
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:174
+#: ../../addon/facebook/facebook.php:319
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:175
+#: ../../addon/facebook/facebook.php:320
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:189
+#: ../../addon/facebook/facebook.php:334
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:230
+#: ../../addon/facebook/facebook.php:396
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:441
 msgid "Image: "
 msgstr ""
 
+#: ../../addon/facebook/facebook.php:489
+msgid "View on Friendika"
+msgstr ""
+
 #: ../../addon/tictac/tictac.php:14
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
@@ -2030,6 +2707,78 @@ msgstr ""
 msgid "Send public postings to Twitter"
 msgstr ""
 
+#: ../../include/profile_advanced.php:23 ../../boot.php:2287
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1071
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/profile_advanced.php:46
+msgid "j F"
+msgstr ""
+
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:103 ../../boot.php:2293
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:138
+msgid "About:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
+msgstr ""
+
 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr ""
@@ -2294,54 +3043,50 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/group.php:130
+#: ../../include/group.php:146
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/group.php:131
+#: ../../include/group.php:147
 msgid "Everybody"
 msgstr ""
 
-#: ../../include/nav.php:38 ../../boot.php:839
+#: ../../include/nav.php:41 ../../boot.php:850
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:44 ../../boot.php:819 ../../boot.php:825
+#: ../../include/nav.php:44 ../../boot.php:830 ../../boot.php:836
 msgid "Login"
 msgstr ""
 
-#: ../../include/nav.php:56 ../../include/nav.php:91
+#: ../../include/nav.php:55 ../../include/nav.php:93
 msgid "Home"
 msgstr ""
 
-#: ../../include/nav.php:64
+#: ../../include/nav.php:68
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:81
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:91
 msgid "Network"
 msgstr ""
 
-#: ../../include/nav.php:96
+#: ../../include/nav.php:99
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:104
+#: ../../include/nav.php:105
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:107
+#: ../../include/nav.php:108
 msgid "Settings"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Profiles"
-msgstr ""
-
 #: ../../include/auth.php:27
 msgid "Logged out."
 msgstr ""
@@ -2382,10 +3127,6 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:154
-msgid "days"
-msgstr ""
-
 #: ../../include/datetime.php:155
 msgid "hour"
 msgstr ""
@@ -2419,245 +3160,308 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/acl_selectors.php:132
+#: ../../include/acl_selectors.php:133
 msgid "Visible To:"
 msgstr ""
 
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152
 msgid "Groups"
 msgstr ""
 
-#: ../../include/acl_selectors.php:147
+#: ../../include/acl_selectors.php:148
 msgid "Except For:"
 msgstr ""
 
-#: ../../include/items.php:1027
-msgid "Birthday:"
+#: ../../include/notifier.php:414
+msgid "(no subject)"
 msgstr ""
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1416
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../boot.php:359
-msgid "Delete this item?"
-msgstr ""
-
-#: ../../boot.php:360
-msgid "Comment"
+#: ../../include/conversation.php:192 ../../include/conversation.php:459
+#: ../../include/conversation.php:460
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../boot.php:810
-msgid "Create a New Account"
+#: ../../include/conversation.php:208
+msgid "View in context"
 msgstr ""
 
-#: ../../boot.php:817
-msgid "Nickname or Email address: "
+#: ../../include/conversation.php:279
+msgid "See more posts like this"
 msgstr ""
 
-#: ../../boot.php:818
-msgid "Password: "
+#: ../../include/conversation.php:304
+#, php-format
+msgid "See all %d comments"
 msgstr ""
 
-#: ../../boot.php:823
-msgid "Nickname/Email/OpenID: "
+#: ../../include/conversation.php:461
+msgid "to"
 msgstr ""
 
-#: ../../boot.php:824
-msgid "Password (if not OpenID): "
+#: ../../include/conversation.php:462
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../boot.php:827
-msgid "Forgot your password?"
+#: ../../include/conversation.php:463
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../boot.php:828
-msgid "Password Reset"
+#: ../../include/conversation.php:600
+msgid "View status"
 msgstr ""
 
-#: ../../boot.php:1080
-msgid "prev"
+#: ../../include/conversation.php:601
+msgid "View profile"
 msgstr ""
 
-#: ../../boot.php:1082
-msgid "first"
+#: ../../include/conversation.php:602
+msgid "View photos"
 msgstr ""
 
-#: ../../boot.php:1111
-msgid "last"
+#: ../../include/conversation.php:603
+msgid "View recent"
 msgstr ""
 
-#: ../../boot.php:1114
-msgid "next"
+#: ../../include/conversation.php:605
+msgid "Send PM"
 msgstr ""
 
-#: ../../boot.php:1840
+#: ../../include/conversation.php:655
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../boot.php:1840
+#: ../../include/conversation.php:655
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../boot.php:1844
+#: ../../include/conversation.php:659
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../boot.php:1846
+#: ../../include/conversation.php:661
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../boot.php:1852
+#: ../../include/conversation.php:667
 msgid "and"
 msgstr ""
 
-#: ../../boot.php:1855
+#: ../../include/conversation.php:670
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../boot.php:1856
+#: ../../include/conversation.php:671
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../boot.php:1856
+#: ../../include/conversation.php:671
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../boot.php:2017
+#: ../../include/conversation.php:691
+msgid "Please enter a YouTube link:"
+msgstr ""
+
+#: ../../include/conversation.php:692
+msgid "Please enter a video(.ogg) link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:693
+msgid "Please enter an audio(.ogg) link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:694
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:695
+msgid "Enter a title for this item"
+msgstr ""
+
+#: ../../include/conversation.php:742
+msgid "Set title"
+msgstr ""
+
+#: ../../boot.php:372
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../boot.php:821
+msgid "Create a New Account"
+msgstr ""
+
+#: ../../boot.php:828
+msgid "Nickname or Email address: "
+msgstr ""
+
+#: ../../boot.php:829
+msgid "Password: "
+msgstr ""
+
+#: ../../boot.php:834
+msgid "Nickname/Email/OpenID: "
+msgstr ""
+
+#: ../../boot.php:835
+msgid "Password (if not OpenID): "
+msgstr ""
+
+#: ../../boot.php:838
+msgid "Forgot your password?"
+msgstr ""
+
+#: ../../boot.php:1091
+msgid "prev"
+msgstr ""
+
+#: ../../boot.php:1093
+msgid "first"
+msgstr ""
+
+#: ../../boot.php:1122
+msgid "last"
+msgstr ""
+
+#: ../../boot.php:1125
+msgid "next"
+msgstr ""
+
+#: ../../boot.php:1986
 msgid "No contacts"
 msgstr ""
 
-#: ../../boot.php:2025
+#: ../../boot.php:1994
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../boot.php:2270
+#: ../../boot.php:2260
 msgid "Connect"
 msgstr ""
 
-#: ../../boot.php:2280
+#: ../../boot.php:2275
 msgid "Location:"
 msgstr ""
 
-#: ../../boot.php:2284
+#: ../../boot.php:2279
 msgid ", "
 msgstr ""
 
-#: ../../boot.php:2292
-msgid "Gender:"
-msgstr ""
-
-#: ../../boot.php:2296
+#: ../../boot.php:2291
 msgid "Status:"
 msgstr ""
 
-#: ../../boot.php:2298
-msgid "Homepage:"
-msgstr ""
-
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Monday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Tuesday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Wednesday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Thursday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Friday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Saturday"
 msgstr ""
 
-#: ../../boot.php:2389
+#: ../../boot.php:2384
 msgid "Sunday"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "January"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "February"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "March"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "April"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "May"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "June"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "July"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "August"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "September"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "October"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "November"
 msgstr ""
 
-#: ../../boot.php:2393
+#: ../../boot.php:2388
 msgid "December"
 msgstr ""
 
-#: ../../boot.php:2427
+#: ../../boot.php:2403
+msgid "g A l F d"
+msgstr ""
+
+#: ../../boot.php:2420
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:2428
+#: ../../boot.php:2421
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:2429
+#: ../../boot.php:2422
 msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../boot.php:2440
+#: ../../boot.php:2433
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:2637
+#: ../../boot.php:2634
 msgid "link to source"
 msgstr ""
 
@@ -2681,10 +3485,18 @@ msgstr ""
 msgid "Server error. Upload directory isn"
 msgstr ""
 
-#: ../../index.php:194
+#: ../../wip/group.php:81
+msgid "Membership list updated."
+msgstr ""
+
+#: ../../wip/group.php:175
+msgid "Members:"
+msgstr ""
+
+#: ../../index.php:208
 msgid "Not Found"
 msgstr ""
 
-#: ../../index.php:195
+#: ../../index.php:209
 msgid "Page not found."
 msgstr ""