Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  separate tag search from body search
  Esperanto at 100% again
  Improvements to diabook-dark
  move unfriend to standalone function for use in account removal
  more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips

* master:

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1320' );
+define ( 'FRIENDICA_VERSION',      '2.3.1321' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 

include/Contact.php

@@ -73,6 +73,49 @@ function contact_remove($id) {
 }
 
 
+// sends an unfriend message. Does not remove the contact
+
+function terminate_friendship($user,$self,$contact) {
+
+
+	$a = get_app();
+
+	require_once('include/datetime.php');
+
+	if($contact['network'] === NETWORK_OSTATUS) {
+
+		$slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
+			'$name' => $user['username'],
+			'$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
+			'$photo' => $self['photo'],
+			'$thumb' => $self['thumb'],
+			'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
+			'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+			'$title' => '',
+			'$type' => 'text',
+			'$content' => t('stopped following'),
+			'$nick' => $user['nickname'],
+			'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
+			'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
+		));
+
+		if((x($contact,'notify')) && (strlen($contact['notify']))) {
+			require_once('include/salmon.php');
+			slapper($user,$contact['notify'],$slap);
+		}
+	}
+	elseif($contact['network'] === NETWORK_DIASPORA) {
+		require_once('include/diaspora.php');
+		diaspora_unshare($user,$contact);
+	}
+	elseif($contact['network'] === NETWORK_DFRN) {
+		require_once('include/items.php');
+		dfrn_deliver($user,$contact,'placeholder', 1);
+	}
+
+}
+
+
 // Contact has refused to recognise us as a friend. We will start a countdown.
 // If they still don't recognise us in 32 days, the relationship is over,
 // and we won't waste any more time trying to communicate with them.

include/diaspora.php

@@ -706,10 +706,10 @@ function diaspora_post($importer,$xml) {
 					continue;
 
 				$basetag = str_replace('_',' ',substr($tag,1));
-				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
 					$str_tags .= ',';
-				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
 				continue;
 			}
 		}
@@ -872,10 +872,10 @@ function diaspora_reshare($importer,$xml) {
 
 
 				$basetag = str_replace('_',' ',substr($tag,1));
-				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
 					$str_tags .= ',';
-				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
 				continue;
 			}
 		}
@@ -1113,10 +1113,10 @@ function diaspora_comment($importer,$xml,$msg) {
 
 
 				$basetag = str_replace('_',' ',substr($tag,1));
-				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
 				if(strlen($str_tags))
 					$str_tags .= ',';
-				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+				$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
 				continue;
 			}
 		}

include/html2plain.php

@@ -83,7 +83,7 @@ function collecturls($message) {
 	$urls = array();
 	foreach ($result as $treffer) {
 		// A list of some links that should be ignored
-		$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+		$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
 				"//facebook.com/profile.php?id=", "//plus.google.com/");
 		foreach ($list as $listitem)
 			if (strpos($treffer[1], $listitem) !== false)

mod/acl.php

@@ -38,6 +38,22 @@ function acl_init(&$a){
 			intval(local_user())
 		);
 		$contact_count = (int)$r[0]['c'];
+	} 
+	elseif ($type == 'm') {
+
+		// autocomplete for Private Messages
+
+		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+				WHERE `uid` = %d AND `self` = 0 
+				AND `blocked` = 0 AND `pending` = 0 
+				AND `network` IN ('%s','%s','%s') $sql_extra2" ,
+			intval(local_user()),
+			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_ZOT),
+			dbesc(NETWORK_DIASPORA)
+		);
+		$contact_count = (int)$r[0]['c'];
+
 	} else {
 		$contact_count = 0;
 	}
@@ -83,6 +99,23 @@ function acl_init(&$a){
 			ORDER BY `name` ASC ",
 			intval(local_user())
 		);
