From 32868dab79a2fac3e328e72ce8aad9f14633317f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Nov 2012 15:17:41 -0800
Subject: [PATCH] catch stragglers in "chunked" delivery mode

---
 boot.php             |   2 +-
 include/notifier.php |   4 +
 util/messages.po     | 291 ++++++++++++++++++++++---------------------
 3 files changed, 155 insertions(+), 142 deletions(-)

diff --git a/boot.php b/boot.php
index 1809df966c..fa4a9364fd 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1538' );
+define ( 'FRIENDICA_VERSION',      '3.0.1540' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 
diff --git a/include/notifier.php b/include/notifier.php
index f05bac1966..091d09b562 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -606,6 +606,10 @@ function notifier_run(&$argv, &$argc){
 				}
 				continue;
 			}
+			// be sure to pick up any stragglers
+			if(count($this_batch))
+				proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
+
 
 			$deliver_status = 0;
 
diff --git a/util/messages.po b/util/messages.po
index 6e5e6a3e2a..bc4ff31d33 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1538\n"
+"Project-Id-Version: 3.0.1540\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-25 10:00-0800\n"
+"POT-Creation-Date: 2012-11-27 10:00-0800\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"
@@ -131,9 +131,9 @@ msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 #: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/install.php:246
+#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
+#: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:352
 #: ../../mod/settings.php:559 ../../mod/settings.php:669
@@ -171,15 +171,15 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:685 ../../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:394
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:645
+#: ../../view/theme/diabook/theme.php:600
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
 #: ../../object/Item.php:570 ../../addon.old/fromgplus/fromgplus.php:40
@@ -286,7 +286,7 @@ msgstr ""
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
 #: ../../include/nav.php:52 ../../boot.php:1748
 msgid "Events"
 msgstr ""
@@ -344,6 +344,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
 #: ../../boot.php:1278
 msgid "Location:"
@@ -435,15 +436,15 @@ msgid "Photo Albums"
 msgstr ""
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
-#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
+#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
+#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
 #: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:529
+#: ../../view/theme/diabook/theme.php:486
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
+#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
 msgid "Upload New Photos"
 msgstr ""
 
@@ -455,13 +456,13 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
-#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
+#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:530 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:487 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@@ -471,11 +472,11 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1105
+#: ../../mod/photos.php:182 ../../mod/photos.php:1101
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1368
+#: ../../mod/photos.php:245 ../../mod/photos.php:1364
 msgid "Delete Photo"
 msgstr ""
 
@@ -488,7 +489,7 @@ msgstr ""
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
@@ -510,6 +511,7 @@ msgstr ""
 #: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr ""
 
@@ -521,128 +523,123 @@ msgstr ""
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1037
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1041
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:1047
+#: ../../mod/photos.php:1043
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1048
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1049
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1115
+#: ../../mod/photos.php:1111
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1121
+#: ../../mod/photos.php:1117
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1123
+#: ../../mod/photos.php:1119
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
+#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1178
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1184
+#: ../../mod/photos.php:1180
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1236
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1236
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1241
+#: ../../mod/photos.php:1237
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1247 ../../mod/content.php:603
+#: ../../mod/photos.php:1243 ../../mod/content.php:603
 #: ../../object/Item.php:104
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1266
+#: ../../mod/photos.php:1262
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1340
+#: ../../mod/photos.php:1336
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1343
+#: ../../mod/photos.php:1339
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1349
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1354
+#: ../../mod/photos.php:1350
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1356
+#: ../../mod/photos.php:1352
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1359
+#: ../../mod/photos.php:1355
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1357
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1365
+#: ../../mod/photos.php:1361
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:667
+#: ../../mod/photos.php:1381 ../../mod/content.php:667
 #: ../../object/Item.php:202
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1386 ../../mod/content.php:668
+#: ../../mod/photos.php:1382 ../../mod/content.php:668
 #: ../../object/Item.php:203
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1387 ../../include/conversation.php:969
+#: ../../mod/photos.php:1383 ../../include/conversation.php:969
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1388 ../../mod/editpost.php:121
+#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
 #: ../../mod/content.php:482 ../../mod/content.php:848
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
 #: ../../mod/message.php:488 ../../include/conversation.php:624
@@ -650,37 +647,37 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/content.php:690
+#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
+#: ../../mod/photos.php:1516 ../../mod/content.php:690
 #: ../../object/Item.php:567
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:608
+#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
 #: ../../object/Item.php:266 ../../object/Item.php:569
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
-#: ../../mod/photos.php:1524 ../../mod/editpost.php:142
+#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
 #: ../../mod/content.php:702 ../../include/conversation.php:1006
 #: ../../object/Item.php:579
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1492 ../../mod/content.php:439
+#: ../../mod/photos.php:1488 ../../mod/content.php:439
 #: ../../mod/content.php:724 ../../mod/settings.php:622
 #: ../../mod/group.php:168 ../../mod/admin.php:696
 #: ../../include/conversation.php:569 ../../object/Item.php:118
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1605
+#: ../../mod/photos.php:1601
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1614
+#: ../../mod/photos.php:1610
 msgid "Recent Photos"
 msgstr ""
 
@@ -688,7 +685,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@@ -1051,9 +1048,8 @@ msgstr ""
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
 #: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:387
-#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:138
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:615
+#: ../../include/nav.php:138 ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
 msgstr ""
@@ -1589,7 +1585,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
 #: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr ""
@@ -2034,7 +2030,7 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:142
 msgid "Contacts"
 msgstr ""
@@ -2044,10 +2040,12 @@ msgid "Search your contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr ""
 
 #: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -2200,7 +2198,7 @@ msgstr ""
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/twitter/twitter.php:501
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2216,13 +2214,13 @@ msgid "Add application"
 msgstr ""
 
 #: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../addon/statusnet/statusnet.php:570
+#: ../../addon/statusnet/statusnet.php:679
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
 #: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:569
+#: ../../addon/statusnet/statusnet.php:678
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
@@ -2766,7 +2764,7 @@ msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
 #: ../../addon/fbpost/fbpost.php:267
 #: ../../addon/dav/friendica/layout.fnk.php:441
 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
@@ -2925,7 +2923,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
 #: ../../boot.php:1731
 msgid "Profile"
@@ -3242,7 +3240,7 @@ msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:501 ../../include/text.php:1442
+#: ../../view/theme/diabook/theme.php:458 ../../include/text.php:1442
 #: ../../include/diaspora.php:1848 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
@@ -3253,8 +3251,8 @@ msgstr ""
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:496
-#: ../../view/theme/diabook/theme.php:505 ../../include/diaspora.php:1848
+#: ../../view/theme/diabook/theme.php:453
+#: ../../view/theme/diabook/theme.php:462 ../../include/diaspora.php:1848
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3265,7 +3263,7 @@ msgstr ""
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:510 ../../include/diaspora.php:1864
+#: ../../view/theme/diabook/theme.php:467 ../../include/diaspora.php:1864
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3288,7 +3286,7 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
 #: ../../include/nav.php:51 ../../boot.php:1738
 msgid "Photos"
 msgstr ""
@@ -3655,7 +3653,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:676
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
@@ -4561,6 +4559,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/profiles.php:652 ../../mod/directory.php:111
+#: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr ""
 
@@ -4681,7 +4680,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:557
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:514
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4696,42 +4695,50 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:555
+#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
+#: ../../view/theme/diabook/theme.php:512
 msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
 msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/directory.php:60
+#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
 msgid "Site Directory"
 msgstr ""
 
 #: ../../mod/directory.php:114
+#: ../../addon/forumdirectory/forumdirectory.php:136
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1280
+#: ../../mod/directory.php:136
+#: ../../addon/forumdirectory/forumdirectory.php:158
+#: ../../include/profile_advanced.php:17 ../../boot.php:1280
 msgid "Gender:"
 msgstr ""
 
-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1283
+#: ../../mod/directory.php:138
+#: ../../addon/forumdirectory/forumdirectory.php:160
+#: ../../include/profile_advanced.php:37 ../../boot.php:1283
 msgid "Status:"
 msgstr ""
 
-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1285
+#: ../../mod/directory.php:140
+#: ../../addon/forumdirectory/forumdirectory.php:162
+#: ../../include/profile_advanced.php:48 ../../boot.php:1285
 msgid "Homepage:"
 msgstr ""
 
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142
+#: ../../addon/forumdirectory/forumdirectory.php:164
+#: ../../include/profile_advanced.php:58
 msgid "About:"
 msgstr ""
 
 #: ../../mod/directory.php:180
+#: ../../addon/forumdirectory/forumdirectory.php:202
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -5202,27 +5209,27 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
@@ -5590,6 +5597,10 @@ msgstr ""
 msgid "Enable Planets Plugin"
 msgstr ""
 
+#: ../../addon/forumdirectory/forumdirectory.php:22
+msgid "Forum Directory"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
@@ -5634,7 +5645,7 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:493 ../../include/text.php:1440
+#: ../../view/theme/diabook/theme.php:450 ../../include/text.php:1440
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -6557,22 +6568,22 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:297
+#: ../../addon/js_upload/js_upload.php:303
 #: ../../addon.old/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon/js_upload/js_upload.php:309
 #: ../../addon.old/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:326
+#: ../../addon/js_upload/js_upload.php:332
 #: ../../addon.old/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:337
+#: ../../addon/js_upload/js_upload.php:343
 #: ../../addon.old/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
@@ -7276,7 +7287,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:568
+#: ../../addon/statusnet/statusnet.php:677
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
@@ -7510,11 +7521,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -7652,137 +7663,135 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
 #: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:88
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:386
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:93
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:421
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:378
+#: ../../view/theme/diabook/theme.php:592
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:442
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:399
+#: ../../view/theme/diabook/theme.php:597
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:471
-#: ../../view/theme/diabook/theme.php:644
+#: ../../view/theme/diabook/theme.php:428
+#: ../../view/theme/diabook/theme.php:599
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:473
+#: ../../view/theme/diabook/theme.php:598
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:553
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:510
+#: ../../view/theme/diabook/theme.php:595
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:554
+#: ../../view/theme/diabook/theme.php:511
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:556 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:513 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:558 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:515 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:575
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:532
+#: ../../view/theme/diabook/theme.php:591
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:580
+#: ../../view/theme/diabook/theme.php:537
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:581
+#: ../../view/theme/diabook/theme.php:538
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:582
+#: ../../view/theme/diabook/theme.php:539
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:595
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:552
+#: ../../view/theme/diabook/theme.php:593
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:602
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:559
+#: ../../view/theme/diabook/theme.php:594
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:609
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:566
+#: ../../view/theme/diabook/theme.php:596
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:612
+#: ../../view/theme/diabook/theme.php:569
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:588
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:588
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:589
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""