rev update

[friendica.git] / util / messages.po

diff --git a/util/messages.po b/util/messages.po
index a5c0be3083a17998dbd197648289206fadb5a928..0099cc489405f63c3daa40050274ef4562466138 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1404\n"
+"Project-Id-Version: 3.0.1418\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-14 10:00-0700\n"
+"POT-Creation-Date: 2012-07-28 10:00-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"
@@ -37,10 +37,10 @@ msgstr ""
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:957
-#: ../../mod/editpost.php:10 ../../mod/install.php:151
+#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:109
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145
-#: ../../mod/settings.php:106 ../../mod/settings.php:537
-#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:106 ../../mod/settings.php:539
+#: ../../mod/settings.php:544 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -56,7 +56,7 @@ msgstr ""
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:353
-#: ../../include/items.php:3593 ../../index.php:309
+#: ../../include/items.php:3813 ../../index.php:309
 msgid "Permission denied."
 msgstr ""
 
@@ -85,8 +85,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:557
-#: ../../mod/settings.php:583 ../../mod/admin.php:661 ../../mod/admin.php:670
+#: ../../mod/crepair.php:148 ../../mod/settings.php:559
+#: ../../mod/settings.php:585 ../../mod/admin.php:664 ../../mod/admin.php:673
 msgid "Name"
 msgstr ""
 
@@ -127,16 +127,16 @@ msgstr ""
 #: ../../mod/photos.php:1309 ../../mod/photos.php:1349
 #: ../../mod/photos.php:1389 ../../mod/photos.php:1420
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/content.php:691
-#: ../../mod/contacts.php:343 ../../mod/settings.php:555
-#: ../../mod/settings.php:709 ../../mod/settings.php:770
-#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:294
-#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:658
-#: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080
+#: ../../mod/localtime.php:45 ../../mod/poke.php:169 ../../mod/content.php:691
+#: ../../mod/contacts.php:343 ../../mod/settings.php:557
+#: ../../mod/settings.php:711 ../../mod/settings.php:772
+#: ../../mod/settings.php:973 ../../mod/group.php:85 ../../mod/message.php:294
+#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:661
+#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083
 #: ../../mod/profiles.php:577 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
-#: ../../addon/snautofollow/snautofollow.php:64
+#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
 #: ../../addon/planets/planets.php:158
@@ -144,13 +144,16 @@ msgstr ""
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/forumlist/forumlist.php:169
 #: ../../addon/impressum/impressum.php:82
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
-#: ../../addon/gravatar/gravatar.php:86
+#: ../../addon/group_text/group_text.php:84
+#: ../../addon/libravatar/libravatar.php:99
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:302
 #: ../../addon/statusnet/statusnet.php:278
@@ -158,18 +161,18 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:387
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:653
+#: ../../include/conversation.php:696
 msgid "Submit"
 msgstr ""
 
@@ -224,12 +227,12 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:304 ../../include/text.php:1069
+#: ../../mod/events.php:304 ../../include/text.php:1110
 msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1596
+#: ../../include/nav.php:52 ../../boot.php:1614
 msgid "Events"
 msgstr ""
 
@@ -284,8 +287,8 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:429 ../../mod/directory.php:132
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:469
-#: ../../boot.php:1173
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:447
+#: ../../boot.php:1179
 msgid "Location:"
 msgstr ""
 
@@ -298,8 +301,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556
-#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:558
+#: ../../mod/settings.php:584 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -343,30 +346,30 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
-#: ../../mod/settings.php:887 ../../mod/settings.php:893
-#: ../../mod/settings.php:901 ../../mod/settings.php:905
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:922 ../../mod/settings.php:928
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:889 ../../mod/settings.php:895
+#: ../../mod/settings.php:903 ../../mod/settings.php:907
+#: ../../mod/settings.php:912 ../../mod/settings.php:918
+#: ../../mod/settings.php:924 ../../mod/settings.php:930
 #: ../../mod/settings.php:960 ../../mod/settings.php:961
-#: ../../mod/settings.php:962 ../../mod/register.php:234
+#: ../../mod/settings.php:962 ../../mod/settings.php:963
+#: ../../mod/settings.php:964 ../../mod/register.php:234
 #: ../../mod/profiles.php:554
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
-#: ../../mod/settings.php:887 ../../mod/settings.php:893
-#: ../../mod/settings.php:901 ../../mod/settings.php:905
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:922 ../../mod/settings.php:928
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:889 ../../mod/settings.php:895
+#: ../../mod/settings.php:903 ../../mod/settings.php:907
+#: ../../mod/settings.php:912 ../../mod/settings.php:918
+#: ../../mod/settings.php:924 ../../mod/settings.php:930
 #: ../../mod/settings.php:960 ../../mod/settings.php:961
