merged multipart email changes

[friendica.git] / util / messages.po

diff --git a/util/messages.po b/util/messages.po
index 23f250da2075fad65caa235ac4cbfcf7ebef5b25..316aab96d225e02fa5e28b72b5deed85c81c0c9b 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: 2.1.942\n"
+"Project-Id-Version: 2.2.975\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-04-08 12:29+0200\n"
+"POT-Creation-Date: 2011-05-10 14:13+0200\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -16,308 +16,250 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

 
 

-#: ../../index.php:208
+#: ../../index.php:210

 msgid "Not Found"
 msgstr ""
 
 msgid "Not Found"
 msgstr ""
 

-#: ../../index.php:209
+#: ../../index.php:211

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 

-#: ../../index.php:264 ../../mod/group.php:88
+#: ../../index.php:266 ../../mod/profperm.php:19 ../../mod/group.php:67

 msgid "Permission denied"
 msgstr ""
 
 msgid "Permission denied"
 msgstr ""
 

-#: ../../index.php:265 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../index.php:267 ../../mod/manage.php:75 ../../mod/wall_upload.php:42

 #: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
 #: ../../mod/follow.php:8 ../../mod/profile_photo.php:19

-#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144
+#: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16

 #: ../../mod/profiles.php:7 ../../mod/profiles.php:227
 #: ../../mod/settings.php:15 ../../mod/settings.php:20
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:227
 #: ../../mod/settings.php:15 ../../mod/settings.php:20

-#: ../../mod/settings.php:211 ../../mod/photos.php:85 ../../mod/photos.php:773
-#: ../../mod/display.php:311 ../../mod/editpost.php:10 ../../mod/invite.php:13
-#: ../../mod/invite.php:50 ../../mod/contacts.php:106
+#: ../../mod/settings.php:251 ../../mod/photos.php:89 ../../mod/photos.php:798
+#: ../../mod/display.php:138 ../../mod/editpost.php:10 ../../mod/invite.php:13
+#: ../../mod/invite.php:54 ../../mod/contacts.php:106

 #: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
 #: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6

-#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
-#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
+#: ../../mod/notifications.php:56 ../../mod/crepair.php:54
+#: ../../mod/item.php:57 ../../mod/item.php:680 ../../mod/message.php:8
+#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53
+#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19
+#: ../../addon/facebook/facebook.php:246

 msgid "Permission denied."
 msgstr ""
 
 msgid "Permission denied."
 msgstr ""
 

-#: ../../boot.php:359
+#: ../../boot.php:385

 msgid "Delete this item?"
 msgstr ""
 
 msgid "Delete this item?"
 msgstr ""
 

-#: ../../boot.php:360 ../../mod/profile.php:387 ../../mod/photos.php:1108
-#: ../../mod/display.php:173 ../../mod/network.php:505
+#: ../../boot.php:386 ../../mod/photos.php:1130 ../../mod/photos.php:1169
+#: ../../mod/photos.php:1200 ../../include/conversation.php:375

 msgid "Comment"
 msgstr ""
 
 msgid "Comment"
 msgstr ""
 

-#: ../../boot.php:813
+#: ../../boot.php:834

 msgid "Create a New Account"
 msgstr ""
 
 msgid "Create a New Account"
 msgstr ""
 

-#: ../../boot.php:814 ../../mod/register.php:463 ../../include/nav.php:62
+#: ../../boot.php:835 ../../mod/register.php:471 ../../include/nav.php:59

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: ../../boot.php:820
+#: ../../boot.php:841

 msgid "Nickname or Email address: "
 msgstr ""
 
 msgid "Nickname or Email address: "
 msgstr ""
 

-#: ../../boot.php:821
+#: ../../boot.php:842

 msgid "Password: "
 msgstr ""
 
 msgid "Password: "
 msgstr ""
 

-#: ../../boot.php:822 ../../boot.php:828 ../../include/nav.php:45
+#: ../../boot.php:843 ../../boot.php:849 ../../include/nav.php:44

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: ../../boot.php:826
+#: ../../boot.php:847

 msgid "Nickname/Email/OpenID: "
 msgstr ""
 
 msgid "Nickname/Email/OpenID: "
 msgstr ""
 

-#: ../../boot.php:827
+#: ../../boot.php:848

 msgid "Password (if not OpenID): "
 msgstr ""
 
 msgid "Password (if not OpenID): "
 msgstr ""
 

-#: ../../boot.php:830
+#: ../../boot.php:851

 msgid "Forgot your password?"
 msgstr ""
 
 msgid "Forgot your password?"
 msgstr ""
 

-#: ../../boot.php:831 ../../mod/lostpass.php:74
+#: ../../boot.php:852 ../../mod/lostpass.php:78

 msgid "Password Reset"
 msgstr ""
 
 msgid "Password Reset"
 msgstr ""
 

-#: ../../boot.php:842 ../../include/nav.php:39
+#: ../../boot.php:865 ../../include/nav.php:41

 msgid "Logout"
 msgstr ""
 
 msgid "Logout"
 msgstr ""
 

-#: ../../boot.php:1083
+#: ../../boot.php:1106

 msgid "prev"
 msgstr ""
 
 msgid "prev"
 msgstr ""
 

-#: ../../boot.php:1085
+#: ../../boot.php:1108

 msgid "first"
 msgstr ""
 
 msgid "first"
 msgstr ""
 

-#: ../../boot.php:1114
+#: ../../boot.php:1137

 msgid "last"
 msgstr ""
 
 msgid "last"
 msgstr ""
 

-#: ../../boot.php:1117
+#: ../../boot.php:1140

 msgid "next"
 msgstr ""
 
 msgid "next"
 msgstr ""
 

-#: ../../boot.php:1848
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../boot.php:1848
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../boot.php:1852
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr ""
-
-#: ../../boot.php:1854
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr ""
-
-#: ../../boot.php:1860
-msgid "and"
-msgstr ""
-
-#: ../../boot.php:1863
-#, php-format
-msgid ", and %d other people"
-msgstr ""
-
-#: ../../boot.php:1864
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../boot.php:1864
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../boot.php:2025
+#: ../../boot.php:2001

 msgid "No contacts"
 msgstr ""
 
 msgid "No contacts"
 msgstr ""
 

-#: ../../boot.php:2033
+#: ../../boot.php:2009

 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../boot.php:2049 ../../mod/viewcontacts.php:17
+#: ../../boot.php:2014 ../../mod/viewcontacts.php:25

 msgid "View Contacts"
 msgstr ""
 
 msgid "View Contacts"
 msgstr ""
 

-#: ../../boot.php:2066 ../../mod/search.php:17 ../../include/nav.php:68
+#: ../../boot.php:2060 ../../mod/search.php:26 ../../include/nav.php:71

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: ../../boot.php:2221 ../../mod/profile.php:8
+#: ../../boot.php:2216 ../../mod/profile.php:11

 msgid "No profile"
 msgstr ""
 
 msgid "No profile"
 msgstr ""
 

-#: ../../boot.php:2278
+#: ../../boot.php:2275

 msgid "Connect"
 msgstr ""
 
 msgid "Connect"
 msgstr ""
 

-#: ../../boot.php:2288
+#: ../../boot.php:2290

 msgid "Location:"
 msgstr ""
 
 msgid "Location:"
 msgstr ""
 

-#: ../../boot.php:2292
+#: ../../boot.php:2294

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 

-#: ../../boot.php:2300 ../../include/profile_advanced.php:23
+#: ../../boot.php:2302 ../../include/profile_advanced.php:23

 msgid "Gender:"
 msgstr ""
 
 msgid "Gender:"
 msgstr ""
 

-#: ../../boot.php:2304
+#: ../../boot.php:2306

 msgid "Status:"
 msgstr ""
 
 msgid "Status:"
 msgstr ""
 

-#: ../../boot.php:2306 ../../include/profile_advanced.php:103
+#: ../../boot.php:2308 ../../include/profile_advanced.php:103

 msgid "Homepage:"
 msgstr ""
 
 msgid "Homepage:"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Monday"
 msgstr ""
 
 msgid "Monday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Tuesday"
 msgstr ""
 
 msgid "Tuesday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Wednesday"
 msgstr ""
 
 msgid "Wednesday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Thursday"
 msgstr ""
 
 msgid "Thursday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Friday"
 msgstr ""
 
 msgid "Friday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Saturday"
 msgstr ""
 
 msgid "Saturday"
 msgstr ""
 

-#: ../../boot.php:2397
+#: ../../boot.php:2399

 msgid "Sunday"
 msgstr ""
 
 msgid "Sunday"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 

-#: ../../boot.php:2401
+#: ../../boot.php:2403

 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 

-#: ../../boot.php:2416
+#: ../../boot.php:2418

 msgid "g A l F d"
 msgstr ""
 
 msgid "g A l F d"
 msgstr ""
 

-#: ../../boot.php:2433
+#: ../../boot.php:2435

 msgid "Birthday Reminders"
 msgstr ""
 
 msgid "Birthday Reminders"
 msgstr ""
 

