From bbb022f56461e6aa9944505a3584f30fee21fdc7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 13 Jul 2012 13:52:23 -0700
Subject: [PATCH 1/7] rev update

---
 boot.php         |   2 +-
 util/messages.po | 350 ++++++++++++++++++++++++-----------------------
 2 files changed, 182 insertions(+), 170 deletions(-)

diff --git a/boot.php b/boot.php
index 78c952a61b..05fa868978 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.1402' );
+define ( 'FRIENDICA_VERSION',      '3.0.1403' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1153      );
 
diff --git a/util/messages.po b/util/messages.po
index 06a9c4f007..d5cdeda967 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1402\n"
+"Project-Id-Version: 3.0.1403\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-12 10:00-0700\n"
+"POT-Creation-Date: 2012-07-13 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"
@@ -52,7 +52,7 @@ msgstr ""
 #: ../../mod/message.php:175 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:400 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:408 ../../mod/delegate.php:6
 #: ../../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
@@ -133,7 +133,7 @@ msgstr ""
 #: ../../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/profiles.php:569 ../../mod/invite.php:119
+#: ../../mod/profiles.php:577 ../../mod/invite.php:119
 #: ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
@@ -169,7 +169,7 @@ msgstr ""
 #: ../../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:652
+#: ../../include/conversation.php:653
 msgid "Submit"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:429 ../../mod/directory.php:132
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:409
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:469
 #: ../../boot.php:1173
 msgid "Location:"
 msgstr ""
@@ -350,7 +350,7 @@ msgstr ""
 #: ../../mod/settings.php:958 ../../mod/settings.php:959
 #: ../../mod/settings.php:960 ../../mod/settings.php:961
 #: ../../mod/settings.php:962 ../../mod/register.php:234
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:554
 msgid "Yes"
 msgstr ""
 
@@ -362,7 +362,7 @@ msgstr ""
 #: ../../mod/settings.php:958 ../../mod/settings.php:959
 #: ../../mod/settings.php:960 ../../mod/settings.php:961
 #: ../../mod/settings.php:962 ../../mod/register.php:235
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:555
 msgid "No"
 msgstr ""
 
@@ -417,10 +417,10 @@ msgstr ""
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70
+#: ../../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
-#: ../../include/diaspora.php:1792 ../../include/conversation.php:114
+#: ../../include/diaspora.php:1793 ../../include/conversation.php:114
 #: ../../include/conversation.php:187
 msgid "photo"
 msgstr ""
@@ -520,7 +520,7 @@ msgid "Use as profile photo"
 msgstr ""
 
 #: ../../mod/photos.php:1192 ../../mod/content.php:601
-#: ../../include/conversation.php:562
+#: ../../include/conversation.php:563
 msgid "Private Message"
 msgstr ""
 
@@ -561,49 +561,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1327 ../../mod/content.php:665
-#: ../../include/conversation.php:626
+#: ../../include/conversation.php:627
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1328 ../../mod/content.php:666
-#: ../../include/conversation.php:627
+#: ../../include/conversation.php:628
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1329 ../../include/conversation.php:1065
+#: ../../mod/photos.php:1329 ../../include/conversation.php:1066
 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:443
-#: ../../include/conversation.php:803 ../../include/conversation.php:1084
+#: ../../mod/message.php:474 ../../include/conversation.php:444
+#: ../../include/conversation.php:804 ../../include/conversation.php:1085
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1346 ../../mod/photos.php:1386
 #: ../../mod/photos.php:1417 ../../mod/content.php:688
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:650
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1348 ../../mod/photos.php:1388
 #: ../../mod/photos.php:1419 ../../mod/content.php:690
-#: ../../include/conversation.php:651 ../../boot.php:565
+#: ../../include/conversation.php:652 ../../boot.php:565
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1350 ../../mod/editpost.php:125
-#: ../../mod/content.php:700 ../../include/conversation.php:661
-#: ../../include/conversation.php:1102
+#: ../../mod/content.php:700 ../../include/conversation.php:662
+#: ../../include/conversation.php:1103
 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:400 ../../include/conversation.php:681