-#: ../../mod/settings.php:962 ../../mod/register.php:235
+#: ../../mod/settings.php:962 ../../mod/settings.php:963
+#: ../../mod/settings.php:964 ../../mod/register.php:235
 #: ../../mod/profiles.php:555
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1590
+#: ../../mod/photos.php:46 ../../boot.php:1607
 msgid "Photo Albums"
 msgstr ""
 
@@ -419,9 +422,9 @@ msgstr ""
 
 #: ../../mod/photos.php:591 ../../mod/like.php:145 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1362
 #: ../../include/diaspora.php:1793 ../../include/conversation.php:114
-#: ../../include/conversation.php:187
+#: ../../include/conversation.php:230
 msgid "photo"
 msgstr ""
 
@@ -520,7 +523,7 @@ msgid "Use as profile photo"
 msgstr ""
 
 #: ../../mod/photos.php:1192 ../../mod/content.php:601
-#: ../../include/conversation.php:563
+#: ../../include/conversation.php:606
 msgid "Private Message"
 msgstr ""
 
@@ -561,49 +564,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1327 ../../mod/content.php:665
-#: ../../include/conversation.php:627
+#: ../../include/conversation.php:670
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1328 ../../mod/content.php:666
-#: ../../include/conversation.php:628
+#: ../../include/conversation.php:671
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1329 ../../include/conversation.php:1066
+#: ../../mod/photos.php:1329 ../../include/conversation.php:1112
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1330 ../../mod/editpost.php:104
 #: ../../mod/content.php:482 ../../mod/content.php:842
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:293
-#: ../../mod/message.php:474 ../../include/conversation.php:444
-#: ../../include/conversation.php:804 ../../include/conversation.php:1085
+#: ../../mod/message.php:474 ../../include/conversation.php:487
+#: ../../include/conversation.php:847 ../../include/conversation.php:1131
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1346 ../../mod/photos.php:1386
 #: ../../mod/photos.php:1417 ../../mod/content.php:688
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:693
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1348 ../../mod/photos.php:1388
 #: ../../mod/photos.php:1419 ../../mod/content.php:690
-#: ../../include/conversation.php:652 ../../boot.php:565
+#: ../../include/conversation.php:695 ../../boot.php:569
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1350 ../../mod/editpost.php:125
-#: ../../mod/content.php:700 ../../include/conversation.php:662
-#: ../../include/conversation.php:1103
+#: ../../mod/content.php:700 ../../include/conversation.php:705
+#: ../../include/conversation.php:1149
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1447 ../../mod/content.php:439
-#: ../../mod/content.php:720 ../../mod/settings.php:618
-#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:665
-#: ../../include/conversation.php:401 ../../include/conversation.php:682
+#: ../../mod/content.php:720 ../../mod/settings.php:620
+#: ../../mod/settings.php:709 ../../mod/group.php:168 ../../mod/admin.php:668
+#: ../../include/conversation.php:444 ../../include/conversation.php:725
 msgid "Delete"
 msgstr ""
 
@@ -624,7 +627,8 @@ msgstr ""
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:144
+#: ../../mod/community.php:61 ../../mod/community.php:86
+#: ../../mod/search.php:146 ../../mod/search.php:172
 msgid "No results."
 msgstr ""
 
@@ -668,28 +672,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:1052
+#: ../../mod/editpost.php:80 ../../include/conversation.php:1098
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:95 ../../mod/content.php:707
-#: ../../mod/settings.php:617 ../../include/conversation.php:669
+#: ../../mod/settings.php:619 ../../include/conversation.php:712
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:291 ../../mod/message.php:471
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1113
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:1069
+#: ../../mod/editpost.php:97 ../../include/conversation.php:1115
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:292 ../../mod/message.php:472
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1117
 msgid "Insert web link"
 msgstr ""
 
@@ -705,35 +709,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:1077
+#: ../../mod/editpost.php:102 ../../include/conversation.php:1123
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:1079
+#: ../../mod/editpost.php:103 ../../include/conversation.php:1125
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1086
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1132
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1095
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1141
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1096
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1142
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1082
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1128
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1084
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1130
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1098
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1144
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -854,7 +858,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:2984
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -906,7 +910,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652
+#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:654
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1180,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:447
+#: ../../include/bb2diaspora.php:425
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1213,6 +1217,26 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
+#: ../../mod/poke.php:163
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../mod/poke.php:164
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../mod/poke.php:165
+msgid "Recipient"
+msgstr ""
+
+#: ../../mod/poke.php:166
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../mod/poke.php:168
+msgid "Make this post private"
+msgstr ""
+
 #: ../../mod/match.php:12
 msgid "Profile Match"
 msgstr ""