-#: ../../boot.php:2434
+#: ../../boot.php:2436

 msgid "Birthdays this week:"
 msgstr ""
 
 msgid "Birthdays this week:"
 msgstr ""
 

-#: ../../boot.php:2435
+#: ../../boot.php:2437

 msgid "(Adjusted for local time)"
 msgstr ""
 
 msgid "(Adjusted for local time)"
 msgstr ""
 

-#: ../../boot.php:2446
+#: ../../boot.php:2448

 msgid "[today]"
 msgstr ""
 
 msgid "[today]"
 msgstr ""
 

-#: ../../boot.php:2643
+#: ../../boot.php:2654

 msgid "link to source"
 msgstr ""
 
 msgid "link to source"
 msgstr ""
 

-#: ../../boot.php:2729
-msgid "View status"
-msgstr ""
-
-#: ../../boot.php:2730
-msgid "View profile"
-msgstr ""
-
-#: ../../boot.php:2731
-msgid "View photos"
-msgstr ""
-
-#: ../../boot.php:2732 ../../mod/contacts.php:385
-msgid "Edit contact"
-msgstr ""
-
-#: ../../boot.php:2733
-msgid "Send PM"
-msgstr ""
-

 #: ../../mod/manage.php:37
 #, php-format
 msgid "Welcome back %s"
 #: ../../mod/manage.php:37
 #, php-format
 msgid "Welcome back %s"


@@ -337,18 +279,19 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
 msgid "Select an identity to manage: "
 msgstr ""
 

-#: ../../mod/manage.php:106 ../../mod/profile.php:388
-#: ../../mod/profiles.php:370 ../../mod/settings.php:364
-#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
-#: ../../mod/photos.php:1109 ../../mod/display.php:174 ../../mod/invite.php:64
+#: ../../mod/manage.php:106 ../../mod/profiles.php:370
+#: ../../mod/settings.php:426 ../../mod/photos.php:826
+#: ../../mod/photos.php:883 ../../mod/photos.php:1091
+#: ../../mod/photos.php:1131 ../../mod/photos.php:1170
+#: ../../mod/photos.php:1201 ../../mod/invite.php:68

 #: ../../mod/contacts.php:264 ../../mod/install.php:133
 #: ../../mod/contacts.php:264 ../../mod/install.php:133

-#: ../../mod/network.php:506 ../../mod/group.php:97 ../../mod/group.php:155
+#: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159

 #: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
 #: ../../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
 #: ../../addon/statusnet/statusnet.php:163
 #: ../../addon/statusnet/statusnet.php:189
 #: ../../addon/statusnet/statusnet.php:207

-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
+#: ../../addon/facebook/facebook.php:293
+#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:376

 msgid "Submit"
 msgstr ""
 
 msgid "Submit"
 msgstr ""
 


@@ -358,214 +301,82 @@ msgid "Image exceeds size limit of %d"
 msgstr ""
 
 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
 msgstr ""
 
 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118

-#: ../../mod/photos.php:571
+#: ../../mod/photos.php:575

 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88

-#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:214

 #: ../../mod/message.php:93
 msgid "Wall Photos"
 msgstr ""
 
 #: ../../mod/message.php:93
 msgid "Wall Photos"
 msgstr ""
 

-#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:236
-#: ../../mod/photos.php:589
+#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241
+#: ../../mod/photos.php:593

 msgid "Image upload failed."
 msgstr ""
 
 msgid "Image upload failed."
 msgstr ""
 

-#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:392
-#: ../../mod/dfrn_notify.php:478 ../../mod/regmod.php:93
-#: ../../mod/register.php:329 ../../mod/register.php:366
-#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
-#: ../../mod/item.php:475 ../../mod/item.php:498
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1420
+#: ../../mod/dfrn_notify.php:189 ../../mod/dfrn_notify.php:405
+#: ../../mod/dfrn_notify.php:495 ../../mod/regmod.php:94
+#: ../../mod/register.php:333 ../../mod/register.php:373
+#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
+#: ../../mod/lostpass.php:102 ../../mod/item.php:480 ../../mod/item.php:506
+#: ../../mod/dfrn_confirm.php:657 ../../include/items.php:1435

 msgid "Administrator"
 msgstr ""
 
 msgid "Administrator"
 msgstr ""
 

-#: ../../mod/dfrn_notify.php:179
+#: ../../mod/dfrn_notify.php:191

 msgid "noreply"
 msgstr ""
 
 msgid "noreply"
 msgstr ""
 

-#: ../../mod/dfrn_notify.php:237
+#: ../../mod/dfrn_notify.php:249

 msgid "New mail received at "
 msgstr ""
 
 msgid "New mail received at "
 msgstr ""
 

-#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
+#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:493

 #, php-format
 msgid "%s commented on an item at %s"
 msgstr ""
 
 #, php-format
 msgid "%s commented on an item at %s"
 msgstr ""
 

-#: ../../mod/profile.php:102
+#: ../../mod/profile.php:112

 msgid "Status"
 msgstr ""
 
 msgid "Status"
 msgstr ""
 

-#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
+#: ../../mod/profile.php:113 ../../mod/profperm.php:94
+#: ../../include/profile_advanced.php:7

 msgid "Profile"
 msgstr ""
 
 msgid "Profile"
 msgstr ""
 

-#: ../../mod/profile.php:104
+#: ../../mod/profile.php:114

 msgid "Photos"
 msgstr ""
 
 msgid "Photos"
 msgstr ""
 

-#: ../../mod/profile.php:130 ../../mod/network.php:77
-#: ../../mod/message.php:172
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/profile.php:131 ../../mod/network.php:78
-msgid "Please enter a YouTube link:"
-msgstr ""
-
-#: ../../mod/profile.php:132 ../../mod/network.php:79
-msgid "Please enter a video(.ogg) link/URL:"
-msgstr ""
-
-#: ../../mod/profile.php:133 ../../mod/network.php:80
-msgid "Please enter an audio(.ogg) link/URL:"
-msgstr ""
-
-#: ../../mod/profile.php:134 ../../mod/network.php:81
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../mod/profile.php:135 ../../mod/network.php:82
-msgid "Enter a title for this item"
-msgstr ""
-
-#: ../../mod/profile.php:158 ../../mod/profile.php:372
-#: ../../mod/photos.php:1086 ../../mod/display.php:158
-#: ../../mod/network.php:105 ../../mod/network.php:489
-msgid "Share"
-msgstr ""
-
-#: ../../mod/profile.php:159 ../../mod/editpost.php:63
-#: ../../mod/network.php:106 ../../mod/message.php:188
-#: ../../mod/message.php:322
-msgid "Upload photo"
-msgstr ""
-
-#: ../../mod/profile.php:160 ../../mod/editpost.php:64
-#: ../../mod/network.php:107 ../../mod/message.php:189
-#: ../../mod/message.php:323
-msgid "Insert web link"
-msgstr ""
-
-#: ../../mod/profile.php:161 ../../mod/editpost.php:65
-#: ../../mod/network.php:108
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/profile.php:162 ../../mod/editpost.php:66
-#: ../../mod/network.php:109
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/profile.php:163 ../../mod/editpost.php:67
-#: ../../mod/network.php:110
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/profile.php:164 ../../mod/editpost.php:68
-#: ../../mod/network.php:111
-msgid "Set your location"
-msgstr ""
-
-#: ../../mod/profile.php:165 ../../mod/editpost.php:69
-#: ../../mod/network.php:112
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../mod/profile.php:166 ../../mod/network.php:113
-msgid "Set title"
-msgstr ""
-
-#: ../../mod/profile.php:167 ../../mod/profile.php:373
-#: ../../mod/photos.php:1087 ../../mod/display.php:159
-#: ../../mod/editpost.php:70 ../../mod/network.php:114
-#: ../../mod/network.php:490 ../../mod/message.php:190
-#: ../../mod/message.php:324
-msgid "Please wait"
-msgstr ""
-
-#: ../../mod/profile.php:168 ../../mod/editpost.php:71
-#: ../../mod/network.php:115
-msgid "Permission settings"
-msgstr ""
-
-#: ../../mod/profile.php:175 ../../mod/editpost.php:77
-#: ../../mod/network.php:121
-msgid "CC: email addresses"
-msgstr ""
-
-#: ../../mod/profile.php:177 ../../mod/editpost.php:79
-#: ../../mod/network.php:123
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../mod/profile.php:352 ../../mod/network.php:428
-#, php-format
-msgid "See all %d comments"
-msgstr ""
-
-#: ../../mod/profile.php:363 ../../mod/photos.php:962
-#: ../../mod/display.php:149 ../../mod/network.php:443
-msgid "Private Message"
-msgstr ""
-
-#: ../../mod/profile.php:370 ../../mod/photos.php:1084
-#: ../../mod/display.php:156 ../../mod/network.php:487
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../mod/profile.php:371 ../../mod/photos.php:1085
-#: ../../mod/display.php:157 ../../mod/network.php:488
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../mod/profile.php:385 ../../mod/photos.php:1106
-#: ../../mod/photos.php:1148 ../../mod/photos.php:1177
-#: ../../mod/display.php:171 ../../mod/network.php:503
-msgid "This is you"
-msgstr ""
-
-#: ../../mod/profile.php:411 ../../mod/display.php:224
-#: ../../mod/editpost.php:62 ../../mod/network.php:513
-msgid "Edit"
-msgstr ""
-
-#: ../../mod/profile.php:433 ../../mod/photos.php:1205
-#: ../../mod/display.php:240 ../../mod/network.php:514 ../../mod/group.php:141
-msgid "Delete"
-msgstr ""
-
-#: ../../mod/profile.php:455 ../../mod/search.php:124
-#: ../../mod/display.php:264 ../../mod/network.php:330
-#: ../../mod/network.php:563
-msgid "View $name's profile"
-msgstr ""
-
-#: ../../mod/profile.php:489 ../../mod/display.php:320
-#: ../../mod/register.php:442 ../../mod/network.php:609
+#: ../../mod/profile.php:262 ../../mod/display.php:147
+#: ../../mod/register.php:450 ../../mod/network.php:259

 msgid ""
 "Shared content is covered by the <a href=\"http://creativecommons.org/"
 "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
 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/follow.php:186