+#: ../../include/conversation.php:401 ../../include/conversation.php:682
 msgid "Delete"
 msgstr ""
 
@@ -668,28 +668,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:1051
+#: ../../mod/editpost.php:80 ../../include/conversation.php:1052
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:95 ../../mod/content.php:707
-#: ../../mod/settings.php:617 ../../include/conversation.php:668
+#: ../../mod/settings.php:617 ../../include/conversation.php:669
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:291 ../../mod/message.php:471
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1067
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:1068
+#: ../../mod/editpost.php:97 ../../include/conversation.php:1069
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:292 ../../mod/message.php:472
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1071
 msgid "Insert web link"
 msgstr ""
 
@@ -705,35 +705,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:1076
+#: ../../mod/editpost.php:102 ../../include/conversation.php:1077
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:1078
+#: ../../mod/editpost.php:103 ../../include/conversation.php:1079
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1085
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1086
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1094
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1095
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1095
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1096
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1081
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1082
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1083
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1084
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1097
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1098
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1180,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:387
+#: ../../include/bb2diaspora.php:447
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1255,28 +1255,28 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:719
-#: ../../include/conversation.php:399 ../../include/conversation.php:680
+#: ../../include/conversation.php:400 ../../include/conversation.php:681
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:812
-#: ../../mod/content.php:813 ../../include/conversation.php:416
-#: ../../include/conversation.php:773 ../../include/conversation.php:774
+#: ../../mod/content.php:813 ../../include/conversation.php:417
+#: ../../include/conversation.php:774 ../../include/conversation.php:775
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:824
-#: ../../include/conversation.php:426 ../../include/conversation.php:785
+#: ../../include/conversation.php:427 ../../include/conversation.php:786
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:441
+#: ../../mod/content.php:480 ../../include/conversation.php:442
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:547
+#: ../../mod/content.php:586 ../../include/conversation.php:548
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1285,92 +1285,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:548
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:549
 #: ../../boot.php:566
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:626
+#: ../../mod/content.php:665 ../../include/conversation.php:627
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:627
+#: ../../mod/content.php:666 ../../include/conversation.php:628
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:629
+#: ../../mod/content.php:668 ../../include/conversation.php:630
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:629
+#: ../../mod/content.php:668 ../../include/conversation.php:630
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:653
+#: ../../mod/content.php:692 ../../include/conversation.php:654
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:654
+#: ../../mod/content.php:693 ../../include/conversation.php:655
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:655
+#: ../../mod/content.php:694 ../../include/conversation.php:656
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:656
+#: ../../mod/content.php:695 ../../include/conversation.php:657
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:657
+#: ../../mod/content.php:696 ../../include/conversation.php:658
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:658
+#: ../../mod/content.php:697 ../../include/conversation.php:659
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:659
+#: ../../mod/content.php:698 ../../include/conversation.php:660
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:660
+#: ../../mod/content.php:699 ../../include/conversation.php:661
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:732 ../../include/conversation.php:693
+#: ../../mod/content.php:732 ../../include/conversation.php:694
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:694
+#: ../../mod/content.php:733 ../../include/conversation.php:695
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:695
+#: ../../mod/content.php:734 ../../include/conversation.php:696
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../include/conversation.php:698
+#: ../../mod/content.php:737 ../../include/conversation.php:699
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:699
+#: ../../mod/content.php:738 ../../include/conversation.php:700
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../include/conversation.php:703
+#: ../../mod/content.php:742 ../../include/conversation.php:704
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:814 ../../include/conversation.php:775
+#: ../../mod/content.php:814 ../../include/conversation.php:776
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:776
+#: ../../mod/content.php:815 ../../include/conversation.php:777
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:777
+#: ../../mod/content.php:816 ../../include/conversation.php:778
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -2603,7 +2603,7 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:124 ../../mod/message.php:250
-#: ../../include/conversation.php:1019
+#: ../../include/conversation.php:1020
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2925,26 +2925,26 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../mod/like.php:297 ../../mod/tagger.php:70
+#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70
 #: ../../addon/facebook/facebook.php:1586
 #: ../../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:1792
+#: ../../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
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:161 ../../addon/facebook/facebook.php:1590
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1590
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1808
+#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809
 #: ../../include/conversation.php:126
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:163 ../../include/conversation.php:129
+#: ../../mod/like.php:164 ../../include/conversation.php:129
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
@@ -3858,7 +3858,7 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/share.php:28 ../../include/bb2diaspora.php:226
+#: ../../mod/share.php:28 ../../include/bb2diaspora.php:286
 msgid "link"
 msgstr ""
 
@@ -3879,8 +3879,8 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:410
-#: ../../mod/profiles.php:524 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:418
+#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -3967,226 +3967,226 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:429
+#: ../../mod/profiles.php:437
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:447 ../../mod/profiles.php:481
+#: ../../mod/profiles.php:455 ../../mod/profiles.php:489
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:466 ../../mod/profiles.php:508
+#: ../../mod/profiles.php:474 ../../mod/profiles.php:516
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:487
+#: ../../mod/profiles.php:495
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:545
+#: ../../mod/profiles.php:553
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:570
+#: ../../mod/profiles.php:578
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:571
+#: ../../mod/profiles.php:579
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:572
+#: ../../mod/profiles.php:580
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:573
+#: ../../mod/profiles.php:581
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:574
+#: ../../mod/profiles.php:582
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:575
+#: ../../mod/profiles.php:583
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:576
+#: ../../mod/profiles.php:584
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:577
+#: ../../mod/profiles.php:585
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:578
+#: ../../mod/profiles.php:586
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:587
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:588
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:581
+#: ../../mod/profiles.php:589
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:582
+#: ../../mod/profiles.php:590
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:591
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:592
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:585
+#: ../../mod/profiles.php:593
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:586
+#: ../../mod/profiles.php:594
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:587
+#: ../../mod/profiles.php:595
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:588 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:589
+#: ../../mod/profiles.php:597
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:590 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:598 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:591 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:592
+#: ../../mod/profiles.php:600
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:601
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:594
+#: ../../mod/profiles.php:602
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:595 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:603 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:605
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:606
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:607
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:608
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:609
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:610
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:611
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:612
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:613
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:614
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:615
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:616
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:617
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:622
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:624 ../../mod/directory.php:109
+#: ../../mod/profiles.php:632 ../../mod/directory.php:109
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:671
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:664 ../../boot.php:1139
+#: ../../mod/profiles.php:672 ../../boot.php:1139
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:665 ../../boot.php:1140
+#: ../../mod/profiles.php:673 ../../boot.php:1140
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:676 ../../boot.php:1150
+#: ../../mod/profiles.php:684 ../../boot.php:1150
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:678 ../../boot.php:1153
+#: ../../mod/profiles.php:686 ../../boot.php:1153
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:679 ../../boot.php:1154
+#: ../../mod/profiles.php:687 ../../boot.php:1154
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1023
+#: ../../mod/filer.php:29 ../../include/conversation.php:1024
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4238,34 +4238,46 @@ msgstr ""
 msgid "Source (bbcode) text:"
 msgstr ""
 
-#: ../../mod/babel.php:25
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr ""
+
+#: ../../mod/babel.php:31
 msgid "Source input: "
 msgstr ""
 
-#: ../../mod/babel.php:29
+#: ../../mod/babel.php:35
 msgid "bb2html: "
 msgstr ""
 
-#: ../../mod/babel.php:33
+#: ../../mod/babel.php:39
 msgid "bb2html2bb: "
 msgstr ""
 
-#: ../../mod/babel.php:37
+#: ../../mod/babel.php:43
 msgid "bb2md: "
 msgstr ""
 
-#: ../../mod/babel.php:41
+#: ../../mod/babel.php:47
 msgid "bb2md2html: "
 msgstr ""
 
-#: ../../mod/babel.php:45
+#: ../../mod/babel.php:51
 msgid "bb2dia2bb: "
 msgstr ""
 
-#: ../../mod/babel.php:49
+#: ../../mod/babel.php:55
 msgid "bb2md2html2bb: "
 msgstr ""
 
+#: ../../mod/babel.php:65
+msgid "Source input (Diaspora format): "
+msgstr ""
+
+#: ../../mod/babel.php:70
+msgid "diaspora2bb: "
+msgstr ""
+
 #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
@@ -6686,11 +6698,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:393
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:453
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:401
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:461
 msgid "Finishes:"
 msgstr ""
 
@@ -6862,7 +6874,7 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2173
+#: ../../include/diaspora.php:2174
 msgid "Attachments:"
 msgstr ""
 
@@ -7438,8 +7450,8 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:226 ../../include/bb2diaspora.php:236
-#: ../../include/bb2diaspora.php:237
+#: ../../include/bb2diaspora.php:286 ../../include/bb2diaspora.php:296
+#: ../../include/bb2diaspora.php:297
 msgid "image/photo"
 msgstr ""
 
@@ -7533,30 +7545,30 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:218 ../../include/conversation.php:914
+#: ../../include/Contact.php:218 ../../include/conversation.php:915
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:219 ../../include/conversation.php:915
+#: ../../include/Contact.php:219 ../../include/conversation.php:916
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:916
+#: ../../include/Contact.php:220 ../../include/conversation.php:917
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:221 ../../include/Contact.php:234
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:918
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:222 ../../include/Contact.php:234
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:919
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:223 ../../include/Contact.php:234
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:920
 msgid "Send PM"
 msgstr ""
 
@@ -7569,106 +7581,106 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:822
+#: ../../include/conversation.php:823
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:978
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:978
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:982
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:983
+#: ../../include/conversation.php:984
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:989
+#: ../../include/conversation.php:990
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:992
+#: ../../include/conversation.php:993
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:993
+#: ../../include/conversation.php:994
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:993
+#: ../../include/conversation.php:994
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1018
+#: ../../include/conversation.php:1019
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1020
+#: ../../include/conversation.php:1021
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1021
+#: ../../include/conversation.php:1022
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1022
+#: ../../include/conversation.php:1023
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1024
+#: ../../include/conversation.php:1025
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1069
+#: ../../include/conversation.php:1070
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1072
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1072
+#: ../../include/conversation.php:1073
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1074
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1075
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1076
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1078
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1080
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1087
 msgid "permissions"
 msgstr ""
 

From 8b6942c5727a80d85ab4a9fca2d74acb2b7c9739 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 13 Jul 2012 15:38:02 -0700
Subject: [PATCH 2/7] don't use language detection if < php 5.3

---
 include/items.php | 12 +++++++-----
 mod/item.php      | 14 ++++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/items.php b/include/items.php
index 6d58bd182a..06da4bd612 100755
--- a/include/items.php
+++ b/include/items.php
@@ -816,12 +816,14 @@ function item_store($arr,$force_parent = false) {
 	if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) 
 		$arr['body'] = strip_tags($arr['body']);
 
-	require_once('Text/LanguageDetect.php');
-	$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
-	$l = new Text_LanguageDetect;
-	$lng = $l->detectConfidence($naked_body);
-	$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
 
+	if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+		require_once('Text/LanguageDetect.php');
+		$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
+		$l = new Text_LanguageDetect;
+		$lng = $l->detectConfidence($naked_body);
+		$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+	}
 
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : random_string());
diff --git a/mod/item.php b/mod/item.php
index b4e894337e..fddc3fd124 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -219,12 +219,18 @@ function item_post(&$a) {
 
 
 		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
-		$l = new Text_LanguageDetect;
-		$lng = $l->detectConfidence($naked_body);
 
-		$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+			$l = new Text_LanguageDetect;
+			$lng = $l->detectConfidence($naked_body);
+
+			$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+
+			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
+		}
+		else
+			$postopts = '';
 
-		logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
 
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 

From 476b86e1a21754e4236319fcdcc758edf9f9cd76 Mon Sep 17 00:00:00 2001
From: Michael Johnston <michaelgeorgejohnston@gmail.com>
Date: Sat, 14 Jul 2012 00:46:41 -0400
Subject: [PATCH 3/7] fix pagination on community page

---
 mod/community.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/community.php b/mod/community.php
index fb28f78059..becb5642b1 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -45,13 +45,13 @@ function community_content(&$a, $update = 0) {
 	// OR your own posts if you are a logged in member
 
 
-	$r = q("SELECT distinct(`item`.`uri`) AS `total`
+	$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
 		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` "
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
 	);
 
 	if(count($r))

From 717fd8539b10eb478d0f05bb4fd823167a43e581 Mon Sep 17 00:00:00 2001
From: Michael Johnston <michaelgeorgejohnston@gmail.com>
Date: Sat, 14 Jul 2012 14:21:58 -0400
Subject: [PATCH 4/7] add alt_pager function, add ability to use new pager
 logic on network, profile, community, and search.

---
 include/text.php  | 25 +++++++++++++++++++++++++
 mod/community.php | 44 ++++++++++++++++++++++++++++----------------
 mod/network.php   | 37 ++++++++++++++++++++++---------------
 mod/profile.php   | 32 +++++++++++++++++++-------------
 mod/search.php    | 44 +++++++++++++++++++++++++++++---------------
 5 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/include/text.php b/include/text.php
index 409d40d59f..a35c9a8d67 100644
--- a/include/text.php
+++ b/include/text.php
@@ -280,6 +280,31 @@ function paginate(&$a) {
 	return $o;
 }}
 
+if(! function_exists('alt_pager')) {
+function alt_pager(&$a, $i) {
+        $o = '';
+	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+	$stripped = str_replace('q=','',$stripped);
+	$stripped = trim($stripped,'/');
+	$pagenum = $a->pager['page'];
+        $url = $a->get_baseurl() . '/' . $stripped;
+
+        $o .= '<div class="pager">';
+
+	if($a->pager['page']>1)
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'">' . t('newer') . '</a>';
+        if($i>0) {
+          if($a->pager['page']>1)
+	          $o .= "&nbsp;-&nbsp;";
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('older') . '</a>';
+	}
+
+
+        $o .= '</div>'."\r\n";
+
+	return $o;
+}}
+
 // Turn user/group ACLs stored as angle bracketed text into arrays
 
 if(! function_exists('expand_acl')) {
diff --git a/mod/community.php b/mod/community.php
index becb5642b1..354f68528d 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -44,22 +44,24 @@ function community_content(&$a, $update = 0) {
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	        $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
+		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+		        AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		        AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+		        AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
+	        );
 
-	$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
-	);
+	        if(count($r))
+		        $a->set_pager_total($r[0]['total']);
 
-	if(count($r))
-		$a->set_pager_total($r[0]['total']);
+	        if(! $r[0]['total']) {
+		        info( t('No results.') . EOL);
+		        return $o;
+	        }
 
-	if(! $r[0]['total']) {
-		info( t('No results.') . EOL);
-		return $o;
 	}
 
 	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
@@ -70,9 +72,9 @@ function community_content(&$a, $update = 0) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri`
 		ORDER BY `received` DESC LIMIT %d, %d ",
 		intval($a->pager['start']),
@@ -80,11 +82,21 @@ function community_content(&$a, $update = 0) {
 
 	);
 
+	if(! count($r)) {
+		info( t('No results.') . EOL);
+		return $o;
+	}
+
 	// we behave the same in message lists as the search module
 
 	$o .= conversation($a,$r,'community',$update);
 
-	$o .= paginate($a);
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	        $o .= paginate($a);
+	}
+	else {
+	        $o .= alt_pager($a,count($r));
+	}
 
 	return $o;
 }
diff --git a/mod/network.php b/mod/network.php
index 3d8fa7c144..17368ab92d 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -563,21 +563,23 @@ function network_content(&$a, $update = 0) {
 
 	}
 	else {
-		$r = q("SELECT COUNT(*) AS `total`
-			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			$sql_extra2 $sql_extra3
-			$sql_extra $sql_nets ",
-			intval($_SESSION['uid'])
-		);
+ 	        if(! get_pconfig(local_user(),'system','alt_pager')) {
+		        $r = q("SELECT COUNT(*) AS `total`
+			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			        $sql_extra2 $sql_extra3
+			        $sql_extra $sql_nets ",
+			        intval($_SESSION['uid'])
+		        );
 
-		if(count($r)) {
-			$a->set_pager_total($r[0]['total']);
-	                $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
-		}
-		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
+		        if(count($r)) {
+			        $a->set_pager_total($r[0]['total']);
+		        }
+	         }
+                $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
+                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
 	$simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
@@ -688,7 +690,12 @@ function network_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,$mode,$update);
 
 	if(! $update) {
-		$o .= paginate($a);
+	        if(! get_pconfig(local_user(),'system','alt_pager')) {
+		        $o .= paginate($a);
+		}
+		else {
+		        $o .= alt_pager($a,count($items));
+		}
 	}
 
 	return $o;
diff --git a/mod/profile.php b/mod/profile.php
index b142943c1e..78fb5487cd 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -229,20 +229,21 @@ function profile_content(&$a, $update = 0) {
 			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
+                if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+		        $r = q("SELECT COUNT(*) AS `total`
+			        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			        and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+			        AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+			        $sql_extra $sql_extra2 ",
+			        intval($a->profile['profile_uid'])
+		        );
 
-		$r = q("SELECT COUNT(*) AS `total`
-			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-			and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-			AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
-			$sql_extra $sql_extra2 ",
-			intval($a->profile['profile_uid'])
-		);
-
-		if(count($r)) {
-			$a->set_pager_total($r[0]['total']);
-			$a->set_pager_itemspage(40);
+		        if(count($r)) {
+			        $a->set_pager_total($r[0]['total']);
 		}
+		}
+		$a->set_pager_itemspage(40);
 
 		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 
@@ -313,7 +314,12 @@ function profile_content(&$a, $update = 0) {
 	$o .= conversation($a,$items,'profile',$update);
 
 	if(! $update) {
-		$o .= paginate($a);
+	  if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+		        $o .= paginate($a);
+	        }
+	        else {
+	                $o .= alt_pager($a,count($items));
+	        }
 	}
 
 	return $o;
diff --git a/mod/search.php b/mod/search.php
index 320ffddcef..8f73b92448 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -128,21 +128,24 @@ function search_content(&$a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall. 
 
-	$r = q("SELECT distinct(`item`.`uri`) as `total`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
-			OR `item`.`uid` = %d )
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		$sql_extra group by `item`.`uri` ", 
-		intval(local_user())
-	);
+	if(! get_pconfig(local_user(),'system','alt_pager')) {
+	        $r = q("SELECT distinct(`item`.`uri`) as `total`
+		        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+		        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+		        AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
+			        OR `item`.`uid` = %d )
+		        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+		        $sql_extra group by `item`.`uri` ", 
+		        intval(local_user())
+	        );
 
-	if(count($r))
-		$a->set_pager_total(count($r));
-	if(! count($r)) {
-		info( t('No results.') . EOL);
-		return $o;
+	        if(count($r))
+		        $a->set_pager_total(count($r));
+
+	        if(! count($r)) {
+		        info( t('No results.') . EOL);
+		        return $o;
+	        }
 	}
 
 	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
@@ -165,6 +168,12 @@ function search_content(&$a) {
 
 	);
 
+	if(! count($r)) {
+		info( t('No results.') . EOL);
+		return $o;
+	}
+
+
 	if($tag) 
 		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
 	else
@@ -172,7 +181,12 @@ function search_content(&$a) {
 
 	$o .= conversation($a,$r,'search',false);
 
-	$o .= paginate($a);
+        if(! get_pconfig(local_user(),'system','alt_pager')) {
+	        $o .= paginate($a);
+	}
+	else {
+	        $o .= alt_pager($a,count($r));
+	}
 
 	return $o;
 }

From c87d3cb86faef926aa33bc2135ca0d621d881ece Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Jul 2012 14:16:24 -0700
Subject: [PATCH 5/7] rev update

---
 boot.php         |  2 +-
 util/messages.po | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/boot.php b/boot.php
index 05fa868978..e0d0de8f2e 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.1403' );
+define ( 'FRIENDICA_VERSION',      '3.0.1404' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1153      );
 
diff --git a/util/messages.po b/util/messages.po
index d5cdeda967..a5c0be3083 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1403\n"
+"Project-Id-Version: 3.0.1404\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-13 10:00-0700\n"
+"POT-Creation-Date: 2012-07-14 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"
@@ -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:3591 ../../index.php:309
+#: ../../include/items.php:3593 ../../index.php:309
 msgid "Permission denied."
 msgstr ""
 
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:2982
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:2984
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1888,7 +1888,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1192
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2991
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2993
 #: ../../boot.php:767
 msgid "Administrator"
 msgstr ""
@@ -2951,7 +2951,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:3470
+#: ../../mod/display.php:142 ../../include/items.php:3472
 msgid "Item not found."
 msgstr ""
 
@@ -2985,38 +2985,38 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:268
+#: ../../mod/item.php:274
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:389 ../../mod/wall_upload.php:122
+#: ../../mod/item.php:395 ../../mod/wall_upload.php:122
 #: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:794
+#: ../../mod/item.php:800
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:819
+#: ../../mod/item.php:825
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:821
+#: ../../mod/item.php:827
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:822
+#: ../../mod/item.php:828
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:824
+#: ../../mod/item.php:830
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -7179,12 +7179,12 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:450 ../../include/items.php:1559
+#: ../../include/datetime.php:450 ../../include/items.php:1561
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:451 ../../include/items.php:1560
+#: ../../include/datetime.php:451 ../../include/items.php:1562
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -7438,15 +7438,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2989
+#: ../../include/items.php:2991
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2989
+#: ../../include/items.php:2991
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3658
+#: ../../include/items.php:3660
 msgid "Archives"
 msgstr ""
 

From 79b5520e770dcf40fafcc614f2e11515b0804cf0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Jul 2012 20:28:17 -0700
Subject: [PATCH 6/7] sql errors on profile page

---
 mod/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/profile.php b/mod/profile.php
index 78fb5487cd..cc333d36ec 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -206,7 +206,7 @@ function profile_content(&$a, $update = 0) {
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
 			(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `item`.`deleted` = 0
 			and `item`.`moderated` = 0 and `item`.`unseen` = 1
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `item`.`wall` = 1

From 8767eedaac61d8d8d61559799e2c0267c9f5a7ef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Jul 2012 20:38:30 -0700
Subject: [PATCH 7/7] sql fix - this should work a bit better

---
 mod/profile.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mod/profile.php b/mod/profile.php
index cc333d36ec..a3e25b76a1 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -206,7 +206,6 @@ function profile_content(&$a, $update = 0) {
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
 			(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
-			AND `item`.`deleted` = 0
 			and `item`.`moderated` = 0 and `item`.`unseen` = 1
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `item`.`wall` = 1