From 8c83828f839678b0ad0bb975ba6831e493c13aea Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 20 Jul 2012 15:12:21 -0700
Subject: [PATCH] rev update

---
 boot.php         |   2 +-
 util/messages.po | 835 +++++++++++++++++++++++++++--------------------
 2 files changed, 475 insertions(+), 362 deletions(-)

diff --git a/boot.php b/boot.php
index beaaeb2475..cc5bb22fb5 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1409' );
+define ( 'FRIENDICA_VERSION',      '3.0.1410' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1153      );
 
diff --git a/util/messages.po b/util/messages.po
index 9155007995..fc19fc7f9a 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1409\n"
+"Project-Id-Version: 3.0.1410\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-19 10:00-0700\n"
+"POT-Creation-Date: 2012-07-20 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:3651 ../../index.php:309
+#: ../../include/items.php:3701 ../../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:661 ../../mod/admin.php:670
 msgid "Name"
 msgstr ""
 
@@ -127,10 +127,10 @@ 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/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:658
 #: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080
 #: ../../mod/profiles.php:577 ../../mod/invite.php:119
@@ -159,18 +159,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 ""
 
@@ -225,12 +225,12 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:304 ../../include/text.php:1094
+#: ../../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:1599
 msgid "Events"
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr ""
 
 #: ../../mod/events.php:429 ../../mod/directory.php:132
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:447
-#: ../../boot.php:1173
+#: ../../boot.php:1176
 msgid "Location:"
 msgstr ""
 
@@ -299,8 +299,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 ""
 
@@ -344,30 +344,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:1593
 msgid "Photo Albums"
 msgstr ""
 
@@ -420,9 +420,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:1346
+#: ../../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 ""
 
@@ -521,7 +521,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 ""
 
@@ -562,49 +562,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:568
 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:665
+#: ../../include/conversation.php:444 ../../include/conversation.php:725
 msgid "Delete"
 msgstr ""
 
@@ -670,28 +670,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 ""
 
@@ -707,35 +707,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 ""
 
@@ -856,7 +856,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3042
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3092
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -908,7 +908,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 ""
@@ -1215,6 +1215,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 ""
@@ -1228,7 +1248,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:1120
 msgid "Connect"
 msgstr ""
 
@@ -1257,28 +1277,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"
@@ -1287,92 +1307,92 @@ 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
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
+#: ../../boot.php:569
 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 ""
 
@@ -1888,10 +1908,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:3051
-#: ../../boot.php:767
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3101
+#: ../../boot.php:770
 msgid "Administrator"
 msgstr ""
 
@@ -1901,7 +1921,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:899
+#: ../../mod/lostpass.php:83 ../../boot.php:902
 msgid "Password Reset"
 msgstr ""
 
@@ -1984,7 +2004,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 ""
 
@@ -2012,457 +2032,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 ""
 
@@ -2564,13 +2588,13 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1602
+#: ../../mod/notes.php:44 ../../boot.php:1605
 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/privacy_image_cache/privacy_image_cache.php:236
 #: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:677
 msgid "Save"
 msgstr ""
@@ -2605,7 +2629,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 ""
 
@@ -2815,7 +2839,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:1584
 msgid "Profile"
 msgstr ""
 
@@ -2919,7 +2943,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:868
 msgid "Register"
 msgstr ""
 
@@ -2928,17 +2952,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
@@ -2953,7 +2977,7 @@ 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:3530
+#: ../../mod/display.php:142 ../../include/items.php:3580
 msgid "Item not found."
 msgstr ""
 
@@ -2962,7 +2986,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:1590
 msgid "Photos"
 msgstr ""
 
@@ -3313,7 +3337,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 ""
 
@@ -3773,7 +3797,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1030
+#: ../../mod/profile.php:21 ../../boot.php:1033
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -4168,27 +4192,27 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:672 ../../boot.php:1139
+#: ../../mod/profiles.php:672 ../../boot.php:1142
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:673 ../../boot.php:1140
+#: ../../mod/profiles.php:673 ../../boot.php:1143
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:684 ../../boot.php:1150
+#: ../../mod/profiles.php:684 ../../boot.php:1153
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:686 ../../boot.php:1153
+#: ../../mod/profiles.php:686 ../../boot.php:1156
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:687 ../../boot.php:1154
+#: ../../mod/profiles.php:687 ../../boot.php:1157
 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 ""
 