+#: ../../mod/follow.php:16 ../../mod/dfrn_request.php:340
+msgid "Disallowed profile URL."
+msgstr ""
+
+#: ../../mod/follow.php:39

 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 

-#: ../../mod/follow.php:192
+#: ../../mod/follow.php:45

 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 

-#: ../../mod/follow.php:243
+#: ../../mod/follow.php:100

 msgid "Unable to retrieve contact information."
 msgstr ""
 
 msgid "Unable to retrieve contact information."
 msgstr ""
 

-#: ../../mod/follow.php:289
+#: ../../mod/follow.php:146

 msgid "following"
 msgstr ""
 
 msgid "following"
 msgstr ""
 


@@ -574,16 +385,16 @@ msgid "Image uploaded but image cropping failed."
 msgstr ""
 
 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
 msgstr ""
 
 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65

-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
-#: ../../mod/profile_photo.php:231 ../../mod/profile_photo.php:240
-#: ../../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/profile_photo.php:72 ../../mod/profile_photo.php:160
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245
+#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:875
+#: ../../mod/photos.php:890 ../../mod/register.php:288
+#: ../../mod/register.php:295 ../../mod/register.php:302

 msgid "Profile Photos"
 msgstr ""
 
 #: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
 msgid "Profile Photos"
 msgstr ""
 
 #: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68

-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:243
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248

 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""


@@ -592,39 +403,43 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
 msgid "Unable to process image"
 msgstr ""
 

-#: ../../mod/profile_photo.php:188
+#: ../../mod/profile_photo.php:193

 msgid "Upload File:"
 msgstr ""
 
 msgid "Upload File:"
 msgstr ""
 

-#: ../../mod/profile_photo.php:189
+#: ../../mod/profile_photo.php:194

 msgid "Upload Profile Photo"
 msgstr ""
 
 msgid "Upload Profile Photo"
 msgstr ""
 

-#: ../../mod/profile_photo.php:190
+#: ../../mod/profile_photo.php:195

 msgid "Upload"
 msgstr ""
 
 msgid "Upload"
 msgstr ""
 

-#: ../../mod/profile_photo.php:191 ../../mod/settings.php:336
+#: ../../mod/profile_photo.php:196 ../../mod/settings.php:398

 msgid "or"
 msgstr ""
 
 msgid "or"
 msgstr ""
 

-#: ../../mod/profile_photo.php:191
+#: ../../mod/profile_photo.php:196
+msgid "skip this step"
+msgstr ""
+
+#: ../../mod/profile_photo.php:196

 msgid "select a photo from your photo albums"
 msgstr ""
 
 msgid "select a photo from your photo albums"
 msgstr ""
 

-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:209

 msgid "Crop Image"
 msgstr ""
 
 msgid "Crop Image"
 msgstr ""
 

-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:210

 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 

-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211

 msgid "Done Editing"
 msgstr ""
 
 msgid "Done Editing"
 msgstr ""
 

-#: ../../mod/profile_photo.php:234
+#: ../../mod/profile_photo.php:239

 msgid "Image uploaded successfully."
 msgstr ""
 
 msgid "Image uploaded successfully."
 msgstr ""
 


@@ -642,12 +457,12 @@ msgstr ""
 msgid "Registration revoked for %s"
 msgstr ""
 
 msgid "Registration revoked for %s"
 msgstr ""
 

-#: ../../mod/regmod.php:92 ../../mod/register.php:328
+#: ../../mod/regmod.php:92 ../../mod/register.php:331

 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 

-#: ../../mod/regmod.php:96
+#: ../../mod/regmod.php:99

 msgid "Account approved."
 msgstr ""
 
 msgid "Account approved."
 msgstr ""
 


@@ -684,15 +499,15 @@ msgstr ""
 msgid "Hide my contact/friend list from viewers of this profile?"
 msgstr ""
 
 msgid "Hide my contact/friend list from viewers of this profile?"
 msgstr ""
 

-#: ../../mod/profiles.php:355 ../../mod/settings.php:289
-#: ../../mod/settings.php:301 ../../mod/register.php:436
-#: ../../mod/dfrn_request.php:620
+#: ../../mod/profiles.php:355 ../../mod/settings.php:350
+#: ../../mod/settings.php:362 ../../mod/register.php:444
+#: ../../mod/dfrn_request.php:634

 msgid "Yes"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 

-#: ../../mod/profiles.php:356 ../../mod/settings.php:290
-#: ../../mod/settings.php:302 ../../mod/register.php:437
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/profiles.php:356 ../../mod/settings.php:351
+#: ../../mod/settings.php:363 ../../mod/register.php:445
+#: ../../mod/dfrn_request.php:635

 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 


@@ -850,11 +665,11 @@ msgid ""
 "be visible to anybody using the internet."
 msgstr ""
 
 "be visible to anybody using the internet."
 msgstr ""
 

-#: ../../mod/profiles.php:421 ../../mod/directory.php:91
+#: ../../mod/profiles.php:421 ../../mod/directory.php:97

 msgid "Age: "
 msgstr ""
 
 msgid "Age: "
 msgstr ""
 

-#: ../../mod/profiles.php:456 ../../include/nav.php:110
+#: ../../mod/profiles.php:456 ../../include/nav.php:109

 msgid "Profiles"
 msgstr ""
 
 msgid "Profiles"
 msgstr ""
 


@@ -866,10 +681,18 @@ msgstr ""
 msgid "Create New Profile"
 msgstr ""
 
 msgid "Create New Profile"
 msgstr ""
 

-#: ../../mod/profiles.php:470
+#: ../../mod/profiles.php:468

 msgid "Profile Image"
 msgstr ""
 
 msgid "Profile Image"
 msgstr ""
 

+#: ../../mod/profiles.php:470
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../mod/profiles.php:471
+msgid "Edit visibility"
+msgstr ""
+

 #: ../../mod/settings.php:38
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 #: ../../mod/settings.php:38
 msgid "Passwords do not match. Password unchanged."
 msgstr ""


@@ -886,364 +709,430 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
 msgid "Password update failed. Please try again."
 msgstr ""
 

-#: ../../mod/settings.php:98
+#: ../../mod/settings.php:138

 msgid " Please use a shorter name."
 msgstr ""
 
 msgid " Please use a shorter name."
 msgstr ""
 

-#: ../../mod/settings.php:100
+#: ../../mod/settings.php:140

 msgid " Name too short."
 msgstr ""
 
 msgid " Name too short."
 msgstr ""
 

-#: ../../mod/settings.php:106
+#: ../../mod/settings.php:146

 msgid " Not valid email."
 msgstr ""
 
 msgid " Not valid email."
 msgstr ""
 

-#: ../../mod/settings.php:108
+#: ../../mod/settings.php:148

 msgid " Cannot change to that email."
 msgstr ""
 
 msgid " Cannot change to that email."
 msgstr ""
 

-#: ../../mod/settings.php:166
+#: ../../mod/settings.php:206

 msgid "Settings updated."
 msgstr ""
 
 msgid "Settings updated."
 msgstr ""
 

-#: ../../mod/settings.php:216 ../../mod/settings.php:356
+#: ../../mod/settings.php:256 ../../mod/settings.php:418

 msgid "Plugin Settings"
 msgstr ""
 
 msgid "Plugin Settings"
 msgstr ""
 

-#: ../../mod/settings.php:217 ../../mod/settings.php:355
+#: ../../mod/settings.php:257 ../../mod/settings.php:417

 msgid "Account Settings"
 msgstr ""
 
 msgid "Account Settings"
 msgstr ""
 