@@ -1226,7 +1250,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1117
+#: ../../include/contact_widgets.php:9 ../../boot.php:1123
 msgid "Connect"
 msgstr ""
 
@@ -1255,28 +1279,28 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:719
-#: ../../include/conversation.php:400 ../../include/conversation.php:681
+#: ../../include/conversation.php:443 ../../include/conversation.php:724
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:812
-#: ../../mod/content.php:813 ../../include/conversation.php:417
-#: ../../include/conversation.php:774 ../../include/conversation.php:775
+#: ../../mod/content.php:813 ../../include/conversation.php:460
+#: ../../include/conversation.php:817 ../../include/conversation.php:818
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:824
-#: ../../include/conversation.php:427 ../../include/conversation.php:786
+#: ../../include/conversation.php:470 ../../include/conversation.php:829
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:442
+#: ../../mod/content.php:480 ../../include/conversation.php:485
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:548
+#: ../../mod/content.php:586 ../../include/conversation.php:591
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1284,93 +1308,93 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
-#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:549
-#: ../../boot.php:566
+#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
+#: ../../boot.php:570
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:627
+#: ../../mod/content.php:665 ../../include/conversation.php:670
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:628
+#: ../../mod/content.php:666 ../../include/conversation.php:671
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:630
+#: ../../mod/content.php:668 ../../include/conversation.php:673
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:630
+#: ../../mod/content.php:668 ../../include/conversation.php:673
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:654
+#: ../../mod/content.php:692 ../../include/conversation.php:697
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:655
+#: ../../mod/content.php:693 ../../include/conversation.php:698
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:656
+#: ../../mod/content.php:694 ../../include/conversation.php:699
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:657
+#: ../../mod/content.php:695 ../../include/conversation.php:700
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:658
+#: ../../mod/content.php:696 ../../include/conversation.php:701
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:659
+#: ../../mod/content.php:697 ../../include/conversation.php:702
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:660
+#: ../../mod/content.php:698 ../../include/conversation.php:703
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:661
+#: ../../mod/content.php:699 ../../include/conversation.php:704
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:732 ../../include/conversation.php:694
+#: ../../mod/content.php:732 ../../include/conversation.php:737
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:695
+#: ../../mod/content.php:733 ../../include/conversation.php:738
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:696
+#: ../../mod/content.php:734 ../../include/conversation.php:739
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../include/conversation.php:699
+#: ../../mod/content.php:737 ../../include/conversation.php:742
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:700
+#: ../../mod/content.php:738 ../../include/conversation.php:743
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../include/conversation.php:704
+#: ../../mod/content.php:742 ../../include/conversation.php:747
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:814 ../../include/conversation.php:776
+#: ../../mod/content.php:814 ../../include/conversation.php:819
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:777
+#: ../../mod/content.php:815 ../../include/conversation.php:820
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:778
+#: ../../mod/content.php:816 ../../include/conversation.php:821
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -1455,7 +1479,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:666
 msgid "Approve"
 msgstr ""
 
@@ -1656,12 +1680,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:310 ../../mod/contacts.php:369
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:670
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:310 ../../mod/contacts.php:369
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:669
 msgid "Block"
 msgstr ""
 
@@ -1758,7 +1782,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:366 ../../mod/admin.php:1138
+#: ../../mod/contacts.php:366 ../../mod/admin.php:1141
 msgid "Update now"
 msgstr ""
 
@@ -1886,10 +1910,10 @@ msgstr ""
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1192
+#: ../../addon/facebook/facebook.php:1200
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2993
-#: ../../boot.php:767
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213
+#: ../../boot.php:772
 msgid "Administrator"
 msgstr ""
 
@@ -1899,7 +1923,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:899
+#: ../../mod/lostpass.php:83 ../../boot.php:905
 msgid "Password Reset"
 msgstr ""
 
@@ -1971,7 +1995,7 @@ msgstr ""
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:89 ../../mod/admin.php:753 ../../mod/admin.php:958
+#: ../../mod/settings.php:89 ../../mod/admin.php:756 ../../mod/admin.php:961
 #: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
 #: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
@@ -1982,7 +2006,7 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:136 ../../mod/settings.php:581
+#: ../../mod/settings.php:136 ../../mod/settings.php:583
 msgid "Update"
 msgstr ""
 
@@ -2010,457 +2034,461 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:386
+#: ../../mod/settings.php:388
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:388
+#: ../../mod/settings.php:390
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:394
+#: ../../mod/settings.php:396
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:396
+#: ../../mod/settings.php:398
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:450
+#: ../../mod/settings.php:452
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:456
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:486 ../../addon/facebook/facebook.php:495
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:382
+#: ../../addon/twitter/twitter.php:389
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:554 ../../mod/settings.php:580
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:556 ../../mod/settings.php:582
+#: ../../mod/settings.php:618
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../addon/statusnet/statusnet.php:561
+#: ../../mod/settings.php:560 ../../mod/settings.php:586
+#: ../../addon/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
-#: ../../addon/statusnet/statusnet.php:560
+#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../addon/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:560 ../../mod/settings.php:586
+#: ../../mod/settings.php:562 ../../mod/settings.php:588
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:574
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:617
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:621
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:622
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:623
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:632
+#: ../../mod/settings.php:634
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:642 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:654 ../../mod/settings.php:655
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:654 ../../mod/settings.php:655
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/settings.php:653
+#: ../../mod/settings.php:654 ../../mod/settings.php:655
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:655
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:687
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:693
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:698
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:699
 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:698
+#: ../../mod/settings.php:700
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:700
+#: ../../mod/settings.php:702
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:701
+#: ../../mod/settings.php:703
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:702
+#: ../../mod/settings.php:704
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:702 ../../mod/settings.php:707
+#: ../../mod/settings.php:704 ../../mod/settings.php:709
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:703
+#: ../../mod/settings.php:705
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:706
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:705
+#: ../../mod/settings.php:707
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:706
+#: ../../mod/settings.php:708
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:709
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:709
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:709
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:708
+#: ../../mod/settings.php:710
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:768
+#: ../../mod/settings.php:770
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:776
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:777
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:777
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:778
 msgid "Number of items to display on the network page:"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:778
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:779
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:850
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:849
+#: ../../mod/settings.php:851
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:854
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:855
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:856
+#: ../../mod/settings.php:858
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:859
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:862
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:863
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:866
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:867
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:879
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:879
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:887
+#: ../../mod/settings.php:889
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:895
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:903
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:905
+#: ../../mod/settings.php:907
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:912
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:918
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:924
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:930
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:936
+#: ../../mod/settings.php:938
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:939 ../../mod/profile_photo.php:214
+#: ../../mod/settings.php:941 ../../mod/profile_photo.php:214
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:946
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:957
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:957
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:958
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:959
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:960
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:961
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:962
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:963
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:964
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:971
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:979
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:980
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:981
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:981
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:985
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:984 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:986 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:987
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:988
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:989
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:990
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:993
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:995
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:993 ../../mod/settings.php:1012
+#: ../../mod/settings.php:995 ../../mod/settings.php:1014
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:994
+#: ../../mod/settings.php:996
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:997
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1014
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1017
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1018
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1019
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1020
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1021
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1022
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1023
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1024
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1025
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1026
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1027
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1028
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1029
 msgid "You are tagged in a post"
 msgstr ""
 
 #: ../../mod/settings.php:1030
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1033
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1034
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2562,14 +2590,14 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1602
+#: ../../mod/notes.php:44 ../../boot.php:1621
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
-#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:236
+#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:677
 msgid "Save"
 msgstr ""
 
@@ -2603,7 +2631,7 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:124 ../../mod/message.php:250
-#: ../../include/conversation.php:1020
+#: ../../include/conversation.php:1066
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2813,7 +2841,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1581
+#: ../../include/nav.php:50 ../../boot.php:1597
 msgid "Profile"
 msgstr ""
 
@@ -2829,7 +2857,7 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:614
 msgid "View Contacts"
 msgstr ""
 
@@ -2917,7 +2945,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:865
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:871
 msgid "Register"
 msgstr ""
 
@@ -2926,17 +2954,17 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1586
+#: ../../addon/facebook/facebook.php:1594
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793
 #: ../../include/conversation.php:109 ../../include/conversation.php:118
-#: ../../include/conversation.php:182 ../../include/conversation.php:191
+#: ../../include/conversation.php:225 ../../include/conversation.php:234
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1590
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809
 #: ../../include/conversation.php:126
@@ -2950,8 +2978,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:702 ../../mod/admin.php:901 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3472
+#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3692
 msgid "Item not found."
 msgstr ""
 
@@ -2960,7 +2988,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1587
+#: ../../include/nav.php:51 ../../boot.php:1604
 msgid "Photos"
 msgstr ""
 
@@ -3185,15 +3213,15 @@ msgstr ""
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:657 ../../mod/admin.php:669
+#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:751 ../../mod/admin.php:793
+#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:956 ../../mod/admin.php:992
+#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995
 msgid "Themes"
 msgstr ""
 
@@ -3201,7 +3229,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1079
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082
 msgid "Logs"
 msgstr ""
 
@@ -3217,19 +3245,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:639
+#: ../../mod/admin.php:183 ../../mod/admin.php:642
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:640
+#: ../../mod/admin.php:184 ../../mod/admin.php:643
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:641
+#: ../../mod/admin.php:185 ../../mod/admin.php:644
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:642
+#: ../../mod/admin.php:186 ../../mod/admin.php:645
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3245,9 +3273,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:656
-#: ../../mod/admin.php:750 ../../mod/admin.php:792 ../../mod/admin.php:955
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078
+#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659
+#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958
+#: ../../mod/admin.php:994 ../../mod/admin.php:1081
 msgid "Administration"
 msgstr ""
 
@@ -3311,7 +3339,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:558
+#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
@@ -3552,226 +3580,226 @@ msgid ""
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:487
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:490
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:494
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:494
+#: ../../mod/admin.php:497
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:512
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:514
+#: ../../mod/admin.php:517
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:518
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:519
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:544
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:551
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:587
+#: ../../mod/admin.php:590
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:595
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:595
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:662
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:663
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:664
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:661 ../../mod/admin.php:670
+#: ../../mod/admin.php:664 ../../mod/admin.php:673
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:665
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:667
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:673
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:675
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:676
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:714
+#: ../../mod/admin.php:717
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:721
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:728 ../../mod/admin.php:926
+#: ../../mod/admin.php:731 ../../mod/admin.php:929
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:730 ../../mod/admin.php:928
+#: ../../mod/admin.php:733 ../../mod/admin.php:931
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:752 ../../mod/admin.php:957
+#: ../../mod/admin.php:755 ../../mod/admin.php:960
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:967
+#: ../../mod/admin.php:763 ../../mod/admin.php:970
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:761 ../../mod/admin.php:968
+#: ../../mod/admin.php:764 ../../mod/admin.php:971
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:890
+#: ../../mod/admin.php:893
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:952
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:997
+#: ../../mod/admin.php:1000
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:998
+#: ../../mod/admin.php:1001
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1025
+#: ../../mod/admin.php:1028
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1081
+#: ../../mod/admin.php:1084
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1087
+#: ../../mod/admin.php:1090
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1088
+#: ../../mod/admin.php:1091
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1088
+#: ../../mod/admin.php:1091
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1089
+#: ../../mod/admin.php:1092
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1139
+#: ../../mod/admin.php:1142
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1145
+#: ../../mod/admin.php:1148
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1146
+#: ../../mod/admin.php:1149
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1147
+#: ../../mod/admin.php:1150
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1148
+#: ../../mod/admin.php:1151
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1030
+#: ../../mod/profile.php:21 ../../boot.php:1036
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3858,7 +3886,7 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/share.php:28 ../../include/bb2diaspora.php:286
+#: ../../mod/share.php:28
 msgid "link"
 msgstr ""
 
@@ -3874,8 +3902,8 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:83 ../../include/text.php:649
-#: ../../include/text.php:650 ../../include/nav.php:91
+#: ../../mod/search.php:83 ../../include/text.php:674
+#: ../../include/text.php:675 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
@@ -4166,27 +4194,27 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:672 ../../boot.php:1139
+#: ../../mod/profiles.php:672 ../../boot.php:1145
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:673 ../../boot.php:1140
+#: ../../mod/profiles.php:673 ../../boot.php:1146
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:684 ../../boot.php:1150
+#: ../../mod/profiles.php:684 ../../boot.php:1156
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:686 ../../boot.php:1153
+#: ../../mod/profiles.php:686 ../../boot.php:1159
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:687 ../../boot.php:1154
+#: ../../mod/profiles.php:687 ../../boot.php:1160
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1024
+#: ../../mod/filer.php:29 ../../include/conversation.php:1070
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4194,7 +4222,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:199
+#: ../../mod/tagger.php:103 ../../include/conversation.php:242
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4310,17 +4338,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1175
+#: ../../boot.php:1181
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1178
+#: ../../boot.php:1184
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1180
+#: ../../boot.php:1186
 msgid "Homepage:"
 msgstr ""
 
@@ -4700,23 +4728,23 @@ msgid ""
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1141
+#: ../../addon/facebook/facebook.php:1149
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1174
+#: ../../addon/facebook/facebook.php:1182
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1222
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1215
+#: ../../addon/facebook/facebook.php:1223
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1216
+#: ../../addon/facebook/facebook.php:1224
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4738,23 +4766,35 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:184
+#: ../../addon/bg/bg.php:51
+msgid "Bg settings updated."
+msgstr ""
+
+#: ../../addon/bg/bg.php:82
+msgid "Bg Settings"
+msgstr ""
+
+#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:233
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:189
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:238
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:241
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:243
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:196
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:245
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -4792,6 +4832,157 @@ msgstr ""
 msgid "Connect on Friendica!"
 msgstr ""
 
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "point out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "pointed out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declare undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declared undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:24
+msgid "set fire to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patent"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patented"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroke beard"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroked their beard at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoaned the declining standards of modern secondary and tertiary education "
+"to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hug"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hugged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kiss"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kissed"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raise eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raised their eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insult"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insulted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praise"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praised"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "be dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "was dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "eat"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "ate"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggle and fawn at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggled and fawned at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubt"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glare"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glared at"
+msgstr ""
+
 #: ../../addon/yourls/yourls.php:55
 msgid "YourLS Settings"
 msgstr ""
@@ -4876,10 +5067,11 @@ msgid "%s - Click to open/close"
 msgstr ""
 
 #: ../../addon/page/page.php:61 ../../addon/page/page.php:91
+#: ../../addon/forumlist/forumlist.php:54
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:129
+#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
 msgid "Forums:"
 msgstr ""
 
@@ -4891,7 +5083,7 @@ msgstr ""
 msgid "Page Settings"
 msgstr ""
 
-#: ../../addon/page/page.php:196
+#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
@@ -4915,7 +5107,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:886
+#: ../../include/nav.php:64 ../../boot.php:892
 msgid "Login"
 msgstr ""
 
@@ -4943,8 +5135,8 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319
-#: ../../include/conversation.php:106 ../../include/conversation.php:179
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1360
+#: ../../include/conversation.php:106 ../../include/conversation.php:222
 msgid "event"
 msgstr ""
 
@@ -5053,7 +5245,7 @@ msgstr ""
 msgid "Limitations"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:391
+#: ../../addon/dav/layout.fnk.php:391 ../../addon/libravatar/libravatar.php:82
 msgid "Warning"
 msgstr ""
 
@@ -5379,6 +5571,30 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
+#: ../../addon/forumlist/forumlist.php:57
+msgid "show/hide"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:72
+msgid "No forum subscriptions"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:124
+msgid "Forumlist settings updated."
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:153
+msgid "Forumlist Settings"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:158
+msgid "Randomise Forumlist/Forum list"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:161
+msgid "Show forumlists/forums on profile forumlist"
+msgstr ""
+
 #: ../../addon/impressum/impressum.php:36
 msgid "Impressum"
 msgstr ""
@@ -5537,6 +5753,82 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/group_text/group_text.php:46
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr ""
+
+#: ../../addon/group_text/group_text.php:76
+msgid "Group Text"
+msgstr ""
+
+#: ../../addon/group_text/group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:73
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:74
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:75
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:76
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:77
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:93
+#: ../../addon/gravatar/gravatar.php:89
+msgid "Information"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:93
+msgid ""
+"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
+"Libravatar addon will fall back to Gravatar if nothing was found at "
+"Libravatar."
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:100
+#: ../../addon/gravatar/gravatar.php:96
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr ""
+
 #: ../../addon/libertree/libertree.php:36
 msgid "Post to libertree"
 msgstr ""
@@ -5561,6 +5853,18 @@ msgstr ""
 msgid "Post to Libertree by default"
 msgstr ""
 
+#: ../../addon/altpager/altpager.php:46
+msgid "Altpager settings updated."
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:79
+msgid "Alternate Pagination Setting"
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:81
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr ""
+
 #: ../../addon/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -5582,10 +5886,6 @@ msgid ""
 "be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
-#: ../../addon/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr ""
-
 #: ../../addon/editplain/editplain.php:76
 msgid "Editplain Settings"
 msgstr ""
@@ -5594,43 +5894,26 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:71
-msgid "generic profile image"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:72
-msgid "random geometric pattern"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:73
-msgid "monster face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:74
-msgid "computer generated face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:75
-msgid "retro arcade style face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:87
-msgid "Default avatar image"
+#: ../../addon/gravatar/gravatar.php:89
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:87
+#: ../../addon/gravatar/gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:88
+#: ../../addon/gravatar/gravatar.php:97
 msgid "Rating of images"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:88
+#: ../../addon/gravatar/gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:102
+#: ../../addon/gravatar/gravatar.php:111
 msgid "Gravatar settings updated."
 msgstr ""
 
@@ -5808,7 +6091,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:559
+#: ../../addon/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
 
@@ -5848,10 +6131,6 @@ msgstr ""
 msgid "Numfriends Settings"
 msgstr ""
 
-#: ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr ""
-
 #: ../../addon/gnot/gnot.php:48
 msgid "Gnot settings updated."
 msgstr ""
@@ -6025,11 +6304,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:390
+#: ../../addon/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -6698,11 +6977,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:453
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:431
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:461
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:439
 msgid "Finishes:"
 msgstr ""
 
@@ -6735,138 +7014,194 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:568
+#: ../../include/text.php:295
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:299
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:593
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:577
+#: ../../include/text.php:602
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:715
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:715 ../../include/conversation.php:201
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:716
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:716
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:717
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:717
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:718
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:718
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:719
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:719
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:880
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:880
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:843
+#: ../../include/text.php:884
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:929
+#: ../../include/text.php:970
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:949 ../../include/text.php:964
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:949 ../../include/text.php:964
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:952
+#: ../../include/text.php:993
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:967
+#: ../../include/text.php:1008
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:983 ../../include/text.php:995
+#: ../../include/text.php:1024 ../../include/text.php:1036
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1101 ../../include/user.php:236
+#: ../../include/text.php:1142 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1154
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1323
+#: ../../include/text.php:1364
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1325
+#: ../../include/text.php:1366
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1326
+#: ../../include/text.php:1367
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1481
+#: ../../include/text.php:1522
 msgid "Item filed"
 msgstr ""
 
@@ -6874,11 +7209,11 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2174
+#: ../../include/diaspora.php:2177
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:842
+#: ../../include/network.php:843
 msgid "view full size"
 msgstr ""
 
@@ -6925,7 +7260,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:885
+#: ../../include/nav.php:46 ../../boot.php:891
 msgid "Logout"
 msgstr ""
 
@@ -6933,7 +7268,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1575
+#: ../../include/nav.php:49 ../../boot.php:1590
 msgid "Status"
 msgstr ""
 
@@ -7013,11 +7348,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1139
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1139
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7110,81 +7445,81 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:263
+#: ../../include/datetime.php:153 ../../include/datetime.php:285
 msgid "year"
 msgstr ""
 
-#: ../../include/datetime.php:136 ../../include/datetime.php:264
+#: ../../include/datetime.php:158 ../../include/datetime.php:286
 msgid "month"
 msgstr ""
 
-#: ../../include/datetime.php:141 ../../include/datetime.php:266
+#: ../../include/datetime.php:163 ../../include/datetime.php:288
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:276
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:260
+#: ../../include/datetime.php:282
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:263
+#: ../../include/datetime.php:285
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:264
+#: ../../include/datetime.php:286
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:265
+#: ../../include/datetime.php:287
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:265
+#: ../../include/datetime.php:287
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:266
+#: ../../include/datetime.php:288
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:289
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:289
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:268
+#: ../../include/datetime.php:290
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:268
+#: ../../include/datetime.php:290
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:269
+#: ../../include/datetime.php:291
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:269
+#: ../../include/datetime.php:291
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:278
+#: ../../include/datetime.php:300
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:450 ../../include/items.php:1561
+#: ../../include/datetime.php:472 ../../include/items.php:1620
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:451 ../../include/items.php:1562
+#: ../../include/datetime.php:473 ../../include/items.php:1621
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -7193,11 +7528,11 @@ msgstr ""
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:102 ../../include/bbcode.php:313
+#: ../../include/bbcode.php:102 ../../include/bbcode.php:317
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:278 ../../include/bbcode.php:298
+#: ../../include/bbcode.php:282 ../../include/bbcode.php:302
 msgid "$1 wrote:"
 msgstr ""
 
@@ -7282,7 +7617,8 @@ msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
 #: ../../include/enotify.php:116 ../../include/enotify.php:131
-#: ../../include/enotify.php:144 ../../include/enotify.php:157
+#: ../../include/enotify.php:144 ../../include/enotify.php:162
+#: ../../include/enotify.php:175
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
@@ -7317,68 +7653,83 @@ msgstr ""
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:151
+#: ../../include/enotify.php:152
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr ""
+
+#: ../../include/enotify.php:153
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:154
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:169
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:170
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:153
+#: ../../include/enotify.php:171
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:164
+#: ../../include/enotify.php:182
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:165
+#: ../../include/enotify.php:183
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:166
+#: ../../include/enotify.php:184
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:169 ../../include/enotify.php:187
+#: ../../include/enotify.php:187 ../../include/enotify.php:205
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:171
+#: ../../include/enotify.php:189
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:178
+#: ../../include/enotify.php:196
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:179
+#: ../../include/enotify.php:197
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:180
+#: ../../include/enotify.php:198
 #, php-format
 msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:185
+#: ../../include/enotify.php:203
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:186
+#: ../../include/enotify.php:204
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:189
+#: ../../include/enotify.php:207
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
@@ -7438,23 +7789,18 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2991
+#: ../../include/items.php:3211
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2991
+#: ../../include/items.php:3211
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3660
+#: ../../include/items.php:3880
 msgid "Archives"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:286 ../../include/bb2diaspora.php:296
-#: ../../include/bb2diaspora.php:297
-msgid "image/photo"
-msgstr ""
-
 #: ../../include/user.php:38
 msgid "An invitation is required."
 msgstr ""
@@ -7545,247 +7891,256 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:218 ../../include/conversation.php:915
+#: ../../include/Contact.php:220 ../../include/conversation.php:966
+msgid "Poke"
+msgstr ""
+
+#: ../../include/Contact.php:221 ../../include/conversation.php:960
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:219 ../../include/conversation.php:916
+#: ../../include/Contact.php:222 ../../include/conversation.php:961
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:917
+#: ../../include/Contact.php:223 ../../include/conversation.php:962
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/Contact.php:234
-#: ../../include/conversation.php:918
+#: ../../include/Contact.php:224 ../../include/Contact.php:237
+#: ../../include/conversation.php:963
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/Contact.php:234
-#: ../../include/conversation.php:919
+#: ../../include/Contact.php:225 ../../include/Contact.php:237
+#: ../../include/conversation.php:964
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/Contact.php:234
-#: ../../include/conversation.php:920
+#: ../../include/Contact.php:226 ../../include/Contact.php:237
+#: ../../include/conversation.php:965
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:224
+#: ../../include/conversation.php:197
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:267
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:225
+#: ../../include/conversation.php:268
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:823
+#: ../../include/conversation.php:866
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:978
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:978
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:982
+#: ../../include/conversation.php:1028
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:984
+#: ../../include/conversation.php:1030
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1036
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:993
+#: ../../include/conversation.php:1039
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:994
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:994
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1019
+#: ../../include/conversation.php:1065
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1021
+#: ../../include/conversation.php:1067
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1068
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1023
+#: ../../include/conversation.php:1069
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1025
+#: ../../include/conversation.php:1071
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1114
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1116
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1072
+#: ../../include/conversation.php:1118
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1119
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1120
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1121
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1122
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1124
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1126
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1133
 msgid "permissions"
 msgstr ""
 
-#: ../../include/plugin.php:388 ../../include/plugin.php:390
+#: ../../include/plugin.php:390 ../../include/plugin.php:392
 msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/plugin.php:396
+#: ../../include/plugin.php:398
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/plugin.php:401
+#: ../../include/plugin.php:403
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:564
+#: ../../boot.php:568
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:567
+#: ../../boot.php:571
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:767
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:764
+#: ../../boot.php:769
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:864
+#: ../../boot.php:870
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:888
+#: ../../boot.php:894
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:889
+#: ../../boot.php:895
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:892
+#: ../../boot.php:898
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:898
+#: ../../boot.php:904
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1065
+#: ../../boot.php:1071
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1125
+#: ../../boot.php:1131
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1241 ../../boot.php:1320
+#: ../../boot.php:1247 ../../boot.php:1326
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1242 ../../boot.php:1321
+#: ../../boot.php:1248 ../../boot.php:1327
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1287 ../../boot.php:1361
+#: ../../boot.php:1293 ../../boot.php:1367
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1305
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1300
+#: ../../boot.php:1306
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1354
+#: ../../boot.php:1360
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1372
+#: ../../boot.php:1378
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1373
+#: ../../boot.php:1379
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1578
+#: ../../boot.php:1593
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1584
+#: ../../boot.php:1600
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1599
+#: ../../boot.php:1617
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1605
+#: ../../boot.php:1624
 msgid "Only You Can See This"
 msgstr ""