+	}
+	elseif($type == 'm') {
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 
+			AND `network` IN ('%s','%s','%s')
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user()),
+			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_ZOT),
+			dbesc(NETWORK_DIASPORA)
+		);
+	}
+	else
+		$r = array();
+
+	if(count($r)) {
 		foreach($r as $g){
 			$contacts[] = array(
 				"type"  => "c",
@@ -94,10 +127,8 @@ function acl_init(&$a){
 				"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
 			);
 		}			
-			
 	}
 		
-	
 	$items = array_merge($groups, $contacts);
 	
 	$o = array(

mod/contacts.php

@@ -184,38 +184,9 @@ function contacts_content(&$a) {
 
 		if($cmd === 'drop') {
 
-			// create an unfollow slap
+			require_once('include/Contact.php');
 
-			if($orig_record[0]['network'] === NETWORK_OSTATUS) {
+			terminate_friendship($a->user,$a->contact,$orig_record[0]);
-				$tpl = get_markup_template('follow_slap.tpl');
-				$slap = replace_macros($tpl, array(
-					'$name' => $a->user['username'],
-					'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-					'$photo' => $a->contact['photo'],
-					'$thumb' => $a->contact['thumb'],
-					'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
-					'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
-					'$title' => '',
-					'$type' => 'text',
-					'$content' => t('stopped following'),
-					'$nick' => $a->user['nickname'],
-					'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
-					'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
-				));
-
-				if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
-					require_once('include/salmon.php');
-					slapper($a->user,$orig_record[0]['notify'],$slap);
-				}
-			}
-			elseif($orig_record[0]['network'] === NETWORK_DIASPORA) {
-				require_once('include/diaspora.php');
-				diaspora_unshare($a->user,$orig_record[0]);
-			}
-			elseif($orig_record[0]['network'] === NETWORK_DFRN) {
-				require_once('include/items.php');
-				dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
-			}
 
 			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );

mod/dfrn_request.php

@@ -392,10 +392,22 @@ function dfrn_request_post(&$a) {
 				);
 			}
 
-			// contact is created. Now send an email verify form to the requestor.
+			// contact is created. Now create an introduction
-			//
 
+			$hash = random_string();
 
+			$r = q("insert into intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
+				values( %d , %d, %d, '%s', '%s', '%s', %d ) ",
+				intval($uid),
+				intval($contact_id),
+				((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
+				dbesc(notags(trim($_POST['dfrn-request-message']))),
+				dbesc($hash),
+				dbesc(datetime_convert()),
+				1
+			);
+				
+			// Next send an email verify form to the requestor.
 
 		}
 

mod/item.php

@@ -872,7 +872,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 		//base tag has the tags name only
 		$basetag = str_replace('_',' ',substr($tag,1));
 		//create text for link
-		$newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+		$newtag = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
 		//replace tag by the link
 		$body = str_replace($tag, $newtag, $body);
 	

mod/search.php

@@ -87,11 +87,26 @@ function search_content(&$a) {
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
+	$tag = false;
+	if(x($_GET,'tag')) {
+		$tag = true;
+		$search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
+	}
+
+
 	$o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
 	if(! $search)
 		return $o;
 
+	if($tag)
+		$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", 	dbesc('\\]' . preg_quote($search) . '\\['));
+	else
+		$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
+
+
+
+
 	// Here is the way permissions work in the search module...
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
@@ -103,10 +118,8 @@ function search_content(&$a) {
 		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ", 
+		$sql_extra group by `item`.`uri` ", 
-		intval(local_user()),
+		intval(local_user())
-		dbesc(preg_quote($search)), 
-		dbesc('\\]' . preg_quote($search) . '\\[')
 	);
 
 	if(count($r))
@@ -127,18 +140,19 @@ function search_content(&$a) {
 		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+		$sql_extra
 		group by `item`.`uri`	
 		ORDER BY `received` DESC LIMIT %d , %d ",
 		intval(local_user()),
-		dbesc(preg_quote($search)), 
-		dbesc('\\]' . preg_quote($search) . '\\['),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 
 	);
 
-	$o .= '<h2>Search results for: ' . $search . '</h2>';
+	if($tag) 
+		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
+	else
+		$o .= '<h2>Search results for: ' . $search . '</h2>';
 
 	$o .= conversation($a,$r,'search',false);
 

mod/tagger.php

@@ -86,7 +86,7 @@ function tagger_content(&$a) {
 	</target>
 EOT;
 
-	$tagid = $a->get_baseurl() . '/search?search=' . $term;
+	$tagid = $a->get_baseurl() . '/search?tag=' . $term;
 	$objtype = ACTIVITY_OBJ_TAGTERM;
 
 	$obj = <<< EOT
@@ -105,7 +105,7 @@ EOT;
 	if(! isset($bodyverb))
 			return; 
 
-	$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]';
+	$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 
 	$arr = array();
 
@@ -161,7 +161,7 @@ EOT;
 
 	if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) {
 		q("update item set tag = '%s' where id = %d limit 1",
-			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'),
+			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 			intval($item['id'])
 		);
 	}
@@ -177,7 +177,7 @@ EOT;
 		);
 		if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
 			q("update item set tag = '%s' where id = %d limit 1",
-				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'),
+				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 				intval($r[0]['id'])
 			);
 		}

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1320\n"
+"Project-Id-Version: 2.3.1321\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-22 10:00-0700\n"
+"POT-Creation-Date: 2012-04-23 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"
@@ -50,7 +50,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
-#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
@@ -290,7 +290,7 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/dfrn_request.php:800 ../../mod/settings.php:533
 #: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -334,7 +334,7 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:788
 #: ../../mod/settings.php:844 ../../mod/settings.php:850
 #: ../../mod/settings.php:858 ../../mod/settings.php:862
 #: ../../mod/settings.php:867 ../../mod/settings.php:873
