From 4f9fb37925c605426c0ec338a25bc8e5b2034f67 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 10 Jun 2012 16:31:00 -0700
Subject: [PATCH 01/44] rev update

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

diff --git a/boot.php b/boot.php
index 24ab5da82..ada1ac525 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1369' );
+define ( 'FRIENDICA_VERSION',      '3.0.1370' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/util/messages.po b/util/messages.po
index c9d7877cf..1a30447b9 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1369\n"
+"Project-Id-Version: 3.0.1370\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-09 10:00-0700\n"
+"POT-Creation-Date: 2012-06-10 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"
@@ -2410,7 +2410,7 @@ msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:756
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:178
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:185
 #: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652
 msgid "Save"
 msgstr ""
@@ -4473,23 +4473,23 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:175
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:182
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:180
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:183
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:190
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:185
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
 msgid "Delete the whole cache"
 msgstr ""
 

From a21db51a58b52345814d5a5bf644ad6c0fe59ec8 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 11 Jun 2012 05:21:46 -0400
Subject: [PATCH 02/44] network view: rembember last tab selected by user

---
 mod/network.php | 112 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 83 insertions(+), 29 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index b998a3107..bd5946619 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -6,7 +6,31 @@ function network_init(&$a) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
-  
+	
+	
+	// fetch last used tab and redirect if needed
+	$sel_tabs = network_query_get_sel_tab($a);
+	$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
+	if (is_array($last_sel_tabs)){
+		$tab_urls = array(
+			'/network?f=&order=comment',						//all
+			'/network?f=&order=post',		//postord
+			'/network?f=&conv=1',			//conv
+			'/network/new',					//new
+			'/network?f=&star=1',			//starred
+			'/network?f=&bmark=1',			//bookmarked
+			'/network?f=&spam=1',			//spam
+		);
+		
+		// redirect if current selected tab is 'no_active' and
+		// last selected tab is _not_ 'all_active'. 
+		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active') {
+			$k = array_search('active', $last_sel_tabs);
+			//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
+			goaway($a->get_baseurl() . $tab_urls[$k]);
+		}
+	}
+	
 	$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
 		  
 	require_once('include/group.php');
@@ -98,26 +122,23 @@ function saved_searches($search) {
 
 }
 