-#: ../../mod/settings.php:223
+#: ../../mod/settings.php:263

 msgid "No Plugin settings configured"
 msgstr ""
 
 msgid "No Plugin settings configured"
 msgstr ""
 

-#: ../../mod/settings.php:262
+#: ../../mod/settings.php:323

 msgid "Normal Account"
 msgstr ""
 
 msgid "Normal Account"
 msgstr ""
 

-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:324

 msgid "This account is a normal personal profile"
 msgstr ""
 
 msgid "This account is a normal personal profile"
 msgstr ""
 

-#: ../../mod/settings.php:264
+#: ../../mod/settings.php:325

 msgid "Soapbox Account"
 msgstr ""
 
 msgid "Soapbox Account"
 msgstr ""
 

-#: ../../mod/settings.php:265
+#: ../../mod/settings.php:326

 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 

-#: ../../mod/settings.php:266
+#: ../../mod/settings.php:327

 msgid "Community/Celebrity Account"
 msgstr ""
 
 msgid "Community/Celebrity Account"
 msgstr ""
 

-#: ../../mod/settings.php:267
+#: ../../mod/settings.php:328

 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 

-#: ../../mod/settings.php:268
+#: ../../mod/settings.php:329

 msgid "Automatic Friend Account"
 msgstr ""
 
 msgid "Automatic Friend Account"
 msgstr ""
 

-#: ../../mod/settings.php:269
+#: ../../mod/settings.php:330

 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 

-#: ../../mod/settings.php:278
+#: ../../mod/settings.php:339

 msgid "OpenID: "
 msgstr ""
 
 msgid "OpenID: "
 msgstr ""
 

-#: ../../mod/settings.php:278
+#: ../../mod/settings.php:339

 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 

-#: ../../mod/settings.php:288
+#: ../../mod/settings.php:349

 msgid "Publish your default profile in site directory?"
 msgstr ""
 
 msgid "Publish your default profile in site directory?"
 msgstr ""
 

-#: ../../mod/settings.php:300
+#: ../../mod/settings.php:361

 msgid "Publish your default profile in global social directory?"
 msgstr ""
 
 msgid "Publish your default profile in global social directory?"
 msgstr ""
 

-#: ../../mod/settings.php:316
+#: ../../mod/settings.php:377

 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 

-#: ../../mod/settings.php:341
-msgid "Your profile address is"
+#: ../../mod/settings.php:403
+msgid "Your Identity Address is"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/settings.php:351
+#: ../../mod/settings.php:413

 msgid "Export Personal Data"
 msgstr ""
 
 msgid "Export Personal Data"
 msgstr ""
 

-#: ../../mod/settings.php:357
+#: ../../mod/settings.php:419

 msgid "Basic Settings"
 msgstr ""
 
 msgid "Basic Settings"
 msgstr ""
 

-#: ../../mod/settings.php:358 ../../include/profile_advanced.php:10
+#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10

 msgid "Full Name:"
 msgstr ""
 
 msgid "Full Name:"
 msgstr ""
 

-#: ../../mod/settings.php:359
+#: ../../mod/settings.php:421

 msgid "Email Address:"
 msgstr ""
 
 msgid "Email Address:"
 msgstr ""
 

-#: ../../mod/settings.php:360
+#: ../../mod/settings.php:422

 msgid "Your Timezone:"
 msgstr ""
 
 msgid "Your Timezone:"
 msgstr ""
 

-#: ../../mod/settings.php:361
+#: ../../mod/settings.php:423

 msgid "Default Post Location:"
 msgstr ""
 
 msgid "Default Post Location:"
 msgstr ""
 

-#: ../../mod/settings.php:362
+#: ../../mod/settings.php:424

 msgid "Use Browser Location:"
 msgstr ""
 
 msgid "Use Browser Location:"
 msgstr ""
 

-#: ../../mod/settings.php:363
+#: ../../mod/settings.php:425

 msgid "Display Theme:"
 msgstr ""
 
 msgid "Display Theme:"
 msgstr ""
 

-#: ../../mod/settings.php:365
+#: ../../mod/settings.php:427

 msgid "Security and Privacy Settings"
 msgstr ""
 
 msgid "Security and Privacy Settings"
 msgstr ""
 

-#: ../../mod/settings.php:366
+#: ../../mod/settings.php:428

 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 

-#: ../../mod/settings.php:367
+#: ../../mod/settings.php:429

 msgid "(to prevent spam abuse)"
 msgstr ""
 
 msgid "(to prevent spam abuse)"
 msgstr ""
 

-#: ../../mod/settings.php:368
+#: ../../mod/settings.php:430

 msgid "Allow friends to post to your profile page:"
 msgstr ""
 
 msgid "Allow friends to post to your profile page:"
 msgstr ""
 

-#: ../../mod/settings.php:369
+#: ../../mod/settings.php:431

 msgid "Automatically expire (delete) posts older than"
 msgstr ""
 
 msgid "Automatically expire (delete) posts older than"
 msgstr ""
 

-#: ../../mod/settings.php:370 ../../include/datetime.php:154
+#: ../../mod/settings.php:432 ../../include/datetime.php:154

 msgid "days"
 msgstr ""
 
 msgid "days"
 msgstr ""
 

-#: ../../mod/settings.php:371
+#: ../../mod/settings.php:433

 msgid "Notification Settings"
 msgstr ""
 
 msgid "Notification Settings"
 msgstr ""
 

-#: ../../mod/settings.php:372
+#: ../../mod/settings.php:434

 msgid "Send a notification email when:"
 msgstr ""
 
 msgid "Send a notification email when:"
 msgstr ""
 

-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:435

 msgid "You receive an introduction"
 msgstr ""
 
 msgid "You receive an introduction"
 msgstr ""
 

-#: ../../mod/settings.php:374
+#: ../../mod/settings.php:436

 msgid "Your introductions are confirmed"
 msgstr ""
 
 msgid "Your introductions are confirmed"
 msgstr ""
 

-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:437

 msgid "Someone writes on your profile wall"
 msgstr ""
 
 msgid "Someone writes on your profile wall"
 msgstr ""
 

-#: ../../mod/settings.php:376
+#: ../../mod/settings.php:438

 msgid "Someone writes a followup comment"
 msgstr ""
 
 msgid "Someone writes a followup comment"
 msgstr ""
 

-#: ../../mod/settings.php:377
+#: ../../mod/settings.php:439

 msgid "You receive a private message"
 msgstr ""
 
 msgid "You receive a private message"
 msgstr ""
 

-#: ../../mod/settings.php:378
+#: ../../mod/settings.php:440

 msgid "Password Settings"
 msgstr ""
 
 msgid "Password Settings"
 msgstr ""
 

-#: ../../mod/settings.php:379
+#: ../../mod/settings.php:441

 msgid "Leave password fields blank unless changing"
 msgstr ""
 
 msgid "Leave password fields blank unless changing"
 msgstr ""
 

-#: ../../mod/settings.php:380
+#: ../../mod/settings.php:442

 msgid "New Password:"
 msgstr ""
 
 msgid "New Password:"
 msgstr ""
 

-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:443

 msgid "Confirm:"
 msgstr ""
 
 msgid "Confirm:"
 msgstr ""
 

-#: ../../mod/settings.php:382
+#: ../../mod/settings.php:444

 msgid "Advanced Page Settings"
 msgstr ""
 
 msgid "Advanced Page Settings"
 msgstr ""
 

-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:459

 msgid "Default Post Permissions"
 msgstr ""
 
 msgid "Default Post Permissions"
 msgstr ""
 

-#: ../../mod/search.php:62
-msgid "No results."
+#: ../../mod/settings.php:460
+msgid "(click to open/close)"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/search.php:140 ../../mod/network.php:346
-msgid "View in context"
+#: ../../mod/settings.php:473
+msgid "Email/Mailbox Setup"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/photos.php:30
+#: ../../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/search.php:13 ../../mod/photos.php:676 ../../mod/display.php:7
+#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:18
+#: ../../mod/viewcontacts.php:16
+msgid "Public access denied."
+msgstr ""
+
+#: ../../mod/search.php:69
+msgid "No results."
+msgstr ""
+
+#: ../../mod/photos.php:34

 msgid "Photo Albums"
 msgstr ""
 
 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:1235
-#: ../../mod/photos.php:1246 ../../include/Photo.php:225
-#: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:1028 ../../include/items.php:1031
-#: ../../include/items.php:1034
+#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:806
+#: ../../mod/photos.php:875 ../../mod/photos.php:890 ../../mod/photos.php:1278
+#: ../../mod/photos.php:1289 ../../include/Photo.php:233
+#: ../../include/Photo.php:240 ../../include/Photo.php:247
+#: ../../include/items.php:1027 ../../include/items.php:1030
+#: ../../include/items.php:1033

 msgid "Contact Photos"
 msgstr ""
 
 msgid "Contact Photos"
 msgstr ""
 

-#: ../../mod/photos.php:95
+#: ../../mod/photos.php:99

 msgid "Contact information unavailable"
 msgstr ""
 
 msgid "Contact information unavailable"
 msgstr ""
 

-#: ../../mod/photos.php:116
+#: ../../mod/photos.php:120

 msgid "Album not found."
 msgstr ""
 
 msgid "Album not found."
 msgstr ""
 

-#: ../../mod/photos.php:134 ../../mod/photos.php:859
+#: ../../mod/photos.php:138 ../../mod/photos.php:884

 msgid "Delete Album"
 msgstr ""
 
 msgid "Delete Album"
 msgstr ""
 

-#: ../../mod/photos.php:197 ../../mod/photos.php:1067
+#: ../../mod/photos.php:201 ../../mod/photos.php:1092

 msgid "Delete Photo"
 msgstr ""
 
 msgid "Delete Photo"
 msgstr ""
 

-#: ../../mod/photos.php:469
+#: ../../mod/photos.php:473

 msgid "was tagged in a"
 msgstr ""
 
 msgid "was tagged in a"
 msgstr ""
 

-#: ../../mod/photos.php:469 ../../mod/like.php:110
+#: ../../mod/photos.php:473 ../../mod/like.php:110
+#: ../../include/conversation.php:20

 msgid "photo"
 msgstr ""
 
 msgid "photo"
 msgstr ""
 

-#: ../../mod/photos.php:469
+#: ../../mod/photos.php:473

 msgid "by"
 msgstr ""
 
 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

 msgid "Image exceeds size limit of "
 msgstr ""
 
 msgid "Image exceeds size limit of "
 msgstr ""
 

-#: ../../mod/photos.php:661
+#: ../../mod/photos.php:686

 msgid "No photos selected"
 msgstr ""
 
 msgid "No photos selected"
 msgstr ""
 

-#: ../../mod/photos.php:808
+#: ../../mod/photos.php:833

 msgid "Upload Photos"
 msgstr ""
 
 msgid "Upload Photos"
 msgstr ""
 

-#: ../../mod/photos.php:811 ../../mod/photos.php:854
+#: ../../mod/photos.php:836 ../../mod/photos.php:879

 msgid "New album name: "
 msgstr ""
 
 msgid "New album name: "
 msgstr ""
 

-#: ../../mod/photos.php:812
+#: ../../mod/photos.php:837

 msgid "or existing album name: "
 msgstr ""
 
 msgid "or existing album name: "
 msgstr ""
 

-#: ../../mod/photos.php:814 ../../mod/photos.php:1062
+#: ../../mod/photos.php:839 ../../mod/photos.php:1087

 msgid "Permissions"
 msgstr ""
 
 msgid "Permissions"
 msgstr ""
 

-#: ../../mod/photos.php:869
+#: ../../mod/photos.php:894

 msgid "Edit Album"
 msgstr ""
 
 msgid "Edit Album"
 msgstr ""
 

-#: ../../mod/photos.php:879 ../../mod/photos.php:1265
+#: ../../mod/photos.php:904 ../../mod/photos.php:1307

 msgid "View Photo"
 msgstr ""
 
 msgid "View Photo"
 msgstr ""
 

-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:933

 msgid "Photo not available"
 msgstr ""
 
 msgid "Photo not available"
 msgstr ""
 

-#: ../../mod/photos.php:956
+#: ../../mod/photos.php:982

 msgid "Edit photo"
 msgstr ""
 
 msgid "Edit photo"
 msgstr ""
 

-#: ../../mod/photos.php:958
+#: ../../mod/photos.php:983

 msgid "Use as profile photo"
 msgstr ""
 
 msgid "Use as profile photo"
 msgstr ""
 

-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:989 ../../include/conversation.php:309
+msgid "Private Message"
+msgstr ""
+
+#: ../../mod/photos.php:996

 msgid "<< Prev"
 msgstr ""
 
 msgid "<< Prev"
 msgstr ""
 

-#: ../../mod/photos.php:973
+#: ../../mod/photos.php:1000

 msgid "View Full Size"
 msgstr ""
 
 msgid "View Full Size"
 msgstr ""
 

-#: ../../mod/photos.php:977
+#: ../../mod/photos.php:1005

 msgid "Next >>"
 msgstr ""
 
 msgid "Next >>"
 msgstr ""
 

-#: ../../mod/photos.php:1036
+#: ../../mod/photos.php:1067

 msgid "Tags: "
 msgstr ""
 
 msgid "Tags: "
 msgstr ""
 

-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1070

 msgid "[Remove any tag]"
 msgstr ""
 
 msgid "[Remove any tag]"
 msgstr ""
 

-#: ../../mod/photos.php:1055
+#: ../../mod/photos.php:1080

 msgid "New album name"
 msgstr ""
 
 msgid "New album name"
 msgstr ""
 

-#: ../../mod/photos.php:1058
+#: ../../mod/photos.php:1083

 msgid "Caption"
 msgstr ""
 
 msgid "Caption"
 msgstr ""
 

-#: ../../mod/photos.php:1060
+#: ../../mod/photos.php:1085

 msgid "Add a Tag"
 msgstr ""
 
 msgid "Add a Tag"
 msgstr ""
 

-#: ../../mod/photos.php:1064
+#: ../../mod/photos.php:1089

 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 

-#: ../../mod/photos.php:1251
-msgid "Recent Photos"
+#: ../../mod/photos.php:1109 ../../include/conversation.php:357
+msgid "I like this (toggle)"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/photos.php:1255
-msgid "Upload New Photos"
+#: ../../mod/photos.php:1110 ../../include/conversation.php:358
+msgid "I don't like this (toggle)"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/photos.php:1271
-msgid "View Album"
+#: ../../mod/photos.php:1111 ../../include/conversation.php:359
+#: ../../include/conversation.php:718
+msgid "Share"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:15 ../../mod/display.php:315 ../../mod/item.php:598
-msgid "Item not found."
+#: ../../mod/photos.php:1112 ../../mod/editpost.php:96
+#: ../../mod/message.php:190 ../../mod/message.php:324
+#: ../../include/conversation.php:360 ../../include/conversation.php:727
+msgid "Please wait"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:265 ../../mod/network.php:564
-msgid "View $owner_name's profile"
+#: ../../mod/photos.php:1128 ../../mod/photos.php:1167
+#: ../../mod/photos.php:1198 ../../include/conversation.php:373
+msgid "This is you"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:266 ../../mod/network.php:565
-msgid "to"
+#: ../../mod/photos.php:1228 ../../mod/group.php:146
+#: ../../include/conversation.php:174 ../../include/conversation.php:386
+msgid "Delete"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:267 ../../mod/network.php:566
-msgid "Wall-to-Wall"
+#: ../../mod/photos.php:1294
+msgid "Recent Photos"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:268 ../../mod/network.php:567
-msgid "via Wall-To-Wall:"
+#: ../../mod/photos.php:1298
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../mod/photos.php:1311
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/display.php:25 ../../mod/display.php:142 ../../mod/item.php:609
+msgid "Item not found."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:308
+#: ../../mod/display.php:135

 msgid "Item has been removed."
 msgstr ""
 
 msgid "Item has been removed."
 msgstr ""
 


@@ -1255,6 +1144,61 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
 msgid "Edit post"
 msgstr ""
 

+#: ../../mod/editpost.php:38 ../../include/conversation.php:673
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../mod/editpost.php:75 ../../include/conversation.php:707
+msgid "Post to Email"
+msgstr ""
+
+#: ../../mod/editpost.php:88 ../../include/conversation.php:384
+#: ../../include/group.php:169
+msgid "Edit"
+msgstr ""
+
+#: ../../mod/editpost.php:89 ../../mod/message.php:188
+#: ../../mod/message.php:322 ../../include/conversation.php:719
+msgid "Upload photo"
+msgstr ""
+
+#: ../../mod/editpost.php:90 ../../mod/message.php:189
+#: ../../mod/message.php:323 ../../include/conversation.php:720
+msgid "Insert web link"
+msgstr ""
+
+#: ../../mod/editpost.php:91 ../../include/conversation.php:721
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editpost.php:92 ../../include/conversation.php:722
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editpost.php:93 ../../include/conversation.php:723
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/editpost.php:94 ../../include/conversation.php:724
+msgid "Set your location"
+msgstr ""
+
+#: ../../mod/editpost.php:95 ../../include/conversation.php:725
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../mod/editpost.php:97 ../../include/conversation.php:728
+msgid "Permission settings"
+msgstr ""
+
+#: ../../mod/editpost.php:103 ../../include/conversation.php:734
+msgid "CC: email addresses"
+msgstr ""
+
+#: ../../mod/editpost.php:105 ../../include/conversation.php:736
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+

 #: ../../mod/invite.php:28
 #, php-format
 msgid "%s : Not a valid email address."
 #: ../../mod/invite.php:28
 #, php-format
 msgid "%s : Not a valid email address."


@@ -1265,40 +1209,40 @@ msgstr ""
 msgid "Please join my network on %s"
 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 ""
 
 #, 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] ""
 
 #, 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 ""
 
 msgid "Send invitations"
 msgstr ""
 

-#: ../../mod/invite.php:58
+#: ../../mod/invite.php:62

 msgid "Enter email addresses, one per line:"
 msgstr ""
 
 msgid "Enter email addresses, one per line:"
 msgstr ""
 

-#: ../../mod/invite.php:59 ../../mod/message.php:185 ../../mod/message.php:319
+#: ../../mod/invite.php:63 ../../mod/message.php:185 ../../mod/message.php:319

 msgid "Your message:"
 msgstr ""
 
 msgid "Your message:"
 msgstr ""
 

-#: ../../mod/invite.php:60
+#: ../../mod/invite.php:64

 #, php-format
 msgid "Please join my social network on %s"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""


@@ -1335,7 +1279,7 @@ msgstr ""
 msgid "Contact updated."
 msgstr ""
 
 msgid "Contact updated."
 msgstr ""
 

-#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
+#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:406

 msgid "Failed to update contact record."
 msgstr ""
 
 msgid "Failed to update contact record."
 msgstr ""
 


@@ -1363,19 +1307,20 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
 msgid "Contact has been removed."
 msgstr ""
 

-#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
+#: ../../mod/contacts.php:214 ../../mod/crepair.php:68
+#: ../../mod/dfrn_confirm.php:114

 msgid "Contact not found."
 msgstr ""
 
 msgid "Contact not found."
 msgstr ""
 

-#: ../../mod/contacts.php:228 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:363

 msgid "Mutual Friendship"
 msgstr ""
 
 msgid "Mutual Friendship"
 msgstr ""
 

-#: ../../mod/contacts.php:232 ../../mod/contacts.php:364
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:367

 msgid "is a fan of yours"
 msgstr ""
 
 msgid "is a fan of yours"
 msgstr ""
 

-#: ../../mod/contacts.php:237 ../../mod/contacts.php:368
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:371

 msgid "you are a fan of"
 msgstr ""
 
 msgid "you are a fan of"
 msgstr ""
 


@@ -1453,70 +1398,86 @@ msgid "Ignore contact"
 msgstr ""
 
 #: ../../mod/contacts.php:275
 msgstr ""
 
 #: ../../mod/contacts.php:275

-msgid "Delete contact"
+msgid "Repair contact URL settings"
+msgstr ""
+
+#: ../../mod/contacts.php:276
+msgid "Repair contact URL settings (WARNING: Advanced)"

 msgstr ""
 
 #: ../../mod/contacts.php:277
 msgstr ""
 
 #: ../../mod/contacts.php:277

-msgid "Last updated: "
+msgid "View conversations"

 msgstr ""
 
 #: ../../mod/contacts.php:278
 msgstr ""
 
 #: ../../mod/contacts.php:278

-msgid "Update public posts: "
+msgid "Delete contact"

 msgstr ""
 
 #: ../../mod/contacts.php:280
 msgstr ""
 
 #: ../../mod/contacts.php:280

-msgid "Update now"
+msgid "Last updated: "
+msgstr ""
+
+#: ../../mod/contacts.php:281
+msgid "Update public posts: "

 msgstr ""
 
 #: ../../mod/contacts.php:283
 msgstr ""
 
 #: ../../mod/contacts.php:283

+msgid "Update now"
+msgstr ""
+
+#: ../../mod/contacts.php:286

 msgid "Unblock this contact"
 msgstr ""
 
 msgid "Unblock this contact"
 msgstr ""
 

-#: ../../mod/contacts.php:283
+#: ../../mod/contacts.php:286

 msgid "Block this contact"
 msgstr ""
 
 msgid "Block this contact"
 msgstr ""
 

-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:287

 msgid "Unignore this contact"
 msgstr ""
 
 msgid "Unignore this contact"
 msgstr ""
 

-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:287

 msgid "Ignore this contact"
 msgstr ""
 
 msgid "Ignore this contact"
 msgstr ""
 

-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:290

 msgid "Currently blocked"
 msgstr ""
 
 msgid "Currently blocked"
 msgstr ""
 

-#: ../../mod/contacts.php:288
+#: ../../mod/contacts.php:291

 msgid "Currently ignored"
 msgstr ""
 
 msgid "Currently ignored"
 msgstr ""
 

-#: ../../mod/contacts.php:319 ../../include/acl_selectors.php:140
-#: ../../include/acl_selectors.php:155 ../../include/nav.php:112
+#: ../../mod/contacts.php:322 ../../include/acl_selectors.php:141
+#: ../../include/acl_selectors.php:156 ../../include/nav.php:110

 msgid "Contacts"
 msgstr ""
 
 msgid "Contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:324

 msgid "Show Blocked Connections"
 msgstr ""
 
 msgid "Show Blocked Connections"
 msgstr ""
 

-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:324

 msgid "Hide Blocked Connections"
 msgstr ""
 
 msgid "Hide Blocked Connections"
 msgstr ""
 

-#: ../../mod/contacts.php:323 ../../mod/directory.php:38
+#: ../../mod/contacts.php:326 ../../mod/directory.php:44

 msgid "Finding: "
 msgstr ""
 
 msgid "Finding: "
 msgstr ""
 

-#: ../../mod/contacts.php:324 ../../mod/directory.php:40
+#: ../../mod/contacts.php:327 ../../mod/directory.php:46

 msgid "Find"
 msgstr ""
 
 msgid "Find"
 msgstr ""
 

-#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52

 msgid "Visit $username's profile"
 msgstr ""
 
 msgid "Visit $username's profile"
 msgstr ""
 

+#: ../../mod/contacts.php:388 ../../include/conversation.php:587
+msgid "Edit contact"
+msgstr ""
+

 #: ../../mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr ""
 #: ../../mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr ""


@@ -1541,106 +1502,106 @@ msgstr ""
 msgid "Name too short."
 msgstr ""
 
 msgid "Name too short."
 msgstr ""
 

-#: ../../mod/register.php:89
+#: ../../mod/register.php:91

 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Not a valid email address."
 msgstr ""
 

-#: ../../mod/register.php:101
+#: ../../mod/register.php:104

 msgid "Cannot use that email."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 

-#: ../../mod/register.php:333
+#: ../../mod/register.php:339

 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Your registration can not be processed."
 msgstr ""
 

-#: ../../mod/register.php:365
+#: ../../mod/register.php:371

 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Your OpenID (optional): "
 msgstr ""
 

-#: ../../mod/register.php:433
+#: ../../mod/register.php:441

 msgid "Include your profile in member directory?"
 msgstr ""
 
 msgid "Include your profile in member directory?"
 msgstr ""
 

-#: ../../mod/register.php:449
+#: ../../mod/register.php:457

 msgid "Registration"
 msgstr ""
 
 msgid "Registration"
 msgstr ""
 

-#: ../../mod/register.php:457
+#: ../../mod/register.php:465

 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 

-#: ../../mod/register.php:458
+#: ../../mod/register.php:466

 msgid "Your Email Address: "
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Choose a nickname: "
 msgstr ""
 


@@ -1648,6 +1609,14 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
 msgid "Post successful."
 msgstr ""
 

+#: ../../mod/help.php:27
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:31 ../../include/nav.php:64
+msgid "Help"
+msgstr ""
+

 #: ../../mod/install.php:33
 msgid "Could not create/connect to database."
 msgstr ""
 #: ../../mod/install.php:33
 msgid "Could not create/connect to database."
 msgstr ""


@@ -1833,36 +1802,64 @@ msgstr ""
 msgid "New Item View"
 msgstr ""
 
 msgid "New Item View"
 msgstr ""
 

-#: ../../mod/network.php:59
+#: ../../mod/network.php:64

 #, php-format
 msgid "%d member"
 msgid_plural "%d members"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d member"
 msgid_plural "%d members"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/network.php:60
+#: ../../mod/network.php:65

 #, php-format
 msgid "Warning: This group contains %s from an insecure network."
 msgstr ""
 
 #, php-format
 msgid "Warning: This group contains %s from an insecure network."
 msgstr ""
 

-#: ../../mod/network.php:61
+#: ../../mod/network.php:66

 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 

-#: ../../mod/network.php:166
+#: ../../mod/network.php:126

 msgid "No such group"
 msgstr ""
 
 msgid "No such group"
 msgstr ""
 

-#: ../../mod/network.php:177
+#: ../../mod/network.php:137

 msgid "Group is empty"
 msgstr ""
 
 msgid "Group is empty"
 msgstr ""
 

-#: ../../mod/network.php:181
+#: ../../mod/network.php:141

 msgid "Group: "
 msgstr ""
 
 msgid "Group: "
 msgstr ""
 

-#: ../../mod/network.php:409
-msgid "See more posts like this"
+#: ../../mod/network.php:151
+msgid "Contact: "
+msgstr ""
+
+#: ../../mod/network.php:153
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr ""
+
+#: ../../mod/network.php:158
+msgid "Invalid contact."
+msgstr ""
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:46
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../mod/profperm.php:92
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../mod/profperm.php:96 ../../mod/group.php:156
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../mod/profperm.php:105
+msgid "Visible To"
+msgstr ""
+
+#: ../../mod/profperm.php:116
+msgid "All Contacts (with secure profile access)"

 msgstr ""
 
 #: ../../mod/notifications.php:28
 msgstr ""
 
 #: ../../mod/notifications.php:28


@@ -1945,176 +1942,232 @@ msgstr ""
 msgid "No registrations."
 msgstr ""
 
 msgid "No registrations."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:92
+#: ../../mod/crepair.php:42
+msgid "Contact settings applied."
+msgstr ""
+
+#: ../../mod/crepair.php:44
+msgid "Contact update failed."
+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/dfrn_request.php:96

 msgid "This introduction has already been accepted."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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] ""
 
 #, 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 ""
 
 msgid "Introduction complete."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:188
+#: ../../mod/dfrn_request.php:192

 msgid "Unrecoverable protocol error."
 msgstr ""
 
 msgid "Unrecoverable protocol error."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:216
+#: ../../mod/dfrn_request.php:220

 msgid "Profile unavailable."
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 msgid "Invalid profile URL."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:336
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:423
+#: ../../mod/dfrn_request.php:427

 msgid "Your introduction has been sent."
 msgstr ""
 
 msgid "Your introduction has been sent."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:477
+#: ../../mod/dfrn_request.php:481

 msgid "Please login to confirm introduction."
 msgstr ""
 
 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 ""
 
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:503
+#: ../../mod/dfrn_request.php:507

 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:504
+#: ../../mod/dfrn_request.php:508

 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:505
+#: ../../mod/dfrn_request.php:509

 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:538 ../../include/items.php:1411
+#: ../../mod/dfrn_request.php:542 ../../include/items.php:1426

 msgid "[Name Withheld]"
 msgstr ""
 
 msgid "[Name Withheld]"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:545
+#: ../../mod/dfrn_request.php:549

 msgid "Introduction received at "
 msgstr ""
 
 msgid "Introduction received at "
 msgstr ""
 

-#: ../../mod/dfrn_request.php:617
+#: ../../mod/dfrn_request.php:630

 msgid "Friend/Connection Request"
 msgstr ""
 
 msgid "Friend/Connection Request"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:618
+#: ../../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 ""
 
 msgid "Please answer the following:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:619
+#: ../../mod/dfrn_request.php:633

 msgid "Does $name know you?"
 msgstr ""
 
 msgid "Does $name know you?"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:622
+#: ../../mod/dfrn_request.php:636

 msgid "Add a personal note:"
 msgstr ""
 
 msgid "Add a personal note:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:623
+#: ../../mod/dfrn_request.php:637

 msgid ""
 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 ""
 
 msgstr ""
 

-#: ../../mod/dfrn_request.php:624
+#: ../../mod/dfrn_request.php:638

 msgid "Friendika"
 msgstr ""
 
 msgid "Friendika"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:625
+#: ../../mod/dfrn_request.php:639

 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:626
+#: ../../mod/dfrn_request.php:640

 msgid "Private (secure) network"
 msgstr ""
 
 msgid "Private (secure) network"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:641

 msgid "Public (insecure) network"
 msgstr ""
 
 msgid "Public (insecure) network"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:628
-msgid "Your profile address:"
+#: ../../mod/dfrn_request.php:642
+msgid "Your Identity Address:"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/dfrn_request.php:629
+#: ../../mod/dfrn_request.php:643

 msgid "Submit Request"
 msgstr ""
 
 msgid "Submit Request"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:630 ../../mod/tagrm.php:11
+#: ../../mod/dfrn_request.php:644 ../../mod/tagrm.php:11

 #: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
 msgstr ""
 
 #: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
 msgstr ""
 

-#: ../../mod/like.php:110
+#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:745
+#: ../../include/conversation.php:20

 msgid "status"
 msgstr ""
 
 msgid "status"
 msgstr ""
 

-#: ../../mod/like.php:127
+#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:749
+#: ../../include/conversation.php:25

 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
 #, 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 ""
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""


@@ -2128,49 +2181,49 @@ msgstr ""
 msgid "Password reset requested at %s"
 msgstr ""
 
 msgid "Password reset requested at %s"
 msgstr ""
 

-#: ../../mod/lostpass.php:56
+#: ../../mod/lostpass.php:60

 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 

-#: ../../mod/lostpass.php:75
+#: ../../mod/lostpass.php:79

 msgid "Your password has been reset as requested."
 msgstr ""
 
 msgid "Your password has been reset as requested."
 msgstr ""
 

-#: ../../mod/lostpass.php:76
+#: ../../mod/lostpass.php:80

 msgid "Your new password is"
 msgstr ""
 
 msgid "Your new password is"
 msgstr ""
 

-#: ../../mod/lostpass.php:77
+#: ../../mod/lostpass.php:81

 msgid "Save or copy your new password - and then"
 msgstr ""
 
 msgid "Save or copy your new password - and then"
 msgstr ""
 

-#: ../../mod/lostpass.php:78
+#: ../../mod/lostpass.php:82

 msgid "click here to login"
 msgstr ""
 
 msgid "click here to login"
 msgstr ""
 

-#: ../../mod/lostpass.php:79
+#: ../../mod/lostpass.php:83

 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 

-#: ../../mod/lostpass.php:107
+#: ../../mod/lostpass.php:114

 msgid "Forgot your Password?"
 msgstr ""
 
 msgid "Forgot your Password?"
 msgstr ""
 

-#: ../../mod/lostpass.php:108
+#: ../../mod/lostpass.php:115

 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 

-#: ../../mod/lostpass.php:109
+#: ../../mod/lostpass.php:116

 msgid "Nickname or Email: "
 msgstr ""
 
 msgid "Nickname or Email: "
 msgstr ""
 

-#: ../../mod/lostpass.php:110
+#: ../../mod/lostpass.php:117

 msgid "Reset"
 msgstr ""
 
 msgid "Reset"
 msgstr ""
 


@@ -2192,19 +2245,19 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
 msgid "Applications"
 msgstr ""
 

-#: ../../mod/directory.php:32
+#: ../../mod/directory.php:38

 msgid "Global Directory"
 msgstr ""
 
 msgid "Global Directory"
 msgstr ""
 

-#: ../../mod/directory.php:39
+#: ../../mod/directory.php:45

 msgid "Site Directory"
 msgstr ""
 
 msgid "Site Directory"
 msgstr ""
 

-#: ../../mod/directory.php:94
+#: ../../mod/directory.php:100

 msgid "Gender: "
 msgstr ""
 
 msgid "Gender: "
 msgstr ""
 

-#: ../../mod/directory.php:120
+#: ../../mod/directory.php:126

 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 


@@ -2251,41 +2304,42 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
 msgid "Unable to locate original post."
 msgstr ""
 

-#: ../../mod/item.php:126
+#: ../../mod/item.php:128

 msgid "Empty post discarded."
 msgstr ""
 
 msgid "Empty post discarded."
 msgstr ""
 

-#: ../../mod/item.php:474
+#: ../../mod/item.php:478

 #, php-format
 msgid "%s commented on your item at %s"
 msgstr ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 #, php-format
 msgid "%s posted an update."
 msgstr ""


@@ -2326,7 +2380,7 @@ msgstr ""
 msgid "Message could not be sent."
 msgstr ""
 
 msgid "Message could not be sent."
 msgstr ""
 

-#: ../../mod/message.php:125 ../../include/nav.php:101
+#: ../../mod/message.php:125 ../../include/nav.php:102

 msgid "Messages"
 msgstr ""
 
 msgid "Messages"
 msgstr ""
 


@@ -2350,6 +2404,10 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
 msgid "Conversation removed."
 msgstr ""
 

+#: ../../mod/message.php:172 ../../include/conversation.php:674
+msgid "Please enter a link URL:"
+msgstr ""
+

 #: ../../mod/message.php:180
 msgid "Send Private Message"
 msgstr ""
 #: ../../mod/message.php:180
 msgid "Send Private Message"
 msgstr ""


@@ -2415,61 +2473,70 @@ msgstr ""
 msgid "Unable to set contact photo."
 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 ""
 
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:494
+#: ../../mod/dfrn_confirm.php:501

 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 

-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
+#: ../../mod/openid.php:62 ../../mod/openid.php:118 ../../include/auth.php:114
+#: ../../include/auth.php:139 ../../include/auth.php:192

 msgid "Login failed."
 msgstr ""
 
 msgid "Login failed."
 msgstr ""
 

-#: ../../mod/openid.php:73 ../../include/auth.php:194
+#: ../../mod/openid.php:78 ../../include/auth.php:208
+msgid "Welcome "
+msgstr ""
+
+#: ../../mod/openid.php:79 ../../include/auth.php:209
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../mod/openid.php:82 ../../include/auth.php:212

 msgid "Welcome back "
 msgstr ""
 
 msgid "Welcome back "
 msgstr ""
 

-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:483
+#: ../../mod/dfrn_poll.php:84 ../../mod/dfrn_poll.php:510

 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
 
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
 

-#: ../../mod/viewcontacts.php:32
+#: ../../mod/viewcontacts.php:40

 msgid "No contacts."
 msgstr ""
 
 msgid "No contacts."
 msgstr ""
 


@@ -2481,7 +2548,7 @@ msgstr ""
 msgid "Could not create group."
 msgstr ""
 
 msgid "Could not create group."
 msgstr ""
 

-#: ../../mod/group.php:43 ../../mod/group.php:127
+#: ../../mod/group.php:43 ../../mod/group.php:115

 msgid "Group not found."
 msgstr ""
 
 msgid "Group not found."
 msgstr ""
 


@@ -2489,32 +2556,32 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
 msgid "Group name changed."
 msgstr ""
 

-#: ../../mod/group.php:79
-msgid "Membership list updated."
-msgstr ""
-
-#: ../../mod/group.php:95
+#: ../../mod/group.php:74

 msgid "Create a group of contacts/friends."
 msgstr ""
 
 msgid "Create a group of contacts/friends."
 msgstr ""
 

-#: ../../mod/group.php:96 ../../mod/group.php:153
+#: ../../mod/group.php:75 ../../mod/group.php:158

 msgid "Group Name: "
 msgstr ""
 
 msgid "Group Name: "
 msgstr ""
 

-#: ../../mod/group.php:111
+#: ../../mod/group.php:90

 msgid "Group removed."
 msgstr ""
 
 msgid "Group removed."
 msgstr ""
 

-#: ../../mod/group.php:113
+#: ../../mod/group.php:92

 msgid "Unable to remove group."
 msgstr ""
 
 msgid "Unable to remove group."
 msgstr ""
 

-#: ../../mod/group.php:152
+#: ../../mod/group.php:157

 msgid "Group Editor"
 msgstr ""
 
 msgid "Group Editor"
 msgstr ""
 

-#: ../../mod/group.php:154
-msgid "Members:"
+#: ../../mod/group.php:169
+msgid "Members"
+msgstr ""
+
+#: ../../mod/group.php:183
+msgid "All Contacts"

 msgstr ""
 
 #: ../../mod/match.php:10
 msgstr ""
 
 #: ../../mod/match.php:10


@@ -2692,46 +2759,60 @@ msgid ""
 "Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 
 "Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:116
+#: ../../addon/facebook/facebook.php:252

 msgid "Facebook disabled"
 msgstr ""
 
 msgid "Facebook disabled"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:124
+#: ../../addon/facebook/facebook.php:257
+msgid "Updating contacts"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:266

 msgid "Facebook API key is missing."
 msgstr ""
 
 msgid "Facebook API key is missing."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:131
+#: ../../addon/facebook/facebook.php:273

 msgid "Facebook Connect"
 msgstr ""
 
 msgid "Facebook Connect"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
+#: ../../addon/facebook/facebook.php:279
+msgid "Install Facebook connector for this account."

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
+#: ../../addon/facebook/facebook.php:286
+msgid "Remove Facebook connector"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:150
+#: ../../addon/facebook/facebook.php:292

 msgid "Post to Facebook by default"
 msgstr ""
 
 msgid "Post to Facebook by default"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:174
+#: ../../addon/facebook/facebook.php:354

 msgid "Facebook"
 msgstr ""
 
 msgid "Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:175
+#: ../../addon/facebook/facebook.php:355

 msgid "Facebook Connector Settings"
 msgstr ""
 
 msgid "Facebook Connector Settings"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:189
+#: ../../addon/facebook/facebook.php:369

 msgid "Post to Facebook"
 msgstr ""
 
 msgid "Post to Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:230
+#: ../../addon/facebook/facebook.php:436
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:491

 msgid "Image: "
 msgstr ""
 
 msgid "Image: "
 msgstr ""
 

+#: ../../addon/facebook/facebook.php:551
+msgid "View on Friendika"
+msgstr ""
+

 #: ../../addon/randplace/randplace.php:171
 msgid "Randplace Settings"
 msgstr ""
 #: ../../addon/randplace/randplace.php:171
 msgid "Randplace Settings"
 msgstr ""


@@ -2772,6 +2853,10 @@ msgstr ""
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 

+#: ../../include/notifier.php:414
+msgid "(no subject)"
+msgstr ""
+

 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr ""
 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr ""


@@ -3032,15 +3117,15 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
 msgid "Ask me"
 msgstr ""
 

-#: ../../include/acl_selectors.php:132
+#: ../../include/acl_selectors.php:133

 msgid "Visible To:"
 msgstr ""
 
 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 ""
 
 msgid "Groups"
 msgstr ""
 

-#: ../../include/acl_selectors.php:147
+#: ../../include/acl_selectors.php:148

 msgid "Except For:"
 msgstr ""
 
 msgid "Except For:"
 msgstr ""
 


@@ -3048,6 +3133,10 @@ msgstr ""
 msgid "Logged out."
 msgstr ""
 
 msgid "Logged out."
 msgstr ""
 

+#: ../../include/bbcode.php:83
+msgid "Image/photo"
+msgstr ""
+

 #: ../../include/datetime.php:44 ../../include/datetime.php:46
 msgid "Miscellaneous"
 msgstr ""
 #: ../../include/datetime.php:44 ../../include/datetime.php:46
 msgid "Miscellaneous"
 msgstr ""


@@ -3112,7 +3201,7 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
 msgid " ago"
 msgstr ""
 

-#: ../../include/profile_advanced.php:36 ../../include/items.php:1073
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1072

 msgid "Birthday:"
 msgstr ""
 
 msgid "Birthday:"
 msgstr ""
 


@@ -3176,23 +3265,23 @@ msgstr ""
 msgid "School/education:"
 msgstr ""
 
 msgid "School/education:"
 msgstr ""
 

-#: ../../include/nav.php:57 ../../include/nav.php:92
+#: ../../include/nav.php:55 ../../include/nav.php:93

 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: ../../include/nav.php:65
+#: ../../include/nav.php:68

 msgid "Apps"
 msgstr ""
 
 msgid "Apps"
 msgstr ""
 

-#: ../../include/nav.php:78
+#: ../../include/nav.php:81

 msgid "Directory"
 msgstr ""
 
 msgid "Directory"
 msgstr ""
 

-#: ../../include/nav.php:88
+#: ../../include/nav.php:91

 msgid "Network"
 msgstr ""
 
 msgid "Network"
 msgstr ""
 

-#: ../../include/nav.php:97
+#: ../../include/nav.php:99

 msgid "Notifications"
 msgstr ""
 
 msgid "Notifications"
 msgstr ""
 


@@ -3204,20 +3293,134 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

+#: ../../include/conversation.php:184 ../../include/conversation.php:441
+#: ../../include/conversation.php:442
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../include/conversation.php:200
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:271
+msgid "See more posts like this"
+msgstr ""
+
+#: ../../include/conversation.php:296
+#, php-format
+msgid "See all %d comments"
+msgstr ""
+
+#: ../../include/conversation.php:443
+msgid "to"
+msgstr ""
+
+#: ../../include/conversation.php:444
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../include/conversation.php:445
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../include/conversation.php:583
+msgid "View status"
+msgstr ""
+
+#: ../../include/conversation.php:584
+msgid "View profile"
+msgstr ""
+
+#: ../../include/conversation.php:585
+msgid "View photos"
+msgstr ""
+
+#: ../../include/conversation.php:586
+msgid "View recent"
+msgstr ""
+
+#: ../../include/conversation.php:588
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/conversation.php:638
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:638
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:642
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr ""
+
+#: ../../include/conversation.php:644
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:650
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:653
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: ../../include/conversation.php:654
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:654
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:675
+msgid "Please enter a YouTube link:"
+msgstr ""
+
+#: ../../include/conversation.php:676
+msgid "Please enter a video(.ogg) link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:677
+msgid "Please enter an audio(.ogg) link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:678
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:679
+msgid "Enter a title for this item"
+msgstr ""
+
+#: ../../include/conversation.php:726
+msgid "Set title"
+msgstr ""
+

 #: ../../include/dba.php:31
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
 #: ../../include/dba.php:31
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 

-#: ../../include/items.php:1418
+#: ../../include/items.php:1433

 msgid "You have a new follower at "
 msgstr ""
 
 msgid "You have a new follower at "
 msgstr ""
 

-#: ../../include/group.php:145
+#: ../../include/group.php:146

 msgid "Create a new group"
 msgstr ""
 
 msgid "Create a new group"
 msgstr ""
 

-#: ../../include/group.php:146
+#: ../../include/group.php:147

 msgid "Everybody"
 msgstr ""
 
 msgid "Everybody"
 msgstr ""