@@ -345,7 +345,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:789
 #: ../../mod/settings.php:844 ../../mod/settings.php:850
 #: ../../mod/settings.php:858 ../../mod/settings.php:862
 #: ../../mod/settings.php:867 ../../mod/settings.php:873
@@ -445,17 +445,17 @@ msgid "Image file is empty."
 msgstr ""
 
 #: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:69
+#: ../../mod/wall_upload.php:83
 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:102
 msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:719 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
@@ -730,19 +730,19 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:475
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:480
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:482
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:485
 #, 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"
@@ -786,128 +786,128 @@ msgstr ""
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:372
+#: ../../mod/dfrn_request.php:420
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:385
+#: ../../mod/dfrn_request.php:433
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:389
+#: ../../mod/dfrn_request.php:437
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:410
+#: ../../mod/dfrn_request.php:458
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:464 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:533 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:506
+#: ../../mod/dfrn_request.php:554
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:559
+#: ../../mod/dfrn_request.php:607
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:573
+#: ../../mod/dfrn_request.php:621
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:585
+#: ../../mod/dfrn_request.php:633
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:586
+#: ../../mod/dfrn_request.php:634
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:587
+#: ../../mod/dfrn_request.php:635
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691
+#: ../../mod/dfrn_request.php:676 ../../include/items.php:2691
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715
+#: ../../mod/dfrn_request.php:763
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:731
+#: ../../mod/dfrn_request.php:779
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:733
+#: ../../mod/dfrn_request.php:781
 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:736
+#: ../../mod/dfrn_request.php:784
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:737
+#: ../../mod/dfrn_request.php:785
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:738
+#: ../../mod/dfrn_request.php:786
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:739
+#: ../../mod/dfrn_request.php:787
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:742
+#: ../../mod/dfrn_request.php:790
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:792 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:745
+#: ../../mod/dfrn_request.php:793
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
+#: ../../mod/dfrn_request.php:794 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:747
+#: ../../mod/dfrn_request.php:795
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:748
+#: ../../mod/dfrn_request.php:796
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:751
+#: ../../mod/dfrn_request.php:799
 msgid "Submit Request"
 msgstr ""
 
@@ -1676,7 +1676,7 @@ msgstr ""
 #: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
 #: ../../addon/facebook/facebook.php:650
-#: ../../addon/facebook/facebook.php:1136
+#: ../../addon/facebook/facebook.php:1139
 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
 msgid "Administrator"
 msgstr ""
