Merge branch 'master' back into develop

2015-09-29 10:00:13 +02:00 · 2015-09-29 10:00:13 +02:00 · 880dda4257
parent eccc06914c 4b6afbf681
commit 880dda4257
37 changed files with 8431 additions and 7909 deletions
--- a/45
+++ b/45
@ -1,3 +1,48 @@
+Version 3.4.2
+
+	Updates to the documentation (tobias, silke, annando)
+	Updates to the translations (tobiasd & translation teams)
+	Updates to themes frost-mobile, vier, duepuntozero, quattro (annando, tobiasd)
+	Enancements of the communications via OStatus and Diaspora protocols (annando)
+	Option to automatically follow OStatus contacts was moved from addon to the core (annando)
+	Add tool to import OStatus contacts from an old account (annando)
+	SALMON slaps with OStatus were reworked (annando)
+	Fix for saving searches (rabuzarus)
+	Fix separation of list items in contact editor (issue #1747) (tobiasd)
+	When a picture is uploaded, "don't send a note about this new picture" is now the default behaviour (tobiasd)
+	Show profile url in contact-edit overview listing (issue #1745) (tobiasd)
+	The vagrant VM usage was changed so that the "installation" is now done automatically on the first run. Example users are automatically put into the database (silke)
+	Buttons to insert images or attachment to a post use a popup browser to select a previously uploaded item or upload a new one (fabrixxm, rabuzarus)
+	Improvements in contact handling (annando)
+	Friendica node can now query other nodes about their users and the contact lists (annando)
+	Contact recommendation is done only for recently active users (annando)
+	Admins can opt for search the local DB for contacts instead of the global directory (annando)
+	The global directory is queried in the background to update local DB and improve similar searches in the future. (annando)
+	By communication over the Diaspora protocol, red#matrix sources are now correctly identified, hubzilla is detected (annando)
+	Adopt limitation of usage of "-" in username to avoid conflicts with GNU Social and Diaspora (annando)
+	The [url] tag now also suppots ftp, mailto, gopher links (annando)
+	An "inspect queue" module was added to the admin panel (tobiasd)
+	Fix some missing SQL data escapes (fabrixxm)
+	Improved the accessibility of the web UI for better screen reader compatibility (annando)
+	Added access keys (annando)
+	Support for the public relay server of Diaspora (annando)
+	Support for the new nodeinfo protocol (successor of current statistics.json), addon deprecated as functionality has been moved into the core (annando)
+	Fix issue with moved Friendica profiles and Diaspora communication (issue #1491) (annando)
+	Show more information on contact request page (issue #1739) (annando)
+	Support for newer versions of the Twidere client was enhanced (annando)
+	Support for inline [code] tag usage (fabrixxm)
+	Fix login form in aside (issue #1348) (annando)
+	Show both url-style and webfinger-style identity address in profile (issue #1621) (tobiasd)
+	Add button to reload all active plugins in admin plugins page to ensure new hooks are used (fabrixxm)
+	Make the hardcoded path to global directory configurable (annando)
+	Change default directory to dir.friendi.ca (annando)
+	Improve cache system with granular expire time (annando)
+	Remove oohembed code (issue #1855) (annando)
+	Checks for mcrypt availability before enable or use RINO2 (fabrixm)
+	Fix following email contacts (issue #1896) (annando)
+	Parse BBCode in contact request notification email (annando)
+	
+	
 Version 3.4.1

 	Implement server-to-server encryption (RINO) using php-encryption library as "RINO 2", deprecate "RINO 1" (issue #1655) (fabrixxm)
--- a/boot.php
+++ b/boot.php
@ -17,7 +17,7 @@ require_once('include/dbstructure.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
-define ( 'FRIENDICA_VERSION',      '3.4.1' );
+define ( 'FRIENDICA_VERSION',      '3.4.2' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1188      );
 define ( 'EOL',                    "<br />\r\n"     );
@ -1811,7 +1811,11 @@ function get_lockpath() {

 	if ($temppath != "") {
 		$lockpath = $temppath."/lock";
+
+		if (!is_dir($lockpath))
 			mkdir($lockpath);
+		elseif (!is_writable($lockpath))
+			$lockpath = $temppath;

 		if (is_dir($lockpath) AND is_writable($lockpath)) {
 			set_config("system", "lockpath", $lockpath);
--- a/doc/Settings.md
+++ b/doc/Settings.md
@ -200,7 +200,7 @@ This configures the URL to update the global directory, and is supplied in the d
 The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
 This allows a private community to be completely isolated from the global mistpark network. 

-	$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+	$a->config['system']['directory'] = 'http://dir.friendi.ca';

 Developer Settings
 ---
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@ -138,7 +138,7 @@ Dies erlaubt eine private Kommunikation, die komplett vom globalen Verzeichnis i

 Konfiguriere:
 ```
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory'] = 'http://dir.friendi.ca';
 ```


--- a/htconfig.php
+++ b/htconfig.php
@ -51,12 +51,6 @@ $a->config['system']['maximagesize'] = 800000;

 $a->config['php_path'] = 'php';

-// You shouldn't need to change anything else.
-// Location of global directory submission page. 
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
-
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts

 $a->config['system']['huburl'] = '[internal]';
@ -74,17 +68,8 @@ $a->config['system']['theme'] = 'duepuntozero';

 $a->config['system']['no_regfullname'] = true;

-// If set to true the priority settings of ostatus contacts are used
-$a->config['system']['ostatus_use_priority'] = false;
-
-// If enabled, all items are cached in the given directory
-$a->config['system']['itemcache'] = "";
-
-// If enabled, the lockpath is used for a lockfile to check if the poller is running
-$a->config['system']['lockpath'] = "";
-
 //Deny public access to the local directory
 //$a->config['system']['block_local_dir'] = false;

-// Global directory
+// Location of the global directory
 $a->config['system']['directory'] = 'http://dir.friendi.ca';
--- a/include/Scrape.php
+++ b/include/Scrape.php
@ -819,6 +819,8 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 		}
 	}

+	// Only store into the cache if the value seems to be valid
+	if ($result['network'] != NETWORK_FEED)
 		Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);

 	return $result;
--- a/include/directory.php
+++ b/include/directory.php
@ -29,11 +29,13 @@ function directory_run(&$argv, &$argc){

 	$a->set_baseurl(get_config('system','url'));

-	$dir = get_config('system','directory_submit_url');
+	$dir = get_config('system','directory');

 	if(! strlen($dir))
 		return;

+	$dir .= "/submit";
+
 	$arr = array('url' => $argv[1]);

 	call_hooks('globaldir_update', $arr);
--- a/include/dsprphotoq.php
+++ b/include/dsprphotoq.php
@ -28,9 +28,14 @@ function dsprphotoq_run($argv, $argc){

 	foreach($dphotos as $dphoto) {

+		$r = array();
+
+		if ($dphoto['uid'] == 0)
+			$r[0] = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+		else
 			$r = q("SELECT * FROM user WHERE uid = %d",
-			intval($dphoto['uid'])
-		);
+				intval($dphoto['uid']));
+
 		if(!$r) {
 			logger("diaspora photo queue: user " . $dphoto['uid'] . " not found");
 			return;
--- a/include/identity.php
+++ b/include/identity.php
@ -285,6 +285,7 @@ if(! function_exists('profile_sidebar')) {
 		$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));

 		$diaspora = array(
+			'guid' => $profile['guid'],
 			'podloc' => $a->get_baseurl(),
 			'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
 			'nickname' => $profile['nickname'],
--- a/include/items.php
+++ b/include/items.php
@ -1229,8 +1229,13 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa

 	item_add_language_opt($arr);

+	if ($notify)
+		$guid_prefix = "";
+	else
+		$guid_prefix = $arr['network'];
+
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
-	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $arr['network']));
+	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $guid_prefix));
 	$arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : $arr['guid']);
 	$arr['extid']         = ((x($arr,'extid'))         ? notags(trim($arr['extid']))         : '');
 	$arr['author-name']   = ((x($arr,'author-name'))   ? notags(trim($arr['author-name']))   : '');
@ -1443,6 +1448,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	// Fill the cache field
 	put_item_in_cache($arr);

+	if ($notify)
+		call_hooks('post_local',$arr);
+	else
 		call_hooks('post_remote',$arr);

 	if(x($arr,'cancel')) {
@ -1589,6 +1597,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa

 		$r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
 		if (count($r) == 1) {
+			if ($notify)
+				call_hooks('post_local_end', $r[0]);
+			else
 				call_hooks('post_remote_end', $r[0]);
 		} else
 			logger('item_store: new item not found in DB, id ' . $current_post);
@ -2009,6 +2020,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {

 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
+	// use RINO1 if mcrypt isn't installed and RINO2 was selected
+	if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;

 	logger("Local rino version: ". $rino, LOGGER_DEBUG);

--- a/include/nav.php
+++ b/include/nav.php
@ -129,7 +129,7 @@ function nav_info(&$a) {
 	$gdirpath = 'directory';

 	if(strlen(get_config('system','singleuser'))) {
-		$gdir = dirname(get_config('system','directory_submit_url'));
+		$gdir = get_config('system','directory');
 		if(strlen($gdir))
 			$gdirpath = $gdir;
 	}
--- a/include/profile_update.php
+++ b/include/profile_update.php
@ -12,7 +12,7 @@ function profile_change() {
 		return;

 //   $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-//   if($url && strlen(get_config('system','directory_submit_url')))
+//   if($url && strlen(get_config('system','directory')))
 //      proc_run('php',"include/directory.php","$url");

 	$recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
--- a/include/socgraph.php
+++ b/include/socgraph.php
@ -234,7 +234,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 	}

 	if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
-		AND poco_reachable($profile_url, $server_url, $network, true)) {
+		AND poco_reachable($profile_url, $server_url, $network, false)) {
 		$data = probe_url($profile_url);

 		$orig_profile = $profile_url;
@ -1224,7 +1224,7 @@ function update_suggestions() {

 	$done[] = $a->get_baseurl() . '/poco';

-	if(strlen(get_config('system','directory_submit_url'))) {
+	if(strlen(get_config('system','directory'))) {
 		$x = fetch_url(get_server()."/pubsites");
 		if($x) {
 			$j = json_decode($x);
@ -1296,8 +1296,11 @@ function poco_discover($complete = false) {
 	if ($r)
 		foreach ($r AS $server) {

-			if (!poco_check_server($server["url"], $server["network"]))
+			if (!poco_check_server($server["url"], $server["network"])) {
+				// The server is not reachable? Okay, then we will try it later
+				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 				continue;
+			}

 			// Fetch all users from the other server
 			$url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
@ -1338,8 +1341,13 @@ function poco_discover($complete = false) {
 				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 				if (!$complete AND (--$no_of_queries == 0))
 					break;
-			} else	// If the server hadn't replied correctly, then force a sanity check
+			} else {
+				// If the server hadn't replied correctly, then force a sanity check
 				poco_check_server($server["url"], $server["network"], true);
+
+				// If we couldn't reach the server, we will try it some time later
+				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+			}
 		}
 }

--- a/include/user.php
+++ b/include/user.php
@ -33,7 +33,7 @@ function create_user($arr) {
 	$verified   = ((x($arr,'verified'))   ? intval($arr['verified']) : 0);

 	$publish    = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
-	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
+	$netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);

 	if ($password1 != $confirm) {
 		$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
--- a/mod/admin.php
+++ b/mod/admin.php
@ -363,7 +363,7 @@ function admin_page_site_post(&$a){
 	$allowed_email		=	((x($_POST,'allowed_email'))		? notags(trim($_POST['allowed_email']))		: '');
 	$block_public		=	((x($_POST,'block_public'))		? True						: False);
 	$force_publish		=	((x($_POST,'publish_all'))		? True						: False);
-	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
+	$global_directory	=	((x($_POST,'directory'))		? notags(trim($_POST['directory']))	: '');
 	$thread_allow		=	((x($_POST,'thread_allow'))		? True						: False);
 	$newuser_private		=	((x($_POST,'newuser_private'))		? True						: False);
 	$enotify_no_content		=	((x($_POST,'enotify_no_content'))	? True						: False);
@ -514,15 +514,7 @@ function admin_page_site_post(&$a){
 	set_config('system','allowed_email', $allowed_email);
 	set_config('system','block_public', $block_public);
 	set_config('system','publish_all', $force_publish);
-	if ($global_directory==""){
-		// don't know why, but del_config doesn't work...
-		q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-			dbesc("system"),
-			dbesc("directory_submit_url")
-		);
-	} else {
-		set_config('system','directory_submit_url', $global_directory);
-	}
+	set_config('system','directory', $global_directory);
 	set_config('system','thread_allow', $thread_allow);
 	set_config('system','newuser_private', $newuser_private);
 	set_config('system','enotify_no_content', $enotify_no_content);
@ -559,7 +551,12 @@ function admin_page_site_post(&$a){
 	set_config('system','old_pager', $old_pager);
 	set_config('system','only_tag_search', $only_tag_search);

+	
+	if ($rino==2 and !function_exists('mcrypt_create_iv')){
+		notice(t("RINO2 needs mcrypt php extension to work."));		
+	} else {	
 		set_config('system','rino_encrypt', $rino);
+	}

 	set_config('system','embedly', $embedly);

@ -578,7 +575,7 @@ function admin_page_site(&$a) {

 	/* Installed langs */
 	$lang_choices = array();
-	$langs = glob('view/*/strings.php');
+	$langs = glob('view/*/strings.php'); /**/

 	if(is_array($langs) && count($langs)) {
 		if(! in_array('view/en/strings.php',$langs))
@ -590,6 +587,12 @@ function admin_page_site(&$a) {
 		}
 	}

+	if (strlen(get_config('system','directory_submit_url')) AND
+		!strlen(get_config('system','directory'))) {
+		set_config('system','directory', dirname(get_config('system','directory_submit_url')));
+		del_config('system','directory_submit_url');
+	}
+
 	/* Installed themes */
 	$theme_choices = array();
 	$theme_choices_mobile = array();
@ -719,7 +722,7 @@ function admin_page_site(&$a) {
 		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
-		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
+		'$global_directory'	=> array('directory', t("Global directory URL"), get_config('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")),
 		'$thread_allow'		=> array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
 		'$newuser_private'	=> array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
 		'$enotify_no_content'	=> array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@ -137,6 +137,8 @@ function dfrn_notify_post(&$a) {

 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
+	// use RINO1 if mcrypt isn't installed and RINO2 was selected
+	if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;

 	logger("Local rino version: ". $rino, LOGGER_DEBUG);

@ -307,6 +309,8 @@ function dfrn_notify_content(&$a) {

 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
+		// use RINO1 if mcrypt isn't installed and RINO2 was selected
+		if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 		
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);

--- a/mod/directory.php
+++ b/mod/directory.php
@ -47,7 +47,7 @@ function directory_content(&$a) {
 	$tpl = get_markup_template('directory_header.tpl');

 	$globaldir = '';
-	$gdirpath = dirname(get_config('system','directory_submit_url'));
+	$gdirpath = get_config('system','directory');
 	if(strlen($gdirpath)) {
 		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
 		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@ -100,7 +100,7 @@ function dirfind_content(&$a, $prefix = "") {

 			$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');

-			if(strlen(get_config('system','directory_submit_url')))
+			if(strlen(get_config('system','directory')))
 				$x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));

 			$j = json_decode($x);
@ -125,6 +125,8 @@ function dirfind_content(&$a, $prefix = "") {
 					$conntxt = t('Connect');
 				}

+				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
+
 				$o .= replace_macros($tpl,array(
 					'$url' => zrl($jj->url),
 					'$name' => $jj->name,
--- a/mod/follow.php
+++ b/mod/follow.php
@ -2,6 +2,7 @@

 require_once('include/Scrape.php');
 require_once('include/follow.php');
+require_once('include/contact_selectors.php');

 function follow_content(&$a) {

@ -30,6 +31,9 @@ function follow_content(&$a) {

 	$ret = probe_url($url);

+	if ($ret["network"] == NETWORK_MAIL)
+		$ret["url"] = $ret["addr"];
+
 	if($ret['network'] === NETWORK_DFRN) {
 		$request = $ret["request"];
 		$tpl = get_markup_template('dfrn_request.tpl');
@ -51,8 +55,15 @@ function follow_content(&$a) {
 	// Makes the connection request for friendica contacts easier
 	$_SESSION["fastlane"] = $ret["url"];

+	$header = $ret["name"];
+
+	if ($ret["addr"] != "")
+		$header .= " <".$ret["addr"].">";
+
+	$header .= " (".network_to_name($ret['network']).")";
+
 	$o  = replace_macros($tpl,array(
-			'$header' => $ret["name"]." (".$ret["addr"].")",
+			'$header' => htmlentities($header),
 			'$photo' => $ret["photo"],
                        '$desc' => "",
                        '$pls_answer' => t('Please answer the following:'),
--- a/mod/install.php
+++ b/mod/install.php
@ -392,6 +392,7 @@ function check_funcs(&$checks) {
 	check_add($ck_funcs, t('OpenSSL PHP module'), true, true, "");
 	check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
 	check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
+	check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");


 	if(function_exists('apache_get_modules')){
@ -422,6 +423,12 @@ function check_funcs(&$checks) {
 		$ck_funcs[4]['status']= false;
 		$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
 	}
+	if(! function_exists('mcrypt_create_iv')){
+		$ck_funcs[5]['status']= false;
+		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
+	}
+
+	
 	
 	$checks = array_merge($checks, $ck_funcs);

--- a/mod/invite.php
+++ b/mod/invite.php
@ -114,13 +114,13 @@ function invite_content(&$a) {
 		}
 	}

-	$dirloc = get_config('system','directory_submit_url');
+	$dirloc = get_config('system','directory');
 	if(strlen($dirloc)) {
 		if($a->config['register_policy'] == REGISTER_CLOSED)
-			$linktxt = sprintf( t('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.'), dirname($dirloc) . '/siteinfo');
+			$linktxt = sprintf( t('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.'), $dirloc . '/siteinfo');
 		elseif($a->config['register_policy'] != REGISTER_CLOSED)
 			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
-			. "\r\n" . "\r\n" . sprintf( t('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.'),dirname($dirloc) . '/siteinfo');
+			. "\r\n" . "\r\n" . sprintf( t('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.'),$dirloc . '/siteinfo');
 	}
 	else {
 		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
--- a/mod/match.php
+++ b/mod/match.php
@ -1,5 +1,7 @@
 <?php
 include_once('include/text.php');
+require_once('include/socgraph.php');
+require_once('include/contact_widgets.php');

 function match_content(&$a) {

@ -7,6 +9,9 @@ function match_content(&$a) {
 	if(! local_user())
 		return;

+	$a->page['aside'] .= follow_widget();
+	$a->page['aside'] .= findpeople_widget();
+
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;

 	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
@ -32,7 +37,7 @@ function match_content(&$a) {
 		if($a->pager['page'] != 1)
 			$params['p'] = $a->pager['page'];

-		if(strlen(get_config('system','directory_submit_url')))
+		if(strlen(get_config('system','directory')))
 			$x = post_url(get_server().'/msearch', $params);
 		else
 			$x = post_url($a->get_baseurl() . '/msearch', $params);
@ -55,7 +60,7 @@ function match_content(&$a) {
 					intval(local_user()),
 					dbesc($match_nurl));
 				if (!count($match)) {
-				
+					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 					$o .= replace_macros($tpl,array(
 						'$url' => zrl($jj->url),
@ -68,8 +73,7 @@ function match_content(&$a) {
 					));
 				}
 			}
-		}
-		else {
+		} else {
 			info( t('No matches') . EOL);
 		}

--- a/mod/notifications.php
+++ b/mod/notifications.php
@ -1,4 +1,5 @@
 <?php
+include_once("include/bbcode.php");

 function notifications_post(&$a) {

@ -213,12 +214,12 @@ function notifications_content(&$a) {
 					'$uid' => $_SESSION['uid'],
 					'$intro_id' => $rr['intro_id'],
 					'$contact_id' => $rr['contact-id'],
-					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
+					'$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo']) : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
 					'$location_label' => t('Location:'),
 					'$location' => $rr['glocation'],
 					'$location_label' => t('Location:'),
-					'$about' => $rr['gabout'],
+					'$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
 					'$about_label' => t('About:'),
 					'$keywords' => $rr['gkeywords'],
 					'$keywords_label' => t('Tags:'),
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@ -118,7 +118,7 @@ function profile_photo_post(&$a) {
 				info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 				// Update global directory in background
 				$url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-				if($url && strlen(get_config('system','directory_submit_url')))
+				if($url && strlen(get_config('system','directory')))
 					proc_run('php',"include/directory.php","$url");

 				require_once('include/profile_update.php');
@ -217,7 +217,7 @@ function profile_photo_content(&$a) {

 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if($url && strlen(get_config('system','directory_submit_url')))
+			if($url && strlen(get_config('system','directory')))
 				proc_run('php',"include/directory.php","$url");

 			goaway($a->get_baseurl() . '/profiles');
--- a/mod/profiles.php
+++ b/mod/profiles.php
@ -508,7 +508,7 @@ function profiles_post(&$a) {

 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if($url && strlen(get_config('system','directory_submit_url')))
+			if($url && strlen(get_config('system','directory')))
 				proc_run('php',"include/directory.php","$url");

 			require_once('include/profile_update.php');
--- a/mod/regmod.php
+++ b/mod/regmod.php
@ -36,7 +36,7 @@ function user_allow($hash) {
 	);
 	if(count($r) && $r[0]['net-publish']) {
 		$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
-		if($url && strlen(get_config('system','directory_submit_url')))
+		if($url && strlen(get_config('system','directory')))
 			proc_run('php',"include/directory.php","$url");
 	}

--- a/mod/settings.php
+++ b/mod/settings.php
@ -582,7 +582,7 @@ function settings_post(&$a) {
 	if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
 		// Update global directory in background
 		$url = $_SESSION['my_url'];
-		if($url && strlen(get_config('system','directory_submit_url')))
+		if($url && strlen(get_config('system','directory')))
 			proc_run('php',"include/directory.php","$url");

 	}
@ -1069,7 +1069,7 @@ function settings_content(&$a) {
 		));
 	}

-	if(strlen(get_config('system','directory_submit_url'))) {
+	if(strlen(get_config('system','directory'))) {
 		$profile_in_net_dir = replace_macros($opt_tpl,array(
 			'$field' 	=> array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
 		));
--- a/util/htconfig.vagrant.php
+++ b/util/htconfig.vagrant.php
@ -47,11 +47,6 @@ $a->config['system']['maximagesize'] = 800000;

 $a->config['php_path'] = '/usr/bin/php';

-// Location of global directory submission page.
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
-
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts

 $a->config['system']['huburl'] = '[internal]';
@ -69,3 +64,9 @@ $a->config['system']['theme'] = 'duepuntozero';
 // By default allow pseudonyms

 $a->config['system']['no_regfullname'] = true;
+
+//Deny public access to the local directory
+//$a->config['system']['block_local_dir'] = false;
+
+// Location of the global directory
+$a->config['system']['directory'] = 'http://dir.friendi.ca';
--- a/util/messages.po
+++ b/util/messages.po
--- a/view/de/messages.po
+++ b/view/de/messages.po
@ -32,8 +32,8 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-01 07:09+0200\n"
-"PO-Revision-Date: 2015-09-01 12:54+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"PO-Revision-Date: 2015-09-16 17:08+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -2723,7 +2723,7 @@ msgstr "Bilder Proxy deaktivieren"
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwith."
-msgstr "Der Proxy für Bilder verbessert die Leitung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."
+msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."

 #: mod/admin.php:763
 msgid "Enable old style pager"
--- a/view/de/strings.php
+++ b/view/de/strings.php
@ -589,7 +589,7 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Basis-Pfad zur Installation";
 $a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist.";
 $a->strings["Disable picture proxy"] = "Bilder Proxy deaktivieren";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Der Proxy für Bilder verbessert die Leitung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen.";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen.";
 $a->strings["Enable old style pager"] = "Den Old-Style Pager aktiviren";
 $a->strings["The old style pager has page numbers but slows down massively the page speed."] = "Der Old-Style Pager zeigt Seitennummern an, verlangsamt aber auch drastisch das Laden einer Seite.";
 $a->strings["Only search in tags"] = "Nur in Tags suchen";
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@ -52,6 +52,10 @@ $a->strings["Toggle Archive status"] = "";
 $a->strings["Repair"] = "Napraw";
 $a->strings["Advanced Contact Settings"] = "Zaawansowane ustawienia kontaktów";
 $a->strings["Communications lost with this contact!"] = "Komunikacja przerwana z tym kontaktem!";
+$a->strings["Fetch further information for feeds"] = "";
+$a->strings["Disabled"] = "";
+$a->strings["Fetch information"] = "";
+$a->strings["Fetch information and keywords"] = "";
 $a->strings["Contact Editor"] = "Edytor kontaktów";
 $a->strings["Submit"] = "Potwierdź";
 $a->strings["Profile Visibility"] = "Widoczność profilu";
@ -74,12 +78,9 @@ $a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
 $a->strings["Notification for new posts"] = "";
 $a->strings["Send a notification of every new post of this contact"] = "";
-$a->strings["Fetch further information for feeds"] = "";
-$a->strings["Disabled"] = "";
-$a->strings["Fetch information"] = "";
-$a->strings["Fetch information and keywords"] = "";
 $a->strings["Blacklisted keywords"] = "";
 $a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "";
+$a->strings["Profile URL"] = "";
 $a->strings["Suggestions"] = "Sugestie";
 $a->strings["Suggest potential friends"] = "Sugerowani znajomi";
 $a->strings["All Contacts"] = "Wszystkie kontakty";
@ -94,16 +95,16 @@ $a->strings["Archived"] = "Zarchiwizowane";
 $a->strings["Only show archived contacts"] = "Pokaż tylko zarchiwizowane kontakty";
 $a->strings["Hidden"] = "Ukryty";
 $a->strings["Only show hidden contacts"] = "Pokaż tylko ukryte kontakty";
-$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
-$a->strings["is a fan of yours"] = "jest twoim fanem";
-$a->strings["you are a fan of"] = "jesteś fanem";
-$a->strings["Edit contact"] = "Edytuj kontakt";
 $a->strings["Contacts"] = "Kontakty";
 $a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
 $a->strings["Finding: "] = "Znalezione:";
 $a->strings["Find"] = "Znajdź";
 $a->strings["Update"] = "Zaktualizuj";
 $a->strings["Delete"] = "Usuń";
+$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
+$a->strings["is a fan of yours"] = "jest twoim fanem";
+$a->strings["you are a fan of"] = "jesteś fanem";
+$a->strings["Edit contact"] = "Edytuj kontakt";
 $a->strings["No profile"] = "Brak profilu";
 $a->strings["Manage Identities and/or Pages"] = "Zarządzaj Tożsamościami i/lub Stronami.";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
@ -164,7 +165,7 @@ $a->strings["Profile Photos"] = "Zdjęcia profilowe";
 $a->strings["Image size reduction [%s] failed."] = "Redukcja rozmiaru obrazka [%s] nie powiodła się.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "";
 $a->strings["Unable to process image"] = "Nie udało się przetworzyć obrazu.";
-$a->strings["Image exceeds size limit of %d"] = "Rozmiar obrazka przekracza limit %d";
+$a->strings["Image exceeds size limit of %s"] = "";
 $a->strings["Unable to process image."] = "Przetwarzanie obrazu nie powiodło się.";
 $a->strings["Upload File:"] = "Wyślij plik:";
 $a->strings["Select a profile:"] = "Wybierz profil:";
@ -187,6 +188,13 @@ $a->strings["Remove"] = "Usuń";
 $a->strings["Save to Folder:"] = "Zapisz w folderze:";
 $a->strings["- select -"] = "- wybierz -";
 $a->strings["Save"] = "Zapisz";
+$a->strings["You already added this contact."] = "";
+$a->strings["Please answer the following:"] = "Proszę odpowiedzieć na poniższe:";
+$a->strings["Does %s know you?"] = "Czy %s Cię zna?";
+$a->strings["No"] = "Nie";
+$a->strings["Add a personal note:"] = "Dodaj osobistą notkę:";
+$a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
+$a->strings["Submit Request"] = "Wyślij zgłoszenie";
 $a->strings["Contact added"] = "Kontakt dodany";
 $a->strings["Unable to locate original post."] = "Nie można zlokalizować oryginalnej wiadomości.";
 $a->strings["Empty post discarded."] = "Pusty wpis wyrzucony.";
@ -233,6 +241,8 @@ $a->strings["[Name Withheld]"] = "[Nazwa wstrzymana]";
 $a->strings["%1\$s has joined %2\$s"] = "%1\$s dołączył/a do %2\$s";
 $a->strings["Requested profile is not available."] = "Żądany profil jest niedostępny";
 $a->strings["Tips for New Members"] = "Wskazówki dla nowych użytkowników";
+$a->strings["Do you really want to delete this video?"] = "";
+$a->strings["Delete Video"] = "";
 $a->strings["No videos selected"] = "Nie zaznaczono filmów";
 $a->strings["Access to this item is restricted."] = "Dostęp do tego obiektu jest ograniczony.";
 $a->strings["View Video"] = "Zobacz film";
@ -243,6 +253,7 @@ $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s zaznaczył %2\$s'g
 $a->strings["Friend suggestion sent."] = "Propozycja znajomych wysłana.";
 $a->strings["Suggest Friends"] = "Zaproponuj znajomych";
 $a->strings["Suggest a friend for %s"] = "Zaproponuj znajomych dla %s";
+$a->strings["Invalid request."] = "";
 $a->strings["No valid account found."] = "Nie znaleziono ważnego konta.";
 $a->strings["Password reset request issued. Check your email."] = "Prośba o zresetowanie hasła została zatwierdzona. Sprawdź swój adres email.";
 $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "";
@ -267,13 +278,6 @@ $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nie lubi %2\$s's %3\$s"
 $a->strings["{0} wants to be your friend"] = "{0} chce być Twoim znajomym";
 $a->strings["{0} sent you a message"] = "{0} wysyła Ci wiadomość";
 $a->strings["{0} requested registration"] = "{0} żądana rejestracja";
-$a->strings["{0} commented %s's post"] = "{0} skomentował %s wpis";
-$a->strings["{0} liked %s's post"] = "{0} polubił wpis %s";
-$a->strings["{0} disliked %s's post"] = "{0} przestał lubić post %s";
-$a->strings["{0} is now friends with %s"] = "{0} jest teraz znajomym %s";
-$a->strings["{0} posted"] = "{0} utworzony";
-$a->strings["{0} tagged %s's post with #%s"] = "{0} zaznaczony %s'go post z #%s";
-$a->strings["{0} mentioned you in a post"] = "{0} wspomniał Cię w swoim wpisie";
 $a->strings["No contacts."] = "brak kontaktów";
 $a->strings["View Contacts"] = "widok kontaktów";
 $a->strings["Invalid request identifier."] = "Niewłaściwy identyfikator wymagania.";
@ -294,12 +298,17 @@ $a->strings["Approve"] = "Zatwierdź";
 $a->strings["Claims to be known to you: "] = "Twierdzi, że go znasz:";
 $a->strings["yes"] = "tak";
 $a->strings["no"] = "nie";
-$a->strings["Approve as: "] = "Zatwierdź jako:";
+$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "";
+$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "";
 $a->strings["Friend"] = "Znajomy";
 $a->strings["Sharer"] = "Udostępniający/a";
 $a->strings["Fan/Admirer"] = "Fan";
 $a->strings["Friend/Connect Request"] = "Prośba o dodanie do przyjaciół/powiązanych";
 $a->strings["New Follower"] = "Nowy obserwator";
+$a->strings["Location:"] = "Lokalizacja";
+$a->strings["About:"] = "O:";
+$a->strings["Tags:"] = "Tagi:";
+$a->strings["Gender:"] = "Płeć:";
 $a->strings["No introductions."] = "Brak wstępu.";
 $a->strings["Notifications"] = "Powiadomienia";
 $a->strings["%s liked %s's post"] = "%s polubił wpis %s";
@ -372,6 +381,7 @@ $a->strings["Return to contact editor"] = "Wróć do edytora kontaktów";
 $a->strings["No mirroring"] = "";
 $a->strings["Mirror as forwarded posting"] = "";
 $a->strings["Mirror as my own posting"] = "";
+$a->strings["Refetch contact data"] = "";
 $a->strings["Name"] = "Imię";
 $a->strings["Account Nickname"] = "Nazwa konta";
 $a->strings["@Tagname - overrides Name/Nickname"] = "";
@ -387,7 +397,8 @@ $a->strings["Mark this contact as remote_self, this will cause friendica to repo
 $a->strings["Login"] = "Login";
 $a->strings["The post was created"] = "";
 $a->strings["Access denied."] = "Brak dostępu";
-$a->strings["People Search"] = "Szukaj osób";
+$a->strings["People Search - %s"] = "";
+$a->strings["Connect"] = "Połącz";
 $a->strings["No matches"] = "brak dopasowań";
 $a->strings["Photos"] = "Zdjęcia";
 $a->strings["Files"] = "Pliki";
@ -398,6 +409,7 @@ $a->strings["Users"] = "Użytkownicy";
 $a->strings["Plugins"] = "Wtyczki";
 $a->strings["Themes"] = "Temat";
 $a->strings["DB updates"] = "Aktualizacje DB";
+$a->strings["Inspect Queue"] = "";
 $a->strings["Logs"] = "Logi";
 $a->strings["probe address"] = "";
 $a->strings["check webfinger"] = "";
@ -405,6 +417,13 @@ $a->strings["Admin"] = "Administator";
 $a->strings["Plugin Features"] = "Polecane wtyczki";
 $a->strings["diagnostics"] = "";
 $a->strings["User registrations waiting for confirmation"] = "Rejestracje użytkownika czekają na potwierdzenie.";
+$a->strings["Administration"] = "Administracja";
+$a->strings["ID"] = "";
+$a->strings["Recipient Name"] = "";
+$a->strings["Recipient Profile"] = "";
+$a->strings["Created"] = "";
+$a->strings["Last Tried"] = "";
+$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "";
 $a->strings["Normal Account"] = "Konto normalne";
 $a->strings["Soapbox Account"] = "Konto Soapbox";
 $a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
@ -412,7 +431,6 @@ $a->strings["Automatic Friend Account"] = "Automatyczny przyjaciel konta";
 $a->strings["Blog Account"] = "Konto Bloga";
 $a->strings["Private Forum"] = "Forum Prywatne";
 $a->strings["Message queues"] = "Wiadomości";
-$a->strings["Administration"] = "Administracja";
 $a->strings["Summary"] = "Skrót";
 $a->strings["Registered users"] = "Zarejestrowani użytkownicy";
 $a->strings["Pending registrations"] = "Rejestracje w toku.";
@ -429,6 +447,12 @@ $a->strings["Frequently"] = "Jak najczęściej";
 $a->strings["Hourly"] = "Godzinowo";
 $a->strings["Twice daily"] = "Dwa razy dziennie";
 $a->strings["Daily"] = "Dziennie";
+$a->strings["Users, Global Contacts"] = "";
+$a->strings["Users, Global Contacts/fallback"] = "";
+$a->strings["One month"] = "Miesiąc";
+$a->strings["Three months"] = "Trzy miesiące";
+$a->strings["Half a year"] = "Pół roku";
+$a->strings["One year"] = "Rok";
 $a->strings["Multi user instance"] = "Tryb MultiUsera";
 $a->strings["Closed"] = "Zamknięty";
 $a->strings["Requires approval"] = "Wymagane zatwierdzenie.";
@ -436,21 +460,25 @@ $a->strings["Open"] = "Otwórz";
 $a->strings["No SSL policy, links will track page SSL state"] = "Brak SSL , linki będą śledzić stan SSL .";
 $a->strings["Force all links to use SSL"] = "Wymuś by linki używały SSL.";
 $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Wewnętrzne Certyfikaty , użyj SSL tylko dla linków lokalnych . ";
-$a->strings["Save Settings"] = "";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
 $a->strings["Registration"] = "Rejestracja";
 $a->strings["File upload"] = "Plik załadowano";
 $a->strings["Policies"] = "zasady";
 $a->strings["Advanced"] = "Zaawansowany";
+$a->strings["Auto Discovered Contact Directory"] = "";
 $a->strings["Performance"] = "Ustawienia";
 $a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Host name"] = "";
 $a->strings["Sender Email"] = "";
+$a->strings["The email address your server shall use to send notification emails from."] = "";
 $a->strings["Banner/Logo"] = "Logo";
 $a->strings["Shortcut icon"] = "";
+$a->strings["Link to an icon that will be used for browsers."] = "";
 $a->strings["Touch icon"] = "";
+$a->strings["Link to an icon that will be used for tablets and mobiles."] = "";
 $a->strings["Additional Info"] = "Dodatkowe informacje";
-$a->strings["For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo."] = "";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "";
 $a->strings["System language"] = "Język systemu";
 $a->strings["System theme"] = "Motyw systemowy";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Domyślny motyw systemu - może być nadpisany przez profil użytkownika  <a href='#' id='cnftheme'>zmień ustawienia motywów</a>";
@ -533,6 +561,18 @@ $a->strings["Poll interval"] = "";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Maximum Load Average (Frontend)"] = "";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "";
+$a->strings["Periodical check of global contacts"] = "";
+$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "";
+$a->strings["Discover contacts from other servers"] = "";
+$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "";
+$a->strings["Timeframe for fetching global contacts"] = "";
+$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "";
+$a->strings["Search the local directory"] = "";
+$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "";
+$a->strings["Publish server information"] = "";
+$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "";
 $a->strings["Use MySQL full text engine"] = "";
 $a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
 $a->strings["Suppress Language"] = "";
@ -540,13 +580,17 @@ $a->strings["Suppress language information in meta information about a posting."
 $a->strings["Suppress Tags"] = "";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "";
 $a->strings["Path to item cache"] = "";
+$a->strings["The item caches buffers generated bbcode and external images."] = "";
 $a->strings["Cache duration in seconds"] = "";
 $a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
 $a->strings["Maximum numbers of comments per post"] = "";
 $a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "";
+$a->strings["The lock file is used to avoid multiple pollers at one time. Only define a folder here."] = "";
 $a->strings["Temp path"] = "Ścieżka do Temp";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "";
 $a->strings["Base path to installation"] = "";
+$a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "";
 $a->strings["Disable picture proxy"] = "";
 $a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "";
 $a->strings["Enable old style pager"] = "";
@ -554,6 +598,11 @@ $a->strings["The old style pager has page numbers but slows down massively the p
 $a->strings["Only search in tags"] = "";
 $a->strings["On large systems the text search can slow down the system extremely."] = "";
 $a->strings["New base url"] = "";
+$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "";
+$a->strings["RINO Encryption"] = "";
+$a->strings["Encryption layer between nodes."] = "";
+$a->strings["Embedly API key"] = "";
+$a->strings["<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter."] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Database structure update %s was successfully applied."] = "";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "";
@ -627,7 +676,7 @@ $a->strings["FTP Host"] = "Założyciel FTP";
 $a->strings["FTP Path"] = "Ścieżka FTP";
 $a->strings["FTP User"] = "Użytkownik FTP";
 $a->strings["FTP Password"] = "FTP Hasło";
-$a->strings["Search Results For:"] = "Szukaj wyników dla:";
+$a->strings["Search Results For: %s"] = "";
 $a->strings["Remove term"] = "Usuń wpis";
 $a->strings["Saved Searches"] = "Zapisane wyszukiwania";
 $a->strings["add"] = "dodaj";
@ -640,7 +689,7 @@ $a->strings["New"] = "Nowy";
 $a->strings["Activity Stream - by date"] = "";
 $a->strings["Shared Links"] = "Współdzielone linki";
 $a->strings["Interesting Links"] = "Interesujące linki";
-$a->strings["Starred"] = "";
+$a->strings["Starred"] = "Ulubione";
 $a->strings["Favourite Posts"] = "Ulubione posty";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Uwaga: Ta grupa posiada %s członka z niezabezpieczonej sieci.",
@ -650,12 +699,13 @@ $a->strings["Warning: This group contains %s member from an insecure network."]
 $a->strings["Private messages to this group are at risk of public disclosure."] = "Prywatne wiadomości do tej grupy mogą zostać publicznego ujawnienia";
 $a->strings["No such group"] = "Nie ma takiej grupy";
 $a->strings["Group is empty"] = "Grupa jest pusta";
-$a->strings["Group: "] = "Grupa:";
-$a->strings["Contact: "] = "Kontakt: ";
+$a->strings["Group: %s"] = "";
+$a->strings["Contact: %s"] = "";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione ";
 $a->strings["Invalid contact."] = "Zły kontakt";
 $a->strings["Friends of %s"] = "Znajomy %s";
 $a->strings["No friends to display."] = "Brak znajomych do wyświetlenia";
+$a->strings["Event can not end before it has started."] = "";
 $a->strings["Event title and start time are required."] = "Wymagany tytuł wydarzenia i czas rozpoczęcia.";
 $a->strings["l, F j"] = "d, M d ";
 $a->strings["Edit event"] = "Edytuj wydarzenie";
@ -664,18 +714,17 @@ $a->strings["Events"] = "Wydarzenia";
 $a->strings["Create New Event"] = "Stwórz nowe wydarzenie";
 $a->strings["Previous"] = "Poprzedni";
 $a->strings["Next"] = "Następny";
-$a->strings["hour:minute"] = "godzina:minuta";
 $a->strings["Event details"] = "Szczegóły wydarzenia";
-$a->strings["Format is %s %s. Starting date and Title are required."] = "Wymagany format %s %s. Data rozpoczęcia i Tytuł są konieczne.";
+$a->strings["Starting date and Title are required."] = "";
 $a->strings["Event Starts:"] = "Rozpoczęcie wydarzenia:";
 $a->strings["Required"] = "Wymagany";
 $a->strings["Finish date/time is not known or not relevant"] = "Data/czas zakończenia nie jest znana lub jest nieistotna";
 $a->strings["Event Finishes:"] = "Zakończenie wydarzenia:";
 $a->strings["Adjust for viewer timezone"] = "Dopasuj dla strefy czasowej widza";
 $a->strings["Description:"] = "Opis:";
-$a->strings["Location:"] = "Lokalizacja";
 $a->strings["Title:"] = "Tytuł:";
 $a->strings["Share this event"] = "Udostępnij te wydarzenie";
+$a->strings["Preview"] = "Podgląd";
 $a->strings["Select"] = "Wybierz";
 $a->strings["View %s's profile @ %s"] = "Pokaż %s's profil @ %s";
 $a->strings["%s from %s"] = "%s od %s";
@ -708,7 +757,6 @@ $a->strings["Code"] = "Kod";
 $a->strings["Image"] = "Obraz";
 $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
-$a->strings["Preview"] = "Podgląd";
 $a->strings["Edit"] = "Edytuj";
 $a->strings["add star"] = "dodaj gwiazdkę";
 $a->strings["remove star"] = "anuluj gwiazdkę";
@ -728,6 +776,7 @@ $a->strings["Could not create table."] = "Nie mogę stworzyć tabeli.";
 $a->strings["Your Friendica site database has been installed."] = "";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Proszę przejrzeć plik \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "";
 $a->strings["System check"] = "Sprawdzanie systemu";
 $a->strings["Check again"] = "Sprawdź ponownie";
 $a->strings["Database connection"] = "Połączenie z bazą danych";
@ -795,12 +844,11 @@ $a->strings["%1\$s welcomes %2\$s"] = "%1\$s witamy %2\$s";
 $a->strings["Welcome to %s"] = "Witamy w %s";
 $a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "";
 $a->strings["Or - did you try to upload an empty file?"] = "";
-$a->strings["File exceeds size limit of %d"] = "Plik przekracza dozwolony rozmiar %d";
+$a->strings["File exceeds size limit of %s"] = "";
 $a->strings["File upload failed."] = "Przesyłanie pliku nie powiodło się.";
 $a->strings["Profile Match"] = "Profil zgodny ";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Brak słów-kluczy do wyszukania. Dodaj słowa-klucze do swojego domyślnego profilu.";
 $a->strings["is interested in:"] = "interesuje się:";
-$a->strings["Connect"] = "Połącz";
 $a->strings["link"] = "Link";
 $a->strings["Not available."] = "Niedostępne.";
 $a->strings["Community"] = "Społeczność";
@ -846,11 +894,16 @@ $a->strings["Plugin Settings"] = "Ustawienia wtyczki";
 $a->strings["Off"] = "Wyłącz";
 $a->strings["On"] = "Włącz";
 $a->strings["Additional Features"] = "";
+$a->strings["General Social Media Settings"] = "";
+$a->strings["Disable intelligent shortening"] = "";
+$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "";
+$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "";
 $a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "włączony";
 $a->strings["disabled"] = "wyłączony";
-$a->strings["StatusNet"] = "StatusNet";
+$a->strings["GNU Social (OStatus)"] = "";
 $a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
 $a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email.";
@ -876,10 +929,11 @@ $a->strings["Number of items to display per page:"] = "";
 $a->strings["Maximum of 100 items"] = "Maksymalnie 100 elementów";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "";
 $a->strings["Don't show emoticons"] = "Nie pokazuj emotikonek";
-$a->strings["Don't show notices"] = "";
-$a->strings["Infinite scroll"] = "";
+$a->strings["Don't show notices"] = "Nie pokazuj powiadomień";
+$a->strings["Infinite scroll"] = "Nieskończone przewijanie";
 $a->strings["Automatic updates only at the top of the network page"] = "";
-$a->strings["User Types"] = "";
+$a->strings["Theme settings"] = "Ustawienia motywu";
+$a->strings["User Types"] = "Użytkownik pisze";
 $a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "";
 $a->strings["This account is a normal personal profile"] = "To konto jest normalnym osobistym profilem";
@ -894,7 +948,6 @@ $a->strings["Private forum - approved members only"] = "";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "Przeznacz to OpenID do logowania się na to konto.";
 $a->strings["Publish your default profile in your local site directory?"] = "Czy publikować Twój profil w lokalnym katalogu tej instancji?";
-$a->strings["No"] = "Nie";
 $a->strings["Publish your default profile in the global social directory?"] = "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ukryć listę znajomych przed odwiedzającymi Twój profil?";
 $a->strings["Hide your profile details from unknown viewers?"] = "Ukryć szczegóły twojego profilu przed nieznajomymi ?";
@ -904,7 +957,7 @@ $a->strings["Allow friends to tag your posts?"] = "Zezwól na oznaczanie twoich
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "";
 $a->strings["Permit unknown people to send you private mail?"] = "";
 $a->strings["Profile is <strong>not published</strong>."] = "Profil <strong>nie jest opublikowany</strong>";
-$a->strings["Your Identity Address is"] = "Twój adres identyfikacyjny to";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "";
 $a->strings["Automatically expire posts after this many days:"] = "";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte.";
 $a->strings["Advanced expiration settings"] = "";
@ -953,6 +1006,8 @@ $a->strings["You receive a private message"] = "Otrzymałeś prywatną wiadomoś
 $a->strings["You receive a friend suggestion"] = "Otrzymane propozycje znajomych";
 $a->strings["You are tagged in a post"] = "Jesteś oznaczony w poście";
 $a->strings["You are poked/prodded/etc. in a post"] = "";
+$a->strings["Activate desktop notifications"] = "";
+$a->strings["Show desktop popup on new notifications"] = "";
 $a->strings["Text-only notification emails"] = "";
 $a->strings["Send text only notification emails, without the html part"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "";
@ -986,22 +1041,17 @@ $a->strings["Disallowed profile URL."] = "Nie dozwolony adres URL profilu.";
 $a->strings["Your introduction has been sent."] = "Twoje dane zostały wysłane.";
 $a->strings["Please login to confirm introduction."] = "Proszę zalogować się do potwierdzenia wstępu.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na <strong>tego</strong> użytkownika. ";
+$a->strings["Confirm"] = "Potwierdź";
 $a->strings["Hide this contact"] = "Ukryj kontakt";
 $a->strings["Welcome home %s."] = "Welcome home %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s.";
-$a->strings["Confirm"] = "Potwierdź";
 $a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Proszę podaj swój \"Adres tożsamości \" z jednej z możliwych wspieranych sieci komunikacyjnych .";
-$a->strings["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>."] = "Jeśli nie jesteś członkiem darmowej sieci społecznościowej <a href=\"http://dir.friendica.com/siteinfo\"> kliknij w ten link by odkryć czym jest Friendica i dołącz do niej dziś </a>.";
+$a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
 $a->strings["Friend/Connection Request"] = "Przyjaciel/Prośba o połączenie";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Przykład : jojo@demo.friendica.com , http://demofriendica.com/profile/jojo , testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Proszę odpowiedzieć na poniższe:";
-$a->strings["Does %s know you?"] = "Czy %s Cię zna?";
-$a->strings["Add a personal note:"] = "Dodaj osobistą notkę:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Sieć społeczna";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "- proszę wyraź to inaczej . Zamiast tego ,wprowadź %s do swojej belki wyszukiwarki.";
-$a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
-$a->strings["Submit Request"] = "Wyślij zgłoszenie";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "";
 $a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
@ -1015,6 +1065,7 @@ $a->strings["Membership on this site is by invitation only."] = "Członkostwo na
 $a->strings["Your invitation ID: "] = "Twoje zaproszenia ID:";
 $a->strings["Your Full Name (e.g. Joe Smith): "] = "Imię i nazwisko (np. Jan Kowalski):";
 $a->strings["Your Email Address: "] = "Twój adres email:";
+$a->strings["Leave empty for an auto generated password."] = "";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wybierz login. Login musi zaczynać się literą. Adres twojego profilu na tej stronie będzie wyglądać następująco '<strong>login@\$nazwastrony</strong>'.";
 $a->strings["Choose a nickname: "] = "Wybierz pseudonim:";
 $a->strings["Register"] = "Zarejestruj";
@ -1022,15 +1073,15 @@ $a->strings["Import"] = "Import";
 $a->strings["Import your profile to this friendica instance"] = "";
 $a->strings["System down for maintenance"] = "";
 $a->strings["Search"] = "Szukaj";
+$a->strings["Items tagged with: %s"] = "";
+$a->strings["Search results for: %s"] = "";
 $a->strings["Global Directory"] = "Globalne Położenie";
 $a->strings["Find on this site"] = "Znajdź na tej stronie";
 $a->strings["Site Directory"] = "Katalog Strony";
 $a->strings["Age: "] = "Wiek: ";
 $a->strings["Gender: "] = "Płeć: ";
-$a->strings["Gender:"] = "Płeć:";
 $a->strings["Status:"] = "Status";
 $a->strings["Homepage:"] = "Strona główna:";
-$a->strings["About:"] = "O:";
 $a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
 $a->strings["No potential page delegates located."] = "";
 $a->strings["Delegate Page Management"] = "";
@ -1094,7 +1145,7 @@ $a->strings["Profile Name:"] = "Nazwa profilu :";
 $a->strings["Your Full Name:"] = "Twoje imię i nazwisko:";
 $a->strings["Title/Description:"] = "Tytuł/Opis :";
 $a->strings["Your Gender:"] = "Twoja płeć:";
-$a->strings["Birthday (%s):"] = "Urodziny (%s):";
+$a->strings["Birthday :"] = "";
 $a->strings["Street Address:"] = "Ulica:";
 $a->strings["Locality/City:"] = "Miejscowość/Miasto :";
 $a->strings["Postal/Zip Code:"] = "Kod Pocztowy :";
@ -1157,6 +1208,7 @@ $a->strings["This is Friendica, version"] = "To jest Friendica, wersja";
 $a->strings["running at web location"] = "otwierane na serwerze";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Odwiedź <a href=\"http://friendica.com\">Friendica.com</a>, aby dowiedzieć się więcej o projekcie Friendica.";
 $a->strings["Bug reports and issues: please visit"] = "Reportowanie błędów i problemów: proszę odwiedź";
+$a->strings["the bugtracker at github"] = "";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "";
 $a->strings["Installed plugins/addons/apps:"] = "Zainstalowane pluginy/dodatki/aplikacje:";
 $a->strings["No installed plugins/addons/apps"] = "Brak zainstalowanych pluginów/dodatków/aplikacji";
@ -1200,8 +1252,9 @@ $a->strings["You are cordially invited to join me and other close friends on Fri
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Gdy już się zarejestrujesz, skontaktuj się ze mną przez moją stronkę profilową :";
 $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "";
-$a->strings["Photo Albums"] = "Albumy zdjęć";
 $a->strings["Contact Photos"] = "Zdjęcia kontaktu";
+$a->strings["Photo Albums"] = "Albumy zdjęć";
+$a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
 $a->strings["Upload New Photos"] = "Wyślij nowe zdjęcie";
 $a->strings["Contact information unavailable"] = "Informacje o kontakcie nie dostępne.";
 $a->strings["Album not found."] = "Album nie znaleziony";
@ -1211,7 +1264,6 @@ $a->strings["Delete Photo"] = "Usuń zdjęcie";
 $a->strings["Do you really want to delete this photo?"] = "Czy na pewno chcesz usunąć to zdjęcie ?";
 $a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
 $a->strings["a photo"] = "zdjęcie";
-$a->strings["Image exceeds size limit of "] = "obrazek przekracza limit rozmiaru";
 $a->strings["Image file is empty."] = "Plik obrazka jest pusty.";
 $a->strings["No photos selected"] = "Nie zaznaczono zdjęć";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
@ -1234,16 +1286,17 @@ $a->strings["Use as profile photo"] = "Ustaw jako zdjęcie profilowe";
 $a->strings["View Full Size"] = "Zobacz w pełnym rozmiarze";
 $a->strings["Tags: "] = "Tagi:";
 $a->strings["[Remove any tag]"] = "[Usunąć znacznik]";
-$a->strings["Rotate CW (right)"] = "Obróć CW (w prawo)";
-$a->strings["Rotate CCW (left)"] = "Obróć CCW (w lewo)";
 $a->strings["New album name"] = "Nazwa nowego albumu";
 $a->strings["Caption"] = "Zawartość";
 $a->strings["Add a Tag"] = "Dodaj tag";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "";
+$a->strings["Rotate CW (right)"] = "Obróć CW (w prawo)";
+$a->strings["Rotate CCW (left)"] = "Obróć CCW (w lewo)";
 $a->strings["Private photo"] = "Prywatne zdjęcie.";
 $a->strings["Public photo"] = "Zdjęcie publiczne";
 $a->strings["Share"] = "Podziel się";
-$a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
+$a->strings["Not Extended"] = "";
 $a->strings["Account approved."] = "Konto zatwierdzone.";
 $a->strings["Registration revoked for %s"] = "Rejestracja dla %s odwołana";
 $a->strings["Please login."] = "Proszę się zalogować.";
@ -1269,26 +1322,6 @@ $a->strings["Website Terms of Service"] = "";
 $a->strings["terms of service"] = "warunki użytkowania";
 $a->strings["Website Privacy Policy"] = "";
 $a->strings["privacy policy"] = "polityka prywatności";
-$a->strings["Requested account is not available."] = "";
-$a->strings["Edit profile"] = "Edytuj profil";
-$a->strings["Message"] = "Wiadomość";
-$a->strings["Profiles"] = "Profile";
-$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
-$a->strings["Network:"] = "";
-$a->strings["g A l F d"] = "g A I F d";
-$a->strings["F d"] = "";
-$a->strings["[today]"] = "[dziś]";
-$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
-$a->strings["Birthdays this week:"] = "Urodziny w tym tygodniu:";
-$a->strings["[No description]"] = "[Brak opisu]";
-$a->strings["Event Reminders"] = "Przypominacze wydarzeń";
-$a->strings["Events this week:"] = "Wydarzenia w tym tygodniu:";
-$a->strings["Status"] = "Status";
-$a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
-$a->strings["Profile Details"] = "Szczegóły profilu";
-$a->strings["Videos"] = "Filmy";
-$a->strings["Events and Calendar"] = "Wydarzenia i kalendarz";
-$a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
 $a->strings["This entry was edited"] = "Ten wpis został zedytowany";
 $a->strings["ignore thread"] = "";
 $a->strings["unignore thread"] = "";
@ -1356,7 +1389,7 @@ $a->strings["Edit Sent Posts"] = "";
 $a->strings["Edit and correct posts and comments after sending"] = "";
 $a->strings["Tagging"] = "Oznaczanie";
 $a->strings["Ability to tag existing posts"] = "";
-$a->strings["Post Categories"] = "";
+$a->strings["Post Categories"] = "Kategorie postów";
 $a->strings["Add categories to your posts"] = "Dodaj kategorie do twoich postów";
 $a->strings["Ability to file posts under folders"] = "";
 $a->strings["Dislike Posts"] = "";
@ -1385,15 +1418,16 @@ $a->strings["Edit group"] = "Edytuj grupy";
 $a->strings["Create a new group"] = "Stwórz nową grupę";
 $a->strings["Contacts not in any group"] = "Kontakt nie jest w żadnej grupie";
 $a->strings["Miscellaneous"] = "Różny";
-$a->strings["year"] = "rok";
-$a->strings["month"] = "miesiąc";
-$a->strings["day"] = "dzień";
+$a->strings["YYYY-MM-DD or MM-DD"] = "";
 $a->strings["never"] = "nigdy";
 $a->strings["less than a second ago"] = "mniej niż sekundę temu";
+$a->strings["year"] = "rok";
 $a->strings["years"] = "lata";
+$a->strings["month"] = "miesiąc";
 $a->strings["months"] = "miesiące";
 $a->strings["week"] = "tydzień";
 $a->strings["weeks"] = "tygodnie";
+$a->strings["day"] = "dzień";
 $a->strings["days"] = "dni";
 $a->strings["hour"] = "godzina";
 $a->strings["hours"] = "godziny";
@ -1404,6 +1438,43 @@ $a->strings["seconds"] = "sekundy";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s temu";
 $a->strings["%s's birthday"] = "Urodziny %s";
 $a->strings["Happy Birthday %s"] = "Urodziny %s";
+$a->strings["Requested account is not available."] = "";
+$a->strings["Edit profile"] = "Edytuj profil";
+$a->strings["Message"] = "Wiadomość";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
+$a->strings["Network:"] = "";
+$a->strings["g A l F d"] = "g A I F d";
+$a->strings["F d"] = "";
+$a->strings["[today]"] = "[dziś]";
+$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
+$a->strings["Birthdays this week:"] = "Urodziny w tym tygodniu:";
+$a->strings["[No description]"] = "[Brak opisu]";
+$a->strings["Event Reminders"] = "Przypominacze wydarzeń";
+$a->strings["Events this week:"] = "Wydarzenia w tym tygodniu:";
+$a->strings["j F, Y"] = "d M, R";
+$a->strings["j F"] = "d M";
+$a->strings["Birthday:"] = "Urodziny:";
+$a->strings["Age:"] = "Wiek:";
+$a->strings["for %1\$d %2\$s"] = "od %1\$d %2\$s";
+$a->strings["Religion:"] = "Religia:";
+$a->strings["Hobbies/Interests:"] = "Hobby/Zainteresowania:";
+$a->strings["Contact information and Social Networks:"] = "Informacje kontaktowe i sieci społeczne";
+$a->strings["Musical interests:"] = "Zainteresowania muzyczne:";
+$a->strings["Books, literature:"] = "Książki, literatura:";
+$a->strings["Television:"] = "Telewizja:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/taniec/kultura/rozrywka";
+$a->strings["Love/Romance:"] = "Miłość/Romans:";
+$a->strings["Work/employment:"] = "Praca/zatrudnienie:";
+$a->strings["School/education:"] = "Szkoła/edukacja:";
+$a->strings["Status"] = "Status";
+$a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
+$a->strings["Profile Details"] = "Szczegóły profilu";
+$a->strings["Videos"] = "Filmy";
+$a->strings["Events and Calendar"] = "Wydarzenia i kalendarz";
+$a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
+$a->strings["Post to Email"] = "Wyślij poprzez email";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["Visible to everybody"] = "Widoczny dla wszystkich";
 $a->strings["show"] = "pokaż";
 $a->strings["don't show"] = "nie pokazuj";
@ -1423,7 +1494,6 @@ $a->strings["Welcome back "] = "Witaj ponownie ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "";
 $a->strings["event"] = "wydarzenie";
 $a->strings["%1\$s poked %2\$s"] = "";
-$a->strings["poked"] = "zaczepiony";
 $a->strings["post/item"] = "";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "";
 $a->strings["remove"] = "usuń";
@ -1443,8 +1513,6 @@ $a->strings["Please enter an audio link/URL:"] = "Podaj link do muzyki";
 $a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
 $a->strings["Delete item(s)?"] = "Usunąć pozycję (pozycje)?";
-$a->strings["Post to Email"] = "Wyślij poprzez email";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "zezwolenia";
 $a->strings["Post to Groups"] = "Wstaw na strony grup";
 $a->strings["Post to Contacts"] = "Wstaw do kontaktów";
@ -1456,13 +1524,19 @@ $a->strings["prev"] = "poprzedni";
 $a->strings["first"] = "pierwszy";
 $a->strings["last"] = "ostatni";
 $a->strings["next"] = "następny";
+$a->strings["Loading more entries..."] = "";
+$a->strings["The end"] = "";
 $a->strings["No contacts"] = "Brak kontaktów";
 $a->strings["%d Contact"] = array(
 	0 => "%d kontakt",
 	1 => "%d kontaktów",
 	2 => "%d kontakty",
 );
+$a->strings["Full Text"] = "";
+$a->strings["Tags"] = "";
+$a->strings["Forums"] = "";
 $a->strings["poke"] = "zaczep";
+$a->strings["poked"] = "zaczepiony";
 $a->strings["ping"] = "ping";
 $a->strings["pinged"] = "";
 $a->strings["prod"] = "";
@ -1514,6 +1588,8 @@ $a->strings["November"] = "Listopad";
 $a->strings["December"] = "Grudzień";
 $a->strings["bytes"] = "bajty";
 $a->strings["Click to open/close"] = "Kliknij aby otworzyć/zamknąć";
+$a->strings["View on separate page"] = "";
+$a->strings["view on separate page"] = "";
 $a->strings["default"] = "standardowe";
 $a->strings["Select an alternate language"] = "Wybierz alternatywny język";
 $a->strings["activity"] = "aktywność";
@ -1547,25 +1623,10 @@ $a->strings["Twitter"] = "";
 $a->strings["Diaspora Connector"] = "";
 $a->strings["Statusnet"] = "";
 $a->strings["App.net"] = "";
+$a->strings["Redmatrix"] = "";
 $a->strings[" on Last.fm"] = "na Last.fm";
 $a->strings["Starts:"] = "Start:";
 $a->strings["Finishes:"] = "Wykończenia:";
-$a->strings["j F, Y"] = "d M, R";
-$a->strings["j F"] = "d M";
-$a->strings["Birthday:"] = "Urodziny:";
-$a->strings["Age:"] = "Wiek:";
-$a->strings["for %1\$d %2\$s"] = "od %1\$d %2\$s";
-$a->strings["Tags:"] = "Tagi:";
-$a->strings["Religion:"] = "Religia:";
-$a->strings["Hobbies/Interests:"] = "Hobby/Zainteresowania:";
-$a->strings["Contact information and Social Networks:"] = "Informacje kontaktowe i sieci społeczne";
-$a->strings["Musical interests:"] = "Zainteresowania muzyczne:";
-$a->strings["Books, literature:"] = "Książki, literatura:";
-$a->strings["Television:"] = "Telewizja:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/taniec/kultura/rozrywka";
-$a->strings["Love/Romance:"] = "Miłość/Romans:";
-$a->strings["Work/employment:"] = "Praca/zatrudnienie:";
-$a->strings["School/education:"] = "Szkoła/edukacja:";
 $a->strings["Click here to upgrade."] = "Kliknij tu, aby zaktualizować.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
 $a->strings["This action is not available under your subscription plan."] = "";
@ -1613,7 +1674,6 @@ $a->strings["Weekly posting limit of %d posts reached. The post was rejected."]
 $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "";
 $a->strings["There is no status with this id."] = "";
 $a->strings["There is no conversation with this id."] = "";
-$a->strings["Invalid request."] = "";
 $a->strings["Invalid item."] = "";
 $a->strings["Invalid action. "] = "";
 $a->strings["DB error"] = "";
@ -1627,7 +1687,7 @@ $a->strings["That doesn't appear to be your full (First Last) name."] = "Zdaje m
 $a->strings["Your email domain is not among those allowed on this site."] = "Twoja domena internetowa nie jest obsługiwana na tej stronie.";
 $a->strings["Not a valid email address."] = "Niepoprawny adres e mail..";
 $a->strings["Cannot use that email."] = "Nie możesz użyć tego e-maila. ";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Twój login może składać się tylko z \"a-z\",  \"0-9\", \"-\", \"_\", i musi mieć na początku literę.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "";
 $a->strings["Nickname is already registered. Please choose another."] = "Ten login jest zajęty. Wybierz inny.";
 $a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Ten nick był już zarejestrowany na tej stronie i nie może być użyty ponownie.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń.";
@ -1743,7 +1803,7 @@ $a->strings["Name:"] = "Imię:";
 $a->strings["Photo:"] = "Zdjęcie:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "";
 $a->strings["[Friendica:Notify] Connection accepted"] = "";
-$a->strings["'%1\$s' has acepted your connection request at %2\$s"] = "";
+$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "";
 $a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "";
 $a->strings["You are now mutual friends and may exchange status updates, photos, and email\n\twithout restriction."] = "";
 $a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "";
@ -1769,7 +1829,6 @@ $a->strings["%d contact not imported"] = array(
 );
 $a->strings["Done. You can now login with your username and password"] = "Wykonano. Teraz możesz się zalogować z użyciem loginu i hasła.";
 $a->strings["toggle mobile"] = "przełącz na mobilny";
-$a->strings["Theme settings"] = "Ustawienia motywu";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "";
 $a->strings["Set font-size for posts and comments"] = "Ustaw rozmiar fontów dla postów i komentarzy";
 $a->strings["Set theme width"] = "Ustaw szerokość motywu";
--- a/view/templates/diaspora_vcard.tpl
+++ b/view/templates/diaspora_vcard.tpl
@ -1,34 +1,45 @@

 <div style="display:none;">
+	<dl class="entity_uid">
+		<dt>Uid</dt>
+		<dd>
+			<span class="uid">{{$diaspora.guid}}</span>
+		</dd>
+	</dl>
 	<dl class='entity_nickname'>
 		<dt>Nickname</dt>
 		<dd>		
-			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
+			<span class="nickname">{{$diaspora.nickname}}</span>
 		</dd>
 	</dl>
-	<dl class='entity_fn'>
-		<dt>Full name</dt>
+	<dl class='entity_full_name'>
+		<dt>Full_name</dt>
 		<dd>
 			<span class='fn'>{{$diaspora.fullname}}</span>
 		</dd>
 	</dl>
-
-	<dl class='entity_given_name'>
-		<dt>First name</dt>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">{{$diaspora.searchable}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_first_name'>
+		<dt>First_name</dt>
 		<dd>
 		<span class='given_name'>{{$diaspora.firstname}}</span>
 		</dd>
 	</dl>
 	<dl class='entity_family_name'>
-		<dt>Family name</dt>
+		<dt>Family_name</dt>
 		<dd>
 		<span class='family_name'>{{$diaspora.lastname}}</span>
 		</dd>
 	</dl>
 	<dl class="entity_url">
-		<dt>URL</dt>
+		<dt>Url</dt>
 		<dd>
-			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
+			<a id="pod_location" class="url" rel="me" href="{{$diaspora.podloc}}/">{{$diaspora.podloc}}/</a>
 		</dd>
 	</dl>
 	<dl class="entity_photo">
@ -38,21 +49,15 @@
 		</dd>
 	</dl>
 	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
+		<dt>Photo_medium</dt>
 		<dd> 
 			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
 		</dd>
 	</dl>
 	<dl class="entity_photo_small">
-		<dt>Photo</dt>
+		<dt>Photo_small</dt>
 		<dd>
 			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
 		</dd>
 	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
 </div>
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@ -47,11 +47,6 @@ $a->config['system']['maximagesize'] = 800000;

 $a->config['php_path'] = '{{$phpath}}';

-// Location of global directory submission page.
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
-
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts

 $a->config['system']['huburl'] = '[internal]';
@ -69,3 +64,9 @@ $a->config['system']['theme'] = 'duepuntozero';
 // By default allow pseudonyms

 $a->config['system']['no_regfullname'] = true;
+
+//Deny public access to the local directory
+//$a->config['system']['block_local_dir'] = false;
+
+// Location of the global directory
+$a->config['system']['directory'] = 'http://dir.friendi.ca';
--- a/view/templates/xrd_host.tpl
+++ b/view/templates/xrd_host.tpl
@ -1,11 +1,10 @@
-
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
     xmlns:hm='http://host-meta.net/xrd/1.0'>
 
    <hm:Host>{{$zhost}}</hm:Host>
 
-    <Link rel='lrdd' template='{{$domain}}/xrd/?uri={uri}' />
+    <Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd/?uri={uri}' />
    <Link rel='acct-mgmt' href='{{$domain}}/amcd' />
    <Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
 	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
@ -14,6 +13,4 @@
    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
        type="http://salmon-protocol.org/ns/magic-key"
        mk:key_id="1">{{$bigkey}}</Property>
-
-
 </XRD>
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@ -324,11 +324,12 @@ li.icon.icon-large:before {

 .icon-user-md:before              { content: "\f200"; }

-.icon.type-image:before           { content: "\f03e"; }
-.icon.type-video:before           { content: "\f008"; }
-.icon.type-audio:before           { content: "\f001"; }
-.icon.type-text:before            { content: "\f036"; }
-.icon.type.unkn:before            { content: "\f059"; }
+.icon.type-image:before           { content: "\f1c5"; }
+.icon.type-video:before           { content: "\f1c8"; }
+.icon.type-audio:before           { content: "\f1c7"; }
+.icon.type-text:before            { content: "\f0f6"; }
+.icon.type-application:before     { content: "\f016"; }
+.icon.type-unkn:before            { content: "\f016"; }

 .icon.drop:before                 { content: "\f014"; }
 .icon.drophide:before             { content: "\f014"; }