@@ -4196,7 +4220,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 ""
@@ -4312,17 +4336,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1175
+#: ../../boot.php:1178
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1178
+#: ../../boot.php:1181
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1180
+#: ../../boot.php:1183
 msgid "Homepage:"
 msgstr ""
 
@@ -4702,23 +4726,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"
@@ -4752,23 +4776,23 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:184
+#: ../../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 ""
 
@@ -4929,7 +4953,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:889
 msgid "Login"
 msgstr ""
 
@@ -4957,8 +4981,8 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1344
-#: ../../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 ""
 
@@ -5706,6 +5730,22 @@ msgstr ""
 msgid "Gravatar settings updated."
 msgstr ""
 
+#: ../../addon/morechoice/morechoice.php:129
+msgid "bitchslap"
+msgstr ""
+
+#: ../../addon/morechoice/morechoice.php:129
+msgid "bitchslapped"
+msgstr ""
+
+#: ../../addon/morechoice/morechoice.php:130
+msgid "shag"
+msgstr ""
+
+#: ../../addon/morechoice/morechoice.php:130
+msgid "shagged"
+msgstr ""
+
 #: ../../addon/testdrive/testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr ""
@@ -5880,7 +5920,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:559
+#: ../../addon/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
 
@@ -6093,11 +6133,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 ""
 
@@ -6822,127 +6862,175 @@ msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:864
+#: ../../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:864
+#: ../../include/text.php:880
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:880
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:880
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:880
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:880
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:880
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:884
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:954
+#: ../../include/text.php:970
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:974 ../../include/text.php:989
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:974 ../../include/text.php:989
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:977
+#: ../../include/text.php:993
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:992
+#: ../../include/text.php:1008
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:1008 ../../include/text.php:1020
+#: ../../include/text.php:1024 ../../include/text.php:1036
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1126 ../../include/user.php:236
+#: ../../include/text.php:1142 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1138
+#: ../../include/text.php:1154
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1348
+#: ../../include/text.php:1364
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1350
+#: ../../include/text.php:1366
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1351
+#: ../../include/text.php:1367
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1506
+#: ../../include/text.php:1522
 msgid "Item filed"
 msgstr ""
 
@@ -7001,7 +7089,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:885
+#: ../../include/nav.php:46 ../../boot.php:888
 msgid "Logout"
 msgstr ""
 
@@ -7009,7 +7097,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1575
+#: ../../include/nav.php:49 ../../boot.php:1578
 msgid "Status"
 msgstr ""
 
@@ -7089,11 +7177,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1136
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1133
+#: ../../include/nav.php:138 ../../boot.php:1136
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7358,7 +7446,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 ""
@@ -7393,68 +7482,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 ""
@@ -7514,15 +7618,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:3049
+#: ../../include/items.php:3099
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3049
+#: ../../include/items.php:3099
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3718
+#: ../../include/items.php:3768
 msgid "Archives"
 msgstr ""
 
@@ -7616,142 +7720,151 @@ 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 ""
 
@@ -7767,96 +7880,96 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:564
+#: ../../boot.php:567
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:567
+#: ../../boot.php:570
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:765
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:764
+#: ../../boot.php:767
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:864
+#: ../../boot.php:867
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:888
+#: ../../boot.php:891
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:889
+#: ../../boot.php:892
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:892
+#: ../../boot.php:895
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:898
+#: ../../boot.php:901
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1065
+#: ../../boot.php:1068
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1125
+#: ../../boot.php:1128
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1241 ../../boot.php:1320
+#: ../../boot.php:1244 ../../boot.php:1323
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1242 ../../boot.php:1321
+#: ../../boot.php:1245 ../../boot.php:1324
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1287 ../../boot.php:1361
+#: ../../boot.php:1290 ../../boot.php:1364
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1302
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1300
+#: ../../boot.php:1303
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1354
+#: ../../boot.php:1357
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1372
+#: ../../boot.php:1375
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1373
+#: ../../boot.php:1376
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1578
+#: ../../boot.php:1581
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1584
+#: ../../boot.php:1587
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1599
+#: ../../boot.php:1602
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1605
+#: ../../boot.php:1608
 msgid "Only You Can See This"
 msgstr ""
-- 
2.39.5