@@ -2310,7 +2310,9 @@ msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:717
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
+#: ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
@@ -2742,7 +2744,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1655
+#: ../../addon/facebook/facebook.php:1533
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/diabook-green/theme.php:83
@@ -2765,7 +2767,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/diabook-green/theme.php:97
 #: ../../view/theme/diabook/diabook-red/theme.php:96
@@ -2831,8 +2833,8 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:99
-#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
+#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
@@ -2883,7 +2885,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
@@ -3509,48 +3511,48 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:175
+#: ../../mod/ping.php:177
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:180
+#: ../../mod/ping.php:182
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:185
+#: ../../mod/ping.php:187
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:191
+#: ../../mod/ping.php:193
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:196
+#: ../../mod/ping.php:198
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:201
+#: ../../mod/ping.php:203
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:206
+#: ../../mod/ping.php:208
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:211
+#: ../../mod/ping.php:213
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:216
+#: ../../mod/ping.php:218
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:222
+#: ../../mod/ping.php:224
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -4262,93 +4264,99 @@ msgstr ""
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:701
 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:705
+#: ../../addon/facebook/facebook.php:706
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:707
+#: ../../addon/facebook/facebook.php:708
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:709
+#: ../../addon/facebook/facebook.php:710
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:712
+#: ../../addon/facebook/facebook.php:713
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:713
+#: ../../addon/facebook/facebook.php:714
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:714
+#: ../../addon/facebook/facebook.php:715
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:718
+#: ../../addon/facebook/facebook.php:716
+msgid ""
+"Synchronize comments (no comments on Facebook are missed, at the cost of "
+"increased system load)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:720
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:722
+#: ../../addon/facebook/facebook.php:724
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:725
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:725
+#: ../../addon/facebook/facebook.php:727
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:725
+#: ../../addon/facebook/facebook.php:727
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:743
+#: ../../addon/facebook/facebook.php:746
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:767
+#: ../../addon/facebook/facebook.php:770
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:865
+#: ../../addon/facebook/facebook.php:868
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1085
+#: ../../addon/facebook/facebook.php:1088
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1118
+#: ../../addon/facebook/facebook.php:1121
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1158
+#: ../../addon/facebook/facebook.php:1161
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1159
+#: ../../addon/facebook/facebook.php:1162
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1160
+#: ../../addon/facebook/facebook.php:1163
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4358,6 +4366,26 @@ msgid ""
 "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr ""
 
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:144
+msgid "Lifetime of the cache (in hours)"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:149
+msgid "Cache Statistics"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
+msgid "Number of items"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:154
+msgid "Size of the cache"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:156
+msgid "Delete the whole cache"
+msgstr ""
+
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -6541,7 +6569,7 @@ msgstr ""
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:307
 msgid "Image/photo"
 msgstr ""
 

view/eo/follow_notify_eml.tpl

@@ -0,0 +1,14 @@
+
+Kara $[myname],
+
+Vi havas novan abonanton ĉe $[sitename] -  '$[requestor]'.
+
+Vi povas viziti ilian profilon ĉe $[url].
+
+Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton.
+
+$[siteurl]
+
+Salutoj,
+
+	[$sitename] administranto

view/eo/friend_complete_eml.tpl

@@ -0,0 +1,22 @@
+
+Kara $[username],
+
+	Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis 
+vian kontaktpeton ĉe '$[sitename]'.
+
+Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn
+senkatene.
+
+Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas 
+ŝangi la rilaton. 
+
+$[siteurl]
+
+[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne
+haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]'
+
+Salutoj,
+
+	$[sitename] administranto
+
+ 

view/eo/intro_complete_eml.tpl

@@ -0,0 +1,22 @@
+
+Kara $[username],
+
+	'$[fn]' ĉe '$[dfrn_url]' akceptis 
+vian kontaktpeton ĉe '$[sitename]'.
+
+	'$[fn]' elektis vin kiel "admiranto", kio malpermesas 
+kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj
+agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj
+aŭtomate aktiviĝis.
+
+	'$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato 
+aŭ apliki pli da permesoj. 
+
+	Vi ekricevos publikajn afiŝojn de '$[fn]', 
+kiuj aperos sur via 'Reto' paĝo ĉe  
+
+$[siteurl]
+
+Salutoj,
+
+	$[sitename] administranto