-
-function network_content(&$a, $update = 0) {
-
-	require_once('include/conversation.php');
-
-	if(! local_user()) {
-		$_SESSION['return_url'] = $a->query_string;
-    	return login(false);
-	}
-
-	$arr = array('query' => $a->query_string);
-
-	call_hooks('network_content_init', $arr);
-
-	$o = '';
-
-	// item filter tabs
-	// TODO: fix this logic, reduce duplication
-	//$a->page['content'] .= '<div class="tabs-wrapper">';
-	
+/**
+ * Return selected tab from query
+ * 
+ * urls -> returns
+ * 		'/network'					=> $no_active = 'active'
+ * 		'/network?f=&order=comment'	=> $comment_active = 'active'
+ * 		'/network?f=&order=post'	=> $postord_active = 'active'
+ * 		'/network?f=&conv=1',		=> $conv_active = 'active'
+ * 		'/network/new',				=> $new_active = 'active'
+ * 		'/network?f=&star=1',		=> $starred_active = 'active'
+ * 		'/network?f=&bmark=1',		=> $bookmarked_active = 'active'
+ * 		'/network?f=&spam=1',		=> $spam_active = 'active'
+ * 
+ * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
+ */
+function network_query_get_sel_tab($a) {
+	$no_active='';
 	$starred_active = '';
 	$new_active = '';
 	$bookmarked_active = '';
@@ -125,6 +146,7 @@ function network_content(&$a, $update = 0) {
 	$search_active = '';
 	$conv_active = '';
 	$spam_active = '';
+	$postord_active = '';
 
 	if(($a->argc > 1 && $a->argv[1] === 'new') 
 		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
@@ -152,28 +174,56 @@ function network_content(&$a, $update = 0) {
 	}
 
 	
+	
 	if (($new_active == '') 
 		&& ($starred_active == '') 
 		&& ($bookmarked_active == '')
 		&& ($conv_active == '')
 		&& ($search_active == '')
 		&& ($spam_active == '')) {
-			$all_active = 'active';
+			$no_active = 'active';
 	}
 
+	if ($no_active=='active' && x($_GET,'order')) {
+		switch($_GET['order']){
+		 case 'post': $postord_active = 'active'; $no_active=''; break;
+		 case 'comment' : $all_active = 'active'; $no_active=''; break;
+		}
+	}
 	
-	$postord_active = '';
+	return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
+}
 
-	if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
-		$all_active = '';
-		$postord_active = 'active';
+
+function network_content(&$a, $update = 0) {
+
+	require_once('include/conversation.php');
+
+	if(! local_user()) {
+		$_SESSION['return_url'] = $a->query_string;
+    	return login(false);
 	}
-			 	
+
+	$arr = array('query' => $a->query_string);
+
+	call_hooks('network_content_init', $arr);
+
+	$o = '';
+
+	// item filter tabs
+	// TODO: fix this logic, reduce duplication
+	//$a->page['content'] .= '<div class="tabs-wrapper">';
+	
+	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
+	// if no tabs are selected, defaults to comments
+	if ($no_active=='active') $all_active='active';
+	//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
+	
 	// tabs
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$all_active,
 			'title'=> t('Sort by Comment Date'),
 		),
@@ -215,8 +265,12 @@ function network_content(&$a, $update = 0) {
 //			'title' => t('Posts flagged as SPAM'),
 //		),	
 
-
 	);
+	
+	// save selected tab, but only if not in search or file mode
+	if(!x($_GET,'search') && !x($_GET,'file')) {
+		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
+	}
 
 	$arr = array('tabs' => $tabs);
 	call_hooks('network_tabs', $arr);

From afa88154114d5632cb13e7c3f56143cccdfd7daa Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 05:28:08 -0700
Subject: [PATCH 03/44] bug #447 - make followed feeds private

---
 include/items.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index ccc11d5be..95a885a1b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -693,6 +693,8 @@ function encode_rel_links($links) {
 	return xmlify($o);
 }
 
+
+
 function item_store($arr,$force_parent = false) {
 
 	// If a Diaspora signature structure was passed in, pull it out of the 
@@ -806,6 +808,14 @@ function item_store($arr,$force_parent = false) {
 			$deny_cid       = $r[0]['deny_cid'];
 			$deny_gid       = $r[0]['deny_gid'];
 			$arr['wall']    = $r[0]['wall'];
+
+			// if the parent is private, force privacy for the entire conversation
+			// This differs from the above settings as it subtly allows comments from 
+			// email correspondents to be private even if the overall thread is not. 
+
+			if($r[0]['private'])
+				$arr['private'] = 1;
+
 		}
 		else {
 
@@ -1835,9 +1845,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$datarray['last-child'] = 1;
 				}
 
-				if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
-					// one way feed - no remote comment ability
-					$datarray['last-child'] = 0;
+				if($contact['network'] === NETWORK_FEED) {
+					if(! strlen($contact['notify'])) {
+						// one way feed - no remote comment ability
+						$datarray['last-child'] = 0;
+					}
+					$datarray['private'] = 1;
 				}
 
 				// This is my contact on another system, but it's really me.

From 3b9c3d886d0c5fcc289950a2c4aeff8457a24217 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 16:21:27 -0700
Subject: [PATCH 04/44] sheesh

---
 boot.php                 |   2 +-
 include/conversation.php |   2 +-
 util/messages.po         | 188 +++++++++++++++++++++------------------
 3 files changed, 105 insertions(+), 87 deletions(-)

diff --git a/boot.php b/boot.php
index ada1ac525..45922f887 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1370' );
+define ( 'FRIENDICA_VERSION',      '3.0.1371' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/include/conversation.php b/include/conversation.php
index a9c6287a9..68693bb9f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -546,7 +546,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}
 
 				$likebuttons = '';
-				$shareable = ((($profile_owner == local_user()) &&  (! $item['private'])) ? true : false); //($mode != 'display') &&
+				$shareable = ((($profile_owner == local_user()) &&  ((! $item['private']) || $item['network'] === NETWORK_FEED)) ? true : false); 
 
 				if($page_writeable) {
 					if($toplevelpost) {
diff --git a/util/messages.po b/util/messages.po
index 1a30447b9..5264e740f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1370\n"
+"Project-Id-Version: 3.0.1371\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 10:00-0700\n"
+"POT-Creation-Date: 2012-06-11 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"
@@ -55,7 +55,7 @@ msgstr ""
 #: ../../mod/profiles.php:385 ../../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:503
-#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3342
+#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3355
 #: ../../index.php:306
 msgid "Permission denied."
 msgstr ""
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:112
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116
 #: ../../include/nav.php:86
 msgid "Help"
 msgstr ""
@@ -233,12 +233,12 @@ msgstr ""
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:147
+#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:154
 msgid "Previous"
 msgstr ""
 
 #: ../../mod/events.php:327 ../../mod/install.php:205
-#: ../../addon/dav/layout.fnk.php:150
+#: ../../addon/dav/layout.fnk.php:157
 msgid "Next"
 msgstr ""
 
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:700 ../../include/items.php:2738
+#: ../../mod/dfrn_request.php:700 ../../include/items.php:2751
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1236,7 +1236,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:188
+#: ../../mod/notifications.php:85 ../../mod/network.php:238
 msgid "Personal"
 msgstr ""
 
@@ -1718,7 +1718,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:688
 #: ../../addon/facebook/facebook.php:1178
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2747
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2760
 #: ../../boot.php:699
 msgid "Administrator"
 msgstr ""
@@ -1802,7 +1802,7 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956
-#: ../../addon/dav/layout.fnk.php:112 ../../addon/mathjax/mathjax.php:36
+#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
 #: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
 msgid "Settings"
@@ -2308,67 +2308,67 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/network.php:43
+#: ../../mod/network.php:67
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:82 ../../mod/search.php:16
+#: ../../mod/network.php:106 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:91 ../../mod/search.php:13
+#: ../../mod/network.php:115 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:92 ../../include/group.php:244
+#: ../../mod/network.php:116 ../../include/group.php:244
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:175
+#: ../../mod/network.php:225
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:178
+#: ../../mod/network.php:228
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:181
+#: ../../mod/network.php:231
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:184
+#: ../../mod/network.php:234
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:191
+#: ../../mod/network.php:241
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:194
+#: ../../mod/network.php:244
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:197
+#: ../../mod/network.php:247
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:200
+#: ../../mod/network.php:250
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:203
+#: ../../mod/network.php:253
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:206
+#: ../../mod/network.php:256
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:209
+#: ../../mod/network.php:259
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:285
+#: ../../mod/network.php:339
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2376,31 +2376,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:288
+#: ../../mod/network.php:342
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:333
+#: ../../mod/network.php:387
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:344
+#: ../../mod/network.php:398
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:348
+#: ../../mod/network.php:402
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:358
+#: ../../mod/network.php:412
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:360
+#: ../../mod/network.php:414
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:365
+#: ../../mod/network.php:419
 msgid "Invalid contact."
 msgstr ""
 
@@ -2411,7 +2411,7 @@ msgstr ""
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:756
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:185
-#: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652
+#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
@@ -2793,7 +2793,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3189
+#: ../../mod/display.php:142 ../../include/items.php:3202
 msgid "Item not found."
 msgstr ""
 
@@ -3758,7 +3758,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:194 ../../addon/dav/layout.fnk.php:310
 msgid "Location"
 msgstr ""
 
@@ -4421,7 +4421,7 @@ msgstr ""
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:394
+#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:360
 msgid "The new values have been saved."
 msgstr ""
 
@@ -4673,98 +4673,116 @@ msgstr ""
 msgid "German Time Format (dd.mm.YYYY)"
 msgstr ""
 
-#: ../../addon/dav/common/calendar.fnk.php:507
-#: ../../addon/dav/common/calendar.fnk.php:576
-#: ../../addon/dav/common/calendar.fnk.php:603
-#: ../../addon/dav/layout.fnk.php:266
+#: ../../addon/dav/common/calendar.fnk.php:517
+#: ../../addon/dav/common/calendar.fnk.php:533
+#: ../../addon/dav/layout.fnk.php:200
+msgid "Error"
+msgstr ""
+
+#: ../../addon/dav/common/calendar.fnk.php:568
+#: ../../addon/dav/common/calendar.fnk.php:637
+#: ../../addon/dav/common/calendar.fnk.php:664
+#: ../../addon/dav/layout.fnk.php:231
 msgid "No access"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:116
+#: ../../addon/dav/layout.fnk.php:119
+msgid "New event"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:123
 msgid "Today"
 msgstr ""
 
 #: ../../addon/dav/layout.fnk.php:132
-msgid "Week"
+msgid "Day"
 msgstr ""
 
 #: ../../addon/dav/layout.fnk.php:139
+msgid "Week"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:146
 msgid "Month"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:144
+#: ../../addon/dav/layout.fnk.php:151
 msgid "Reload"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:155
+#: ../../addon/dav/layout.fnk.php:162
 msgid "Date"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:193 ../../addon/dav/layout.fnk.php:237
-msgid "Error"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:259
+#: ../../addon/dav/layout.fnk.php:224
 msgid "Not found"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:326 ../../addon/dav/layout.fnk.php:399
+#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365
 msgid "Go back to the calendar"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:346
+#: ../../addon/dav/layout.fnk.php:300
+msgid "Starts"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:305
+msgid "Ends"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:312
 msgid "Description"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:349
+#: ../../addon/dav/layout.fnk.php:315
 msgid "Notification"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:358
+#: ../../addon/dav/layout.fnk.php:324
 msgid "Minutes"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:361
+#: ../../addon/dav/layout.fnk.php:327
 msgid "Hours"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:364
+#: ../../addon/dav/layout.fnk.php:330
 msgid "Days"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:365
+#: ../../addon/dav/layout.fnk.php:331
 msgid "before"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:401
+#: ../../addon/dav/layout.fnk.php:367
 msgid "Calendar Settings"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:407
+#: ../../addon/dav/layout.fnk.php:373
 msgid "Date format"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:416
+#: ../../addon/dav/layout.fnk.php:382
 msgid "Time zone"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:421
+#: ../../addon/dav/layout.fnk.php:387
 msgid "Limitations"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:425
+#: ../../addon/dav/layout.fnk.php:391
 msgid "Warning"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:429
+#: ../../addon/dav/layout.fnk.php:395
 msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:436
+#: ../../addon/dav/layout.fnk.php:402
 msgid "Synchronizing this calendar with the iPhone"
 msgstr ""
 
-#: ../../addon/dav/layout.fnk.php:447
+#: ../../addon/dav/layout.fnk.php:413
 msgid "Synchronizing your Friendica-Contacts with the iPhone"
 msgstr ""
 
@@ -4776,71 +4794,71 @@ msgstr ""
 msgid "Your Friendica-Contacts"
 msgstr ""
 
-#: ../../addon/dav/main.php:229
+#: ../../addon/dav/main.php:244
 msgid "Calendar"
 msgstr ""
 
-#: ../../addon/dav/main.php:232
+#: ../../addon/dav/main.php:247
 msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
-#: ../../addon/dav/main.php:248
+#: ../../addon/dav/main.php:263
 msgid "The database tables have been installed."
 msgstr ""
 
-#: ../../addon/dav/main.php:249
+#: ../../addon/dav/main.php:264
 msgid "An error occurred during the installation."
 msgstr ""
 
-#: ../../addon/dav/main.php:265
+#: ../../addon/dav/main.php:280
 msgid "No system-wide settings yet."
 msgstr ""
 
-#: ../../addon/dav/main.php:268
+#: ../../addon/dav/main.php:283
 msgid "Database status"
 msgstr ""
 
-#: ../../addon/dav/main.php:271
+#: ../../addon/dav/main.php:286
 msgid "Installed"
 msgstr ""
 
-#: ../../addon/dav/main.php:274
+#: ../../addon/dav/main.php:289
 msgid "Upgrade needed"
 msgstr ""
 
-#: ../../addon/dav/main.php:274
+#: ../../addon/dav/main.php:289
 msgid "Upgrade"
 msgstr ""
 
-#: ../../addon/dav/main.php:277
+#: ../../addon/dav/main.php:292
 msgid "Not installed"
 msgstr ""
 
-#: ../../addon/dav/main.php:277
+#: ../../addon/dav/main.php:292
 msgid "Install"
 msgstr ""
 
-#: ../../addon/dav/main.php:282
+#: ../../addon/dav/main.php:297
 msgid "Troubleshooting"
 msgstr ""
 
-#: ../../addon/dav/main.php:283
+#: ../../addon/dav/main.php:298
 msgid "Manual creation of the database tables:"
 msgstr ""
 
-#: ../../addon/dav/main.php:284
+#: ../../addon/dav/main.php:299
 msgid "Show SQL-statements"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:128
+#: ../../addon/dav/calendar.friendica.fnk.php:151
 msgid "Private Calendar"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:135
+#: ../../addon/dav/calendar.friendica.fnk.php:158
 msgid "Friendica Events: Mine"
 msgstr ""
 
-#: ../../addon/dav/calendar.friendica.fnk.php:138
+#: ../../addon/dav/calendar.friendica.fnk.php:161
 msgid "Friendica Events: Contacts"
 msgstr ""
 
@@ -6029,7 +6047,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1428
+#: ../../include/items.php:1438
 msgid "Birthday:"
 msgstr ""
 
@@ -7147,11 +7165,11 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2745
+#: ../../include/items.php:2758
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2745
+#: ../../include/items.php:2758
 msgid "You have a new follower at "
 msgstr ""
 

From 09f74be14c94c722a63371cacd7e99a2e8bd7733 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 17:24:16 -0700
Subject: [PATCH 05/44] variable confusion in poller, don't allow negative page
 offsets

---
 boot.php            | 4 ++--
 include/onepoll.php | 4 ++--
 include/poller.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index 45922f887..70dd1c426 100644
--- a/boot.php
+++ b/boot.php
@@ -432,7 +432,7 @@ if(! class_exists('App')) {
 			 * pagination
 			 */
 
-			$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
+			$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
 			$this->pager['itemspage'] = 50;
 			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 			$this->pager['total'] = 0;
@@ -499,7 +499,7 @@ if(! class_exists('App')) {
 		}
 
 		function set_pager_itemspage($n) {
-			$this->pager['itemspage'] = intval($n);
+			$this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
 			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 
 		}
diff --git a/include/onepoll.php b/include/onepoll.php
index ba7d5ebaf..02763cf4b 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -94,8 +94,8 @@ function onepoll_run($argv, $argc){
 	$t = $contact['last-update'];
 
 	if($contact['subhub']) {
-		$interval = get_config('system','pushpoll_frequency');
-		$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+		$poll_interval = get_config('system','pushpoll_frequency');
+		$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
 		$hub_update = false;
 
 		if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
diff --git a/include/poller.php b/include/poller.php
index 6b12445d1..fefc9b381 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -201,8 +201,8 @@ function poller_run($argv, $argc){
 
 
 				if($contact['subhub']) {
-					$interval = get_config('system','pushpoll_frequency');
-					$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+					$poll_interval = get_config('system','pushpoll_frequency');
+					$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
 					$hub_update = false;
 	
 					if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)

From 75104416e07499316444041adfa51ba3c967fd59 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 18:14:49 -0700
Subject: [PATCH 06/44] reduce reverted edits due to edit arriving before
 original

---
 include/items.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 95a885a1b..638a8212c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -22,8 +22,6 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 			if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
 				$category = $a->argv[$x+1];
 		}
-
-
 	}
 
 	
@@ -1645,6 +1643,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+							continue;
+
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($datarray['title']),
 							dbesc($datarray['body']),
@@ -1791,6 +1794,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+							continue;
+
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($datarray['title']),
 							dbesc($datarray['body']),
@@ -2277,7 +2285,12 @@ function local_delivery($importer,$data) {
 
 				if(count($r)) {
 					$iid = $r[0]['id'];
-					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
+					
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+							continue;
+  
 						logger('received updated comment' , LOGGER_DEBUG);
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($datarray['title']),
@@ -2456,6 +2469,11 @@ function local_delivery($importer,$data) {
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+							continue;
+
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($datarray['title']),
 							dbesc($datarray['body']),
@@ -2622,6 +2640,11 @@ function local_delivery($importer,$data) {
 
 			if(count($r)) {
 				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+
+					// do not accept (ignore) an earlier edit than one we currently have.
+					if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+						continue;
+
 					$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($datarray['title']),
 						dbesc($datarray['body']),

From 24e85c95b66dac2bd046ebec5c90bb7f2e2de0b8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 19:36:04 -0700
Subject: [PATCH 07/44] date based profile wall filter - backend

---
 boot.php         |  3 ---
 include/text.php | 13 +++++++++++++
 mod/profile.php  | 37 +++++++++++++++++++++++++++++--------
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/boot.php b/boot.php
index 70dd1c426..0ae0901d2 100644
--- a/boot.php
+++ b/boot.php
@@ -407,9 +407,6 @@ if(! class_exists('App')) {
 			$this->argc = count($this->argv);
 			if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
 				$this->module = str_replace(".", "_", $this->argv[0]);
-				if(array_key_exists('2',$this->argv)) {
-					$this->category = $this->argv[2];
-				}
 			}
 			else {
 				$this->argc = 1;
diff --git a/include/text.php b/include/text.php
index d4a4d5580..f408e0df6 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1541,3 +1541,16 @@ function protect_sprintf($s) {
 	return(str_replace('%','%%',$s));
 }
 
+
+function is_a_date_arg($s) {
+	$i = intval($s);
+	if($i > 1900) {
+		$y = date('Y');
+		if($i <= $y+1 && strpos($s,'-') == 4) {
+			$m = intval(substr($s,5));
+			if($m > 0 && $m <= 12)
+				return true;
+		}
+	}
+	return false;
+}
diff --git a/mod/profile.php b/mod/profile.php
index 7658a9647..3a77faf19 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -67,11 +67,23 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-        if (x($a->category)) {
-	        $category = $a->category;
+	$category = datequery = $datequery2 = '';
+
+	if($a->argc > 2) {
+		for($x = 2; $x < $a->argc; $x ++) {
+			if(is_a_date_arg($a->argv[$x])) {
+				if($datequery)
+					$datequery2 = escape_tags($a->argv[$x]);
+				else
+					$datequery = escape_tags($a->argv[$x]);
+			}
+			else
+				$category = $a->argv[$x];
+		}
 	}
-        else {
-	        $category = ((x($_GET,'category')) ? $_GET['category'] : '');
+
+	if(! x($category)) {
+		$category = ((x($_GET,'category')) ? $_GET['category'] : '');
 	}
 
 	if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
@@ -97,6 +109,7 @@ function profile_content(&$a, $update = 0) {
 		}
 	}
 
+
 	$contact = null;
 	$remote_contact = false;
 
@@ -200,16 +213,24 @@ function profile_content(&$a, $update = 0) {
 	}
 	else {
 
-                if(x($category)) {
-		        $sql_extra .= file_tag_file_query('item',$category,'category');
+		if(x($category)) {
+			$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
 		}
 
+		if($datequery) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('','',$datequery))));
+		}
+		if($datequery2) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('','',$datequery2))));
+		}
+
+
 		$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_extra $sql_extra2 ",
 			intval($a->profile['profile_uid'])
 		);
 
@@ -225,7 +246,7 @@ function profile_content(&$a, $update = 0) {
 			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_extra $sql_extra2
 			ORDER BY `item`.`created` DESC $pager_sql ",
 			intval($a->profile['profile_uid'])
 

From 30295926b9f34fa08a2c0ae6d68c2eade5ed8ec8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 19:52:46 -0700
Subject: [PATCH 08/44] make sure default timezone is set in external processes

---
 boot.php        | 7 +++++++
 index.php       | 9 +--------
 mod/profile.php | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/boot.php b/boot.php
index 0ae0901d2..dfe072578 100644
--- a/boot.php
+++ b/boot.php
@@ -4,6 +4,7 @@ require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
+require_once('include/datetime.php');
 require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
@@ -333,6 +334,12 @@ if(! class_exists('App')) {
 
 		function __construct() {
 
+			global $default_timezone;
+
+			$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
+
+			date_default_timezone_set($this->timezone);
+
 			$this->config = array();
 			$this->page = array();
 			$this->pager= array();
diff --git a/index.php b/index.php
index 94329eedc..6967d0f31 100644
--- a/index.php
+++ b/index.php
@@ -59,8 +59,7 @@ if(! $install) {
 /**
  *
  * Important stuff we always need to do.
- * Initialise authentication and  date and time. 
- * Create the HTML head for the page, even if we may not use it (xml, etc.)
+ *
  * The order of these may be important so use caution if you think they're all
  * intertwingled with no logical order and decide to sort it out. Some of the
  * dependencies have changed, but at least at one time in the recent past - the 
@@ -68,12 +67,6 @@ if(! $install) {
  *
  */
 
-require_once("datetime.php");
-
-$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
-
-date_default_timezone_set($a->timezone);
-
 session_start();
 
 /**
diff --git a/mod/profile.php b/mod/profile.php
index 3a77faf19..2ac8fe586 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -67,7 +67,7 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-	$category = datequery = $datequery2 = '';
+	$category = $datequery = $datequery2 = '';
 
 	if($a->argc > 2) {
 		for($x = 2; $x < $a->argc; $x ++) {

From 6c1914e6bca399906622a8444e7d7dde0c2be5c5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 21:07:53 -0700
Subject: [PATCH 09/44] date search backend to mod/network

---
 mod/network.php | 50 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index bd5946619..45983053c 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -208,6 +208,30 @@ function network_content(&$a, $update = 0) {
 
 	call_hooks('network_content_init', $arr);
 
+
+	$datequery = $datequery2 = '';
+
+	if($a->argc > 1) {
+		for($x = 1; $x < $a->argc; $x ++) {
+			if(is_a_date_arg($a->argv[$x])) {
+				if($datequery)
+					$datequery2 = escape_tags($a->argv[$x]);
+				else {
+					$datequery = escape_tags($a->argv[$x]);
+					$_GET['order'] = 'post';
+				}
+			}
+			elseif($a->argv[$x] === 'new') {
+				$nouveau = true;
+			}
+			elseif(intval($a->argv[$x])) {
+				$group = intval($a->argv[$x]);
+				$def_acl = array('allow_gid' => '<' . $group . '>');
+			}
+		}
+	}
+
+
 	$o = '';
 
 	// item filter tabs
@@ -302,17 +326,7 @@ function network_content(&$a, $update = 0) {
 	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
 	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
 
-	if(($a->argc > 2) && $a->argv[2] === 'new')
-		$nouveau = true;
 
-	if($a->argc > 1) {
-		if($a->argv[1] === 'new')
-			$nouveau = true;
-		else {
-			$group = intval($a->argv[1]);
-			$def_acl = array('allow_gid' => '<' . $group . '>');
-		}
-	}
 
 	if(x($_GET,'search') || x($_GET,'file'))
 		$nouveau = true;
@@ -452,7 +466,17 @@ function network_content(&$a, $update = 0) {
 			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
 
+	$sql_extra3 = '';
+
+	if($datequery) {
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('','',$datequery))));
+	}
+	if($datequery2) {
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('','',$datequery2))));
+	}
+
 	$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
+	$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
 
 	if(x($_GET,'search')) {
 		$search = escape_tags($_GET['search']);
@@ -508,7 +532,7 @@ function network_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
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			$sql_extra2
+			$sql_extra2 $sql_extra3
 			$sql_extra $sql_nets ",
 			intval($_SESSION['uid'])
 		);
@@ -560,7 +584,7 @@ function network_content(&$a, $update = 0) {
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 				and `item`.`moderated` = 0 and `item`.`unseen` = 1
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				$sql_extra $sql_nets ",
+				$sql_extra3 $sql_extra $sql_nets ",
 				intval(local_user())
 			);
 		}
@@ -570,7 +594,7 @@ function network_content(&$a, $update = 0) {
 				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`.`parent` = `item`.`id`
-				$sql_extra $sql_nets
+				$sql_extra3 $sql_extra $sql_nets
 				ORDER BY `item`.$ordering DESC $pager_sql ",
 				intval(local_user())
 			);

From b7e2f802d8eec883276a3a7b30aa418aee1fb2a4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 21:50:10 -0700
Subject: [PATCH 10/44] revert an optimisation that was wrong

---
 include/items.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/items.php b/include/items.php
index 638a8212c..38bdf31c0 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1853,13 +1853,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$datarray['last-child'] = 1;
 				}
 
-				if($contact['network'] === NETWORK_FEED) {
-					if(! strlen($contact['notify'])) {
+				if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
 						// one way feed - no remote comment ability
 						$datarray['last-child'] = 0;
-					}
-					$datarray['private'] = 1;
 				}
+				if($contact['network'] === NETWORK_FEED)
+					$datarray['private'] = 1;
 
 				// This is my contact on another system, but it's really me.
 				// Turn this into a wall post.

From 33a4e45f6bdaa249f6aa0b569b704c74a1bd7141 Mon Sep 17 00:00:00 2001
From: Matthew Exon <github.mexon@spamgourmet.com>
Date: Tue, 12 Jun 2012 07:09:50 +0200
Subject: [PATCH 11/44] Add a hook for post-processing remote items after
 they've been stored in the database and have an ID

---
 include/items.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/items.php b/include/items.php
index 66e219ddf..037de35eb 100755
--- a/include/items.php
+++ b/include/items.php
@@ -900,6 +900,16 @@ function item_store($arr,$force_parent = false) {
 		intval($current_post)
 	);
 
+        $arr['id'] = $current_post;
+        $arr['parent'] = $parent_id;
+        $arr['allow_cid'] = $allow_cid;
+        $arr['allow_gid'] = $allow_gid;
+        $arr['deny_cid'] = $deny_cid;
+        $arr['deny_gid'] = $deny_gid;
+        $arr['private'] = $private;
+        $arr['deleted'] = $parent_deleted;
+	call_hooks('post_remote_end',$arr);
+
 	// update the commented timestamp on the parent
 
 	q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",

From 6f1efccf1cb49c5814735d0b9e2d107e9a8041cc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 01:01:35 -0700
Subject: [PATCH 12/44] bug #448

---
 mod/network.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index 45983053c..a733f3fb3 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -211,6 +211,10 @@ function network_content(&$a, $update = 0) {
 
 	$datequery = $datequery2 = '';
 
+	$group = 0;
+
+	$nouveau = false;
+
 	if($a->argc > 1) {
 		for($x = 1; $x < $a->argc; $x ++) {
 			if(is_a_date_arg($a->argv[$x])) {
@@ -309,9 +313,6 @@ function network_content(&$a, $update = 0) {
 
 	$contact_id = $a->cid;
 
-	$group = 0;
-
-	$nouveau = false;
 	require_once('include/acl_selectors.php');
 
 	$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);

From 8eb81a99c6b032436ae397a65a7ca52c576965be Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 01:13:09 -0700
Subject: [PATCH 13/44] fix default group for local follows

---
 mod/dfrn_request.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 896fe1792..864fb375d 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -170,6 +170,21 @@ function dfrn_request_post(&$a) {
 					info( t("Introduction complete.") . EOL);
 				}
 
+				$r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s limit 1",
+					intval(local_user()),
+					$dbesc($dfrn_url),
+					$parms['key'] // this was already escaped
+				);
+				if(count($r)) {
+					$g = q("select def_gid from user where uid = %d limit 1",
+						intval(local_user())
+					);
+					if($g && intval($g[0]['def_gid'])) {
+						require_once('include/group.php');
+						group_add_member(local_user(),'',$r[0]['id'],$g[0]['def_gid']);
+					}
+				}
+
 				/**
 				 * Allow the blocked remote notification to complete
 				 */

From b6ff71acaab74169aeef575cd20cb7cba0756c42 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 02:06:29 -0700
Subject: [PATCH 14/44] survive bad/un-parseable input to datetime_convert

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index 3b1491e4d..f6bf1041e 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 		$from = 'UTC';
 	if($to === '')
 		$to = 'UTC';
-	if($s === '')
+	if($s === '' || (! is_string($s)))
 		$s = 'now';
 
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended

From a1c407e017b89634ac48b0c14d7f10816d1c1204 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 12 Jun 2012 12:39:28 +0300
Subject: [PATCH 15/44] Removed "oauth/authorize" from the list of not
 implemented functions since it is implemented in "mod/api.php"

---
 include/api.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/api.php b/include/api.php
index 9925b5766..9f2a5fb3b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1654,7 +1654,6 @@ account/update_profile_background_image
 account/update_profile_image
 blocks/create
 blocks/destroy
-oauth/authorize
 
 Not implemented in status.net:
 statuses/retweeted_to_me

From 1dd52c20cf0e9affc49c2dbbe364f102e9f23e53 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 02:47:05 -0700
Subject: [PATCH 16/44] move parens to proper place

---
 include/items.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/items.php b/include/items.php
index d543dcab0..bb81d1a45 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1655,7 +1655,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
 
 						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
 							continue;
 
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -1806,7 +1806,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
 
 						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
 							continue;
 
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -2297,7 +2297,7 @@ function local_delivery($importer,$data) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
 					
 						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
 							continue;
   
 						logger('received updated comment' , LOGGER_DEBUG);
@@ -2480,7 +2480,7 @@ function local_delivery($importer,$data) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
 
 						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
 							continue;
 
 						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -2651,7 +2651,7 @@ function local_delivery($importer,$data) {
 				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
 
 					// do not accept (ignore) an earlier edit than one we currently have.
-					if(datetime_convert('UTC','UTC',$datarray['edited'] < $r[0]['edited']))
+					if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
 						continue;
 
 					$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",

From 832d9eeaaf7c439f3f8802d35e0e4a40509bddf5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 16:17:34 -0700
Subject: [PATCH 17/44] more fixes

---
 boot.php             |   2 +-
 include/text.php     |   2 +-
 mod/dfrn_request.php |   2 +-
 util/messages.po     | 254 +++++++++++++++++++++----------------------
 4 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/boot.php b/boot.php
index dfe072578..a611bf964 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.1371' );
+define ( 'FRIENDICA_VERSION',      '3.0.1372' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/include/text.php b/include/text.php
index f408e0df6..8948bf8c4 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1059,7 +1059,7 @@ function feed_salmonlinks($nick) {
 if(! function_exists('get_plink')) {
 function get_plink($item) {
 	$a = get_app();	
-	if (x($item,'plink') && (! $item['private'])){
+	if (x($item,'plink') && ((! $item['private']) || ($item['network'] === NETWORK_FEED))){
 		return array(
 			'href' => $item['plink'],
 			'title' => t('link to source'),
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 864fb375d..3c76034c3 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
 
 				$r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s limit 1",
 					intval(local_user()),
-					$dbesc($dfrn_url),
+					dbesc($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
 				if(count($r)) {
diff --git a/util/messages.po b/util/messages.po
index 5264e740f..e28fdf7fb 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1371\n"
+"Project-Id-Version: 3.0.1372\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-11 10:00-0700\n"
+"POT-Creation-Date: 2012-06-12 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"
@@ -55,8 +55,8 @@ msgstr ""
 #: ../../mod/profiles.php:385 ../../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:503
-#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3355
-#: ../../index.php:306
+#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
+#: ../../index.php:299
 msgid "Permission denied."
 msgstr ""
 
@@ -178,11 +178,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:225
+#: ../../mod/help.php:38 ../../index.php:218
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:228
+#: ../../mod/help.php:41 ../../index.php:221
 msgid "Page not found."
 msgstr ""
 
@@ -225,7 +225,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1525
+#: ../../include/nav.php:52 ../../boot.php:1529
 msgid "Events"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:265 ../../boot.php:1105
+#: ../../include/bb2diaspora.php:265 ../../boot.php:1109
 msgid "Location:"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:830 ../../mod/settings.php:556
+#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556
 #: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -329,7 +329,7 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:818
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
 #: ../../mod/settings.php:879 ../../mod/settings.php:885
 #: ../../mod/settings.php:893 ../../mod/settings.php:897
 #: ../../mod/settings.php:902 ../../mod/settings.php:908
@@ -341,7 +341,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:819
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
 #: ../../mod/settings.php:879 ../../mod/settings.php:885
 #: ../../mod/settings.php:893 ../../mod/settings.php:897
 #: ../../mod/settings.php:902 ../../mod/settings.php:908
@@ -353,7 +353,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:44 ../../boot.php:1519
+#: ../../mod/photos.php:44 ../../boot.php:1523
 msgid "Photo Albums"
 msgstr ""
 
@@ -435,7 +435,7 @@ msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:820 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:744 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
@@ -558,7 +558,7 @@ msgstr ""
 
 #: ../../mod/photos.php:1305 ../../mod/photos.php:1345
 #: ../../mod/photos.php:1376 ../../include/conversation.php:579
-#: ../../boot.php:519
+#: ../../boot.php:523
 msgid "Comment"
 msgstr ""
 
@@ -707,19 +707,19 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:497
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:502
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:504
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:507
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -730,165 +730,165 @@ msgstr[1] ""
 msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:194
+#: ../../mod/dfrn_request.php:209
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:222
+#: ../../mod/dfrn_request.php:237
 msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:247
+#: ../../mod/dfrn_request.php:262
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:248
+#: ../../mod/dfrn_request.php:263
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:249
+#: ../../mod/dfrn_request.php:264
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:311
+#: ../../mod/dfrn_request.php:326
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:320
+#: ../../mod/dfrn_request.php:335
 msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:346
+#: ../../mod/dfrn_request.php:361
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:442
+#: ../../mod/dfrn_request.php:457
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:455
+#: ../../mod/dfrn_request.php:470
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:459
+#: ../../mod/dfrn_request.php:474
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:480
+#: ../../mod/dfrn_request.php:495
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:486 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:122
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:576
+#: ../../mod/dfrn_request.php:591
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:629
+#: ../../mod/dfrn_request.php:644
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:643
+#: ../../mod/dfrn_request.php:658
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:654
+#: ../../mod/dfrn_request.php:669
 msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:657
+#: ../../mod/dfrn_request.php:672
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:659
+#: ../../mod/dfrn_request.php:674
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:700 ../../include/items.php:2751
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:793
+#: ../../mod/dfrn_request.php:808
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:809
+#: ../../mod/dfrn_request.php:824
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:811
+#: ../../mod/dfrn_request.php:826
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:814
+#: ../../mod/dfrn_request.php:829
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:815
+#: ../../mod/dfrn_request.php:830
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:816
+#: ../../mod/dfrn_request.php:831
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:817
+#: ../../mod/dfrn_request.php:832
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:820
+#: ../../mod/dfrn_request.php:835
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:822 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:823
+#: ../../mod/dfrn_request.php:838
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:824 ../../mod/settings.php:652
+#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:825
+#: ../../mod/dfrn_request.php:840
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:841
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:829
+#: ../../mod/dfrn_request.php:844
 msgid "Submit Request"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1049
+#: ../../include/contact_widgets.php:9 ../../boot.php:1053
 msgid "Connect"
 msgstr ""
 
@@ -1236,7 +1236,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:238
+#: ../../mod/notifications.php:85 ../../mod/network.php:266
 msgid "Personal"
 msgstr ""
 
@@ -1718,8 +1718,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:688
 #: ../../addon/facebook/facebook.php:1178
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2760
-#: ../../boot.php:699
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
+#: ../../boot.php:703
 msgid "Administrator"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:831
+#: ../../mod/lostpass.php:83 ../../boot.php:835
 msgid "Password Reset"
 msgstr ""
 
@@ -2324,51 +2324,51 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:225
+#: ../../mod/network.php:253
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:228
+#: ../../mod/network.php:256
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:231
+#: ../../mod/network.php:259
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:234
+#: ../../mod/network.php:262
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:241
+#: ../../mod/network.php:269
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:244
+#: ../../mod/network.php:272
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:247
+#: ../../mod/network.php:275
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:250
+#: ../../mod/network.php:278
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:281
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:256
+#: ../../mod/network.php:284
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:259
+#: ../../mod/network.php:287
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:339
+#: ../../mod/network.php:354
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2376,35 +2376,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:342
+#: ../../mod/network.php:357
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:387
+#: ../../mod/network.php:402
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:398
+#: ../../mod/network.php:413
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:402
+#: ../../mod/network.php:417
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:412
+#: ../../mod/network.php:427
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:414
+#: ../../mod/network.php:429
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:419
+#: ../../mod/network.php:434
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1531
+#: ../../mod/notes.php:44 ../../boot.php:1535
 msgid "Personal Notes"
 msgstr ""
 
@@ -2613,7 +2613,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298
 msgid "Permission denied"
 msgstr ""
 
@@ -2655,7 +2655,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79
-#: ../../include/nav.php:50 ../../boot.php:1510
+#: ../../include/nav.php:50 ../../boot.php:1514
 msgid "Profile"
 msgstr ""
 
@@ -2759,7 +2759,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:797
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801
 msgid "Register"
 msgstr ""
 
@@ -2793,7 +2793,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3202
+#: ../../mod/display.php:142 ../../include/items.php:3234
 msgid "Item not found."
 msgstr ""
 
@@ -2802,7 +2802,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1516
+#: ../../include/nav.php:51 ../../boot.php:1520
 msgid "Photos"
 msgstr ""
 
@@ -3605,15 +3605,15 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:962
+#: ../../mod/profile.php:21 ../../boot.php:966
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:126 ../../mod/display.php:75
+#: ../../mod/profile.php:139 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:151
+#: ../../mod/profile.php:164
 msgid "Tips for New Members"
 msgstr ""
 
@@ -3980,23 +3980,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:645 ../../boot.php:1071
+#: ../../mod/profiles.php:645 ../../boot.php:1075
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:646 ../../boot.php:1072
+#: ../../mod/profiles.php:646 ../../boot.php:1076
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:657 ../../boot.php:1082
+#: ../../mod/profiles.php:657 ../../boot.php:1086
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:659 ../../boot.php:1085
+#: ../../mod/profiles.php:659 ../../boot.php:1089
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:660 ../../boot.php:1086
+#: ../../mod/profiles.php:660 ../../boot.php:1090
 msgid "Edit visibility"
 msgstr ""
 
@@ -4616,7 +4616,7 @@ msgstr ""
 
 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
-#: ../../boot.php:520
+#: ../../boot.php:524
 msgid "show more"
 msgstr ""
 
@@ -4632,7 +4632,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:818
+#: ../../include/nav.php:64 ../../boot.php:822
 msgid "Login"
 msgstr ""
 
@@ -6034,7 +6034,7 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1107
+#: ../../include/profile_advanced.php:17 ../../boot.php:1111
 msgid "Gender:"
 msgstr ""
 
@@ -6047,7 +6047,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1438
+#: ../../include/items.php:1446
 msgid "Birthday:"
 msgstr ""
 
@@ -6055,7 +6055,7 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1110
+#: ../../include/profile_advanced.php:37 ../../boot.php:1114
 msgid "Status:"
 msgstr ""
 
@@ -6064,7 +6064,7 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:48 ../../boot.php:1112
+#: ../../include/profile_advanced.php:48 ../../boot.php:1116
 msgid "Homepage:"
 msgstr ""
 
@@ -6643,7 +6643,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:817
+#: ../../include/nav.php:46 ../../boot.php:821
 msgid "Logout"
 msgstr ""
 
@@ -6651,7 +6651,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1504
+#: ../../include/nav.php:49 ../../boot.php:1508
 msgid "Status"
 msgstr ""
 
@@ -6731,11 +6731,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1065
+#: ../../include/nav.php:138 ../../boot.php:1069
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1065
+#: ../../include/nav.php:138 ../../boot.php:1069
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7165,11 +7165,11 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2758
+#: ../../include/items.php:2790
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2758
+#: ../../include/items.php:2790
 msgid "You have a new follower at "
 msgstr ""
 
@@ -7521,96 +7521,96 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:518
+#: ../../boot.php:522
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:521
+#: ../../boot.php:525
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:694
+#: ../../boot.php:698
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:696
+#: ../../boot.php:700
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:796
+#: ../../boot.php:800
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:820
+#: ../../boot.php:824
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:825
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:824
+#: ../../boot.php:828
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:830
+#: ../../boot.php:834
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:997
+#: ../../boot.php:1001
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1057
+#: ../../boot.php:1061
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1173 ../../boot.php:1249
+#: ../../boot.php:1177 ../../boot.php:1253
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1174 ../../boot.php:1250
+#: ../../boot.php:1178 ../../boot.php:1254
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1219 ../../boot.php:1290
+#: ../../boot.php:1223 ../../boot.php:1294
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1231
+#: ../../boot.php:1235
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1232
+#: ../../boot.php:1236
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1283
+#: ../../boot.php:1287
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1301
+#: ../../boot.php:1305
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1302
+#: ../../boot.php:1306
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1507
+#: ../../boot.php:1511
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1513
+#: ../../boot.php:1517
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1528
+#: ../../boot.php:1532
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1534
+#: ../../boot.php:1538
 msgid "Only You Can See This"
 msgstr ""

From 920ea2e1c759b96bbcad246422b33d7f2c8fc552 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 20:46:30 -0700
Subject: [PATCH 18/44] archive widget

---
 include/items.php                 | 47 +++++++++++++++++++++++++++++++
 mod/network.php                   | 41 +++++++++++++++++++--------
 mod/profile.php                   |  7 +++--
 view/categories_widget.tpl        |  1 -
 view/contact_block.tpl            |  1 +
 view/posted_date_widget.tpl       |  9 ++++++
 view/theme/duepuntozero/style.css |  4 +++
 view/theme/slackr/style.css       | 14 +++++++++
 8 files changed, 110 insertions(+), 14 deletions(-)
 create mode 100644 view/posted_date_widget.tpl

diff --git a/include/items.php b/include/items.php
index bb81d1a45..8a655594e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3390,3 +3390,50 @@ function drop_item($id,$interactive = true) {
 	}
 	
 }
+
+
+function first_post_date($uid,$wall = false) {
+	$r = q("select created from item 
+		where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 
+		order by created asc limit 1",
+		intval($uid),
+		intval($wall ? 1 : 0)
+	);
+	if(count($r))
+		return substr($r[0]['created'],0,10);
+	return false;
+}
+
+function posted_dates($uid,$wall) {
+	$dnow = datetime_convert('','','now','Y-m-d');
+
+	$dthen = first_post_date($uid,$wall);
+	if(! $dthen)
+		return array();
+
+	$ret = array();
+	while($dnow >= $dthen) {
+		$start_month = datetime_convert('','','first day of ' . $dnow,'Y-m-d');
+		$end_month = datetime_convert('','','last day of ' . $dnow,'Y-m-d');
+		$str = day_translate(datetime_convert('','',$dnow,'F Y'));
+ 		$ret[] = array($str,$end_month,$start_month);
+		$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
+	}
+	return $ret;
+}
+
+
+function posted_date_widget($url,$uid,$wall) {
+	$o = '';
+	$ret = posted_dates($uid,$wall);
+	if(! count($ret))
+		return $o;
+
+	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
+		'$title' => t('Archives'),
+		'$size' => ((count($ret) > 6) ? 6 : count($ret)),
+		'$url' => $url,
+		'$dates' => $ret
+	));
+	return $o;
+}
\ No newline at end of file
diff --git a/mod/network.php b/mod/network.php
index a733f3fb3..c31260b44 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -7,6 +7,16 @@ function network_init(&$a) {
 		return;
 	}
 	
+	$is_a_date_query = false;
+
+	if($a->argc > 1) {
+		for($x = 1; $x < $a->argc; $x ++) {
+			if(is_a_date_arg($a->argv[$x])) {
+				$is_a_date_query = true;
+				break;
+			}
+		}
+	}
 	
 	// fetch last used tab and redirect if needed
 	$sel_tabs = network_query_get_sel_tab($a);
@@ -24,7 +34,11 @@ function network_init(&$a) {
 		
 		// redirect if current selected tab is 'no_active' and
 		// last selected tab is _not_ 'all_active'. 
-		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active') {
+		// and this isn't a date query
+
+		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) {
+
+
 			$k = array_search('active', $last_sel_tabs);
 			//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
 			goaway($a->get_baseurl() . $tab_urls[$k]);
@@ -35,6 +49,7 @@ function network_init(&$a) {
 		  
 	require_once('include/group.php');
 	require_once('include/contact_widgets.php');
+	require_once('include/items.php');
 
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
@@ -66,8 +81,9 @@ function network_init(&$a) {
 	if(x($_GET,'search')) {
 		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
 	}
-	
+
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
+	$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);	
 	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
 	$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
@@ -246,43 +262,46 @@ function network_content(&$a, $update = 0) {
 	// if no tabs are selected, defaults to comments
 	if ($no_active=='active') $all_active='active';
 	//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
-	
+
+	$cmd = (($datequery) ? '' : $a->cmd);
+	$len_naked_cmd = strlen(str_replace('/new','',$cmd));		
+
 	// tabs
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$all_active,
 			'title'=> t('Sort by Comment Date'),
 		),
 		array(
 			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$postord_active,
 			'title' => t('Sort by Post Date'),
 		),
 
 		array(
 			'label' => t('Personal'),
-			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
 			'sel' => $conv_active,
 			'title' => t('Posts that mention or involve you'),
 		),
 		array(
 			'label' => t('New'),
-			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
 			'sel' => $new_active,
 			'title' => t('Activity Stream - by date'),
 		),
 		array(
 			'label' => t('Starred'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
 			'sel'=>$starred_active,
 			'title' => t('Favourite Posts'),
 		),
 		array(
 			'label' => t('Shared Links'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
 			'sel'=>$bookmarked_active,
 			'title'=> t('Interesting Links'),
 		),	
@@ -470,10 +489,10 @@ function network_content(&$a, $update = 0) {
 	$sql_extra3 = '';
 
 	if($datequery) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('','',$datequery))));
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
 	}
 	if($datequery2) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('','',$datequery2))));
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 	}
 
 	$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
diff --git a/mod/profile.php b/mod/profile.php
index 2ac8fe586..24e03d6ea 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -94,6 +94,8 @@ function profile_content(&$a, $update = 0) {
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 	require_once('include/acl_selectors.php');
+	require_once('include/items.php');
+
 	$groups = array();
 
 	$tab = 'posts';
@@ -168,6 +170,7 @@ function profile_content(&$a, $update = 0) {
 
 		$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+		$a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);	
 		$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
 		if(can_write_wall($a,$a->profile['profile_uid'])) {
@@ -218,10 +221,10 @@ function profile_content(&$a, $update = 0) {
 		}
 
 		if($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('','',$datequery))));
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
 		}
 		if($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('','',$datequery2))));
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
 
diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
index 061821beb..5dbd871a8 100644
--- a/view/categories_widget.tpl
+++ b/view/categories_widget.tpl
@@ -1,4 +1,3 @@
-<div class="clear"></div>
 <div id="categories-sidebar" class="widget">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
index eb46c6c43..a79648712 100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -9,3 +9,4 @@
 		</div>
 {{ endif }}
 </div>
+<div class="clear"></div>
diff --git a/view/posted_date_widget.tpl b/view/posted_date_widget.tpl
new file mode 100644
index 000000000..3e2ee5a3e
--- /dev/null
+++ b/view/posted_date_widget.tpl
@@ -0,0 +1,9 @@
+<div id="datebrowse-sidebar" class="widget">
+	<h3>$title</h3>
+<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size">
+{{ for $dates as $d }}
+<option value="$url/$d.1/$d.2" >$d.0</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index ab660888f..3264caf52 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -3226,3 +3226,7 @@ ul.menu-popup {
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
 .autocomplete .selected { background:#F0F0F0; }
 .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
+
+#datebrowse-sidebar select {
+	margin-left: 25px;
+}
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index aa4d4b800..8a8f8c726 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -88,6 +88,20 @@ nav #site-location {
 	box-shadow: 4px 4px 3px 0 #444444;
 }
 
+#datebrowse-sidebar select {
+	margin-left: 25px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+#datebrowse-sidebar select:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
 	border-radius: 3px;
 	-moz-border-radius: 3px;

From 08af43f3964860f17019fdc42e378a8a0904fe74 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 21:30:17 -0700
Subject: [PATCH 19/44] edge case

---
 include/items.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/items.php b/include/items.php
index 8a655594e..f2dde23a7 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3417,6 +3417,8 @@ function posted_dates($uid,$wall) {
 		$end_month = datetime_convert('','','last day of ' . $dnow,'Y-m-d');
 		$str = day_translate(datetime_convert('','',$dnow,'F Y'));
  		$ret[] = array($str,$end_month,$start_month);
+		if($start_month < $dthen)
+			break;
 		$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
 	}
 	return $ret;

From d955813f22d5151046733fc55349112c44a16277 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 21:34:28 -0700
Subject: [PATCH 20/44] tracking another edge case

---
 include/items.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/items.php b/include/items.php
index f2dde23a7..5d9c36d94 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3393,14 +3393,16 @@ function drop_item($id,$interactive = true) {
 
 
 function first_post_date($uid,$wall = false) {
-	$r = q("select created from item 
+	$r = q("select id, created from item 
 		where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 
 		order by created asc limit 1",
 		intval($uid),
 		intval($wall ? 1 : 0)
 	);
-	if(count($r))
+	if(count($r)) {
+		logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
 		return substr($r[0]['created'],0,10);
+	}
 	return false;
 }
 

From 82ad881c853a96b540ca8eebc16b68661a2bbdef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 21:38:10 -0700
Subject: [PATCH 21/44] think this will fix it

---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/items.php b/include/items.php
index 5d9c36d94..6f2e19f6a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3395,6 +3395,7 @@ function drop_item($id,$interactive = true) {
 function first_post_date($uid,$wall = false) {
 	$r = q("select id, created from item 
 		where uid = %d and wall = %d and deleted = 0 and visible = 1 AND moderated = 0 
+		and id = parent
 		order by created asc limit 1",
 		intval($uid),
 		intval($wall ? 1 : 0)

From bbdb8751e5c17db3ebdfb67dd363a65150df1e62 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 21:39:39 -0700
Subject: [PATCH 22/44] that was it

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 6f2e19f6a..2a0a9a426 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3401,7 +3401,7 @@ function first_post_date($uid,$wall = false) {
 		intval($wall ? 1 : 0)
 	);
 	if(count($r)) {
-		logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
+//		logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
 		return substr($r[0]['created'],0,10);
 	}
 	return false;

From f8314d6beafc517cba65bde120edf6beae72a9a8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 22:05:35 -0700
Subject: [PATCH 23/44] one-click change for manage module

---
 mod/manage.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/manage.php b/mod/manage.php
index 84dfa6917..96d420c78 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -96,7 +96,7 @@ function manage_content(&$a) {
 
 	$o .= '<div id="identity-selector-wrapper">' . "\r\n";
 	$o .= '<form action="manage" method="post" >' . "\r\n";
-	$o .= '<select name="identity" size="4">' . "\r\n";
+	$o .= '<select name="identity" size="4" onchange="this.form.submit();" >' . "\r\n";
 
 	foreach($a->identities as $rr) {
 		$selected = (($rr['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : '');
@@ -106,7 +106,8 @@ function manage_content(&$a) {
 	$o .= '</select>' . "\r\n";
 	$o .= '<div id="identity-select-break"></div>' . "\r\n";
 
-	$o .= '<input id="identity-submit" type="submit" name="submit" value="' . t('Submit') . '" /></div></form>' . "\r\n";
+//	$o .= '<input id="identity-submit" type="submit" name="submit" value="' . t('Submit') . '" />';
+	$o .= '</div></form>' . "\r\n";
 
 	return $o;
 

From a424fecdae3b54b47778ed7a52452ff80c2bf631 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 22:52:34 -0700
Subject: [PATCH 24/44] this should catch any weirdness caused by being in
 different timezones and making your first post on the 31st of March

---
 include/items.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/items.php b/include/items.php
index 2a0a9a426..35a4396dc 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3402,26 +3402,32 @@ function first_post_date($uid,$wall = false) {
 	);
 	if(count($r)) {
 //		logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
-		return substr($r[0]['created'],0,10);
+		return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10);
 	}
 	return false;
 }
 
 function posted_dates($uid,$wall) {
-	$dnow = datetime_convert('','','now','Y-m-d');
+	$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
 
 	$dthen = first_post_date($uid,$wall);
 	if(! $dthen)
 		return array();
 
+	// If it's near the end of a long month, backup to the 28th so that in 
+	// consecutive loops we'll always get a whole month difference.
+
+	if(intval(substr($dnow,8)) > 28)
+		$dnow = substr($dnow,0,8) . '28';
+	if(intval(substr($dthen,8)) > 28)
+		$dnow = substr($dthen,0,8) . '28';
+
 	$ret = array();
 	while($dnow >= $dthen) {
 		$start_month = datetime_convert('','','first day of ' . $dnow,'Y-m-d');
 		$end_month = datetime_convert('','','last day of ' . $dnow,'Y-m-d');
 		$str = day_translate(datetime_convert('','',$dnow,'F Y'));
  		$ret[] = array($str,$end_month,$start_month);
-		if($start_month < $dthen)
-			break;
 		$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
 	}
 	return $ret;

From 46cb8174fa2f0633caa179b10d6e1776d853f4ea Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 13 Jun 2012 11:55:21 -0400
Subject: [PATCH 25/44] enotify: rework strings to more easy to translate

---
 include/enotify.php |   62 +-
 util/messages.po    | 9781 +++++++++++++++++++++----------------------
 2 files changed, 4898 insertions(+), 4945 deletions(-)

diff --git a/include/enotify.php b/include/enotify.php
index fe0f128b6..89ecc3703 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -41,8 +41,8 @@ function notification($params) {
 
 		$subject = 	sprintf( t('[Friendica:Notify] New mail received at %s'),$sitename);
 
-		$preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
-		$epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]');
+		$preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$params['source_name'],$sitename);
+		$epreamble = sprintf( t('%1$s sent you %2$s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]');
 		$sitelink = t('Please visit %s to view and/or reply to your private messages.');
 		$tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message/' . $params['item']['id'] . '">' . $sitename . '</a>');
@@ -66,27 +66,38 @@ function notification($params) {
 			);
 		}
 
-		$possess_desc = str_replace('<!item_type!>',item_post_type($p[0]),$possess_desc);
+		$item_post_type = item_post_type($p[0]);
+		//$possess_desc = str_replace('<!item_type!>',$possess_desc);
 
 		// "a post"
-		$dest_str = sprintf($possess_desc,'a');
+		$dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'),
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$itemlink,
+								$item_post_type);
 
 		// "George Bull's post"
 		if($p)
-			$dest_str = sprintf($possess_desc,sprintf( t("%s's"),$p[0]['author-name']));
+			$dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
+						'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+						$itemlink,
+						$p[0]['author-name']
+						$item_post_type);
 		
 		// "your post"
 		if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall'])
-			$dest_str = sprintf($possess_desc, t('your') );
+			$dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$itemlink,
+								$item_post_type);
 
 		// Some mail softwares relies on subject field for threading.
 		// So, we cannot have different subjects for notifications of the same thread.
 		// Before this we have the name of the replier on the subject rendering 
 		// differents subjects for messages on the same thread.
 
-		$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%d by %s'), $parent_id, $params['source_name']);
+		$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%1$d by %1$s'), $parent_id, $params['source_name']);
 		$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
-		$epreamble = sprintf( t('%s commented on %s.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . $dest_str . '[/url]'); 
+		$epreamble = $dest_str; 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -97,9 +108,11 @@ function notification($params) {
 	if($params['type'] == NOTIFY_WALL) {
 		$subject = sprintf( t('[Friendica:Notify] %s posted to your profile wall') , $params['source_name']);
 
-		$preamble = sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename);
+		$preamble = sprintf( t('%1$s posted to your profile wall at %1$s') , $params['source_name'], $sitename);
 		
-		$epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your profile wall.') . '[/url]'); 
+		$epreamble = sprintf( t('%1$s posted to [url=%2s]your wall[/url]') , 
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$itemlink); 
 		
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -109,8 +122,10 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_TAGSELF) {
 		$subject =	sprintf( t('[Friendica:Notify] %s tagged you') , $params['source_name']);
-		$preamble = sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename);
-		$epreamble = sprintf( t('%s %s.') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('tagged you') . '[/url]'); 
+		$preamble = sprintf( t('%1$s tagged you at %2$s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%1$s [url=%2s]tagged you[/url].') , 
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$params['link']); 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -120,8 +135,10 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_TAGSHARE) {
 		$subject =	sprintf( t('[Friendica:Notify] %s tagged your post') , $params['source_name']);
-		$preamble = sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename);
-		$epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your post') . '[/url]' ); 
+		$preamble = sprintf( t('%1$s tagged your post at %2$s') , $params['source_name'], $sitename);
+		$epreamble = sprintf( t('%1$s tagged [url=%2$s]your post[/url]') ,
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+								$itemlink); 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
@@ -131,8 +148,10 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_INTRO) {
 		$subject = sprintf( t('[Friendica:Notify] Introduction received'));
-		$preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); 
-		$epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=$itemlink]' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+		$preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename); 
+		$epreamble = sprintf( t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'),
+								$itemlink,
+								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
 		$body = sprintf( t('You may visit their profile at %s'),$params['source_link']);
 
 		$sitelink = t('Please visit %s to approve or reject the introduction.');
@@ -143,11 +162,12 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_SUGGEST) {
 		$subject = sprintf( t('[Friendica:Notify] Friend suggestion received'));
-		$preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); 
-		$epreamble = sprintf( t('You\'ve received %s for %s from %s.'),
-			'[url=$itemlink]' . t('a friend suggestion') . '[/url]',
-			'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', 
-			'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+		$preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename); 
+		$epreamble = sprintf( t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'),
+									$itemlink,
+									'[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]',
+									'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); 
+									
 		$body = t('Name:') . ' ' . $params['item']['name'] . "\n";
 		$body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";
 		$body .= sprintf( t('You may visit their profile at %s'),$params['item']['url']);
diff --git a/util/messages.po b/util/messages.po
index e28fdf7fb..defa9b795 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,191 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.1372\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-12 10:00-0700\n"
+"POT-Creation-Date: 2012-06-13 11:54-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/oexchange.php:25
-msgid "Post successful."
-msgstr ""
-
-#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
-#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: ../../mod/crepair.php:102
-msgid "Contact settings applied."
-msgstr ""
-
-#: ../../mod/crepair.php:104
-msgid "Contact update failed."
-msgstr ""
-
-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928
-#: ../../mod/editpost.php:10 ../../mod/install.php:151
-#: ../../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/notes.php:20 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
-#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
-#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152
-#: ../../mod/profile_photo.php:165 ../../mod/message.php:45
-#: ../../mod/message.php:97 ../../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:385 ../../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:503
-#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
-#: ../../index.php:299
-msgid "Permission denied."
-msgstr ""
-
-#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
-msgid "Contact not found."
-msgstr ""
-
-#: ../../mod/crepair.php:135
-msgid "Repair Contact Settings"
-msgstr ""
-
-#: ../../mod/crepair.php:137
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
-msgstr ""
-
-#: ../../mod/crepair.php:138
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-
-#: ../../mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr ""
-
-#: ../../mod/crepair.php:148 ../../mod/settings.php:557
-#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668
-msgid "Name"
-msgstr ""
-
-#: ../../mod/crepair.php:149
-msgid "Account Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:150
-msgid "@Tagname - overrides Name/Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:151
-msgid "Account URL"
-msgstr ""
-
-#: ../../mod/crepair.php:152
-msgid "Friend Request URL"
-msgstr ""
-
-#: ../../mod/crepair.php:153
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: ../../mod/crepair.php:154
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: ../../mod/crepair.php:155
-msgid "Poll/Feed URL"
-msgstr ""
-
-#: ../../mod/crepair.php:156
-msgid "New photo from this URL"
-msgstr ""
-
-#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021
-#: ../../mod/photos.php:1266 ../../mod/photos.php:1306
-#: ../../mod/photos.php:1346 ../../mod/photos.php:1377
-#: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:342
-#: ../../mod/settings.php:555 ../../mod/settings.php:701
-#: ../../mod/settings.php:762 ../../mod/settings.php:969
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216
-#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
-#: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
-#: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:61
-#: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
-#: ../../addon/gravatar/gravatar.php:86
-#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/jappixmini/jappixmini.php:302
-#: ../../addon/statusnet/statusnet.php:278
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:318
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:561 ../../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:381
-#: ../../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:580
-msgid "Submit"
-msgstr ""
-
-#: ../../mod/help.php:30
-msgid "Help:"
-msgstr ""
-
-#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116
-#: ../../include/nav.php:86
-msgid "Help"
-msgstr ""
-
-#: ../../mod/help.php:38 ../../index.php:218
+#: ../../index.php:218 ../../mod/help.php:38
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:221
+#: ../../index.php:221 ../../mod/help.php:41
 msgid "Page not found."
 msgstr ""
 
-#: ../../mod/wall_attach.php:58
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../index.php:298 ../../mod/profperm.php:19 ../../mod/group.php:72
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
-msgid "File upload failed."
+#: ../../index.php:299 ../../mod/fsuggest.php:78
+#: ../../mod/notifications.php:66 ../../mod/message.php:45
+#: ../../mod/message.php:97 ../../mod/editpost.php:10
+#: ../../mod/dfrn_confirm.php:53 ../../mod/events.php:138
+#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
+#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928
+#: ../../mod/register.php:38 ../../mod/attach.php:33
+#: ../../mod/contacts.php:145 ../../mod/follow.php:9
+#: ../../mod/allfriends.php:9 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/settings.php:106 ../../mod/settings.php:537
+#: ../../mod/settings.php:542 ../../mod/display.php:138
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:385
+#: ../../mod/wall_attach.php:44 ../../mod/suggest.php:28
+#: ../../mod/manage.php:86 ../../mod/delegate.php:6
+#: ../../mod/viewcontacts.php:22 ../../mod/notes.php:20
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:141
+#: ../../mod/profile_photo.php:152 ../../mod/profile_photo.php:165
+#: ../../mod/install.php:151 ../../mod/group.php:19 ../../mod/regmod.php:116
+#: ../../mod/item.php:124 ../../mod/item.php:140 ../../mod/network.php:6
+#: ../../mod/crepair.php:115 ../../addon/dav/layout.fnk.php:353
+#: ../../addon/facebook/facebook.php:503 ../../include/items.php:3387
+msgid "Permission denied."
+msgstr ""
+
+#: ../../mod/update_notes.php:41 ../../mod/update_profile.php:41
+#: ../../mod/update_community.php:18 ../../mod/update_network.php:22
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+#: ../../mod/dfrn_confirm.php:118 ../../mod/crepair.php:129
+msgid "Contact not found."
 msgstr ""
 
 #: ../../mod/fsuggest.php:63
@@ -208,499 +79,48 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/events.php:65
-msgid "Event description and start time are required."
-msgstr ""
-
-#: ../../mod/events.php:258
-msgid "l, F j"
-msgstr ""
-
-#: ../../mod/events.php:280
-msgid "Edit event"
-msgstr ""
-
-#: ../../mod/events.php:300 ../../include/text.php:1065
-msgid "link to source"
-msgstr ""
-
-#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1529
-msgid "Events"
-msgstr ""
-
-#: ../../mod/events.php:325
-msgid "Create New Event"
-msgstr ""
-
-#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:154
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/events.php:327 ../../mod/install.php:205
-#: ../../addon/dav/layout.fnk.php:157
-msgid "Next"
-msgstr ""
-
-#: ../../mod/events.php:399
-msgid "hour:minute"
-msgstr ""
-
-#: ../../mod/events.php:408
-msgid "Event details"
-msgstr ""
-
-#: ../../mod/events.php:409
-#, php-format
-msgid "Format is %s %s. Starting date and Description are required."
-msgstr ""
-
-#: ../../mod/events.php:411
-msgid "Event Starts:"
-msgstr ""
-
-#: ../../mod/events.php:414
-msgid "Finish date/time is not known or not relevant"
-msgstr ""
-
-#: ../../mod/events.php:416
-msgid "Event Finishes:"
-msgstr ""
-
-#: ../../mod/events.php:419
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../mod/events.php:421
-msgid "Description:"
-msgstr ""
-
-#: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:265 ../../boot.php:1109
-msgid "Location:"
-msgstr ""
-
-#: ../../mod/events.php:425
-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
-msgid "Cancel"
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
-#, php-format
-msgid "%s welcomes %s"
-msgstr ""
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr ""
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr ""
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr ""
-
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
-msgstr ""
-
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
-#: ../../mod/settings.php:879 ../../mod/settings.php:885
-#: ../../mod/settings.php:893 ../../mod/settings.php:897
-#: ../../mod/settings.php:902 ../../mod/settings.php:908
-#: ../../mod/settings.php:914 ../../mod/settings.php:920
-#: ../../mod/settings.php:956 ../../mod/settings.php:957
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
-#: ../../mod/settings.php:960 ../../mod/register.php:234
-#: ../../mod/profiles.php:531
-msgid "Yes"
-msgstr ""
-
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
-#: ../../mod/settings.php:879 ../../mod/settings.php:885
-#: ../../mod/settings.php:893 ../../mod/settings.php:897
-#: ../../mod/settings.php:902 ../../mod/settings.php:908
-#: ../../mod/settings.php:914 ../../mod/settings.php:920
-#: ../../mod/settings.php:956 ../../mod/settings.php:957
-#: ../../mod/settings.php:958 ../../mod/settings.php:959
-#: ../../mod/settings.php:960 ../../mod/register.php:235
-#: ../../mod/profiles.php:532
-msgid "No"
-msgstr ""
-
-#: ../../mod/photos.php:44 ../../boot.php:1523
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
-#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
-#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:598
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../mod/photos.php:70 ../../mod/settings.php:21
-msgid "everybody"
-msgstr ""
-
-#: ../../mod/photos.php:143
-msgid "Contact information unavailable"
-msgstr ""
-
-#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
-#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
-#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
-#: ../../mod/profile_photo.php:263
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298
-#: ../../include/user.php:305 ../../include/user.php:312
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../mod/photos.php:164
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:182 ../../mod/photos.php:1022
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:245 ../../mod/photos.php:1267
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:587
-msgid "was tagged in a"
-msgstr ""
-
-#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316
-#: ../../include/diaspora.php:1671 ../../include/conversation.php:53
-#: ../../include/conversation.php:126
-msgid "photo"
-msgstr ""
-
-#: ../../mod/photos.php:587
-msgid "by"
-msgstr ""
-
-#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315
-msgid "Image exceeds size limit of "
-msgstr ""
-
-#: ../../mod/photos.php:700
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126
-#: ../../mod/wall_upload.php:86
-msgid "Unable to process image."
-msgstr ""
-
-#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259
-#: ../../mod/wall_upload.php:105
-msgid "Image upload failed."
-msgstr ""
-
-#: ../../mod/photos.php:820 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
-msgid "Public access denied."
-msgstr ""
-
-#: ../../mod/photos.php:830
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:909
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:970
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:973 ../../mod/photos.php:1017
-msgid "New album name: "
-msgstr ""
-
-#: ../../mod/photos.php:974
-msgid "or existing album name: "
-msgstr ""
-
-#: ../../mod/photos.php:975
-msgid "Do not show a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:977 ../../mod/photos.php:1262
-msgid "Permissions"
-msgstr ""
-
-#: ../../mod/photos.php:1032
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:1091
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:1093
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:1143
-msgid "View photo"
-msgstr ""
-
-#: ../../mod/photos.php:1143
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:1144
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:1150 ../../include/conversation.php:490
-msgid "Private Message"
-msgstr ""
-
-#: ../../mod/photos.php:1172
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:1240
-msgid "Tags: "
-msgstr ""
-
-#: ../../mod/photos.php:1243
-msgid "[Remove any tag]"
-msgstr ""
-
-#: ../../mod/photos.php:1253
-msgid "Rotate CW"
-msgstr ""
-
-#: ../../mod/photos.php:1255
-msgid "New album name"
-msgstr ""
-
-#: ../../mod/photos.php:1258
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:1260
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:1264
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-
-#: ../../mod/photos.php:1284 ../../include/conversation.php:554
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../mod/photos.php:1285 ../../include/conversation.php:555
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../mod/photos.php:1286 ../../include/conversation.php:989
-msgid "Share"
-msgstr ""
-
-#: ../../mod/photos.php:1287 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:215
-#: ../../mod/message.php:410 ../../include/conversation.php:371
-#: ../../include/conversation.php:731 ../../include/conversation.php:1008
-msgid "Please wait"
-msgstr ""
-
-#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
-#: ../../mod/photos.php:1374 ../../include/conversation.php:577
-msgid "This is you"
-msgstr ""
-
-#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
-#: ../../mod/photos.php:1376 ../../include/conversation.php:579
-#: ../../boot.php:523
-msgid "Comment"
-msgstr ""
-
-#: ../../mod/photos.php:1307 ../../mod/editpost.php:125
-#: ../../include/conversation.php:589 ../../include/conversation.php:1026
-msgid "Preview"
-msgstr ""
-
-#: ../../mod/photos.php:1404 ../../mod/settings.php:618
-#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
-#: ../../include/conversation.php:328 ../../include/conversation.php:609
-msgid "Delete"
-msgstr ""
-
-#: ../../mod/photos.php:1494
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1503
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../mod/community.php:21
-msgid "Not available."
-msgstr ""
-
-#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133
-#: ../../include/nav.php:101
-msgid "Community"
-msgstr ""
-
-#: ../../mod/community.php:61 ../../mod/search.php:144
-msgid "No results."
-msgstr ""
-
-#: ../../mod/friendica.php:55
-msgid "This is Friendica, version"
-msgstr ""
-
-#: ../../mod/friendica.php:56
-msgid "running at web location"
-msgstr ""
-
-#: ../../mod/friendica.php:58
-msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
-msgstr ""
-
-#: ../../mod/friendica.php:60
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/friendica.php:61
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-
-#: ../../mod/friendica.php:75
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/friendica.php:88
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editpost.php:36
-msgid "Edit post"
-msgstr ""
-
-#: ../../mod/editpost.php:80 ../../include/conversation.php:975
-msgid "Post to Email"
-msgstr ""
-
-#: ../../mod/editpost.php:95 ../../mod/settings.php:617
-#: ../../include/conversation.php:596
-msgid "Edit"
-msgstr ""
-
-#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:213 ../../mod/message.php:408
-#: ../../include/conversation.php:990
-msgid "Upload photo"
-msgstr ""
-
-#: ../../mod/editpost.php:97 ../../include/conversation.php:992
-msgid "Attach file"
-msgstr ""
-
-#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:214 ../../mod/message.php:409
-#: ../../include/conversation.php:994
-msgid "Insert web link"
-msgstr ""
-
-#: ../../mod/editpost.php:99
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/editpost.php:100
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/editpost.php:101
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/editpost.php:102 ../../include/conversation.php:1000
-msgid "Set your location"
-msgstr ""
-
-#: ../../mod/editpost.php:103 ../../include/conversation.php:1002
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1009
-msgid "Permission settings"
-msgstr ""
-
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1018
-msgid "CC: email addresses"
-msgstr ""
-
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1019
-msgid "Public post"
-msgstr ""
-
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1005
-msgid "Set title"
-msgstr ""
-
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1007
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1021
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/fsuggest.php:107 ../../mod/admin.php:420 ../../mod/admin.php:656
+#: ../../mod/admin.php:792 ../../mod/admin.php:991 ../../mod/admin.php:1078
+#: ../../mod/message.php:216 ../../mod/events.php:428 ../../mod/photos.php:963
+#: ../../mod/photos.php:1021 ../../mod/photos.php:1266
+#: ../../mod/photos.php:1306 ../../mod/photos.php:1346
+#: ../../mod/photos.php:1377 ../../mod/contacts.php:342
+#: ../../mod/invite.php:119 ../../mod/settings.php:555
+#: ../../mod/settings.php:701 ../../mod/settings.php:762
+#: ../../mod/settings.php:969 ../../mod/profiles.php:554
+#: ../../mod/localtime.php:45 ../../mod/install.php:246
+#: ../../mod/install.php:284 ../../mod/group.php:85 ../../mod/crepair.php:166
+#: ../../view/theme/diabook/theme.php:757
+#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/dispy/config.php:70 ../../view/theme/quattro/config.php:52
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/piwik/piwik.php:89
+#: ../../addon/libertree/libertree.php:90
+#: ../../addon/editplain/editplain.php:84
+#: ../../addon/posterous/posterous.php:103 ../../addon/ljpost/ljpost.php:93
+#: ../../addon/snautofollow/snautofollow.php:64
+#: ../../addon/geonames/geonames.php:187 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:561
+#: ../../addon/qcomment/qcomment.php:61 ../../addon/showmore/showmore.php:48
+#: ../../addon/dwpost/dwpost.php:93 ../../addon/numfriends/numfriends.php:85
+#: ../../addon/blackout/blackout.php:98 ../../addon/blogger/blogger.php:102
+#: ../../addon/wppost/wppost.php:110 ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/gravatar/gravatar.php:86 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/twitter/twitter.php:180 ../../addon/twitter/twitter.php:209
+#: ../../addon/twitter/twitter.php:381 ../../addon/facebook/facebook.php:605
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/randplace/randplace.php:177 ../../addon/blockem/blockem.php:57
+#: ../../addon/impressum/impressum.php:82 ../../addon/gnot/gnot.php:88
+#: ../../addon/planets/planets.php:158 ../../addon/irc/irc.php:55
+#: ../../addon/yourls/yourls.php:76 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/startpage/startpage.php:92 ../../include/conversation.php:580
+msgid "Submit"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:93
@@ -824,6 +244,12 @@ msgstr ""
 msgid "[Name Withheld]"
 msgstr ""
 
+#: ../../mod/dfrn_request.php:759 ../../mod/photos.php:820
+#: ../../mod/search.php:71 ../../mod/display.php:7 ../../mod/community.php:16
+#: ../../mod/viewcontacts.php:17 ../../mod/directory.php:29
+msgid "Public access denied."
+msgstr ""
+
 #: ../../mod/dfrn_request.php:808
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
@@ -860,6 +286,30 @@ msgstr ""
 msgid "Does %s know you?"
 msgstr ""
 
+#: ../../mod/dfrn_request.php:833 ../../mod/api.php:105
+#: ../../mod/register.php:234 ../../mod/settings.php:879
+#: ../../mod/settings.php:885 ../../mod/settings.php:893
+#: ../../mod/settings.php:897 ../../mod/settings.php:902
+#: ../../mod/settings.php:908 ../../mod/settings.php:914
+#: ../../mod/settings.php:920 ../../mod/settings.php:956
+#: ../../mod/settings.php:957 ../../mod/settings.php:958
+#: ../../mod/settings.php:959 ../../mod/settings.php:960
+#: ../../mod/profiles.php:531
+msgid "Yes"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:834 ../../mod/api.php:106
+#: ../../mod/register.php:235 ../../mod/settings.php:879
+#: ../../mod/settings.php:885 ../../mod/settings.php:893
+#: ../../mod/settings.php:897 ../../mod/settings.php:902
+#: ../../mod/settings.php:908 ../../mod/settings.php:914
+#: ../../mod/settings.php:920 ../../mod/settings.php:956
+#: ../../mod/settings.php:957 ../../mod/settings.php:958
+#: ../../mod/settings.php:959 ../../mod/settings.php:960
+#: ../../mod/profiles.php:532
+msgid "No"
+msgstr ""
+
 #: ../../mod/dfrn_request.php:835
 msgid "Add a personal note:"
 msgstr ""
@@ -892,325 +342,22 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
+#: ../../mod/dfrn_request.php:845 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:556
+#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
+msgid "Cancel"
 msgstr ""
 
-#: ../../mod/install.php:123
-msgid "Could not connect to database."
+#: ../../mod/profile.php:21 ../../boot.php:966
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/install.php:127
-msgid "Could not create table."
+#: ../../mod/profile.php:141 ../../mod/display.php:75
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "Your Friendica site database has been installed."
-msgstr ""
-
-#: ../../mod/install.php:138
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:489
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: ../../mod/install.php:201
-msgid "System check"
-msgstr ""
-
-#: ../../mod/install.php:206
-msgid "Check again"
-msgstr ""
-
-#: ../../mod/install.php:225
-msgid "Database connection"
-msgstr ""
-
-#: ../../mod/install.php:226
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../mod/install.php:227
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../mod/install.php:228
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../mod/install.php:232
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../mod/install.php:233
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../mod/install.php:234
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../mod/install.php:235
-msgid "Database Name"
-msgstr ""
-
-#: ../../mod/install.php:236 ../../mod/install.php:275
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../mod/install.php:236 ../../mod/install.php:275
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../mod/install.php:240 ../../mod/install.php:278
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../mod/install.php:265
-msgid "Site settings"
-msgstr ""
-
-#: ../../mod/install.php:318
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../mod/install.php:319
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See <a href='http://"
-"friendica.com/node/27'>'Activating scheduled tasks'</a>"
-msgstr ""
-
-#: ../../mod/install.php:323
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../mod/install.php:323
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../mod/install.php:328
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../mod/install.php:337
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../mod/install.php:338
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../mod/install.php:340
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../mod/install.php:361
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../mod/install.php:362
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../mod/install.php:364
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../mod/install.php:371
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../mod/install.php:372
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../mod/install.php:373
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../mod/install.php:374
-msgid "mysqli PHP module"
-msgstr ""
-
-#: ../../mod/install.php:375
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../mod/install.php:380 ../../mod/install.php:382
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../mod/install.php:380
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:388
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:392
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:396
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:400
-msgid "Error: mysqli PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:404
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/install.php:421
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../mod/install.php:422
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../mod/install.php:423
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Friendica top folder."
-msgstr ""
-
-#: ../../mod/install.php:424
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../mod/install.php:427
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../mod/install.php:439
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr ""
-
-#: ../../mod/install.php:441
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../mod/install.php:451
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../mod/install.php:476
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../mod/install.php:487
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../mod/install.php:488
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:243
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
-msgstr ""
-
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendika provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr ""
-
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
-msgstr ""
-
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
-msgstr ""
-
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr ""
-
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr ""
-
-#: ../../mod/match.php:12
-msgid "Profile Match"
-msgstr ""
-
-#: ../../mod/match.php:20
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-
-#: ../../mod/match.php:57
-msgid "is interested in:"
-msgstr ""
-
-#: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1053
-msgid "Connect"
-msgstr ""
-
-#: ../../mod/match.php:65 ../../mod/dirfind.php:60
-msgid "No matches"
-msgstr ""
-
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr ""
-
-#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/profile.php:166
+msgid "Tips for New Members"
 msgstr ""
 
 #: ../../mod/notifications.php:26
@@ -1236,7 +383,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:266
+#: ../../mod/notifications.php:85 ../../mod/network.php:285
 msgid "Personal"
 msgstr ""
 
@@ -1398,6 +545,1563 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
+#: ../../mod/like.php:185 ../../mod/tagger.php:70 ../../mod/photos.php:587
+#: ../../view/theme/diabook/theme.php:570
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1316
+#: ../../include/diaspora.php:1671 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
+msgid "photo"
+msgstr ""
+
+#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:574
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../addon/facebook/facebook.php:1572 ../../include/diaspora.php:1671
+#: ../../include/conversation.php:48 ../../include/conversation.php:57
+#: ../../include/conversation.php:121 ../../include/conversation.php:130
+msgid "status"
+msgstr ""
+
+#: ../../mod/like.php:202 ../../view/theme/diabook/theme.php:579
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../addon/facebook/facebook.php:1576 ../../include/diaspora.php:1687
+#: ../../include/conversation.php:65
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:204 ../../include/conversation.php:68
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr ""
+
+#: ../../mod/openid.php:93 ../../include/auth.php:99
+#: ../../include/auth.php:162
+msgid "Login failed."
+msgstr ""
+
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:419
+msgid "Site"
+msgstr ""
+
+#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667
+msgid "Users"
+msgstr ""
+
+#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791
+msgid "Plugins"
+msgstr ""
+
+#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990
+msgid "Themes"
+msgstr ""
+
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr ""
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077
+msgid "Logs"
+msgstr ""
+
+#: ../../mod/admin.php:120 ../../include/nav.php:146
+msgid "Admin"
+msgstr ""
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../mod/admin.php:123
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: ../../mod/admin.php:159 ../../mod/admin.php:700 ../../mod/admin.php:899
+#: ../../mod/notice.php:15 ../../mod/display.php:37 ../../mod/display.php:142
+#: ../../mod/viewsrc.php:15 ../../include/items.php:3234
+msgid "Item not found."
+msgstr ""
+
+#: ../../mod/admin.php:183 ../../mod/admin.php:637
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:638
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:639
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/admin.php:186 ../../mod/admin.php:640
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: ../../mod/admin.php:205
+msgid "Message queues"
+msgstr ""
+
+#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654
+#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953
+#: ../../mod/admin.php:989 ../../mod/admin.php:1076
+msgid "Administration"
+msgstr ""
+
+#: ../../mod/admin.php:211
+msgid "Summary"
+msgstr ""
+
+#: ../../mod/admin.php:213
+msgid "Registered users"
+msgstr ""
+
+#: ../../mod/admin.php:215
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../mod/admin.php:216
+msgid "Version"
+msgstr ""
+
+#: ../../mod/admin.php:218
+msgid "Active plugins"
+msgstr ""
+
+#: ../../mod/admin.php:357
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:405
+msgid "Closed"
+msgstr ""
+
+#: ../../mod/admin.php:406
+msgid "Requires approval"
+msgstr ""
+
+#: ../../mod/admin.php:407
+msgid "Open"
+msgstr ""
+
+#: ../../mod/admin.php:411
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:412
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:413
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:421 ../../mod/register.php:255
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/admin.php:422
+msgid "File upload"
+msgstr ""
+
+#: ../../mod/admin.php:423
+msgid "Policies"
+msgstr ""
+
+#: ../../mod/admin.php:424
+msgid "Advanced"
+msgstr ""
+
+#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552
+msgid "Site name"
+msgstr ""
+
+#: ../../mod/admin.php:429
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../mod/admin.php:430
+msgid "System language"
+msgstr ""
+
+#: ../../mod/admin.php:431
+msgid "System theme"
+msgstr ""
+
+#: ../../mod/admin.php:431
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: ../../mod/admin.php:432
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:432
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:433
+msgid "Maximum image size"
+msgstr ""
+
+#: ../../mod/admin.php:433
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:435
+msgid "Register policy"
+msgstr ""
+
+#: ../../mod/admin.php:436
+msgid "Register text"
+msgstr ""
+
+#: ../../mod/admin.php:436
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:437
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../mod/admin.php:437
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: ../../mod/admin.php:438
+msgid "Allowed friend domains"
+msgstr ""
+
+#: ../../mod/admin.php:438
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../mod/admin.php:439
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../mod/admin.php:439
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../mod/admin.php:440
+msgid "Block public"
+msgstr ""
+
+#: ../../mod/admin.php:440
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid "Force publish"
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:442
+msgid "Global directory update URL"
+msgstr ""
+
+#: ../../mod/admin.php:442
+msgid ""
+"URL to update the global directory. If this is not set, the global directory "
+"is completely unavailable to the application."
+msgstr ""
+
+#: ../../mod/admin.php:444
+msgid "Block multiple registrations"
+msgstr ""
+
+#: ../../mod/admin.php:444
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:445
+msgid "OpenID support"
+msgstr ""
+
+#: ../../mod/admin.php:445
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../mod/admin.php:446
+msgid "Fullname check"
+msgstr ""
+
+#: ../../mod/admin.php:446
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:447
+msgid "UTF-8 Regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:447
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:448
+msgid "Show Community Page"
+msgstr ""
+
+#: ../../mod/admin.php:448
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:449
+msgid "Enable OStatus support"
+msgstr ""
+
+#: ../../mod/admin.php:449
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: ../../mod/admin.php:450
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: ../../mod/admin.php:450
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:451
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: ../../mod/admin.php:451
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: ../../mod/admin.php:452
+msgid "Verify SSL"
+msgstr ""
+
+#: ../../mod/admin.php:452
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
+msgstr ""
+
+#: ../../mod/admin.php:453
+msgid "Proxy user"
+msgstr ""
+
+#: ../../mod/admin.php:454
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../mod/admin.php:455
+msgid "Network timeout"
+msgstr ""
+
+#: ../../mod/admin.php:455
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:456
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../mod/admin.php:456
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: ../../mod/admin.php:457
+msgid "Poll interval"
+msgstr ""
+
+#: ../../mod/admin.php:457
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../mod/admin.php:458
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:458
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../mod/admin.php:472
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:482
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../mod/admin.php:485
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:489
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:492
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../mod/admin.php:507
+msgid "No failed updates."
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../mod/admin.php:512
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: ../../mod/admin.php:513
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../mod/admin.php:539
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:546
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:585
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../mod/admin.php:593
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: ../../mod/admin.php:593
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: ../../mod/admin.php:657
+msgid "select all"
+msgstr ""
+
+#: ../../mod/admin.php:658
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: ../../mod/admin.php:659
+msgid "Request date"
+msgstr ""
+
+#: ../../mod/admin.php:659 ../../mod/admin.php:668 ../../mod/settings.php:557
+#: ../../mod/settings.php:583 ../../mod/crepair.php:148
+msgid "Name"
+msgstr ""
+
+#: ../../mod/admin.php:659 ../../mod/admin.php:668
+#: ../../include/contact_selectors.php:79
+msgid "Email"
+msgstr ""
+
+#: ../../mod/admin.php:660
+msgid "No registrations."
+msgstr ""
+
+#: ../../mod/admin.php:662
+msgid "Deny"
+msgstr ""
+
+#: ../../mod/admin.php:663 ../../mod/photos.php:1404
+#: ../../mod/settings.php:618 ../../mod/settings.php:699
+#: ../../mod/group.php:168 ../../include/conversation.php:328
+#: ../../include/conversation.php:609
+msgid "Delete"
+msgstr ""
+
+#: ../../mod/admin.php:664 ../../mod/contacts.php:310
+#: ../../mod/contacts.php:367
+msgid "Block"
+msgstr ""
+
+#: ../../mod/admin.php:665 ../../mod/contacts.php:310
+#: ../../mod/contacts.php:367
+msgid "Unblock"
+msgstr ""
+
+#: ../../mod/admin.php:668
+msgid "Register date"
+msgstr ""
+
+#: ../../mod/admin.php:668
+msgid "Last login"
+msgstr ""
+
+#: ../../mod/admin.php:668
+msgid "Last item"
+msgstr ""
+
+#: ../../mod/admin.php:668
+msgid "Account"
+msgstr ""
+
+#: ../../mod/admin.php:670
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../mod/admin.php:671
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../mod/admin.php:712
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../mod/admin.php:716
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../mod/admin.php:726 ../../mod/admin.php:924
+msgid "Disable"
+msgstr ""
+
+#: ../../mod/admin.php:728 ../../mod/admin.php:926
+msgid "Enable"
+msgstr ""
+
+#: ../../mod/admin.php:750 ../../mod/admin.php:955
+msgid "Toggle"
+msgstr ""
+
+#: ../../mod/admin.php:751 ../../mod/admin.php:956 ../../mod/settings.php:89
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:773 ../../addon/dav/layout.fnk.php:116
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
+msgid "Settings"
+msgstr ""
+
+#: ../../mod/admin.php:758 ../../mod/admin.php:965
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:759 ../../mod/admin.php:966
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:888
+msgid "No themes found."
+msgstr ""
+
+#: ../../mod/admin.php:947
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:995
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:996
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:1023
+msgid "Log settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:1079
+msgid "Clear"
+msgstr ""
+
+#: ../../mod/admin.php:1085
+msgid "Debugging"
+msgstr ""
+
+#: ../../mod/admin.php:1086
+msgid "Log file"
+msgstr ""
+
+#: ../../mod/admin.php:1086
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: ../../mod/admin.php:1087
+msgid "Log level"
+msgstr ""
+
+#: ../../mod/admin.php:1136 ../../mod/contacts.php:364
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/admin.php:1137
+msgid "Close"
+msgstr ""
+
+#: ../../mod/admin.php:1143
+msgid "FTP Host"
+msgstr ""
+
+#: ../../mod/admin.php:1144
+msgid "FTP Path"
+msgstr ""
+
+#: ../../mod/admin.php:1145
+msgid "FTP User"
+msgstr ""
+
+#: ../../mod/admin.php:1146
+msgid "FTP Password"
+msgstr ""
+
+#: ../../mod/message.php:9 ../../include/nav.php:131
+msgid "New Message"
+msgstr ""
+
+#: ../../mod/message.php:66 ../../mod/wallmessage.php:56
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/message.php:70
+msgid "Unable to locate contact information."
+msgstr ""
+
+#: ../../mod/message.php:73 ../../mod/wallmessage.php:62
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/message.php:76 ../../mod/wallmessage.php:65
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/message.php:79 ../../mod/wallmessage.php:68
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/message.php:120
+msgid "Message deleted."
+msgstr ""
+
+#: ../../mod/message.php:150
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/message.php:172 ../../mod/wallmessage.php:124
+#: ../../include/conversation.php:943
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/message.php:200 ../../mod/wallmessage.php:131
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/message.php:201 ../../mod/message.php:399
+#: ../../mod/wallmessage.php:133
+msgid "To:"
+msgstr ""
+
+#: ../../mod/message.php:206 ../../mod/message.php:401
+#: ../../mod/wallmessage.php:134
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/message.php:210 ../../mod/message.php:404
+#: ../../mod/wallmessage.php:140 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
+#: ../../mod/message.php:213 ../../mod/message.php:408
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../include/conversation.php:990
+msgid "Upload photo"
+msgstr ""
+
+#: ../../mod/message.php:214 ../../mod/message.php:409
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../include/conversation.php:994
+msgid "Insert web link"
+msgstr ""
+
+#: ../../mod/message.php:215 ../../mod/message.php:410
+#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:145
+#: ../../mod/photos.php:1287 ../../include/conversation.php:371
+#: ../../include/conversation.php:731 ../../include/conversation.php:1008
+msgid "Please wait"
+msgstr ""
+
+#: ../../mod/message.php:247
+msgid "No messages."
+msgstr ""
+
+#: ../../mod/message.php:254
+#, php-format
+msgid "Unknown sender - %s"
+msgstr ""
+
+#: ../../mod/message.php:257
+#, php-format
+msgid "You and %s"
+msgstr ""
+
+#: ../../mod/message.php:260
+#, php-format
+msgid "%s and You"
+msgstr ""
+
+#: ../../mod/message.php:270 ../../mod/message.php:392
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../mod/message.php:273
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:275
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/message.php:310
+msgid "Message not available."
+msgstr ""
+
+#: ../../mod/message.php:375
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/message.php:394
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:398
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr ""
+
+#: ../../mod/editpost.php:36
+msgid "Edit post"
+msgstr ""
+
+#: ../../mod/editpost.php:80 ../../include/conversation.php:975
+msgid "Post to Email"
+msgstr ""
+
+#: ../../mod/editpost.php:95 ../../mod/settings.php:617
+#: ../../include/conversation.php:596
+msgid "Edit"
+msgstr ""
+
+#: ../../mod/editpost.php:97 ../../include/conversation.php:992
+msgid "Attach file"
+msgstr ""
+
+#: ../../mod/editpost.php:99
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editpost.php:100
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editpost.php:101
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/editpost.php:102 ../../include/conversation.php:1000
+msgid "Set your location"
+msgstr ""
+
+#: ../../mod/editpost.php:103 ../../include/conversation.php:1002
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1009
+msgid "Permission settings"
+msgstr ""
+
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1018
+msgid "CC: email addresses"
+msgstr ""
+
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1019
+msgid "Public post"
+msgstr ""
+
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1005
+msgid "Set title"
+msgstr ""
+
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1007
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1021
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../mod/editpost.php:125 ../../mod/photos.php:1307
+#: ../../include/conversation.php:589 ../../include/conversation.php:1026
+msgid "Preview"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:62 ../../mod/profiles.php:21
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:509
+msgid "Profile not found."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:237
+msgid "Response from remote site was not understood."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:246
+msgid "Unexpected response from remote site: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:254
+msgid "Confirmation completed successfully."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
+msgid "Remote site reported: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:268
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:420
+msgid "Unable to set contact photo."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510
+#: ../../include/conversation.php:101
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:562
+#, php-format
+msgid "No user record found for '%s' "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:572
+msgid "Our site encryption key is apparently messed up."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:583
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:604
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:618
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:638
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:649
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:716
+msgid "Unable to update your contact profile details on our system"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:750
+#, php-format
+msgid "Connection accepted at %s"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:752 ../../mod/register.php:90
+#: ../../mod/register.php:144 ../../mod/lostpass.php:45
+#: ../../mod/lostpass.php:107 ../../mod/regmod.php:54 ../../boot.php:703
+#: ../../addon/testdrive/testdrive.php:67
+#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:1178
+#: ../../addon/public_server/public_server.php:62 ../../include/items.php:2792
+msgid "Administrator"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:799
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../mod/events.php:65
+msgid "Event description and start time are required."
+msgstr ""
+
+#: ../../mod/events.php:258
+msgid "l, F j"
+msgstr ""
+
+#: ../../mod/events.php:280
+msgid "Edit event"
+msgstr ""
+
+#: ../../mod/events.php:300 ../../include/text.php:1065
+msgid "link to source"
+msgstr ""
+
+#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
+#: ../../boot.php:1529 ../../include/nav.php:52
+msgid "Events"
+msgstr ""
+
+#: ../../mod/events.php:325
+msgid "Create New Event"
+msgstr ""
+
+#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:154
+msgid "Previous"
+msgstr ""
+
+#: ../../mod/events.php:327 ../../mod/install.php:205
+#: ../../addon/dav/layout.fnk.php:157
+msgid "Next"
+msgstr ""
+
+#: ../../mod/events.php:399
+msgid "hour:minute"
+msgstr ""
+
+#: ../../mod/events.php:408
+msgid "Event details"
+msgstr ""
+
+#: ../../mod/events.php:409
+#, php-format
+msgid "Format is %s %s. Starting date and Description are required."
+msgstr ""
+
+#: ../../mod/events.php:411
+msgid "Event Starts:"
+msgstr ""
+
+#: ../../mod/events.php:414
+msgid "Finish date/time is not known or not relevant"
+msgstr ""
+
+#: ../../mod/events.php:416
+msgid "Event Finishes:"
+msgstr ""
+
+#: ../../mod/events.php:419
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: ../../mod/events.php:421
+msgid "Description:"
+msgstr ""
+
+#: ../../mod/events.php:423 ../../boot.php:1109 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:265
+msgid "Location:"
+msgstr ""
+
+#: ../../mod/events.php:425
+msgid "Share this event"
+msgstr ""
+
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../boot.php:1520 ../../include/nav.php:51
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/fbrowser.php:96
+msgid "Files"
+msgstr ""
+
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
+#: ../../mod/nogroup.php:40 ../../mod/contacts.php:351
+#: ../../mod/contacts.php:542 ../../mod/viewcontacts.php:62
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr ""
+
+#: ../../mod/nogroup.php:41 ../../mod/contacts.php:543
+msgid "Edit contact"
+msgstr ""
+
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr ""
+
+#: ../../mod/friendica.php:55
+msgid "This is Friendica, version"
+msgstr ""
+
+#: ../../mod/friendica.php:56
+msgid "running at web location"
+msgstr ""
+
+#: ../../mod/friendica.php:58
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr ""
+
+#: ../../mod/friendica.php:60
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/friendica.php:61
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr ""
+
+#: ../../mod/friendica.php:75
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../mod/friendica.php:88
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr ""
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr ""
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: ../../mod/wall_upload.php:77 ../../mod/profile_photo.php:117
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/wall_upload.php:86 ../../mod/photos.php:714
+#: ../../mod/profile_photo.php:126
+msgid "Unable to process image."
+msgstr ""
+
+#: ../../mod/wall_upload.php:102 ../../mod/wall_upload.php:111
+#: ../../mod/wall_upload.php:118 ../../mod/item.php:379
+#: ../../include/message.php:144
+msgid "Wall Photos"
+msgstr ""
+
+#: ../../mod/wall_upload.php:105 ../../mod/photos.php:734
+#: ../../mod/profile_photo.php:259
+msgid "Image upload failed."
+msgstr ""
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr ""
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: ../../mod/photos.php:44 ../../boot.php:1523
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
+#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
+#: ../../view/theme/diabook/theme.php:598
+#: ../../addon/communityhome/communityhome.php:110
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../mod/photos.php:70 ../../mod/settings.php:21
+msgid "everybody"
+msgstr ""
+
+#: ../../mod/photos.php:143
+msgid "Contact information unavailable"
+msgstr ""
+
+#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
+#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
+#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
+#: ../../mod/profile_photo.php:263 ../../view/theme/diabook/theme.php:599
+#: ../../addon/communityhome/communityhome.php:111 ../../include/user.php:298
+#: ../../include/user.php:305 ../../include/user.php:312
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../mod/photos.php:164
+msgid "Album not found."
+msgstr ""
+
+#: ../../mod/photos.php:182 ../../mod/photos.php:1022
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:245 ../../mod/photos.php:1267
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:587
+msgid "was tagged in a"
+msgstr ""
+
+#: ../../mod/photos.php:587
+msgid "by"
+msgstr ""
+
+#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315
+msgid "Image exceeds size limit of "
+msgstr ""
+
+#: ../../mod/photos.php:700
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../mod/photos.php:830
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:909
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:970
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:973 ../../mod/photos.php:1017
+msgid "New album name: "
+msgstr ""
+
+#: ../../mod/photos.php:974
+msgid "or existing album name: "
+msgstr ""
+
+#: ../../mod/photos.php:975
+msgid "Do not show a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:977 ../../mod/photos.php:1262
+msgid "Permissions"
+msgstr ""
+
+#: ../../mod/photos.php:1032
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1091
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:1093
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:1143
+msgid "View photo"
+msgstr ""
+
+#: ../../mod/photos.php:1143
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:1144
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:1150 ../../include/conversation.php:490
+msgid "Private Message"
+msgstr ""
+
+#: ../../mod/photos.php:1172
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:1240
+msgid "Tags: "
+msgstr ""
+
+#: ../../mod/photos.php:1243
+msgid "[Remove any tag]"
+msgstr ""
+
+#: ../../mod/photos.php:1253
+msgid "Rotate CW"
+msgstr ""
+
+#: ../../mod/photos.php:1255
+msgid "New album name"
+msgstr ""
+
+#: ../../mod/photos.php:1258
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:1260
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1264
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: ../../mod/photos.php:1284 ../../include/conversation.php:554
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../mod/photos.php:1285 ../../include/conversation.php:555
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../mod/photos.php:1286 ../../include/conversation.php:989
+msgid "Share"
+msgstr ""
+
+#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
+#: ../../mod/photos.php:1374 ../../include/conversation.php:577
+msgid "This is you"
+msgstr ""
+
+#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
+#: ../../mod/photos.php:1376 ../../boot.php:523
+#: ../../include/conversation.php:579
+msgid "Comment"
+msgstr ""
+
+#: ../../mod/photos.php:1494
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1503
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr ""
+
+#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../mod/register.php:96
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr ""
+
+#: ../../mod/register.php:100
+msgid "Failed to send email message. Here is the message that failed."
+msgstr ""
+
+#: ../../mod/register.php:105
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: ../../mod/register.php:142
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../mod/register.php:151
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+
+#: ../../mod/register.php:189
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:215
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr ""
+
+#: ../../mod/register.php:216
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr ""
+
+#: ../../mod/register.php:217
+msgid "Your OpenID (optional): "
+msgstr ""
+
+#: ../../mod/register.php:231
+msgid "Include your profile in member directory?"
+msgstr ""
+
+#: ../../mod/register.php:251
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: ../../mod/register.php:252
+msgid "Your invitation ID: "
+msgstr ""
+
+#: ../../mod/register.php:263
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr ""
+
+#: ../../mod/register.php:264
+msgid "Your Email Address: "
+msgstr ""
+
+#: ../../mod/register.php:265
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be '<strong>nickname@$sitename</"
+"strong>'."
+msgstr ""
+
+#: ../../mod/register.php:266
+msgid "Choose a nickname: "
+msgstr ""
+
+#: ../../mod/register.php:269 ../../boot.php:801 ../../include/nav.php:81
+msgid "Register"
+msgstr ""
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr ""
+
+#: ../../mod/lostpass.php:32
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../mod/lostpass.php:43
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:65
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../mod/lostpass.php:83 ../../boot.php:835
+msgid "Password Reset"
+msgstr ""
+
+#: ../../mod/lostpass.php:84
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../mod/lostpass.php:85
+msgid "Your new password is"
+msgstr ""
+
+#: ../../mod/lostpass.php:86
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../mod/lostpass.php:87
+msgid "click here to login"
+msgstr ""
+
+#: ../../mod/lostpass.php:88
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../mod/lostpass.php:119
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../mod/lostpass.php:120
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../mod/lostpass.php:121
+msgid "Nickname or Email: "
+msgstr ""
+
+#: ../../mod/lostpass.php:122
+msgid "Reset"
+msgstr ""
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr ""
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr ""
+
+#: ../../mod/apps.php:4
+msgid "Applications"
+msgstr ""
+
+#: ../../mod/apps.php:7
+msgid "No installed applications."
+msgstr ""
+
+#: ../../mod/help.php:30
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116
+#: ../../include/nav.php:86
+msgid "Help"
+msgstr ""
+
 #: ../../mod/contacts.php:83 ../../mod/contacts.php:163
 msgid "Could not access contact record."
 msgstr ""
@@ -1489,16 +2193,6 @@ msgstr[1] ""
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
-#: ../../mod/admin.php:665
-msgid "Unblock"
-msgstr ""
-
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
-#: ../../mod/admin.php:664
-msgid "Block"
-msgstr ""
-
 #: ../../mod/contacts.php:313
 msgid "Toggle Blocked status"
 msgstr ""
@@ -1554,12 +2248,6 @@ msgstr ""
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:351 ../../mod/contacts.php:542
-#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr ""
-
 #: ../../mod/contacts.php:352
 msgid "Block/Unblock contact"
 msgstr ""
@@ -1588,10 +2276,6 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:364 ../../mod/admin.php:1136
-msgid "Update now"
-msgstr ""
-
 #: ../../mod/contacts.php:371
 msgid "Currently blocked"
 msgstr ""
@@ -1677,10 +2361,6 @@ msgstr ""
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
-msgid "Edit contact"
-msgstr ""
-
 #: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
@@ -1699,78 +2379,256 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: ../../mod/lostpass.php:16
-msgid "No valid account found."
+#: ../../mod/common.php:42
+msgid "Common Friends"
 msgstr ""
 
-#: ../../mod/lostpass.php:32
-msgid "Password reset request issued. Check your email."
+#: ../../mod/common.php:78
+msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/lostpass.php:43
+#: ../../mod/follow.php:27
+msgid "Contact added"
+msgstr ""
+
+#: ../../mod/allfriends.php:34
 #, php-format
-msgid "Password reset requested at %s"
+msgid "Friends of %s"
 msgstr ""
 
-#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:688
-#: ../../addon/facebook/facebook.php:1178
-#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
-#: ../../boot.php:703
-msgid "Administrator"
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/lostpass.php:65
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr ""
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr ""
+
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr ""
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr ""
+
+#: ../../mod/newmember.php:12
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:835
-msgid "Password Reset"
-msgstr ""
-
-#: ../../mod/lostpass.php:84
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../mod/lostpass.php:85
-msgid "Your new password is"
-msgstr ""
-
-#: ../../mod/lostpass.php:86
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../mod/lostpass.php:87
-msgid "click here to login"
-msgstr ""
-
-#: ../../mod/lostpass.php:88
+#: ../../mod/newmember.php:16
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
 msgstr ""
 
-#: ../../mod/lostpass.php:119
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../mod/lostpass.php:120
+#: ../../mod/newmember.php:18
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/lostpass.php:121
-msgid "Nickname or Email: "
+#: ../../mod/newmember.php:20
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/lostpass.php:122
-msgid "Reset"
+#: ../../mod/newmember.php:22
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
+msgstr ""
+
+#: ../../mod/newmember.php:25
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr ""
+
+#: ../../mod/newmember.php:27
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr ""
+
+#: ../../mod/newmember.php:32
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
+msgstr ""
+
+#: ../../mod/newmember.php:34
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
+msgstr ""
+
+#: ../../mod/newmember.php:36
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
+msgstr ""
+
+#: ../../mod/newmember.php:38
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
+msgstr ""
+
+#: ../../mod/newmember.php:40
+msgid ""
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
+msgstr ""
+
+#: ../../mod/newmember.php:42
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/newmember.php:44
+msgid ""
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with "
+"each group privately on your Network page."
+msgstr ""
+
+#: ../../mod/newmember.php:46
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
+msgstr ""
+
+#: ../../mod/search.php:13 ../../mod/network.php:131
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../mod/search.php:16 ../../mod/network.php:122
+msgid "Remove term"
+msgstr ""
+
+#: ../../mod/search.php:83 ../../include/text.php:649
+#: ../../include/text.php:650 ../../include/nav.php:91
+msgid "Search"
+msgstr ""
+
+#: ../../mod/search.php:144 ../../mod/community.php:61
+msgid "No results."
+msgstr ""
+
+#: ../../mod/invite.php:35
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../mod/invite.php:59
+msgid "Please join us on Friendica"
+msgstr ""
+
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../mod/invite.php:100
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many "
+"other social networks."
+msgstr ""
+
+#: ../../mod/invite.php:102
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr ""
+
+#: ../../mod/invite.php:103
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr ""
+
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
+msgstr ""
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr ""
+
+#: ../../mod/invite.php:116
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr ""
+
+#: ../../mod/invite.php:116
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr ""
+
+#: ../../mod/invite.php:118
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
 msgstr ""
 
 #: ../../mod/settings.php:50 ../../include/nav.php:137
@@ -1801,13 +2659,6 @@ msgstr ""
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956
-#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
-msgid "Settings"
-msgstr ""
-
 #: ../../mod/settings.php:133
 msgid "Missing some important data!"
 msgstr ""
@@ -1864,11 +2715,11 @@ msgstr ""
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:488
-#: ../../addon/impressum/impressum.php:77
+#: ../../mod/settings.php:484 ../../addon/piwik/piwik.php:105
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/twitter/twitter.php:376
+#: ../../addon/facebook/facebook.php:488
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:376
+#: ../../addon/impressum/impressum.php:77
 msgid "Settings updated."
 msgstr ""
 
@@ -2294,1424 +3145,16 @@ msgstr ""
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid "Manage Identities and/or Pages"
-msgstr ""
-
-#: ../../mod/manage.php:93
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr ""
-
-#: ../../mod/manage.php:95
-msgid "Select an identity to manage: "
-msgstr ""
-
-#: ../../mod/network.php:67
-msgid "Search Results For:"
-msgstr ""
-
-#: ../../mod/network.php:106 ../../mod/search.php:16
-msgid "Remove term"
-msgstr ""
-
-#: ../../mod/network.php:115 ../../mod/search.php:13
-msgid "Saved Searches"
-msgstr ""
-
-#: ../../mod/network.php:116 ../../include/group.php:244
-msgid "add"
-msgstr ""
-
-#: ../../mod/network.php:253
-msgid "Commented Order"
-msgstr ""
-
-#: ../../mod/network.php:256
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../mod/network.php:259
-msgid "Posted Order"
-msgstr ""
-
-#: ../../mod/network.php:262
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../mod/network.php:269
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../mod/network.php:272
-msgid "New"
-msgstr ""
-
-#: ../../mod/network.php:275
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../mod/network.php:278
-msgid "Starred"
-msgstr ""
-
-#: ../../mod/network.php:281
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../mod/network.php:284
-msgid "Shared Links"
-msgstr ""
-
-#: ../../mod/network.php:287
-msgid "Interesting Links"
-msgstr ""
-
-#: ../../mod/network.php:354
-#, php-format
-msgid "Warning: This group contains %s member from an insecure network."
-msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/network.php:357
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr ""
-
-#: ../../mod/network.php:402
-msgid "No such group"
-msgstr ""
-
-#: ../../mod/network.php:413
-msgid "Group is empty"
-msgstr ""
-
-#: ../../mod/network.php:417
-msgid "Group: "
-msgstr ""
-
-#: ../../mod/network.php:427
-msgid "Contact: "
-msgstr ""
-
-#: ../../mod/network.php:429
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr ""
-
-#: ../../mod/network.php:434
-msgid "Invalid contact."
-msgstr ""
-
-#: ../../mod/notes.php:44 ../../boot.php:1535
-msgid "Personal Notes"
-msgstr ""
-
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:756
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:185
-#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
-msgid "Save"
-msgstr ""
-
-#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr ""
-
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:66
-msgid "No recipient selected."
-msgstr ""
-
-#: ../../mod/wallmessage.php:59
-msgid "Unable to check your home location."
-msgstr ""
-
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:73
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:76
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:79
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
-msgid "No recipient."
-msgstr ""
-
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:172
-#: ../../include/conversation.php:943
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:200
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/wallmessage.php:132
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr ""
-
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:201
-#: ../../mod/message.php:399
-msgid "To:"
-msgstr ""
-
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:206
-#: ../../mod/message.php:401
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:210
-#: ../../mod/message.php:404 ../../mod/invite.php:113
-msgid "Your message:"
-msgstr ""
-
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendica"
-msgstr ""
-
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
-msgstr ""
-
-#: ../../mod/newmember.php:12
-msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page. A link to this page "
-"will be visible from your home page for two weeks after your initial "
-"registration and then will quietly disappear."
-msgstr ""
-
-#: ../../mod/newmember.php:16
-msgid ""
-"On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, connect to Facebook, make some new connections, "
-"and find some groups to join."
-msgstr ""
-
-#: ../../mod/newmember.php:18
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
-msgstr ""
-
-#: ../../mod/newmember.php:20
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
-msgstr ""
-
-#: ../../mod/newmember.php:22
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
-msgstr ""
-
-#: ../../mod/newmember.php:25
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
-msgstr ""
-
-#: ../../mod/newmember.php:27
-msgid ""
-"<em>If</em> this is your own personal server, installing the Facebook addon "
-"may ease your transition to the free social web."
-msgstr ""
-
-#: ../../mod/newmember.php:32
-msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
-msgstr ""
-
-#: ../../mod/newmember.php:34
-msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
-msgstr ""
-
-#: ../../mod/newmember.php:36
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
-msgstr ""
-
-#: ../../mod/newmember.php:38
-msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Add New Contact</em> dialog."
-msgstr ""
-
-#: ../../mod/newmember.php:40
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
-"their profile page. Provide your own Identity Address if requested."
-msgstr ""
-
-#: ../../mod/newmember.php:42
-msgid ""
-"On the side panel of the Contacts page are several tools to find new "
-"friends. We can match people by interest, look up people by name or "
-"interest, and provide suggestions based on network relationships. On a brand "
-"new site, friend suggestions will usually begin to be populated within 24 "
-"hours."
-msgstr ""
-
-#: ../../mod/newmember.php:44
-msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with "
-"each group privately on your Network page."
-msgstr ""
-
-#: ../../mod/newmember.php:46
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
-msgstr ""
-
-#: ../../mod/attach.php:8
-msgid "Item not available."
-msgstr ""
-
-#: ../../mod/attach.php:20
-msgid "Item was not found."
-msgstr ""
-
-#: ../../mod/group.php:29
-msgid "Group created."
-msgstr ""
-
-#: ../../mod/group.php:35
-msgid "Could not create group."
-msgstr ""
-
-#: ../../mod/group.php:47 ../../mod/group.php:137
-msgid "Group not found."
-msgstr ""
-
-#: ../../mod/group.php:60
-msgid "Group name changed."
-msgstr ""
-
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298
-msgid "Permission denied"
-msgstr ""
-
-#: ../../mod/group.php:90
-msgid "Create a group of contacts/friends."
-msgstr ""
-
-#: ../../mod/group.php:91 ../../mod/group.php:177
-msgid "Group Name: "
-msgstr ""
-
-#: ../../mod/group.php:110
-msgid "Group removed."
-msgstr ""
-
-#: ../../mod/group.php:112
-msgid "Unable to remove group."
-msgstr ""
-
-#: ../../mod/group.php:176
-msgid "Group Editor"
-msgstr ""
-
-#: ../../mod/group.php:189
-msgid "Members"
-msgstr ""
-
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79
-#: ../../include/nav.php:50 ../../boot.php:1514
-msgid "Profile"
-msgstr ""
-
-#: ../../mod/profperm.php:114
-msgid "Visible To"
-msgstr ""
-
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr ""
-
-#: ../../mod/viewcontacts.php:39
-msgid "No contacts."
-msgstr ""
-
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
-msgid "View Contacts"
-msgstr ""
-
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../mod/register.php:96
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: ../../mod/register.php:100
-msgid "Failed to send email message. Here is the message that failed."
-msgstr ""
-
-#: ../../mod/register.php:105
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:142
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../mod/register.php:151
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:189
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:215
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-
-#: ../../mod/register.php:216
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: ../../mod/register.php:217
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: ../../mod/register.php:231
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: ../../mod/register.php:251
-msgid "Membership on this site is by invitation only."
-msgstr ""
-
-#: ../../mod/register.php:252
-msgid "Your invitation ID: "
-msgstr ""
-
-#: ../../mod/register.php:255 ../../mod/admin.php:421
-msgid "Registration"
-msgstr ""
-
-#: ../../mod/register.php:263
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr ""
-
-#: ../../mod/register.php:264
-msgid "Your Email Address: "
-msgstr ""
-
-#: ../../mod/register.php:265
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@$sitename</"
-"strong>'."
-msgstr ""
-
-#: ../../mod/register.php:266
-msgid "Choose a nickname: "
-msgstr ""
-
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801
-msgid "Register"
+#: ../../mod/display.php:135
+msgid "Item has been removed."
 msgstr ""
 
 #: ../../mod/dirfind.php:26
 msgid "People Search"
 msgstr ""
 
-#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1572
-#: ../../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:1671
-#: ../../include/conversation.php:48 ../../include/conversation.php:57
-#: ../../include/conversation.php:121 ../../include/conversation.php:130
-msgid "status"
-msgstr ""
-
-#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687
-#: ../../include/conversation.php:65
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:204 ../../include/conversation.php:68
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3234
-msgid "Item not found."
-msgstr ""
-
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
-msgstr ""
-
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1520
-msgid "Photos"
-msgstr ""
-
-#: ../../mod/fbrowser.php:96
-msgid "Files"
-msgstr ""
-
-#: ../../mod/regmod.php:61
-msgid "Account approved."
-msgstr ""
-
-#: ../../mod/regmod.php:98
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../mod/regmod.php:110
-msgid "Please login."
-msgstr ""
-
-#: ../../mod/item.php:89
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:258
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:379 ../../mod/wall_upload.php:102
-#: ../../mod/wall_upload.php:111 ../../mod/wall_upload.php:118
-#: ../../include/message.php:144
-msgid "Wall Photos"
-msgstr ""
-
-#: ../../mod/item.php:800
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../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:827
-#, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: ../../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:830
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: ../../mod/profile_photo.php:30
-msgid "Image uploaded but image cropping failed."
-msgstr ""
-
-#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr ""
-
-#: ../../mod/profile_photo.php:91
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: ../../mod/profile_photo.php:101
-msgid "Unable to process image"
-msgstr ""
-
-#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr ""
-
-#: ../../mod/profile_photo.php:209
-msgid "Upload File:"
-msgstr ""
-
-#: ../../mod/profile_photo.php:210
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../mod/profile_photo.php:211
-msgid "Upload"
-msgstr ""
-
-#: ../../mod/profile_photo.php:213
-msgid "skip this step"
-msgstr ""
-
-#: ../../mod/profile_photo.php:213
-msgid "select a photo from your photo albums"
-msgstr ""
-
-#: ../../mod/profile_photo.php:226
-msgid "Crop Image"
-msgstr ""
-
-#: ../../mod/profile_photo.php:227
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr ""
-
-#: ../../mod/profile_photo.php:229
-msgid "Done Editing"
-msgstr ""
-
-#: ../../mod/profile_photo.php:257
-msgid "Image uploaded successfully."
-msgstr ""
-
-#: ../../mod/hcard.php:10
-msgid "No profile"
-msgstr ""
-
-#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
-msgid "Remove My Account"
-msgstr ""
-
-#: ../../mod/removeme.php:46
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr ""
-
-#: ../../mod/removeme.php:47
-msgid "Please enter your password for verification:"
-msgstr ""
-
-#: ../../mod/message.php:9 ../../include/nav.php:131
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:70
-msgid "Unable to locate contact information."
-msgstr ""
-
-#: ../../mod/message.php:120
-msgid "Message deleted."
-msgstr ""
-
-#: ../../mod/message.php:150
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../mod/message.php:247
-msgid "No messages."
-msgstr ""
-
-#: ../../mod/message.php:254
-#, php-format
-msgid "Unknown sender - %s"
-msgstr ""
-
-#: ../../mod/message.php:257
-#, php-format
-msgid "You and %s"
-msgstr ""
-
-#: ../../mod/message.php:260
-#, php-format
-msgid "%s and You"
-msgstr ""
-
-#: ../../mod/message.php:270 ../../mod/message.php:392
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../mod/message.php:273
-msgid "D, d M Y - g:i A"
-msgstr ""
-
-#: ../../mod/message.php:275
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/message.php:310
-msgid "Message not available."
-msgstr ""
-
-#: ../../mod/message.php:375
-msgid "Delete message"
-msgstr ""
-
-#: ../../mod/message.php:394
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: ../../mod/message.php:398
-msgid "Send Reply"
-msgstr ""
-
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
-msgstr ""
-
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
-msgstr ""
-
-#: ../../mod/admin.php:55
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:96 ../../mod/admin.php:419
-msgid "Site"
-msgstr ""
-
-#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667
-msgid "Users"
-msgstr ""
-
-#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791
-msgid "Plugins"
-msgstr ""
-
-#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990
-msgid "Themes"
-msgstr ""
-
-#: ../../mod/admin.php:100
-msgid "DB updates"
-msgstr ""
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077
-msgid "Logs"
-msgstr ""
-
-#: ../../mod/admin.php:120 ../../include/nav.php:146
-msgid "Admin"
-msgstr ""
-
-#: ../../mod/admin.php:121
-msgid "Plugin Features"
-msgstr ""
-
-#: ../../mod/admin.php:123
-msgid "User registrations waiting for confirmation"
-msgstr ""
-
-#: ../../mod/admin.php:183 ../../mod/admin.php:637
-msgid "Normal Account"
-msgstr ""
-
-#: ../../mod/admin.php:184 ../../mod/admin.php:638
-msgid "Soapbox Account"
-msgstr ""
-
-#: ../../mod/admin.php:185 ../../mod/admin.php:639
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: ../../mod/admin.php:186 ../../mod/admin.php:640
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: ../../mod/admin.php:205
-msgid "Message queues"
-msgstr ""
-
-#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654
-#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953
-#: ../../mod/admin.php:989 ../../mod/admin.php:1076
-msgid "Administration"
-msgstr ""
-
-#: ../../mod/admin.php:211
-msgid "Summary"
-msgstr ""
-
-#: ../../mod/admin.php:213
-msgid "Registered users"
-msgstr ""
-
-#: ../../mod/admin.php:215
-msgid "Pending registrations"
-msgstr ""
-
-#: ../../mod/admin.php:216
-msgid "Version"
-msgstr ""
-
-#: ../../mod/admin.php:218
-msgid "Active plugins"
-msgstr ""
-
-#: ../../mod/admin.php:357
-msgid "Site settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:405
-msgid "Closed"
-msgstr ""
-
-#: ../../mod/admin.php:406
-msgid "Requires approval"
-msgstr ""
-
-#: ../../mod/admin.php:407
-msgid "Open"
-msgstr ""
-
-#: ../../mod/admin.php:411
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: ../../mod/admin.php:412
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:413
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: ../../mod/admin.php:422
-msgid "File upload"
-msgstr ""
-
-#: ../../mod/admin.php:423
-msgid "Policies"
-msgstr ""
-
-#: ../../mod/admin.php:424
-msgid "Advanced"
-msgstr ""
-
-#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552
-msgid "Site name"
-msgstr ""
-
-#: ../../mod/admin.php:429
-msgid "Banner/Logo"
-msgstr ""
-
-#: ../../mod/admin.php:430
-msgid "System language"
-msgstr ""
-
-#: ../../mod/admin.php:431
-msgid "System theme"
-msgstr ""
-
-#: ../../mod/admin.php:431
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: ../../mod/admin.php:432
-msgid "SSL link policy"
-msgstr ""
-
-#: ../../mod/admin.php:432
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: ../../mod/admin.php:433
-msgid "Maximum image size"
-msgstr ""
-
-#: ../../mod/admin.php:433
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: ../../mod/admin.php:435
-msgid "Register policy"
-msgstr ""
-
-#: ../../mod/admin.php:436
-msgid "Register text"
-msgstr ""
-
-#: ../../mod/admin.php:436
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: ../../mod/admin.php:437
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: ../../mod/admin.php:437
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: ../../mod/admin.php:438
-msgid "Allowed friend domains"
-msgstr ""
-
-#: ../../mod/admin.php:438
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr ""
-
-#: ../../mod/admin.php:439
-msgid "Allowed email domains"
-msgstr ""
-
-#: ../../mod/admin.php:439
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr ""
-
-#: ../../mod/admin.php:440
-msgid "Block public"
-msgstr ""
-
-#: ../../mod/admin.php:440
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr ""
-
-#: ../../mod/admin.php:441
-msgid "Force publish"
-msgstr ""
-
-#: ../../mod/admin.php:441
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: ../../mod/admin.php:442
-msgid "Global directory update URL"
-msgstr ""
-
-#: ../../mod/admin.php:442
-msgid ""
-"URL to update the global directory. If this is not set, the global directory "
-"is completely unavailable to the application."
-msgstr ""
-
-#: ../../mod/admin.php:444
-msgid "Block multiple registrations"
-msgstr ""
-
-#: ../../mod/admin.php:444
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: ../../mod/admin.php:445
-msgid "OpenID support"
-msgstr ""
-
-#: ../../mod/admin.php:445
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: ../../mod/admin.php:446
-msgid "Fullname check"
-msgstr ""
-
-#: ../../mod/admin.php:446
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: ../../mod/admin.php:447
-msgid "UTF-8 Regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:447
-msgid "Use PHP UTF8 regular expressions"
-msgstr ""
-
-#: ../../mod/admin.php:448
-msgid "Show Community Page"
-msgstr ""
-
-#: ../../mod/admin.php:448
-msgid ""
-"Display a Community page showing all recent public postings on this site."
-msgstr ""
-
-#: ../../mod/admin.php:449
-msgid "Enable OStatus support"
-msgstr ""
-
-#: ../../mod/admin.php:449
-msgid ""
-"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: ../../mod/admin.php:450
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: ../../mod/admin.php:450
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: ../../mod/admin.php:451
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: ../../mod/admin.php:451
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: ../../mod/admin.php:452
-msgid "Verify SSL"
-msgstr ""
-
-#: ../../mod/admin.php:452
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
-msgstr ""
-
-#: ../../mod/admin.php:453
-msgid "Proxy user"
-msgstr ""
-
-#: ../../mod/admin.php:454
-msgid "Proxy URL"
-msgstr ""
-
-#: ../../mod/admin.php:455
-msgid "Network timeout"
-msgstr ""
-
-#: ../../mod/admin.php:455
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: ../../mod/admin.php:456
-msgid "Delivery interval"
-msgstr ""
-
-#: ../../mod/admin.php:456
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
-
-#: ../../mod/admin.php:457
-msgid "Poll interval"
-msgstr ""
-
-#: ../../mod/admin.php:457
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: ../../mod/admin.php:458
-msgid "Maximum Load Average"
-msgstr ""
-
-#: ../../mod/admin.php:458
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: ../../mod/admin.php:472
-msgid "Update has been marked successful"
-msgstr ""
-
-#: ../../mod/admin.php:482
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr ""
-
-#: ../../mod/admin.php:485
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: ../../mod/admin.php:489
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: ../../mod/admin.php:492
-#, php-format
-msgid "Update function %s could not be found."
-msgstr ""
-
-#: ../../mod/admin.php:507
-msgid "No failed updates."
-msgstr ""
-
-#: ../../mod/admin.php:511
-msgid "Failed Updates"
-msgstr ""
-
-#: ../../mod/admin.php:512
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: ../../mod/admin.php:513
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: ../../mod/admin.php:514
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: ../../mod/admin.php:539
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:546
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:585
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../mod/admin.php:593
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: ../../mod/admin.php:593
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: ../../mod/admin.php:657
-msgid "select all"
-msgstr ""
-
-#: ../../mod/admin.php:658
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: ../../mod/admin.php:659
-msgid "Request date"
-msgstr ""
-
-#: ../../mod/admin.php:659 ../../mod/admin.php:668
-#: ../../include/contact_selectors.php:79
-msgid "Email"
-msgstr ""
-
-#: ../../mod/admin.php:660
-msgid "No registrations."
-msgstr ""
-
-#: ../../mod/admin.php:662
-msgid "Deny"
-msgstr ""
-
-#: ../../mod/admin.php:668
-msgid "Register date"
-msgstr ""
-
-#: ../../mod/admin.php:668
-msgid "Last login"
-msgstr ""
-
-#: ../../mod/admin.php:668
-msgid "Last item"
-msgstr ""
-
-#: ../../mod/admin.php:668
-msgid "Account"
-msgstr ""
-
-#: ../../mod/admin.php:670
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../mod/admin.php:671
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../mod/admin.php:712
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../mod/admin.php:716
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../mod/admin.php:726 ../../mod/admin.php:924
-msgid "Disable"
-msgstr ""
-
-#: ../../mod/admin.php:728 ../../mod/admin.php:926
-msgid "Enable"
-msgstr ""
-
-#: ../../mod/admin.php:750 ../../mod/admin.php:955
-msgid "Toggle"
-msgstr ""
-
-#: ../../mod/admin.php:758 ../../mod/admin.php:965
-msgid "Author: "
-msgstr ""
-
-#: ../../mod/admin.php:759 ../../mod/admin.php:966
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../mod/admin.php:888
-msgid "No themes found."
-msgstr ""
-
-#: ../../mod/admin.php:947
-msgid "Screenshot"
-msgstr ""
-
-#: ../../mod/admin.php:995
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../mod/admin.php:996
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../mod/admin.php:1023
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../mod/admin.php:1079
-msgid "Clear"
-msgstr ""
-
-#: ../../mod/admin.php:1085
-msgid "Debugging"
-msgstr ""
-
-#: ../../mod/admin.php:1086
-msgid "Log file"
-msgstr ""
-
-#: ../../mod/admin.php:1086
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: ../../mod/admin.php:1087
-msgid "Log level"
-msgstr ""
-
-#: ../../mod/admin.php:1137
-msgid "Close"
-msgstr ""
-
-#: ../../mod/admin.php:1143
-msgid "FTP Host"
-msgstr ""
-
-#: ../../mod/admin.php:1144
-msgid "FTP Path"
-msgstr ""
-
-#: ../../mod/admin.php:1145
-msgid "FTP User"
-msgstr ""
-
-#: ../../mod/admin.php:1146
-msgid "FTP Password"
-msgstr ""
-
-#: ../../mod/profile.php:21 ../../boot.php:966
-msgid "Requested profile is not available."
-msgstr ""
-
-#: ../../mod/profile.php:139 ../../mod/display.php:75
-msgid "Access to this profile has been restricted."
-msgstr ""
-
-#: ../../mod/profile.php:164
-msgid "Tips for New Members"
-msgstr ""
-
-#: ../../mod/ping.php:185
-msgid "{0} wants to be your friend"
-msgstr ""
-
-#: ../../mod/ping.php:190
-msgid "{0} sent you a message"
-msgstr ""
-
-#: ../../mod/ping.php:195
-msgid "{0} requested registration"
-msgstr ""
-
-#: ../../mod/ping.php:201
-#, php-format
-msgid "{0} commented %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:206
-#, php-format
-msgid "{0} liked %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:211
-#, php-format
-msgid "{0} disliked %s's post"
-msgstr ""
-
-#: ../../mod/ping.php:216
-#, php-format
-msgid "{0} is now friends with %s"
-msgstr ""
-
-#: ../../mod/ping.php:221
-msgid "{0} posted"
-msgstr ""
-
-#: ../../mod/ping.php:226
-#, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr ""
-
-#: ../../mod/ping.php:232
-msgid "{0} mentioned you in a post"
-msgstr ""
-
-#: ../../mod/nogroup.php:58
-msgid "Contacts who are not members of a group"
-msgstr ""
-
-#: ../../mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../mod/openid.php:53
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr ""
-
-#: ../../mod/openid.php:93 ../../include/auth.php:99
-#: ../../include/auth.php:162
-msgid "Login failed."
-msgstr ""
-
-#: ../../mod/follow.php:27
-msgid "Contact added"
-msgstr ""
-
-#: ../../mod/common.php:42
-msgid "Common Friends"
-msgstr ""
-
-#: ../../mod/common.php:78
-msgid "No contacts in common."
-msgstr ""
-
-#: ../../mod/display.php:135
-msgid "Item has been removed."
-msgstr ""
-
-#: ../../mod/apps.php:4
-msgid "Applications"
-msgstr ""
-
-#: ../../mod/apps.php:7
-msgid "No installed applications."
-msgstr ""
-
-#: ../../mod/search.php:83 ../../include/text.php:649
-#: ../../include/text.php:650 ../../include/nav.php:91
-msgid "Search"
-msgstr ""
-
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:395
-#: ../../mod/profiles.php:509 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
 msgstr ""
 
 #: ../../mod/profiles.php:31
@@ -4000,6 +3443,60 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
+#: ../../mod/ping.php:185
+msgid "{0} wants to be your friend"
+msgstr ""
+
+#: ../../mod/ping.php:190
+msgid "{0} sent you a message"
+msgstr ""
+
+#: ../../mod/ping.php:195
+msgid "{0} requested registration"
+msgstr ""
+
+#: ../../mod/ping.php:201
+#, php-format
+msgid "{0} commented %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:206
+#, php-format
+msgid "{0} liked %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:211
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr ""
+
+#: ../../mod/ping.php:216
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr ""
+
+#: ../../mod/ping.php:221
+msgid "{0} posted"
+msgstr ""
+
+#: ../../mod/ping.php:226
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr ""
+
+#: ../../mod/ping.php:232
+msgid "{0} mentioned you in a post"
+msgstr ""
+
+#: ../../mod/community.php:21
+msgid "Not available."
+msgstr ""
+
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133
+#: ../../include/nav.php:101
+msgid "Community"
+msgstr ""
+
 #: ../../mod/filer.php:29 ../../include/conversation.php:947
 msgid "Save to Folder:"
 msgstr ""
@@ -4008,9 +3505,89 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#: ../../mod/filer.php:30 ../../mod/notes.php:63
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:185
+#: ../../addon/dav/layout.fnk.php:384 ../../addon/facebook/facebook.php:756
+#: ../../include/text.php:652
+msgid "Save"
+msgstr ""
+
+#: ../../mod/wall_attach.php:58
 #, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
+msgid "File upload failed."
+msgstr ""
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
+#: ../../boot.php:1514 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:79 ../../include/nav.php:50
+msgid "Profile"
+msgstr ""
+
+#: ../../mod/profperm.php:105 ../../mod/group.php:221
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr ""
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr ""
+
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../include/contact_widgets.php:34
+msgid "Friend Suggestions"
+msgstr ""
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/suggest.php:59 ../../mod/match.php:58 ../../boot.php:1053
+#: ../../include/contact_widgets.php:9
+msgid "Connect"
+msgstr ""
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
+msgstr ""
+
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
+msgstr ""
+
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
+#, php-format
+msgid "%s welcomes %s"
+msgstr ""
+
+#: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: ../../mod/manage.php:93
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr ""
+
+#: ../../mod/manage.php:95
+msgid "Select an identity to manage: "
 msgstr ""
 
 #: ../../mod/delegate.php:95
@@ -4048,19 +3625,16 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
-#: ../../include/contact_widgets.php:34
-msgid "Friend Suggestions"
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/suggest.php:44
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/suggest.php:61
-msgid "Ignore/Hide"
+#: ../../mod/notes.php:44 ../../boot.php:1535
+msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
@@ -4083,175 +3657,1962 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/invite.php:35
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:243
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../mod/invite.php:59
-msgid "Please join us on Friendica"
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: ../../mod/invite.php:69
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: ../../mod/invite.php:73
+#: ../../mod/localtime.php:30
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
+msgid "UTC time: %s"
+msgstr ""
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr ""
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr ""
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr ""
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr ""
+
+#: ../../mod/profile_photo.php:30
+msgid "Image uploaded but image cropping failed."
+msgstr ""
+
+#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr ""
+
+#: ../../mod/profile_photo.php:91
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: ../../mod/profile_photo.php:101
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:209
+msgid "Upload File:"
+msgstr ""
+
+#: ../../mod/profile_photo.php:210
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../mod/profile_photo.php:211
+msgid "Upload"
+msgstr ""
+
+#: ../../mod/profile_photo.php:213
+msgid "skip this step"
+msgstr ""
+
+#: ../../mod/profile_photo.php:213
+msgid "select a photo from your photo albums"
+msgstr ""
+
+#: ../../mod/profile_photo.php:226
+msgid "Crop Image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:227
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: ../../mod/profile_photo.php:229
+msgid "Done Editing"
+msgstr ""
+
+#: ../../mod/profile_photo.php:257
+msgid "Image uploaded successfully."
+msgstr ""
+
+#: ../../mod/install.php:117
+msgid "Friendica Social Communications Server - Setup"
+msgstr ""
+
+#: ../../mod/install.php:123
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../mod/install.php:127
+msgid "Could not create table."
+msgstr ""
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr ""
+
+#: ../../mod/install.php:138
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr ""
+
+#: ../../mod/install.php:139 ../../mod/install.php:204
+#: ../../mod/install.php:489
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: ../../mod/install.php:201
+msgid "System check"
+msgstr ""
+
+#: ../../mod/install.php:206
+msgid "Check again"
+msgstr ""
+
+#: ../../mod/install.php:225
+msgid "Database connection"
+msgstr ""
+
+#: ../../mod/install.php:226
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../mod/install.php:227
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../mod/install.php:228
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../mod/install.php:232
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../mod/install.php:233
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../mod/install.php:234
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../mod/install.php:235
+msgid "Database Name"
+msgstr ""
+
+#: ../../mod/install.php:236 ../../mod/install.php:275
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../mod/install.php:236 ../../mod/install.php:275
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../mod/install.php:240 ../../mod/install.php:278
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../mod/install.php:265
+msgid "Site settings"
+msgstr ""
+
+#: ../../mod/install.php:318
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: ../../mod/install.php:319
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a href='http://"
+"friendica.com/node/27'>'Activating scheduled tasks'</a>"
+msgstr ""
+
+#: ../../mod/install.php:323
+msgid "PHP executable path"
+msgstr ""
+
+#: ../../mod/install.php:323
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: ../../mod/install.php:328
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../mod/install.php:337
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: ../../mod/install.php:338
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: ../../mod/install.php:340
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../mod/install.php:361
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: ../../mod/install.php:362
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../mod/install.php:364
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../mod/install.php:371
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../mod/install.php:372
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../mod/install.php:373
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../mod/install.php:374
+msgid "mysqli PHP module"
+msgstr ""
+
+#: ../../mod/install.php:375
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../mod/install.php:380 ../../mod/install.php:382
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../mod/install.php:380
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:388
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:392
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:396
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:400
+msgid "Error: mysqli PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:404
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:421
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../mod/install.php:422
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../mod/install.php:423
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
+msgstr ""
+
+#: ../../mod/install.php:424
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../mod/install.php:427
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../mod/install.php:439
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr ""
+
+#: ../../mod/install.php:441
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../mod/install.php:451
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../mod/install.php:476
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../mod/install.php:487
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../mod/install.php:488
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
+#: ../../mod/group.php:29
+msgid "Group created."
+msgstr ""
+
+#: ../../mod/group.php:35
+msgid "Could not create group."
+msgstr ""
+
+#: ../../mod/group.php:47 ../../mod/group.php:137
+msgid "Group not found."
+msgstr ""
+
+#: ../../mod/group.php:60
+msgid "Group name changed."
+msgstr ""
+
+#: ../../mod/group.php:90
+msgid "Create a group of contacts/friends."
+msgstr ""
+
+#: ../../mod/group.php:91 ../../mod/group.php:177
+msgid "Group Name: "
+msgstr ""
+
+#: ../../mod/group.php:110
+msgid "Group removed."
+msgstr ""
+
+#: ../../mod/group.php:112
+msgid "Unable to remove group."
+msgstr ""
+
+#: ../../mod/group.php:176
+msgid "Group Editor"
+msgstr ""
+
+#: ../../mod/group.php:189
+msgid "Members"
+msgstr ""
+
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr ""
+
+#: ../../mod/regmod.php:98
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../mod/regmod.php:110
+msgid "Please login."
+msgstr ""
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr ""
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr ""
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr ""
+
+#: ../../mod/item.php:89
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:258
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:800
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../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:827
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: ../../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:830
+#, php-format
+msgid "%s posted an update."
+msgstr ""
+
+#: ../../mod/network.php:82
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../mod/network.php:132 ../../include/group.php:244
+msgid "add"
+msgstr ""
+
+#: ../../mod/network.php:272
+msgid "Commented Order"
+msgstr ""
+
+#: ../../mod/network.php:275
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../mod/network.php:278
+msgid "Posted Order"
+msgstr ""
+
+#: ../../mod/network.php:281
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../mod/network.php:288
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../mod/network.php:291
+msgid "New"
+msgstr ""
+
+#: ../../mod/network.php:294
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../mod/network.php:297
+msgid "Starred"
+msgstr ""
+
+#: ../../mod/network.php:300
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../mod/network.php:303
+msgid "Shared Links"
+msgstr ""
+
+#: ../../mod/network.php:306
+msgid "Interesting Links"
+msgstr ""
+
+#: ../../mod/network.php:373
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/invite.php:92
-msgid "You have no more invitations available"
+#: ../../mod/network.php:376
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/invite.php:100
+#: ../../mod/network.php:421
+msgid "No such group"
+msgstr ""
+
+#: ../../mod/network.php:432
+msgid "Group is empty"
+msgstr ""
+
+#: ../../mod/network.php:436
+msgid "Group: "
+msgstr ""
+
+#: ../../mod/network.php:446
+msgid "Contact: "
+msgstr ""
+
+#: ../../mod/network.php:448
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr ""
+
+#: ../../mod/network.php:453
+msgid "Invalid contact."
+msgstr ""
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr ""
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr ""
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr ""
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
+msgstr ""
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr ""
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr ""
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr ""
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr ""
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr ""
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:129
+msgid "Your contacts"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
+msgid "Your photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
+msgid "Your events"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:134
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/config.php:201
+msgid "Community Pages"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:490
+#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/config.php:203
+msgid "Community Profiles"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:511
+#: ../../view/theme/diabook/theme.php:754
+#: ../../view/theme/diabook/config.php:208
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:540
+#: ../../view/theme/diabook/theme.php:756
+#: ../../view/theme/diabook/config.php:210
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:562
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1314
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
+msgid "event"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:585
+#: ../../view/theme/diabook/theme.php:755
+#: ../../view/theme/diabook/config.php:209
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:622
+#: ../../view/theme/diabook/theme.php:752
+#: ../../view/theme/diabook/config.php:206
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:623
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:748
+#: ../../view/theme/diabook/config.php:202
+msgid "Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:683
+msgid "Set zoomfactor for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:684
+#: ../../view/theme/diabook/config.php:199
+msgid "Set longitude (X) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:685
+#: ../../view/theme/diabook/config.php:200
+msgid "Set latitude (Y) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:698
+#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/config.php:204
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:705
+#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/config.php:205
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:712
+#: ../../view/theme/diabook/theme.php:753
+msgid "Last Tweets"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:715
+#: ../../view/theme/diabook/config.php:197
+msgid "Set twitter search term"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+msgid "don't show"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+msgid "show"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:745
+msgid "Show/hide boxes at right-hand column:"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/dispy/config.php:72 ../../view/theme/quattro/config.php:54
+#: ../../view/theme/cleanzero/config.php:82
+msgid "Theme settings"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/dispy/config.php:73
+#: ../../view/theme/cleanzero/config.php:84
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:195
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:196
+msgid "Set color scheme"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:198
+msgid "Set zoomfactor for Earth Layer"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:207
+msgid "Last tweets"
+msgstr ""
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Center"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/cleanzero/config.php:86
+msgid "Color scheme"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr ""
+
+#: ../../boot.php:522
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../boot.php:524 ../../addon/showmore/showmore.php:87
+#: ../../addon/page/page.php:63 ../../include/conversation.php:476
+#: ../../include/contact_widgets.php:188
+msgid "show more"
+msgstr ""
+
+#: ../../boot.php:525
+msgid "show fewer"
+msgstr ""
+
+#: ../../boot.php:698
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../boot.php:700
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../boot.php:800
+msgid "Create a New Account"
+msgstr ""
+
+#: ../../boot.php:821 ../../include/nav.php:46
+msgid "Logout"
+msgstr ""
+
+#: ../../boot.php:822 ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64
+msgid "Login"
+msgstr ""
+
+#: ../../boot.php:824
+msgid "Nickname or Email address: "
+msgstr ""
+
+#: ../../boot.php:825
+msgid "Password: "
+msgstr ""
+
+#: ../../boot.php:828
+msgid "Or login using OpenID: "
+msgstr ""
+
+#: ../../boot.php:834
+msgid "Forgot your password?"
+msgstr ""
+
+#: ../../boot.php:1001
+msgid "Edit profile"
+msgstr ""
+
+#: ../../boot.php:1061
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1069 ../../include/nav.php:138
+msgid "Profiles"
+msgstr ""
+
+#: ../../boot.php:1069 ../../include/nav.php:138
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: ../../boot.php:1111 ../../include/profile_advanced.php:17
+msgid "Gender:"
+msgstr ""
+
+#: ../../boot.php:1114 ../../include/profile_advanced.php:37
+msgid "Status:"
+msgstr ""
+
+#: ../../boot.php:1116 ../../include/profile_advanced.php:48
+msgid "Homepage:"
+msgstr ""
+
+#: ../../boot.php:1177 ../../boot.php:1253
+msgid "g A l F d"
+msgstr ""
+
+#: ../../boot.php:1178 ../../boot.php:1254
+msgid "F d"
+msgstr ""
+
+#: ../../boot.php:1223 ../../boot.php:1294
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:1235
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:1236
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../boot.php:1287
+msgid "[No description]"
+msgstr ""
+
+#: ../../boot.php:1305
+msgid "Event Reminders"
+msgstr ""
+
+#: ../../boot.php:1306
+msgid "Events this week:"
+msgstr ""
+
+#: ../../boot.php:1508 ../../include/nav.php:49
+msgid "Status"
+msgstr ""
+
+#: ../../boot.php:1511
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../boot.php:1517
+msgid "Profile Details"
+msgstr ""
+
+#: ../../boot.php:1532
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../boot.php:1538
+msgid "Only You Can See This"
+msgstr ""
+
+#: ../../addon/pageheader/pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr ""
+
+#: ../../addon/pageheader/pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:79
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:82
 #, php-format
 msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many "
-"other social networks."
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
 msgstr ""
 
-#: ../../mod/invite.php:102
+#: ../../addon/piwik/piwik.php:90
+msgid "Piwik Base URL"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr ""
+
+#: ../../addon/viewsrc/viewsrc.php:37
+msgid "View Source"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:36
+msgid "Post to libertree"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:67
+msgid "libertree Post Settings"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:74
+msgid "Libertree API token"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:79
+msgid "Libertree site URL"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:84
+msgid "Post to Libertree by default"
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:37
+msgid "Post to Posterous"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:70
+msgid "Posterous Post Settings"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:72
+msgid "Enable Posterous Post Plugin"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:77
+msgid "Posterous login"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:82
+msgid "Posterous password"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:87
+msgid "Posterous site ID"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:92
+msgid "Posterous API token"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:97
+msgid "Post to Posterous by default"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:189 ../../addon/blogger/blogger.php:172
+#: ../../addon/wppost/wppost.php:199
+msgid "Post from Friendica"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:56
+msgid "StatusNet AutoFollow Settings"
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:58
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:134
+msgid "Post to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:176
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:204
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:232
+msgid "StatusNet settings updated."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:257
+msgid "StatusNet Posting Settings"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:271
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:272
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:280
+msgid "Provide your own OAuth Credentials"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:281
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as "
+"an desktop client on your StatusNet account, copy the consumer key pair here "
+"and enter the API base root.<br />Before you register your own OAuth key "
+"pair ask the administrator if there is already a key pair for this Friendica "
+"installation at your favorited StatusNet installation."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:283
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:286
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:289
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:310
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:311
+msgid "Log in with StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:313
+msgid "Copy the security code from StatusNet here"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:319
+msgid "Cancel Connection Process"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:321
+msgid "Current StatusNet API is"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:322
+msgid "Cancel StatusNet Connection"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+msgid "Currently connected to: "
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:334
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:336
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:339
+msgid "Allow posting to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:342
+msgid "Send public postings to StatusNet by default"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send linked #-tags and @-names to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:553
+msgid "API URL"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to "
+"provide simple replies."
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:94
+#: ../../addon/public_server/public_server.php:126
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:95
+msgid "Your Friendica test account is about to expire."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:96
 #, php-format
 msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you "
+"enjoyed this test drive and use this opportunity to find a permanent "
+"Friendica website for your integrated social communications. A list of "
+"public sites is available at http://dir.friendica.com/siteinfo - and for "
+"more information on setting up your own Friendica server please see the "
+"Friendica project website at http://friendica.com."
 msgstr ""
 
-#: ../../mod/invite.php:103
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:56
+msgid "Generate new key"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:59
+msgid "Widgets key"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:61
+msgid "Widgets available"
+msgstr ""
+
+#: ../../addon/widgets/widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:182
+msgid "Lifetime of the cache (in hours)"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
+msgid "Cache Statistics"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:190
+msgid "Number of items"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
+msgid "Size of the cache"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
+msgid "Delete the whole cache"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:65
+msgid "Show More Settings saved."
+msgstr ""
+
+#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr ""
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:38
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Latest photos"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Latest likes"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:297
+msgid "No files were uploaded."
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:303
+msgid "Uploaded file is empty"
+msgstr ""
+
+#: ../../addon/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
+msgid "Upload was cancelled, or server error encountered"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr ""
+
+#: ../../addon/page/page.php:48
+msgid "Forums"
+msgstr ""
+
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr ""
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr ""
+
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:58
+msgid "New game"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:59
+msgid "New game with handicap"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:182
+msgid "You go first..."
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:187
+msgid "I'm going first this time..."
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:193
+msgid "You won!"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+msgid "\"Cat\" game!"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:222
+msgid "I won!"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:42
+msgid "Post to Wordpress"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:76
+msgid "WordPress Post Settings"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:78
+msgid "Enable WordPress Post Plugin"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:83
+msgid "WordPress username"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:88
+msgid "WordPress password"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:93
+msgid "WordPress API URL"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:98
+msgid "Post to WordPress by default"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:103
+msgid "Provide a backlink to the Friendica post"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:205
+msgid "Read the original post and comment stream on Friendica"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled "
+"storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/"
+"wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
 msgstr ""
 
-#: ../../mod/invite.php:106
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:126
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:205
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/calendar.fnk.php:517
+#: ../../addon/dav/common/calendar.fnk.php:533
+#: ../../addon/dav/layout.fnk.php:200
+msgid "Error"
+msgstr ""
+
+#: ../../addon/dav/common/calendar.fnk.php:568
+#: ../../addon/dav/common/calendar.fnk.php:637
+#: ../../addon/dav/common/calendar.fnk.php:664
+#: ../../addon/dav/layout.fnk.php:231
+msgid "No access"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:119
+msgid "New event"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:123
+msgid "Today"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:132
+msgid "Day"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:139
+msgid "Week"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:146
+msgid "Month"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:151
+msgid "Reload"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:162
+msgid "Date"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:224
+msgid "Not found"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365
+msgid "Go back to the calendar"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:300
+msgid "Starts"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:305
+msgid "Ends"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:312
+msgid "Description"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:315
+msgid "Notification"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:324
+msgid "Minutes"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:327
+msgid "Hours"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:330
+msgid "Days"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:331
+msgid "before"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:360 ../../addon/facebook/facebook.php:785
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:367
+msgid "Calendar Settings"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:373
+msgid "Date format"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:382
+msgid "Time zone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:387
+msgid "Limitations"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:391
+msgid "Warning"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:395
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:402
+msgid "Synchronizing this calendar with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:413
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
+msgid "Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
+msgid "Your Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/main.php:244
+msgid "Calendar"
+msgstr ""
+
+#: ../../addon/dav/main.php:247
+msgid "Extended calendar with CalDAV-support"
+msgstr ""
+
+#: ../../addon/dav/main.php:263
+msgid "The database tables have been installed."
+msgstr ""
+
+#: ../../addon/dav/main.php:264
+msgid "An error occurred during the installation."
+msgstr ""
+
+#: ../../addon/dav/main.php:280
+msgid "No system-wide settings yet."
+msgstr ""
+
+#: ../../addon/dav/main.php:283
+msgid "Database status"
+msgstr ""
+
+#: ../../addon/dav/main.php:286
+msgid "Installed"
+msgstr ""
+
+#: ../../addon/dav/main.php:289
+msgid "Upgrade needed"
+msgstr ""
+
+#: ../../addon/dav/main.php:289
+msgid "Upgrade"
+msgstr ""
+
+#: ../../addon/dav/main.php:292
+msgid "Not installed"
+msgstr ""
+
+#: ../../addon/dav/main.php:292
+msgid "Install"
+msgstr ""
+
+#: ../../addon/dav/main.php:297
+msgid "Troubleshooting"
+msgstr ""
+
+#: ../../addon/dav/main.php:298
+msgid "Manual creation of the database tables:"
+msgstr ""
+
+#: ../../addon/dav/main.php:299
+msgid "Show SQL-statements"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:151
+msgid "Private Calendar"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:158
+msgid "Friendica Events: Mine"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:161
+msgid "Friendica Events: Contacts"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:37
 msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
 msgstr ""
 
-#: ../../mod/invite.php:111
-msgid "Send invitations"
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../mod/invite.php:112
-msgid "Enter email addresses, one per line:"
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../mod/invite.php:114
+#: ../../addon/mathjax/mathjax.php:74
 msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
-#: ../../mod/invite.php:116
-msgid "You will need to supply this invitation code: $invite_code"
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../mod/invite.php:116
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter settings updated."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:146
+msgid "Twitter Posting Settings"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:153
 msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../mod/invite.php:118
+#: ../../addon/twitter/twitter.php:172
 msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:119
+#: ../../addon/twitter/twitter.php:173
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:175
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:190
 msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for "
+"every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:237
-msgid "Response from remote site was not understood."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:246
-msgid "Unexpected response from remote site: "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:254
-msgid "Confirmation completed successfully."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
-#: ../../mod/dfrn_confirm.php:277
-msgid "Remote site reported: "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:268
-msgid "Temporary failure. Please wait and try again."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:275
-msgid "Introduction failed or was revoked."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:420
-msgid "Unable to set contact photo."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510
-#: ../../include/conversation.php:101
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:562
-#, php-format
-msgid "No user record found for '%s' "
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:572
-msgid "Our site encryption key is apparently messed up."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:583
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:604
-msgid "Contact record was not found for you on our site."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:618
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-
-#: ../../mod/dfrn_confirm.php:638
+#: ../../addon/twitter/twitter.php:192
 msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:649
-msgid "Unable to set your contact credentials on our system."
+#: ../../addon/twitter/twitter.php:195
+msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:716
-msgid "Unable to update your contact profile details on our system"
+#: ../../addon/twitter/twitter.php:198
+msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:750
-#, php-format
-msgid "Connection accepted at %s"
+#: ../../addon/twitter/twitter.php:201
+msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:799
-#, php-format
-msgid "%1$s has joined %2$s"
+#: ../../addon/twitter/twitter.php:383
+msgid "Consumer key"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:384
+msgid "Consumer secret"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:509
@@ -4421,10 +5782,6 @@ msgstr ""
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:360
-msgid "The new values have been saved."
-msgstr ""
-
 #: ../../addon/facebook/facebook.php:809
 msgid "Post to Facebook"
 msgstr ""
@@ -4461,120 +5818,6 @@ msgid ""
 "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr ""
 
-#: ../../addon/snautofollow/snautofollow.php:32
-msgid "StatusNet AutoFollow settings updated."
-msgstr ""
-
-#: ../../addon/snautofollow/snautofollow.php:56
-msgid "StatusNet AutoFollow Settings"
-msgstr ""
-
-#: ../../addon/snautofollow/snautofollow.php:58
-msgid "Automatically follow any StatusNet followers/mentioners"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:182
-msgid "Lifetime of the cache (in hours)"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
-msgid "Cache Statistics"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:190
-msgid "Number of items"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
-msgid "Size of the cache"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
-msgid "Delete the whole cache"
-msgstr ""
-
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../addon/widgets/widget_friendheader.php:40
-msgid "Get added to this list!"
-msgstr ""
-
-#: ../../addon/widgets/widgets.php:56
-msgid "Generate new key"
-msgstr ""
-
-#: ../../addon/widgets/widgets.php:59
-msgid "Widgets key"
-msgstr ""
-
-#: ../../addon/widgets/widgets.php:61
-msgid "Widgets available"
-msgstr ""
-
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendica!"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:55
-msgid "YourLS Settings"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:57
-msgid "URL: http://"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:62
-msgid "Username:"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:67
-msgid "Password:"
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:72
-msgid "Use SSL "
-msgstr ""
-
-#: ../../addon/yourls/yourls.php:92
-msgid "yourls Settings saved."
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:39
-msgid "Post to LiveJournal"
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:70
-msgid "LiveJournal Post Settings"
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:72
-msgid "Enable LiveJournal Post Plugin"
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:77
-msgid "LiveJournal username"
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:82
-msgid "LiveJournal password"
-msgstr ""
-
-#: ../../addon/ljpost/ljpost.php:87
-msgid "Post to LiveJournal by default"
-msgstr ""
-
 #: ../../addon/nsfw/nsfw.php:47
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
@@ -4610,334 +5853,22 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""
 
-#: ../../addon/page/page.php:48
-msgid "Forums"
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
 msgstr ""
 
-#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
-#: ../../boot.php:524
-msgid "show more"
-msgstr ""
-
-#: ../../addon/planets/planets.php:150
-msgid "Planets Settings"
-msgstr ""
-
-#: ../../addon/planets/planets.php:152
-msgid "Enable Planets Plugin"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:822
-msgid "Login"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
-msgid "OpenID"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:81
-#: ../../addon/communityhome/twillingham/communityhome.php:81
-msgid "Most active users"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Latest photos"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Latest likes"
-msgstr ""
-
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1314
-#: ../../include/conversation.php:45 ../../include/conversation.php:118
-msgid "event"
-msgstr ""
-
-#: ../../addon/dav/common/wdcal_configuration.php:126
-msgid "U.S. Time Format (mm/dd/YYYY)"
-msgstr ""
-
-#: ../../addon/dav/common/wdcal_configuration.php:205
-msgid "German Time Format (dd.mm.YYYY)"
-msgstr ""
-
-#: ../../addon/dav/common/calendar.fnk.php:517
-#: ../../addon/dav/common/calendar.fnk.php:533
-#: ../../addon/dav/layout.fnk.php:200
-msgid "Error"
-msgstr ""
-
-#: ../../addon/dav/common/calendar.fnk.php:568
-#: ../../addon/dav/common/calendar.fnk.php:637
-#: ../../addon/dav/common/calendar.fnk.php:664
-#: ../../addon/dav/layout.fnk.php:231
-msgid "No access"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:119
-msgid "New event"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:123
-msgid "Today"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:132
-msgid "Day"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:139
-msgid "Week"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:146
-msgid "Month"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:151
-msgid "Reload"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:162
-msgid "Date"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:224
-msgid "Not found"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365
-msgid "Go back to the calendar"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:300
-msgid "Starts"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:305
-msgid "Ends"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:312
-msgid "Description"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:315
-msgid "Notification"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:324
-msgid "Minutes"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:327
-msgid "Hours"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:330
-msgid "Days"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:331
-msgid "before"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:367
-msgid "Calendar Settings"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:373
-msgid "Date format"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:382
-msgid "Time zone"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:387
-msgid "Limitations"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:391
-msgid "Warning"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:395
-msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:402
-msgid "Synchronizing this calendar with the iPhone"
-msgstr ""
-
-#: ../../addon/dav/layout.fnk.php:413
-msgid "Synchronizing your Friendica-Contacts with the iPhone"
-msgstr ""
-
-#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
-msgid "Friendica-Contacts"
-msgstr ""
-
-#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
-msgid "Your Friendica-Contacts"
-msgstr ""
-
-#: ../../addon/dav/main.php:244
-msgid "Calendar"
-msgstr ""
-
-#: ../../addon/dav/main.php:247
-msgid "Extended calendar with CalDAV-support"
-msgstr ""
-
-#: ../../addon/dav/main.php:263
-msgid "The database tables have been installed."
-msgstr ""
-
-#: ../../addon/dav/main.php:264
-msgid "An error occurred during the installation."
-msgstr ""
-
-#: ../../addon/dav/main.php:280
-msgid "No system-wide settings yet."
-msgstr ""
-
-#: ../../addon/dav/main.php:283
-msgid "Database status"
-msgstr ""
-
-#: ../../addon/dav/main.php:286
-msgid "Installed"
-msgstr ""
-
-#: ../../addon/dav/main.php:289
-msgid "Upgrade needed"
-msgstr ""
-
-#: ../../addon/dav/main.php:289
-msgid "Upgrade"
-msgstr ""
-
-#: ../../addon/dav/main.php:292
-msgid "Not installed"
-msgstr ""
-
-#: ../../addon/dav/main.php:292
-msgid "Install"
-msgstr ""
-
-#: ../../addon/dav/main.php:297
-msgid "Troubleshooting"
-msgstr ""
-
-#: ../../addon/dav/main.php:298
-msgid "Manual creation of the database tables:"
-msgstr ""
-
-#: ../../addon/dav/main.php:299
-msgid "Show SQL-statements"
-msgstr ""
-
-#: ../../addon/dav/calendar.friendica.fnk.php:151
-msgid "Private Calendar"
-msgstr ""
-
-#: ../../addon/dav/calendar.friendica.fnk.php:158
-msgid "Friendica Events: Mine"
-msgstr ""
-
-#: ../../addon/dav/calendar.friendica.fnk.php:161
-msgid "Friendica Events: Contacts"
-msgstr ""
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:84
-#, php-format
+#: ../../addon/openstreetmap/openstreetmap.php:71
 msgid ""
-"Allow to use your friendica id (%s) to connecto to external unhosted-enabled "
-"storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/"
-"wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
 msgstr ""
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:85
-msgid "Template URL (with {category})"
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
 msgstr ""
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:86
-msgid "OAuth end-point"
-msgstr ""
-
-#: ../../addon/uhremotestorage/uhremotestorage.php:87
-msgid "Api"
-msgstr ""
-
-#: ../../addon/membersince/membersince.php:18
-msgid "Member since:"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:20
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:53
-msgid "3D Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:58
-msgid "New game"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:59
-msgid "New game with handicap"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:60
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:61
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:63
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:182
-msgid "You go first..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:187
-msgid "I'm going first this time..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:193
-msgid "You won!"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
-msgid "\"Cat\" game!"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:222
-msgid "I won!"
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:169
@@ -4948,152 +5879,37 @@ msgstr ""
 msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:39
-msgid "Post to Dreamwidth"
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:70
-msgid "Dreamwidth Post Settings"
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:72
-msgid "Enable dreamwidth Post Plugin"
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:77
-msgid "dreamwidth username"
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:82
-msgid "dreamwidth password"
-msgstr ""
-
-#: ../../addon/dwpost/dwpost.php:87
-msgid "Post to dreamwidth by default"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:35
-msgid "Post to Drupal"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:72
-msgid "Drupal Post Settings"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:74
-msgid "Enable Drupal Post Plugin"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:79
-msgid "Drupal username"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:84
-msgid "Drupal password"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:89
-msgid "Post Type - article,page,or blog"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:94
-msgid "Drupal site URL"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:99
-msgid "Drupal site uses clean URLS"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:104
-msgid "Post to Drupal by default"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
-msgid "Post from Friendica"
-msgstr ""
-
-#: ../../addon/startpage/startpage.php:83
-msgid "Startpage Settings"
-msgstr ""
-
-#: ../../addon/startpage/startpage.php:85
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr ""
-
-#: ../../addon/startpage/startpage.php:88
-msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
-msgstr ""
-
-#: ../../addon/geonames/geonames.php:143
-msgid "Geonames settings updated."
-msgstr ""
-
-#: ../../addon/geonames/geonames.php:179
-msgid "Geonames Settings"
-msgstr ""
-
-#: ../../addon/geonames/geonames.php:181
-msgid "Enable Geonames Plugin"
-msgstr ""
-
-#: ../../addon/public_server/public_server.php:126
-#: ../../addon/testdrive/testdrive.php:94
+#: ../../addon/blockem/blockem.php:105
 #, php-format
-msgid "Your account on %s will expire in a few days."
+msgid "Blocked %s - Click to open/close"
 msgstr ""
 
-#: ../../addon/public_server/public_server.php:127
-msgid "Your Friendica account is about to expire."
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
 msgstr ""
 
-#: ../../addon/public_server/public_server.php:128
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your "
-"account by logging in at least once every 30 days"
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:43
-msgid "Upload a file"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:46
-msgid "Failed"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:297
-msgid "No files were uploaded."
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:303
-msgid "Uploaded file is empty"
-msgstr ""
-
-#: ../../addon/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
-msgid "Upload was cancelled, or server error encountered"
-msgstr ""
-
-#: ../../addon/oembed.old/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr ""
-
-#: ../../addon/oembed.old/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr ""
-
-#: ../../addon/oembed.old/oembed.php:71
-msgid "URL to embed:"
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:36
@@ -5161,402 +5977,6 @@ msgstr ""
 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
 
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:51
-msgid "\"Blockem\" Settings"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:53
-msgid "Comma separated profile URLS to block"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:70
-msgid "BLOCKEM Settings saved."
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:105
-#, php-format
-msgid "Blocked %s - Click to open/close"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:160
-msgid "Unblock Author"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:162
-msgid "Block Author"
-msgstr ""
-
-#: ../../addon/blockem/blockem.php:194
-msgid "blockem settings updated"
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:51
-msgid ":-)"
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:51
-msgid ":-("
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:51
-msgid "lol"
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:54
-msgid "Quick Comment Settings"
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:56
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to "
-"provide simple replies."
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:57
-msgid "Enter quick comments, one per line"
-msgstr ""
-
-#: ../../addon/qcomment/qcomment.php:75
-msgid "Quick Comment settings saved."
-msgstr ""
-
-#: ../../addon/openstreetmap/openstreetmap.php:71
-msgid "Tile Server URL"
-msgstr ""
-
-#: ../../addon/openstreetmap/openstreetmap.php:71
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
-msgstr ""
-
-#: ../../addon/openstreetmap/openstreetmap.php:72
-msgid "Default zoom"
-msgstr ""
-
-#: ../../addon/openstreetmap/openstreetmap.php:72
-msgid "The default zoom level. (1:world, 18:highest)"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:36
-msgid "Post to libertree"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:67
-msgid "libertree Post Settings"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:69
-msgid "Enable Libertree Post Plugin"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:74
-msgid "Libertree API token"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:79
-msgid "Libertree site URL"
-msgstr ""
-
-#: ../../addon/libertree/libertree.php:84
-msgid "Post to Libertree by default"
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:37
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:38
-msgid "Use the MathJax renderer"
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:74
-msgid "MathJax Base URL"
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:74
-msgid ""
-"The URL for the javascript file that should be included to use MathJax. Can "
-"be either the MathJax CDN or another installation of MathJax."
-msgstr ""
-
-#: ../../addon/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr ""
-
-#: ../../addon/editplain/editplain.php:76
-msgid "Editplain Settings"
-msgstr ""
-
-#: ../../addon/editplain/editplain.php:78
-msgid "Disable richtext status editor"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:71
-msgid "generic profile image"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:72
-msgid "random geometric pattern"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:73
-msgid "monster face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:74
-msgid "computer generated face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:75
-msgid "retro arcade style face"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:87
-msgid "Default avatar image"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:87
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:88
-msgid "Rating of images"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:88
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""
-
-#: ../../addon/gravatar/gravatar.php:102
-msgid "Gravatar settings updated."
-msgstr ""
-
-#: ../../addon/testdrive/testdrive.php:95
-msgid "Your Friendica test account is about to expire."
-msgstr ""
-
-#: ../../addon/testdrive/testdrive.php:96
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you "
-"enjoyed this test drive and use this opportunity to find a permanent "
-"Friendica website for your integrated social communications. A list of "
-"public sites is available at http://dir.friendica.com/siteinfo - and for "
-"more information on setting up your own Friendica server please see the "
-"Friendica project website at http://friendica.com."
-msgstr ""
-
-#: ../../addon/pageheader/pageheader.php:50
-msgid "\"pageheader\" Settings"
-msgstr ""
-
-#: ../../addon/pageheader/pageheader.php:68
-msgid "pageheader Settings saved."
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:39
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:70
-msgid "InsaneJournal Post Settings"
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:72
-msgid "Enable InsaneJournal Post Plugin"
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:77
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:82
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ../../addon/ijpost/ijpost.php:87
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ../../addon/viewsrc/viewsrc.php:37
-msgid "View Source"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:134
-msgid "Post to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:176
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:204
-msgid "We could not contact the StatusNet API with the Path you entered."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:232
-msgid "StatusNet settings updated."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:257
-msgid "StatusNet Posting Settings"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:271
-msgid "Globally Available StatusNet OAuthKeys"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:272
-msgid ""
-"There are preconfigured OAuth key pairs for some StatusNet servers "
-"available. If you are useing one of them, please use these credentials. If "
-"not feel free to connect to any other StatusNet instance (see below)."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:280
-msgid "Provide your own OAuth Credentials"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:281
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendica Account as "
-"an desktop client on your StatusNet account, copy the consumer key pair here "
-"and enter the API base root.<br />Before you register your own OAuth key "
-"pair ask the administrator if there is already a key pair for this Friendica "
-"installation at your favorited StatusNet installation."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:283
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:286
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:289
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:310
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below "
-"and submit the form. Only your <strong>public</strong> posts will be posted "
-"to StatusNet."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:311
-msgid "Log in with StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:313
-msgid "Copy the security code from StatusNet here"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:319
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:321
-msgid "Current StatusNet API is"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:322
-msgid "Cancel StatusNet Connection"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
-msgid "Currently connected to: "
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:334
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated StatusNet account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:336
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to StatusNet will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:339
-msgid "Allow posting to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:342
-msgid "Send public postings to StatusNet by default"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:345
-msgid "Send linked #-tags and @-names to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:553
-msgid "API URL"
-msgstr ""
-
-#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
-msgid "Infinite Improbability Drive"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:36
-msgid "Post to Tumblr"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:67
-msgid "Tumblr Post Settings"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:69
-msgid "Enable Tumblr Post Plugin"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:84
-msgid "Post to Tumblr by default"
-msgstr ""
-
-#: ../../addon/numfriends/numfriends.php:46
-msgid "Numfriends settings updated."
-msgstr ""
-
-#: ../../addon/numfriends/numfriends.php:77
-msgid "Numfriends Settings"
-msgstr ""
-
-#: ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr ""
-
 #: ../../addon/gnot/gnot.php:48
 msgid "Gnot settings updated."
 msgstr ""
@@ -5580,162 +6000,12 @@ msgstr ""
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:42
-msgid "Post to Wordpress"
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:76
-msgid "WordPress Post Settings"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:78
-msgid "Enable WordPress Post Plugin"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:83
-msgid "WordPress username"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:88
-msgid "WordPress password"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:93
-msgid "WordPress API URL"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:98
-msgid "Post to WordPress by default"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:103
-msgid "Provide a backlink to the Friendica post"
-msgstr ""
-
-#: ../../addon/wppost/wppost.php:205
-msgid "Read the original post and comment stream on Friendica"
-msgstr ""
-
-#: ../../addon/showmore/showmore.php:38
-msgid "\"Show more\" Settings"
-msgstr ""
-
-#: ../../addon/showmore/showmore.php:41
-msgid "Enable Show More"
-msgstr ""
-
-#: ../../addon/showmore/showmore.php:44
-msgid "Cutting posts after how much characters"
-msgstr ""
-
-#: ../../addon/showmore/showmore.php:65
-msgid "Show More Settings saved."
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:79
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:82
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:90
-msgid "Piwik Base URL"
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:90
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:91
-msgid "Site ID"
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:92
-msgid "Show opt-out cookie link?"
-msgstr ""
-
-#: ../../addon/piwik/piwik.php:93
-msgid "Asynchronous tracking"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:73
-msgid "Post to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter settings updated."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:146
-msgid "Twitter Posting Settings"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:153
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:172
-msgid ""
-"At this Friendica instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:173
-msgid "Log in with Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:175
-msgid "Copy the PIN from Twitter here"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:190
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for "
-"every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:192
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:195
-msgid "Allow posting to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:198
-msgid "Send public postings to Twitter by default"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:201
-msgid "Send linked #-tags and @-names to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:383
-msgid "Consumer key"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:384
-msgid "Consumer secret"
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
 msgstr ""
 
 #: ../../addon/irc/irc.php:44
@@ -5762,280 +6032,99 @@ msgstr ""
 msgid "Popular Channels"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:42
-msgid "Post to blogger"
+#: ../../addon/public_server/public_server.php:127
+msgid "Your Friendica account is about to expire."
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:74
-msgid "Blogger Post Settings"
+#: ../../addon/public_server/public_server.php:128
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your "
+"account by logging in at least once every 30 days"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:76
-msgid "Enable Blogger Post Plugin"
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:81
-msgid "Blogger username"
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:86
-msgid "Blogger password"
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:91
-msgid "Blogger API URL"
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:96
-msgid "Post to Blogger by default"
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:37
-msgid "Post to Posterous"
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:70
-msgid "Posterous Post Settings"
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:72
-msgid "Enable Posterous Post Plugin"
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:77
-msgid "Posterous login"
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:82
-msgid "Posterous password"
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:87
-msgid "Posterous site ID"
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:92
-msgid "Posterous API token"
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:97
-msgid "Post to Posterous by default"
+#: ../../addon/startpage/startpage.php:83
+msgid "Startpage Settings"
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/diabook/config.php:192
-#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
-msgid "Theme settings"
+#: ../../addon/startpage/startpage.php:85
+msgid "Home page to load after login  - leave blank for profile wall"
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
+#: ../../addon/startpage/startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/diabook/config.php:193
-#: ../../view/theme/dispy/config.php:73
-msgid "Set font-size for posts and comments"
+#: ../../include/auth.php:36
+msgid "Logged out."
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:85
-msgid "Set theme width"
+#: ../../include/auth.php:115
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:86
-#: ../../view/theme/quattro/config.php:56
-msgid "Color scheme"
+#: ../../include/auth.php:115
+msgid "The error message was:"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
-#: ../../include/nav.php:115
-msgid "Your posts and conversations"
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:249
+msgid "Starts:"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
-msgid "Your profile page"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:129
-msgid "Your contacts"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
-msgid "Your photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
-msgid "Your events"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
-msgid "Personal notes"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
-msgid "Your personal photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:134
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:747
-#: ../../view/theme/diabook/config.php:201
-msgid "Community Pages"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:490
-#: ../../view/theme/diabook/theme.php:749
-#: ../../view/theme/diabook/config.php:203
-msgid "Community Profiles"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:511
-#: ../../view/theme/diabook/theme.php:754
-#: ../../view/theme/diabook/config.php:208
-msgid "Last users"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:540
-#: ../../view/theme/diabook/theme.php:756
-#: ../../view/theme/diabook/config.php:210
-msgid "Last likes"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/theme.php:755
-#: ../../view/theme/diabook/config.php:209
-msgid "Last photos"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:622
-#: ../../view/theme/diabook/theme.php:752
-#: ../../view/theme/diabook/config.php:206
-msgid "Find Friends"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:623
-msgid "Local Directory"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
-msgid "Similar Interests"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:678
-#: ../../view/theme/diabook/theme.php:748
-#: ../../view/theme/diabook/config.php:202
-msgid "Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:683
-msgid "Set zoomfactor for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:684
-#: ../../view/theme/diabook/config.php:199
-msgid "Set longitude (X) for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:685
-#: ../../view/theme/diabook/config.php:200
-msgid "Set latitude (Y) for Earth Layers"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:698
-#: ../../view/theme/diabook/theme.php:750
-#: ../../view/theme/diabook/config.php:204
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:705
-#: ../../view/theme/diabook/theme.php:751
-#: ../../view/theme/diabook/config.php:205
-msgid "Connect Services"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:712
-#: ../../view/theme/diabook/theme.php:753
-msgid "Last Tweets"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:715
-#: ../../view/theme/diabook/config.php:197
-msgid "Set twitter search term"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
-msgid "don't show"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
-msgid "show"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:745
-msgid "Show/hide boxes at right-hand column:"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:194
-#: ../../view/theme/dispy/config.php:74
-msgid "Set line-height for posts and comments"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:195
-msgid "Set resolution for middle column"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:196
-msgid "Set color scheme"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:198
-msgid "Set zoomfactor for Earth Layer"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:207
-msgid "Last tweets"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:55
-msgid "Alignment"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:55
-msgid "Left"
-msgstr ""
-
-#: ../../view/theme/quattro/config.php:55
-msgid "Center"
-msgstr ""
-
-#: ../../view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr ""
-
-#: ../../include/profile_advanced.php:17 ../../boot.php:1111
-msgid "Gender:"
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:257
+msgid "Finishes:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:22
@@ -6046,8 +6135,8 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1446
+#: ../../include/profile_advanced.php:30 ../../include/items.php:1446
+#: ../../include/datetime.php:450
 msgid "Birthday:"
 msgstr ""
 
@@ -6055,19 +6144,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1114
-msgid "Status:"
-msgstr ""
-
 #: ../../include/profile_advanced.php:43
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:48 ../../boot.php:1116
-msgid "Homepage:"
-msgstr ""
-
 #: ../../include/profile_advanced.php:52
 msgid "Tags:"
 msgstr ""
@@ -6116,76 +6197,266 @@ msgstr ""
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: ../../include/message.php:15 ../../include/message.php:171
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
+#: ../../include/text.php:243
+msgid "prev"
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../include/text.php:245
+msgid "first"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../include/text.php:274
+msgid "last"
 msgstr ""
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: ../../include/text.php:277
+msgid "next"
 msgstr ""
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: ../../include/text.php:568
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
+#: ../../include/text.php:577
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:835
+msgid "Monday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
+#: ../../include/text.php:835
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
+#: ../../include/text.php:835
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
+#: ../../include/text.php:835
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/text.php:835
+msgid "Friday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/text.php:835
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/text.php:835
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/text.php:839
+msgid "January"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/text.php:839
+msgid "February"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/text.php:839
+msgid "March"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/text.php:839
+msgid "April"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/text.php:839
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:925
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:945 ../../include/text.php:960
+msgid "remove"
+msgstr ""
+
+#: ../../include/text.php:945 ../../include/text.php:960
+msgid "[remove]"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:963
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/text.php:979 ../../include/text.php:991
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1096 ../../include/user.php:230
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1108
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1318
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1320
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1321
+msgid "post"
+msgstr ""
+
+#: ../../include/text.php:1476
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/dba.php:41
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr ""
+
+#: ../../include/items.php:2790
+msgid "A new person is sharing with you at "
+msgstr ""
+
+#: ../../include/items.php:2790
+msgid "You have a new follower at "
+msgstr ""
+
+#: ../../include/items.php:3444
+msgid "Archives"
+msgstr ""
+
+#: ../../include/delivery.php:456 ../../include/notifier.php:678
+msgid "(no subject)"
+msgstr ""
+
+#: ../../include/delivery.php:463 ../../include/notifier.php:685
+#: ../../include/enotify.php:26
+msgid "noreply"
+msgstr ""
+
+#: ../../include/diaspora.php:593
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: ../../include/diaspora.php:2037
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
+msgstr ""
+
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr ""
+
+#: ../../include/follow.php:60 ../../include/follow.php:75
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr ""
+
+#: ../../include/follow.php:73
+msgid "The profile address specified does not provide adequate information."
+msgstr ""
+
+#: ../../include/follow.php:77
+msgid "An author or name was not found."
+msgstr ""
+
+#: ../../include/follow.php:79
+msgid "No browser URL could be matched to this address."
+msgstr ""
+
+#: ../../include/follow.php:81
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr ""
+
+#: ../../include/follow.php:82
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: ../../include/follow.php:88
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr ""
+
+#: ../../include/follow.php:93
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+
+#: ../../include/follow.php:169
+msgid "Unable to retrieve contact information."
+msgstr ""
+
+#: ../../include/follow.php:223
+msgid "following"
+msgstr ""
+
+#: ../../include/security.php:21
+msgid "Welcome "
+msgstr ""
+
+#: ../../include/security.php:22
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../include/security.php:25
+msgid "Welcome back "
+msgstr ""
+
+#: ../../include/security.php:329
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
 #: ../../include/profile_selectors.php:6
@@ -6420,885 +6691,6 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:249
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:257
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/delivery.php:456 ../../include/notifier.php:678
-msgid "(no subject)"
-msgstr ""
-
-#: ../../include/delivery.php:463 ../../include/enotify.php:26
-#: ../../include/notifier.php:685
-msgid "noreply"
-msgstr ""
-
-#: ../../include/text.php:243
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:245
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:274
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:277
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:568
-msgid "No contacts"
-msgstr ""
-
-#: ../../include/text.php:577
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:835
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:925
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:945 ../../include/text.php:960
-msgid "remove"
-msgstr ""
-
-#: ../../include/text.php:945 ../../include/text.php:960
-msgid "[remove]"
-msgstr ""
-
-#: ../../include/text.php:948
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/text.php:963
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/text.php:979 ../../include/text.php:991
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1096 ../../include/user.php:230
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1108
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1318
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:1320
-msgid "comment"
-msgstr ""
-
-#: ../../include/text.php:1321
-msgid "post"
-msgstr ""
-
-#: ../../include/text.php:1476
-msgid "Item filed"
-msgstr ""
-
-#: ../../include/diaspora.php:593
-msgid "Sharing notification from Diaspora network"
-msgstr ""
-
-#: ../../include/diaspora.php:2037
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/network.php:827
-msgid "view full size"
-msgstr ""
-
-#: ../../include/oembed.php:134
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:143
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:176
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:195
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/group.php:218
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:239
-msgid "Groups"
-msgstr ""
-
-#: ../../include/group.php:240
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:241
-msgid "Create a new group"
-msgstr ""
-
-#: ../../include/group.php:242
-msgid "Contacts not in any group"
-msgstr ""
-
-#: ../../include/nav.php:46 ../../boot.php:821
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:46
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:49 ../../boot.php:1508
-msgid "Status"
-msgstr ""
-
-#: ../../include/nav.php:64
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:77
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:81
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:86
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:89
-msgid "Apps"
-msgstr ""
-
-#: ../../include/nav.php:89
-msgid "Addon applications, utilities, games"
-msgstr ""
-
-#: ../../include/nav.php:91
-msgid "Search site content"
-msgstr ""
-
-#: ../../include/nav.php:101
-msgid "Conversations on this site"
-msgstr ""
-
-#: ../../include/nav.php:103
-msgid "Directory"
-msgstr ""
-
-#: ../../include/nav.php:103
-msgid "People directory"
-msgstr ""
-
-#: ../../include/nav.php:113
-msgid "Conversations from your friends"
-msgstr ""
-
-#: ../../include/nav.php:121
-msgid "Friend Requests"
-msgstr ""
-
-#: ../../include/nav.php:123
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:124
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:128
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:129
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/nav.php:134
-msgid "Manage"
-msgstr ""
-
-#: ../../include/nav.php:134
-msgid "Manage other pages"
-msgstr ""
-
-#: ../../include/nav.php:138 ../../boot.php:1069
-msgid "Profiles"
-msgstr ""
-
-#: ../../include/nav.php:138 ../../boot.php:1069
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:139
-msgid "Manage/edit friends and contacts"
-msgstr ""
-
-#: ../../include/nav.php:146
-msgid "Site setup and configuration"
-msgstr ""
-
-#: ../../include/nav.php:169
-msgid "Nothing new here"
-msgstr ""
-
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr ""
-
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
-msgstr ""
-
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr ""
-
-#: ../../include/contact_widgets.php:23
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Find People"
-msgstr ""
-
-#: ../../include/contact_widgets.php:30
-msgid "Enter name or interest"
-msgstr ""
-
-#: ../../include/contact_widgets.php:31
-msgid "Connect/Follow"
-msgstr ""
-
-#: ../../include/contact_widgets.php:32
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: ../../include/contact_widgets.php:36
-msgid "Random Profile"
-msgstr ""
-
-#: ../../include/contact_widgets.php:68
-msgid "Networks"
-msgstr ""
-
-#: ../../include/contact_widgets.php:71
-msgid "All Networks"
-msgstr ""
-
-#: ../../include/contact_widgets.php:98
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:126
-msgid "Categories"
-msgstr ""
-
-#: ../../include/auth.php:36
-msgid "Logged out."
-msgstr ""
-
-#: ../../include/auth.php:115
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr ""
-
-#: ../../include/auth.php:115
-msgid "The error message was:"
-msgstr ""
-
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../include/datetime.php:131 ../../include/datetime.php:263
-msgid "year"
-msgstr ""
-
-#: ../../include/datetime.php:136 ../../include/datetime.php:264
-msgid "month"
-msgstr ""
-
-#: ../../include/datetime.php:141 ../../include/datetime.php:266
-msgid "day"
-msgstr ""
-
-#: ../../include/datetime.php:254
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:260
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:263
-msgid "years"
-msgstr ""
-
-#: ../../include/datetime.php:264
-msgid "months"
-msgstr ""
-
-#: ../../include/datetime.php:265
-msgid "week"
-msgstr ""
-
-#: ../../include/datetime.php:265
-msgid "weeks"
-msgstr ""
-
-#: ../../include/datetime.php:266
-msgid "days"
-msgstr ""
-
-#: ../../include/datetime.php:267
-msgid "hour"
-msgstr ""
-
-#: ../../include/datetime.php:267
-msgid "hours"
-msgstr ""
-
-#: ../../include/datetime.php:268
-msgid "minute"
-msgstr ""
-
-#: ../../include/datetime.php:268
-msgid "minutes"
-msgstr ""
-
-#: ../../include/datetime.php:269
-msgid "second"
-msgstr ""
-
-#: ../../include/datetime.php:269
-msgid "seconds"
-msgstr ""
-
-#: ../../include/datetime.php:278
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/onepoll.php:406
-msgid "From: "
-msgstr ""
-
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:230
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/bbcode.php:245 ../../include/bbcode.php:314
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/dba.php:41
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: ../../include/message.php:15 ../../include/message.php:171
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/acl_selectors.php:286
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/enotify.php:14
-msgid "Friendica Notification"
-msgstr ""
-
-#: ../../include/enotify.php:17
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:19
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/enotify.php:38
-#, php-format
-msgid "%s <!item_type!>"
-msgstr ""
-
-#: ../../include/enotify.php:42
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr ""
-
-#: ../../include/enotify.php:44
-#, php-format
-msgid "%s sent you a new private message at %s."
-msgstr ""
-
-#: ../../include/enotify.php:45
-#, php-format
-msgid "%s sent you %s."
-msgstr ""
-
-#: ../../include/enotify.php:45
-msgid "a private message"
-msgstr ""
-
-#: ../../include/enotify.php:46
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../include/enotify.php:76
-#, php-format
-msgid "%s's"
-msgstr ""
-
-#: ../../include/enotify.php:80
-msgid "your"
-msgstr ""
-
-#: ../../include/enotify.php:87
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d by %s"
-msgstr ""
-
-#: ../../include/enotify.php:88
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr ""
-
-#: ../../include/enotify.php:89
-#, php-format
-msgid "%s commented on %s."
-msgstr ""
-
-#: ../../include/enotify.php:91 ../../include/enotify.php:104
-#: ../../include/enotify.php:115 ../../include/enotify.php:126
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: ../../include/enotify.php:98
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr ""
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "%s posted to your profile wall at %s"
-msgstr ""
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%s posted to %s"
-msgstr ""
-
-#: ../../include/enotify.php:102
-msgid "your profile wall."
-msgstr ""
-
-#: ../../include/enotify.php:111
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr ""
-
-#: ../../include/enotify.php:112
-#, php-format
-msgid "%s tagged you at %s"
-msgstr ""
-
-#: ../../include/enotify.php:113
-#, php-format
-msgid "%s %s."
-msgstr ""
-
-#: ../../include/enotify.php:113
-msgid "tagged you"
-msgstr ""
-
-#: ../../include/enotify.php:122
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr ""
-
-#: ../../include/enotify.php:123
-#, php-format
-msgid "%s tagged your post at %s"
-msgstr ""
-
-#: ../../include/enotify.php:124
-#, php-format
-msgid "%s tagged %s"
-msgstr ""
-
-#: ../../include/enotify.php:124
-msgid "your post"
-msgstr ""
-
-#: ../../include/enotify.php:133
-msgid "[Friendica:Notify] Introduction received"
-msgstr ""
-
-#: ../../include/enotify.php:134
-#, php-format
-msgid "You've received an introduction from '%s' at %s"
-msgstr ""
-
-#: ../../include/enotify.php:135
-#, php-format
-msgid "You've received %s from %s."
-msgstr ""
-
-#: ../../include/enotify.php:135
-msgid "an introduction"
-msgstr ""
-
-#: ../../include/enotify.php:136 ../../include/enotify.php:153
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: ../../include/enotify.php:138
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr ""
-
-#: ../../include/enotify.php:145
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr ""
-
-#: ../../include/enotify.php:146
-#, php-format
-msgid "You've received a friend suggestion from '%s' at %s"
-msgstr ""
-
-#: ../../include/enotify.php:147
-#, php-format
-msgid "You've received %s for %s from %s."
-msgstr ""
-
-#: ../../include/enotify.php:148
-msgid "a friend suggestion"
-msgstr ""
-
-#: ../../include/enotify.php:151
-msgid "Name:"
-msgstr ""
-
-#: ../../include/enotify.php:152
-msgid "Photo:"
-msgstr ""
-
-#: ../../include/enotify.php:155
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: ../../include/follow.php:32
-msgid "Connect URL missing."
-msgstr ""
-
-#: ../../include/follow.php:59
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr ""
-
-#: ../../include/follow.php:60 ../../include/follow.php:75
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
-
-#: ../../include/follow.php:73
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-
-#: ../../include/follow.php:77
-msgid "An author or name was not found."
-msgstr ""
-
-#: ../../include/follow.php:79
-msgid "No browser URL could be matched to this address."
-msgstr ""
-
-#: ../../include/follow.php:81
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr ""
-
-#: ../../include/follow.php:82
-msgid "Use mailto: in front of address to force email check."
-msgstr ""
-
-#: ../../include/follow.php:88
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-
-#: ../../include/follow.php:93
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-
-#: ../../include/follow.php:169
-msgid "Unable to retrieve contact information."
-msgstr ""
-
-#: ../../include/follow.php:223
-msgid "following"
-msgstr ""
-
-#: ../../include/items.php:2790
-msgid "A new person is sharing with you at "
-msgstr ""
-
-#: ../../include/items.php:2790
-msgid "You have a new follower at "
-msgstr ""
-
-#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
-#: ../../include/bb2diaspora.php:113
-msgid "image/photo"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:102
-msgid "link"
-msgstr ""
-
-#: ../../include/user.php:38
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/user.php:43
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/user.php:51
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: ../../include/user.php:66
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/user.php:80
-msgid "Please use a shorter name."
-msgstr ""
-
-#: ../../include/user.php:82
-msgid "Name too short."
-msgstr ""
-
-#: ../../include/user.php:97
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: ../../include/user.php:102
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: ../../include/user.php:105
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../../include/user.php:115
-msgid "Cannot use that email."
-msgstr ""
-
-#: ../../include/user.php:121
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr ""
-
-#: ../../include/user.php:127 ../../include/user.php:219
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: ../../include/user.php:137
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr ""
-
-#: ../../include/user.php:153
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: ../../include/user.php:205
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: ../../include/user.php:240
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: ../../include/security.php:21
-msgid "Welcome "
-msgstr ""
-
-#: ../../include/security.php:22
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: ../../include/security.php:25
-msgid "Welcome back "
-msgstr ""
-
-#: ../../include/security.php:329
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
-#: ../../include/Contact.php:111
-msgid "stopped following"
-msgstr ""
-
-#: ../../include/Contact.php:203 ../../include/conversation.php:842
-msgid "View Status"
-msgstr ""
-
-#: ../../include/Contact.php:204 ../../include/conversation.php:843
-msgid "View Profile"
-msgstr ""
-
-#: ../../include/Contact.php:205 ../../include/conversation.php:844
-msgid "View Photos"
-msgstr ""
-
-#: ../../include/Contact.php:206 ../../include/Contact.php:219
-#: ../../include/conversation.php:845
-msgid "Network Posts"
-msgstr ""
-
-#: ../../include/Contact.php:207 ../../include/Contact.php:219
-#: ../../include/conversation.php:846
-msgid "Edit Contact"
-msgstr ""
-
-#: ../../include/Contact.php:208 ../../include/Contact.php:219
-#: ../../include/conversation.php:847
-msgid "Send PM"
-msgstr ""
-
 #: ../../include/conversation.php:163
 msgid "post/item"
 msgstr ""
@@ -7422,6 +6814,33 @@ msgstr ""
 msgid "Delete Selected Items"
 msgstr ""
 
+#: ../../include/conversation.php:842 ../../include/Contact.php:203
+msgid "View Status"
+msgstr ""
+
+#: ../../include/conversation.php:843 ../../include/Contact.php:204
+msgid "View Profile"
+msgstr ""
+
+#: ../../include/conversation.php:844 ../../include/Contact.php:205
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/conversation.php:845 ../../include/Contact.php:206
+#: ../../include/Contact.php:219
+msgid "Network Posts"
+msgstr ""
+
+#: ../../include/conversation.php:846 ../../include/Contact.php:207
+#: ../../include/Contact.php:219
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/conversation.php:847 ../../include/Contact.php:208
+#: ../../include/Contact.php:219
+msgid "Send PM"
+msgstr ""
+
 #: ../../include/conversation.php:901
 #, php-format
 msgid "%s likes this."
@@ -7521,96 +6940,610 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:522
-msgid "Delete this item?"
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
 msgstr ""
 
-#: ../../boot.php:525
-msgid "show fewer"
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
 msgstr ""
 
-#: ../../boot.php:698
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: ../../include/contact_widgets.php:23
 #, php-format
-msgid "Update %s failed. See error logs."
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:29
+msgid "Find People"
 msgstr ""
 
-#: ../../boot.php:700
+#: ../../include/contact_widgets.php:30
+msgid "Enter name or interest"
+msgstr ""
+
+#: ../../include/contact_widgets.php:31
+msgid "Connect/Follow"
+msgstr ""
+
+#: ../../include/contact_widgets.php:32
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr ""
+
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:98
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+msgid "Everything"
+msgstr ""
+
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
+msgstr ""
+
+#: ../../include/nav.php:46
+msgid "End this session"
+msgstr ""
+
+#: ../../include/nav.php:64
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:77
+msgid "Home Page"
+msgstr ""
+
+#: ../../include/nav.php:81
+msgid "Create an account"
+msgstr ""
+
+#: ../../include/nav.php:86
+msgid "Help and documentation"
+msgstr ""
+
+#: ../../include/nav.php:89
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:89
+msgid "Addon applications, utilities, games"
+msgstr ""
+
+#: ../../include/nav.php:91
+msgid "Search site content"
+msgstr ""
+
+#: ../../include/nav.php:101
+msgid "Conversations on this site"
+msgstr ""
+
+#: ../../include/nav.php:103
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:103
+msgid "People directory"
+msgstr ""
+
+#: ../../include/nav.php:113
+msgid "Conversations from your friends"
+msgstr ""
+
+#: ../../include/nav.php:121
+msgid "Friend Requests"
+msgstr ""
+
+#: ../../include/nav.php:123
+msgid "See all notifications"
+msgstr ""
+
+#: ../../include/nav.php:124
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:128
+msgid "Private mail"
+msgstr ""
+
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/nav.php:134
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:134
+msgid "Manage other pages"
+msgstr ""
+
+#: ../../include/nav.php:139
+msgid "Manage/edit friends and contacts"
+msgstr ""
+
+#: ../../include/nav.php:146
+msgid "Site setup and configuration"
+msgstr ""
+
+#: ../../include/nav.php:169
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr ""
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr ""
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr ""
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr ""
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr ""
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr ""
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr ""
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr ""
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr ""
+
+#: ../../include/enotify.php:14
+msgid "Friendica Notification"
+msgstr ""
+
+#: ../../include/enotify.php:17
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:19
 #, php-format
-msgid "Update Error at %s"
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../boot.php:800
-msgid "Create a New Account"
+#: ../../include/enotify.php:38
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../boot.php:824
-msgid "Nickname or Email address: "
+#: ../../include/enotify.php:42
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../boot.php:825
-msgid "Password: "
+#: ../../include/enotify.php:44
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: ../../boot.php:828
-msgid "Or login using OpenID: "
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../boot.php:834
-msgid "Forgot your password?"
+#: ../../include/enotify.php:45
+msgid "a private message"
 msgstr ""
 
-#: ../../boot.php:1001
-msgid "Edit profile"
+#: ../../include/enotify.php:46
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../boot.php:1061
-msgid "Message"
+#: ../../include/enotify.php:73
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr ""
 
-#: ../../boot.php:1177 ../../boot.php:1253
-msgid "g A l F d"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: ../../boot.php:1178 ../../boot.php:1254
-msgid "F d"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: ../../boot.php:1223 ../../boot.php:1294
-msgid "[today]"
+#: ../../include/enotify.php:98
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %1$s"
 msgstr ""
 
-#: ../../boot.php:1235
-msgid "Birthday Reminders"
+#: ../../include/enotify.php:99
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../boot.php:1236
-msgid "Birthdays this week:"
+#: ../../include/enotify.php:102 ../../include/enotify.php:117
+#: ../../include/enotify.php:130 ../../include/enotify.php:143
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../boot.php:1287
-msgid "[No description]"
+#: ../../include/enotify.php:109
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../boot.php:1305
-msgid "Event Reminders"
+#: ../../include/enotify.php:111
+#, php-format
+msgid "%1$s posted to your profile wall at %1$s"
 msgstr ""
 
-#: ../../boot.php:1306
-msgid "Events this week:"
+#: ../../include/enotify.php:113
+#, php-format
+msgid "%1$s posted to [url=%2s]your wall[/url]"
 msgstr ""
 
-#: ../../boot.php:1511
-msgid "Status Messages and Posts"
+#: ../../include/enotify.php:124
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: ../../boot.php:1517
-msgid "Profile Details"
+#: ../../include/enotify.php:125
+#, php-format
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: ../../boot.php:1532
-msgid "Events and Calendar"
+#: ../../include/enotify.php:126
+#, php-format
+msgid "%1$s [url=%2s]tagged you[/url]."
 msgstr ""
 
-#: ../../boot.php:1538
-msgid "Only You Can See This"
+#: ../../include/enotify.php:137
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:138
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:139
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr ""
+
+#: ../../include/enotify.php:150
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:151
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:152
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:155 ../../include/enotify.php:173
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:157
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: ../../include/enotify.php:164
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:165
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:166
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:171
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:172
+msgid "Photo:"
+msgstr ""
+
+#: ../../include/enotify.php:175
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../include/onepoll.php:406
+msgid "From: "
+msgstr ""
+
+#: ../../include/user.php:38
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/user.php:43
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/user.php:51
+msgid "Invalid OpenID url"
+msgstr ""
+
+#: ../../include/user.php:66
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/user.php:80
+msgid "Please use a shorter name."
+msgstr ""
+
+#: ../../include/user.php:82
+msgid "Name too short."
+msgstr ""
+
+#: ../../include/user.php:97
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr ""
+
+#: ../../include/user.php:102
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: ../../include/user.php:105
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../../include/user.php:115
+msgid "Cannot use that email."
+msgstr ""
+
+#: ../../include/user.php:121
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr ""
+
+#: ../../include/user.php:127 ../../include/user.php:219
+msgid "Nickname is already registered. Please choose another."
+msgstr ""
+
+#: ../../include/user.php:137
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: ../../include/user.php:153
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr ""
+
+#: ../../include/user.php:205
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+
+#: ../../include/user.php:240
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: ../../include/acl_selectors.php:286
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:230
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/bbcode.php:245 ../../include/bbcode.php:314
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/oembed.php:134
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:143
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:176
+msgid "Default privacy group for new contacts"
+msgstr ""
+
+#: ../../include/group.php:195
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/group.php:218
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:239
+msgid "Groups"
+msgstr ""
+
+#: ../../include/group.php:240
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:241
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:242
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/Contact.php:111
+msgid "stopped following"
+msgstr ""
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:254
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:260
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:263
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:264
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:265
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:265
+msgid "weeks"
+msgstr ""
+
+#: ../../include/datetime.php:266
+msgid "days"
+msgstr ""
+
+#: ../../include/datetime.php:267
+msgid "hour"
+msgstr ""
+
+#: ../../include/datetime.php:267
+msgid "hours"
+msgstr ""
+
+#: ../../include/datetime.php:268
+msgid "minute"
+msgstr ""
+
+#: ../../include/datetime.php:268
+msgid "minutes"
+msgstr ""
+
+#: ../../include/datetime.php:269
+msgid "second"
+msgstr ""
+
+#: ../../include/datetime.php:269
+msgid "seconds"
+msgstr ""
+
+#: ../../include/datetime.php:278
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: ../../include/network.php:827
+msgid "view full size"
 msgstr ""

From feab17bfea374fd753b18157eeb8bf5cd61954cf Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 13 Jun 2012 12:08:34 -0400
Subject: [PATCH 26/44] enotify: fix stupid typo

---
 include/enotify.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/enotify.php b/include/enotify.php
index 89ecc3703..aba2f8516 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -80,7 +80,7 @@ function notification($params) {
 			$dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
 						'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
 						$itemlink,
-						$p[0]['author-name']
+						$p[0]['author-name'],
 						$item_post_type);
 		
 		// "your post"

From e8e1de36031fcd1adb569f66dcaedecaa8284bd6 Mon Sep 17 00:00:00 2001
From: Erkan Yilmaz <erkan77@gmail.com>
Date: Wed, 13 Jun 2012 20:41:53 +0200
Subject: [PATCH 27/44] add missing bracket

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index f6bf1041e..58a618610 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 		$from = 'UTC';
 	if($to === '')
 		$to = 'UTC';
-	if($s === '' || (! is_string($s)))
+	if( ($s === '') || (! is_string($s)) )
 		$s = 'now';
 
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended

From d908c9dd7196276e1364f77abb053aba3dce77af Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 16:17:45 -0700
Subject: [PATCH 28/44] disable archive widget for PHP < 5.3

---
 boot.php          |  2 +-
 include/items.php | 12 +++++++++
 util/messages.po  | 66 +++++++++++++++++++++++++----------------------
 3 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/boot.php b/boot.php
index a611bf964..bf4e59293 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.1372' );
+define ( 'FRIENDICA_VERSION',      '3.0.1373' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/include/items.php b/include/items.php
index 35a4396dc..5c797424b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3436,6 +3436,18 @@ function posted_dates($uid,$wall) {
 
 function posted_date_widget($url,$uid,$wall) {
 	$o = '';
+
+	// "first day of " constructs were added in php 5.3
+	// TODO: emulate posted_dates() logic for prior releases
+
+	if(version_compare(PHP_VERSION, '5.3.0') < 0)
+		return $o;
+
+	// For former Facebook folks that left because of "timeline"
+
+	if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
+		return $o;
+
 	$ret = posted_dates($uid,$wall);
 	if(! count($ret))
 		return $o;
diff --git a/util/messages.po b/util/messages.po
index e28fdf7fb..20fe27fc8 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1372\n"
+"Project-Id-Version: 3.0.1373\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-12 10:00-0700\n"
+"POT-Creation-Date: 2012-06-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"
@@ -130,9 +130,9 @@ msgstr ""
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:342
 #: ../../mod/settings.php:555 ../../mod/settings.php:701
 #: ../../mod/settings.php:762 ../../mod/settings.php:969
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216
-#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
-#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
+#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
+#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991
+#: ../../mod/admin.php:1078 ../../mod/profiles.php:554
 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
@@ -1236,7 +1236,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:266
+#: ../../mod/notifications.php:85 ../../mod/network.php:285
 msgid "Personal"
 msgstr ""
 
@@ -2308,67 +2308,67 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/network.php:67
+#: ../../mod/network.php:82
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:106 ../../mod/search.php:16
+#: ../../mod/network.php:122 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:115 ../../mod/search.php:13
+#: ../../mod/network.php:131 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:116 ../../include/group.php:244
+#: ../../mod/network.php:132 ../../include/group.php:244
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:272
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:256
+#: ../../mod/network.php:275
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:259
+#: ../../mod/network.php:278
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:262
+#: ../../mod/network.php:281
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:269
+#: ../../mod/network.php:288
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:272
+#: ../../mod/network.php:291
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:275
+#: ../../mod/network.php:294
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:278
+#: ../../mod/network.php:297
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:281
+#: ../../mod/network.php:300
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:284
+#: ../../mod/network.php:303
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:287
+#: ../../mod/network.php:306
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:354
+#: ../../mod/network.php:373
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2376,31 +2376,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:357
+#: ../../mod/network.php:376
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:402
+#: ../../mod/network.php:421
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:413
+#: ../../mod/network.php:432
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:417
+#: ../../mod/network.php:436
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:427
+#: ../../mod/network.php:446
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:429
+#: ../../mod/network.php:448
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:434
+#: ../../mod/network.php:453
 msgid "Invalid contact."
 msgstr ""
 
@@ -3609,11 +3609,11 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:139 ../../mod/display.php:75
+#: ../../mod/profile.php:141 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:164
+#: ../../mod/profile.php:166
 msgid "Tips for New Members"
 msgstr ""
 
@@ -7173,6 +7173,10 @@ msgstr ""
 msgid "You have a new follower at "
 msgstr ""
 
+#: ../../include/items.php:3444
+msgid "Archives"
+msgstr ""
+
 #: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
 #: ../../include/bb2diaspora.php:113
 msgid "image/photo"

From 7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 19:59:20 -0700
Subject: [PATCH 29/44] fix to imported youtube videos, updating of contact
 profile photos, do not remove "dead" contacts but archive them.

---
 include/Contact.php  |  13 ++++-
 include/Photo.php    | 113 +++++++++++++++++++++++++++++++------------
 include/queue_fn.php |   7 +++
 include/text.php     |   6 +--
 4 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index 675d1c81e..3b255a072 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -146,12 +146,23 @@ function mark_for_death($contact) {
 		);
 	}
 	else {
+
+		// TODO: We really should send a notification to the owner after 2-3 weeks
+		// so they won't be surprised when the contact vanishes and can take
+		// remedial action if this was a serious mistake or glitch
+
 		$expiry = $contact['term-date'] . ' + 32 days ';
 		if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
 			// relationship is really truly dead. 
+			// archive them rather than delete
+			// though if the owner tries to unarchive them we'll start the whole process over again
 
-			contact_remove($contact['id']);
+			q("update contact set `archive` = 1 where id = %d limit 1",
+				intval($contact['id'])
+			);
+
+			//contact_remove($contact['id']);
 
 		}
 	}
diff --git a/include/Photo.php b/include/Photo.php
index f769a70a6..da7c49622 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -256,35 +256,81 @@ class Photo {
 		else
 			$guid = get_guid();
 
-		$r = q("INSERT INTO `photo`
-			( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
-			intval($uid),
-			intval($cid),
-			dbesc($guid),
-			dbesc($rid),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(basename($filename)),
-			dbesc($this->type),
-			dbesc($album),
-			intval($this->height),
-			intval($this->width),
-			dbesc($this->imageString()),
-			intval($scale),
-			intval($profile),
-			dbesc($allow_cid),
-			dbesc($allow_gid),
-			dbesc($deny_cid),
-			dbesc($deny_gid)
+		$x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
+				dbesc($rid),
+				intval($uid),
+				intval($cid),
+				intval($scale)
 		);
+		if(count($x)) {
+			$r = q("UPDATE `photo`
+				set `uid` = %d, 
+				`contact-id` = %d, 
+				`guid` = '%s', 
+				`resource-id` = '%s', 
+				`created` = '%s',
+				`edited` = '%s', 
+				`filename` = '%s', 
+				`type` = '%s', 
+				`album` = '%s', 
+				`height` = %d, 
+				`width` = %d, 
+				`data` = '%s', 
+				`scale` = %d, 
+				`profile` = %d, 
+				`allow_cid` = '%s', 
+				`allow_gid` = '%s', 
+				`deny_cid` = '%s',
+				`deny_gid` = '%s', 
+				where id = %d limit 1",
+
+				intval($uid),
+				intval($cid),
+				dbesc($guid),
+				dbesc($rid),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc(basename($filename)),
+				dbesc($this->type),
+				dbesc($album),
+				intval($this->height),
+				intval($this->width),
+				dbesc($this->imageString()),
+				intval($scale),
+				intval($profile),
+				dbesc($allow_cid),
+				dbesc($allow_gid),
+				dbesc($deny_cid),
+				dbesc($deny_gid),
+				intval($x[0]['id'])
+			);
+		}
+		else {
+			$r = q("INSERT INTO `photo`
+				( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
+				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+				intval($uid),
+				intval($cid),
+				dbesc($guid),
+				dbesc($rid),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc(basename($filename)),
+				dbesc($this->type),
+				dbesc($album),
+				intval($this->height),
+				intval($this->width),
+				dbesc($this->imageString()),
+				intval($scale),
+				intval($profile),
+				dbesc($allow_cid),
+				dbesc($allow_gid),
+				dbesc($deny_cid),
+				dbesc($deny_gid)
+			);
+		}
 		return $r;
 	}
-
-
-
-
-
 }}
 
 
@@ -326,6 +372,17 @@ function import_profile_photo($photo,$uid,$cid) {
 
 	$a = get_app();
 
+	$r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
+		intval($uid),
+		intval($cid)
+	);
+	if(count($r)) {
+		$hash = $r[0]['resource-id'];
+	}
+	else {
+		$hash = photo_new_resource();
+	}
+		
 	$photo_failure = false;
 
 	$filename = basename($photo);
@@ -340,8 +397,6 @@ function import_profile_photo($photo,$uid,$cid) {
 
 		$img->scaleImageSquare(175);
 					
-		$hash = photo_new_resource();
-
 		$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
 
 		if($r === false)
@@ -361,8 +416,6 @@ function import_profile_photo($photo,$uid,$cid) {
 		if($r === false)
 			$photo_failure = true;
 
-
-
 		$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
 		$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
 		$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 2aca338f5..e43912431 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,6 +23,13 @@ function was_recently_delayed($cid) {
 	);
 	if(count($r))
 		return true;
+
+	$r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
+		intval($cid)
+	);
+	if(count($r))
+		return true;
+
 	return false;
 }
 
diff --git a/include/text.php b/include/text.php
index 8948bf8c4..cc4bee268 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1255,13 +1255,13 @@ function bb_translate_video($s) {
 
 function html2bb_video($s) {
 
-	$s = preg_replace('#<object[^>]+>(.*?)https+://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)</object>#ism',
+	$s = preg_replace('#<object[^>]+>(.*?)https?://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)</object>#ism',
 			'[youtube]$2[/youtube]', $s);
 
-	$s = preg_replace('#<iframe[^>](.*?)https+://www.youtube.com/embed/([A-Za-z0-9\-_=]+)(.*?)</iframe>#ism',
+	$s = preg_replace('#<iframe[^>](.*?)https?://www.youtube.com/embed/([A-Za-z0-9\-_=]+)(.*?)</iframe>#ism',
 			'[youtube]$2[/youtube]', $s);
 
-	$s = preg_replace('#<iframe[^>](.*?)https+://player.vimeo.com/video/([0-9]+)(.*?)</iframe>#ism',
+	$s = preg_replace('#<iframe[^>](.*?)https?://player.vimeo.com/video/([0-9]+)(.*?)</iframe>#ism',
 			'[vimeo]$2[/vimeo]', $s);
 
 	return $s;

From b0a0c1ef4da159293236253e16eb0ba46a590d21 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 20:03:18 -0700
Subject: [PATCH 30/44] couple of little fixes to enotify positional params

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

diff --git a/include/enotify.php b/include/enotify.php
index aba2f8516..81f3e11eb 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -95,7 +95,7 @@ function notification($params) {
 		// Before this we have the name of the replier on the subject rendering 
 		// differents subjects for messages on the same thread.
 
-		$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%1$d by %1$s'), $parent_id, $params['source_name']);
+		$subject = sprintf( t('[Friendica:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $params['source_name']);
 		$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); 
 		$epreamble = $dest_str; 
 
@@ -108,7 +108,7 @@ function notification($params) {
 	if($params['type'] == NOTIFY_WALL) {
 		$subject = sprintf( t('[Friendica:Notify] %s posted to your profile wall') , $params['source_name']);
 
-		$preamble = sprintf( t('%1$s posted to your profile wall at %1$s') , $params['source_name'], $sitename);
+		$preamble = sprintf( t('%1$s posted to your profile wall at %2$s') , $params['source_name'], $sitename);
 		
 		$epreamble = sprintf( t('%1$s posted to [url=%2s]your wall[/url]') , 
 								'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',

From edeca6d815a8830d92a42a18199087fc6b1798cd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 20:59:19 -0700
Subject: [PATCH 31/44] remove php version restriction on archive widget

---
 include/items.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/items.php b/include/items.php
index 5c797424b..3db1a2802 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3424,8 +3424,10 @@ function posted_dates($uid,$wall) {
 
 	$ret = array();
 	while($dnow >= $dthen) {
-		$start_month = datetime_convert('','','first day of ' . $dnow,'Y-m-d');
-		$end_month = datetime_convert('','','last day of ' . $dnow,'Y-m-d');
+		$dstart = substr($dnow,0,8) . '01';
+		$dend = substr($dnow,0,8) . get_dim(intval($dnow),intval(substr($dnow,5)));
+		$start_month = datetime_convert('','',$dstart,'Y-m-d');
+		$end_month = datetime_convert('','',$dend,'Y-m-d');
 		$str = day_translate(datetime_convert('','',$dnow,'F Y'));
  		$ret[] = array($str,$end_month,$start_month);
 		$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
@@ -3437,12 +3439,6 @@ function posted_dates($uid,$wall) {
 function posted_date_widget($url,$uid,$wall) {
 	$o = '';
 
-	// "first day of " constructs were added in php 5.3
-	// TODO: emulate posted_dates() logic for prior releases
-
-	if(version_compare(PHP_VERSION, '5.3.0') < 0)
-		return $o;
-
 	// For former Facebook folks that left because of "timeline"
 
 	if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))

From 4229debff883c01d7f2e80a14b1e0fcba14ad32f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 21:40:02 -0700
Subject: [PATCH 32/44] ajax append placeholder, fix some html warnings

---
 view/conversation.tpl                  | 2 ++
 view/search_item.tpl                   | 2 +-
 view/theme/dispy/conversation.tpl      | 2 ++
 view/theme/facepark/conversation.tpl   | 2 ++
 view/theme/quattro/conversation.tpl    | 2 ++
 view/theme/testbubble/conversation.tpl | 2 ++
 view/wall_item.tpl                     | 2 +-
 view/wallwall_item.tpl                 | 2 +-
 8 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/view/conversation.tpl b/view/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 22314d88a..47f34685f 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index c49cdf26b..ca1b560a6 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div class="delete-checked">
 <a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index 7bb7cd2fd..a30ff187c 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -19,6 +19,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <a href="#" onclick="deleteCheckedItems();return false;">
 	<span class="icon s22 delete text">$dropping</span>
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/theme/testbubble/conversation.tpl
+++ b/view/theme/testbubble/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index a3a79598e..a6a96d879 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 1044f7ae4..37e56ee8b 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">

From 79e2ae3791ec092f5be4f5b0b635247df2535089 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 22:34:48 -0700
Subject: [PATCH 33/44] syntax on sql

---
 include/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Photo.php b/include/Photo.php
index da7c49622..aa6f5f113 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -281,7 +281,7 @@ class Photo {
 				`allow_cid` = '%s', 
 				`allow_gid` = '%s', 
 				`deny_cid` = '%s',
-				`deny_gid` = '%s', 
+				`deny_gid` = '%s' 
 				where id = %d limit 1",
 
 				intval($uid),

From e68e9ec5f49aeaec550dfe46aa26ad69c4e1e785 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 18:39:48 +1000
Subject: [PATCH 34/44] Required for github/Windows

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..4be1c9185
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Disable LF normalization for all files
+* -text
\ No newline at end of file

From 2f5e891cd174c6314f3ba5c31f9672595462a22c Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 14 Jun 2012 09:12:52 -0400
Subject: [PATCH 35/44] quattro theme: show uncollapsed comments on display
 page

---
 view/theme/quattro/conversation.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index a30ff187c..7ca3daea7 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -1,6 +1,8 @@
 {{ for $threads as $thread }}
 <div id="tread-wrapper-$thread.id" class="tread-wrapper">
 	{{ for $thread.items as $item }}
+        {{if $mode == display}}
+        {{ else }}
 		{{if $item.comment_firstcollapsed}}
 			<div class="hide-comments-outer">
 			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
@@ -8,7 +10,8 @@
 			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
 		{{endif}}
 		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
+        {{ endif }}
+        
 		{{ if $item.type == tag }}
 			{{ inc wall_item_tag.tpl }}{{ endinc }}
 		{{ else }}

From f66ae301b8ff154e009afd02258551787cae683c Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 14 Jun 2012 10:04:13 -0400
Subject: [PATCH 36/44] network: fix bug #453

---
 boot.php        |  27 ++
 mod/network.php | 679 ------------------------------------------------
 2 files changed, 27 insertions(+), 679 deletions(-)

diff --git a/boot.php b/boot.php
index bf4e59293..e535c171f 100644
--- a/boot.php
+++ b/boot.php
@@ -1577,3 +1577,30 @@ function zrl($s,$force = false) {
 		return $s . $achar . 'zrl=' . urlencode($mine);
 	return $s;
 }
+
+/**
+* returns querystring as string from a mapped array
+*
+* @param params Array 
+* @return string
+*/
+function build_querystring($params, $name=null) { 
+    $ret = ""; 
+    foreach($params as $key=>$val) {
+        if(is_array($val)) { 
+            if($name==null) {
+                $ret .= build_querystring($val, $key); 
+            } else {
+                $ret .= build_querystring($val, $name."[$key]");    
+            }
+        } else {
+            $val = urlencode($val);
+            if($name!=null) {
+                $ret.=$name."[$key]"."=$val&"; 
+            } else {
+                $ret.= "$key=$val&"; 
+            }
+        } 
+    } 
+    return $ret;    
+}
diff --git a/mod/network.php b/mod/network.php
index c31260b44..e69de29bb 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,679 +0,0 @@
-<?php
-
-
-function network_init(&$a) {
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-	
-	$is_a_date_query = false;
-
-	if($a->argc > 1) {
-		for($x = 1; $x < $a->argc; $x ++) {
-			if(is_a_date_arg($a->argv[$x])) {
-				$is_a_date_query = true;
-				break;
-			}
-		}
-	}
-	
-	// fetch last used tab and redirect if needed
-	$sel_tabs = network_query_get_sel_tab($a);
-	$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
-	if (is_array($last_sel_tabs)){
-		$tab_urls = array(
-			'/network?f=&order=comment',						//all
-			'/network?f=&order=post',		//postord
-			'/network?f=&conv=1',			//conv
-			'/network/new',					//new
-			'/network?f=&star=1',			//starred
-			'/network?f=&bmark=1',			//bookmarked
-			'/network?f=&spam=1',			//spam
-		);
-		
-		// redirect if current selected tab is 'no_active' and
-		// last selected tab is _not_ 'all_active'. 
-		// and this isn't a date query
-
-		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) {
-
-
-			$k = array_search('active', $last_sel_tabs);
-			//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
-			goaway($a->get_baseurl() . $tab_urls[$k]);
-		}
-	}
-	
-	$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
-		  
-	require_once('include/group.php');
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
-
-	if(! x($a->page,'aside'))
-		$a->page['aside'] = '';
-
-	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
-
-	if(x($_GET,'save')) {
-		$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
-			intval(local_user()),
-			dbesc($search)
-		);
-		if(! count($r)) {
-			q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
-				intval(local_user()),
-				dbesc($search)
-			);
-		}
-	}
-	if(x($_GET,'remove')) {
-		q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
-			intval(local_user()),
-			dbesc($search)
-		);
-	}
-
-
-	
-	// search terms header
-	if(x($_GET,'search')) {
-		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
-	}
-
-	$a->page['aside'] .= group_side('network','network',true,$group_id);
-	$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);	
-	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
-	$a->page['aside'] .= saved_searches($search);
-	$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
-
-}
-
-function saved_searches($search) {
-
-	$a = get_app();
-
-	$srchurl = '/network?f=' 
-		. ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '') 
-		. ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
-		. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
-		. ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
-		. ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
-		. ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
-		. ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
-		. ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
-	;
-	
-	$o = '';
-
-	$r = q("select `id`,`term` from `search` WHERE `uid` = %d",
-		intval(local_user())
-	);
-
-	$saved = array();
-
-	if(count($r)) {
-		foreach($r as $rr) {
-			$saved[] = array(
-				'id'            => $rr['id'],
-				'term'			=> $rr['term'],
-				'encodedterm' 	=> urlencode($rr['term']),
-				'delete'		=> t('Remove term'),
-				'selected'		=> ($search==$rr['term']),
-			);
-		}
-	}		
-
-	
-	$tpl = get_markup_template("saved_searches_aside.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'	 => t('Saved Searches'),
-		'$add'		 => t('add'),
-		'$searchbox' => search($search,'netsearch-box',$srchurl,true),
-		'$saved' 	 => $saved,
-	));
-	
-	return $o;
-
-}
-
-/**
- * Return selected tab from query
- * 
- * urls -> returns
- * 		'/network'					=> $no_active = 'active'
- * 		'/network?f=&order=comment'	=> $comment_active = 'active'
- * 		'/network?f=&order=post'	=> $postord_active = 'active'
- * 		'/network?f=&conv=1',		=> $conv_active = 'active'
- * 		'/network/new',				=> $new_active = 'active'
- * 		'/network?f=&star=1',		=> $starred_active = 'active'
- * 		'/network?f=&bmark=1',		=> $bookmarked_active = 'active'
- * 		'/network?f=&spam=1',		=> $spam_active = 'active'
- * 
- * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
- */
-function network_query_get_sel_tab($a) {
-	$no_active='';
-	$starred_active = '';
-	$new_active = '';
-	$bookmarked_active = '';
-	$all_active = '';
-	$search_active = '';
-	$conv_active = '';
-	$spam_active = '';
-	$postord_active = '';
-
-	if(($a->argc > 1 && $a->argv[1] === 'new') 
-		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
-			$new_active = 'active';
-	}
-	
-	if(x($_GET,'search')) {
-		$search_active = 'active';
-	}
-	
-	if(x($_GET,'star')) {
-		$starred_active = 'active';
-	}
-	
-	if(x($_GET,'bmark')) {
-		$bookmarked_active = 'active';
-	}
-
-	if(x($_GET,'conv')) {
-		$conv_active = 'active';
-	}
-
-	if(x($_GET,'spam')) {
-		$spam_active = 'active';
-	}
-
-	
-	
-	if (($new_active == '') 
-		&& ($starred_active == '') 
-		&& ($bookmarked_active == '')
-		&& ($conv_active == '')
-		&& ($search_active == '')
-		&& ($spam_active == '')) {
-			$no_active = 'active';
-	}
-
-	if ($no_active=='active' && x($_GET,'order')) {
-		switch($_GET['order']){
-		 case 'post': $postord_active = 'active'; $no_active=''; break;
-		 case 'comment' : $all_active = 'active'; $no_active=''; break;
-		}
-	}
-	
-	return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
-}
-
-
-function network_content(&$a, $update = 0) {
-
-	require_once('include/conversation.php');
-
-	if(! local_user()) {
-		$_SESSION['return_url'] = $a->query_string;
-    	return login(false);
-	}
-
-	$arr = array('query' => $a->query_string);
-
-	call_hooks('network_content_init', $arr);
-
-
-	$datequery = $datequery2 = '';
-
-	$group = 0;
-
-	$nouveau = false;
-
-	if($a->argc > 1) {
-		for($x = 1; $x < $a->argc; $x ++) {
-			if(is_a_date_arg($a->argv[$x])) {
-				if($datequery)
-					$datequery2 = escape_tags($a->argv[$x]);
-				else {
-					$datequery = escape_tags($a->argv[$x]);
-					$_GET['order'] = 'post';
-				}
-			}
-			elseif($a->argv[$x] === 'new') {
-				$nouveau = true;
-			}
-			elseif(intval($a->argv[$x])) {
-				$group = intval($a->argv[$x]);
-				$def_acl = array('allow_gid' => '<' . $group . '>');
-			}
-		}
-	}
-
-
-	$o = '';
-
-	// item filter tabs
-	// TODO: fix this logic, reduce duplication
-	//$a->page['content'] .= '<div class="tabs-wrapper">';
-	
-	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
-	// if no tabs are selected, defaults to comments
-	if ($no_active=='active') $all_active='active';
-	//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
-
-	$cmd = (($datequery) ? '' : $a->cmd);
-	$len_naked_cmd = strlen(str_replace('/new','',$cmd));		
-
-	// tabs
-	$tabs = array(
-		array(
-			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
-			'sel'=>$all_active,
-			'title'=> t('Sort by Comment Date'),
-		),
-		array(
-			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
-			'sel'=>$postord_active,
-			'title' => t('Sort by Post Date'),
-		),
-
-		array(
-			'label' => t('Personal'),
-			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
-			'sel' => $conv_active,
-			'title' => t('Posts that mention or involve you'),
-		),
-		array(
-			'label' => t('New'),
-			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
-			'sel' => $new_active,
-			'title' => t('Activity Stream - by date'),
-		),
-		array(
-			'label' => t('Starred'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
-			'sel'=>$starred_active,
-			'title' => t('Favourite Posts'),
-		),
-		array(
-			'label' => t('Shared Links'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
-			'sel'=>$bookmarked_active,
-			'title'=> t('Interesting Links'),
-		),	
-//		array(
-//			'label' => t('Spam'),
-//			'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
-//			'sel'=> $spam_active,
-//			'title' => t('Posts flagged as SPAM'),
-//		),	
-
-	);
-	
-	// save selected tab, but only if not in search or file mode
-	if(!x($_GET,'search') && !x($_GET,'file')) {
-		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
-	}
-
-	$arr = array('tabs' => $tabs);
-	call_hooks('network_tabs', $arr);
-
-	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
-
-	// --- end item filter tabs
-
-
-
-	
-
-	$contact_id = $a->cid;
-
-	require_once('include/acl_selectors.php');
-
-	$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
-	$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
-	$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
-	$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
-	$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
-	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
-	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
-	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
-	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
-	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
-	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
-
-
-
-	if(x($_GET,'search') || x($_GET,'file'))
-		$nouveau = true;
-	if($cid)
-		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
-
-	if($nets) {
-		$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
-			intval(local_user()),
-			dbesc($nets)
-		);
-
-		$str = '';
-		if(count($r))
-			foreach($r as $rr)
-				$str .= '<' . $rr['id'] . '>';
-		if(strlen($str))
-			$def_acl = array('allow_cid' => $str);
-	}
-
-	if(! $update) {
-		if($group) {
-			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
-				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
-									'Warning: This group contains %s members from an insecure network.',
-									$t), $t ) . EOL);
-				notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
-			}
-		}
-
-		nav_set_selected('network');
-
-		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
-		$x = array(
-			'is_owner' => true,
-			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default-location'],
-			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid || $nets) ? '!' : ''),
-			'visitor' => 'block',
-			'profile_uid' => local_user()
-		);
-
-		$o .= status_editor($a,$x);
-
-	}
-
-
-	// We don't have to deal with ACL's on this page. You're looking at everything
-	// that belongs to you, hence you can see all of it. We will filter by group if
-	// desired. 
-
-	
-	$sql_options  = (($star) ? " and starred = 1 " : '');
-	$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
-
-	$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
-
-	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
-
-	if($group) {
-		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($group),
-			intval($_SESSION['uid'])
-		);
-		if(! count($r)) {
-			if($update)
-				killme();
-			notice( t('No such group') . EOL );
-			goaway($a->get_baseurl(true) . '/network');
-			// NOTREACHED
-		}
-
-		$contacts = expand_groups(array($group));
-		if((is_array($contacts)) && count($contacts)) {
-			$contact_str = implode(',',$contacts);
-		}
-		else {
-				$contact_str = ' 0 ';
-				info( t('Group is empty'));
-		}
-
-		$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) ";
-		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
-	}
-	elseif($cid) {
-
-		$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d 
-				AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
-			intval($cid)
-		);
-		if(count($r)) {
-			$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) ";
-			$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
-			if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
-				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
-			}
-
-		}
-		else {
-			notice( t('Invalid contact.') . EOL);
-			goaway($a->get_baseurl(true) . '/network');
-			// NOTREACHED
-		}
-	}
-
-	if((! $group) && (! $cid) && (! $update)) {
-		$o .= get_birthdays();
-		$o .= get_events();
-	}
-
-	if(! $update) {
-		// The special div is needed for liveUpdate to kick in for this page.
-		// We only launch liveUpdate if you aren't filtering in some incompatible 
-		// way and also you aren't writing a comment (discovered in javascript).
-
-		$o .= '<div id="live-network"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = " . $_SESSION['uid'] 
-			. "; var netargs = '" . substr($a->cmd,8)
-			. '?f='
-			. ((x($_GET,'cid'))    ? '&cid='    . $_GET['cid']    : '')
-			. ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
-			. ((x($_GET,'star'))   ? '&star='   . $_GET['star']   : '') 
-			. ((x($_GET,'order'))  ? '&order='  . $_GET['order']  : '') 
-			. ((x($_GET,'bmark'))  ? '&bmark='  . $_GET['bmark']  : '') 
-			. ((x($_GET,'liked'))  ? '&liked='  . $_GET['liked']  : '') 
-			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
-			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
-			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
-			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
-			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
-			. ((x($_GET,'file'))   ? '&file='   . $_GET['file']   : '') 
-
-			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
-	}
-
-	$sql_extra3 = '';
-
-	if($datequery) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-	}
-	if($datequery2) {
-		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-	}
-
-	$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
-	$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
-
-	if(x($_GET,'search')) {
-		$search = escape_tags($_GET['search']);
-		if (get_config('system','use_fulltext_engine')) {
-			if(strpos($search,'#') === 0)
-				$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
-					dbesc(protect_sprintf($search))
-				);
-			else
-				$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
-					dbesc(protect_sprintf($search)),
-					dbesc(protect_sprintf($search))
-				);
-		} else {
-			$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
-					dbesc(protect_sprintf('%' . $search . '%')),
-					dbesc(protect_sprintf('%]' . $search . '[%'))
-			);
-		}
-	}
-	if(strlen($file)) {
-		$sql_extra .= file_tag_file_query('item',unxmlify($file));
-	}
-
-	if($conv) {
-		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
-		$myurl = substr($myurl,strpos($myurl,'://')+3);
-		$myurl = str_replace('www.','',$myurl);
-		$diasp_url = str_replace('/profile/','/u/',$myurl);
-		if (get_config('system','use_fulltext_engine'))
-			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
-				dbesc(protect_sprintf($myurl)),
-				dbesc(protect_sprintf($myurl)),
-				dbesc(protect_sprintf($diasp_url))
-			);
-		else
-			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
-				dbesc(protect_sprintf('%' . $myurl)),
-				dbesc(protect_sprintf('%' . $myurl . ']%')),
-				dbesc(protect_sprintf('%' . $diasp_url . ']%'))
-			);
-
-	}
-
-	if($update) {
-
-		// only setup pagination on initial page view
-		$pager_sql = '';
-
-	}
-	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(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 " : '');
-
-	if($nouveau) {
-		// "New Item View" - show all items unthreaded in reverse created date order
-
-		$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, `contact`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 
-			AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-			$simple_update
-			AND `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			$sql_extra $sql_nets
-			ORDER BY `item`.`received` DESC $pager_sql ",
-			intval($_SESSION['uid'])
-		);
-
-	}
-	else {
-
-		// Normal conversation view
-
-
-		if($order === 'post')
-				$ordering = "`created`";
-		else
-				$ordering = "`commented`";
-
-		// Fetch a page full of parent items for this page
-
-		if($update) {
-			$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
-				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 `item`.`unseen` = 1
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				$sql_extra3 $sql_extra $sql_nets ",
-				intval(local_user())
-			);
-		}
-		else {
-			$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
-				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`.`parent` = `item`.`id`
-				$sql_extra3 $sql_extra $sql_nets
-				ORDER BY `item`.$ordering DESC $pager_sql ",
-				intval(local_user())
-			);
-		}
-
-		// Then fetch all the children of the parents that are on this page
-
-		$parents_arr = array();
-		$parents_str = '';
-
-		if(count($r)) {
-			foreach($r as $rr)
-				if(! in_array($rr['item_id'],$parents_arr))
-					$parents_arr[] = $rr['item_id'];
-			$parents_str = implode(', ', $parents_arr);
-
-			$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
-				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`,
-				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-				FROM `item`, `contact`
-				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-				AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id`
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`parent` IN ( %s )
-				$sql_extra ",
-				intval(local_user()),
-				dbesc($parents_str)
-			);
-
-			$items = conv_sort($items,$ordering);
-
-		} else {
-			$items = array();
-		}
-	}
-
-
-	// We aren't going to try and figure out at the item, group, and page
-	// level which items you've seen and which you haven't. If you're looking
-	// at the top level network page just mark everything seen. 
-	
-	if((! $group) && (! $cid) && (! $star)) {
-		$r = q("UPDATE `item` SET `unseen` = 0 
-			WHERE `unseen` = 1 AND `uid` = %d",
-			intval(local_user())
-		);
-	}
-
-	// Set this so that the conversation function can find out contact info for our wall-wall items
-	$a->page_contact = $a->contact;
-
-	$mode = (($nouveau) ? 'network-new' : 'network');
-
-	$o .= conversation($a,$items,$mode,$update);
-
-	if(! $update) {
-		$o .= paginate($a);
-	}
-
-	return $o;
-}

From be090cc8513504edcfaf368915e45308711f7e7c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 16:56:46 -0700
Subject: [PATCH 37/44] better handling of dead contacts

---
 boot.php              |   2 +-
 include/Contact.php   |   4 ++
 include/onepoll.php   |   5 +-
 mod/contacts.php      |   2 +
 util/messages.po      | 140 +++++++++++++++++++++++-------------------
 view/contact_edit.tpl |   3 +
 6 files changed, 91 insertions(+), 65 deletions(-)

diff --git a/boot.php b/boot.php
index bf4e59293..631a3f7b8 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.1373' );
+define ( 'FRIENDICA_VERSION',      '3.0.1374' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/include/Contact.php b/include/Contact.php
index 3b255a072..14e1a52cd 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -139,6 +139,10 @@ function terminate_friendship($user,$self,$contact) {
  
 if(! function_exists('mark_for_death')) {
 function mark_for_death($contact) {
+
+	if($contact['archive'])
+		return;
+
 	if($contact['term-date'] == '0000-00-00 00:00:00') {
 		q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
 				dbesc(datetime_convert()),
diff --git a/include/onepoll.php b/include/onepoll.php
index 02763cf4b..447881ab7 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -139,15 +139,18 @@ function onepoll_run($argv, $argc){
 			. '&perm=' . $perm ;
 
 		$handshake_xml = fetch_url($url);
+		$html_code = $a->get_curl_code();
 
 		logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
-		if(! $handshake_xml) {
+		if((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) {
 			logger("poller: $url appears to be dead - marking for death ");
+
 			// dead connection - might be a transient event, or this might
 			// mean the software was uninstalled or the domain expired. 
 			// Will keep trying for one month.
+
 			mark_for_death($contact);
 
 			// set the last-update so we don't keep polling
diff --git a/mod/contacts.php b/mod/contacts.php
index a3e3f409b..f84a988c8 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -335,6 +335,7 @@ function contacts_content(&$a) {
 		$tab_tpl = get_markup_template('common_tabs.tpl');
 		$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
 
+		$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Contact Editor'),
@@ -359,6 +360,7 @@ function contacts_content(&$a) {
 			'$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
 			'$poll_enabled' => $poll_enabled,
 			'$lastupdtext' => t('Last update:'),
+			'$lost_contact' => $lost_contact,
 			'$updpub' => t('Update public posts'),
 			'$last_update' => $last_update,
 			'$udnow' => t('Update now'),
diff --git a/util/messages.po b/util/messages.po
index 8e86ccef0..19aab0ac0 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1373\n"
+"Project-Id-Version: 3.0.1374\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-13 16:24-0700\n"
+"POT-Creation-Date: 2012-06-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"
@@ -54,7 +54,7 @@ msgstr ""
 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:385 ../../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:503
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507
 #: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
 #: ../../index.php:299
 msgid "Permission denied."
@@ -133,7 +133,7 @@ msgstr ""
 #: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
 #: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991
 #: ../../mod/admin.php:1078 ../../mod/profiles.php:554
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
+#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
@@ -141,7 +141,8 @@ msgstr ""
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57
+#: ../../addon/impressum/impressum.php:82
+#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
@@ -1715,8 +1716,8 @@ msgstr ""
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:688
-#: ../../addon/facebook/facebook.php:1178
+#: ../../addon/facebook/facebook.php:692
+#: ../../addon/facebook/facebook.php:1182
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
 #: ../../boot.php:703
@@ -1864,7 +1865,7 @@ msgstr ""
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:488
+#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:492
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
@@ -2409,7 +2410,7 @@ msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:756
+#: ../../addon/facebook/facebook.php:760
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:185
 #: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
 msgid "Save"
@@ -2768,7 +2769,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1572
+#: ../../addon/facebook/facebook.php:1576
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
@@ -2778,7 +2779,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576
+#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1580
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687
 #: ../../include/conversation.php:65
@@ -4254,83 +4255,83 @@ msgstr ""
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:509
+#: ../../addon/facebook/facebook.php:513
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:514
+#: ../../addon/facebook/facebook.php:518
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:541
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:548
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:550
+#: ../../addon/facebook/facebook.php:554
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:557
+#: ../../addon/facebook/facebook.php:561
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:562
+#: ../../addon/facebook/facebook.php:566
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:569
+#: ../../addon/facebook/facebook.php:573
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:575
+#: ../../addon/facebook/facebook.php:579
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:579
+#: ../../addon/facebook/facebook.php:583
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:586
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:584
+#: ../../addon/facebook/facebook.php:588
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:585
+#: ../../addon/facebook/facebook.php:589
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:586
+#: ../../addon/facebook/facebook.php:590
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:590
+#: ../../addon/facebook/facebook.php:594
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:595
+#: ../../addon/facebook/facebook.php:599
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:597
+#: ../../addon/facebook/facebook.php:601
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked, "
 "your Facebook profile wall will be merged with your profile wall on this "
@@ -4338,120 +4339,120 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:602
+#: ../../addon/facebook/facebook.php:606
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:686
+#: ../../addon/facebook/facebook.php:690
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:714
+#: ../../addon/facebook/facebook.php:718
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:715
+#: ../../addon/facebook/facebook.php:719
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:730
+#: ../../addon/facebook/facebook.php:734
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:740
+#: ../../addon/facebook/facebook.php:744
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:745
+#: ../../addon/facebook/facebook.php:749
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:747
+#: ../../addon/facebook/facebook.php:751
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:749
+#: ../../addon/facebook/facebook.php:753
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:756
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:753
+#: ../../addon/facebook/facebook.php:757
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754
+#: ../../addon/facebook/facebook.php:758
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:755
+#: ../../addon/facebook/facebook.php:759
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:759
+#: ../../addon/facebook/facebook.php:763
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:767
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:764
+#: ../../addon/facebook/facebook.php:768
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:770
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:770
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:360
+#: ../../addon/facebook/facebook.php:789 ../../addon/dav/layout.fnk.php:360
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:809
+#: ../../addon/facebook/facebook.php:813
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:907
+#: ../../addon/facebook/facebook.php:911
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1127
+#: ../../addon/facebook/facebook.php:1131
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1160
+#: ../../addon/facebook/facebook.php:1164
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1200
+#: ../../addon/facebook/facebook.php:1204
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1201
+#: ../../addon/facebook/facebook.php:1205
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1202
+#: ../../addon/facebook/facebook.php:1206
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -5165,6 +5166,18 @@ msgstr ""
 msgid "Report Bug"
 msgstr ""
 
+#: ../../addon/notimeline/notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr ""
+
+#: ../../addon/notimeline/notimeline.php:56
+msgid "No Timeline Settings"
+msgstr ""
+
+#: ../../addon/notimeline/notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
 #: ../../addon/blockem/blockem.php:51
 msgid "\"Blockem\" Settings"
 msgstr ""
@@ -6980,7 +6993,8 @@ msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
 #: ../../include/enotify.php:98
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %1$s"
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
 #: ../../include/enotify.php:99
@@ -7001,7 +7015,7 @@ msgstr ""
 
 #: ../../include/enotify.php:111
 #, php-format
-msgid "%1$s posted to your profile wall at %1$s"
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
 #: ../../include/enotify.php:113
@@ -7153,7 +7167,7 @@ msgstr ""
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3456
+#: ../../include/items.php:3452
 msgid "Archives"
 msgstr ""
 
@@ -7256,29 +7270,29 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:203 ../../include/conversation.php:842
+#: ../../include/Contact.php:214 ../../include/conversation.php:842
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:204 ../../include/conversation.php:843
+#: ../../include/Contact.php:215 ../../include/conversation.php:843
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:205 ../../include/conversation.php:844
+#: ../../include/Contact.php:216 ../../include/conversation.php:844
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:206 ../../include/Contact.php:219
+#: ../../include/Contact.php:217 ../../include/Contact.php:230
 #: ../../include/conversation.php:845
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:207 ../../include/Contact.php:219
+#: ../../include/Contact.php:218 ../../include/Contact.php:230
 #: ../../include/conversation.php:846
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:208 ../../include/Contact.php:219
+#: ../../include/Contact.php:219 ../../include/Contact.php:230
 #: ../../include/conversation.php:847
 msgid "Send PM"
 msgstr ""
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index eeedda3a4..c68ca7f1d 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -17,6 +17,9 @@
 			<ul>
 				<li><div id="contact-edit-rel">$relation_text</div></li>
 				<li><div id="contact-edit-nettype">$nettype</div></li>
+				{{ if $lost_contact }}
+					<li><div id="lost-contact-message">$lost_contact</div></li>
+				{{ endif }}
 				{{ if $insecure }}
 					<li><div id="insecure-message">$insecure</div></li>
 				{{ endif }}

From 267681844d81364afce37c86f92b803c3d8e4c48 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 17:27:07 -0700
Subject: [PATCH 38/44] poll even if contact hasn't responded recently, so we
 can update the termination status

---
 include/conversation.php | 2 +-
 include/onepoll.php      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 68693bb9f..1d5a92284 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -173,8 +173,8 @@ function localize_item(&$item){
 				$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
 		}
 	}
+	// add zrl's to public images
 	if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
-logger('matched');
 		foreach($matches as $mtch) {
 				$item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5]  . '[/img][/url]',$item['body']);
 		}
diff --git a/include/onepoll.php b/include/onepoll.php
index 447881ab7..804a166c8 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -54,9 +54,7 @@ function onepoll_run($argv, $argc){
 		logger('onepoll: no contact');
 		return;
 	}
-
-	if(was_recently_delayed($contact_id))
-		return;
+	
 
 	$d = datetime_convert();
 
@@ -87,7 +85,7 @@ function onepoll_run($argv, $argc){
 	}
 
 	$contact = $contacts[0];
-
+	logger('onepoll: ' . $contact['id'] . ' ' . $contact['name'], LOGGER_DEBUG);
 
 	$xml = false;
 

From 2efee75557bafc32b20be1cceac047fdeea3bb71 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 17:38:39 -0700
Subject: [PATCH 39/44] also mark for death if there isn't any xml to be found

---
 include/onepoll.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/onepoll.php b/include/onepoll.php
index 804a166c8..22f29deb2 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -162,6 +162,9 @@ function onepoll_run($argv, $argc){
 
 		if(! strstr($handshake_xml,'<?xml')) {
 			logger('poller: response from ' . $url . ' did not contain XML.');
+
+			mark_for_death($contact);
+
 			$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
 				dbesc(datetime_convert()),
 				intval($contact['id'])

From 40e6d87d082a9966e71925e7339a06cb4cf16017 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 17:41:24 -0700
Subject: [PATCH 40/44] highlight the lost contact message

---
 view/theme/duepuntozero/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 3264caf52..be755d411 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1608,7 +1608,7 @@ input#dfrn-url {
 .contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
-#block-message, #ignore-message, #archive-message {
+#block-message, #ignore-message, #archive-message, #lost-contact-message {
 	color: #FF0000;
 }
 

From ba0ea1e6516e1e067dd0da0855dc197ca95f9a61 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 17:46:58 -0700
Subject: [PATCH 41/44] mod/network.php was lost

---
 mod/network.php | 679 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 679 insertions(+)

diff --git a/mod/network.php b/mod/network.php
index e69de29bb..c31260b44 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -0,0 +1,679 @@
+<?php
+
+
+function network_init(&$a) {
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+	
+	$is_a_date_query = false;
+
+	if($a->argc > 1) {
+		for($x = 1; $x < $a->argc; $x ++) {
+			if(is_a_date_arg($a->argv[$x])) {
+				$is_a_date_query = true;
+				break;
+			}
+		}
+	}
+	
+	// fetch last used tab and redirect if needed
+	$sel_tabs = network_query_get_sel_tab($a);
+	$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
+	if (is_array($last_sel_tabs)){
+		$tab_urls = array(
+			'/network?f=&order=comment',						//all
+			'/network?f=&order=post',		//postord
+			'/network?f=&conv=1',			//conv
+			'/network/new',					//new
+			'/network?f=&star=1',			//starred
+			'/network?f=&bmark=1',			//bookmarked
+			'/network?f=&spam=1',			//spam
+		);
+		
+		// redirect if current selected tab is 'no_active' and
+		// last selected tab is _not_ 'all_active'. 
+		// and this isn't a date query
+
+		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) {
+
+
+			$k = array_search('active', $last_sel_tabs);
+			//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
+			goaway($a->get_baseurl() . $tab_urls[$k]);
+		}
+	}
+	
+	$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
+		  
+	require_once('include/group.php');
+	require_once('include/contact_widgets.php');
+	require_once('include/items.php');
+
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
+
+	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
+
+	if(x($_GET,'save')) {
+		$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
+			intval(local_user()),
+			dbesc($search)
+		);
+		if(! count($r)) {
+			q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
+				intval(local_user()),
+				dbesc($search)
+			);
+		}
+	}
+	if(x($_GET,'remove')) {
+		q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
+			intval(local_user()),
+			dbesc($search)
+		);
+	}
+
+
+	
+	// search terms header
+	if(x($_GET,'search')) {
+		$a->page['content'] .= '<h2>' . t('Search Results For:') . ' '  . $search . '</h2>';
+	}
+
+	$a->page['aside'] .= group_side('network','network',true,$group_id);
+	$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);	
+	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
+	$a->page['aside'] .= saved_searches($search);
+	$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
+
+}
+
+function saved_searches($search) {
+
+	$a = get_app();
+
+	$srchurl = '/network?f=' 
+		. ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '') 
+		. ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
+		. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
+		. ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
+		. ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
+		. ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
+		. ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
+		. ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
+	;
+	
+	$o = '';
+
+	$r = q("select `id`,`term` from `search` WHERE `uid` = %d",
+		intval(local_user())
+	);
+
+	$saved = array();
+
+	if(count($r)) {
+		foreach($r as $rr) {
+			$saved[] = array(
+				'id'            => $rr['id'],
+				'term'			=> $rr['term'],
+				'encodedterm' 	=> urlencode($rr['term']),
+				'delete'		=> t('Remove term'),
+				'selected'		=> ($search==$rr['term']),
+			);
+		}
+	}		
+
+	
+	$tpl = get_markup_template("saved_searches_aside.tpl");
+	$o = replace_macros($tpl, array(
+		'$title'	 => t('Saved Searches'),
+		'$add'		 => t('add'),
+		'$searchbox' => search($search,'netsearch-box',$srchurl,true),
+		'$saved' 	 => $saved,
+	));
+	
+	return $o;
+
+}
+
+/**
+ * Return selected tab from query
+ * 
+ * urls -> returns
+ * 		'/network'					=> $no_active = 'active'
+ * 		'/network?f=&order=comment'	=> $comment_active = 'active'
+ * 		'/network?f=&order=post'	=> $postord_active = 'active'
+ * 		'/network?f=&conv=1',		=> $conv_active = 'active'
+ * 		'/network/new',				=> $new_active = 'active'
+ * 		'/network?f=&star=1',		=> $starred_active = 'active'
+ * 		'/network?f=&bmark=1',		=> $bookmarked_active = 'active'
+ * 		'/network?f=&spam=1',		=> $spam_active = 'active'
+ * 
+ * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
+ */
+function network_query_get_sel_tab($a) {
+	$no_active='';
+	$starred_active = '';
+	$new_active = '';
+	$bookmarked_active = '';
+	$all_active = '';
+	$search_active = '';
+	$conv_active = '';
+	$spam_active = '';
+	$postord_active = '';
+
+	if(($a->argc > 1 && $a->argv[1] === 'new') 
+		|| ($a->argc > 2 && $a->argv[2] === 'new')) {
+			$new_active = 'active';
+	}
+	
+	if(x($_GET,'search')) {
+		$search_active = 'active';
+	}
+	
+	if(x($_GET,'star')) {
+		$starred_active = 'active';
+	}
+	
+	if(x($_GET,'bmark')) {
+		$bookmarked_active = 'active';
+	}
+
+	if(x($_GET,'conv')) {
+		$conv_active = 'active';
+	}
+
+	if(x($_GET,'spam')) {
+		$spam_active = 'active';
+	}
+
+	
+	
+	if (($new_active == '') 
+		&& ($starred_active == '') 
+		&& ($bookmarked_active == '')
+		&& ($conv_active == '')
+		&& ($search_active == '')
+		&& ($spam_active == '')) {
+			$no_active = 'active';
+	}
+
+	if ($no_active=='active' && x($_GET,'order')) {
+		switch($_GET['order']){
+		 case 'post': $postord_active = 'active'; $no_active=''; break;
+		 case 'comment' : $all_active = 'active'; $no_active=''; break;
+		}
+	}
+	
+	return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
+}
+
+
+function network_content(&$a, $update = 0) {
+
+	require_once('include/conversation.php');
+
+	if(! local_user()) {
+		$_SESSION['return_url'] = $a->query_string;
+    	return login(false);
+	}
+
+	$arr = array('query' => $a->query_string);
+
+	call_hooks('network_content_init', $arr);
+
+
+	$datequery = $datequery2 = '';
+
+	$group = 0;
+
+	$nouveau = false;
+
+	if($a->argc > 1) {
+		for($x = 1; $x < $a->argc; $x ++) {
+			if(is_a_date_arg($a->argv[$x])) {
+				if($datequery)
+					$datequery2 = escape_tags($a->argv[$x]);
+				else {
+					$datequery = escape_tags($a->argv[$x]);
+					$_GET['order'] = 'post';
+				}
+			}
+			elseif($a->argv[$x] === 'new') {
+				$nouveau = true;
+			}
+			elseif(intval($a->argv[$x])) {
+				$group = intval($a->argv[$x]);
+				$def_acl = array('allow_gid' => '<' . $group . '>');
+			}
+		}
+	}
+
+
+	$o = '';
+
+	// item filter tabs
+	// TODO: fix this logic, reduce duplication
+	//$a->page['content'] .= '<div class="tabs-wrapper">';
+	
+	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
+	// if no tabs are selected, defaults to comments
+	if ($no_active=='active') $all_active='active';
+	//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
+
+	$cmd = (($datequery) ? '' : $a->cmd);
+	$len_naked_cmd = strlen(str_replace('/new','',$cmd));		
+
+	// tabs
+	$tabs = array(
+		array(
+			'label' => t('Commented Order'),
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'sel'=>$all_active,
+			'title'=> t('Sort by Comment Date'),
+		),
+		array(
+			'label' => t('Posted Order'),
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'sel'=>$postord_active,
+			'title' => t('Sort by Post Date'),
+		),
+
+		array(
+			'label' => t('Personal'),
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
+			'sel' => $conv_active,
+			'title' => t('Posts that mention or involve you'),
+		),
+		array(
+			'label' => t('New'),
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
+			'sel' => $new_active,
+			'title' => t('Activity Stream - by date'),
+		),
+		array(
+			'label' => t('Starred'),
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
+			'sel'=>$starred_active,
+			'title' => t('Favourite Posts'),
+		),
+		array(
+			'label' => t('Shared Links'),
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
+			'sel'=>$bookmarked_active,
+			'title'=> t('Interesting Links'),
+		),	
+//		array(
+//			'label' => t('Spam'),
+//			'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
+//			'sel'=> $spam_active,
+//			'title' => t('Posts flagged as SPAM'),
+//		),	
+
+	);
+	
+	// save selected tab, but only if not in search or file mode
+	if(!x($_GET,'search') && !x($_GET,'file')) {
+		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
+	}
+
+	$arr = array('tabs' => $tabs);
+	call_hooks('network_tabs', $arr);
+
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
+
+	// --- end item filter tabs
+
+
+
+	
+
+	$contact_id = $a->cid;
+
+	require_once('include/acl_selectors.php');
+
+	$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
+	$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
+	$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
+	$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
+	$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
+	$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
+	$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
+	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
+	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
+	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
+
+
+
+	if(x($_GET,'search') || x($_GET,'file'))
+		$nouveau = true;
+	if($cid)
+		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
+
+	if($nets) {
+		$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+			intval(local_user()),
+			dbesc($nets)
+		);
+
+		$str = '';
+		if(count($r))
+			foreach($r as $rr)
+				$str .= '<' . $rr['id'] . '>';
+		if(strlen($str))
+			$def_acl = array('allow_cid' => $str);
+	}
+
+	if(! $update) {
+		if($group) {
+			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
+				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
+									'Warning: This group contains %s members from an insecure network.',
+									$t), $t ) . EOL);
+				notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+			}
+		}
+
+		nav_set_selected('network');
+
+		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+		$x = array(
+			'is_owner' => true,
+			'allow_location' => $a->user['allow_location'],
+			'default_location' => $a->user['default-location'],
+			'nickname' => $a->user['nickname'],
+			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+			'bang' => (($group || $cid || $nets) ? '!' : ''),
+			'visitor' => 'block',
+			'profile_uid' => local_user()
+		);
+
+		$o .= status_editor($a,$x);
+
+	}
+
+
+	// We don't have to deal with ACL's on this page. You're looking at everything
+	// that belongs to you, hence you can see all of it. We will filter by group if
+	// desired. 
+
+	
+	$sql_options  = (($star) ? " and starred = 1 " : '');
+	$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
+
+	$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
+
+	$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
+
+	if($group) {
+		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($group),
+			intval($_SESSION['uid'])
+		);
+		if(! count($r)) {
+			if($update)
+				killme();
+			notice( t('No such group') . EOL );
+			goaway($a->get_baseurl(true) . '/network');
+			// NOTREACHED
+		}
+
+		$contacts = expand_groups(array($group));
+		if((is_array($contacts)) && count($contacts)) {
+			$contact_str = implode(',',$contacts);
+		}
+		else {
+				$contact_str = ' 0 ';
+				info( t('Group is empty'));
+		}
+
+		$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) ";
+		$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
+	}
+	elseif($cid) {
+
+		$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d 
+				AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+			intval($cid)
+		);
+		if(count($r)) {
+			$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) ";
+			$o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
+			if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
+				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
+			}
+
+		}
+		else {
+			notice( t('Invalid contact.') . EOL);
+			goaway($a->get_baseurl(true) . '/network');
+			// NOTREACHED
+		}
+	}
+
+	if((! $group) && (! $cid) && (! $update)) {
+		$o .= get_birthdays();
+		$o .= get_events();
+	}
+
+	if(! $update) {
+		// The special div is needed for liveUpdate to kick in for this page.
+		// We only launch liveUpdate if you aren't filtering in some incompatible 
+		// way and also you aren't writing a comment (discovered in javascript).
+
+		$o .= '<div id="live-network"></div>' . "\r\n";
+		$o .= "<script> var profile_uid = " . $_SESSION['uid'] 
+			. "; var netargs = '" . substr($a->cmd,8)
+			. '?f='
+			. ((x($_GET,'cid'))    ? '&cid='    . $_GET['cid']    : '')
+			. ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
+			. ((x($_GET,'star'))   ? '&star='   . $_GET['star']   : '') 
+			. ((x($_GET,'order'))  ? '&order='  . $_GET['order']  : '') 
+			. ((x($_GET,'bmark'))  ? '&bmark='  . $_GET['bmark']  : '') 
+			. ((x($_GET,'liked'))  ? '&liked='  . $_GET['liked']  : '') 
+			. ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
+			. ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
+			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
+			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
+			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
+			. ((x($_GET,'file'))   ? '&file='   . $_GET['file']   : '') 
+
+			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+	}
+
+	$sql_extra3 = '';
+
+	if($datequery) {
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+	}
+	if($datequery2) {
+		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+	}
+
+	$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
+	$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
+
+	if(x($_GET,'search')) {
+		$search = escape_tags($_GET['search']);
+		if (get_config('system','use_fulltext_engine')) {
+			if(strpos($search,'#') === 0)
+				$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+					dbesc(protect_sprintf($search))
+				);
+			else
+				$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+					dbesc(protect_sprintf($search)),
+					dbesc(protect_sprintf($search))
+				);
+		} else {
+			$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
+					dbesc(protect_sprintf('%' . $search . '%')),
+					dbesc(protect_sprintf('%]' . $search . '[%'))
+			);
+		}
+	}
+	if(strlen($file)) {
+		$sql_extra .= file_tag_file_query('item',unxmlify($file));
+	}
+
+	if($conv) {
+		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+		$myurl = substr($myurl,strpos($myurl,'://')+3);
+		$myurl = str_replace('www.','',$myurl);
+		$diasp_url = str_replace('/profile/','/u/',$myurl);
+		if (get_config('system','use_fulltext_engine'))
+			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+				dbesc(protect_sprintf($myurl)),
+				dbesc(protect_sprintf($myurl)),
+				dbesc(protect_sprintf($diasp_url))
+			);
+		else
+			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
+				dbesc(protect_sprintf('%' . $myurl)),
+				dbesc(protect_sprintf('%' . $myurl . ']%')),
+				dbesc(protect_sprintf('%' . $diasp_url . ']%'))
+			);
+
+	}
+
+	if($update) {
+
+		// only setup pagination on initial page view
+		$pager_sql = '';
+
+	}
+	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(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 " : '');
+
+	if($nouveau) {
+		// "New Item View" - show all items unthreaded in reverse created date order
+
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 
+			AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+			$simple_update
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra $sql_nets
+			ORDER BY `item`.`received` DESC $pager_sql ",
+			intval($_SESSION['uid'])
+		);
+
+	}
+	else {
+
+		// Normal conversation view
+
+
+		if($order === 'post')
+				$ordering = "`created`";
+		else
+				$ordering = "`commented`";
+
+		// Fetch a page full of parent items for this page
+
+		if($update) {
+			$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
+				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 `item`.`unseen` = 1
+				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				$sql_extra3 $sql_extra $sql_nets ",
+				intval(local_user())
+			);
+		}
+		else {
+			$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
+				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`.`parent` = `item`.`id`
+				$sql_extra3 $sql_extra $sql_nets
+				ORDER BY `item`.$ordering DESC $pager_sql ",
+				intval(local_user())
+			);
+		}
+
+		// Then fetch all the children of the parents that are on this page
+
+		$parents_arr = array();
+		$parents_str = '';
+
+		if(count($r)) {
+			foreach($r as $rr)
+				if(! in_array($rr['item_id'],$parents_arr))
+					$parents_arr[] = $rr['item_id'];
+			$parents_str = implode(', ', $parents_arr);
+
+			$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`,
+				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+				FROM `item`, `contact`
+				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+				AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id`
+				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				AND `item`.`parent` IN ( %s )
+				$sql_extra ",
+				intval(local_user()),
+				dbesc($parents_str)
+			);
+
+			$items = conv_sort($items,$ordering);
+
+		} else {
+			$items = array();
+		}
+	}
+
+
+	// We aren't going to try and figure out at the item, group, and page
+	// level which items you've seen and which you haven't. If you're looking
+	// at the top level network page just mark everything seen. 
+	
+	if((! $group) && (! $cid) && (! $star)) {
+		$r = q("UPDATE `item` SET `unseen` = 0 
+			WHERE `unseen` = 1 AND `uid` = %d",
+			intval(local_user())
+		);
+	}
+
+	// Set this so that the conversation function can find out contact info for our wall-wall items
+	$a->page_contact = $a->contact;
+
+	$mode = (($nouveau) ? 'network-new' : 'network');
+
+	$o .= conversation($a,$items,$mode,$update);
+
+	if(! $update) {
+		$o .= paginate($a);
+	}
+
+	return $o;
+}

From ff45e11284b3d6c4b878a023038e0be0dae833b1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Jun 2012 17:55:30 -0700
Subject: [PATCH 42/44] redundant log entry

---
 include/onepoll.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/onepoll.php b/include/onepoll.php
index 22f29deb2..700498efc 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -85,7 +85,6 @@ function onepoll_run($argv, $argc){
 	}
 
 	$contact = $contacts[0];
-	logger('onepoll: ' . $contact['id'] . ' ' . $contact['name'], LOGGER_DEBUG);
 
 	$xml = false;
 

From 6416d09c719e10a6457e6545024771a6037e1d61 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 15 Jun 2012 03:18:42 -0400
Subject: [PATCH 43/44] the missing mod/network.php

---
 mod/network.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/mod/network.php b/mod/network.php
index c31260b44..5f009dacd 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -17,13 +17,18 @@ function network_init(&$a) {
 			}
 		}
 	}
-	
+    
+    // convert query string to array and remove first element (wich is friendica args)
+    $query_array = array();
+    parse_str($a->query_string, $query_array);
+    array_shift($query_array);
+    
 	// fetch last used tab and redirect if needed
 	$sel_tabs = network_query_get_sel_tab($a);
 	$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
 	if (is_array($last_sel_tabs)){
 		$tab_urls = array(
-			'/network?f=&order=comment',						//all
+			'/network?f=&order=comment',//all
 			'/network?f=&order=post',		//postord
 			'/network?f=&conv=1',			//conv
 			'/network/new',					//new
@@ -37,11 +42,21 @@ function network_init(&$a) {
 		// and this isn't a date query
 
 		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) {
-
-
 			$k = array_search('active', $last_sel_tabs);
-			//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
-			goaway($a->get_baseurl() . $tab_urls[$k]);
+          
+            // merge tab querystring with request querystring
+            $dest_qa = array();
+            list($dest_url,$dest_qs) = explode("?", $tab_urls[$k]);
+            parse_str( $dest_qs, $dest_qa);
+            $dest_qa = array_merge($query_array, $dest_qa);
+            $dest_qs = build_querystring($dest_qa);
+            
+            // groups filter is in form of "network/nnn". Add it to $dest_url, if it's possible
+            if ($a->argc==2 && is_numeric($a->argv[1]) && strpos($dest_url, "/",1)===false){
+                $dest_url .= "/".$a->argv[1];
+            }
+
+			goaway($a->get_baseurl() . $dest_url."?".$dest_qs);
 		}
 	}
 	

From 4faf0e609fe03095069c7a4bcdfc3496e4a28627 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 16 Jun 2012 03:35:45 -0700
Subject: [PATCH 44/44] rev update

---
 boot.php            |   2 +-
 include/onepoll.php |  10 ---
 util/messages.po    | 162 +++++++++++++++++++++++---------------------
 3 files changed, 84 insertions(+), 90 deletions(-)

diff --git a/boot.php b/boot.php
index 60ab069cd..01dcb6a1d 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.1374' );
+define ( 'FRIENDICA_VERSION',      '3.0.1375' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 
diff --git a/include/onepoll.php b/include/onepoll.php
index 700498efc..d68f26883 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -36,11 +36,6 @@ function onepoll_run($argv, $argc){
 
 	logger('onepoll: start');
 	
-	$abandon_days = intval(get_config('system','account_abandon_days'));
-	if($abandon_days < 1)
-		$abandon_days = 0;
-
-
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;
@@ -62,11 +57,6 @@ function onepoll_run($argv, $argc){
 	// and which have a polling address and ignore Diaspora since 
 	// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
 
-	$abandon_sql = (($abandon_days) 
-		? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) 
-		: '' 
-	);
-
 	$contacts = q("SELECT `contact`.* FROM `contact` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
 		AND NOT `network` IN ( '%s', '%s' )
diff --git a/util/messages.po b/util/messages.po
index 19aab0ac0..5a1142fbf 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1374\n"
+"Project-Id-Version: 3.0.1375\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-14 10:00-0700\n"
+"POT-Creation-Date: 2012-06-15 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"
@@ -127,7 +127,7 @@ msgstr ""
 #: ../../mod/photos.php:1266 ../../mod/photos.php:1306
 #: ../../mod/photos.php:1346 ../../mod/photos.php:1377
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:342
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
 #: ../../mod/settings.php:555 ../../mod/settings.php:701
 #: ../../mod/settings.php:762 ../../mod/settings.php:969
 #: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
@@ -1225,7 +1225,7 @@ msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
 #: ../../mod/notifications.php:206 ../../mod/contacts.php:316
-#: ../../mod/contacts.php:368
+#: ../../mod/contacts.php:370
 msgid "Ignore"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:285
+#: ../../mod/notifications.php:85 ../../mod/network.php:300
 msgid "Personal"
 msgstr ""
 
@@ -1277,7 +1277,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:376
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1490,12 +1490,12 @@ msgstr[1] ""
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
 #: ../../mod/admin.php:665
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
 #: ../../mod/admin.php:664
 msgid "Block"
 msgstr ""
@@ -1504,7 +1504,7 @@ msgstr ""
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:316 ../../mod/contacts.php:368
+#: ../../mod/contacts.php:316 ../../mod/contacts.php:370
 msgid "Unignore"
 msgstr ""
 
@@ -1532,170 +1532,174 @@ msgstr ""
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:340
+#: ../../mod/contacts.php:338
+msgid "Communications lost with this contact!"
+msgstr ""
+
+#: ../../mod/contacts.php:341
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:344
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:344
+#: ../../mod/contacts.php:345
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:345
+#: ../../mod/contacts.php:346
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:347
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:351 ../../mod/contacts.php:542
+#: ../../mod/contacts.php:352 ../../mod/contacts.php:544
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:353
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:354
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:355
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:356
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:357
+#: ../../mod/contacts.php:358
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:362
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:364
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:364 ../../mod/admin.php:1136
+#: ../../mod/contacts.php:366 ../../mod/admin.php:1136
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:371
+#: ../../mod/contacts.php:373
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:374
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:375
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:376
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:429
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:430
+#: ../../mod/contacts.php:432
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:433 ../../mod/group.php:191
+#: ../../mod/contacts.php:435 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:438
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:439
+#: ../../mod/contacts.php:441
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:442
+#: ../../mod/contacts.php:444
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:448
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:451
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:455
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:458
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:462
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:465
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:469
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:472
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:518
+#: ../../mod/contacts.php:520
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:524
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:526
+#: ../../mod/contacts.php:528
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:568
+#: ../../mod/contacts.php:570
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:569 ../../mod/directory.php:57
+#: ../../mod/contacts.php:571 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:570 ../../mod/directory.php:59
+#: ../../mod/contacts.php:572 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -2309,67 +2313,67 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/network.php:82
+#: ../../mod/network.php:97
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:122 ../../mod/search.php:16
+#: ../../mod/network.php:137 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:131 ../../mod/search.php:13
+#: ../../mod/network.php:146 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:132 ../../include/group.php:244
+#: ../../mod/network.php:147 ../../include/group.php:244
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:272
+#: ../../mod/network.php:287
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:275
+#: ../../mod/network.php:290
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:278
+#: ../../mod/network.php:293
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:281
+#: ../../mod/network.php:296
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:288
+#: ../../mod/network.php:303
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:291
+#: ../../mod/network.php:306
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:294
+#: ../../mod/network.php:309
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:297
+#: ../../mod/network.php:312
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:300
+#: ../../mod/network.php:315
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:303
+#: ../../mod/network.php:318
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:306
+#: ../../mod/network.php:321
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:373
+#: ../../mod/network.php:388
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2377,31 +2381,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:376
+#: ../../mod/network.php:391
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:421
+#: ../../mod/network.php:436
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:432
+#: ../../mod/network.php:447
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:436
+#: ../../mod/network.php:451
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:446
+#: ../../mod/network.php:461
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:448
+#: ../../mod/network.php:463
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:453
+#: ../../mod/network.php:468
 msgid "Invalid contact."
 msgstr ""
 
@@ -6910,7 +6914,7 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/onepoll.php:406
+#: ../../include/onepoll.php:409
 msgid "From: "
 msgstr ""
 
@@ -7270,29 +7274,29 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:214 ../../include/conversation.php:842
+#: ../../include/Contact.php:218 ../../include/conversation.php:842
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:215 ../../include/conversation.php:843
+#: ../../include/Contact.php:219 ../../include/conversation.php:843
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:216 ../../include/conversation.php:844
+#: ../../include/Contact.php:220 ../../include/conversation.php:844
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:217 ../../include/Contact.php:230
+#: ../../include/Contact.php:221 ../../include/Contact.php:234
 #: ../../include/conversation.php:845
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:218 ../../include/Contact.php:230
+#: ../../include/Contact.php:222 ../../include/Contact.php:234
 #: ../../include/conversation.php:846
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:219 ../../include/Contact.php:230
+#: ../../include/Contact.php:223 ../../include/Contact.php:234
 #: ../../include/conversation.php:847
 msgid "Send PM"
 msgstr ""