view/eo/passchanged_eml.tpl

@@ -0,0 +1,20 @@
+
+Kara $[username],
+	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
+informon (aŭ tuj ŝanĝu vian pasvorton al 
+iu kiun vi povas memori).
+
+
+Jen viaj legitimaĵoj:
+
+Retejo:»$[siteurl]
+Salutnomo:»$[email]
+Pasvorto:»$[new_password]
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
+
+
+Salutoj,
+	$[sitename] administranto
+
+ 

view/eo/register_open_eml.tpl

@@ -0,0 +1,34 @@
+
+Kara $[username],
+	Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita. 
+Jen viaj legitimaĵoj:
+
+
+Retejo:»$[siteurl]
+Salutnomo:»$[email]
+Pasvorto:»$[password]
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas  
+ensalutita.
+
+Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn.
+
+Eble vi volas aldoni kelkajn bazajn informojn al via profilo 
+(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj.
+
+Ni rekomendas agordi vian plenan noman, aldoni profilbildon,
+kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj 
+eble en kiu lando vi loĝas, se vi ne volas pli specifa
+ol tio.
+
+Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. 
+Se vi novas kaj ne konas iun ĉi tie, ili eble helpas 
+vin trovi novajn kaj interesajn amikojn.  
+
+
+Dankon kaj bonvenon ĉe $[sitename].
+
+Salutoj,
+	$[sitename] administranto
+
+ 

view/eo/register_verify_eml.tpl

@@ -0,0 +1,25 @@
+
+Nova peto por registrado atendas ĉe $[sitename] 
+kaj bezonas vian aprobon. 
+
+
+Jen la detaloj de la peto:
+
+Plena Nomo:»$[username]
+Retejo:»$[siteurl]
+Salutnomo:»$[email]
+
+
+Aprobonte la peton, bonvolu klaki tiun ligilon:
+
+
+$[siteurl]/regmod/allow/$[hash] 
+
+
+Malaprobonte kaj forviŝonte la konton, bonvolu klaki:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Dankon!

view/eo/request_notify_eml.tpl

@@ -0,0 +1,17 @@
+
+Kara $[myname],
+
+Vi ĵus ricevis kontaktpeton ĉe $[sitename] 
+
+de '$[requestor]'.
+
+Vi eblas viziti la profilon de la petanto ĉe $[url].
+
+Bonvolu ensaluti en la retejo por vidi la plenan prezenton 
+kaj aprobi aŭ ignori/nuligi la peton.
+
+$[siteurl]
+
+Salutoj,
+
+	$[sitename] administranto

view/eo/strings.php

@@ -223,7 +223,7 @@ $a->strings["GD graphics PHP module"] = "PHP modulo GD";
 $a->strings["OpenSSL PHP module"] = "PHP modulo OpenSSL";
 $a->strings["mysqli PHP module"] = "PHP modulo mysqli";
 $a->strings["mb_string PHP module"] = "PHP modulo mb_string";
-$a->strings["Apace mod_rewrite module"] = "Apache modulo mod_rewrite";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite modulo";
 $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Eraro: La modulo mod_rewrite en la Apache retservilo estas bezonata sed ne instalita.";
 $a->strings["Error: libCURL PHP module required but not installed."] = "Eraro: La modulo libCURL en PHP estas bezonata sed ne instalita.";
 $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Eraro: La modulo GD en PHP kun subteno por JPEG estas bezonata sed ne instalita.";
@@ -367,12 +367,12 @@ $a->strings["Forgot your Password?"] = "Ĉu vi forgesis vian pasvorton?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entajpu vian retpoŝtadreson kaj sendu por pasvorta riparado. Poste, bonvolu legi vian retpoŝton por trovi pliajn instrukciojn.";
 $a->strings["Nickname or Email: "] = "Salutnomo aŭ retpoŝtadreso: ";
 $a->strings["Reset"] = "Repari";
-$a->strings["Account settings"] = "Kontoagordoj";
+$a->strings["Account settings"] = "Konto";
-$a->strings["Display settings"] = "Ekranagordoj";
+$a->strings["Display settings"] = "Ekrano";
-$a->strings["Connector settings"] = "Konektiloagordoj";
+$a->strings["Connector settings"] = "Konektiloj";
-$a->strings["Plugin settings"] = "Agordoj pri kromprogramoj";
+$a->strings["Plugin settings"] = "Kromprogramoj";
 $a->strings["Connected apps"] = "Konektitaj programoj";
-$a->strings["Export personal data"] = "Eksporti personan datumaron";
+$a->strings["Export personal data"] = "Eksporto";
 $a->strings["Settings"] = "Agordoj";
 $a->strings["Missing some important data!"] = "Mankas importantaj datumoj!";
 $a->strings["Update"] = "Ĝisdatigi";
@@ -426,10 +426,10 @@ $a->strings["Update browser every xx seconds"] = "Ĝisdatigu retesplorilon ĉiu
 $a->strings["Minimum of 10 seconds, no maximum"] = "Minimume 10 sekundoj, sen maksimumo";
 $a->strings["Number of items to display on the network page:"] = "Kvanto da elementoj kiuj estos montrata ĉe la reto paĝo.";
 $a->strings["Maximum of 100 items"] = "Maksimume 100 eroj";
-$a->strings["Don't show emoticons"] = "Ne montru ridetulojn.";
+$a->strings["Don't show emoticons"] = "Ne montru ridetulojn";
 $a->strings["Normal Account"] = "Normala konto";
 $a->strings["This account is a normal personal profile"] = "Tiu konto estas normala persona profilo";
-$a->strings["Soapbox Account"] = "Konto ĉe Soapbox";
+$a->strings["Soapbox Account"] = "Soapbox Konto";
 $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj";
 $a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
 $a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi";
@@ -447,7 +447,7 @@ $a->strings["Allow us to suggest you as a potential friend to new members?"] = "
 $a->strings["Permit unknown people to send you private mail?"] = "Permesigi nekonatulojn sendi retpoŝton al vi?";
 $a->strings["Profile is <strong>not published</strong>."] = "Profilo <strong>ne estas publika</strong>.";
 $a->strings["or"] = "aŭ";
-$a->strings["Your Identity Address is"] = "Via identeco adreso estas";
+$a->strings["Your Identity Address is"] = "Via identeca adreso estas";
 $a->strings["Automatically expire posts after this many days:"] = "Automatike senvalidigi afiŝojn post tiom da tagoj:";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Se malplena, afiŝoj neniam senvalidiĝos. Senvalidigitajn afiŝon estos forviŝata";
 $a->strings["Advanced expiration settings"] = "Detalaj agordoj rilate al senvalidiĝo";
@@ -603,6 +603,8 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s ŝatas la %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s malŝatas la %3\$s de %2\$s";
 $a->strings["Item not found."] = "Elemento ne estas trovita.";
 $a->strings["Access denied."] = "Atingo nepermesita.";
+$a->strings["Photos"] = "Bildoj";
+$a->strings["Files"] = "Dosieroj";
 $a->strings["Account approved."] = "Konto aprobita.";
 $a->strings["Registration revoked for %s"] = "Registraĵo por %s senvalidigita.";
 $a->strings["Please login."] = "Bonvolu ensaluti.";
@@ -688,7 +690,7 @@ $a->strings["Register policy"] = "Interkonsento pri registrado";
 $a->strings["Register text"] = "Interkonsento teksto";
 $a->strings["Will be displayed prominently on the registration page."] = "Tio estos eminente montrata en la registro paĝo.";
 $a->strings["Accounts abandoned after x days"] = "Kontoj forlasitaj post x tagoj";
-$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
 $a->strings["Allowed friend domains"] = "Permesitaj amikaj domainoj";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
 $a->strings["Allowed email domains"] = "Permesitaj retpoŝtaj domajnoj";
@@ -1049,7 +1051,7 @@ $a->strings["OEmbed settings updated"] = "Ĝisdatigis OEmbed agordojn";
 $a->strings["Use OEmbed for YouTube videos"] = "Uzi OEmbed por YouTube videtoj";
 $a->strings["URL to embed:"] = "Enigi la URL adreson:";
 $a->strings["Impressum"] = "Kolofono";
-$a->strings["Site Owner"] = "Proprietulo de la laĝo";
+$a->strings["Site Owner"] = "Proprietulo de la paĝo";
 $a->strings["Email Address"] = "Retpoŝta Adreso";
 $a->strings["Postal Address"] = "Poŝta Adreso";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "La kolofono (impressum) kromprogramo bezonas agordojn!<br />Bonvolu aldoni minimume la <tt>owner</tt> variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo.";
@@ -1212,13 +1214,9 @@ $a->strings["Invite Friends"] = "Inviti amikojn";
 $a->strings["Community Pages"] = "Komunumaj paĝoj";
 $a->strings["Help or @NewHere ?"] = "Helpu aŭ @NewHere ?";
 $a->strings["Connect Services"] = "Konekti Servojn";
-$a->strings["PostIt to Friendica"] = "PostIt al Friendica";
-$a->strings["Post to Friendica"] = "Afiŝi al Friendica";
-$a->strings[" from anywhere by bookmarking this Link."] = " de iu kun ĉi tio ligilo.";
 $a->strings["Your posts and conversations"] = "Viaj afiŝoj kaj komunikadoj";
 $a->strings["Your profile page"] = "Via profilo";
 $a->strings["Your contacts"] = "Viaj kontaktoj";
-$a->strings["Photos"] = "Bildoj";
 $a->strings["Your photos"] = "Viaj bildoj";
 $a->strings["Your events"] = "Viaj okazoj";
 $a->strings["Personal notes"] = "Personaj notoj";
@@ -1227,6 +1225,7 @@ $a->strings["Theme settings"] = "Agordoj pri la etoso";
 $a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj";
 $a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj";
 $a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
+$a->strings["Set color scheme"] = "Agordi Kolorskemon";
 $a->strings["Alignment"] = "Ĝisrandigo";
 $a->strings["Left"] = "Maldekstren";
 $a->strings["Center"] = "Centren";
@@ -1406,7 +1405,7 @@ $a->strings["Inbox"] = "Enirkesto";
 $a->strings["Outbox"] = "Elirkesto";
 $a->strings["Manage"] = "Administri";
 $a->strings["Manage other pages"] = "Administri aliajn paĝojn";
-$a->strings["Profiles"] = "Profiloj:";
+$a->strings["Profiles"] = "Profiloj";
 $a->strings["Manage/edit profiles"] = "Administri/redakti profilojn";
 $a->strings["Manage/edit friends and contacts"] = "Administri/redakti amikojn kaj kontaktojn";
 $a->strings["Admin"] = "Administrado";
@@ -1456,8 +1455,8 @@ $a->strings["Image/photo"] = "Bildo";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Ne trovis DNS informojn por datumbaza servilo '%s'.";
 $a->strings["[no subject]"] = "[neniu temo]";
 $a->strings["Visible to everybody"] = "Videbla al ĉiuj";
-$a->strings["show"] = "montru";
+$a->strings["show"] = "montri";
-$a->strings["don't show"] = "ne montru";
+$a->strings["don't show"] = "kaŝi";
 $a->strings["Friendica Notification"] = "Friendica Atentigo";
 $a->strings["Thank You,"] = "Dankon,";
 $a->strings["%s Administrator"] = "%s Administranto";

view/theme/diabook/diabook-dark/style-network.css

@@ -387,7 +387,7 @@
   margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #fff;
+  background-color: #2e2e2f;
   padding: 8px;
 }
 
@@ -439,7 +439,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: #3465a4;
 }
 .tool a:hover {
   text-decoration: none;
@@ -1283,7 +1283,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {