From 6088f59c33d7136d416d184871c19f98ffbddc52 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 7 Sep 2015 23:14:18 +0200
Subject: [PATCH 01/22] Bugfix: "remote self" items weren't posted by
 connectors

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

diff --git a/include/items.php b/include/items.php
index 5915e2ece..9a4d4d5e3 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1423,7 +1423,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	// Fill the cache field
 	put_item_in_cache($arr);
 
-	call_hooks('post_remote',$arr);
+	if ($notify)
+		call_hooks('post_local',$arr);
+	else
+		call_hooks('post_remote',$arr);
 
 	if(x($arr,'cancel')) {
 		logger('item_store: post cancelled by plugin.');
@@ -1569,7 +1572,10 @@ 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) {
-			call_hooks('post_remote_end', $r[0]);
+			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);
 	}

From f2cb9b889edfd296fc934ac86222d750e2cf3a33 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 7 Sep 2015 23:33:02 +0200
Subject: [PATCH 02/22] Only set a prefix for the guid if it is a locally
 stored item

---
 include/items.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 9a4d4d5e3..b00942b5a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1209,8 +1209,13 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 	}
 
+	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']))   : '');

From 91d5c316568aef37bd3024412796a652b05fd6f8 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 11 Sep 2015 20:46:55 +0200
Subject: [PATCH 03/22] Issue 1886: Some speedup for poco

---
 include/socgraph.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/socgraph.php b/include/socgraph.php
index 97daae1d2..1a92a7256 100644
--- 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;
@@ -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"]));
+			}
 		}
 }
 

From a98d10e800ef4efa7d5df88e40c2af7883823737 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 14 Sep 2015 15:22:41 +0200
Subject: [PATCH 04/22] Update CHANGELOG

---
 CHANGELOG | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 257a2868e..e37f45a87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,45 @@
+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)
+	fFx 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)
+	Option to automatically follow OStatus contacts was moved from addon to the core (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 accessability 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 (predecessor of current statistics.json), addon deprecated as functionality has been moved in 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)
+	
 Version 3.4.1
 
 	Implement server-to-server encryption (RINO) using php-encryption library as "RINO 2", deprecate "RINO 1" (issue #1655) (fabrixxm)

From 7affbba05535b288d8044b7efcd7e79d1ee226ca Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 14 Sep 2015 17:31:13 +0200
Subject: [PATCH 05/22] Fix CHANGELOG

---
 CHANGELOG | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e37f45a87..01ae443d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ Version 3.4.2
 	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)
-	fFx for saving searches (rabuzarus)
+	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)
@@ -27,7 +27,7 @@ Version 3.4.2
 	Improved the accessability 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 (predecessor of current statistics.json), addon deprecated as functionality has been moved in core (annando)
+	Support for the new nodeinfo protocol (successor of current statistics.json), addon deprecated as functionality has been moved in 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)

From 345b0d81dd4db30a4de339df3e55b2c409ef521f Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 14 Sep 2015 23:14:21 +0200
Subject: [PATCH 06/22] Picture import from Diaspora often failed

---
 include/dsprphotoq.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/dsprphotoq.php b/include/dsprphotoq.php
index 7e252cd84..0d8088d4b 100644
--- a/include/dsprphotoq.php
+++ b/include/dsprphotoq.php
@@ -28,9 +28,14 @@ function dsprphotoq_run($argv, $argc){
 
 	foreach($dphotos as $dphoto) {
 
-		$r = q("SELECT * FROM user WHERE uid = %d",
-			intval($dphoto['uid'])
-		);
+		$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']));
+
 		if(!$r) {
 			logger("diaspora photo queue: user " . $dphoto['uid'] . " not found");
 			return;

From 5ac38b7f99979c0c47d3e5a9dcd014723825f644 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 15 Sep 2015 22:29:02 +0200
Subject: [PATCH 07/22] There is now only one central parameter for the global
 directory.

---
 doc/Settings.md             |  2 +-
 doc/de/Settings.md          |  2 +-
 htconfig.php                | 29 ++++++---------------
 include/directory.php       |  6 +++--
 include/nav.php             |  2 +-
 include/profile_update.php  |  2 +-
 include/socgraph.php        |  2 +-
 include/user.php            |  2 +-
 mod/admin.php               | 22 ++++++++--------
 mod/directory.php           |  2 +-
 mod/dirfind.php             |  4 ++-
 mod/invite.php              | 10 ++++----
 mod/match.php               | 50 ++++++++++++++++++++-----------------
 mod/profile_photo.php       |  4 +--
 mod/profiles.php            |  2 +-
 mod/regmod.php              |  2 +-
 mod/settings.php            |  4 +--
 util/htconfig.vagrant.php   | 23 +++++++++--------
 view/templates/htconfig.tpl | 21 ++++++++--------
 19 files changed, 92 insertions(+), 99 deletions(-)

diff --git a/doc/Settings.md b/doc/Settings.md
index fee8ec1c5..60fff847a 100644
--- 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
 ---
diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 6bc238e26..988b3657c 100644
--- 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';
 ```
 
 
diff --git a/htconfig.php b/htconfig.php
index 9b5771445..508de9a32 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -1,12 +1,12 @@
 <?php
 
-// If automatic system installation fails: 
+// If automatic system installation fails:
 
 // Copy or rename this file to .htconfig.php
 
 // Why .htconfig.php? Because it contains sensitive information which could
-// give somebody complete control of your database. Apache's default 
-// configuration denies access to and refuses to serve any file beginning 
+// give somebody complete control of your database. Apache's default
+// configuration denies access to and refuses to serve any file beginning
 // with .ht
 
 // Then set the following for your MySQL installation
@@ -26,11 +26,11 @@ $default_timezone = 'America/Los_Angeles';
 $a->config['sitename'] = "Friendica Social Network";
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
 // to the email address of an already registered person who can authorise
-// and/or approve/deny the request. 
+// and/or approve/deny the request.
 
 // In order to perform system administration via the admin panel, admin_email
 // must precisely match the email address of the person logged in.
@@ -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';
diff --git a/include/directory.php b/include/directory.php
index aed700fa8..85476bd5f 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -7,7 +7,7 @@ function directory_run(&$argv, &$argc){
 	if(is_null($a)) {
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
 		@include(".htconfig.php");
 		require_once("include/dba.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);
diff --git a/include/nav.php b/include/nav.php
index e7f51cc0c..935d08f52 100644
--- 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;
 	}
diff --git a/include/profile_update.php b/include/profile_update.php
index 9da96442c..0fcf3617f 100644
--- 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'
diff --git a/include/socgraph.php b/include/socgraph.php
index 97daae1d2..5d7b8e0d4 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -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);
diff --git a/include/user.php b/include/user.php
index 33ff46ee6..d989664ac 100644
--- 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;
diff --git a/mod/admin.php b/mod/admin.php
index d54d25a51..002d332cb 100644
--- 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);
@@ -578,7 +570,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 +582,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 +717,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.")),
diff --git a/mod/directory.php b/mod/directory.php
index cce281881..fa3a89e45 100644
--- 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>';
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 2295b3772..b0d578a3c 100644
--- 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,
diff --git a/mod/invite.php b/mod/invite.php
index aea92a663..ccf876c7c 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -112,15 +112,15 @@ function invite_content(&$a) {
 			notice( t('You have no more invitations available') . EOL);
 			return '';
 		}
-	}			
+	}
 
-	$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.');
@@ -141,4 +141,4 @@ function invite_content(&$a) {
 	));
 
 	return $o;
-}
\ No newline at end of file
+}
diff --git a/mod/match.php b/mod/match.php
index 199ad9ed7..74f83a6cc 100644
--- 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(
@@ -17,7 +22,7 @@ function match_content(&$a) {
 		intval(local_user())
 	);
 	if(! count($r))
-		return; 
+		return;
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
 		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
@@ -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);
@@ -47,31 +52,30 @@ function match_content(&$a) {
 		if(count($j->results)) {
 
 
-			
+
 			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
-			    $match_nurl = normalise_link($jj->url);
-			    $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
-				intval(local_user()),
-				dbesc($match_nurl));
-			    if (!count($match)) {
-				
-				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-				$o .= replace_macros($tpl,array(
-					'$url' => zrl($jj->url),
-					'$name' => $jj->name,
-					'$photo' => proxy_url($jj->photo),
-					'$inttxt' => ' ' . t('is interested in:'),
-					'$conntxt' => t('Connect'),
-					'$connlnk' => $connlnk,
-					'$tags' => $jj->tags
-				));
-			    }
+				$match_nurl = normalise_link($jj->url);
+				$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
+					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),
+						'$name' => $jj->name,
+						'$photo' => proxy_url($jj->photo),
+						'$inttxt' => ' ' . t('is interested in:'),
+						'$conntxt' => t('Connect'),
+						'$connlnk' => $connlnk,
+						'$tags' => $jj->tags
+					));
+				}
 			}
-		}
-		else {
+		} else {
 			info( t('No matches') . EOL);
-		}		
+		}
 
 	}
 
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 6607eebd0..aa8809059 100644
--- 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');
diff --git a/mod/profiles.php b/mod/profiles.php
index 993504a71..6c1a82c7b 100644
--- 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');
diff --git a/mod/regmod.php b/mod/regmod.php
index 3ab43b105..5a90db1f9 100644
--- 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");
 	}
 
diff --git a/mod/settings.php b/mod/settings.php
index a985985c7..556fb63e8 100644
--- 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'))),
 		));
diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php
index 36fd4b9c9..4665e68c0 100644
--- a/util/htconfig.vagrant.php
+++ b/util/htconfig.vagrant.php
@@ -11,10 +11,10 @@ $db_data = 'friendica';
 // If you are using a subdirectory of your domain you will need to put the
 // relative path (from the root of your domain) here.
 // For instance if your URL is 'http://example.com/directory/subdirectory',
-// set path to 'directory/subdirectory'. 
+// set path to 'directory/subdirectory'.
 
 $a->path = '';
- 
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
@@ -25,8 +25,8 @@ $default_timezone = 'Europe/Berlin';
 $a->config['sitename'] = "My Friend Network";
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
 // to the email address of an already registered person who can authorise
 // and/or approve/deny the request.
@@ -47,18 +47,13 @@ $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]';
 
-// Server-to-server private message encryption (RINO) is allowed by default. 
+// Server-to-server private message encryption (RINO) is allowed by default.
 // Encryption will only be provided if this setting is true and the
-// PHP mcrypt extension is installed on both systems 
+// PHP mcrypt extension is installed on both systems
 
 $a->config['system']['rino_encrypt'] = true;
 
@@ -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';
diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 7c71623dd..6b3bda617 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -11,7 +11,7 @@ $db_data = '{{$dbdata}}';
 // If you are using a subdirectory of your domain you will need to put the
 // relative path (from the root of your domain) here.
 // For instance if your URL is 'http://example.com/directory/subdirectory',
-// set path to 'directory/subdirectory'. 
+// set path to 'directory/subdirectory'.
 
 $a->path = '{{$urlpath}}';
  
@@ -25,8 +25,8 @@ $default_timezone = '{{$timezone}}';
 $a->config['sitename'] = "My Friend Network";
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
 // to the email address of an already registered person who can authorise
 // and/or approve/deny the request.
@@ -47,18 +47,13 @@ $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]';
 
-// Server-to-server private message encryption (RINO) is allowed by default. 
+// Server-to-server private message encryption (RINO) is allowed by default.
 // Encryption will only be provided if this setting is true and the
-// PHP mcrypt extension is installed on both systems 
+// PHP mcrypt extension is installed on both systems
 
 $a->config['system']['rino_encrypt'] = true;
 
@@ -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';

From 8086a21b373a53fcbb0c448e218cc63601cfa03e Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 16 Sep 2015 16:59:14 +0200
Subject: [PATCH 08/22] Fix CHANGELOG

---
 CHANGELOG | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 01ae443d3..df571e552 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,14 +20,13 @@ Version 3.4.2
 	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)
-	Option to automatically follow OStatus contacts was moved from addon to the core (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 accessability of the web UI for better screen reader compatibility (annando)
+	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 in core (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)

From dbc9d8715671197a9129dbcba27ee54248ae300a Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 17 Sep 2015 14:24:07 +0200
Subject: [PATCH 09/22] DE update to the strings

---
 view/de/messages.po | 6 +++---
 view/de/strings.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 51682d23d..e1d3d54f8 100644
--- 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"
diff --git a/view/de/strings.php b/view/de/strings.php
index b5d19b92e..a800561db 100644
--- 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";

From 6be65f4eae5575e7f5f5f6f345afe0f1f0a55dff Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 18 Sep 2015 21:09:31 +0200
Subject: [PATCH 10/22] Now attachments of the type "application" are displayed
 as well.

---
 view/theme/vier/css/font2.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
index 472af62c2..4300a910c 100644
--- 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"; }

From a9fdba638f75e49badac271fd6a2bf0c367257c7 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 19 Sep 2015 11:30:19 +0200
Subject: [PATCH 11/22] Avoiding errors when checking for the lockpath

---
 boot.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 7451891fe..e2eed38eb 100644
--- a/boot.php
+++ b/boot.php
@@ -1811,7 +1811,11 @@ function get_lockpath() {
 
 	if ($temppath != "") {
 		$lockpath = $temppath."/lock";
-		mkdir($lockpath);
+
+		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);

From 25fc2c97994358c23e60284da377dbbde1f35e60 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 19 Sep 2015 14:00:33 +0200
Subject: [PATCH 12/22] Some changes to stay compatible to Diaspora

---
 include/identity.php              |  1 +
 view/templates/diaspora_vcard.tpl | 39 +++++++++++++++++--------------
 view/templates/xrd_host.tpl       |  5 +---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 9f3e1dda0..0fba0c592 100644
--- 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'],
diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl
index 25a0fe0fc..58419bd13 100644
--- 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>
diff --git a/view/templates/xrd_host.tpl b/view/templates/xrd_host.tpl
index 29d9e7a6d..5df18b173 100644
--- 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>

From 554948c22ae1783876e28793073341a3027a5e4d Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 22 Sep 2015 09:50:24 +0200
Subject: [PATCH 13/22] Adds checks for mcrypt module for RINO2

- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
---
 include/items.php   | 2 ++
 mod/admin.php       | 7 ++++++-
 mod/dfrn_notify.php | 6 +++++-
 mod/install.php     | 7 +++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/include/items.php b/include/items.php
index b00942b5a..637826757 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2000,6 +2000,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);
 
diff --git a/mod/admin.php b/mod/admin.php
index 002d332cb..878508a23 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -551,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);
 
-	set_config('system','rino_encrypt', $rino);
+	
+	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);
 
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index fe7adca41..fcc572654 100644
--- 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,7 +309,9 @@ 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);
 
 		// if requested rino is lower than enabled local rino, lower local rino version
diff --git a/mod/install.php b/mod/install.php
index 99ebfc6ba..182495d25 100755
--- 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,7 +423,13 @@ 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);
 
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))

From 69dd6869f251758173b008b12daff97ff61a02ef Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 22 Sep 2015 09:59:12 +0200
Subject: [PATCH 14/22] update messages.po

---
 util/messages.po | 10920 +++++++++++++++++++++++----------------------
 1 file changed, 5544 insertions(+), 5376 deletions(-)

diff --git a/util/messages.po b/util/messages.po
index 14aab3dcf..a6792943b 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 07:09+0200\n"
+"POT-Creation-Date: 2015-09-22 09:58+0200\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"
@@ -18,6 +18,3090 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
+#: object/Item.php:95
+msgid "This entry was edited"
+msgstr ""
+
+#: object/Item.php:117 mod/photos.php:1379 mod/content.php:622
+msgid "Private Message"
+msgstr ""
+
+#: object/Item.php:121 mod/settings.php:694 mod/content.php:730
+msgid "Edit"
+msgstr ""
+
+#: object/Item.php:130 mod/photos.php:1672 mod/content.php:439
+#: mod/content.php:742 include/conversation.php:612
+msgid "Select"
+msgstr ""
+
+#: object/Item.php:131 mod/admin.php:1087 mod/photos.php:1673
+#: mod/contacts.php:801 mod/settings.php:695 mod/group.php:171
+#: mod/content.php:440 mod/content.php:743 include/conversation.php:613
+msgid "Delete"
+msgstr ""
+
+#: object/Item.php:134 mod/content.php:765
+msgid "save to folder"
+msgstr ""
+
+#: object/Item.php:196 mod/content.php:755
+msgid "add star"
+msgstr ""
+
+#: object/Item.php:197 mod/content.php:756
+msgid "remove star"
+msgstr ""
+
+#: object/Item.php:198 mod/content.php:757
+msgid "toggle star status"
+msgstr ""
+
+#: object/Item.php:201 mod/content.php:760
+msgid "starred"
+msgstr ""
+
+#: object/Item.php:209
+msgid "ignore thread"
+msgstr ""
+
+#: object/Item.php:210
+msgid "unignore thread"
+msgstr ""
+
+#: object/Item.php:211
+msgid "toggle ignore status"
+msgstr ""
+
+#: object/Item.php:214 mod/ostatus_subscribe.php:69
+msgid "ignored"
+msgstr ""
+
+#: object/Item.php:221 mod/content.php:761
+msgid "add tag"
+msgstr ""
+
+#: object/Item.php:232 mod/photos.php:1561 mod/content.php:686
+msgid "I like this (toggle)"
+msgstr ""
+
+#: object/Item.php:232 mod/content.php:686
+msgid "like"
+msgstr ""
+
+#: object/Item.php:233 mod/photos.php:1562 mod/content.php:687
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: object/Item.php:233 mod/content.php:687
+msgid "dislike"
+msgstr ""
+
+#: object/Item.php:235 mod/content.php:689
+msgid "Share this"
+msgstr ""
+
+#: object/Item.php:235 mod/content.php:689
+msgid "share"
+msgstr ""
+
+#: object/Item.php:318 include/conversation.php:665
+msgid "Categories:"
+msgstr ""
+
+#: object/Item.php:319 include/conversation.php:666
+msgid "Filed under:"
+msgstr ""
+
+#: object/Item.php:328 object/Item.php:329 mod/content.php:473
+#: mod/content.php:854 mod/content.php:855 include/conversation.php:653
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: object/Item.php:330 mod/content.php:856
+msgid "to"
+msgstr ""
+
+#: object/Item.php:331
+msgid "via"
+msgstr ""
+
+#: object/Item.php:332 mod/content.php:857
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: object/Item.php:333 mod/content.php:858
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: object/Item.php:342 mod/content.php:483 mod/content.php:866
+#: include/conversation.php:673
+#, php-format
+msgid "%s from %s"
+msgstr ""
+
+#: object/Item.php:363 object/Item.php:679 mod/photos.php:1583
+#: mod/photos.php:1627 mod/photos.php:1715 mod/content.php:711 boot.php:764
+msgid "Comment"
+msgstr ""
+
+#: object/Item.php:366 mod/message.php:335 mod/message.php:566
+#: mod/editpost.php:124 mod/wallmessage.php:156 mod/photos.php:1564
+#: mod/content.php:501 mod/content.php:885 include/conversation.php:691
+#: include/conversation.php:1074
+msgid "Please wait"
+msgstr ""
+
+#: object/Item.php:389 mod/content.php:605
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: object/Item.php:391 object/Item.php:404 mod/content.php:607
+#: include/text.php:2038
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: object/Item.php:392 mod/content.php:608 boot.php:765 include/items.php:5147
+#: include/contact_widgets.php:205
+msgid "show more"
+msgstr ""
+
+#: object/Item.php:677 mod/photos.php:1581 mod/photos.php:1625
+#: mod/photos.php:1713 mod/content.php:709
+msgid "This is you"
+msgstr ""
+
+#: object/Item.php:680 mod/fsuggest.php:107 mod/message.php:336
+#: mod/message.php:565 mod/events.php:511 mod/photos.php:1104
+#: mod/photos.php:1223 mod/photos.php:1533 mod/photos.php:1584
+#: mod/photos.php:1628 mod/photos.php:1716 mod/contacts.php:596
+#: mod/invite.php:140 mod/profiles.php:683 mod/manage.php:110 mod/poke.php:199
+#: mod/localtime.php:45 mod/install.php:250 mod/install.php:288
+#: mod/content.php:712 mod/mood.php:137 mod/crepair.php:191
+#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148
+#: view/theme/vier/config.php:56 view/theme/dispy/config.php:70
+#: view/theme/duepuntozero/config.php:59 view/theme/quattro/config.php:64
+#: view/theme/cleanzero/config.php:80
+msgid "Submit"
+msgstr ""
+
+#: object/Item.php:681 mod/content.php:713
+msgid "Bold"
+msgstr ""
+
+#: object/Item.php:682 mod/content.php:714
+msgid "Italic"
+msgstr ""
+
+#: object/Item.php:683 mod/content.php:715
+msgid "Underline"
+msgstr ""
+
+#: object/Item.php:684 mod/content.php:716
+msgid "Quote"
+msgstr ""
+
+#: object/Item.php:685 mod/content.php:717
+msgid "Code"
+msgstr ""
+
+#: object/Item.php:686 mod/content.php:718
+msgid "Image"
+msgstr ""
+
+#: object/Item.php:687 mod/content.php:719
+msgid "Link"
+msgstr ""
+
+#: object/Item.php:688 mod/content.php:720
+msgid "Video"
+msgstr ""
+
+#: object/Item.php:689 mod/editpost.php:145 mod/events.php:509
+#: mod/photos.php:1585 mod/photos.php:1629 mod/photos.php:1717
+#: mod/content.php:721 include/conversation.php:1089
+msgid "Preview"
+msgstr ""
+
+#: index.php:225 mod/apps.php:7
+msgid "You must be logged in to use addons. "
+msgstr ""
+
+#: index.php:269 mod/help.php:42 mod/p.php:16 mod/p.php:25
+msgid "Not Found"
+msgstr ""
+
+#: index.php:272 mod/help.php:45
+msgid "Page not found."
+msgstr ""
+
+#: index.php:381 mod/profperm.php:19 mod/group.php:72
+msgid "Permission denied"
+msgstr ""
+
+#: index.php:382 mod/fsuggest.php:78 mod/files.php:170
+#: mod/notifications.php:66 mod/message.php:39 mod/message.php:175
+#: mod/editpost.php:10 mod/dfrn_confirm.php:55 mod/events.php:164
+#: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79
+#: mod/wallmessage.php:103 mod/nogroup.php:25 mod/wall_upload.php:70
+#: mod/wall_upload.php:71 mod/api.php:26 mod/api.php:31 mod/photos.php:156
+#: mod/photos.php:1072 mod/register.php:42 mod/attach.php:33
+#: mod/contacts.php:350 mod/follow.php:9 mod/follow.php:44 mod/follow.php:83
+#: mod/uimport.php:23 mod/allfriends.php:9 mod/invite.php:15
+#: mod/invite.php:101 mod/settings.php:20 mod/settings.php:116
+#: mod/settings.php:619 mod/display.php:508 mod/profiles.php:165
+#: mod/profiles.php:615 mod/wall_attach.php:60 mod/wall_attach.php:61
+#: mod/suggest.php:58 mod/repair_ostatus.php:9 mod/manage.php:96
+#: mod/delegate.php:12 mod/viewcontacts.php:24 mod/notes.php:20
+#: mod/poke.php:135 mod/ostatus_subscribe.php:9 mod/profile_photo.php:19
+#: mod/profile_photo.php:169 mod/profile_photo.php:180
+#: mod/profile_photo.php:193 mod/group.php:19 mod/regmod.php:110
+#: mod/item.php:170 mod/item.php:186 mod/mood.php:114 mod/network.php:4
+#: mod/crepair.php:120 include/items.php:5036
+msgid "Permission denied."
+msgstr ""
+
+#: index.php:441
+msgid "toggle mobile"
+msgstr ""
+
+#: mod/update_notes.php:37 mod/update_profile.php:41
+#: mod/update_community.php:18 mod/update_network.php:25
+#: mod/update_display.php:22
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: mod/fsuggest.php:20 mod/fsuggest.php:92 mod/dfrn_confirm.php:120
+#: mod/crepair.php:134
+msgid "Contact not found."
+msgstr ""
+
+#: mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr ""
+
+#: mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr ""
+
+#: mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr ""
+
+#: mod/dfrn_request.php:95
+msgid "This introduction has already been accepted."
+msgstr ""
+
+#: mod/dfrn_request.php:120 mod/dfrn_request.php:518
+msgid "Profile location is not valid or does not contain profile information."
+msgstr ""
+
+#: mod/dfrn_request.php:125 mod/dfrn_request.php:523
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+
+#: mod/dfrn_request.php:127 mod/dfrn_request.php:525
+msgid "Warning: profile location has no profile photo."
+msgstr ""
+
+#: mod/dfrn_request.php:130 mod/dfrn_request.php:528
+#, 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"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/dfrn_request.php:172
+msgid "Introduction complete."
+msgstr ""
+
+#: mod/dfrn_request.php:214
+msgid "Unrecoverable protocol error."
+msgstr ""
+
+#: mod/dfrn_request.php:242
+msgid "Profile unavailable."
+msgstr ""
+
+#: mod/dfrn_request.php:267
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr ""
+
+#: mod/dfrn_request.php:268
+msgid "Spam protection measures have been invoked."
+msgstr ""
+
+#: mod/dfrn_request.php:269
+msgid "Friends are advised to please try again in 24 hours."
+msgstr ""
+
+#: mod/dfrn_request.php:331
+msgid "Invalid locator"
+msgstr ""
+
+#: mod/dfrn_request.php:340
+msgid "Invalid email address."
+msgstr ""
+
+#: mod/dfrn_request.php:367
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: mod/dfrn_request.php:463
+msgid "Unable to resolve your name at the provided location."
+msgstr ""
+
+#: mod/dfrn_request.php:476
+msgid "You have already introduced yourself here."
+msgstr ""
+
+#: mod/dfrn_request.php:480
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr ""
+
+#: mod/dfrn_request.php:501
+msgid "Invalid profile URL."
+msgstr ""
+
+#: mod/dfrn_request.php:507 include/follow.php:70
+msgid "Disallowed profile URL."
+msgstr ""
+
+#: mod/dfrn_request.php:576 mod/contacts.php:194
+msgid "Failed to update contact record."
+msgstr ""
+
+#: mod/dfrn_request.php:597
+msgid "Your introduction has been sent."
+msgstr ""
+
+#: mod/dfrn_request.php:650
+msgid "Please login to confirm introduction."
+msgstr ""
+
+#: mod/dfrn_request.php:660
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
+msgstr ""
+
+#: mod/dfrn_request.php:674 mod/dfrn_request.php:691
+msgid "Confirm"
+msgstr ""
+
+#: mod/dfrn_request.php:686
+msgid "Hide this contact"
+msgstr ""
+
+#: mod/dfrn_request.php:689
+#, php-format
+msgid "Welcome home %s."
+msgstr ""
+
+#: mod/dfrn_request.php:690
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: mod/dfrn_request.php:732 mod/dfrn_confirm.php:753 include/items.php:4250
+msgid "[Name Withheld]"
+msgstr ""
+
+#: mod/dfrn_request.php:777 mod/photos.php:942 mod/videos.php:187
+#: mod/search.php:93 mod/search.php:98 mod/display.php:223
+#: mod/community.php:18 mod/viewcontacts.php:19 mod/directory.php:35
+msgid "Public access denied."
+msgstr ""
+
+#: mod/dfrn_request.php:819
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr ""
+
+#: mod/dfrn_request.php:840
+#, php-format
+msgid ""
+"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>."
+msgstr ""
+
+#: mod/dfrn_request.php:845
+msgid "Friend/Connection Request"
+msgstr ""
+
+#: mod/dfrn_request.php:846
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr ""
+
+#: mod/dfrn_request.php:847 mod/follow.php:58
+msgid "Please answer the following:"
+msgstr ""
+
+#: mod/dfrn_request.php:848 mod/follow.php:59
+#, php-format
+msgid "Does %s know you?"
+msgstr ""
+
+#: mod/dfrn_request.php:848 mod/api.php:106 mod/register.php:236
+#: mod/follow.php:59 mod/settings.php:1068 mod/settings.php:1074
+#: mod/settings.php:1082 mod/settings.php:1086 mod/settings.php:1091
+#: mod/settings.php:1097 mod/settings.php:1103 mod/settings.php:1109
+#: mod/settings.php:1135 mod/settings.php:1136 mod/settings.php:1137
+#: mod/settings.php:1138 mod/settings.php:1139 mod/profiles.php:658
+#: mod/profiles.php:662
+msgid "No"
+msgstr ""
+
+#: mod/dfrn_request.php:848 mod/message.php:210 mod/api.php:105
+#: mod/register.php:235 mod/contacts.php:441 mod/follow.php:59
+#: mod/settings.php:1068 mod/settings.php:1074 mod/settings.php:1082
+#: mod/settings.php:1086 mod/settings.php:1091 mod/settings.php:1097
+#: mod/settings.php:1103 mod/settings.php:1109 mod/settings.php:1135
+#: mod/settings.php:1136 mod/settings.php:1137 mod/settings.php:1138
+#: mod/settings.php:1139 mod/profiles.php:658 mod/profiles.php:661
+#: mod/suggest.php:29 include/items.php:4868
+msgid "Yes"
+msgstr ""
+
+#: mod/dfrn_request.php:852 mod/follow.php:60
+msgid "Add a personal note:"
+msgstr ""
+
+#: mod/dfrn_request.php:854 include/contact_selectors.php:76
+msgid "Friendica"
+msgstr ""
+
+#: mod/dfrn_request.php:855
+msgid "StatusNet/Federated Social Web"
+msgstr ""
+
+#: mod/dfrn_request.php:856 mod/settings.php:793
+#: include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr ""
+
+#: mod/dfrn_request.php:857
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
+msgstr ""
+
+#: mod/dfrn_request.php:858 mod/follow.php:66
+msgid "Your Identity Address:"
+msgstr ""
+
+#: mod/dfrn_request.php:861 mod/follow.php:69
+msgid "Submit Request"
+msgstr ""
+
+#: mod/dfrn_request.php:862 mod/message.php:213 mod/editpost.php:148
+#: mod/fbrowser.php:89 mod/fbrowser.php:125 mod/photos.php:225
+#: mod/photos.php:314 mod/contacts.php:444 mod/videos.php:121
+#: mod/follow.php:70 mod/tagrm.php:11 mod/tagrm.php:94 mod/settings.php:633
+#: mod/settings.php:659 mod/suggest.php:32 include/items.php:4871
+#: include/conversation.php:1093
+msgid "Cancel"
+msgstr ""
+
+#: mod/files.php:156 mod/videos.php:373 include/text.php:1460
+msgid "View Video"
+msgstr ""
+
+#: mod/profile.php:21 include/identity.php:77
+msgid "Requested profile is not available."
+msgstr ""
+
+#: mod/profile.php:155 mod/display.php:343
+msgid "Access to this profile has been restricted."
+msgstr ""
+
+#: mod/profile.php:179
+msgid "Tips for New Members"
+msgstr ""
+
+#: mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr ""
+
+#: mod/notifications.php:35 mod/notifications.php:175
+#: mod/notifications.php:234
+msgid "Discard"
+msgstr ""
+
+#: mod/notifications.php:51 mod/notifications.php:174
+#: mod/notifications.php:233 mod/contacts.php:556 mod/contacts.php:623
+#: mod/contacts.php:799
+msgid "Ignore"
+msgstr ""
+
+#: mod/notifications.php:78
+msgid "System"
+msgstr ""
+
+#: mod/notifications.php:84 mod/admin.php:205 include/nav.php:153
+msgid "Network"
+msgstr ""
+
+#: mod/notifications.php:90 mod/network.php:375
+msgid "Personal"
+msgstr ""
+
+#: mod/notifications.php:96 view/theme/diabook/theme.php:123
+#: include/nav.php:105 include/nav.php:156
+msgid "Home"
+msgstr ""
+
+#: mod/notifications.php:102 include/nav.php:161
+msgid "Introductions"
+msgstr ""
+
+#: mod/notifications.php:127
+msgid "Show Ignored Requests"
+msgstr ""
+
+#: mod/notifications.php:127
+msgid "Hide Ignored Requests"
+msgstr ""
+
+#: mod/notifications.php:159 mod/notifications.php:209
+msgid "Notification type: "
+msgstr ""
+
+#: mod/notifications.php:160
+msgid "Friend Suggestion"
+msgstr ""
+
+#: mod/notifications.php:162
+#, php-format
+msgid "suggested by %s"
+msgstr ""
+
+#: mod/notifications.php:167 mod/notifications.php:227 mod/contacts.php:629
+msgid "Hide this contact from others"
+msgstr ""
+
+#: mod/notifications.php:168 mod/notifications.php:228
+msgid "Post a new friend activity"
+msgstr ""
+
+#: mod/notifications.php:168 mod/notifications.php:228
+msgid "if applicable"
+msgstr ""
+
+#: mod/notifications.php:171 mod/notifications.php:231 mod/admin.php:1085
+msgid "Approve"
+msgstr ""
+
+#: mod/notifications.php:191
+msgid "Claims to be known to you: "
+msgstr ""
+
+#: mod/notifications.php:191
+msgid "yes"
+msgstr ""
+
+#: mod/notifications.php:191
+msgid "no"
+msgstr ""
+
+#: mod/notifications.php:192
+msgid ""
+"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: "
+msgstr ""
+
+#: mod/notifications.php:195
+msgid ""
+"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: "
+msgstr ""
+
+#: mod/notifications.php:203
+msgid "Friend"
+msgstr ""
+
+#: mod/notifications.php:204
+msgid "Sharer"
+msgstr ""
+
+#: mod/notifications.php:204
+msgid "Fan/Admirer"
+msgstr ""
+
+#: mod/notifications.php:210
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: mod/notifications.php:210
+msgid "New Follower"
+msgstr ""
+
+#: mod/notifications.php:218 mod/notifications.php:220 mod/events.php:503
+#: mod/directory.php:152 include/event.php:42 include/identity.php:268
+#: include/bb2diaspora.php:170
+msgid "Location:"
+msgstr ""
+
+#: mod/notifications.php:222 mod/directory.php:160 include/identity.php:277
+#: include/identity.php:582
+msgid "About:"
+msgstr ""
+
+#: mod/notifications.php:224 include/identity.php:576
+msgid "Tags:"
+msgstr ""
+
+#: mod/notifications.php:226 mod/directory.php:154 include/identity.php:270
+#: include/identity.php:541
+msgid "Gender:"
+msgstr ""
+
+#: mod/notifications.php:240
+msgid "No introductions."
+msgstr ""
+
+#: mod/notifications.php:243 include/nav.php:164
+msgid "Notifications"
+msgstr ""
+
+#: mod/notifications.php:281 mod/notifications.php:410
+#: mod/notifications.php:501
+#, php-format
+msgid "%s liked %s's post"
+msgstr ""
+
+#: mod/notifications.php:291 mod/notifications.php:420
+#: mod/notifications.php:511
+#, php-format
+msgid "%s disliked %s's post"
+msgstr ""
+
+#: mod/notifications.php:306 mod/notifications.php:435
+#: mod/notifications.php:526
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: mod/notifications.php:313 mod/notifications.php:442
+#, php-format
+msgid "%s created a new post"
+msgstr ""
+
+#: mod/notifications.php:314 mod/notifications.php:443
+#: mod/notifications.php:536
+#, php-format
+msgid "%s commented on %s's post"
+msgstr ""
+
+#: mod/notifications.php:329
+msgid "No more network notifications."
+msgstr ""
+
+#: mod/notifications.php:333
+msgid "Network Notifications"
+msgstr ""
+
+#: mod/notifications.php:359 mod/notify.php:72
+msgid "No more system notifications."
+msgstr ""
+
+#: mod/notifications.php:363 mod/notify.php:76
+msgid "System Notifications"
+msgstr ""
+
+#: mod/notifications.php:458
+msgid "No more personal notifications."
+msgstr ""
+
+#: mod/notifications.php:462
+msgid "Personal Notifications"
+msgstr ""
+
+#: mod/notifications.php:543
+msgid "No more home notifications."
+msgstr ""
+
+#: mod/notifications.php:547
+msgid "Home Notifications"
+msgstr ""
+
+#: mod/like.php:149 mod/tagger.php:62 mod/subthread.php:87
+#: view/theme/diabook/theme.php:471 include/text.php:2034
+#: include/diaspora.php:2134 include/conversation.php:126
+#: include/conversation.php:253
+msgid "photo"
+msgstr ""
+
+#: mod/like.php:149 mod/like.php:319 mod/tagger.php:62 mod/subthread.php:87
+#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475
+#: include/diaspora.php:2134 include/conversation.php:121
+#: include/conversation.php:130 include/conversation.php:248
+#: include/conversation.php:257
+msgid "status"
+msgstr ""
+
+#: mod/like.php:166 view/theme/diabook/theme.php:480 include/diaspora.php:2150
+#: include/conversation.php:137
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: mod/like.php:168 include/conversation.php:140
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr ""
+
+#: mod/openid.php:93 include/auth.php:112 include/auth.php:175
+msgid "Login failed."
+msgstr ""
+
+#: mod/babel.php:17
+msgid "Source (bbcode) text:"
+msgstr ""
+
+#: mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
+msgstr ""
+
+#: mod/babel.php:31
+msgid "Source input: "
+msgstr ""
+
+#: mod/babel.php:35
+msgid "bb2html (raw HTML): "
+msgstr ""
+
+#: mod/babel.php:39
+msgid "bb2html: "
+msgstr ""
+
+#: mod/babel.php:43
+msgid "bb2html2bb: "
+msgstr ""
+
+#: mod/babel.php:47
+msgid "bb2md: "
+msgstr ""
+
+#: mod/babel.php:51
+msgid "bb2md2html: "
+msgstr ""
+
+#: mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr ""
+
+#: mod/babel.php:59
+msgid "bb2md2html2bb: "
+msgstr ""
+
+#: mod/babel.php:69
+msgid "Source input (Diaspora format): "
+msgstr ""
+
+#: mod/babel.php:74
+msgid "diaspora2bb: "
+msgstr ""
+
+#: mod/admin.php:57
+msgid "Theme settings updated."
+msgstr ""
+
+#: mod/admin.php:104 mod/admin.php:687
+msgid "Site"
+msgstr ""
+
+#: mod/admin.php:105 mod/admin.php:633 mod/admin.php:1078 mod/admin.php:1093
+msgid "Users"
+msgstr ""
+
+#: mod/admin.php:106 mod/admin.php:1182 mod/admin.php:1242 mod/settings.php:66
+msgid "Plugins"
+msgstr ""
+
+#: mod/admin.php:107 mod/admin.php:1410 mod/admin.php:1444
+msgid "Themes"
+msgstr ""
+
+#: mod/admin.php:108
+msgid "DB updates"
+msgstr ""
+
+#: mod/admin.php:109 mod/admin.php:200
+msgid "Inspect Queue"
+msgstr ""
+
+#: mod/admin.php:124 mod/admin.php:133 mod/admin.php:1531
+msgid "Logs"
+msgstr ""
+
+#: mod/admin.php:125
+msgid "probe address"
+msgstr ""
+
+#: mod/admin.php:126
+msgid "check webfinger"
+msgstr ""
+
+#: mod/admin.php:131 include/nav.php:193
+msgid "Admin"
+msgstr ""
+
+#: mod/admin.php:132
+msgid "Plugin Features"
+msgstr ""
+
+#: mod/admin.php:134
+msgid "diagnostics"
+msgstr ""
+
+#: mod/admin.php:135
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: mod/admin.php:173 mod/admin.php:1132 mod/admin.php:1352 mod/notice.php:15
+#: mod/display.php:82 mod/display.php:295 mod/display.php:512
+#: mod/viewsrc.php:15 include/items.php:4827
+msgid "Item not found."
+msgstr ""
+
+#: mod/admin.php:199 mod/admin.php:249 mod/admin.php:686 mod/admin.php:1077
+#: mod/admin.php:1181 mod/admin.php:1241 mod/admin.php:1409 mod/admin.php:1443
+#: mod/admin.php:1530
+msgid "Administration"
+msgstr ""
+
+#: mod/admin.php:202
+msgid "ID"
+msgstr ""
+
+#: mod/admin.php:203
+msgid "Recipient Name"
+msgstr ""
+
+#: mod/admin.php:204
+msgid "Recipient Profile"
+msgstr ""
+
+#: mod/admin.php:206
+msgid "Created"
+msgstr ""
+
+#: mod/admin.php:207
+msgid "Last Tried"
+msgstr ""
+
+#: mod/admin.php:208
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:220 mod/admin.php:1031
+msgid "Normal Account"
+msgstr ""
+
+#: mod/admin.php:221 mod/admin.php:1032
+msgid "Soapbox Account"
+msgstr ""
+
+#: mod/admin.php:222 mod/admin.php:1033
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: mod/admin.php:223 mod/admin.php:1034
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: mod/admin.php:224
+msgid "Blog Account"
+msgstr ""
+
+#: mod/admin.php:225
+msgid "Private Forum"
+msgstr ""
+
+#: mod/admin.php:244
+msgid "Message queues"
+msgstr ""
+
+#: mod/admin.php:250
+msgid "Summary"
+msgstr ""
+
+#: mod/admin.php:252
+msgid "Registered users"
+msgstr ""
+
+#: mod/admin.php:254
+msgid "Pending registrations"
+msgstr ""
+
+#: mod/admin.php:255
+msgid "Version"
+msgstr ""
+
+#: mod/admin.php:260
+msgid "Active plugins"
+msgstr ""
+
+#: mod/admin.php:283
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr ""
+
+#: mod/admin.php:556
+msgid "RINO2 needs mcrypt php extension to work."
+msgstr ""
+
+#: mod/admin.php:564
+msgid "Site settings updated."
+msgstr ""
+
+#: mod/admin.php:599 mod/settings.php:885
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: mod/admin.php:616
+msgid "No community page"
+msgstr ""
+
+#: mod/admin.php:617
+msgid "Public postings from users of this site"
+msgstr ""
+
+#: mod/admin.php:618
+msgid "Global community page"
+msgstr ""
+
+#: mod/admin.php:623 mod/contacts.php:526
+msgid "Never"
+msgstr ""
+
+#: mod/admin.php:624
+msgid "At post arrival"
+msgstr ""
+
+#: mod/admin.php:625 include/contact_selectors.php:56
+msgid "Frequently"
+msgstr ""
+
+#: mod/admin.php:626 include/contact_selectors.php:57
+msgid "Hourly"
+msgstr ""
+
+#: mod/admin.php:627 include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr ""
+
+#: mod/admin.php:628 include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: mod/admin.php:632 mod/contacts.php:585
+msgid "Disabled"
+msgstr ""
+
+#: mod/admin.php:634
+msgid "Users, Global Contacts"
+msgstr ""
+
+#: mod/admin.php:635
+msgid "Users, Global Contacts/fallback"
+msgstr ""
+
+#: mod/admin.php:639
+msgid "One month"
+msgstr ""
+
+#: mod/admin.php:640
+msgid "Three months"
+msgstr ""
+
+#: mod/admin.php:641
+msgid "Half a year"
+msgstr ""
+
+#: mod/admin.php:642
+msgid "One year"
+msgstr ""
+
+#: mod/admin.php:647
+msgid "Multi user instance"
+msgstr ""
+
+#: mod/admin.php:670
+msgid "Closed"
+msgstr ""
+
+#: mod/admin.php:671
+msgid "Requires approval"
+msgstr ""
+
+#: mod/admin.php:672
+msgid "Open"
+msgstr ""
+
+#: mod/admin.php:676
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: mod/admin.php:677
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: mod/admin.php:678
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: mod/admin.php:688 mod/admin.php:1243 mod/admin.php:1445 mod/admin.php:1532
+#: mod/settings.php:632 mod/settings.php:742 mod/settings.php:786
+#: mod/settings.php:855 mod/settings.php:937 mod/settings.php:1167
+msgid "Save Settings"
+msgstr ""
+
+#: mod/admin.php:689 mod/register.php:260
+msgid "Registration"
+msgstr ""
+
+#: mod/admin.php:690
+msgid "File upload"
+msgstr ""
+
+#: mod/admin.php:691
+msgid "Policies"
+msgstr ""
+
+#: mod/admin.php:692
+msgid "Advanced"
+msgstr ""
+
+#: mod/admin.php:693
+msgid "Auto Discovered Contact Directory"
+msgstr ""
+
+#: mod/admin.php:694
+msgid "Performance"
+msgstr ""
+
+#: mod/admin.php:695
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr ""
+
+#: mod/admin.php:698
+msgid "Site name"
+msgstr ""
+
+#: mod/admin.php:699
+msgid "Host name"
+msgstr ""
+
+#: mod/admin.php:700
+msgid "Sender Email"
+msgstr ""
+
+#: mod/admin.php:700
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr ""
+
+#: mod/admin.php:701
+msgid "Banner/Logo"
+msgstr ""
+
+#: mod/admin.php:702
+msgid "Shortcut icon"
+msgstr ""
+
+#: mod/admin.php:702
+msgid "Link to an icon that will be used for browsers."
+msgstr ""
+
+#: mod/admin.php:703
+msgid "Touch icon"
+msgstr ""
+
+#: mod/admin.php:703
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr ""
+
+#: mod/admin.php:704
+msgid "Additional Info"
+msgstr ""
+
+#: mod/admin.php:704
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
+msgstr ""
+
+#: mod/admin.php:705
+msgid "System language"
+msgstr ""
+
+#: mod/admin.php:706
+msgid "System theme"
+msgstr ""
+
+#: mod/admin.php:706
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: mod/admin.php:707
+msgid "Mobile system theme"
+msgstr ""
+
+#: mod/admin.php:707
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: mod/admin.php:708
+msgid "SSL link policy"
+msgstr ""
+
+#: mod/admin.php:708
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: mod/admin.php:709
+msgid "Force SSL"
+msgstr ""
+
+#: mod/admin.php:709
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
+msgstr ""
+
+#: mod/admin.php:710
+msgid "Old style 'Share'"
+msgstr ""
+
+#: mod/admin.php:710
+msgid "Deactivates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: mod/admin.php:711
+msgid "Hide help entry from navigation menu"
+msgstr ""
+
+#: mod/admin.php:711
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr ""
+
+#: mod/admin.php:712
+msgid "Single user instance"
+msgstr ""
+
+#: mod/admin.php:712
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr ""
+
+#: mod/admin.php:713
+msgid "Maximum image size"
+msgstr ""
+
+#: mod/admin.php:713
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: mod/admin.php:714
+msgid "Maximum image length"
+msgstr ""
+
+#: mod/admin.php:714
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr ""
+
+#: mod/admin.php:715
+msgid "JPEG image quality"
+msgstr ""
+
+#: mod/admin.php:715
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: mod/admin.php:717
+msgid "Register policy"
+msgstr ""
+
+#: mod/admin.php:718
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: mod/admin.php:718
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user "
+"registrations to accept per day.  If register is set to closed, this setting "
+"has no effect."
+msgstr ""
+
+#: mod/admin.php:719
+msgid "Register text"
+msgstr ""
+
+#: mod/admin.php:719
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: mod/admin.php:720
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: mod/admin.php:720
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: mod/admin.php:721
+msgid "Allowed friend domains"
+msgstr ""
+
+#: mod/admin.php:721
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: mod/admin.php:722
+msgid "Allowed email domains"
+msgstr ""
+
+#: mod/admin.php:722
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: mod/admin.php:723
+msgid "Block public"
+msgstr ""
+
+#: mod/admin.php:723
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: mod/admin.php:724
+msgid "Force publish"
+msgstr ""
+
+#: mod/admin.php:724
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: mod/admin.php:725
+msgid "Global directory URL"
+msgstr ""
+
+#: mod/admin.php:725
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr ""
+
+#: mod/admin.php:726
+msgid "Allow threaded items"
+msgstr ""
+
+#: mod/admin.php:726
+msgid "Allow infinite level threading for items on this site."
+msgstr ""
+
+#: mod/admin.php:727
+msgid "Private posts by default for new users"
+msgstr ""
+
+#: mod/admin.php:727
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr ""
+
+#: mod/admin.php:728
+msgid "Don't include post content in email notifications"
+msgstr ""
+
+#: mod/admin.php:728
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:729
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr ""
+
+#: mod/admin.php:729
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr ""
+
+#: mod/admin.php:730
+msgid "Don't embed private images in posts"
+msgstr ""
+
+#: mod/admin.php:730
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a while."
+msgstr ""
+
+#: mod/admin.php:731
+msgid "Allow Users to set remote_self"
+msgstr ""
+
+#: mod/admin.php:731
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr ""
+
+#: mod/admin.php:732
+msgid "Block multiple registrations"
+msgstr ""
+
+#: mod/admin.php:732
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: mod/admin.php:733
+msgid "OpenID support"
+msgstr ""
+
+#: mod/admin.php:733
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: mod/admin.php:734
+msgid "Fullname check"
+msgstr ""
+
+#: mod/admin.php:734
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: mod/admin.php:735
+msgid "UTF-8 Regular expressions"
+msgstr ""
+
+#: mod/admin.php:735
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: mod/admin.php:736
+msgid "Community Page Style"
+msgstr ""
+
+#: mod/admin.php:736
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr ""
+
+#: mod/admin.php:737
+msgid "Posts per user on community page"
+msgstr ""
+
+#: mod/admin.php:737
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr ""
+
+#: mod/admin.php:738
+msgid "Enable OStatus support"
+msgstr ""
+
+#: mod/admin.php:738
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: mod/admin.php:739
+msgid "OStatus conversation completion interval"
+msgstr ""
+
+#: mod/admin.php:739
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr ""
+
+#: mod/admin.php:740
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: mod/admin.php:740
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: mod/admin.php:741
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: mod/admin.php:741
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: mod/admin.php:742
+msgid "Verify SSL"
+msgstr ""
+
+#: mod/admin.php:742
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
+msgstr ""
+
+#: mod/admin.php:743
+msgid "Proxy user"
+msgstr ""
+
+#: mod/admin.php:744
+msgid "Proxy URL"
+msgstr ""
+
+#: mod/admin.php:745
+msgid "Network timeout"
+msgstr ""
+
+#: mod/admin.php:745
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: mod/admin.php:746
+msgid "Delivery interval"
+msgstr ""
+
+#: mod/admin.php:746
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: mod/admin.php:747
+msgid "Poll interval"
+msgstr ""
+
+#: mod/admin.php:747
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: mod/admin.php:748
+msgid "Maximum Load Average"
+msgstr ""
+
+#: mod/admin.php:748
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: mod/admin.php:749
+msgid "Maximum Load Average (Frontend)"
+msgstr ""
+
+#: mod/admin.php:749
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr ""
+
+#: mod/admin.php:751
+msgid "Periodical check of global contacts"
+msgstr ""
+
+#: mod/admin.php:751
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr ""
+
+#: mod/admin.php:752
+msgid "Days between requery"
+msgstr ""
+
+#: mod/admin.php:752
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr ""
+
+#: mod/admin.php:753
+msgid "Discover contacts from other servers"
+msgstr ""
+
+#: mod/admin.php:753
+msgid ""
+"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'."
+msgstr ""
+
+#: mod/admin.php:754
+msgid "Timeframe for fetching global contacts"
+msgstr ""
+
+#: mod/admin.php:754
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr ""
+
+#: mod/admin.php:755
+msgid "Search the local directory"
+msgstr ""
+
+#: mod/admin.php:755
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:757
+msgid "Publish server information"
+msgstr ""
+
+#: mod/admin.php:757
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:759
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: mod/admin.php:759
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: mod/admin.php:760
+msgid "Suppress Language"
+msgstr ""
+
+#: mod/admin.php:760
+msgid "Suppress language information in meta information about a posting."
+msgstr ""
+
+#: mod/admin.php:761
+msgid "Suppress Tags"
+msgstr ""
+
+#: mod/admin.php:761
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr ""
+
+#: mod/admin.php:762
+msgid "Path to item cache"
+msgstr ""
+
+#: mod/admin.php:762
+msgid "The item caches buffers generated bbcode and external images."
+msgstr ""
+
+#: mod/admin.php:763
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: mod/admin.php:763
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:764
+msgid "Maximum numbers of comments per post"
+msgstr ""
+
+#: mod/admin.php:764
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr ""
+
+#: mod/admin.php:765
+msgid "Path for lock file"
+msgstr ""
+
+#: mod/admin.php:765
+msgid ""
+"The lock file is used to avoid multiple pollers at one time. Only define a "
+"folder here."
+msgstr ""
+
+#: mod/admin.php:766
+msgid "Temp path"
+msgstr ""
+
+#: mod/admin.php:766
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr ""
+
+#: mod/admin.php:767
+msgid "Base path to installation"
+msgstr ""
+
+#: mod/admin.php:767
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:768
+msgid "Disable picture proxy"
+msgstr ""
+
+#: mod/admin.php:768
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
+msgstr ""
+
+#: mod/admin.php:769
+msgid "Enable old style pager"
+msgstr ""
+
+#: mod/admin.php:769
+msgid ""
+"The old style pager has page numbers but slows down massively the page speed."
+msgstr ""
+
+#: mod/admin.php:770
+msgid "Only search in tags"
+msgstr ""
+
+#: mod/admin.php:770
+msgid "On large systems the text search can slow down the system extremely."
+msgstr ""
+
+#: mod/admin.php:772
+msgid "New base url"
+msgstr ""
+
+#: mod/admin.php:772
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts "
+"of all users."
+msgstr ""
+
+#: mod/admin.php:774
+msgid "RINO Encryption"
+msgstr ""
+
+#: mod/admin.php:774
+msgid "Encryption layer between nodes."
+msgstr ""
+
+#: mod/admin.php:775
+msgid "Embedly API key"
+msgstr ""
+
+#: mod/admin.php:775
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr ""
+
+#: mod/admin.php:793
+msgid "Update has been marked successful"
+msgstr ""
+
+#: mod/admin.php:801
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:804
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:816
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:819
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:823
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: mod/admin.php:825
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr ""
+
+#: mod/admin.php:844
+msgid "No failed updates."
+msgstr ""
+
+#: mod/admin.php:845
+msgid "Check database structure"
+msgstr ""
+
+#: mod/admin.php:850
+msgid "Failed Updates"
+msgstr ""
+
+#: mod/admin.php:851
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: mod/admin.php:852
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: mod/admin.php:853
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: mod/admin.php:885
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr ""
+
+#: mod/admin.php:888
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default "
+"profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr ""
+
+#: mod/admin.php:920 include/user.php:421
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: mod/admin.php:932
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:939
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:978
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: mod/admin.php:986
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: mod/admin.php:986
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: mod/admin.php:1079
+msgid "Add User"
+msgstr ""
+
+#: mod/admin.php:1080
+msgid "select all"
+msgstr ""
+
+#: mod/admin.php:1081
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: mod/admin.php:1082
+msgid "User waiting for permanent deletion"
+msgstr ""
+
+#: mod/admin.php:1083
+msgid "Request date"
+msgstr ""
+
+#: mod/admin.php:1083 mod/admin.php:1095 mod/admin.php:1096 mod/admin.php:1109
+#: mod/settings.php:634 mod/settings.php:660 mod/crepair.php:170
+msgid "Name"
+msgstr ""
+
+#: mod/admin.php:1083 mod/admin.php:1095 mod/admin.php:1096 mod/admin.php:1111
+#: include/contact_selectors.php:79 include/contact_selectors.php:86
+msgid "Email"
+msgstr ""
+
+#: mod/admin.php:1084
+msgid "No registrations."
+msgstr ""
+
+#: mod/admin.php:1086
+msgid "Deny"
+msgstr ""
+
+#: mod/admin.php:1088 mod/contacts.php:549 mod/contacts.php:622
+#: mod/contacts.php:798
+msgid "Block"
+msgstr ""
+
+#: mod/admin.php:1089 mod/contacts.php:549 mod/contacts.php:622
+#: mod/contacts.php:798
+msgid "Unblock"
+msgstr ""
+
+#: mod/admin.php:1090
+msgid "Site admin"
+msgstr ""
+
+#: mod/admin.php:1091
+msgid "Account expired"
+msgstr ""
+
+#: mod/admin.php:1094
+msgid "New User"
+msgstr ""
+
+#: mod/admin.php:1095 mod/admin.php:1096
+msgid "Register date"
+msgstr ""
+
+#: mod/admin.php:1095 mod/admin.php:1096
+msgid "Last login"
+msgstr ""
+
+#: mod/admin.php:1095 mod/admin.php:1096
+msgid "Last item"
+msgstr ""
+
+#: mod/admin.php:1095
+msgid "Deleted since"
+msgstr ""
+
+#: mod/admin.php:1096 mod/settings.php:41
+msgid "Account"
+msgstr ""
+
+#: mod/admin.php:1098
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: mod/admin.php:1099
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: mod/admin.php:1109
+msgid "Name of the new user."
+msgstr ""
+
+#: mod/admin.php:1110
+msgid "Nickname"
+msgstr ""
+
+#: mod/admin.php:1110
+msgid "Nickname of the new user."
+msgstr ""
+
+#: mod/admin.php:1111
+msgid "Email address of the new user."
+msgstr ""
+
+#: mod/admin.php:1144
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: mod/admin.php:1148
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: mod/admin.php:1158 mod/admin.php:1381
+msgid "Disable"
+msgstr ""
+
+#: mod/admin.php:1160 mod/admin.php:1383
+msgid "Enable"
+msgstr ""
+
+#: mod/admin.php:1183 mod/admin.php:1411
+msgid "Toggle"
+msgstr ""
+
+#: mod/admin.php:1184 mod/admin.php:1412 mod/newmember.php:22
+#: mod/settings.php:99 view/theme/diabook/theme.php:544
+#: view/theme/diabook/theme.php:648 include/nav.php:181
+msgid "Settings"
+msgstr ""
+
+#: mod/admin.php:1191 mod/admin.php:1421
+msgid "Author: "
+msgstr ""
+
+#: mod/admin.php:1192 mod/admin.php:1422
+msgid "Maintainer: "
+msgstr ""
+
+#: mod/admin.php:1341
+msgid "No themes found."
+msgstr ""
+
+#: mod/admin.php:1403
+msgid "Screenshot"
+msgstr ""
+
+#: mod/admin.php:1449
+msgid "[Experimental]"
+msgstr ""
+
+#: mod/admin.php:1450
+msgid "[Unsupported]"
+msgstr ""
+
+#: mod/admin.php:1477
+msgid "Log settings updated."
+msgstr ""
+
+#: mod/admin.php:1533
+msgid "Clear"
+msgstr ""
+
+#: mod/admin.php:1539
+msgid "Enable Debugging"
+msgstr ""
+
+#: mod/admin.php:1540
+msgid "Log file"
+msgstr ""
+
+#: mod/admin.php:1540
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: mod/admin.php:1541
+msgid "Log level"
+msgstr ""
+
+#: mod/admin.php:1590 mod/contacts.php:619
+msgid "Update now"
+msgstr ""
+
+#: mod/admin.php:1591 include/acl_selectors.php:347
+msgid "Close"
+msgstr ""
+
+#: mod/admin.php:1597
+msgid "FTP Host"
+msgstr ""
+
+#: mod/admin.php:1598
+msgid "FTP Path"
+msgstr ""
+
+#: mod/admin.php:1599
+msgid "FTP User"
+msgstr ""
+
+#: mod/admin.php:1600
+msgid "FTP Password"
+msgstr ""
+
+#: mod/message.php:9 include/nav.php:173
+msgid "New Message"
+msgstr ""
+
+#: mod/message.php:64 mod/wallmessage.php:56
+msgid "No recipient selected."
+msgstr ""
+
+#: mod/message.php:68
+msgid "Unable to locate contact information."
+msgstr ""
+
+#: mod/message.php:71 mod/wallmessage.php:62
+msgid "Message could not be sent."
+msgstr ""
+
+#: mod/message.php:74 mod/wallmessage.php:65
+msgid "Message collection failure."
+msgstr ""
+
+#: mod/message.php:77 mod/wallmessage.php:68
+msgid "Message sent."
+msgstr ""
+
+#: mod/message.php:183 include/nav.php:170
+msgid "Messages"
+msgstr ""
+
+#: mod/message.php:208
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#: mod/message.php:228
+msgid "Message deleted."
+msgstr ""
+
+#: mod/message.php:259
+msgid "Conversation removed."
+msgstr ""
+
+#: mod/message.php:284 mod/message.php:292 mod/message.php:467
+#: mod/message.php:475 mod/wallmessage.php:127 mod/wallmessage.php:135
+#: include/conversation.php:1001 include/conversation.php:1019
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: mod/message.php:320 mod/wallmessage.php:142
+msgid "Send Private Message"
+msgstr ""
+
+#: mod/message.php:321 mod/message.php:554 mod/wallmessage.php:144
+msgid "To:"
+msgstr ""
+
+#: mod/message.php:326 mod/message.php:556 mod/wallmessage.php:145
+msgid "Subject:"
+msgstr ""
+
+#: mod/message.php:330 mod/message.php:559 mod/wallmessage.php:151
+#: mod/invite.php:134
+msgid "Your message:"
+msgstr ""
+
+#: mod/message.php:333 mod/message.php:563 mod/editpost.php:110
+#: mod/wallmessage.php:154 include/conversation.php:1056
+msgid "Upload photo"
+msgstr ""
+
+#: mod/message.php:334 mod/message.php:564 mod/editpost.php:114
+#: mod/wallmessage.php:155 include/conversation.php:1060
+msgid "Insert web link"
+msgstr ""
+
+#: mod/message.php:372
+msgid "No messages."
+msgstr ""
+
+#: mod/message.php:379
+#, php-format
+msgid "Unknown sender - %s"
+msgstr ""
+
+#: mod/message.php:382
+#, php-format
+msgid "You and %s"
+msgstr ""
+
+#: mod/message.php:385
+#, php-format
+msgid "%s and You"
+msgstr ""
+
+#: mod/message.php:406 mod/message.php:547
+msgid "Delete conversation"
+msgstr ""
+
+#: mod/message.php:409
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: mod/message.php:412
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/message.php:451
+msgid "Message not available."
+msgstr ""
+
+#: mod/message.php:521
+msgid "Delete message"
+msgstr ""
+
+#: mod/message.php:549
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: mod/message.php:553
+msgid "Send Reply"
+msgstr ""
+
+#: mod/editpost.php:17 mod/editpost.php:27
+msgid "Item not found"
+msgstr ""
+
+#: mod/editpost.php:40
+msgid "Edit post"
+msgstr ""
+
+#: mod/editpost.php:109 mod/filer.php:31 mod/notes.php:59 include/text.php:997
+msgid "Save"
+msgstr ""
+
+#: mod/editpost.php:111 include/conversation.php:1057
+msgid "upload photo"
+msgstr ""
+
+#: mod/editpost.php:112 include/conversation.php:1058
+msgid "Attach file"
+msgstr ""
+
+#: mod/editpost.php:113 include/conversation.php:1059
+msgid "attach file"
+msgstr ""
+
+#: mod/editpost.php:115 include/conversation.php:1061
+msgid "web link"
+msgstr ""
+
+#: mod/editpost.php:116 include/conversation.php:1062
+msgid "Insert video link"
+msgstr ""
+
+#: mod/editpost.php:117 include/conversation.php:1063
+msgid "video link"
+msgstr ""
+
+#: mod/editpost.php:118 include/conversation.php:1064
+msgid "Insert audio link"
+msgstr ""
+
+#: mod/editpost.php:119 include/conversation.php:1065
+msgid "audio link"
+msgstr ""
+
+#: mod/editpost.php:120 include/conversation.php:1066
+msgid "Set your location"
+msgstr ""
+
+#: mod/editpost.php:121 include/conversation.php:1067
+msgid "set location"
+msgstr ""
+
+#: mod/editpost.php:122 include/conversation.php:1068
+msgid "Clear browser location"
+msgstr ""
+
+#: mod/editpost.php:123 include/conversation.php:1069
+msgid "clear location"
+msgstr ""
+
+#: mod/editpost.php:125 include/conversation.php:1075
+msgid "Permission settings"
+msgstr ""
+
+#: mod/editpost.php:133 include/acl_selectors.php:343
+msgid "CC: email addresses"
+msgstr ""
+
+#: mod/editpost.php:134 include/conversation.php:1084
+msgid "Public post"
+msgstr ""
+
+#: mod/editpost.php:137 include/conversation.php:1071
+msgid "Set title"
+msgstr ""
+
+#: mod/editpost.php:139 include/conversation.php:1073
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: mod/editpost.php:140 include/acl_selectors.php:344
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: mod/dfrn_confirm.php:64 mod/profiles.php:18 mod/profiles.php:133
+#: mod/profiles.php:179 mod/profiles.php:627
+msgid "Profile not found."
+msgstr ""
+
+#: mod/dfrn_confirm.php:121
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: mod/dfrn_confirm.php:240
+msgid "Response from remote site was not understood."
+msgstr ""
+
+#: mod/dfrn_confirm.php:249 mod/dfrn_confirm.php:254
+msgid "Unexpected response from remote site: "
+msgstr ""
+
+#: mod/dfrn_confirm.php:263
+msgid "Confirmation completed successfully."
+msgstr ""
+
+#: mod/dfrn_confirm.php:265 mod/dfrn_confirm.php:279 mod/dfrn_confirm.php:286
+msgid "Remote site reported: "
+msgstr ""
+
+#: mod/dfrn_confirm.php:277
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+
+#: mod/dfrn_confirm.php:284
+msgid "Introduction failed or was revoked."
+msgstr ""
+
+#: mod/dfrn_confirm.php:430
+msgid "Unable to set contact photo."
+msgstr ""
+
+#: mod/dfrn_confirm.php:487 include/diaspora.php:633
+#: include/conversation.php:172
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr ""
+
+#: mod/dfrn_confirm.php:572
+#, php-format
+msgid "No user record found for '%s' "
+msgstr ""
+
+#: mod/dfrn_confirm.php:582
+msgid "Our site encryption key is apparently messed up."
+msgstr ""
+
+#: mod/dfrn_confirm.php:593
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+
+#: mod/dfrn_confirm.php:614
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: mod/dfrn_confirm.php:628
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr ""
+
+#: mod/dfrn_confirm.php:648
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr ""
+
+#: mod/dfrn_confirm.php:659
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+
+#: mod/dfrn_confirm.php:726
+msgid "Unable to update your contact profile details on our system"
+msgstr ""
+
+#: mod/dfrn_confirm.php:798
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: mod/events.php:71 mod/events.php:73
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: mod/events.php:80 mod/events.php:82
+msgid "Event title and start time are required."
+msgstr ""
+
+#: mod/events.php:317
+msgid "l, F j"
+msgstr ""
+
+#: mod/events.php:339
+msgid "Edit event"
+msgstr ""
+
+#: mod/events.php:361 include/text.php:1716 include/text.php:1723
+msgid "link to source"
+msgstr ""
+
+#: mod/events.php:396 view/theme/diabook/theme.php:127
+#: include/identity.php:668 include/nav.php:80
+msgid "Events"
+msgstr ""
+
+#: mod/events.php:397
+msgid "Create New Event"
+msgstr ""
+
+#: mod/events.php:398
+msgid "Previous"
+msgstr ""
+
+#: mod/events.php:399 mod/install.php:209
+msgid "Next"
+msgstr ""
+
+#: mod/events.php:491
+msgid "Event details"
+msgstr ""
+
+#: mod/events.php:492
+msgid "Starting date and Title are required."
+msgstr ""
+
+#: mod/events.php:493
+msgid "Event Starts:"
+msgstr ""
+
+#: mod/events.php:493 mod/events.php:505
+msgid "Required"
+msgstr ""
+
+#: mod/events.php:495
+msgid "Finish date/time is not known or not relevant"
+msgstr ""
+
+#: mod/events.php:497
+msgid "Event Finishes:"
+msgstr ""
+
+#: mod/events.php:499
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: mod/events.php:501
+msgid "Description:"
+msgstr ""
+
+#: mod/events.php:505
+msgid "Title:"
+msgstr ""
+
+#: mod/events.php:507
+msgid "Share this event"
+msgstr ""
+
+#: mod/fbrowser.php:32 view/theme/diabook/theme.php:126
+#: include/identity.php:649 include/nav.php:78
+msgid "Photos"
+msgstr ""
+
+#: mod/fbrowser.php:122
+msgid "Files"
+msgstr ""
+
+#: mod/home.php:35
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: mod/lockview.php:31 mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: mod/lockview.php:48
+msgid "Visible to:"
+msgstr ""
+
+#: mod/wallmessage.php:42 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: mod/wallmessage.php:143
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
+#: mod/nogroup.php:40 mod/contacts.php:605 mod/contacts.php:838
+#: mod/viewcontacts.php:64
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr ""
+
+#: mod/nogroup.php:41 mod/contacts.php:839
+msgid "Edit contact"
+msgstr ""
+
+#: mod/nogroup.php:59
+msgid "Contacts who are not members of a group"
+msgstr ""
+
+#: mod/friendica.php:59
+msgid "This is Friendica, version"
+msgstr ""
+
+#: mod/friendica.php:60
+msgid "running at web location"
+msgstr ""
+
+#: mod/friendica.php:62
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr ""
+
+#: mod/friendica.php:64
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: mod/friendica.php:64
+msgid "the bugtracker at github"
+msgstr ""
+
+#: mod/friendica.php:65
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr ""
+
+#: mod/friendica.php:79
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: mod/friendica.php:92
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: mod/removeme.php:46 mod/removeme.php:49
+msgid "Remove My Account"
+msgstr ""
+
+#: mod/removeme.php:47
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr ""
+
+#: mod/removeme.php:48
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: mod/wall_upload.php:19 mod/wall_upload.php:29 mod/wall_upload.php:76
+#: mod/wall_upload.php:110 mod/wall_upload.php:111 mod/wall_attach.php:16
+#: mod/wall_attach.php:21 mod/wall_attach.php:66 include/api.php:1692
+msgid "Invalid request."
+msgstr ""
+
+#: mod/wall_upload.php:137 mod/photos.php:789 mod/profile_photo.php:144
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr ""
+
+#: mod/wall_upload.php:169 mod/photos.php:829 mod/profile_photo.php:153
+msgid "Unable to process image."
+msgstr ""
+
+#: mod/wall_upload.php:199 mod/wall_upload.php:213 mod/wall_upload.php:220
+#: mod/item.php:486 include/message.php:145 include/Photo.php:951
+#: include/Photo.php:966 include/Photo.php:973 include/Photo.php:995
+msgid "Wall Photos"
+msgstr ""
+
+#: mod/wall_upload.php:202 mod/photos.php:856 mod/profile_photo.php:301
+msgid "Image upload failed."
+msgstr ""
+
+#: mod/api.php:76 mod/api.php:102
+msgid "Authorize application connection"
+msgstr ""
+
+#: mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr ""
+
+#: mod/api.php:89
+msgid "Please login to continue."
+msgstr ""
+
+#: mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: mod/tagger.php:95 include/conversation.php:265
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: mod/photos.php:50 mod/photos.php:177 mod/photos.php:1086
+#: mod/photos.php:1207 mod/photos.php:1230 mod/photos.php:1779
+#: mod/photos.php:1791 view/theme/diabook/theme.php:499
+msgid "Contact Photos"
+msgstr ""
+
+#: mod/photos.php:84 include/identity.php:652
+msgid "Photo Albums"
+msgstr ""
+
+#: mod/photos.php:85 mod/photos.php:1836
+msgid "Recent Photos"
+msgstr ""
+
+#: mod/photos.php:88 mod/photos.php:1282 mod/photos.php:1838
+msgid "Upload New Photos"
+msgstr ""
+
+#: mod/photos.php:102 mod/settings.php:34
+msgid "everybody"
+msgstr ""
+
+#: mod/photos.php:166
+msgid "Contact information unavailable"
+msgstr ""
+
+#: mod/photos.php:177 mod/photos.php:753 mod/photos.php:1207
+#: mod/photos.php:1230 mod/profile_photo.php:74 mod/profile_photo.php:81
+#: mod/profile_photo.php:88 mod/profile_photo.php:204
+#: mod/profile_photo.php:296 mod/profile_photo.php:305
+#: view/theme/diabook/theme.php:500 include/user.php:343 include/user.php:350
+#: include/user.php:357
+msgid "Profile Photos"
+msgstr ""
+
+#: mod/photos.php:187
+msgid "Album not found."
+msgstr ""
+
+#: mod/photos.php:210 mod/photos.php:222 mod/photos.php:1224
+msgid "Delete Album"
+msgstr ""
+
+#: mod/photos.php:220
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr ""
+
+#: mod/photos.php:300 mod/photos.php:311 mod/photos.php:1534
+msgid "Delete Photo"
+msgstr ""
+
+#: mod/photos.php:309
+msgid "Do you really want to delete this photo?"
+msgstr ""
+
+#: mod/photos.php:684
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr ""
+
+#: mod/photos.php:684
+msgid "a photo"
+msgstr ""
+
+#: mod/photos.php:797
+msgid "Image file is empty."
+msgstr ""
+
+#: mod/photos.php:952
+msgid "No photos selected"
+msgstr ""
+
+#: mod/photos.php:1053 mod/videos.php:298
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: mod/photos.php:1114
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr ""
+
+#: mod/photos.php:1149
+msgid "Upload Photos"
+msgstr ""
+
+#: mod/photos.php:1153 mod/photos.php:1219
+msgid "New album name: "
+msgstr ""
+
+#: mod/photos.php:1154
+msgid "or existing album name: "
+msgstr ""
+
+#: mod/photos.php:1155
+msgid "Do not show a status post for this upload"
+msgstr ""
+
+#: mod/photos.php:1157 mod/photos.php:1529 include/acl_selectors.php:346
+msgid "Permissions"
+msgstr ""
+
+#: mod/photos.php:1166 mod/photos.php:1538 mod/settings.php:1202
+msgid "Show to Groups"
+msgstr ""
+
+#: mod/photos.php:1167 mod/photos.php:1539 mod/settings.php:1203
+msgid "Show to Contacts"
+msgstr ""
+
+#: mod/photos.php:1168
+msgid "Private Photo"
+msgstr ""
+
+#: mod/photos.php:1169
+msgid "Public Photo"
+msgstr ""
+
+#: mod/photos.php:1232
+msgid "Edit Album"
+msgstr ""
+
+#: mod/photos.php:1238
+msgid "Show Newest First"
+msgstr ""
+
+#: mod/photos.php:1240
+msgid "Show Oldest First"
+msgstr ""
+
+#: mod/photos.php:1268 mod/photos.php:1821
+msgid "View Photo"
+msgstr ""
+
+#: mod/photos.php:1314
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: mod/photos.php:1316
+msgid "Photo not available"
+msgstr ""
+
+#: mod/photos.php:1372
+msgid "View photo"
+msgstr ""
+
+#: mod/photos.php:1372
+msgid "Edit photo"
+msgstr ""
+
+#: mod/photos.php:1373
+msgid "Use as profile photo"
+msgstr ""
+
+#: mod/photos.php:1398
+msgid "View Full Size"
+msgstr ""
+
+#: mod/photos.php:1477
+msgid "Tags: "
+msgstr ""
+
+#: mod/photos.php:1480
+msgid "[Remove any tag]"
+msgstr ""
+
+#: mod/photos.php:1520
+msgid "New album name"
+msgstr ""
+
+#: mod/photos.php:1521
+msgid "Caption"
+msgstr ""
+
+#: mod/photos.php:1522
+msgid "Add a Tag"
+msgstr ""
+
+#: mod/photos.php:1522
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: mod/photos.php:1523
+msgid "Do not rotate"
+msgstr ""
+
+#: mod/photos.php:1524
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: mod/photos.php:1525
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: mod/photos.php:1540
+msgid "Private photo"
+msgstr ""
+
+#: mod/photos.php:1541
+msgid "Public photo"
+msgstr ""
+
+#: mod/photos.php:1563 include/conversation.php:1055
+msgid "Share"
+msgstr ""
+
+#: mod/photos.php:1827 mod/videos.php:380
+msgid "View Album"
+msgstr ""
+
+#: mod/hcard.php:10
+msgid "No profile"
+msgstr ""
+
+#: mod/register.php:92
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr ""
+
+#: mod/register.php:97
+#, php-format
+msgid ""
+"Failed to send email message. Here your accout details:<br> login: %s<br> "
+"password: %s<br><br>You can change your password after login."
+msgstr ""
+
+#: mod/register.php:107
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: mod/register.php:150
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+
+#: mod/register.php:188 mod/uimport.php:50
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: mod/register.php:216
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr ""
+
+#: mod/register.php:217
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr ""
+
+#: mod/register.php:218
+msgid "Your OpenID (optional): "
+msgstr ""
+
+#: mod/register.php:232
+msgid "Include your profile in member directory?"
+msgstr ""
+
+#: mod/register.php:256
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: mod/register.php:257
+msgid "Your invitation ID: "
+msgstr ""
+
+#: mod/register.php:268
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr ""
+
+#: mod/register.php:269
+msgid "Your Email Address: "
+msgstr ""
+
+#: mod/register.php:271 mod/settings.php:1174
+msgid "New Password:"
+msgstr ""
+
+#: mod/register.php:271
+msgid "Leave empty for an auto generated password."
+msgstr ""
+
+#: mod/register.php:272 mod/settings.php:1175
+msgid "Confirm:"
+msgstr ""
+
+#: mod/register.php:273
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be '<strong>nickname@$sitename</"
+"strong>'."
+msgstr ""
+
+#: mod/register.php:274
+msgid "Choose a nickname: "
+msgstr ""
+
+#: mod/register.php:277 boot.php:1248 include/nav.php:109
+msgid "Register"
+msgstr ""
+
+#: mod/register.php:283 mod/uimport.php:64
+msgid "Import"
+msgstr ""
+
+#: mod/register.php:284
+msgid "Import your profile to this friendica instance"
+msgstr ""
+
+#: mod/lostpass.php:19
+msgid "No valid account found."
+msgstr ""
+
+#: mod/lostpass.php:35
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: mod/lostpass.php:42
+#, php-format
+msgid ""
+"\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."
+msgstr ""
+
+#: mod/lostpass.php:53
+#, php-format
+msgid ""
+"\n"
+"\t\tFollow this link to verify your identity:\n"
+"\n"
+"\t\t%1$s\n"
+"\n"
+"\t\tYou will then receive a follow-up message containing the new password.\n"
+"\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\n"
+"\t\tThe login details are as follows:\n"
+"\n"
+"\t\tSite Location:\t%2$s\n"
+"\t\tLogin Name:\t%3$s"
+msgstr ""
+
+#: mod/lostpass.php:72
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: mod/lostpass.php:92
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: mod/lostpass.php:109 boot.php:1287
+msgid "Password Reset"
+msgstr ""
+
+#: mod/lostpass.php:110
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: mod/lostpass.php:111
+msgid "Your new password is"
+msgstr ""
+
+#: mod/lostpass.php:112
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: mod/lostpass.php:113
+msgid "click here to login"
+msgstr ""
+
+#: mod/lostpass.php:114
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: mod/lostpass.php:125
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tDear %1$s,\n"
+"\t\t\t\t\tYour password has been changed as requested. Please retain this\n"
+"\t\t\t\tinformation for your records (or change your password immediately "
+"to\n"
+"\t\t\t\tsomething that you will remember).\n"
+"\t\t\t"
+msgstr ""
+
+#: mod/lostpass.php:131
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\t\tSite Location:\t%1$s\n"
+"\t\t\t\tLogin Name:\t%2$s\n"
+"\t\t\t\tPassword:\t%3$s\n"
+"\n"
+"\t\t\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\t\t\t"
+msgstr ""
+
+#: mod/lostpass.php:147
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: mod/lostpass.php:159
+msgid "Forgot your Password?"
+msgstr ""
+
+#: mod/lostpass.php:160
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: mod/lostpass.php:161
+msgid "Nickname or Email: "
+msgstr ""
+
+#: mod/lostpass.php:162
+msgid "Reset"
+msgstr ""
+
+#: mod/maintenance.php:5
+msgid "System down for maintenance"
+msgstr ""
+
+#: mod/attach.php:8
+msgid "Item not available."
+msgstr ""
+
+#: mod/attach.php:20
+msgid "Item was not found."
+msgstr ""
+
+#: mod/apps.php:11
+msgid "Applications"
+msgstr ""
+
+#: mod/apps.php:14
+msgid "No installed applications."
+msgstr ""
+
+#: mod/help.php:31
+msgid "Help:"
+msgstr ""
+
+#: mod/help.php:36 include/nav.php:114
+msgid "Help"
+msgstr ""
+
 #: mod/contacts.php:114
 #, php-format
 msgid "%d contact edited."
@@ -25,7 +3109,7 @@ msgid_plural "%d contacts edited"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/contacts.php:145 mod/contacts.php:340
+#: mod/contacts.php:145 mod/contacts.php:368
 msgid "Could not access contact record."
 msgstr ""
 
@@ -37,486 +3121,415 @@ msgstr ""
 msgid "Contact updated."
 msgstr ""
 
-#: mod/contacts.php:194 mod/dfrn_request.php:576
-msgid "Failed to update contact record."
-msgstr ""
-
-#: mod/contacts.php:322 mod/manage.php:96 mod/display.php:508
-#: mod/profile_photo.php:19 mod/profile_photo.php:169 mod/profile_photo.php:180
-#: mod/profile_photo.php:193 mod/follow.php:9 mod/follow.php:44
-#: mod/follow.php:83 mod/item.php:170 mod/item.php:186 mod/group.php:19
-#: mod/dfrn_confirm.php:55 mod/fsuggest.php:78 mod/wall_upload.php:70
-#: mod/wall_upload.php:71 mod/viewcontacts.php:24 mod/notifications.php:66
-#: mod/message.php:39 mod/message.php:175 mod/crepair.php:120
-#: mod/nogroup.php:25 mod/network.php:4 mod/allfriends.php:9 mod/events.php:164
-#: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79
-#: mod/wallmessage.php:103 mod/wall_attach.php:60 mod/wall_attach.php:61
-#: mod/settings.php:20 mod/settings.php:116 mod/settings.php:619
-#: mod/register.php:42 mod/delegate.php:12 mod/mood.php:114 mod/suggest.php:58
-#: mod/profiles.php:165 mod/profiles.php:615 mod/editpost.php:10 mod/api.php:26
-#: mod/api.php:31 mod/notes.php:20 mod/poke.php:135 mod/invite.php:15
-#: mod/invite.php:101 mod/photos.php:156 mod/photos.php:1072 mod/regmod.php:110
-#: mod/uimport.php:23 mod/attach.php:33 include/items.php:5023 index.php:382
-msgid "Permission denied."
-msgstr ""
-
-#: mod/contacts.php:361
+#: mod/contacts.php:389
 msgid "Contact has been blocked"
 msgstr ""
 
-#: mod/contacts.php:361
+#: mod/contacts.php:389
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: mod/contacts.php:372
+#: mod/contacts.php:400
 msgid "Contact has been ignored"
 msgstr ""
 
-#: mod/contacts.php:372
+#: mod/contacts.php:400
 msgid "Contact has been unignored"
 msgstr ""
 
-#: mod/contacts.php:384
+#: mod/contacts.php:412
 msgid "Contact has been archived"
 msgstr ""
 
-#: mod/contacts.php:384
+#: mod/contacts.php:412
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: mod/contacts.php:411 mod/contacts.php:767
+#: mod/contacts.php:439 mod/contacts.php:795
 msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: mod/contacts.php:413 mod/follow.php:59 mod/message.php:210
-#: mod/settings.php:1066 mod/settings.php:1072 mod/settings.php:1080
-#: mod/settings.php:1084 mod/settings.php:1089 mod/settings.php:1095
-#: mod/settings.php:1101 mod/settings.php:1107 mod/settings.php:1133
-#: mod/settings.php:1134 mod/settings.php:1135 mod/settings.php:1136
-#: mod/settings.php:1137 mod/dfrn_request.php:848 mod/register.php:235
-#: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661 mod/api.php:105
-#: include/items.php:4855
-msgid "Yes"
-msgstr ""
-
-#: mod/contacts.php:416 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:70
-#: mod/videos.php:121 mod/message.php:213 mod/fbrowser.php:89
-#: mod/fbrowser.php:125 mod/settings.php:633 mod/settings.php:659
-#: mod/dfrn_request.php:862 mod/suggest.php:32 mod/editpost.php:148
-#: mod/photos.php:225 mod/photos.php:314 include/conversation.php:1093
-#: include/items.php:4858
-msgid "Cancel"
-msgstr ""
-
-#: mod/contacts.php:428
+#: mod/contacts.php:456
 msgid "Contact has been removed."
 msgstr ""
 
-#: mod/contacts.php:466
+#: mod/contacts.php:494
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: mod/contacts.php:470
+#: mod/contacts.php:498
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: mod/contacts.php:475
+#: mod/contacts.php:503
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: mod/contacts.php:495
+#: mod/contacts.php:523
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: mod/contacts.php:498 mod/admin.php:618
-msgid "Never"
-msgstr ""
-
-#: mod/contacts.php:502
+#: mod/contacts.php:530
 msgid "(Update was successful)"
 msgstr ""
 
-#: mod/contacts.php:502
+#: mod/contacts.php:530
 msgid "(Update was not successful)"
 msgstr ""
 
-#: mod/contacts.php:504
+#: mod/contacts.php:532
 msgid "Suggest friends"
 msgstr ""
 
-#: mod/contacts.php:508
+#: mod/contacts.php:536
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: mod/contacts.php:511 include/contact_widgets.php:200
+#: mod/contacts.php:539 include/contact_widgets.php:200
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/contacts.php:516
+#: mod/contacts.php:544
 msgid "View all contacts"
 msgstr ""
 
-#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770
-#: mod/admin.php:1083
-msgid "Unblock"
-msgstr ""
-
-#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770
-#: mod/admin.php:1082
-msgid "Block"
-msgstr ""
-
-#: mod/contacts.php:524
+#: mod/contacts.php:552
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771
+#: mod/contacts.php:556 mod/contacts.php:623 mod/contacts.php:799
 msgid "Unignore"
 msgstr ""
 
-#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771
-#: mod/notifications.php:51 mod/notifications.php:174 mod/notifications.php:233
-msgid "Ignore"
-msgstr ""
-
-#: mod/contacts.php:531
+#: mod/contacts.php:559
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: mod/contacts.php:536 mod/contacts.php:772
+#: mod/contacts.php:564 mod/contacts.php:800
 msgid "Unarchive"
 msgstr ""
 
-#: mod/contacts.php:536 mod/contacts.php:772
+#: mod/contacts.php:564 mod/contacts.php:800
 msgid "Archive"
 msgstr ""
 
-#: mod/contacts.php:539
+#: mod/contacts.php:567
 msgid "Toggle Archive status"
 msgstr ""
 
-#: mod/contacts.php:543
+#: mod/contacts.php:571
 msgid "Repair"
 msgstr ""
 
-#: mod/contacts.php:546
+#: mod/contacts.php:574
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: mod/contacts.php:553
+#: mod/contacts.php:581
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: mod/contacts.php:556
+#: mod/contacts.php:584
 msgid "Fetch further information for feeds"
 msgstr ""
 
-#: mod/contacts.php:557 mod/admin.php:627
-msgid "Disabled"
-msgstr ""
-
-#: mod/contacts.php:557
+#: mod/contacts.php:585
 msgid "Fetch information"
 msgstr ""
 
-#: mod/contacts.php:557
+#: mod/contacts.php:585
 msgid "Fetch information and keywords"
 msgstr ""
 
-#: mod/contacts.php:566
+#: mod/contacts.php:594
 msgid "Contact Editor"
 msgstr ""
 
-#: mod/contacts.php:568 mod/manage.php:110 mod/fsuggest.php:107
-#: mod/message.php:336 mod/message.php:565 mod/crepair.php:191
-#: mod/events.php:511 mod/content.php:712 mod/install.php:250
-#: mod/install.php:288 mod/mood.php:137 mod/profiles.php:683
-#: mod/localtime.php:45 mod/poke.php:199 mod/invite.php:140 mod/photos.php:1104
-#: mod/photos.php:1223 mod/photos.php:1533 mod/photos.php:1584
-#: mod/photos.php:1628 mod/photos.php:1716 object/Item.php:680
-#: view/theme/cleanzero/config.php:80 view/theme/dispy/config.php:70
-#: view/theme/quattro/config.php:64 view/theme/diabook/config.php:148
-#: view/theme/diabook/theme.php:633 view/theme/vier/config.php:56
-#: view/theme/duepuntozero/config.php:59
-msgid "Submit"
-msgstr ""
-
-#: mod/contacts.php:569
+#: mod/contacts.php:597
 msgid "Profile Visibility"
 msgstr ""
 
-#: mod/contacts.php:570
+#: mod/contacts.php:598
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: mod/contacts.php:571
+#: mod/contacts.php:599
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: mod/contacts.php:572
+#: mod/contacts.php:600
 msgid "Edit contact notes"
 msgstr ""
 
-#: mod/contacts.php:577 mod/contacts.php:810 mod/viewcontacts.php:64
-#: mod/nogroup.php:40
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr ""
-
-#: mod/contacts.php:578
+#: mod/contacts.php:606
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: mod/contacts.php:579
+#: mod/contacts.php:607
 msgid "Ignore contact"
 msgstr ""
 
-#: mod/contacts.php:580
+#: mod/contacts.php:608
 msgid "Repair URL settings"
 msgstr ""
 
-#: mod/contacts.php:581
+#: mod/contacts.php:609
 msgid "View conversations"
 msgstr ""
 
-#: mod/contacts.php:583
+#: mod/contacts.php:611
 msgid "Delete contact"
 msgstr ""
 
-#: mod/contacts.php:587
+#: mod/contacts.php:615
 msgid "Last update:"
 msgstr ""
 
-#: mod/contacts.php:589
+#: mod/contacts.php:617
 msgid "Update public posts"
 msgstr ""
 
-#: mod/contacts.php:591 mod/admin.php:1584
-msgid "Update now"
-msgstr ""
-
-#: mod/contacts.php:598
+#: mod/contacts.php:626
 msgid "Currently blocked"
 msgstr ""
 
-#: mod/contacts.php:599
+#: mod/contacts.php:627
 msgid "Currently ignored"
 msgstr ""
 
-#: mod/contacts.php:600
+#: mod/contacts.php:628
 msgid "Currently archived"
 msgstr ""
 
-#: mod/contacts.php:601 mod/notifications.php:167 mod/notifications.php:227
-msgid "Hide this contact from others"
-msgstr ""
-
-#: mod/contacts.php:601
+#: mod/contacts.php:629
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: mod/contacts.php:602
+#: mod/contacts.php:630
 msgid "Notification for new posts"
 msgstr ""
 
-#: mod/contacts.php:602
+#: mod/contacts.php:630
 msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: mod/contacts.php:605
+#: mod/contacts.php:633
 msgid "Blacklisted keywords"
 msgstr ""
 
-#: mod/contacts.php:605
+#: mod/contacts.php:633
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: mod/contacts.php:612
+#: mod/contacts.php:640
 msgid "Profile URL"
 msgstr ""
 
-#: mod/contacts.php:658
+#: mod/contacts.php:686
 msgid "Suggestions"
 msgstr ""
 
-#: mod/contacts.php:661
+#: mod/contacts.php:689
 msgid "Suggest potential friends"
 msgstr ""
 
-#: mod/contacts.php:665 mod/group.php:192
+#: mod/contacts.php:693 mod/group.php:192
 msgid "All Contacts"
 msgstr ""
 
-#: mod/contacts.php:668
+#: mod/contacts.php:696
 msgid "Show all contacts"
 msgstr ""
 
-#: mod/contacts.php:672
+#: mod/contacts.php:700
 msgid "Unblocked"
 msgstr ""
 
-#: mod/contacts.php:675
+#: mod/contacts.php:703
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: mod/contacts.php:680
+#: mod/contacts.php:708
 msgid "Blocked"
 msgstr ""
 
-#: mod/contacts.php:683
+#: mod/contacts.php:711
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: mod/contacts.php:688
+#: mod/contacts.php:716
 msgid "Ignored"
 msgstr ""
 
-#: mod/contacts.php:691
+#: mod/contacts.php:719
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: mod/contacts.php:696
+#: mod/contacts.php:724
 msgid "Archived"
 msgstr ""
 
-#: mod/contacts.php:699
+#: mod/contacts.php:727
 msgid "Only show archived contacts"
 msgstr ""
 
-#: mod/contacts.php:704
+#: mod/contacts.php:732
 msgid "Hidden"
 msgstr ""
 
-#: mod/contacts.php:707
+#: mod/contacts.php:735
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: mod/contacts.php:758 include/text.php:1005 include/nav.php:124
-#: include/nav.php:186 view/theme/diabook/theme.php:125
+#: mod/contacts.php:786 view/theme/diabook/theme.php:125 include/text.php:1005
+#: include/nav.php:124 include/nav.php:186
 msgid "Contacts"
 msgstr ""
 
-#: mod/contacts.php:762
+#: mod/contacts.php:790
 msgid "Search your contacts"
 msgstr ""
 
-#: mod/contacts.php:763 mod/directory.php:63
+#: mod/contacts.php:791 mod/directory.php:63
 msgid "Finding: "
 msgstr ""
 
-#: mod/contacts.php:764 mod/directory.php:65 include/contact_widgets.php:34
+#: mod/contacts.php:792 mod/directory.php:65 include/contact_widgets.php:34
 msgid "Find"
 msgstr ""
 
-#: mod/contacts.php:769 mod/settings.php:146 mod/settings.php:658
+#: mod/contacts.php:797 mod/settings.php:146 mod/settings.php:658
 msgid "Update"
 msgstr ""
 
-#: mod/contacts.php:773 mod/group.php:171 mod/admin.php:1081
-#: mod/content.php:440 mod/content.php:743 mod/settings.php:695
-#: mod/photos.php:1673 object/Item.php:131 include/conversation.php:613
-msgid "Delete"
-msgstr ""
-
-#: mod/contacts.php:786
+#: mod/contacts.php:814
 msgid "Mutual Friendship"
 msgstr ""
 
-#: mod/contacts.php:790
+#: mod/contacts.php:818
 msgid "is a fan of yours"
 msgstr ""
 
-#: mod/contacts.php:794
+#: mod/contacts.php:822
 msgid "you are a fan of"
 msgstr ""
 
-#: mod/contacts.php:811 mod/nogroup.php:41
-msgid "Edit contact"
+#: mod/videos.php:113
+msgid "Do you really want to delete this video?"
 msgstr ""
 
-#: mod/hcard.php:10
-msgid "No profile"
+#: mod/videos.php:118
+msgid "Delete Video"
 msgstr ""
 
-#: mod/manage.php:106
-msgid "Manage Identities and/or Pages"
+#: mod/videos.php:197
+msgid "No videos selected"
 msgstr ""
 
-#: mod/manage.php:107
+#: mod/videos.php:389
+msgid "Recent Videos"
+msgstr ""
+
+#: mod/videos.php:391
+msgid "Upload New Videos"
+msgstr ""
+
+#: mod/common.php:45
+msgid "Common Friends"
+msgstr ""
+
+#: mod/common.php:82
+msgid "No contacts in common."
+msgstr ""
+
+#: mod/follow.php:26
+msgid "You already added this contact."
+msgstr ""
+
+#: mod/follow.php:108
+msgid "Contact added"
+msgstr ""
+
+#: mod/bookmarklet.php:12 boot.php:1273 include/nav.php:92
+msgid "Login"
+msgstr ""
+
+#: mod/bookmarklet.php:41
+msgid "The post was created"
+msgstr ""
+
+#: mod/uimport.php:66
+msgid "Move account"
+msgstr ""
+
+#: mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: mod/uimport.php:68
 msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also "
+"to inform your friends that you moved here."
 msgstr ""
 
-#: mod/manage.php:108
-msgid "Select an identity to manage: "
+#: mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
-#: mod/oexchange.php:25
-msgid "Post successful."
+#: mod/uimport.php:70
+msgid "Account file"
 msgstr ""
 
-#: mod/profperm.php:19 mod/group.php:72 index.php:381
-msgid "Permission denied"
+#: mod/uimport.php:70
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
 msgstr ""
 
-#: mod/profperm.php:25 mod/profperm.php:56
-msgid "Invalid profile identifier."
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: mod/profperm.php:102
-msgid "Profile Visibility Editor"
+#: mod/allfriends.php:37
+#, php-format
+msgid "Friends of %s"
 msgstr ""
 
-#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:529
-#: include/identity.php:610 include/identity.php:640 include/nav.php:77
-#: view/theme/diabook/theme.php:124
-msgid "Profile"
+#: mod/allfriends.php:44
+msgid "No friends to display."
 msgstr ""
 
-#: mod/profperm.php:106 mod/group.php:222
-msgid "Click on a contact to add or remove."
+#: mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: mod/profperm.php:115
-msgid "Visible To"
+#: mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: mod/profperm.php:131
-msgid "All Contacts (with secure profile access)"
+#: mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: mod/display.php:82 mod/display.php:295 mod/display.php:512
-#: mod/viewsrc.php:15 mod/admin.php:173 mod/admin.php:1126 mod/admin.php:1346
-#: mod/notice.php:15 include/items.php:4814
-msgid "Item not found."
-msgstr ""
-
-#: mod/display.php:223 mod/videos.php:187 mod/viewcontacts.php:19
-#: mod/community.php:18 mod/dfrn_request.php:777 mod/search.php:93
-#: mod/directory.php:35 mod/photos.php:942
-msgid "Public access denied."
-msgstr ""
-
-#: mod/display.php:343 mod/profile.php:155
-msgid "Access to this profile has been restricted."
-msgstr ""
-
-#: mod/display.php:505
-msgid "Item has been removed."
+#: mod/tagrm.php:93 mod/delegate.php:139
+msgid "Remove"
 msgstr ""
 
 #: mod/newmember.php:6
@@ -550,12 +3563,6 @@ msgid ""
 "join."
 msgstr ""
 
-#: mod/newmember.php:22 mod/admin.php:1178 mod/admin.php:1406
-#: mod/settings.php:99 include/nav.php:181 view/theme/diabook/theme.php:544
-#: view/theme/diabook/theme.php:648
-msgid "Settings"
-msgstr ""
-
 #: mod/newmember.php:26
 msgid "Go to Your Settings"
 msgstr ""
@@ -575,7 +3582,13 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: mod/newmember.php:36 mod/profile_photo.php:244 mod/profiles.php:696
+#: mod/newmember.php:32 mod/profperm.php:104 view/theme/diabook/theme.php:124
+#: include/identity.php:530 include/identity.php:611 include/identity.php:641
+#: include/nav.php:77
+msgid "Profile"
+msgstr ""
+
+#: mod/newmember.php:36 mod/profiles.php:696 mod/profile_photo.php:244
 msgid "Upload Profile Photo"
 msgstr ""
 
@@ -714,3099 +3727,122 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: mod/openid.php:53
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr ""
-
-#: mod/openid.php:93 include/auth.php:112 include/auth.php:175
-msgid "Login failed."
-msgstr ""
-
-#: mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
-msgstr ""
-
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:204 mod/profile_photo.php:296
-#: mod/profile_photo.php:305 mod/photos.php:177 mod/photos.php:753
-#: mod/photos.php:1207 mod/photos.php:1230 include/user.php:343
-#: include/user.php:350 include/user.php:357 view/theme/diabook/theme.php:500
-msgid "Profile Photos"
-msgstr ""
-
-#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
-#: mod/profile_photo.php:308
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr ""
-
-#: mod/profile_photo.php:118
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: mod/profile_photo.php:128
-msgid "Unable to process image"
-msgstr ""
-
-#: mod/profile_photo.php:144 mod/wall_upload.php:137 mod/photos.php:789
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
-
-#: mod/profile_photo.php:153 mod/wall_upload.php:169 mod/photos.php:829
-msgid "Unable to process image."
-msgstr ""
-
-#: mod/profile_photo.php:242
-msgid "Upload File:"
-msgstr ""
-
-#: mod/profile_photo.php:243
-msgid "Select a profile:"
-msgstr ""
-
-#: mod/profile_photo.php:245
-msgid "Upload"
-msgstr ""
-
-#: mod/profile_photo.php:248
-msgid "or"
-msgstr ""
-
-#: mod/profile_photo.php:248
-msgid "skip this step"
-msgstr ""
-
-#: mod/profile_photo.php:248
-msgid "select a photo from your photo albums"
-msgstr ""
-
-#: mod/profile_photo.php:262
-msgid "Crop Image"
-msgstr ""
-
-#: mod/profile_photo.php:263
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr ""
-
-#: mod/profile_photo.php:265
-msgid "Done Editing"
-msgstr ""
-
-#: mod/profile_photo.php:299
-msgid "Image uploaded successfully."
-msgstr ""
-
-#: mod/profile_photo.php:301 mod/wall_upload.php:202 mod/photos.php:856
-msgid "Image upload failed."
-msgstr ""
-
-#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149
-#: include/conversation.php:126 include/conversation.php:253
-#: include/text.php:2034 include/diaspora.php:2127
-#: view/theme/diabook/theme.php:471
-msgid "photo"
-msgstr ""
-
-#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149 mod/like.php:319
-#: include/conversation.php:121 include/conversation.php:130
-#: include/conversation.php:248 include/conversation.php:257
-#: include/diaspora.php:2127 view/theme/diabook/theme.php:466
-#: view/theme/diabook/theme.php:475
-msgid "status"
-msgstr ""
-
-#: mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr ""
-
-#: mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: mod/tagrm.php:93 mod/delegate.php:139
-msgid "Remove"
-msgstr ""
-
-#: mod/filer.php:30 include/conversation.php:1005 include/conversation.php:1023
-msgid "Save to Folder:"
-msgstr ""
-
-#: mod/filer.php:30
-msgid "- select -"
-msgstr ""
-
-#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:59 include/text.php:997
-msgid "Save"
-msgstr ""
-
-#: mod/follow.php:26
-msgid "You already added this contact."
-msgstr ""
-
-#: mod/follow.php:58 mod/dfrn_request.php:847
-msgid "Please answer the following:"
-msgstr ""
-
-#: mod/follow.php:59 mod/dfrn_request.php:848
-#, php-format
-msgid "Does %s know you?"
-msgstr ""
-
-#: mod/follow.php:59 mod/settings.php:1066 mod/settings.php:1072
-#: mod/settings.php:1080 mod/settings.php:1084 mod/settings.php:1089
-#: mod/settings.php:1095 mod/settings.php:1101 mod/settings.php:1107
-#: mod/settings.php:1133 mod/settings.php:1134 mod/settings.php:1135
-#: mod/settings.php:1136 mod/settings.php:1137 mod/dfrn_request.php:848
-#: mod/register.php:236 mod/profiles.php:658 mod/profiles.php:662
-#: mod/api.php:106
-msgid "No"
-msgstr ""
-
-#: mod/follow.php:60 mod/dfrn_request.php:852
-msgid "Add a personal note:"
-msgstr ""
-
-#: mod/follow.php:66 mod/dfrn_request.php:858
-msgid "Your Identity Address:"
-msgstr ""
-
-#: mod/follow.php:69 mod/dfrn_request.php:861
-msgid "Submit Request"
-msgstr ""
-
-#: mod/follow.php:108
-msgid "Contact added"
-msgstr ""
-
-#: mod/item.php:115
-msgid "Unable to locate original post."
-msgstr ""
-
-#: mod/item.php:347
-msgid "Empty post discarded."
-msgstr ""
-
-#: mod/item.php:486 mod/wall_upload.php:199 mod/wall_upload.php:213
-#: mod/wall_upload.php:220 include/Photo.php:951 include/Photo.php:966
-#: include/Photo.php:973 include/Photo.php:995 include/message.php:145
-msgid "Wall Photos"
-msgstr ""
-
-#: mod/item.php:860
-msgid "System error. Post not saved."
-msgstr ""
-
-#: mod/item.php:989
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
-msgstr ""
-
-#: mod/item.php:991
-#, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: mod/item.php:992
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-
-#: mod/item.php:996
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: mod/group.php:29
-msgid "Group created."
-msgstr ""
-
-#: mod/group.php:35
-msgid "Could not create group."
-msgstr ""
-
-#: mod/group.php:47 mod/group.php:140
-msgid "Group not found."
-msgstr ""
-
-#: mod/group.php:60
-msgid "Group name changed."
-msgstr ""
-
-#: mod/group.php:87
-msgid "Save Group"
-msgstr ""
-
-#: mod/group.php:93
-msgid "Create a group of contacts/friends."
-msgstr ""
-
-#: mod/group.php:94 mod/group.php:178 include/group.php:273
-msgid "Group Name: "
-msgstr ""
-
-#: mod/group.php:113
-msgid "Group removed."
-msgstr ""
-
-#: mod/group.php:115
-msgid "Unable to remove group."
-msgstr ""
-
-#: mod/group.php:177
-msgid "Group Editor"
-msgstr ""
-
-#: mod/group.php:190
-msgid "Members"
-msgstr ""
-
-#: mod/apps.php:7 index.php:225
-msgid "You must be logged in to use addons. "
-msgstr ""
-
-#: mod/apps.php:11
-msgid "Applications"
-msgstr ""
-
-#: mod/apps.php:14
-msgid "No installed applications."
-msgstr ""
-
-#: mod/dfrn_confirm.php:64 mod/profiles.php:18 mod/profiles.php:133
-#: mod/profiles.php:179 mod/profiles.php:627
-msgid "Profile not found."
-msgstr ""
-
-#: mod/dfrn_confirm.php:120 mod/fsuggest.php:20 mod/fsuggest.php:92
-#: mod/crepair.php:134
-msgid "Contact not found."
-msgstr ""
-
-#: mod/dfrn_confirm.php:121
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
-msgstr ""
-
-#: mod/dfrn_confirm.php:240
-msgid "Response from remote site was not understood."
-msgstr ""
-
-#: mod/dfrn_confirm.php:249 mod/dfrn_confirm.php:254
-msgid "Unexpected response from remote site: "
-msgstr ""
-
-#: mod/dfrn_confirm.php:263
-msgid "Confirmation completed successfully."
-msgstr ""
-
-#: mod/dfrn_confirm.php:265 mod/dfrn_confirm.php:279 mod/dfrn_confirm.php:286
-msgid "Remote site reported: "
-msgstr ""
-
-#: mod/dfrn_confirm.php:277
-msgid "Temporary failure. Please wait and try again."
-msgstr ""
-
-#: mod/dfrn_confirm.php:284
-msgid "Introduction failed or was revoked."
-msgstr ""
-
-#: mod/dfrn_confirm.php:430
-msgid "Unable to set contact photo."
-msgstr ""
-
-#: mod/dfrn_confirm.php:487 include/conversation.php:172
-#: include/diaspora.php:634
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr ""
-
-#: mod/dfrn_confirm.php:572
-#, php-format
-msgid "No user record found for '%s' "
-msgstr ""
-
-#: mod/dfrn_confirm.php:582
-msgid "Our site encryption key is apparently messed up."
-msgstr ""
-
-#: mod/dfrn_confirm.php:593
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-
-#: mod/dfrn_confirm.php:614
-msgid "Contact record was not found for you on our site."
-msgstr ""
-
-#: mod/dfrn_confirm.php:628
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-
-#: mod/dfrn_confirm.php:648
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr ""
-
-#: mod/dfrn_confirm.php:659
-msgid "Unable to set your contact credentials on our system."
-msgstr ""
-
-#: mod/dfrn_confirm.php:726
-msgid "Unable to update your contact profile details on our system"
-msgstr ""
-
-#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:732 include/items.php:4237
-msgid "[Name Withheld]"
-msgstr ""
-
-#: mod/dfrn_confirm.php:798
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr ""
-
-#: mod/profile.php:21 include/identity.php:77
-msgid "Requested profile is not available."
-msgstr ""
-
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr ""
-
-#: mod/videos.php:113
-msgid "Do you really want to delete this video?"
-msgstr ""
-
-#: mod/videos.php:118
-msgid "Delete Video"
-msgstr ""
-
-#: mod/videos.php:197
-msgid "No videos selected"
-msgstr ""
-
-#: mod/videos.php:298 mod/photos.php:1053
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: mod/videos.php:373 include/text.php:1460
-msgid "View Video"
-msgstr ""
-
-#: mod/videos.php:380 mod/photos.php:1827
-msgid "View Album"
-msgstr ""
-
-#: mod/videos.php:389
-msgid "Recent Videos"
-msgstr ""
-
-#: mod/videos.php:391
-msgid "Upload New Videos"
-msgstr ""
-
-#: mod/tagger.php:95 include/conversation.php:265
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr ""
-
-#: mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr ""
-
-#: mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr ""
-
-#: mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr ""
-
-#: mod/wall_upload.php:19 mod/wall_upload.php:29 mod/wall_upload.php:76
-#: mod/wall_upload.php:110 mod/wall_upload.php:111 mod/wall_attach.php:16
-#: mod/wall_attach.php:21 mod/wall_attach.php:66 include/api.php:1692
-msgid "Invalid request."
-msgstr ""
-
-#: mod/lostpass.php:19
-msgid "No valid account found."
-msgstr ""
-
-#: mod/lostpass.php:35
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: mod/lostpass.php:42
-#, php-format
-msgid ""
-"\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."
-msgstr ""
-
-#: mod/lostpass.php:53
-#, php-format
-msgid ""
-"\n"
-"\t\tFollow this link to verify your identity:\n"
-"\n"
-"\t\t%1$s\n"
-"\n"
-"\t\tYou will then receive a follow-up message containing the new password.\n"
-"\t\tYou may change that password from your account settings page after "
-"logging in.\n"
-"\n"
-"\t\tThe login details are as follows:\n"
-"\n"
-"\t\tSite Location:\t%2$s\n"
-"\t\tLogin Name:\t%3$s"
-msgstr ""
-
-#: mod/lostpass.php:72
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: mod/lostpass.php:92
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: mod/lostpass.php:109 boot.php:1287
-msgid "Password Reset"
-msgstr ""
-
-#: mod/lostpass.php:110
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: mod/lostpass.php:111
-msgid "Your new password is"
-msgstr ""
-
-#: mod/lostpass.php:112
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: mod/lostpass.php:113
-msgid "click here to login"
-msgstr ""
-
-#: mod/lostpass.php:114
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: mod/lostpass.php:125
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tDear %1$s,\n"
-"\t\t\t\t\tYour password has been changed as requested. Please retain this\n"
-"\t\t\t\tinformation for your records (or change your password immediately "
-"to\n"
-"\t\t\t\tsomething that you will remember).\n"
-"\t\t\t"
-msgstr ""
-
-#: mod/lostpass.php:131
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\t\tSite Location:\t%1$s\n"
-"\t\t\t\tLogin Name:\t%2$s\n"
-"\t\t\t\tPassword:\t%3$s\n"
-"\n"
-"\t\t\t\tYou may change that password from your account settings page after "
-"logging in.\n"
-"\t\t\t"
-msgstr ""
-
-#: mod/lostpass.php:147
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr ""
-
-#: mod/lostpass.php:159
-msgid "Forgot your Password?"
-msgstr ""
-
-#: mod/lostpass.php:160
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: mod/lostpass.php:161
-msgid "Nickname or Email: "
-msgstr ""
-
-#: mod/lostpass.php:162
-msgid "Reset"
-msgstr ""
-
-#: mod/like.php:166 include/conversation.php:137 include/diaspora.php:2143
-#: view/theme/diabook/theme.php:480
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: mod/like.php:168 include/conversation.php:140
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: mod/ping.php:233
-msgid "{0} wants to be your friend"
-msgstr ""
-
-#: mod/ping.php:248
-msgid "{0} sent you a message"
-msgstr ""
-
-#: mod/ping.php:263
-msgid "{0} requested registration"
-msgstr ""
-
-#: mod/viewcontacts.php:41
-msgid "No contacts."
-msgstr ""
-
-#: mod/viewcontacts.php:78 include/text.php:917
-msgid "View Contacts"
-msgstr ""
-
-#: mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr ""
-
-#: mod/notifications.php:35 mod/notifications.php:175 mod/notifications.php:234
-msgid "Discard"
-msgstr ""
-
-#: mod/notifications.php:78
-msgid "System"
-msgstr ""
-
-#: mod/notifications.php:84 mod/admin.php:205 include/nav.php:153
-msgid "Network"
-msgstr ""
-
-#: mod/notifications.php:90 mod/network.php:375
-msgid "Personal"
-msgstr ""
-
-#: mod/notifications.php:96 include/nav.php:105 include/nav.php:156
-#: view/theme/diabook/theme.php:123
-msgid "Home"
-msgstr ""
-
-#: mod/notifications.php:102 include/nav.php:161
-msgid "Introductions"
-msgstr ""
-
-#: mod/notifications.php:127
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: mod/notifications.php:127
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: mod/notifications.php:159 mod/notifications.php:209
-msgid "Notification type: "
-msgstr ""
-
-#: mod/notifications.php:160
-msgid "Friend Suggestion"
-msgstr ""
-
-#: mod/notifications.php:162
-#, php-format
-msgid "suggested by %s"
-msgstr ""
-
-#: mod/notifications.php:168 mod/notifications.php:228
-msgid "Post a new friend activity"
-msgstr ""
-
-#: mod/notifications.php:168 mod/notifications.php:228
-msgid "if applicable"
-msgstr ""
-
-#: mod/notifications.php:171 mod/notifications.php:231 mod/admin.php:1079
-msgid "Approve"
-msgstr ""
-
-#: mod/notifications.php:191
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: mod/notifications.php:191
-msgid "yes"
-msgstr ""
-
-#: mod/notifications.php:191
-msgid "no"
-msgstr ""
-
-#: mod/notifications.php:192
-msgid ""
-"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: "
-msgstr ""
-
-#: mod/notifications.php:195
-msgid ""
-"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: "
-msgstr ""
-
-#: mod/notifications.php:203
-msgid "Friend"
-msgstr ""
-
-#: mod/notifications.php:204
-msgid "Sharer"
-msgstr ""
-
-#: mod/notifications.php:204
-msgid "Fan/Admirer"
-msgstr ""
-
-#: mod/notifications.php:210
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: mod/notifications.php:210
-msgid "New Follower"
-msgstr ""
-
-#: mod/notifications.php:218 mod/notifications.php:220 mod/events.php:503
-#: mod/directory.php:152 include/identity.php:268 include/bb2diaspora.php:170
-#: include/event.php:42
-msgid "Location:"
-msgstr ""
-
-#: mod/notifications.php:222 mod/directory.php:160 include/identity.php:277
-#: include/identity.php:581
-msgid "About:"
-msgstr ""
-
-#: mod/notifications.php:224 include/identity.php:575
-msgid "Tags:"
-msgstr ""
-
-#: mod/notifications.php:226 mod/directory.php:154 include/identity.php:270
-#: include/identity.php:540
-msgid "Gender:"
-msgstr ""
-
-#: mod/notifications.php:240
-msgid "No introductions."
-msgstr ""
-
-#: mod/notifications.php:243 include/nav.php:164
-msgid "Notifications"
-msgstr ""
-
-#: mod/notifications.php:281 mod/notifications.php:410
-#: mod/notifications.php:501
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: mod/notifications.php:291 mod/notifications.php:420
-#: mod/notifications.php:511
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: mod/notifications.php:306 mod/notifications.php:435
-#: mod/notifications.php:526
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: mod/notifications.php:313 mod/notifications.php:442
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: mod/notifications.php:314 mod/notifications.php:443
-#: mod/notifications.php:536
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: mod/notifications.php:329
-msgid "No more network notifications."
-msgstr ""
-
-#: mod/notifications.php:333
-msgid "Network Notifications"
-msgstr ""
-
-#: mod/notifications.php:359 mod/notify.php:72
-msgid "No more system notifications."
-msgstr ""
-
-#: mod/notifications.php:363 mod/notify.php:76
-msgid "System Notifications"
-msgstr ""
-
-#: mod/notifications.php:458
-msgid "No more personal notifications."
-msgstr ""
-
-#: mod/notifications.php:462
-msgid "Personal Notifications"
-msgstr ""
-
-#: mod/notifications.php:543
-msgid "No more home notifications."
-msgstr ""
-
-#: mod/notifications.php:547
-msgid "Home Notifications"
-msgstr ""
-
-#: mod/babel.php:17
-msgid "Source (bbcode) text:"
-msgstr ""
-
-#: mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr ""
-
-#: mod/babel.php:31
-msgid "Source input: "
-msgstr ""
-
-#: mod/babel.php:35
-msgid "bb2html (raw HTML): "
-msgstr ""
-
-#: mod/babel.php:39
-msgid "bb2html: "
-msgstr ""
-
-#: mod/babel.php:43
-msgid "bb2html2bb: "
-msgstr ""
-
-#: mod/babel.php:47
-msgid "bb2md: "
-msgstr ""
-
-#: mod/babel.php:51
-msgid "bb2md2html: "
-msgstr ""
-
-#: mod/babel.php:55
-msgid "bb2dia2bb: "
-msgstr ""
-
-#: mod/babel.php:59
-msgid "bb2md2html2bb: "
-msgstr ""
-
-#: mod/babel.php:69
-msgid "Source input (Diaspora format): "
-msgstr ""
-
-#: mod/babel.php:74
-msgid "diaspora2bb: "
-msgstr ""
-
-#: mod/navigation.php:20 include/nav.php:34
-msgid "Nothing new here"
-msgstr ""
-
-#: mod/navigation.php:24 include/nav.php:38
-msgid "Clear notifications"
-msgstr ""
-
-#: mod/message.php:9 include/nav.php:173
-msgid "New Message"
-msgstr ""
-
-#: mod/message.php:64 mod/wallmessage.php:56
-msgid "No recipient selected."
-msgstr ""
-
-#: mod/message.php:68
-msgid "Unable to locate contact information."
-msgstr ""
-
-#: mod/message.php:71 mod/wallmessage.php:62
-msgid "Message could not be sent."
-msgstr ""
-
-#: mod/message.php:74 mod/wallmessage.php:65
-msgid "Message collection failure."
-msgstr ""
-
-#: mod/message.php:77 mod/wallmessage.php:68
-msgid "Message sent."
-msgstr ""
-
-#: mod/message.php:183 include/nav.php:170
-msgid "Messages"
-msgstr ""
-
-#: mod/message.php:208
-msgid "Do you really want to delete this message?"
-msgstr ""
-
-#: mod/message.php:228
-msgid "Message deleted."
-msgstr ""
-
-#: mod/message.php:259
-msgid "Conversation removed."
-msgstr ""
-
-#: mod/message.php:284 mod/message.php:292 mod/message.php:467
-#: mod/message.php:475 mod/wallmessage.php:127 mod/wallmessage.php:135
-#: include/conversation.php:1001 include/conversation.php:1019
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: mod/message.php:320 mod/wallmessage.php:142
-msgid "Send Private Message"
-msgstr ""
-
-#: mod/message.php:321 mod/message.php:554 mod/wallmessage.php:144
-msgid "To:"
-msgstr ""
-
-#: mod/message.php:326 mod/message.php:556 mod/wallmessage.php:145
-msgid "Subject:"
-msgstr ""
-
-#: mod/message.php:330 mod/message.php:559 mod/wallmessage.php:151
-#: mod/invite.php:134
-msgid "Your message:"
-msgstr ""
-
-#: mod/message.php:333 mod/message.php:563 mod/wallmessage.php:154
-#: mod/editpost.php:110 include/conversation.php:1056
-msgid "Upload photo"
-msgstr ""
-
-#: mod/message.php:334 mod/message.php:564 mod/wallmessage.php:155
-#: mod/editpost.php:114 include/conversation.php:1060
-msgid "Insert web link"
-msgstr ""
-
-#: mod/message.php:335 mod/message.php:566 mod/content.php:501
-#: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:124
-#: mod/photos.php:1564 object/Item.php:366 include/conversation.php:691
-#: include/conversation.php:1074
-msgid "Please wait"
-msgstr ""
-
-#: mod/message.php:372
-msgid "No messages."
-msgstr ""
-
-#: mod/message.php:379
-#, php-format
-msgid "Unknown sender - %s"
-msgstr ""
-
-#: mod/message.php:382
-#, php-format
-msgid "You and %s"
-msgstr ""
-
-#: mod/message.php:385
-#, php-format
-msgid "%s and You"
-msgstr ""
-
-#: mod/message.php:406 mod/message.php:547
-msgid "Delete conversation"
-msgstr ""
-
-#: mod/message.php:409
-msgid "D, d M Y - g:i A"
-msgstr ""
-
-#: mod/message.php:412
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/message.php:451
-msgid "Message not available."
-msgstr ""
-
-#: mod/message.php:521
-msgid "Delete message"
-msgstr ""
-
-#: mod/message.php:549
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: mod/message.php:553
-msgid "Send Reply"
-msgstr ""
-
-#: mod/update_display.php:22 mod/update_community.php:18
-#: mod/update_notes.php:37 mod/update_profile.php:41 mod/update_network.php:25
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: mod/crepair.php:107
-msgid "Contact settings applied."
-msgstr ""
-
-#: mod/crepair.php:109
-msgid "Contact update failed."
-msgstr ""
-
-#: mod/crepair.php:140
-msgid "Repair Contact Settings"
-msgstr ""
-
-#: mod/crepair.php:142
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
-msgstr ""
-
-#: mod/crepair.php:143
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-
-#: mod/crepair.php:149
-msgid "Return to contact editor"
-msgstr ""
-
-#: mod/crepair.php:160 mod/crepair.php:162
-msgid "No mirroring"
-msgstr ""
-
-#: mod/crepair.php:160
-msgid "Mirror as forwarded posting"
-msgstr ""
-
-#: mod/crepair.php:160 mod/crepair.php:162
-msgid "Mirror as my own posting"
-msgstr ""
-
-#: mod/crepair.php:169
-msgid "Refetch contact data"
-msgstr ""
-
-#: mod/crepair.php:170 mod/admin.php:1077 mod/admin.php:1089 mod/admin.php:1090
-#: mod/admin.php:1103 mod/settings.php:634 mod/settings.php:660
-msgid "Name"
-msgstr ""
-
-#: mod/crepair.php:171
-msgid "Account Nickname"
-msgstr ""
-
-#: mod/crepair.php:172
-msgid "@Tagname - overrides Name/Nickname"
-msgstr ""
-
-#: mod/crepair.php:173
-msgid "Account URL"
-msgstr ""
-
-#: mod/crepair.php:174
-msgid "Friend Request URL"
-msgstr ""
-
-#: mod/crepair.php:175
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: mod/crepair.php:176
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: mod/crepair.php:177
-msgid "Poll/Feed URL"
-msgstr ""
-
-#: mod/crepair.php:178
-msgid "New photo from this URL"
-msgstr ""
-
-#: mod/crepair.php:179
-msgid "Remote Self"
-msgstr ""
-
-#: mod/crepair.php:181
-msgid "Mirror postings from this contact"
-msgstr ""
-
-#: mod/crepair.php:181
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr ""
-
-#: mod/bookmarklet.php:12 boot.php:1273 include/nav.php:92
-msgid "Login"
-msgstr ""
-
-#: mod/bookmarklet.php:41
-msgid "The post was created"
-msgstr ""
-
-#: mod/viewsrc.php:7
-msgid "Access denied."
-msgstr ""
-
-#: mod/dirfind.php:36
-#, php-format
-msgid "People Search - %s"
-msgstr ""
-
-#: mod/dirfind.php:125 mod/match.php:65 mod/suggest.php:92
-#: include/contact_widgets.php:10 include/identity.php:188
-msgid "Connect"
-msgstr ""
-
-#: mod/dirfind.php:139 mod/match.php:73
-msgid "No matches"
-msgstr ""
-
-#: mod/fbrowser.php:32 include/identity.php:648 include/nav.php:78
-#: view/theme/diabook/theme.php:126
-msgid "Photos"
-msgstr ""
-
-#: mod/fbrowser.php:122
-msgid "Files"
-msgstr ""
-
-#: mod/nogroup.php:59
-msgid "Contacts who are not members of a group"
-msgstr ""
-
-#: mod/admin.php:57
-msgid "Theme settings updated."
-msgstr ""
-
-#: mod/admin.php:104 mod/admin.php:682
-msgid "Site"
-msgstr ""
-
-#: mod/admin.php:105 mod/admin.php:628 mod/admin.php:1072 mod/admin.php:1087
-msgid "Users"
-msgstr ""
-
-#: mod/admin.php:106 mod/admin.php:1176 mod/admin.php:1236 mod/settings.php:66
-msgid "Plugins"
-msgstr ""
-
-#: mod/admin.php:107 mod/admin.php:1404 mod/admin.php:1438
-msgid "Themes"
-msgstr ""
-
-#: mod/admin.php:108
-msgid "DB updates"
-msgstr ""
-
-#: mod/admin.php:109 mod/admin.php:200
-msgid "Inspect Queue"
-msgstr ""
-
-#: mod/admin.php:124 mod/admin.php:133 mod/admin.php:1525
-msgid "Logs"
-msgstr ""
-
-#: mod/admin.php:125
-msgid "probe address"
-msgstr ""
-
-#: mod/admin.php:126
-msgid "check webfinger"
-msgstr ""
-
-#: mod/admin.php:131 include/nav.php:193
-msgid "Admin"
-msgstr ""
-
-#: mod/admin.php:132
-msgid "Plugin Features"
-msgstr ""
-
-#: mod/admin.php:134
-msgid "diagnostics"
-msgstr ""
-
-#: mod/admin.php:135
-msgid "User registrations waiting for confirmation"
-msgstr ""
-
-#: mod/admin.php:199 mod/admin.php:249 mod/admin.php:681 mod/admin.php:1071
-#: mod/admin.php:1175 mod/admin.php:1235 mod/admin.php:1403 mod/admin.php:1437
-#: mod/admin.php:1524
-msgid "Administration"
-msgstr ""
-
-#: mod/admin.php:202
-msgid "ID"
-msgstr ""
-
-#: mod/admin.php:203
-msgid "Recipient Name"
-msgstr ""
-
-#: mod/admin.php:204
-msgid "Recipient Profile"
-msgstr ""
-
-#: mod/admin.php:206
-msgid "Created"
-msgstr ""
-
-#: mod/admin.php:207
-msgid "Last Tried"
-msgstr ""
-
-#: mod/admin.php:208
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:220 mod/admin.php:1025
-msgid "Normal Account"
-msgstr ""
-
-#: mod/admin.php:221 mod/admin.php:1026
-msgid "Soapbox Account"
-msgstr ""
-
-#: mod/admin.php:222 mod/admin.php:1027
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: mod/admin.php:223 mod/admin.php:1028
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: mod/admin.php:224
-msgid "Blog Account"
-msgstr ""
-
-#: mod/admin.php:225
-msgid "Private Forum"
-msgstr ""
-
-#: mod/admin.php:244
-msgid "Message queues"
-msgstr ""
-
-#: mod/admin.php:250
-msgid "Summary"
-msgstr ""
-
-#: mod/admin.php:252
-msgid "Registered users"
-msgstr ""
-
-#: mod/admin.php:254
-msgid "Pending registrations"
-msgstr ""
-
-#: mod/admin.php:255
-msgid "Version"
-msgstr ""
-
-#: mod/admin.php:260
-msgid "Active plugins"
-msgstr ""
-
-#: mod/admin.php:283
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr ""
-
-#: mod/admin.php:565
-msgid "Site settings updated."
-msgstr ""
-
-#: mod/admin.php:594 mod/settings.php:883
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:611
-msgid "No community page"
-msgstr ""
-
-#: mod/admin.php:612
-msgid "Public postings from users of this site"
-msgstr ""
-
-#: mod/admin.php:613
-msgid "Global community page"
-msgstr ""
-
-#: mod/admin.php:619
-msgid "At post arrival"
-msgstr ""
-
-#: mod/admin.php:620 include/contact_selectors.php:56
-msgid "Frequently"
-msgstr ""
-
-#: mod/admin.php:621 include/contact_selectors.php:57
-msgid "Hourly"
-msgstr ""
-
-#: mod/admin.php:622 include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr ""
-
-#: mod/admin.php:623 include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: mod/admin.php:629
-msgid "Users, Global Contacts"
-msgstr ""
-
-#: mod/admin.php:630
-msgid "Users, Global Contacts/fallback"
-msgstr ""
-
-#: mod/admin.php:634
-msgid "One month"
-msgstr ""
-
-#: mod/admin.php:635
-msgid "Three months"
-msgstr ""
-
-#: mod/admin.php:636
-msgid "Half a year"
-msgstr ""
-
-#: mod/admin.php:637
-msgid "One year"
-msgstr ""
-
-#: mod/admin.php:642
-msgid "Multi user instance"
-msgstr ""
-
-#: mod/admin.php:665
-msgid "Closed"
-msgstr ""
-
-#: mod/admin.php:666
-msgid "Requires approval"
-msgstr ""
-
-#: mod/admin.php:667
-msgid "Open"
-msgstr ""
-
-#: mod/admin.php:671
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: mod/admin.php:672
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: mod/admin.php:673
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: mod/admin.php:683 mod/admin.php:1237 mod/admin.php:1439 mod/admin.php:1526
-#: mod/settings.php:632 mod/settings.php:742 mod/settings.php:784
-#: mod/settings.php:853 mod/settings.php:935 mod/settings.php:1165
-msgid "Save Settings"
-msgstr ""
-
-#: mod/admin.php:684 mod/register.php:260
-msgid "Registration"
-msgstr ""
-
-#: mod/admin.php:685
-msgid "File upload"
-msgstr ""
-
-#: mod/admin.php:686
-msgid "Policies"
-msgstr ""
-
-#: mod/admin.php:687
-msgid "Advanced"
-msgstr ""
-
-#: mod/admin.php:688
-msgid "Auto Discovered Contact Directory"
-msgstr ""
-
-#: mod/admin.php:689
-msgid "Performance"
-msgstr ""
-
-#: mod/admin.php:690
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr ""
-
-#: mod/admin.php:693
-msgid "Site name"
-msgstr ""
-
-#: mod/admin.php:694
-msgid "Host name"
-msgstr ""
-
-#: mod/admin.php:695
-msgid "Sender Email"
-msgstr ""
-
-#: mod/admin.php:695
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr ""
-
-#: mod/admin.php:696
-msgid "Banner/Logo"
-msgstr ""
-
-#: mod/admin.php:697
-msgid "Shortcut icon"
-msgstr ""
-
-#: mod/admin.php:697
-msgid "Link to an icon that will be used for browsers."
-msgstr ""
-
-#: mod/admin.php:698
-msgid "Touch icon"
-msgstr ""
-
-#: mod/admin.php:698
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr ""
-
-#: mod/admin.php:699
-msgid "Additional Info"
-msgstr ""
-
-#: mod/admin.php:699
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr ""
-
-#: mod/admin.php:700
-msgid "System language"
-msgstr ""
-
-#: mod/admin.php:701
-msgid "System theme"
-msgstr ""
-
-#: mod/admin.php:701
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: mod/admin.php:702
-msgid "Mobile system theme"
-msgstr ""
-
-#: mod/admin.php:702
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:703
-msgid "SSL link policy"
-msgstr ""
-
-#: mod/admin.php:703
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: mod/admin.php:704
-msgid "Force SSL"
-msgstr ""
-
-#: mod/admin.php:704
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
-msgstr ""
-
-#: mod/admin.php:705
-msgid "Old style 'Share'"
-msgstr ""
-
-#: mod/admin.php:705
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr ""
-
-#: mod/admin.php:706
-msgid "Hide help entry from navigation menu"
-msgstr ""
-
-#: mod/admin.php:706
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr ""
-
-#: mod/admin.php:707
-msgid "Single user instance"
-msgstr ""
-
-#: mod/admin.php:707
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr ""
-
-#: mod/admin.php:708
-msgid "Maximum image size"
-msgstr ""
-
-#: mod/admin.php:708
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: mod/admin.php:709
-msgid "Maximum image length"
-msgstr ""
-
-#: mod/admin.php:709
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr ""
-
-#: mod/admin.php:710
-msgid "JPEG image quality"
-msgstr ""
-
-#: mod/admin.php:710
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: mod/admin.php:712
-msgid "Register policy"
-msgstr ""
-
-#: mod/admin.php:713
-msgid "Maximum Daily Registrations"
-msgstr ""
-
-#: mod/admin.php:713
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user "
-"registrations to accept per day.  If register is set to closed, this setting "
-"has no effect."
-msgstr ""
-
-#: mod/admin.php:714
-msgid "Register text"
-msgstr ""
-
-#: mod/admin.php:714
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: mod/admin.php:715
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: mod/admin.php:715
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: mod/admin.php:716
-msgid "Allowed friend domains"
-msgstr ""
-
-#: mod/admin.php:716
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr ""
-
-#: mod/admin.php:717
-msgid "Allowed email domains"
-msgstr ""
-
-#: mod/admin.php:717
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr ""
-
-#: mod/admin.php:718
-msgid "Block public"
-msgstr ""
-
-#: mod/admin.php:718
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr ""
-
-#: mod/admin.php:719
-msgid "Force publish"
-msgstr ""
-
-#: mod/admin.php:719
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: mod/admin.php:720
-msgid "Global directory update URL"
-msgstr ""
-
-#: mod/admin.php:720
-msgid ""
-"URL to update the global directory. If this is not set, the global directory "
-"is completely unavailable to the application."
-msgstr ""
-
-#: mod/admin.php:721
-msgid "Allow threaded items"
-msgstr ""
-
-#: mod/admin.php:721
-msgid "Allow infinite level threading for items on this site."
-msgstr ""
-
-#: mod/admin.php:722
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: mod/admin.php:722
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: mod/admin.php:723
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: mod/admin.php:723
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:724
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: mod/admin.php:724
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: mod/admin.php:725
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: mod/admin.php:725
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
-msgstr ""
-
-#: mod/admin.php:726
-msgid "Allow Users to set remote_self"
-msgstr ""
-
-#: mod/admin.php:726
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr ""
-
-#: mod/admin.php:727
-msgid "Block multiple registrations"
-msgstr ""
-
-#: mod/admin.php:727
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: mod/admin.php:728
-msgid "OpenID support"
-msgstr ""
-
-#: mod/admin.php:728
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: mod/admin.php:729
-msgid "Fullname check"
-msgstr ""
-
-#: mod/admin.php:729
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: mod/admin.php:730
-msgid "UTF-8 Regular expressions"
-msgstr ""
-
-#: mod/admin.php:730
-msgid "Use PHP UTF8 regular expressions"
-msgstr ""
-
-#: mod/admin.php:731
-msgid "Community Page Style"
-msgstr ""
-
-#: mod/admin.php:731
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr ""
-
-#: mod/admin.php:732
-msgid "Posts per user on community page"
-msgstr ""
-
-#: mod/admin.php:732
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr ""
-
-#: mod/admin.php:733
-msgid "Enable OStatus support"
-msgstr ""
-
-#: mod/admin.php:733
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: mod/admin.php:734
-msgid "OStatus conversation completion interval"
-msgstr ""
-
-#: mod/admin.php:734
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr ""
-
-#: mod/admin.php:735
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: mod/admin.php:735
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: mod/admin.php:736
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: mod/admin.php:736
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: mod/admin.php:737
-msgid "Verify SSL"
-msgstr ""
-
-#: mod/admin.php:737
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
-msgstr ""
-
-#: mod/admin.php:738
-msgid "Proxy user"
-msgstr ""
-
-#: mod/admin.php:739
-msgid "Proxy URL"
-msgstr ""
-
-#: mod/admin.php:740
-msgid "Network timeout"
-msgstr ""
-
-#: mod/admin.php:740
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: mod/admin.php:741
-msgid "Delivery interval"
-msgstr ""
-
-#: mod/admin.php:741
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
-
-#: mod/admin.php:742
-msgid "Poll interval"
-msgstr ""
-
-#: mod/admin.php:742
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: mod/admin.php:743
-msgid "Maximum Load Average"
-msgstr ""
-
-#: mod/admin.php:743
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: mod/admin.php:744
-msgid "Maximum Load Average (Frontend)"
-msgstr ""
-
-#: mod/admin.php:744
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr ""
-
-#: mod/admin.php:746
-msgid "Periodical check of global contacts"
-msgstr ""
-
-#: mod/admin.php:746
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr ""
-
-#: mod/admin.php:747
-msgid "Discover contacts from other servers"
-msgstr ""
-
-#: mod/admin.php:747
-msgid ""
-"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'."
-msgstr ""
-
-#: mod/admin.php:748
-msgid "Timeframe for fetching global contacts"
-msgstr ""
-
-#: mod/admin.php:748
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr ""
-
-#: mod/admin.php:749
-msgid "Search the local directory"
-msgstr ""
-
-#: mod/admin.php:749
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:751
-msgid "Publish server information"
-msgstr ""
-
-#: mod/admin.php:751
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:753
-msgid "Use MySQL full text engine"
-msgstr ""
-
-#: mod/admin.php:753
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr ""
-
-#: mod/admin.php:754
-msgid "Suppress Language"
-msgstr ""
-
-#: mod/admin.php:754
-msgid "Suppress language information in meta information about a posting."
-msgstr ""
-
-#: mod/admin.php:755
-msgid "Suppress Tags"
-msgstr ""
-
-#: mod/admin.php:755
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
-
-#: mod/admin.php:756
-msgid "Path to item cache"
-msgstr ""
-
-#: mod/admin.php:756
-msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
-
-#: mod/admin.php:757
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: mod/admin.php:757
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:758
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: mod/admin.php:758
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: mod/admin.php:759
-msgid "Path for lock file"
-msgstr ""
-
-#: mod/admin.php:759
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr ""
-
-#: mod/admin.php:760
-msgid "Temp path"
-msgstr ""
-
-#: mod/admin.php:760
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr ""
-
-#: mod/admin.php:761
-msgid "Base path to installation"
-msgstr ""
-
-#: mod/admin.php:761
-msgid ""
-"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."
-msgstr ""
-
-#: mod/admin.php:762
-msgid "Disable picture proxy"
-msgstr ""
-
-#: mod/admin.php:762
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
-msgstr ""
-
-#: mod/admin.php:763
-msgid "Enable old style pager"
-msgstr ""
-
-#: mod/admin.php:763
-msgid ""
-"The old style pager has page numbers but slows down massively the page speed."
-msgstr ""
-
-#: mod/admin.php:764
-msgid "Only search in tags"
-msgstr ""
-
-#: mod/admin.php:764
-msgid "On large systems the text search can slow down the system extremely."
-msgstr ""
-
-#: mod/admin.php:766
-msgid "New base url"
-msgstr ""
-
-#: mod/admin.php:766
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts "
-"of all users."
-msgstr ""
-
-#: mod/admin.php:768
-msgid "RINO Encryption"
-msgstr ""
-
-#: mod/admin.php:768
-msgid "Encryption layer between nodes."
-msgstr ""
-
-#: mod/admin.php:769
-msgid "Embedly API key"
-msgstr ""
-
-#: mod/admin.php:769
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr ""
-
-#: mod/admin.php:787
-msgid "Update has been marked successful"
-msgstr ""
-
-#: mod/admin.php:795
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:798
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:810
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:813
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:817
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: mod/admin.php:819
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr ""
-
-#: mod/admin.php:838
-msgid "No failed updates."
-msgstr ""
-
-#: mod/admin.php:839
-msgid "Check database structure"
-msgstr ""
-
-#: mod/admin.php:844
-msgid "Failed Updates"
-msgstr ""
-
-#: mod/admin.php:845
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: mod/admin.php:846
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: mod/admin.php:847
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: mod/admin.php:879
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr ""
-
-#: mod/admin.php:882
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default "
-"profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr ""
-
-#: mod/admin.php:914 include/user.php:421
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: mod/admin.php:926
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:933
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:972
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: mod/admin.php:980
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: mod/admin.php:980
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: mod/admin.php:1073
-msgid "Add User"
-msgstr ""
-
-#: mod/admin.php:1074
-msgid "select all"
-msgstr ""
-
-#: mod/admin.php:1075
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: mod/admin.php:1076
-msgid "User waiting for permanent deletion"
-msgstr ""
-
-#: mod/admin.php:1077
-msgid "Request date"
-msgstr ""
-
-#: mod/admin.php:1077 mod/admin.php:1089 mod/admin.php:1090 mod/admin.php:1105
-#: include/contact_selectors.php:79 include/contact_selectors.php:86
-msgid "Email"
-msgstr ""
-
-#: mod/admin.php:1078
-msgid "No registrations."
-msgstr ""
-
-#: mod/admin.php:1080
-msgid "Deny"
-msgstr ""
-
-#: mod/admin.php:1084
-msgid "Site admin"
-msgstr ""
-
-#: mod/admin.php:1085
-msgid "Account expired"
-msgstr ""
-
-#: mod/admin.php:1088
-msgid "New User"
-msgstr ""
-
-#: mod/admin.php:1089 mod/admin.php:1090
-msgid "Register date"
-msgstr ""
-
-#: mod/admin.php:1089 mod/admin.php:1090
-msgid "Last login"
-msgstr ""
-
-#: mod/admin.php:1089 mod/admin.php:1090
-msgid "Last item"
-msgstr ""
-
-#: mod/admin.php:1089
-msgid "Deleted since"
-msgstr ""
-
-#: mod/admin.php:1090 mod/settings.php:41
-msgid "Account"
-msgstr ""
-
-#: mod/admin.php:1092
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1093
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1103
-msgid "Name of the new user."
-msgstr ""
-
-#: mod/admin.php:1104
-msgid "Nickname"
-msgstr ""
-
-#: mod/admin.php:1104
-msgid "Nickname of the new user."
-msgstr ""
-
-#: mod/admin.php:1105
-msgid "Email address of the new user."
-msgstr ""
-
-#: mod/admin.php:1138
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: mod/admin.php:1142
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: mod/admin.php:1152 mod/admin.php:1375
-msgid "Disable"
-msgstr ""
-
-#: mod/admin.php:1154 mod/admin.php:1377
-msgid "Enable"
-msgstr ""
-
-#: mod/admin.php:1177 mod/admin.php:1405
-msgid "Toggle"
-msgstr ""
-
-#: mod/admin.php:1185 mod/admin.php:1415
-msgid "Author: "
-msgstr ""
-
-#: mod/admin.php:1186 mod/admin.php:1416
-msgid "Maintainer: "
-msgstr ""
-
-#: mod/admin.php:1335
-msgid "No themes found."
-msgstr ""
-
-#: mod/admin.php:1397
-msgid "Screenshot"
-msgstr ""
-
-#: mod/admin.php:1443
-msgid "[Experimental]"
-msgstr ""
-
-#: mod/admin.php:1444
-msgid "[Unsupported]"
-msgstr ""
-
-#: mod/admin.php:1471
-msgid "Log settings updated."
-msgstr ""
-
-#: mod/admin.php:1527
-msgid "Clear"
-msgstr ""
-
-#: mod/admin.php:1533
-msgid "Enable Debugging"
-msgstr ""
-
-#: mod/admin.php:1534
-msgid "Log file"
-msgstr ""
-
-#: mod/admin.php:1534
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: mod/admin.php:1535
-msgid "Log level"
-msgstr ""
-
-#: mod/admin.php:1585 include/acl_selectors.php:347
-msgid "Close"
-msgstr ""
-
-#: mod/admin.php:1591
-msgid "FTP Host"
-msgstr ""
-
-#: mod/admin.php:1592
-msgid "FTP Path"
-msgstr ""
-
-#: mod/admin.php:1593
-msgid "FTP User"
-msgstr ""
-
-#: mod/admin.php:1594
-msgid "FTP Password"
-msgstr ""
-
-#: mod/network.php:143
-#, php-format
-msgid "Search Results For: %s"
-msgstr ""
-
-#: mod/network.php:187 mod/search.php:25
+#: mod/search.php:25 mod/network.php:187
 msgid "Remove term"
 msgstr ""
 
-#: mod/network.php:196 mod/search.php:34 include/features.php:42
+#: mod/search.php:34 mod/network.php:196 include/features.php:42
 msgid "Saved Searches"
 msgstr ""
 
-#: mod/network.php:197 include/group.php:277
-msgid "add"
+#: mod/search.php:107 include/text.php:996 include/nav.php:119
+msgid "Search"
 msgstr ""
 
-#: mod/network.php:358
-msgid "Commented Order"
-msgstr ""
-
-#: mod/network.php:361
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: mod/network.php:365
-msgid "Posted Order"
-msgstr ""
-
-#: mod/network.php:368
-msgid "Sort by Post Date"
-msgstr ""
-
-#: mod/network.php:378
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: mod/network.php:385
-msgid "New"
-msgstr ""
-
-#: mod/network.php:388
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: mod/network.php:395
-msgid "Shared Links"
-msgstr ""
-
-#: mod/network.php:398
-msgid "Interesting Links"
-msgstr ""
-
-#: mod/network.php:405
-msgid "Starred"
-msgstr ""
-
-#: mod/network.php:408
-msgid "Favourite Posts"
-msgstr ""
-
-#: mod/network.php:466
-#, php-format
-msgid "Warning: This group contains %s member from an insecure network."
-msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/network.php:469
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr ""
-
-#: mod/network.php:532 mod/content.php:119
-msgid "No such group"
-msgstr ""
-
-#: mod/network.php:549 mod/content.php:130
-msgid "Group is empty"
-msgstr ""
-
-#: mod/network.php:560 mod/content.php:135
-#, php-format
-msgid "Group: %s"
-msgstr ""
-
-#: mod/network.php:578
-#, php-format
-msgid "Contact: %s"
-msgstr ""
-
-#: mod/network.php:582
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr ""
-
-#: mod/network.php:587
-msgid "Invalid contact."
-msgstr ""
-
-#: mod/allfriends.php:37
-#, php-format
-msgid "Friends of %s"
-msgstr ""
-
-#: mod/allfriends.php:44
-msgid "No friends to display."
-msgstr ""
-
-#: mod/events.php:71 mod/events.php:73
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: mod/events.php:80 mod/events.php:82
-msgid "Event title and start time are required."
-msgstr ""
-
-#: mod/events.php:317
-msgid "l, F j"
-msgstr ""
-
-#: mod/events.php:339
-msgid "Edit event"
-msgstr ""
-
-#: mod/events.php:361 include/text.php:1716 include/text.php:1723
-msgid "link to source"
-msgstr ""
-
-#: mod/events.php:396 include/identity.php:667 include/nav.php:80
-#: view/theme/diabook/theme.php:127
-msgid "Events"
-msgstr ""
-
-#: mod/events.php:397
-msgid "Create New Event"
-msgstr ""
-
-#: mod/events.php:398
-msgid "Previous"
-msgstr ""
-
-#: mod/events.php:399 mod/install.php:209
-msgid "Next"
-msgstr ""
-
-#: mod/events.php:491
-msgid "Event details"
-msgstr ""
-
-#: mod/events.php:492
-msgid "Starting date and Title are required."
-msgstr ""
-
-#: mod/events.php:493
-msgid "Event Starts:"
-msgstr ""
-
-#: mod/events.php:493 mod/events.php:505
-msgid "Required"
-msgstr ""
-
-#: mod/events.php:495
-msgid "Finish date/time is not known or not relevant"
-msgstr ""
-
-#: mod/events.php:497
-msgid "Event Finishes:"
-msgstr ""
-
-#: mod/events.php:499
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: mod/events.php:501
-msgid "Description:"
-msgstr ""
-
-#: mod/events.php:505
-msgid "Title:"
-msgstr ""
-
-#: mod/events.php:507
-msgid "Share this event"
-msgstr ""
-
-#: mod/events.php:509 mod/content.php:721 mod/editpost.php:145
-#: mod/photos.php:1585 mod/photos.php:1629 mod/photos.php:1717
-#: object/Item.php:689 include/conversation.php:1089
-msgid "Preview"
-msgstr ""
-
-#: mod/content.php:439 mod/content.php:742 mod/photos.php:1672
-#: object/Item.php:130 include/conversation.php:612
-msgid "Select"
-msgstr ""
-
-#: mod/content.php:473 mod/content.php:854 mod/content.php:855
-#: object/Item.php:328 object/Item.php:329 include/conversation.php:653
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: mod/content.php:483 mod/content.php:866 object/Item.php:342
-#: include/conversation.php:673
-#, php-format
-msgid "%s from %s"
-msgstr ""
-
-#: mod/content.php:499 include/conversation.php:689
-msgid "View in context"
-msgstr ""
-
-#: mod/content.php:605 object/Item.php:389
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/content.php:607 object/Item.php:391 object/Item.php:404
-#: include/text.php:2038
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/content.php:608 boot.php:765 object/Item.php:392
-#: include/contact_widgets.php:205 include/items.php:5134
-msgid "show more"
-msgstr ""
-
-#: mod/content.php:622 mod/photos.php:1379 object/Item.php:117
-msgid "Private Message"
-msgstr ""
-
-#: mod/content.php:686 mod/photos.php:1561 object/Item.php:232
-msgid "I like this (toggle)"
-msgstr ""
-
-#: mod/content.php:686 object/Item.php:232
-msgid "like"
-msgstr ""
-
-#: mod/content.php:687 mod/photos.php:1562 object/Item.php:233
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: mod/content.php:687 object/Item.php:233
-msgid "dislike"
-msgstr ""
-
-#: mod/content.php:689 object/Item.php:235
-msgid "Share this"
-msgstr ""
-
-#: mod/content.php:689 object/Item.php:235
-msgid "share"
-msgstr ""
-
-#: mod/content.php:709 mod/photos.php:1581 mod/photos.php:1625
-#: mod/photos.php:1713 object/Item.php:677
-msgid "This is you"
-msgstr ""
-
-#: mod/content.php:711 mod/photos.php:1583 mod/photos.php:1627
-#: mod/photos.php:1715 boot.php:764 object/Item.php:363 object/Item.php:679
-msgid "Comment"
-msgstr ""
-
-#: mod/content.php:713 object/Item.php:681
-msgid "Bold"
-msgstr ""
-
-#: mod/content.php:714 object/Item.php:682
-msgid "Italic"
-msgstr ""
-
-#: mod/content.php:715 object/Item.php:683
-msgid "Underline"
-msgstr ""
-
-#: mod/content.php:716 object/Item.php:684
-msgid "Quote"
-msgstr ""
-
-#: mod/content.php:717 object/Item.php:685
-msgid "Code"
-msgstr ""
-
-#: mod/content.php:718 object/Item.php:686
-msgid "Image"
-msgstr ""
-
-#: mod/content.php:719 object/Item.php:687
-msgid "Link"
-msgstr ""
-
-#: mod/content.php:720 object/Item.php:688
-msgid "Video"
-msgstr ""
-
-#: mod/content.php:730 mod/settings.php:694 object/Item.php:121
-msgid "Edit"
-msgstr ""
-
-#: mod/content.php:755 object/Item.php:196
-msgid "add star"
-msgstr ""
-
-#: mod/content.php:756 object/Item.php:197
-msgid "remove star"
-msgstr ""
-
-#: mod/content.php:757 object/Item.php:198
-msgid "toggle star status"
-msgstr ""
-
-#: mod/content.php:760 object/Item.php:201
-msgid "starred"
-msgstr ""
-
-#: mod/content.php:761 object/Item.php:221
-msgid "add tag"
-msgstr ""
-
-#: mod/content.php:765 object/Item.php:134
-msgid "save to folder"
-msgstr ""
-
-#: mod/content.php:856 object/Item.php:330
-msgid "to"
-msgstr ""
-
-#: mod/content.php:857 object/Item.php:332
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: mod/content.php:858 object/Item.php:333
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: mod/removeme.php:46 mod/removeme.php:49
-msgid "Remove My Account"
-msgstr ""
-
-#: mod/removeme.php:47
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr ""
-
-#: mod/removeme.php:48
-msgid "Please enter your password for verification:"
-msgstr ""
-
-#: mod/install.php:119
-msgid "Friendica Communications Server - Setup"
-msgstr ""
-
-#: mod/install.php:125
-msgid "Could not connect to database."
-msgstr ""
-
-#: mod/install.php:129
-msgid "Could not create table."
-msgstr ""
-
-#: mod/install.php:135
-msgid "Your Friendica site database has been installed."
-msgstr ""
-
-#: mod/install.php:140
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-
-#: mod/install.php:141 mod/install.php:208 mod/install.php:530
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: mod/install.php:153
-msgid "Database already in use."
-msgstr ""
-
-#: mod/install.php:205
-msgid "System check"
-msgstr ""
-
-#: mod/install.php:210
-msgid "Check again"
-msgstr ""
-
-#: mod/install.php:229
-msgid "Database connection"
-msgstr ""
-
-#: mod/install.php:230
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: mod/install.php:231
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: mod/install.php:232
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: mod/install.php:236
-msgid "Database Server Name"
-msgstr ""
-
-#: mod/install.php:237
-msgid "Database Login Name"
-msgstr ""
-
-#: mod/install.php:238
-msgid "Database Login Password"
-msgstr ""
-
-#: mod/install.php:239
-msgid "Database Name"
-msgstr ""
-
-#: mod/install.php:240 mod/install.php:279
-msgid "Site administrator email address"
-msgstr ""
-
-#: mod/install.php:240 mod/install.php:279
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: mod/install.php:244 mod/install.php:282
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: mod/install.php:269
-msgid "Site settings"
-msgstr ""
-
-#: mod/install.php:323
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: mod/install.php:324
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See <a href='http://"
-"friendica.com/node/27'>'Activating scheduled tasks'</a>"
-msgstr ""
-
-#: mod/install.php:328
-msgid "PHP executable path"
-msgstr ""
-
-#: mod/install.php:328
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: mod/install.php:333
-msgid "Command line PHP"
-msgstr ""
-
-#: mod/install.php:342
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr ""
-
-#: mod/install.php:343
-msgid "Found PHP version: "
-msgstr ""
-
-#: mod/install.php:345
-msgid "PHP cli binary"
-msgstr ""
-
-#: mod/install.php:356
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: mod/install.php:357
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: mod/install.php:359
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: mod/install.php:380
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: mod/install.php:381
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: mod/install.php:383
-msgid "Generate encryption keys"
-msgstr ""
-
-#: mod/install.php:390
-msgid "libCurl PHP module"
-msgstr ""
-
-#: mod/install.php:391
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: mod/install.php:392
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: mod/install.php:393
-msgid "mysqli PHP module"
-msgstr ""
-
-#: mod/install.php:394
-msgid "mb_string PHP module"
-msgstr ""
-
-#: mod/install.php:399 mod/install.php:401
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: mod/install.php:399
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: mod/install.php:407
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: mod/install.php:411
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: mod/install.php:415
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: mod/install.php:419
-msgid "Error: mysqli PHP module required but not installed."
-msgstr ""
-
-#: mod/install.php:423
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: mod/install.php:440
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: mod/install.php:441
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: mod/install.php:442
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Friendica top folder."
-msgstr ""
-
-#: mod/install.php:443
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
-msgstr ""
-
-#: mod/install.php:446
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: mod/install.php:456
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: mod/install.php:457
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr ""
-
-#: mod/install.php:458
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: mod/install.php:459
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: mod/install.php:462
-msgid "view/smarty3 is writable"
-msgstr ""
-
-#: mod/install.php:478
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr ""
-
-#: mod/install.php:480
-msgid "Url rewrite is working"
-msgstr ""
-
-#: mod/install.php:489
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: mod/install.php:528
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: mod/install.php:529
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
-#: mod/wallmessage.php:42 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr ""
-
-#: mod/wallmessage.php:59
-msgid "Unable to check your home location."
-msgstr ""
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr ""
-
-#: mod/wallmessage.php:143
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr ""
-
-#: mod/help.php:31
-msgid "Help:"
-msgstr ""
-
-#: mod/help.php:36 include/nav.php:114
-msgid "Help"
-msgstr ""
-
-#: mod/help.php:42 mod/p.php:16 mod/p.php:25 index.php:269
-msgid "Not Found"
-msgstr ""
-
-#: mod/help.php:45 index.php:272
-msgid "Page not found."
-msgstr ""
-
-#: mod/dfrn_poll.php:103 mod/dfrn_poll.php:536
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: mod/home.php:35
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: mod/wall_attach.php:83
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr ""
-
-#: mod/wall_attach.php:83
-msgid "Or - did you try to upload an empty file?"
-msgstr ""
-
-#: mod/wall_attach.php:94
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr ""
-
-#: mod/wall_attach.php:145 mod/wall_attach.php:161
-msgid "File upload failed."
-msgstr ""
-
-#: mod/match.php:13
-msgid "Profile Match"
-msgstr ""
-
-#: mod/match.php:22
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-
-#: mod/match.php:64
-msgid "is interested in:"
-msgstr ""
-
-#: mod/share.php:38
-msgid "link"
-msgstr ""
-
-#: mod/community.php:23
-msgid "Not available."
-msgstr ""
-
-#: mod/community.php:32 include/nav.php:137 include/nav.php:139
-#: view/theme/diabook/theme.php:129
-msgid "Community"
-msgstr ""
-
-#: mod/community.php:62 mod/community.php:71 mod/search.php:192
+#: mod/search.php:199 mod/community.php:62 mod/community.php:71
 msgid "No results."
 msgstr ""
 
-#: mod/settings.php:34 mod/photos.php:102
-msgid "everybody"
+#: mod/search.php:205
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: mod/search.php:207
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
+#: mod/invite.php:27
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: mod/invite.php:73
+msgid "Please join us on Friendica"
+msgstr ""
+
+#: mod/invite.php:84
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: mod/invite.php:89
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: mod/invite.php:93
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/invite.php:112
+msgid "You have no more invitations available"
+msgstr ""
+
+#: mod/invite.php:120
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many "
+"other social networks."
+msgstr ""
+
+#: mod/invite.php:122
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr ""
+
+#: mod/invite.php:123
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr ""
+
+#: mod/invite.php:126
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
+msgstr ""
+
+#: mod/invite.php:132
+msgid "Send invitations"
+msgstr ""
+
+#: mod/invite.php:133
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: mod/invite.php:135
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr ""
+
+#: mod/invite.php:137
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr ""
+
+#: mod/invite.php:137
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr ""
+
+#: mod/invite.php:139
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
 msgstr ""
 
 #: mod/settings.php:47
@@ -3817,7 +3853,7 @@ msgstr ""
 msgid "Display"
 msgstr ""
 
-#: mod/settings.php:60 mod/settings.php:835
+#: mod/settings.php:60 mod/settings.php:837
 msgid "Social Networks"
 msgstr ""
 
@@ -3995,866 +4031,492 @@ msgid ""
 "unknown user."
 msgstr ""
 
-#: mod/settings.php:791 mod/settings.php:792
+#: mod/settings.php:779
+msgid "Your legacy GNU Social account"
+msgstr ""
+
+#: mod/settings.php:781
+msgid ""
+"If you enter your old GNU Social/Statusnet account name here (in the format "
+"user@domain.tld), your contacts will be added automatically. The field will "
+"be emptied when done."
+msgstr ""
+
+#: mod/settings.php:784
+msgid "Repair OStatus subscriptions"
+msgstr ""
+
+#: mod/settings.php:793 mod/settings.php:794
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/settings.php:791 mod/dfrn_request.php:856
-#: include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr ""
-
-#: mod/settings.php:791 mod/settings.php:792
+#: mod/settings.php:793 mod/settings.php:794
 msgid "enabled"
 msgstr ""
 
-#: mod/settings.php:791 mod/settings.php:792
+#: mod/settings.php:793 mod/settings.php:794
 msgid "disabled"
 msgstr ""
 
-#: mod/settings.php:792
+#: mod/settings.php:794
 msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: mod/settings.php:828
+#: mod/settings.php:830
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: mod/settings.php:840
+#: mod/settings.php:842
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: mod/settings.php:841
+#: mod/settings.php:843
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: mod/settings.php:842
+#: mod/settings.php:844
 msgid "Last successful email check:"
 msgstr ""
 
-#: mod/settings.php:844
+#: mod/settings.php:846
 msgid "IMAP server name:"
 msgstr ""
 
-#: mod/settings.php:845
+#: mod/settings.php:847
 msgid "IMAP port:"
 msgstr ""
 
-#: mod/settings.php:846
+#: mod/settings.php:848
 msgid "Security:"
 msgstr ""
 
-#: mod/settings.php:846 mod/settings.php:851
+#: mod/settings.php:848 mod/settings.php:853
 msgid "None"
 msgstr ""
 
-#: mod/settings.php:847
+#: mod/settings.php:849
 msgid "Email login name:"
 msgstr ""
 
-#: mod/settings.php:848
+#: mod/settings.php:850
 msgid "Email password:"
 msgstr ""
 
-#: mod/settings.php:849
+#: mod/settings.php:851
 msgid "Reply-to address:"
 msgstr ""
 
-#: mod/settings.php:850
+#: mod/settings.php:852
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:853
 msgid "Action after import:"
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:853
 msgid "Mark as seen"
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:853
 msgid "Move to folder"
 msgstr ""
 
-#: mod/settings.php:852
+#: mod/settings.php:854
 msgid "Move to folder:"
 msgstr ""
 
-#: mod/settings.php:933
+#: mod/settings.php:935
 msgid "Display Settings"
 msgstr ""
 
-#: mod/settings.php:939 mod/settings.php:955
+#: mod/settings.php:941 mod/settings.php:957
 msgid "Display Theme:"
 msgstr ""
 
-#: mod/settings.php:940
+#: mod/settings.php:942
 msgid "Mobile Theme:"
 msgstr ""
 
-#: mod/settings.php:941
+#: mod/settings.php:943
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: mod/settings.php:941
+#: mod/settings.php:943
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: mod/settings.php:942
+#: mod/settings.php:944
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: mod/settings.php:942 mod/settings.php:943
+#: mod/settings.php:944 mod/settings.php:945
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: mod/settings.php:943
+#: mod/settings.php:945
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: mod/settings.php:944
+#: mod/settings.php:946
 msgid "Don't show emoticons"
 msgstr ""
 
-#: mod/settings.php:945
+#: mod/settings.php:947
 msgid "Don't show notices"
 msgstr ""
 
-#: mod/settings.php:946
+#: mod/settings.php:948
 msgid "Infinite scroll"
 msgstr ""
 
-#: mod/settings.php:947
+#: mod/settings.php:949
 msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: mod/settings.php:949 view/theme/cleanzero/config.php:82
-#: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66
-#: view/theme/diabook/config.php:150 view/theme/vier/config.php:58
-#: view/theme/duepuntozero/config.php:61
+#: mod/settings.php:951 view/theme/diabook/config.php:150
+#: view/theme/vier/config.php:58 view/theme/dispy/config.php:72
+#: view/theme/duepuntozero/config.php:61 view/theme/quattro/config.php:66
+#: view/theme/cleanzero/config.php:82
 msgid "Theme settings"
 msgstr ""
 
-#: mod/settings.php:1025
+#: mod/settings.php:1027
 msgid "User Types"
 msgstr ""
 
-#: mod/settings.php:1026
+#: mod/settings.php:1028
 msgid "Community Types"
 msgstr ""
 
-#: mod/settings.php:1027
+#: mod/settings.php:1029
 msgid "Normal Account Page"
 msgstr ""
 
-#: mod/settings.php:1028
+#: mod/settings.php:1030
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: mod/settings.php:1031
+#: mod/settings.php:1033
 msgid "Soapbox Page"
 msgstr ""
 
-#: mod/settings.php:1032
+#: mod/settings.php:1034
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: mod/settings.php:1035
+#: mod/settings.php:1037
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: mod/settings.php:1036
+#: mod/settings.php:1038
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: mod/settings.php:1039
+#: mod/settings.php:1041
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/settings.php:1040
+#: mod/settings.php:1042
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: mod/settings.php:1043
+#: mod/settings.php:1045
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: mod/settings.php:1044
+#: mod/settings.php:1046
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: mod/settings.php:1056
+#: mod/settings.php:1058
 msgid "OpenID:"
 msgstr ""
 
-#: mod/settings.php:1056
+#: mod/settings.php:1058
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: mod/settings.php:1066
+#: mod/settings.php:1068
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: mod/settings.php:1072
+#: mod/settings.php:1074
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/settings.php:1080
+#: mod/settings.php:1082
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/settings.php:1084 include/acl_selectors.php:330
+#: mod/settings.php:1086 include/acl_selectors.php:330
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: mod/settings.php:1084
+#: mod/settings.php:1086
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr ""
 
-#: mod/settings.php:1089
+#: mod/settings.php:1091
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: mod/settings.php:1095
+#: mod/settings.php:1097
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: mod/settings.php:1101
+#: mod/settings.php:1103
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: mod/settings.php:1107
+#: mod/settings.php:1109
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: mod/settings.php:1115
+#: mod/settings.php:1117
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: mod/settings.php:1123
+#: mod/settings.php:1125
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: mod/settings.php:1130
+#: mod/settings.php:1132
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: mod/settings.php:1130
+#: mod/settings.php:1132
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: mod/settings.php:1131
+#: mod/settings.php:1133
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: mod/settings.php:1132
+#: mod/settings.php:1134
 msgid "Advanced Expiration"
 msgstr ""
 
-#: mod/settings.php:1133
+#: mod/settings.php:1135
 msgid "Expire posts:"
 msgstr ""
 
-#: mod/settings.php:1134
+#: mod/settings.php:1136
 msgid "Expire personal notes:"
 msgstr ""
 
-#: mod/settings.php:1135
+#: mod/settings.php:1137
 msgid "Expire starred posts:"
 msgstr ""
 
-#: mod/settings.php:1136
+#: mod/settings.php:1138
 msgid "Expire photos:"
 msgstr ""
 
-#: mod/settings.php:1137
+#: mod/settings.php:1139
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: mod/settings.php:1163
+#: mod/settings.php:1165
 msgid "Account Settings"
 msgstr ""
 
-#: mod/settings.php:1171
+#: mod/settings.php:1173
 msgid "Password Settings"
 msgstr ""
 
-#: mod/settings.php:1172 mod/register.php:271
-msgid "New Password:"
-msgstr ""
-
-#: mod/settings.php:1173 mod/register.php:272
-msgid "Confirm:"
-msgstr ""
-
-#: mod/settings.php:1173
+#: mod/settings.php:1175
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: mod/settings.php:1174
+#: mod/settings.php:1176
 msgid "Current Password:"
 msgstr ""
 
-#: mod/settings.php:1174 mod/settings.php:1175
+#: mod/settings.php:1176 mod/settings.php:1177
 msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: mod/settings.php:1175
+#: mod/settings.php:1177
 msgid "Password:"
 msgstr ""
 
-#: mod/settings.php:1179
+#: mod/settings.php:1181
 msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:1180 include/identity.php:538
+#: mod/settings.php:1182 include/identity.php:539
 msgid "Full Name:"
 msgstr ""
 
-#: mod/settings.php:1181
+#: mod/settings.php:1183
 msgid "Email Address:"
 msgstr ""
 
-#: mod/settings.php:1182
+#: mod/settings.php:1184
 msgid "Your Timezone:"
 msgstr ""
 
-#: mod/settings.php:1183
+#: mod/settings.php:1185
 msgid "Default Post Location:"
 msgstr ""
 
-#: mod/settings.php:1184
+#: mod/settings.php:1186
 msgid "Use Browser Location:"
 msgstr ""
 
-#: mod/settings.php:1187
+#: mod/settings.php:1189
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: mod/settings.php:1189
+#: mod/settings.php:1191
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: mod/settings.php:1189 mod/settings.php:1219
+#: mod/settings.php:1191 mod/settings.php:1221
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: mod/settings.php:1190
+#: mod/settings.php:1192
 msgid "Default Post Permissions"
 msgstr ""
 
-#: mod/settings.php:1191
+#: mod/settings.php:1193
 msgid "(click to open/close)"
 msgstr ""
 
-#: mod/settings.php:1200 mod/photos.php:1166 mod/photos.php:1538
-msgid "Show to Groups"
-msgstr ""
-
-#: mod/settings.php:1201 mod/photos.php:1167 mod/photos.php:1539
-msgid "Show to Contacts"
-msgstr ""
-
-#: mod/settings.php:1202
+#: mod/settings.php:1204
 msgid "Default Private Post"
 msgstr ""
 
-#: mod/settings.php:1203
+#: mod/settings.php:1205
 msgid "Default Public Post"
 msgstr ""
 
-#: mod/settings.php:1207
+#: mod/settings.php:1209
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: mod/settings.php:1219
+#: mod/settings.php:1221
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: mod/settings.php:1222
+#: mod/settings.php:1224
 msgid "Notification Settings"
 msgstr ""
 
-#: mod/settings.php:1223
+#: mod/settings.php:1225
 msgid "By default post a status message when:"
 msgstr ""
 
-#: mod/settings.php:1224
+#: mod/settings.php:1226
 msgid "accepting a friend request"
 msgstr ""
 
-#: mod/settings.php:1225
+#: mod/settings.php:1227
 msgid "joining a forum/community"
 msgstr ""
 
-#: mod/settings.php:1226
+#: mod/settings.php:1228
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: mod/settings.php:1227
+#: mod/settings.php:1229
 msgid "Send a notification email when:"
 msgstr ""
 
-#: mod/settings.php:1228
+#: mod/settings.php:1230
 msgid "You receive an introduction"
 msgstr ""
 
-#: mod/settings.php:1229
+#: mod/settings.php:1231
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: mod/settings.php:1230
+#: mod/settings.php:1232
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: mod/settings.php:1231
+#: mod/settings.php:1233
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: mod/settings.php:1232
+#: mod/settings.php:1234
 msgid "You receive a private message"
 msgstr ""
 
-#: mod/settings.php:1233
+#: mod/settings.php:1235
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: mod/settings.php:1234
+#: mod/settings.php:1236
 msgid "You are tagged in a post"
 msgstr ""
 
-#: mod/settings.php:1235
+#: mod/settings.php:1237
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: mod/settings.php:1237
+#: mod/settings.php:1239
 msgid "Activate desktop notifications"
 msgstr ""
 
-#: mod/settings.php:1237
+#: mod/settings.php:1239
 msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: mod/settings.php:1239
+#: mod/settings.php:1241
 msgid "Text-only notification emails"
 msgstr ""
 
-#: mod/settings.php:1241
+#: mod/settings.php:1243
 msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: mod/settings.php:1243
+#: mod/settings.php:1245
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: mod/settings.php:1244
+#: mod/settings.php:1246
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: mod/settings.php:1247
+#: mod/settings.php:1249
 msgid "Relocate"
 msgstr ""
 
-#: mod/settings.php:1248
+#: mod/settings.php:1250
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr ""
 
-#: mod/settings.php:1249
+#: mod/settings.php:1251
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: mod/dfrn_request.php:95
-msgid "This introduction has already been accepted."
+#: mod/display.php:505
+msgid "Item has been removed."
 msgstr ""
 
-#: mod/dfrn_request.php:120 mod/dfrn_request.php:518
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-
-#: mod/dfrn_request.php:125 mod/dfrn_request.php:523
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: mod/dfrn_request.php:127 mod/dfrn_request.php:525
-msgid "Warning: profile location has no profile photo."
-msgstr ""
-
-#: mod/dfrn_request.php:130 mod/dfrn_request.php:528
+#: mod/dirfind.php:36
 #, 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/dfrn_request.php:172
-msgid "Introduction complete."
-msgstr ""
-
-#: mod/dfrn_request.php:214
-msgid "Unrecoverable protocol error."
-msgstr ""
-
-#: mod/dfrn_request.php:242
-msgid "Profile unavailable."
-msgstr ""
-
-#: mod/dfrn_request.php:267
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr ""
-
-#: mod/dfrn_request.php:268
-msgid "Spam protection measures have been invoked."
-msgstr ""
-
-#: mod/dfrn_request.php:269
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: mod/dfrn_request.php:331
-msgid "Invalid locator"
-msgstr ""
-
-#: mod/dfrn_request.php:340
-msgid "Invalid email address."
-msgstr ""
-
-#: mod/dfrn_request.php:367
-msgid "This account has not been configured for email. Request failed."
-msgstr ""
-
-#: mod/dfrn_request.php:463
-msgid "Unable to resolve your name at the provided location."
-msgstr ""
-
-#: mod/dfrn_request.php:476
-msgid "You have already introduced yourself here."
-msgstr ""
-
-#: mod/dfrn_request.php:480
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: mod/dfrn_request.php:501
-msgid "Invalid profile URL."
-msgstr ""
-
-#: mod/dfrn_request.php:507 include/follow.php:70
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: mod/dfrn_request.php:597
-msgid "Your introduction has been sent."
-msgstr ""
-
-#: mod/dfrn_request.php:650
-msgid "Please login to confirm introduction."
-msgstr ""
-
-#: mod/dfrn_request.php:660
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
-msgstr ""
-
-#: mod/dfrn_request.php:674 mod/dfrn_request.php:691
-msgid "Confirm"
-msgstr ""
-
-#: mod/dfrn_request.php:686
-msgid "Hide this contact"
-msgstr ""
-
-#: mod/dfrn_request.php:689
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
-#: mod/dfrn_request.php:690
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: mod/dfrn_request.php:819
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr ""
-
-#: mod/dfrn_request.php:840
-#, php-format
-msgid ""
-"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>."
-msgstr ""
-
-#: mod/dfrn_request.php:845
-msgid "Friend/Connection Request"
-msgstr ""
-
-#: mod/dfrn_request.php:846
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr ""
-
-#: mod/dfrn_request.php:854 include/contact_selectors.php:76
-msgid "Friendica"
-msgstr ""
-
-#: mod/dfrn_request.php:855
-msgid "StatusNet/Federated Social Web"
-msgstr ""
-
-#: mod/dfrn_request.php:857
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
-msgstr ""
-
-#: mod/register.php:92
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: mod/register.php:97
-#, php-format
-msgid ""
-"Failed to send email message. Here your accout details:<br> login: %s<br> "
-"password: %s<br><br>You can change your password after login."
-msgstr ""
-
-#: mod/register.php:107
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: mod/register.php:150
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: mod/register.php:188 mod/uimport.php:50
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: mod/register.php:216
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-
-#: mod/register.php:217
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: mod/register.php:218
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: mod/register.php:232
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: mod/register.php:256
-msgid "Membership on this site is by invitation only."
-msgstr ""
-
-#: mod/register.php:257
-msgid "Your invitation ID: "
-msgstr ""
-
-#: mod/register.php:268
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr ""
-
-#: mod/register.php:269
-msgid "Your Email Address: "
-msgstr ""
-
-#: mod/register.php:271
-msgid "Leave empty for an auto generated password."
-msgstr ""
-
-#: mod/register.php:273
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@$sitename</"
-"strong>'."
-msgstr ""
-
-#: mod/register.php:274
-msgid "Choose a nickname: "
-msgstr ""
-
-#: mod/register.php:277 boot.php:1248 include/nav.php:109
-msgid "Register"
-msgstr ""
-
-#: mod/register.php:283 mod/uimport.php:64
-msgid "Import"
-msgstr ""
-
-#: mod/register.php:284
-msgid "Import your profile to this friendica instance"
-msgstr ""
-
-#: mod/maintenance.php:5
-msgid "System down for maintenance"
-msgstr ""
-
-#: mod/search.php:100 include/text.php:996 include/nav.php:119
-msgid "Search"
-msgstr ""
-
-#: mod/search.php:198
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: mod/search.php:200
-#, php-format
-msgid "Search results for: %s"
-msgstr ""
-
-#: mod/directory.php:53 view/theme/diabook/theme.php:525
-msgid "Global Directory"
-msgstr ""
-
-#: mod/directory.php:61
-msgid "Find on this site"
-msgstr ""
-
-#: mod/directory.php:64
-msgid "Site Directory"
-msgstr ""
-
-#: mod/directory.php:129 mod/profiles.php:747
-msgid "Age: "
-msgstr ""
-
-#: mod/directory.php:132
-msgid "Gender: "
-msgstr ""
-
-#: mod/directory.php:156 include/identity.php:273 include/identity.php:560
-msgid "Status:"
-msgstr ""
-
-#: mod/directory.php:158 include/identity.php:275 include/identity.php:571
-msgid "Homepage:"
-msgstr ""
-
-#: mod/directory.php:205
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: mod/delegate.php:101
-msgid "No potential page delegates located."
-msgstr ""
-
-#: mod/delegate.php:130 include/nav.php:179
-msgid "Delegate Page Management"
-msgstr ""
-
-#: mod/delegate.php:132
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr ""
-
-#: mod/delegate.php:133
-msgid "Existing Page Managers"
-msgstr ""
-
-#: mod/delegate.php:135
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: mod/delegate.php:137
-msgid "Potential Delegates"
-msgstr ""
-
-#: mod/delegate.php:140
-msgid "Add"
-msgstr ""
-
-#: mod/delegate.php:141
-msgid "No entries."
-msgstr ""
-
-#: mod/common.php:45
-msgid "Common Friends"
-msgstr ""
-
-#: mod/common.php:82
-msgid "No contacts in common."
-msgstr ""
-
-#: mod/uexport.php:77
-msgid "Export account"
-msgstr ""
-
-#: mod/uexport.php:77
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
-msgstr ""
-
-#: mod/uexport.php:78
-msgid "Export all"
-msgstr ""
-
-#: mod/uexport.php:78
-msgid ""
-"Export your accout info, contacts and all your items as json. Could be a "
-"very big file, and could take a lot of time. Use this to make a full backup "
-"of your account (photos are not exported)"
-msgstr ""
-
-#: mod/mood.php:62 include/conversation.php:226
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr ""
-
-#: mod/mood.php:133
-msgid "Mood"
-msgstr ""
-
-#: mod/mood.php:134
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr ""
-
-#: mod/suggest.php:69 include/contact_widgets.php:35
-#: view/theme/diabook/theme.php:527
-msgid "Friend Suggestions"
+msgid "People Search - %s"
 msgstr ""
 
-#: mod/suggest.php:76
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: mod/dirfind.php:125 mod/suggest.php:92 mod/match.php:70
+#: include/identity.php:188 include/contact_widgets.php:10
+msgid "Connect"
 msgstr ""
 
-#: mod/suggest.php:94
-msgid "Ignore/Hide"
+#: mod/dirfind.php:141 mod/match.php:77
+msgid "No matches"
 msgstr ""
 
 #: mod/profiles.php:37
@@ -5064,7 +4726,7 @@ msgstr ""
 msgid "Since [date]:"
 msgstr ""
 
-#: mod/profiles.php:711 include/identity.php:569
+#: mod/profiles.php:711 include/identity.php:570
 msgid "Sexual Preference:"
 msgstr ""
 
@@ -5072,11 +4734,11 @@ msgstr ""
 msgid "Homepage URL:"
 msgstr ""
 
-#: mod/profiles.php:713 include/identity.php:573
+#: mod/profiles.php:713 include/identity.php:574
 msgid "Hometown:"
 msgstr ""
 
-#: mod/profiles.php:714 include/identity.php:577
+#: mod/profiles.php:714 include/identity.php:578
 msgid "Political Views:"
 msgstr ""
 
@@ -5092,11 +4754,11 @@ msgstr ""
 msgid "Private Keywords:"
 msgstr ""
 
-#: mod/profiles.php:718 include/identity.php:585
+#: mod/profiles.php:718 include/identity.php:586
 msgid "Likes:"
 msgstr ""
 
-#: mod/profiles.php:719 include/identity.php:587
+#: mod/profiles.php:719 include/identity.php:588
 msgid "Dislikes:"
 msgstr ""
 
@@ -5158,6 +4820,10 @@ msgid ""
 "be visible to anybody using the internet."
 msgstr ""
 
+#: mod/profiles.php:747 mod/directory.php:129
+msgid "Age: "
+msgstr ""
+
 #: mod/profiles.php:800
 msgid "Edit/Manage Profiles"
 msgstr ""
@@ -5182,153 +4848,284 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: mod/editpost.php:17 mod/editpost.php:27
-msgid "Item not found"
+#: mod/share.php:38
+msgid "link"
 msgstr ""
 
-#: mod/editpost.php:40
-msgid "Edit post"
+#: mod/uexport.php:77
+msgid "Export account"
 msgstr ""
 
-#: mod/editpost.php:111 include/conversation.php:1057
-msgid "upload photo"
-msgstr ""
-
-#: mod/editpost.php:112 include/conversation.php:1058
-msgid "Attach file"
-msgstr ""
-
-#: mod/editpost.php:113 include/conversation.php:1059
-msgid "attach file"
-msgstr ""
-
-#: mod/editpost.php:115 include/conversation.php:1061
-msgid "web link"
-msgstr ""
-
-#: mod/editpost.php:116 include/conversation.php:1062
-msgid "Insert video link"
-msgstr ""
-
-#: mod/editpost.php:117 include/conversation.php:1063
-msgid "video link"
-msgstr ""
-
-#: mod/editpost.php:118 include/conversation.php:1064
-msgid "Insert audio link"
-msgstr ""
-
-#: mod/editpost.php:119 include/conversation.php:1065
-msgid "audio link"
-msgstr ""
-
-#: mod/editpost.php:120 include/conversation.php:1066
-msgid "Set your location"
-msgstr ""
-
-#: mod/editpost.php:121 include/conversation.php:1067
-msgid "set location"
-msgstr ""
-
-#: mod/editpost.php:122 include/conversation.php:1068
-msgid "Clear browser location"
-msgstr ""
-
-#: mod/editpost.php:123 include/conversation.php:1069
-msgid "clear location"
-msgstr ""
-
-#: mod/editpost.php:125 include/conversation.php:1075
-msgid "Permission settings"
-msgstr ""
-
-#: mod/editpost.php:133 include/acl_selectors.php:343
-msgid "CC: email addresses"
-msgstr ""
-
-#: mod/editpost.php:134 include/conversation.php:1084
-msgid "Public post"
-msgstr ""
-
-#: mod/editpost.php:137 include/conversation.php:1071
-msgid "Set title"
-msgstr ""
-
-#: mod/editpost.php:139 include/conversation.php:1073
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: mod/editpost.php:140 include/acl_selectors.php:344
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: mod/friendica.php:59
-msgid "This is Friendica, version"
-msgstr ""
-
-#: mod/friendica.php:60
-msgid "running at web location"
-msgstr ""
-
-#: mod/friendica.php:62
+#: mod/uexport.php:77
 msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
 msgstr ""
 
-#: mod/friendica.php:64
-msgid "Bug reports and issues: please visit"
+#: mod/uexport.php:78
+msgid "Export all"
 msgstr ""
 
-#: mod/friendica.php:64
-msgid "the bugtracker at github"
-msgstr ""
-
-#: mod/friendica.php:65
+#: mod/uexport.php:78
 msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
 msgstr ""
 
-#: mod/friendica.php:79
-msgid "Installed plugins/addons/apps:"
+#: mod/ping.php:233
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/friendica.php:92
-msgid "No installed plugins/addons/apps"
+#: mod/ping.php:248
+msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/api.php:76 mod/api.php:102
-msgid "Authorize application connection"
+#: mod/ping.php:263
+msgid "{0} requested registration"
 msgstr ""
 
-#: mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: mod/navigation.php:20 include/nav.php:34
+msgid "Nothing new here"
 msgstr ""
 
-#: mod/api.php:89
-msgid "Please login to continue."
+#: mod/navigation.php:24 include/nav.php:38
+msgid "Clear notifications"
 msgstr ""
 
-#: mod/api.php:104
+#: mod/community.php:23
+msgid "Not available."
+msgstr ""
+
+#: mod/community.php:32 view/theme/diabook/theme.php:129 include/nav.php:137
+#: include/nav.php:139
+msgid "Community"
+msgstr ""
+
+#: mod/filer.php:30 include/conversation.php:1005
+#: include/conversation.php:1023
+msgid "Save to Folder:"
+msgstr ""
+
+#: mod/filer.php:30
+msgid "- select -"
+msgstr ""
+
+#: mod/wall_attach.php:83
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr ""
+
+#: mod/wall_attach.php:83
+msgid "Or - did you try to upload an empty file?"
+msgstr ""
+
+#: mod/wall_attach.php:94
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr ""
+
+#: mod/wall_attach.php:145 mod/wall_attach.php:161
+msgid "File upload failed."
+msgstr ""
+
+#: mod/profperm.php:25 mod/profperm.php:56
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: mod/profperm.php:102
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: mod/profperm.php:106 mod/group.php:222
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: mod/profperm.php:115
+msgid "Visible To"
+msgstr ""
+
+#: mod/profperm.php:131
+msgid "All Contacts (with secure profile access)"
+msgstr ""
+
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: mod/suggest.php:69 view/theme/diabook/theme.php:527
+#: include/contact_widgets.php:35
+msgid "Friend Suggestions"
+msgstr ""
+
+#: mod/suggest.php:76
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: mod/lockview.php:31 mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: mod/suggest.php:94
+msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/lockview.php:48
-msgid "Visible to:"
+#: mod/viewsrc.php:7
+msgid "Access denied."
 msgstr ""
 
-#: mod/notes.php:44 include/identity.php:675
+#: mod/repair_ostatus.php:14
+msgid "Resubsribing to OStatus contacts"
+msgstr ""
+
+#: mod/repair_ostatus.php:30
+msgid "Error"
+msgstr ""
+
+#: mod/repair_ostatus.php:44 mod/ostatus_subscribe.php:51
+msgid "Done"
+msgstr ""
+
+#: mod/repair_ostatus.php:50 mod/ostatus_subscribe.php:73
+msgid "Keep this window open until done."
+msgstr ""
+
+#: mod/dfrn_poll.php:103 mod/dfrn_poll.php:536
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr ""
+
+#: mod/manage.php:106
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: mod/manage.php:107
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr ""
+
+#: mod/manage.php:108
+msgid "Select an identity to manage: "
+msgstr ""
+
+#: mod/delegate.php:101
+msgid "No potential page delegates located."
+msgstr ""
+
+#: mod/delegate.php:130 include/nav.php:179
+msgid "Delegate Page Management"
+msgstr ""
+
+#: mod/delegate.php:132
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr ""
+
+#: mod/delegate.php:133
+msgid "Existing Page Managers"
+msgstr ""
+
+#: mod/delegate.php:135
+msgid "Existing Page Delegates"
+msgstr ""
+
+#: mod/delegate.php:137
+msgid "Potential Delegates"
+msgstr ""
+
+#: mod/delegate.php:140
+msgid "Add"
+msgstr ""
+
+#: mod/delegate.php:141
+msgid "No entries."
+msgstr ""
+
+#: mod/viewcontacts.php:41
+msgid "No contacts."
+msgstr ""
+
+#: mod/viewcontacts.php:78 include/text.php:917
+msgid "View Contacts"
+msgstr ""
+
+#: mod/notes.php:44 include/identity.php:676
 msgid "Personal Notes"
 msgstr ""
 
-#: mod/localtime.php:12 include/bb2diaspora.php:148 include/event.php:13
+#: mod/poke.php:192
+msgid "Poke/Prod"
+msgstr ""
+
+#: mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: mod/poke.php:194
+msgid "Recipient"
+msgstr ""
+
+#: mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: mod/poke.php:198
+msgid "Make this post private"
+msgstr ""
+
+#: mod/directory.php:53 view/theme/diabook/theme.php:525
+msgid "Global Directory"
+msgstr ""
+
+#: mod/directory.php:61
+msgid "Find on this site"
+msgstr ""
+
+#: mod/directory.php:64
+msgid "Site Directory"
+msgstr ""
+
+#: mod/directory.php:132
+msgid "Gender: "
+msgstr ""
+
+#: mod/directory.php:156 include/identity.php:273 include/identity.php:561
+msgid "Status:"
+msgstr ""
+
+#: mod/directory.php:158 include/identity.php:275 include/identity.php:572
+msgid "Homepage:"
+msgstr ""
+
+#: mod/directory.php:205
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: mod/ostatus_subscribe.php:14
+msgid "Subsribing to OStatus contacts"
+msgstr ""
+
+#: mod/ostatus_subscribe.php:25
+msgid "No contact provided."
+msgstr ""
+
+#: mod/ostatus_subscribe.php:30
+msgid "Couldn't fetch information for contact."
+msgstr ""
+
+#: mod/ostatus_subscribe.php:38
+msgid "Couldn't fetch friends for contact."
+msgstr ""
+
+#: mod/ostatus_subscribe.php:65
+msgid "success"
+msgstr ""
+
+#: mod/ostatus_subscribe.php:67
+msgid "failed"
+msgstr ""
+
+#: mod/localtime.php:12 include/event.php:13 include/bb2diaspora.php:148
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -5361,302 +5158,439 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
-#: mod/poke.php:192
-msgid "Poke/Prod"
+#: mod/oexchange.php:25
+msgid "Post successful."
 msgstr ""
 
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
+#: mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr ""
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr ""
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr ""
-
-#: mod/invite.php:27
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: mod/invite.php:49
+#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
+#: mod/profile_photo.php:308
 #, php-format
-msgid "%s : Not a valid email address."
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: mod/invite.php:73
-msgid "Please join us on Friendica"
-msgstr ""
-
-#: mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: mod/invite.php:89
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: mod/invite.php:93
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/invite.php:112
-msgid "You have no more invitations available"
-msgstr ""
-
-#: mod/invite.php:120
-#, php-format
+#: mod/profile_photo.php:118
 msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many "
-"other social networks."
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: mod/invite.php:122
-#, php-format
+#: mod/profile_photo.php:128
+msgid "Unable to process image"
+msgstr ""
+
+#: mod/profile_photo.php:242
+msgid "Upload File:"
+msgstr ""
+
+#: mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr ""
+
+#: mod/profile_photo.php:245
+#: view/smarty3/compiled/7ed3c1755557256685d55b3a8e5cca927de090fb.file.filebrowser_plain.tpl.php:96
+#: view/smarty3/compiled/48b358673d34ee5cf1512cb114ef7f14c9f5b9d0.file.filebrowser_plain.tpl.php:96
+#: view/smarty3/compiled/be03ead94b64e658f07d62d8fbdc13a08b408e62.file.filebrowser_plain.tpl.php:103
+msgid "Upload"
+msgstr ""
+
+#: mod/profile_photo.php:248
+msgid "or"
+msgstr ""
+
+#: mod/profile_photo.php:248
+msgid "skip this step"
+msgstr ""
+
+#: mod/profile_photo.php:248
+msgid "select a photo from your photo albums"
+msgstr ""
+
+#: mod/profile_photo.php:262
+msgid "Crop Image"
+msgstr ""
+
+#: mod/profile_photo.php:263
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: mod/profile_photo.php:265
+msgid "Done Editing"
+msgstr ""
+
+#: mod/profile_photo.php:299
+msgid "Image uploaded successfully."
+msgstr ""
+
+#: mod/install.php:119
+msgid "Friendica Communications Server - Setup"
+msgstr ""
+
+#: mod/install.php:125
+msgid "Could not connect to database."
+msgstr ""
+
+#: mod/install.php:129
+msgid "Could not create table."
+msgstr ""
+
+#: mod/install.php:135
+msgid "Your Friendica site database has been installed."
+msgstr ""
+
+#: mod/install.php:140
 msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: mod/invite.php:123
-#, php-format
+#: mod/install.php:141 mod/install.php:208 mod/install.php:537
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: mod/install.php:153
+msgid "Database already in use."
+msgstr ""
+
+#: mod/install.php:205
+msgid "System check"
+msgstr ""
+
+#: mod/install.php:210
+msgid "Check again"
+msgstr ""
+
+#: mod/install.php:229
+msgid "Database connection"
+msgstr ""
+
+#: mod/install.php:230
 msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: mod/invite.php:126
+#: mod/install.php:231
 msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: mod/invite.php:132
-msgid "Send invitations"
-msgstr ""
-
-#: mod/invite.php:133
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: mod/invite.php:135
+#: mod/install.php:232
 msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
+#: mod/install.php:236
+msgid "Database Server Name"
 msgstr ""
 
-#: mod/invite.php:137
+#: mod/install.php:237
+msgid "Database Login Name"
+msgstr ""
+
+#: mod/install.php:238
+msgid "Database Login Password"
+msgstr ""
+
+#: mod/install.php:239
+msgid "Database Name"
+msgstr ""
+
+#: mod/install.php:240 mod/install.php:279
+msgid "Site administrator email address"
+msgstr ""
+
+#: mod/install.php:240 mod/install.php:279
 msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: mod/invite.php:139
+#: mod/install.php:244 mod/install.php:282
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: mod/install.php:269
+msgid "Site settings"
+msgstr ""
+
+#: mod/install.php:323
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: mod/install.php:324
 msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a href='http://"
+"friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: mod/photos.php:50 mod/photos.php:177 mod/photos.php:1086 mod/photos.php:1207
-#: mod/photos.php:1230 mod/photos.php:1779 mod/photos.php:1791
-#: view/theme/diabook/theme.php:499
-msgid "Contact Photos"
+#: mod/install.php:328
+msgid "PHP executable path"
 msgstr ""
 
-#: mod/photos.php:84 include/identity.php:651
-msgid "Photo Albums"
+#: mod/install.php:328
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: mod/photos.php:85 mod/photos.php:1836
-msgid "Recent Photos"
+#: mod/install.php:333
+msgid "Command line PHP"
 msgstr ""
 
-#: mod/photos.php:88 mod/photos.php:1282 mod/photos.php:1838
-msgid "Upload New Photos"
+#: mod/install.php:342
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: mod/photos.php:166
-msgid "Contact information unavailable"
+#: mod/install.php:343
+msgid "Found PHP version: "
 msgstr ""
 
-#: mod/photos.php:187
-msgid "Album not found."
+#: mod/install.php:345
+msgid "PHP cli binary"
 msgstr ""
 
-#: mod/photos.php:210 mod/photos.php:222 mod/photos.php:1224
-msgid "Delete Album"
+#: mod/install.php:356
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: mod/photos.php:220
-msgid "Do you really want to delete this photo album and all its photos?"
+#: mod/install.php:357
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: mod/photos.php:300 mod/photos.php:311 mod/photos.php:1534
-msgid "Delete Photo"
+#: mod/install.php:359
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: mod/photos.php:309
-msgid "Do you really want to delete this photo?"
+#: mod/install.php:380
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: mod/photos.php:684
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
+#: mod/install.php:381
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: mod/photos.php:684
-msgid "a photo"
+#: mod/install.php:383
+msgid "Generate encryption keys"
 msgstr ""
 
-#: mod/photos.php:797
-msgid "Image file is empty."
+#: mod/install.php:390
+msgid "libCurl PHP module"
 msgstr ""
 
-#: mod/photos.php:952
-msgid "No photos selected"
+#: mod/install.php:391
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: mod/photos.php:1114
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+#: mod/install.php:392
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: mod/photos.php:1149
-msgid "Upload Photos"
+#: mod/install.php:393
+msgid "mysqli PHP module"
 msgstr ""
 
-#: mod/photos.php:1153 mod/photos.php:1219
-msgid "New album name: "
+#: mod/install.php:394
+msgid "mb_string PHP module"
 msgstr ""
 
-#: mod/photos.php:1154
-msgid "or existing album name: "
+#: mod/install.php:395
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: mod/photos.php:1155
-msgid "Do not show a status post for this upload"
+#: mod/install.php:400 mod/install.php:402
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: mod/photos.php:1157 mod/photos.php:1529 include/acl_selectors.php:346
-msgid "Permissions"
+#: mod/install.php:400
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: mod/photos.php:1168
-msgid "Private Photo"
+#: mod/install.php:408
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:1169
-msgid "Public Photo"
+#: mod/install.php:412
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: mod/photos.php:1232
-msgid "Edit Album"
+#: mod/install.php:416
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:1238
-msgid "Show Newest First"
+#: mod/install.php:420
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:1240
-msgid "Show Oldest First"
+#: mod/install.php:424
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:1268 mod/photos.php:1821
-msgid "View Photo"
+#: mod/install.php:428
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:1314
-msgid "Permission denied. Access to this item may be restricted."
+#: mod/install.php:447
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: mod/photos.php:1316
-msgid "Photo not available"
+#: mod/install.php:448
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: mod/photos.php:1372
-msgid "View photo"
+#: mod/install.php:449
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: mod/photos.php:1372
-msgid "Edit photo"
+#: mod/install.php:450
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: mod/photos.php:1373
-msgid "Use as profile photo"
+#: mod/install.php:453
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: mod/photos.php:1398
-msgid "View Full Size"
+#: mod/install.php:463
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: mod/photos.php:1477
-msgid "Tags: "
+#: mod/install.php:464
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
 msgstr ""
 
-#: mod/photos.php:1480
-msgid "[Remove any tag]"
+#: mod/install.php:465
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: mod/photos.php:1520
-msgid "New album name"
+#: mod/install.php:466
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: mod/photos.php:1521
-msgid "Caption"
+#: mod/install.php:469
+msgid "view/smarty3 is writable"
 msgstr ""
 
-#: mod/photos.php:1522
-msgid "Add a Tag"
+#: mod/install.php:485
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: mod/photos.php:1522
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: mod/install.php:487
+msgid "Url rewrite is working"
 msgstr ""
 
-#: mod/photos.php:1523
-msgid "Do not rotate"
+#: mod/install.php:496
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: mod/photos.php:1524
-msgid "Rotate CW (right)"
+#: mod/install.php:535
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: mod/photos.php:1525
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: mod/photos.php:1540
-msgid "Private photo"
-msgstr ""
-
-#: mod/photos.php:1541
-msgid "Public photo"
-msgstr ""
-
-#: mod/photos.php:1563 include/conversation.php:1055
-msgid "Share"
+#: mod/install.php:536
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: mod/p.php:9
 msgid "Not Extended"
 msgstr ""
 
+#: mod/group.php:29
+msgid "Group created."
+msgstr ""
+
+#: mod/group.php:35
+msgid "Could not create group."
+msgstr ""
+
+#: mod/group.php:47 mod/group.php:140
+msgid "Group not found."
+msgstr ""
+
+#: mod/group.php:60
+msgid "Group name changed."
+msgstr ""
+
+#: mod/group.php:87
+msgid "Save Group"
+msgstr ""
+
+#: mod/group.php:93
+msgid "Create a group of contacts/friends."
+msgstr ""
+
+#: mod/group.php:94 mod/group.php:178 include/group.php:273
+msgid "Group Name: "
+msgstr ""
+
+#: mod/group.php:113
+msgid "Group removed."
+msgstr ""
+
+#: mod/group.php:115
+msgid "Unable to remove group."
+msgstr ""
+
+#: mod/group.php:177
+msgid "Group Editor"
+msgstr ""
+
+#: mod/group.php:190
+msgid "Members"
+msgstr ""
+
+#: mod/content.php:119 mod/network.php:532
+msgid "No such group"
+msgstr ""
+
+#: mod/content.php:130 mod/network.php:549
+msgid "Group is empty"
+msgstr ""
+
+#: mod/content.php:135 mod/network.php:560
+#, php-format
+msgid "Group: %s"
+msgstr ""
+
+#: mod/content.php:499 include/conversation.php:689
+msgid "View in context"
+msgstr ""
+
 #: mod/regmod.php:55
 msgid "Account approved."
 msgstr ""
@@ -5670,43 +5604,520 @@ msgstr ""
 msgid "Please login."
 msgstr ""
 
-#: mod/uimport.php:66
-msgid "Move account"
+#: mod/match.php:18
+msgid "Profile Match"
 msgstr ""
 
-#: mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
+#: mod/match.php:27
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: mod/uimport.php:68
+#: mod/match.php:69
+msgid "is interested in:"
+msgstr ""
+
+#: mod/item.php:115
+msgid "Unable to locate original post."
+msgstr ""
+
+#: mod/item.php:347
+msgid "Empty post discarded."
+msgstr ""
+
+#: mod/item.php:860
+msgid "System error. Post not saved."
+msgstr ""
+
+#: mod/item.php:989
+#, php-format
 msgid ""
-"You need to export your account from the old server and upload it here. We "
-"will recreate your old account here with all your contacts. We will try also "
-"to inform your friends that you moved here."
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/uimport.php:69
+#: mod/item.php:991
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: mod/item.php:992
 msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (statusnet/identi.ca) or from Diaspora"
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: mod/uimport.php:70
-msgid "Account file"
+#: mod/item.php:996
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: mod/uimport.php:70
+#: mod/mood.php:62 include/conversation.php:226
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr ""
+
+#: mod/mood.php:133
+msgid "Mood"
+msgstr ""
+
+#: mod/mood.php:134
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: mod/network.php:143
+#, php-format
+msgid "Search Results For: %s"
+msgstr ""
+
+#: mod/network.php:197 include/group.php:277
+msgid "add"
+msgstr ""
+
+#: mod/network.php:358
+msgid "Commented Order"
+msgstr ""
+
+#: mod/network.php:361
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: mod/network.php:365
+msgid "Posted Order"
+msgstr ""
+
+#: mod/network.php:368
+msgid "Sort by Post Date"
+msgstr ""
+
+#: mod/network.php:378
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: mod/network.php:385
+msgid "New"
+msgstr ""
+
+#: mod/network.php:388
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: mod/network.php:395
+msgid "Shared Links"
+msgstr ""
+
+#: mod/network.php:398
+msgid "Interesting Links"
+msgstr ""
+
+#: mod/network.php:405
+msgid "Starred"
+msgstr ""
+
+#: mod/network.php:408
+msgid "Favourite Posts"
+msgstr ""
+
+#: mod/network.php:466
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/network.php:469
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr ""
+
+#: mod/network.php:578
+#, php-format
+msgid "Contact: %s"
+msgstr ""
+
+#: mod/network.php:582
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr ""
+
+#: mod/network.php:587
+msgid "Invalid contact."
+msgstr ""
+
+#: mod/crepair.php:107
+msgid "Contact settings applied."
+msgstr ""
+
+#: mod/crepair.php:109
+msgid "Contact update failed."
+msgstr ""
+
+#: mod/crepair.php:140
+msgid "Repair Contact Settings"
+msgstr ""
+
+#: mod/crepair.php:142
 msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: mod/attach.php:8
-msgid "Item not available."
+#: mod/crepair.php:143
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: mod/attach.php:20
-msgid "Item was not found."
+#: mod/crepair.php:149
+msgid "Return to contact editor"
+msgstr ""
+
+#: mod/crepair.php:160 mod/crepair.php:162
+msgid "No mirroring"
+msgstr ""
+
+#: mod/crepair.php:160
+msgid "Mirror as forwarded posting"
+msgstr ""
+
+#: mod/crepair.php:160 mod/crepair.php:162
+msgid "Mirror as my own posting"
+msgstr ""
+
+#: mod/crepair.php:169
+msgid "Refetch contact data"
+msgstr ""
+
+#: mod/crepair.php:171
+msgid "Account Nickname"
+msgstr ""
+
+#: mod/crepair.php:172
+msgid "@Tagname - overrides Name/Nickname"
+msgstr ""
+
+#: mod/crepair.php:173
+msgid "Account URL"
+msgstr ""
+
+#: mod/crepair.php:174
+msgid "Friend Request URL"
+msgstr ""
+
+#: mod/crepair.php:175
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: mod/crepair.php:176
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: mod/crepair.php:177
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: mod/crepair.php:178
+msgid "New photo from this URL"
+msgstr ""
+
+#: mod/crepair.php:179
+msgid "Remote Self"
+msgstr ""
+
+#: mod/crepair.php:181
+msgid "Mirror postings from this contact"
+msgstr ""
+
+#: mod/crepair.php:181
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr ""
+
+#: view/theme/diabook/theme.php:123 include/nav.php:76 include/nav.php:156
+msgid "Your posts and conversations"
+msgstr ""
+
+#: view/theme/diabook/theme.php:124 include/nav.php:77
+msgid "Your profile page"
+msgstr ""
+
+#: view/theme/diabook/theme.php:125
+msgid "Your contacts"
+msgstr ""
+
+#: view/theme/diabook/theme.php:126 include/nav.php:78
+msgid "Your photos"
+msgstr ""
+
+#: view/theme/diabook/theme.php:127 include/nav.php:80
+msgid "Your events"
+msgstr ""
+
+#: view/theme/diabook/theme.php:128 include/nav.php:81
+msgid "Personal notes"
+msgstr ""
+
+#: view/theme/diabook/theme.php:128
+msgid "Your personal photos"
+msgstr ""
+
+#: view/theme/diabook/theme.php:130 view/theme/diabook/theme.php:544
+#: view/theme/diabook/theme.php:624 view/theme/diabook/config.php:158
+msgid "Community Pages"
+msgstr ""
+
+#: view/theme/diabook/theme.php:391 view/theme/diabook/theme.php:626
+#: view/theme/diabook/config.php:160
+msgid "Community Profiles"
+msgstr ""
+
+#: view/theme/diabook/theme.php:412 view/theme/diabook/theme.php:630
+#: view/theme/diabook/config.php:164
+msgid "Last users"
+msgstr ""
+
+#: view/theme/diabook/theme.php:441 view/theme/diabook/theme.php:632
+#: view/theme/diabook/config.php:166
+msgid "Last likes"
+msgstr ""
+
+#: view/theme/diabook/theme.php:463 include/text.php:2032
+#: include/conversation.php:118 include/conversation.php:245
+msgid "event"
+msgstr ""
+
+#: view/theme/diabook/theme.php:486 view/theme/diabook/theme.php:631
+#: view/theme/diabook/config.php:165
+msgid "Last photos"
+msgstr ""
+
+#: view/theme/diabook/theme.php:523 view/theme/diabook/theme.php:629
+#: view/theme/diabook/config.php:163
+msgid "Find Friends"
+msgstr ""
+
+#: view/theme/diabook/theme.php:524
+msgid "Local Directory"
+msgstr ""
+
+#: view/theme/diabook/theme.php:526 include/contact_widgets.php:36
+msgid "Similar Interests"
+msgstr ""
+
+#: view/theme/diabook/theme.php:528 include/contact_widgets.php:38
+msgid "Invite Friends"
+msgstr ""
+
+#: view/theme/diabook/theme.php:579 view/theme/diabook/theme.php:625
+#: view/theme/diabook/config.php:159
+msgid "Earth Layers"
+msgstr ""
+
+#: view/theme/diabook/theme.php:584
+msgid "Set zoomfactor for Earth Layers"
+msgstr ""
+
+#: view/theme/diabook/theme.php:585 view/theme/diabook/config.php:156
+msgid "Set longitude (X) for Earth Layers"
+msgstr ""
+
+#: view/theme/diabook/theme.php:586 view/theme/diabook/config.php:157
+msgid "Set latitude (Y) for Earth Layers"
+msgstr ""
+
+#: view/theme/diabook/theme.php:599 view/theme/diabook/theme.php:627
+#: view/theme/diabook/config.php:161
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: view/theme/diabook/theme.php:606 view/theme/diabook/theme.php:628
+#: view/theme/diabook/config.php:162
+msgid "Connect Services"
+msgstr ""
+
+#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
+#: include/acl_selectors.php:337
+msgid "don't show"
+msgstr ""
+
+#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
+#: include/acl_selectors.php:336
+msgid "show"
+msgstr ""
+
+#: view/theme/diabook/theme.php:622
+msgid "Show/hide boxes at right-hand column:"
+msgstr ""
+
+#: view/theme/diabook/config.php:151 view/theme/dispy/config.php:73
+#: view/theme/cleanzero/config.php:84
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: view/theme/diabook/config.php:152 view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: view/theme/diabook/config.php:153
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: view/theme/diabook/config.php:154
+msgid "Set color scheme"
+msgstr ""
+
+#: view/theme/diabook/config.php:155
+msgid "Set zoomfactor for Earth Layer"
+msgstr ""
+
+#: view/theme/vier/config.php:59
+msgid "Set style"
+msgstr ""
+
+#: view/theme/dispy/config.php:75
+msgid "Set colour scheme"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:44 include/text.php:1768
+#: include/user.php:255
+msgid "default"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:45
+msgid "greenzero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:46
+msgid "purplezero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:47
+msgid "easterbunny"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:48
+msgid "darkzero"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:49
+msgid "comix"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:50
+msgid "slackr"
+msgstr ""
+
+#: view/theme/duepuntozero/config.php:62
+msgid "Variations"
+msgstr ""
+
+#: view/theme/quattro/config.php:67
+msgid "Alignment"
+msgstr ""
+
+#: view/theme/quattro/config.php:67
+msgid "Left"
+msgstr ""
+
+#: view/theme/quattro/config.php:67
+msgid "Center"
+msgstr ""
+
+#: view/theme/quattro/config.php:68 view/theme/cleanzero/config.php:86
+msgid "Color scheme"
+msgstr ""
+
+#: view/theme/quattro/config.php:69
+msgid "Posts font size"
+msgstr ""
+
+#: view/theme/quattro/config.php:70
+msgid "Textareas font size"
+msgstr ""
+
+#: view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
+msgstr ""
+
+#: view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr ""
+
+#: view/smarty3/compiled/de93dd804a3e4e0c280f6a6ccb3ab9b0eaebd65d.file.blob.tpl.php:106
+msgid "Click here to download"
+msgstr ""
+
+#: view/smarty3/compiled/e3e71db17e5b19827a9ae25070c4171ecb4fad17.file.project.tpl.php:149
+#: view/smarty3/compiled/681c121d981f553bdaa9e163d8a08e0bb4bd88ec.file.tree.tpl.php:121
+msgid "Create new pull request"
+msgstr ""
+
+#: view/smarty3/compiled/919a59d5a78d842406e0afa69e5825d6feb5dc06.file.admin_plugins.tpl.php:42
+msgid "Reload active plugins"
+msgstr ""
+
+#: view/smarty3/compiled/1708ab6fbb592af5399438bf991f7b474286b1b1.file.contact_drop_confirm.tpl.php:22
+msgid "Drop contact"
+msgstr ""
+
+#: view/smarty3/compiled/0ab9915ded65caccda8a9411b11cb533ec6f1af8.file.list_public_projects.tpl.php:32
+msgid "Public projects on this node"
+msgstr ""
+
+#: view/smarty3/compiled/0ab9915ded65caccda8a9411b11cb533ec6f1af8.file.list_public_projects.tpl.php:79
+#: view/smarty3/compiled/68590690bd1fadc9898381cbb32b3ed34d6baab6.file.index.tpl.php:68
+#, php-format
+msgid ""
+"Do you want to delete the project '%s'?\\n\\nThis operation cannot be undone."
+msgstr ""
+
+#: view/smarty3/compiled/1db8395fd4b71e9c520b6b80e9f3ed29e256be20.file.clonerepo.tpl.php:56
+msgid "Visibility"
+msgstr ""
+
+#: view/smarty3/compiled/1db8395fd4b71e9c520b6b80e9f3ed29e256be20.file.clonerepo.tpl.php:72
+#: view/smarty3/compiled/94127d6f81f2af31862a508c8c0e2c8568904f2f.file.pullrequest_new.tpl.php:69
+msgid "Create"
+msgstr ""
+
+#: view/smarty3/compiled/2fd5e5477cae394009c2532728561334470ac491.file.pullrequest_list.tpl.php:107
+msgid "No pull requests to show"
+msgstr ""
+
+#: view/smarty3/compiled/2fd5e5477cae394009c2532728561334470ac491.file.pullrequest_list.tpl.php:123
+msgid "opened by"
+msgstr ""
+
+#: view/smarty3/compiled/2fd5e5477cae394009c2532728561334470ac491.file.pullrequest_list.tpl.php:128
+msgid "closed"
+msgstr ""
+
+#: view/smarty3/compiled/2fd5e5477cae394009c2532728561334470ac491.file.pullrequest_list.tpl.php:133
+msgid "merged"
+msgstr ""
+
+#: view/smarty3/compiled/68590690bd1fadc9898381cbb32b3ed34d6baab6.file.index.tpl.php:31
+msgid "Projects"
+msgstr ""
+
+#: view/smarty3/compiled/68590690bd1fadc9898381cbb32b3ed34d6baab6.file.index.tpl.php:32
+msgid "add new"
+msgstr ""
+
+#: view/smarty3/compiled/68590690bd1fadc9898381cbb32b3ed34d6baab6.file.index.tpl.php:51
+msgid "delete"
+msgstr ""
+
+#: view/smarty3/compiled/4bbe2f5d3d1015c250383e229b603c26c960f47c.file.commits.tpl.php:80
+#: view/smarty3/compiled/1cdeb5a00fc3621815c983a6f754af6d16ff85c9.file.commit.tpl.php:80
+#: view/smarty3/compiled/0427bde50f01fd26112193bc4daba7b58c19ca11.file.aside.tpl.php:51
+msgid "Clone this project:"
+msgstr ""
+
+#: view/smarty3/compiled/94127d6f81f2af31862a508c8c0e2c8568904f2f.file.pullrequest_new.tpl.php:38
+msgid "New pull request"
+msgstr ""
+
+#: view/smarty3/compiled/94127d6f81f2af31862a508c8c0e2c8568904f2f.file.pullrequest_new.tpl.php:63
+msgid "Can't show you the diff at the moment. Sorry"
 msgstr ""
 
 #: boot.php:763
@@ -5766,145 +6177,6 @@ msgstr ""
 msgid "privacy policy"
 msgstr ""
 
-#: object/Item.php:95
-msgid "This entry was edited"
-msgstr ""
-
-#: object/Item.php:209
-msgid "ignore thread"
-msgstr ""
-
-#: object/Item.php:210
-msgid "unignore thread"
-msgstr ""
-
-#: object/Item.php:211
-msgid "toggle ignore status"
-msgstr ""
-
-#: object/Item.php:214
-msgid "ignored"
-msgstr ""
-
-#: object/Item.php:318 include/conversation.php:665
-msgid "Categories:"
-msgstr ""
-
-#: object/Item.php:319 include/conversation.php:666
-msgid "Filed under:"
-msgstr ""
-
-#: object/Item.php:331
-msgid "via"
-msgstr ""
-
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
-msgstr ""
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr ""
-
-#: include/dbstructure.php:152
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: include/dbstructure.php:210
-msgid "Errors encountered performing database changes."
-msgstr ""
-
-#: include/auth.php:38
-msgid "Logged out."
-msgstr ""
-
-#: include/auth.php:128 include/user.php:75
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr ""
-
-#: include/auth.php:128 include/user.php:75
-msgid "The error message was:"
-msgstr ""
-
-#: include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr ""
-
-#: include/contact_widgets.php:7
-msgid "Enter address or web location"
-msgstr ""
-
-#: include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr ""
-
-#: include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/contact_widgets.php:30
-msgid "Find People"
-msgstr ""
-
-#: include/contact_widgets.php:31
-msgid "Enter name or interest"
-msgstr ""
-
-#: include/contact_widgets.php:32
-msgid "Connect/Follow"
-msgstr ""
-
-#: include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: include/contact_widgets.php:36 view/theme/diabook/theme.php:526
-msgid "Similar Interests"
-msgstr ""
-
-#: include/contact_widgets.php:37
-msgid "Random Profile"
-msgstr ""
-
-#: include/contact_widgets.php:38 view/theme/diabook/theme.php:528
-msgid "Invite Friends"
-msgstr ""
-
-#: include/contact_widgets.php:71
-msgid "Networks"
-msgstr ""
-
-#: include/contact_widgets.php:74
-msgid "All Networks"
-msgstr ""
-
-#: include/contact_widgets.php:104 include/features.php:60
-msgid "Saved Folders"
-msgstr ""
-
-#: include/contact_widgets.php:107 include/contact_widgets.php:139
-msgid "Everything"
-msgstr ""
-
-#: include/contact_widgets.php:136
-msgid "Categories"
-msgstr ""
-
 #: include/features.php:23
 msgid "General Features"
 msgstr ""
@@ -6042,6 +6314,10 @@ msgstr ""
 msgid "Add categories to your posts"
 msgstr ""
 
+#: include/features.php:60 include/contact_widgets.php:104
+msgid "Saved Folders"
+msgstr ""
+
 #: include/features.php:60
 msgid "Ability to file posts under folders"
 msgstr ""
@@ -6070,513 +6346,34 @@ msgstr ""
 msgid "Ability to mute notifications for a thread"
 msgstr ""
 
-#: include/follow.php:75
-msgid "Connect URL missing."
+#: include/auth.php:38
+msgid "Logged out."
 msgstr ""
 
-#: include/follow.php:102
+#: include/auth.php:128 include/user.php:75
 msgid ""
-"This site is not configured to allow communications with other networks."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: include/follow.php:103 include/follow.php:123
-msgid "No compatible communication protocols or feeds were discovered."
+#: include/auth.php:128 include/user.php:75
+msgid "The error message was:"
 msgstr ""
 
-#: include/follow.php:121
-msgid "The profile address specified does not provide adequate information."
+#: include/event.php:22 include/bb2diaspora.php:154
+msgid "Starts:"
 msgstr ""
 
-#: include/follow.php:125
-msgid "An author or name was not found."
-msgstr ""
-
-#: include/follow.php:127
-msgid "No browser URL could be matched to this address."
-msgstr ""
-
-#: include/follow.php:129
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr ""
-
-#: include/follow.php:130
-msgid "Use mailto: in front of address to force email check."
-msgstr ""
-
-#: include/follow.php:136
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-
-#: include/follow.php:146
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-
-#: include/follow.php:249
-msgid "Unable to retrieve contact information."
-msgstr ""
-
-#: include/follow.php:302
-msgid "following"
-msgstr ""
-
-#: include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: include/group.php:207
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: include/group.php:226
-msgid "Everybody"
-msgstr ""
-
-#: include/group.php:249
-msgid "edit"
-msgstr ""
-
-#: include/group.php:271
-msgid "Edit group"
-msgstr ""
-
-#: include/group.php:272
-msgid "Create a new group"
-msgstr ""
-
-#: include/group.php:275
-msgid "Contacts not in any group"
-msgstr ""
-
-#: include/datetime.php:43 include/datetime.php:45
-msgid "Miscellaneous"
-msgstr ""
-
-#: include/datetime.php:141
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: include/datetime.php:256
-msgid "never"
-msgstr ""
-
-#: include/datetime.php:262
-msgid "less than a second ago"
-msgstr ""
-
-#: include/datetime.php:272
-msgid "year"
-msgstr ""
-
-#: include/datetime.php:272
-msgid "years"
-msgstr ""
-
-#: include/datetime.php:273
-msgid "month"
-msgstr ""
-
-#: include/datetime.php:273
-msgid "months"
-msgstr ""
-
-#: include/datetime.php:274
-msgid "week"
-msgstr ""
-
-#: include/datetime.php:274
-msgid "weeks"
-msgstr ""
-
-#: include/datetime.php:275
-msgid "day"
-msgstr ""
-
-#: include/datetime.php:275
-msgid "days"
-msgstr ""
-
-#: include/datetime.php:276
-msgid "hour"
-msgstr ""
-
-#: include/datetime.php:276
-msgid "hours"
-msgstr ""
-
-#: include/datetime.php:277
-msgid "minute"
-msgstr ""
-
-#: include/datetime.php:277
-msgid "minutes"
-msgstr ""
-
-#: include/datetime.php:278
-msgid "second"
-msgstr ""
-
-#: include/datetime.php:278
-msgid "seconds"
-msgstr ""
-
-#: include/datetime.php:287
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: include/datetime.php:459 include/items.php:2432
-#, php-format
-msgid "%s's birthday"
-msgstr ""
-
-#: include/datetime.php:460 include/items.php:2433
-#, php-format
-msgid "Happy Birthday %s"
-msgstr ""
-
-#: include/identity.php:38
-msgid "Requested account is not available."
-msgstr ""
-
-#: include/identity.php:121 include/identity.php:255 include/identity.php:607
-msgid "Edit profile"
-msgstr ""
-
-#: include/identity.php:220
-msgid "Message"
-msgstr ""
-
-#: include/identity.php:226 include/nav.php:184
-msgid "Profiles"
-msgstr ""
-
-#: include/identity.php:226
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: include/identity.php:341
-msgid "Network:"
-msgstr ""
-
-#: include/identity.php:373 include/identity.php:459
-msgid "g A l F d"
-msgstr ""
-
-#: include/identity.php:374 include/identity.php:460
-msgid "F d"
-msgstr ""
-
-#: include/identity.php:419 include/identity.php:506
-msgid "[today]"
-msgstr ""
-
-#: include/identity.php:431
-msgid "Birthday Reminders"
-msgstr ""
-
-#: include/identity.php:432
-msgid "Birthdays this week:"
-msgstr ""
-
-#: include/identity.php:493
-msgid "[No description]"
-msgstr ""
-
-#: include/identity.php:517
-msgid "Event Reminders"
-msgstr ""
-
-#: include/identity.php:518
-msgid "Events this week:"
-msgstr ""
-
-#: include/identity.php:545
-msgid "j F, Y"
-msgstr ""
-
-#: include/identity.php:546
-msgid "j F"
-msgstr ""
-
-#: include/identity.php:553
-msgid "Birthday:"
-msgstr ""
-
-#: include/identity.php:557
-msgid "Age:"
-msgstr ""
-
-#: include/identity.php:566
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: include/identity.php:579
-msgid "Religion:"
-msgstr ""
-
-#: include/identity.php:583
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: include/identity.php:590
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: include/identity.php:592
-msgid "Musical interests:"
-msgstr ""
-
-#: include/identity.php:594
-msgid "Books, literature:"
-msgstr ""
-
-#: include/identity.php:596
-msgid "Television:"
-msgstr ""
-
-#: include/identity.php:598
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: include/identity.php:600
-msgid "Love/Romance:"
-msgstr ""
-
-#: include/identity.php:602
-msgid "Work/employment:"
-msgstr ""
-
-#: include/identity.php:604
-msgid "School/education:"
-msgstr ""
-
-#: include/identity.php:632 include/nav.php:76
-msgid "Status"
-msgstr ""
-
-#: include/identity.php:635
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: include/identity.php:643
-msgid "Profile Details"
-msgstr ""
-
-#: include/identity.php:656 include/identity.php:659 include/nav.php:79
-msgid "Videos"
-msgstr ""
-
-#: include/identity.php:670
-msgid "Events and Calendar"
-msgstr ""
-
-#: include/identity.php:678
-msgid "Only You Can See This"
-msgstr ""
-
-#: include/acl_selectors.php:324
-msgid "Post to Email"
-msgstr ""
-
-#: include/acl_selectors.php:329
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr ""
-
-#: include/acl_selectors.php:335
-msgid "Visible to everybody"
-msgstr ""
-
-#: include/acl_selectors.php:336 view/theme/diabook/config.php:142
-#: view/theme/diabook/theme.php:621
-msgid "show"
-msgstr ""
-
-#: include/acl_selectors.php:337 view/theme/diabook/config.php:142
-#: view/theme/diabook/theme.php:621
-msgid "don't show"
+#: include/event.php:32 include/bb2diaspora.php:162
+msgid "Finishes:"
 msgstr ""
 
 #: include/message.php:15 include/message.php:173
 msgid "[no subject]"
 msgstr ""
 
-#: include/Contact.php:119
-msgid "stopped following"
-msgstr ""
-
-#: include/Contact.php:232 include/conversation.php:881
-msgid "Poke"
-msgstr ""
-
-#: include/Contact.php:233 include/conversation.php:875
-msgid "View Status"
-msgstr ""
-
-#: include/Contact.php:234 include/conversation.php:876
-msgid "View Profile"
-msgstr ""
-
-#: include/Contact.php:235 include/conversation.php:877
-msgid "View Photos"
-msgstr ""
-
-#: include/Contact.php:236 include/Contact.php:259 include/conversation.php:878
-msgid "Network Posts"
-msgstr ""
-
-#: include/Contact.php:237 include/Contact.php:259 include/conversation.php:879
-msgid "Edit Contact"
-msgstr ""
-
-#: include/Contact.php:238
-msgid "Drop Contact"
-msgstr ""
-
-#: include/Contact.php:239 include/Contact.php:259 include/conversation.php:880
-msgid "Send PM"
-msgstr ""
-
-#: include/security.php:22
-msgid "Welcome "
-msgstr ""
-
-#: include/security.php:23
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: include/security.php:26
-msgid "Welcome back "
-msgstr ""
-
-#: include/security.php:375
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
-#: include/conversation.php:118 include/conversation.php:245
-#: include/text.php:2032 view/theme/diabook/theme.php:463
-msgid "event"
-msgstr ""
-
-#: include/conversation.php:206
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: include/conversation.php:290
-msgid "post/item"
-msgstr ""
-
-#: include/conversation.php:291
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr ""
-
-#: include/conversation.php:771
-msgid "remove"
-msgstr ""
-
-#: include/conversation.php:775
-msgid "Delete Selected Items"
-msgstr ""
-
-#: include/conversation.php:874
-msgid "Follow Thread"
-msgstr ""
-
-#: include/conversation.php:943
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: include/conversation.php:943
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: include/conversation.php:948
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr ""
-
-#: include/conversation.php:951
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr ""
-
-#: include/conversation.php:965
-msgid "and"
-msgstr ""
-
-#: include/conversation.php:971
-#, php-format
-msgid ", and %d other people"
-msgstr ""
-
-#: include/conversation.php:973
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: include/conversation.php:973
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: include/conversation.php:1000 include/conversation.php:1018
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: include/conversation.php:1002 include/conversation.php:1020
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: include/conversation.php:1003 include/conversation.php:1021
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: include/conversation.php:1004 include/conversation.php:1022
-msgid "Tag term:"
-msgstr ""
-
-#: include/conversation.php:1006 include/conversation.php:1024
-msgid "Where are you right now?"
-msgstr ""
-
-#: include/conversation.php:1007
-msgid "Delete item(s)?"
-msgstr ""
-
-#: include/conversation.php:1076
-msgid "permissions"
-msgstr ""
-
-#: include/conversation.php:1099
-msgid "Post to Groups"
-msgstr ""
-
-#: include/conversation.php:1100
-msgid "Post to Contacts"
-msgstr ""
-
-#: include/conversation.php:1101
-msgid "Private post"
-msgstr ""
-
-#: include/network.php:959
-msgid "view full size"
+#: include/Scrape.php:603
+msgid " on Last.fm"
 msgstr ""
 
 #: include/text.php:299
@@ -6854,11 +6651,6 @@ msgstr ""
 msgid "view on separate page"
 msgstr ""
 
-#: include/text.php:1768 include/user.php:255
-#: view/theme/duepuntozero/config.php:44
-msgid "default"
-msgstr ""
-
 #: include/text.php:1780
 msgid "Select an alternate language"
 msgstr ""
@@ -6875,303 +6667,6 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: include/bbcode.php:458 include/bbcode.php:1112 include/bbcode.php:1113
-msgid "Image/photo"
-msgstr ""
-
-#: include/bbcode.php:556
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr ""
-
-#: include/bbcode.php:590
-#, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href="
-"\"%s\" target=\"_blank\">post</a>"
-msgstr ""
-
-#: include/bbcode.php:1076 include/bbcode.php:1096
-msgid "$1 wrote:"
-msgstr ""
-
-#: include/bbcode.php:1121 include/bbcode.php:1122
-msgid "Encrypted content"
-msgstr ""
-
-#: include/notifier.php:830 include/delivery.php:456
-msgid "(no subject)"
-msgstr ""
-
-#: include/notifier.php:840 include/delivery.php:467 include/enotify.php:33
-msgid "noreply"
-msgstr ""
-
-#: include/dba_pdo.php:72 include/dba.php:56
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr ""
-
-#: include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr ""
-
-#: include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
-msgstr ""
-
-#: include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
-msgstr ""
-
-#: include/contact_selectors.php:36
-msgid "OK, probably harmless"
-msgstr ""
-
-#: include/contact_selectors.php:37
-msgid "Reputable, has my trust"
-msgstr ""
-
-#: include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
-#: include/contact_selectors.php:77
-msgid "OStatus"
-msgstr ""
-
-#: include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr ""
-
-#: include/contact_selectors.php:82
-msgid "Zot!"
-msgstr ""
-
-#: include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr ""
-
-#: include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr ""
-
-#: include/contact_selectors.php:85
-msgid "MySpace"
-msgstr ""
-
-#: include/contact_selectors.php:87
-msgid "Google+"
-msgstr ""
-
-#: include/contact_selectors.php:88
-msgid "pump.io"
-msgstr ""
-
-#: include/contact_selectors.php:89
-msgid "Twitter"
-msgstr ""
-
-#: include/contact_selectors.php:90
-msgid "Diaspora Connector"
-msgstr ""
-
-#: include/contact_selectors.php:91
-msgid "Statusnet"
-msgstr ""
-
-#: include/contact_selectors.php:92
-msgid "App.net"
-msgstr ""
-
-#: include/contact_selectors.php:103
-msgid "Redmatrix"
-msgstr ""
-
-#: include/Scrape.php:603
-msgid " on Last.fm"
-msgstr ""
-
-#: include/bb2diaspora.php:154 include/event.php:22
-msgid "Starts:"
-msgstr ""
-
-#: include/bb2diaspora.php:162 include/event.php:32
-msgid "Finishes:"
-msgstr ""
-
-#: include/plugin.php:458 include/plugin.php:460
-msgid "Click here to upgrade."
-msgstr ""
-
-#: include/plugin.php:466
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: include/plugin.php:471
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: include/nav.php:73
-msgid "End this session"
-msgstr ""
-
-#: include/nav.php:76 include/nav.php:156 view/theme/diabook/theme.php:123
-msgid "Your posts and conversations"
-msgstr ""
-
-#: include/nav.php:77 view/theme/diabook/theme.php:124
-msgid "Your profile page"
-msgstr ""
-
-#: include/nav.php:78 view/theme/diabook/theme.php:126
-msgid "Your photos"
-msgstr ""
-
-#: include/nav.php:79
-msgid "Your videos"
-msgstr ""
-
-#: include/nav.php:80 view/theme/diabook/theme.php:127
-msgid "Your events"
-msgstr ""
-
-#: include/nav.php:81 view/theme/diabook/theme.php:128
-msgid "Personal notes"
-msgstr ""
-
-#: include/nav.php:81
-msgid "Your personal notes"
-msgstr ""
-
-#: include/nav.php:92
-msgid "Sign in"
-msgstr ""
-
-#: include/nav.php:105
-msgid "Home Page"
-msgstr ""
-
-#: include/nav.php:109
-msgid "Create an account"
-msgstr ""
-
-#: include/nav.php:114
-msgid "Help and documentation"
-msgstr ""
-
-#: include/nav.php:117
-msgid "Apps"
-msgstr ""
-
-#: include/nav.php:117
-msgid "Addon applications, utilities, games"
-msgstr ""
-
-#: include/nav.php:119
-msgid "Search site content"
-msgstr ""
-
-#: include/nav.php:137
-msgid "Conversations on this site"
-msgstr ""
-
-#: include/nav.php:139
-msgid "Conversations on the network"
-msgstr ""
-
-#: include/nav.php:141
-msgid "Directory"
-msgstr ""
-
-#: include/nav.php:141
-msgid "People directory"
-msgstr ""
-
-#: include/nav.php:143
-msgid "Information"
-msgstr ""
-
-#: include/nav.php:143
-msgid "Information about this friendica instance"
-msgstr ""
-
-#: include/nav.php:153
-msgid "Conversations from your friends"
-msgstr ""
-
-#: include/nav.php:154
-msgid "Network Reset"
-msgstr ""
-
-#: include/nav.php:154
-msgid "Load Network page with no filters"
-msgstr ""
-
-#: include/nav.php:161
-msgid "Friend Requests"
-msgstr ""
-
-#: include/nav.php:165
-msgid "See all notifications"
-msgstr ""
-
-#: include/nav.php:166
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: include/nav.php:170
-msgid "Private mail"
-msgstr ""
-
-#: include/nav.php:171
-msgid "Inbox"
-msgstr ""
-
-#: include/nav.php:172
-msgid "Outbox"
-msgstr ""
-
-#: include/nav.php:176
-msgid "Manage"
-msgstr ""
-
-#: include/nav.php:176
-msgid "Manage other pages"
-msgstr ""
-
-#: include/nav.php:181
-msgid "Account settings"
-msgstr ""
-
-#: include/nav.php:184
-msgid "Manage/Edit Profiles"
-msgstr ""
-
-#: include/nav.php:186
-msgid "Manage/edit friends and contacts"
-msgstr ""
-
-#: include/nav.php:193
-msgid "Site setup and configuration"
-msgstr ""
-
-#: include/nav.php:197
-msgid "Navigation"
-msgstr ""
-
-#: include/nav.php:197
-msgid "Site map"
-msgstr ""
-
 #: include/api.php:321 include/api.php:332 include/api.php:441
 #: include/api.php:1141 include/api.php:1143
 msgid "User not found."
@@ -7212,136 +6707,259 @@ msgstr ""
 msgid "DB error"
 msgstr ""
 
-#: include/user.php:48
-msgid "An invitation is required."
-msgstr ""
-
-#: include/user.php:53
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: include/user.php:61
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: include/user.php:82
-msgid "Please enter the required information."
-msgstr ""
-
-#: include/user.php:96
-msgid "Please use a shorter name."
-msgstr ""
-
-#: include/user.php:98
-msgid "Name too short."
-msgstr ""
-
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: include/user.php:121
-msgid "Not a valid email address."
-msgstr ""
-
-#: include/user.php:134
-msgid "Cannot use that email."
-msgstr ""
-
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
-msgstr ""
-
-#: include/user.php:146 include/user.php:244
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: include/user.php:156
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr ""
-
-#: include/user.php:172
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: include/user.php:230
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: include/user.php:265
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: include/user.php:297 include/user.php:301 include/profile_selectors.php:42
-msgid "Friends"
-msgstr ""
-
-#: include/user.php:385
+#: include/dba.php:56 include/dba_pdo.php:72
 #, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: include/user.php:389
+#: include/items.php:2445 include/datetime.php:459
 #, php-format
-msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
+msgid "%s's birthday"
 msgstr ""
 
-#: include/diaspora.php:717
-msgid "Sharing notification from Diaspora network"
+#: include/items.php:2446 include/datetime.php:460
+#, php-format
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: include/diaspora.php:2560
-msgid "Attachments:"
-msgstr ""
-
-#: include/items.php:4853
+#: include/items.php:4866
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/items.php:5128
+#: include/items.php:5141
 msgid "Archives"
 msgstr ""
 
+#: include/delivery.php:456 include/notifier.php:834
+msgid "(no subject)"
+msgstr ""
+
+#: include/delivery.php:467 include/notifier.php:844 include/enotify.php:33
+msgid "noreply"
+msgstr ""
+
+#: include/diaspora.php:716
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: include/diaspora.php:2567
+msgid "Attachments:"
+msgstr ""
+
+#: include/identity.php:38
+msgid "Requested account is not available."
+msgstr ""
+
+#: include/identity.php:121 include/identity.php:255 include/identity.php:608
+msgid "Edit profile"
+msgstr ""
+
+#: include/identity.php:220
+msgid "Message"
+msgstr ""
+
+#: include/identity.php:226 include/nav.php:184
+msgid "Profiles"
+msgstr ""
+
+#: include/identity.php:226
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: include/identity.php:342
+msgid "Network:"
+msgstr ""
+
+#: include/identity.php:374 include/identity.php:460
+msgid "g A l F d"
+msgstr ""
+
+#: include/identity.php:375 include/identity.php:461
+msgid "F d"
+msgstr ""
+
+#: include/identity.php:420 include/identity.php:507
+msgid "[today]"
+msgstr ""
+
+#: include/identity.php:432
+msgid "Birthday Reminders"
+msgstr ""
+
+#: include/identity.php:433
+msgid "Birthdays this week:"
+msgstr ""
+
+#: include/identity.php:494
+msgid "[No description]"
+msgstr ""
+
+#: include/identity.php:518
+msgid "Event Reminders"
+msgstr ""
+
+#: include/identity.php:519
+msgid "Events this week:"
+msgstr ""
+
+#: include/identity.php:546
+msgid "j F, Y"
+msgstr ""
+
+#: include/identity.php:547
+msgid "j F"
+msgstr ""
+
+#: include/identity.php:554
+msgid "Birthday:"
+msgstr ""
+
+#: include/identity.php:558
+msgid "Age:"
+msgstr ""
+
+#: include/identity.php:567
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: include/identity.php:580
+msgid "Religion:"
+msgstr ""
+
+#: include/identity.php:584
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: include/identity.php:591
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: include/identity.php:593
+msgid "Musical interests:"
+msgstr ""
+
+#: include/identity.php:595
+msgid "Books, literature:"
+msgstr ""
+
+#: include/identity.php:597
+msgid "Television:"
+msgstr ""
+
+#: include/identity.php:599
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: include/identity.php:601
+msgid "Love/Romance:"
+msgstr ""
+
+#: include/identity.php:603
+msgid "Work/employment:"
+msgstr ""
+
+#: include/identity.php:605
+msgid "School/education:"
+msgstr ""
+
+#: include/identity.php:633 include/nav.php:76
+msgid "Status"
+msgstr ""
+
+#: include/identity.php:636
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: include/identity.php:644
+msgid "Profile Details"
+msgstr ""
+
+#: include/identity.php:657 include/identity.php:660 include/nav.php:79
+msgid "Videos"
+msgstr ""
+
+#: include/identity.php:671
+msgid "Events and Calendar"
+msgstr ""
+
+#: include/identity.php:679
+msgid "Only You Can See This"
+msgstr ""
+
+#: include/follow.php:75
+msgid "Connect URL missing."
+msgstr ""
+
+#: include/follow.php:102
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr ""
+
+#: include/follow.php:103 include/follow.php:123
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr ""
+
+#: include/follow.php:121
+msgid "The profile address specified does not provide adequate information."
+msgstr ""
+
+#: include/follow.php:125
+msgid "An author or name was not found."
+msgstr ""
+
+#: include/follow.php:127
+msgid "No browser URL could be matched to this address."
+msgstr ""
+
+#: include/follow.php:129
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr ""
+
+#: include/follow.php:130
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: include/follow.php:136
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr ""
+
+#: include/follow.php:146
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+
+#: include/follow.php:253
+msgid "Unable to retrieve contact information."
+msgstr ""
+
+#: include/follow.php:306
+msgid "following"
+msgstr ""
+
+#: include/security.php:22
+msgid "Welcome "
+msgstr ""
+
+#: include/security.php:23
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: include/security.php:26
+msgid "Welcome back "
+msgstr ""
+
+#: include/security.php:375
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
 #: include/profile_selectors.php:6
 msgid "Male"
 msgstr ""
@@ -7486,6 +7104,10 @@ msgstr ""
 msgid "Sex Addict"
 msgstr ""
 
+#: include/profile_selectors.php:42 include/user.php:297 include/user.php:301
+msgid "Friends"
+msgstr ""
+
 #: include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr ""
@@ -7570,6 +7192,461 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
+#: include/uimport.php:94
+msgid "Error decoding account file"
+msgstr ""
+
+#: include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: include/uimport.php:116 include/uimport.php:127
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: include/uimport.php:120 include/uimport.php:131
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: include/uimport.php:153
+msgid "User creation error"
+msgstr ""
+
+#: include/uimport.php:173
+msgid "User profile creation error"
+msgstr ""
+
+#: include/uimport.php:222
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/uimport.php:292
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
+#: include/plugin.php:458 include/plugin.php:460
+msgid "Click here to upgrade."
+msgstr ""
+
+#: include/plugin.php:466
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: include/plugin.php:471
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
+#: include/conversation.php:206
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: include/conversation.php:290
+msgid "post/item"
+msgstr ""
+
+#: include/conversation.php:291
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr ""
+
+#: include/conversation.php:771
+msgid "remove"
+msgstr ""
+
+#: include/conversation.php:775
+msgid "Delete Selected Items"
+msgstr ""
+
+#: include/conversation.php:874
+msgid "Follow Thread"
+msgstr ""
+
+#: include/conversation.php:875 include/Contact.php:233
+msgid "View Status"
+msgstr ""
+
+#: include/conversation.php:876 include/Contact.php:234
+msgid "View Profile"
+msgstr ""
+
+#: include/conversation.php:877 include/Contact.php:235
+msgid "View Photos"
+msgstr ""
+
+#: include/conversation.php:878 include/Contact.php:236
+#: include/Contact.php:259
+msgid "Network Posts"
+msgstr ""
+
+#: include/conversation.php:879 include/Contact.php:237
+#: include/Contact.php:259
+msgid "Edit Contact"
+msgstr ""
+
+#: include/conversation.php:880 include/Contact.php:239
+#: include/Contact.php:259
+msgid "Send PM"
+msgstr ""
+
+#: include/conversation.php:881 include/Contact.php:232
+msgid "Poke"
+msgstr ""
+
+#: include/conversation.php:943
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: include/conversation.php:943
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: include/conversation.php:948
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr ""
+
+#: include/conversation.php:951
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr ""
+
+#: include/conversation.php:965
+msgid "and"
+msgstr ""
+
+#: include/conversation.php:971
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: include/conversation.php:973
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: include/conversation.php:973
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: include/conversation.php:1000 include/conversation.php:1018
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: include/conversation.php:1002 include/conversation.php:1020
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: include/conversation.php:1003 include/conversation.php:1021
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: include/conversation.php:1004 include/conversation.php:1022
+msgid "Tag term:"
+msgstr ""
+
+#: include/conversation.php:1006 include/conversation.php:1024
+msgid "Where are you right now?"
+msgstr ""
+
+#: include/conversation.php:1007
+msgid "Delete item(s)?"
+msgstr ""
+
+#: include/conversation.php:1076
+msgid "permissions"
+msgstr ""
+
+#: include/conversation.php:1099
+msgid "Post to Groups"
+msgstr ""
+
+#: include/conversation.php:1100
+msgid "Post to Contacts"
+msgstr ""
+
+#: include/conversation.php:1101
+msgid "Private post"
+msgstr ""
+
+#: include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr ""
+
+#: include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr ""
+
+#: include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: include/contact_widgets.php:24
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/contact_widgets.php:30
+msgid "Find People"
+msgstr ""
+
+#: include/contact_widgets.php:31
+msgid "Enter name or interest"
+msgstr ""
+
+#: include/contact_widgets.php:32
+msgid "Connect/Follow"
+msgstr ""
+
+#: include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr ""
+
+#: include/contact_widgets.php:37
+msgid "Random Profile"
+msgstr ""
+
+#: include/contact_widgets.php:71
+msgid "Networks"
+msgstr ""
+
+#: include/contact_widgets.php:74
+msgid "All Networks"
+msgstr ""
+
+#: include/contact_widgets.php:107 include/contact_widgets.php:139
+msgid "Everything"
+msgstr ""
+
+#: include/contact_widgets.php:136
+msgid "Categories"
+msgstr ""
+
+#: include/nav.php:73
+msgid "End this session"
+msgstr ""
+
+#: include/nav.php:79
+msgid "Your videos"
+msgstr ""
+
+#: include/nav.php:81
+msgid "Your personal notes"
+msgstr ""
+
+#: include/nav.php:92
+msgid "Sign in"
+msgstr ""
+
+#: include/nav.php:105
+msgid "Home Page"
+msgstr ""
+
+#: include/nav.php:109
+msgid "Create an account"
+msgstr ""
+
+#: include/nav.php:114
+msgid "Help and documentation"
+msgstr ""
+
+#: include/nav.php:117
+msgid "Apps"
+msgstr ""
+
+#: include/nav.php:117
+msgid "Addon applications, utilities, games"
+msgstr ""
+
+#: include/nav.php:119
+msgid "Search site content"
+msgstr ""
+
+#: include/nav.php:137
+msgid "Conversations on this site"
+msgstr ""
+
+#: include/nav.php:139
+msgid "Conversations on the network"
+msgstr ""
+
+#: include/nav.php:141
+msgid "Directory"
+msgstr ""
+
+#: include/nav.php:141
+msgid "People directory"
+msgstr ""
+
+#: include/nav.php:143
+msgid "Information"
+msgstr ""
+
+#: include/nav.php:143
+msgid "Information about this friendica instance"
+msgstr ""
+
+#: include/nav.php:153
+msgid "Conversations from your friends"
+msgstr ""
+
+#: include/nav.php:154
+msgid "Network Reset"
+msgstr ""
+
+#: include/nav.php:154
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: include/nav.php:161
+msgid "Friend Requests"
+msgstr ""
+
+#: include/nav.php:165
+msgid "See all notifications"
+msgstr ""
+
+#: include/nav.php:166
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: include/nav.php:170
+msgid "Private mail"
+msgstr ""
+
+#: include/nav.php:171
+msgid "Inbox"
+msgstr ""
+
+#: include/nav.php:172
+msgid "Outbox"
+msgstr ""
+
+#: include/nav.php:176
+msgid "Manage"
+msgstr ""
+
+#: include/nav.php:176
+msgid "Manage other pages"
+msgstr ""
+
+#: include/nav.php:181
+msgid "Account settings"
+msgstr ""
+
+#: include/nav.php:184
+msgid "Manage/Edit Profiles"
+msgstr ""
+
+#: include/nav.php:186
+msgid "Manage/edit friends and contacts"
+msgstr ""
+
+#: include/nav.php:193
+msgid "Site setup and configuration"
+msgstr ""
+
+#: include/nav.php:197
+msgid "Navigation"
+msgstr ""
+
+#: include/nav.php:197
+msgid "Site map"
+msgstr ""
+
+#: include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr ""
+
+#: include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr ""
+
+#: include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr ""
+
+#: include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr ""
+
+#: include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr ""
+
+#: include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr ""
+
+#: include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: include/contact_selectors.php:77
+msgid "OStatus"
+msgstr ""
+
+#: include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: include/contact_selectors.php:82
+msgid "Zot!"
+msgstr ""
+
+#: include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: include/contact_selectors.php:85
+msgid "MySpace"
+msgstr ""
+
+#: include/contact_selectors.php:87
+msgid "Google+"
+msgstr ""
+
+#: include/contact_selectors.php:88
+msgid "pump.io"
+msgstr ""
+
+#: include/contact_selectors.php:89
+msgid "Twitter"
+msgstr ""
+
+#: include/contact_selectors.php:90
+msgid "Diaspora Connector"
+msgstr ""
+
+#: include/contact_selectors.php:91
+msgid "Statusnet"
+msgstr ""
+
+#: include/contact_selectors.php:92
+msgid "App.net"
+msgstr ""
+
+#: include/contact_selectors.php:103
+msgid "Redmatrix"
+msgstr ""
+
 #: include/enotify.php:18
 msgid "Friendica Notification"
 msgstr ""
@@ -7853,6 +7930,153 @@ msgstr ""
 msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
+#: include/user.php:48
+msgid "An invitation is required."
+msgstr ""
+
+#: include/user.php:53
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: include/user.php:61
+msgid "Invalid OpenID url"
+msgstr ""
+
+#: include/user.php:82
+msgid "Please enter the required information."
+msgstr ""
+
+#: include/user.php:96
+msgid "Please use a shorter name."
+msgstr ""
+
+#: include/user.php:98
+msgid "Name too short."
+msgstr ""
+
+#: include/user.php:113
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr ""
+
+#: include/user.php:118
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: include/user.php:121
+msgid "Not a valid email address."
+msgstr ""
+
+#: include/user.php:134
+msgid "Cannot use that email."
+msgstr ""
+
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+msgstr ""
+
+#: include/user.php:146 include/user.php:244
+msgid "Nickname is already registered. Please choose another."
+msgstr ""
+
+#: include/user.php:156
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: include/user.php:172
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr ""
+
+#: include/user.php:230
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+
+#: include/user.php:265
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: include/user.php:385
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
+msgstr ""
+
+#: include/user.php:389
+#, php-format
+msgid ""
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$s\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\tthan that.\n"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
+msgstr ""
+
+#: include/acl_selectors.php:324
+msgid "Post to Email"
+msgstr ""
+
+#: include/acl_selectors.php:329
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr ""
+
+#: include/acl_selectors.php:335
+msgid "Visible to everybody"
+msgstr ""
+
+#: include/bbcode.php:458 include/bbcode.php:1112 include/bbcode.php:1113
+msgid "Image/photo"
+msgstr ""
+
+#: include/bbcode.php:556
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr ""
+
+#: include/bbcode.php:590
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href="
+"\"%s\" target=\"_blank\">post</a>"
+msgstr ""
+
+#: include/bbcode.php:1076 include/bbcode.php:1096
+msgid "$1 wrote:"
+msgstr ""
+
+#: include/bbcode.php:1121 include/bbcode.php:1122
+msgid "Encrypted content"
+msgstr ""
+
 #: include/oembed.php:220
 msgid "Embedded content"
 msgstr ""
@@ -7861,204 +8085,148 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: include/uimport.php:94
-msgid "Error decoding account file"
+#: include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: include/group.php:207
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: include/uimport.php:116 include/uimport.php:127
-msgid "Error! Cannot check nickname"
+#: include/group.php:226
+msgid "Everybody"
 msgstr ""
 
-#: include/uimport.php:120 include/uimport.php:131
+#: include/group.php:249
+msgid "edit"
+msgstr ""
+
+#: include/group.php:271
+msgid "Edit group"
+msgstr ""
+
+#: include/group.php:272
+msgid "Create a new group"
+msgstr ""
+
+#: include/group.php:275
+msgid "Contacts not in any group"
+msgstr ""
+
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr ""
+
+#: include/Contact.php:238
+msgid "Drop Contact"
+msgstr ""
+
+#: include/datetime.php:43 include/datetime.php:45
+msgid "Miscellaneous"
+msgstr ""
+
+#: include/datetime.php:141
+msgid "YYYY-MM-DD or MM-DD"
+msgstr ""
+
+#: include/datetime.php:256
+msgid "never"
+msgstr ""
+
+#: include/datetime.php:262
+msgid "less than a second ago"
+msgstr ""
+
+#: include/datetime.php:272
+msgid "year"
+msgstr ""
+
+#: include/datetime.php:272
+msgid "years"
+msgstr ""
+
+#: include/datetime.php:273
+msgid "month"
+msgstr ""
+
+#: include/datetime.php:273
+msgid "months"
+msgstr ""
+
+#: include/datetime.php:274
+msgid "week"
+msgstr ""
+
+#: include/datetime.php:274
+msgid "weeks"
+msgstr ""
+
+#: include/datetime.php:275
+msgid "day"
+msgstr ""
+
+#: include/datetime.php:275
+msgid "days"
+msgstr ""
+
+#: include/datetime.php:276
+msgid "hour"
+msgstr ""
+
+#: include/datetime.php:276
+msgid "hours"
+msgstr ""
+
+#: include/datetime.php:277
+msgid "minute"
+msgstr ""
+
+#: include/datetime.php:277
+msgid "minutes"
+msgstr ""
+
+#: include/datetime.php:278
+msgid "second"
+msgstr ""
+
+#: include/datetime.php:278
+msgid "seconds"
+msgstr ""
+
+#: include/datetime.php:287
 #, php-format
-msgid "User '%s' already exists on this server!"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: include/uimport.php:153
-msgid "User creation error"
+#: include/network.php:959
+msgid "view full size"
 msgstr ""
 
-#: include/uimport.php:173
-msgid "User profile creation error"
-msgstr ""
-
-#: include/uimport.php:222
+#: include/dbstructure.php:26
 #, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/uimport.php:292
-msgid "Done. You can now login with your username and password"
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
 msgstr ""
 
-#: index.php:441
-msgid "toggle mobile"
+#: include/dbstructure.php:31
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
+#: include/dbstructure.php:152
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: view/theme/cleanzero/config.php:84 view/theme/dispy/config.php:73
-#: view/theme/diabook/config.php:151
-msgid "Set font-size for posts and comments"
-msgstr ""
-
-#: view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr ""
-
-#: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr ""
-
-#: view/theme/dispy/config.php:74 view/theme/diabook/config.php:152
-msgid "Set line-height for posts and comments"
-msgstr ""
-
-#: view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr ""
-
-#: view/theme/quattro/config.php:67
-msgid "Alignment"
-msgstr ""
-
-#: view/theme/quattro/config.php:67
-msgid "Left"
-msgstr ""
-
-#: view/theme/quattro/config.php:67
-msgid "Center"
-msgstr ""
-
-#: view/theme/quattro/config.php:69
-msgid "Posts font size"
-msgstr ""
-
-#: view/theme/quattro/config.php:70
-msgid "Textareas font size"
-msgstr ""
-
-#: view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
-msgstr ""
-
-#: view/theme/diabook/config.php:154
-msgid "Set color scheme"
-msgstr ""
-
-#: view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
-msgstr ""
-
-#: view/theme/diabook/config.php:156 view/theme/diabook/theme.php:585
-msgid "Set longitude (X) for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/config.php:157 view/theme/diabook/theme.php:586
-msgid "Set latitude (Y) for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/config.php:158 view/theme/diabook/theme.php:130
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
-msgid "Community Pages"
-msgstr ""
-
-#: view/theme/diabook/config.php:159 view/theme/diabook/theme.php:579
-#: view/theme/diabook/theme.php:625
-msgid "Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/config.php:160 view/theme/diabook/theme.php:391
-#: view/theme/diabook/theme.php:626
-msgid "Community Profiles"
-msgstr ""
-
-#: view/theme/diabook/config.php:161 view/theme/diabook/theme.php:599
-#: view/theme/diabook/theme.php:627
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: view/theme/diabook/config.php:162 view/theme/diabook/theme.php:606
-#: view/theme/diabook/theme.php:628
-msgid "Connect Services"
-msgstr ""
-
-#: view/theme/diabook/config.php:163 view/theme/diabook/theme.php:523
-#: view/theme/diabook/theme.php:629
-msgid "Find Friends"
-msgstr ""
-
-#: view/theme/diabook/config.php:164 view/theme/diabook/theme.php:412
-#: view/theme/diabook/theme.php:630
-msgid "Last users"
-msgstr ""
-
-#: view/theme/diabook/config.php:165 view/theme/diabook/theme.php:486
-#: view/theme/diabook/theme.php:631
-msgid "Last photos"
-msgstr ""
-
-#: view/theme/diabook/config.php:166 view/theme/diabook/theme.php:441
-#: view/theme/diabook/theme.php:632
-msgid "Last likes"
-msgstr ""
-
-#: view/theme/diabook/theme.php:125
-msgid "Your contacts"
-msgstr ""
-
-#: view/theme/diabook/theme.php:128
-msgid "Your personal photos"
-msgstr ""
-
-#: view/theme/diabook/theme.php:524
-msgid "Local Directory"
-msgstr ""
-
-#: view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
-msgstr ""
-
-#: view/theme/vier/config.php:59
-msgid "Set style"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:45
-msgid "greenzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:46
-msgid "purplezero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:47
-msgid "easterbunny"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:48
-msgid "darkzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:49
-msgid "comix"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:50
-msgid "slackr"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:62
-msgid "Variations"
+#: include/dbstructure.php:210
+msgid "Errors encountered performing database changes."
 msgstr ""

From 7c8c8b821a7a1f4aeb3524136a1734b5d94937d6 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 22 Sep 2015 22:31:22 +0200
Subject: [PATCH 15/22] Bugfix: Following mail accounts is now possible again

---
 include/Scrape.php |  4 +++-
 mod/follow.php     | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/Scrape.php b/include/Scrape.php
index a2bf5ee0a..93d68be22 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -819,7 +819,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 		}
 	}
 
-	Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
+	// 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;
 }
diff --git a/mod/follow.php b/mod/follow.php
index 9b5b39545..bdcde7743 100755
--- 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:'),

From 2a2dd6a1b918b646e51cdca4c93d817ac11c2cf5 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 23 Sep 2015 10:47:34 +0200
Subject: [PATCH 16/22] Remove duplicated calls to language detection

Also avoids overriding existing "lang" specification in an item
---
 include/items.php | 66 ++++++++++++++++++++++++++++++-----------------
 mod/item.php      | 29 ++-------------------
 2 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/include/items.php b/include/items.php
index 5915e2ece..667353d32 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1096,6 +1096,48 @@ function add_guid($item) {
 		dbesc($item["uri"]), dbesc($item["network"]));
 }
 
+// Adds a "lang" specification in a "postopts" element of given $arr,
+// if possible and not already present.
+// Expects "body" element to exist in $arr.
+// TODO: add a parameter to request forcing override
+function item_add_language_opt(&$arr) {
+
+	if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ?
+
+	if ( $arr['postopts'] )
+	{
+		if ( strstr($arr['postopts'], 'lang=') )
+		{
+			// do not override
+			// TODO: add parameter to request overriding
+			return;
+		}
+		$postopts = $arr['postopts'];
+	}
+	else
+	{
+		$postopts = "";
+	}
+
+	require_once('library/langdet/Text/LanguageDetect.php');
+	$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
+	$l = new Text_LanguageDetect;
+	//$lng = $l->detectConfidence($naked_body);
+	//$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+	$lng = $l->detect($naked_body, 3);
+
+	if (sizeof($lng) > 0) {
+		if ($postopts) $postopts .= '^'; // arbitrary separator, to be reviewed
+		$postopts .= 'lang=';
+		$sep = "";
+		foreach ($lng as $language => $score) {
+			$postopts .= $sep . $language.";".$score;
+			$sep = ':';
+		}
+		$arr['postopts'] = $postopts;
+	}
+}
+
 function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
 
 	// If it is a posting where users should get notifications, then define it as wall posting
@@ -1185,29 +1227,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	//if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
 	//	$arr['body'] = strip_tags($arr['body']);
 
-
-	if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-		require_once('library/langdet/Text/LanguageDetect.php');
-		$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
-		$l = new Text_LanguageDetect;
-		//$lng = $l->detectConfidence($naked_body);
-		//$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
-		$lng = $l->detect($naked_body, 3);
-
-		if (sizeof($lng) > 0) {
-			$postopts = "";
-
-			foreach ($lng as $language => $score) {
-				if ($postopts == "")
-					$postopts = "lang=";
-				else
-					$postopts .= ":";
-
-				$postopts .= $language.";".$score;
-			}
-			$arr['postopts'] = $postopts;
-		}
-	}
+	item_add_language_opt($arr);
 
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $arr['network']));
diff --git a/mod/item.php b/mod/item.php
index d203ce64d..91a94974e 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -18,7 +18,6 @@
 require_once('include/crypto.php');
 require_once('include/enotify.php');
 require_once('include/email.php');
-require_once('library/langdet/Text/LanguageDetect.php');
 require_once('include/tags.php');
 require_once('include/files.php');
 require_once('include/threads.php');
@@ -268,32 +267,8 @@ function item_post(&$a) {
 		$guid              = get_guid(32);
 
 
-		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
-
-		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-			$l = new Text_LanguageDetect;
-			//$lng = $l->detectConfidence($naked_body);
-			//$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
-
-			$lng = $l->detect($naked_body, 3);
-
-			if (sizeof($lng) > 0) {
-				$postopts = "";
-
-				foreach ($lng as $language => $score) {
-					if ($postopts == "")
-						$postopts = "lang=";
-					else
-						$postopts .= ":";
-
-					$postopts .= $language.";".$score;
-				}
-			}
-
-			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
-		}
-		else
-			$postopts = '';
+		item_add_language_opt($_REQUEST);
+		$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
 
 
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);

From 741b82ccab71e179bd5522391736cf26117fe014 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 23 Sep 2015 11:11:12 +0200
Subject: [PATCH 17/22] Use x() function to check for array containement (I
 think)

this is response to @fabrixxxm comment
---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 667353d32..4c41ae115 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1104,7 +1104,7 @@ function item_add_language_opt(&$arr) {
 
 	if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ?
 
-	if ( $arr['postopts'] )
+	if ( x($arr, 'postopts') )
 	{
 		if ( strstr($arr['postopts'], 'lang=') )
 		{

From e9f001aa5d45bb928af9332f1d24cb54bf9fdb86 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 23 Sep 2015 11:39:36 +0200
Subject: [PATCH 18/22] Use ampersend to separate postopts, and explicit test
 for empty string

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

diff --git a/include/items.php b/include/items.php
index 4c41ae115..40409bb89 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1127,7 +1127,7 @@ function item_add_language_opt(&$arr) {
 	$lng = $l->detect($naked_body, 3);
 
 	if (sizeof($lng) > 0) {
-		if ($postopts) $postopts .= '^'; // arbitrary separator, to be reviewed
+		if ($postopts != "") $postopts .= '&'; // arbitrary separator, to be reviewed
 		$postopts .= 'lang=';
 		$sep = "";
 		foreach ($lng as $language => $score) {

From 28df4b2cd0540801ad8570b17bbc1bcdf1d9f2ee Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 24 Sep 2015 22:09:39 +0200
Subject: [PATCH 19/22] PL update to the strings

---
 view/pl/messages.po | 4769 ++++++++++++++++++++++---------------------
 view/pl/strings.php |  257 ++-
 2 files changed, 2639 insertions(+), 2387 deletions(-)

diff --git a/view/pl/messages.po b/view/pl/messages.po
index 0781d120e..2507352a9 100644
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Adam Jurkiewicz <a.jurkiewicz@abix.info.pl>, 2012
-# julia.domagalska <braknazwy@autograf.pl>, 2013
+# julia.domagalska <braknazwy@autograf.pl>, 2013,2015
 # julia.domagalska <braknazwy@autograf.pl>, 2012-2013
 # Daria Początek <charizard@autograf.pl>, 2012
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
@@ -36,17 +36,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-09 08:57+0100\n"
-"PO-Revision-Date: 2015-02-09 09:46+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
+"POT-Creation-Date: 2015-09-01 07:09+0200\n"
+"PO-Revision-Date: 2015-09-24 16:15+0000\n"
+"Last-Translator: julia.domagalska <braknazwy@autograf.pl>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../../mod/contacts.php:108
+#: mod/contacts.php:114
 #, php-format
 msgid "%d contact edited."
 msgid_plural "%d contacts edited"
@@ -54,144 +54,136 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../mod/contacts.php:139 ../../mod/contacts.php:272
+#: mod/contacts.php:145 mod/contacts.php:340
 msgid "Could not access contact record."
 msgstr "Nie można uzyskać dostępu do rejestru kontaktów."
 
-#: ../../mod/contacts.php:153
+#: mod/contacts.php:159
 msgid "Could not locate selected profile."
 msgstr "Nie można znaleźć wybranego profilu."
 
-#: ../../mod/contacts.php:186
+#: mod/contacts.php:192
 msgid "Contact updated."
 msgstr "Kontakt zaktualizowany"
 
-#: ../../mod/contacts.php:188 ../../mod/dfrn_request.php:576
+#: mod/contacts.php:194 mod/dfrn_request.php:576
 msgid "Failed to update contact record."
 msgstr "Aktualizacja nagrania kontaktu nie powiodła się."
 
-#: ../../mod/contacts.php:254 ../../mod/manage.php:96
-#: ../../mod/display.php:499 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
-#: ../../mod/profile_photo.php:193 ../../mod/follow.php:9
-#: ../../mod/item.php:168 ../../mod/item.php:184 ../../mod/group.php:19
-#: ../../mod/dfrn_confirm.php:55 ../../mod/fsuggest.php:78
-#: ../../mod/wall_upload.php:66 ../../mod/viewcontacts.php:24
-#: ../../mod/notifications.php:66 ../../mod/message.php:38
-#: ../../mod/message.php:174 ../../mod/crepair.php:119
-#: ../../mod/nogroup.php:25 ../../mod/network.php:4 ../../mod/allfriends.php:9
-#: ../../mod/events.php:140 ../../mod/install.php:151
-#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
-#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
-#: ../../mod/wall_attach.php:55 ../../mod/settings.php:102
-#: ../../mod/settings.php:596 ../../mod/settings.php:601
-#: ../../mod/register.php:42 ../../mod/delegate.php:12 ../../mod/mood.php:114
-#: ../../mod/suggest.php:58 ../../mod/profiles.php:165
-#: ../../mod/profiles.php:618 ../../mod/editpost.php:10 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/notes.php:20 ../../mod/poke.php:135
-#: ../../mod/invite.php:15 ../../mod/invite.php:101 ../../mod/photos.php:134
-#: ../../mod/photos.php:1050 ../../mod/regmod.php:110 ../../mod/uimport.php:23
-#: ../../mod/attach.php:33 ../../include/items.php:4712 ../../index.php:369
+#: mod/contacts.php:322 mod/manage.php:96 mod/display.php:508
+#: mod/profile_photo.php:19 mod/profile_photo.php:169
+#: mod/profile_photo.php:180 mod/profile_photo.php:193 mod/follow.php:9
+#: mod/follow.php:44 mod/follow.php:83 mod/item.php:170 mod/item.php:186
+#: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78
+#: mod/wall_upload.php:70 mod/wall_upload.php:71 mod/viewcontacts.php:24
+#: mod/notifications.php:66 mod/message.php:39 mod/message.php:175
+#: mod/crepair.php:120 mod/nogroup.php:25 mod/network.php:4
+#: mod/allfriends.php:9 mod/events.php:164 mod/wallmessage.php:9
+#: mod/wallmessage.php:33 mod/wallmessage.php:79 mod/wallmessage.php:103
+#: mod/wall_attach.php:60 mod/wall_attach.php:61 mod/settings.php:20
+#: mod/settings.php:116 mod/settings.php:619 mod/register.php:42
+#: mod/delegate.php:12 mod/mood.php:114 mod/suggest.php:58
+#: mod/profiles.php:165 mod/profiles.php:615 mod/editpost.php:10
+#: mod/api.php:26 mod/api.php:31 mod/notes.php:20 mod/poke.php:135
+#: mod/invite.php:15 mod/invite.php:101 mod/photos.php:156 mod/photos.php:1072
+#: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33
+#: include/items.php:5023 index.php:382
 msgid "Permission denied."
 msgstr "Brak uprawnień."
 
-#: ../../mod/contacts.php:287
+#: mod/contacts.php:361
 msgid "Contact has been blocked"
 msgstr "Kontakt został zablokowany"
 
-#: ../../mod/contacts.php:287
+#: mod/contacts.php:361
 msgid "Contact has been unblocked"
 msgstr "Kontakt został odblokowany"
 
-#: ../../mod/contacts.php:298
+#: mod/contacts.php:372
 msgid "Contact has been ignored"
 msgstr "Kontakt jest ignorowany"
 
-#: ../../mod/contacts.php:298
+#: mod/contacts.php:372
 msgid "Contact has been unignored"
 msgstr "Kontakt nie jest ignorowany"
 
-#: ../../mod/contacts.php:310
+#: mod/contacts.php:384
 msgid "Contact has been archived"
 msgstr "Kontakt został zarchiwizowany"
 
-#: ../../mod/contacts.php:310
+#: mod/contacts.php:384
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:335 ../../mod/contacts.php:711
+#: mod/contacts.php:411 mod/contacts.php:767
 msgid "Do you really want to delete this contact?"
 msgstr "Czy na pewno chcesz usunąć ten kontakt?"
 
-#: ../../mod/contacts.php:337 ../../mod/message.php:209
-#: ../../mod/settings.php:1010 ../../mod/settings.php:1016
-#: ../../mod/settings.php:1024 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1033 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1045 ../../mod/settings.php:1051
-#: ../../mod/settings.php:1081 ../../mod/settings.php:1082
-#: ../../mod/settings.php:1083 ../../mod/settings.php:1084
-#: ../../mod/settings.php:1085 ../../mod/dfrn_request.php:830
-#: ../../mod/register.php:233 ../../mod/suggest.php:29
-#: ../../mod/profiles.php:661 ../../mod/profiles.php:664 ../../mod/api.php:105
-#: ../../include/items.php:4557
+#: mod/contacts.php:413 mod/follow.php:59 mod/message.php:210
+#: mod/settings.php:1066 mod/settings.php:1072 mod/settings.php:1080
+#: mod/settings.php:1084 mod/settings.php:1089 mod/settings.php:1095
+#: mod/settings.php:1101 mod/settings.php:1107 mod/settings.php:1133
+#: mod/settings.php:1134 mod/settings.php:1135 mod/settings.php:1136
+#: mod/settings.php:1137 mod/dfrn_request.php:848 mod/register.php:235
+#: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661
+#: mod/api.php:105 include/items.php:4855
 msgid "Yes"
 msgstr "Tak"
 
-#: ../../mod/contacts.php:340 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/message.php:212 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/settings.php:615
-#: ../../mod/settings.php:641 ../../mod/dfrn_request.php:844
-#: ../../mod/suggest.php:32 ../../mod/editpost.php:148
-#: ../../mod/photos.php:203 ../../mod/photos.php:292
-#: ../../include/conversation.php:1129 ../../include/items.php:4560
+#: mod/contacts.php:416 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:70
+#: mod/videos.php:121 mod/message.php:213 mod/fbrowser.php:89
+#: mod/fbrowser.php:125 mod/settings.php:633 mod/settings.php:659
+#: mod/dfrn_request.php:862 mod/suggest.php:32 mod/editpost.php:148
+#: mod/photos.php:225 mod/photos.php:314 include/conversation.php:1093
+#: include/items.php:4858
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../../mod/contacts.php:352
+#: mod/contacts.php:428
 msgid "Contact has been removed."
 msgstr "Kontakt został usunięty."
 
-#: ../../mod/contacts.php:390
+#: mod/contacts.php:466
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Jesteś już znajomym z %s"
 
-#: ../../mod/contacts.php:394
+#: mod/contacts.php:470
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Współdzielisz z %s"
 
-#: ../../mod/contacts.php:399
+#: mod/contacts.php:475
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s współdzieli z tobą"
 
-#: ../../mod/contacts.php:416
+#: mod/contacts.php:495
 msgid "Private communications are not available for this contact."
 msgstr "Prywatna rozmowa jest niemożliwa dla tego kontaktu"
 
-#: ../../mod/contacts.php:419 ../../mod/admin.php:569
+#: mod/contacts.php:498 mod/admin.php:618
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../../mod/contacts.php:423
+#: mod/contacts.php:502
 msgid "(Update was successful)"
 msgstr "(Aktualizacja przebiegła pomyślnie)"
 
-#: ../../mod/contacts.php:423
+#: mod/contacts.php:502
 msgid "(Update was not successful)"
 msgstr "(Aktualizacja nie powiodła się)"
 
-#: ../../mod/contacts.php:425
+#: mod/contacts.php:504
 msgid "Suggest friends"
 msgstr "Osoby, które możesz znać"
 
-#: ../../mod/contacts.php:429
+#: mod/contacts.php:508
 #, php-format
 msgid "Network type: %s"
 msgstr "Typ sieci: %s"
 
-#: ../../mod/contacts.php:432 ../../include/contact_widgets.php:200
+#: mod/contacts.php:511 include/contact_widgets.php:200
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
@@ -199,383 +191,376 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../mod/contacts.php:437
+#: mod/contacts.php:516
 msgid "View all contacts"
 msgstr "Zobacz wszystkie kontakty"
 
-#: ../../mod/contacts.php:442 ../../mod/contacts.php:501
-#: ../../mod/contacts.php:714 ../../mod/admin.php:1009
+#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770
+#: mod/admin.php:1083
 msgid "Unblock"
 msgstr "Odblokuj"
 
-#: ../../mod/contacts.php:442 ../../mod/contacts.php:501
-#: ../../mod/contacts.php:714 ../../mod/admin.php:1008
+#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770
+#: mod/admin.php:1082
 msgid "Block"
 msgstr "Zablokuj"
 
-#: ../../mod/contacts.php:445
+#: mod/contacts.php:524
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:448 ../../mod/contacts.php:502
-#: ../../mod/contacts.php:715
+#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771
 msgid "Unignore"
 msgstr "Odblokuj"
 
-#: ../../mod/contacts.php:448 ../../mod/contacts.php:502
-#: ../../mod/contacts.php:715 ../../mod/notifications.php:51
-#: ../../mod/notifications.php:164 ../../mod/notifications.php:210
+#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771
+#: mod/notifications.php:51 mod/notifications.php:174
+#: mod/notifications.php:233
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../../mod/contacts.php:451
+#: mod/contacts.php:531
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
+#: mod/contacts.php:536 mod/contacts.php:772
 msgid "Unarchive"
 msgstr "Przywróć z archiwum"
 
-#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
+#: mod/contacts.php:536 mod/contacts.php:772
 msgid "Archive"
 msgstr "Archiwum"
 
-#: ../../mod/contacts.php:458
+#: mod/contacts.php:539
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:461
+#: mod/contacts.php:543
 msgid "Repair"
 msgstr "Napraw"
 
-#: ../../mod/contacts.php:464
+#: mod/contacts.php:546
 msgid "Advanced Contact Settings"
 msgstr "Zaawansowane ustawienia kontaktów"
 
-#: ../../mod/contacts.php:470
+#: mod/contacts.php:553
 msgid "Communications lost with this contact!"
 msgstr "Komunikacja przerwana z tym kontaktem!"
 
-#: ../../mod/contacts.php:473
+#: mod/contacts.php:556
+msgid "Fetch further information for feeds"
+msgstr ""
+
+#: mod/contacts.php:557 mod/admin.php:627
+msgid "Disabled"
+msgstr ""
+
+#: mod/contacts.php:557
+msgid "Fetch information"
+msgstr ""
+
+#: mod/contacts.php:557
+msgid "Fetch information and keywords"
+msgstr ""
+
+#: mod/contacts.php:566
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
-#: ../../mod/contacts.php:475 ../../mod/manage.php:110
-#: ../../mod/fsuggest.php:107 ../../mod/message.php:335
-#: ../../mod/message.php:564 ../../mod/crepair.php:186
-#: ../../mod/events.php:478 ../../mod/content.php:710
-#: ../../mod/install.php:248 ../../mod/install.php:286 ../../mod/mood.php:137
-#: ../../mod/profiles.php:686 ../../mod/localtime.php:45
-#: ../../mod/poke.php:199 ../../mod/invite.php:140 ../../mod/photos.php:1084
-#: ../../mod/photos.php:1203 ../../mod/photos.php:1514
-#: ../../mod/photos.php:1565 ../../mod/photos.php:1609
-#: ../../mod/photos.php:1697 ../../object/Item.php:678
-#: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/dispy/config.php:70 ../../view/theme/quattro/config.php:64
-#: ../../view/theme/diabook/config.php:148
-#: ../../view/theme/diabook/theme.php:633 ../../view/theme/vier/config.php:53
-#: ../../view/theme/duepuntozero/config.php:59
+#: mod/contacts.php:568 mod/manage.php:110 mod/fsuggest.php:107
+#: mod/message.php:336 mod/message.php:565 mod/crepair.php:191
+#: mod/events.php:511 mod/content.php:712 mod/install.php:250
+#: mod/install.php:288 mod/mood.php:137 mod/profiles.php:683
+#: mod/localtime.php:45 mod/poke.php:199 mod/invite.php:140
+#: mod/photos.php:1104 mod/photos.php:1223 mod/photos.php:1533
+#: mod/photos.php:1584 mod/photos.php:1628 mod/photos.php:1716
+#: object/Item.php:680 view/theme/cleanzero/config.php:80
+#: view/theme/dispy/config.php:70 view/theme/quattro/config.php:64
+#: view/theme/diabook/config.php:148 view/theme/diabook/theme.php:633
+#: view/theme/vier/config.php:56 view/theme/duepuntozero/config.php:59
 msgid "Submit"
 msgstr "Potwierdź"
 
-#: ../../mod/contacts.php:476
+#: mod/contacts.php:569
 msgid "Profile Visibility"
 msgstr "Widoczność profilu"
 
-#: ../../mod/contacts.php:477
+#: mod/contacts.php:570
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Wybierz profil, który chcesz bezpiecznie wyświetlić %s"
 
-#: ../../mod/contacts.php:478
+#: mod/contacts.php:571
 msgid "Contact Information / Notes"
 msgstr "Informacja o kontakcie / Notka"
 
-#: ../../mod/contacts.php:479
+#: mod/contacts.php:572
 msgid "Edit contact notes"
 msgstr "Edytuj notatki kontaktu"
 
-#: ../../mod/contacts.php:484 ../../mod/contacts.php:679
-#: ../../mod/viewcontacts.php:64 ../../mod/nogroup.php:40
+#: mod/contacts.php:577 mod/contacts.php:810 mod/viewcontacts.php:64
+#: mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Obejrzyj %s's profil [%s]"
 
-#: ../../mod/contacts.php:485
+#: mod/contacts.php:578
 msgid "Block/Unblock contact"
 msgstr "Zablokuj/odblokuj kontakt"
 
-#: ../../mod/contacts.php:486
+#: mod/contacts.php:579
 msgid "Ignore contact"
 msgstr "Ignoruj kontakt"
 
-#: ../../mod/contacts.php:487
+#: mod/contacts.php:580
 msgid "Repair URL settings"
 msgstr "Napraw ustawienia adresu"
 
-#: ../../mod/contacts.php:488
+#: mod/contacts.php:581
 msgid "View conversations"
 msgstr "Zobacz rozmowę"
 
-#: ../../mod/contacts.php:490
+#: mod/contacts.php:583
 msgid "Delete contact"
 msgstr "Usuń kontakt"
 
-#: ../../mod/contacts.php:494
+#: mod/contacts.php:587
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../../mod/contacts.php:496
+#: mod/contacts.php:589
 msgid "Update public posts"
 msgstr "Zaktualizuj publiczne posty"
 
-#: ../../mod/contacts.php:498 ../../mod/admin.php:1503
+#: mod/contacts.php:591 mod/admin.php:1584
 msgid "Update now"
 msgstr "Aktualizuj teraz"
 
-#: ../../mod/contacts.php:505
+#: mod/contacts.php:598
 msgid "Currently blocked"
 msgstr "Obecnie zablokowany"
 
-#: ../../mod/contacts.php:506
+#: mod/contacts.php:599
 msgid "Currently ignored"
 msgstr "Obecnie zignorowany"
 
-#: ../../mod/contacts.php:507
+#: mod/contacts.php:600
 msgid "Currently archived"
 msgstr "Obecnie zarchiwizowany"
 
-#: ../../mod/contacts.php:508 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:204
+#: mod/contacts.php:601 mod/notifications.php:167 mod/notifications.php:227
 msgid "Hide this contact from others"
 msgstr "Ukryj ten kontakt przed innymi"
 
-#: ../../mod/contacts.php:508
+#: mod/contacts.php:601
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne"
 
-#: ../../mod/contacts.php:509
+#: mod/contacts.php:602
 msgid "Notification for new posts"
 msgstr ""
 
-#: ../../mod/contacts.php:509
+#: mod/contacts.php:602
 msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:510
-msgid "Fetch further information for feeds"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Disabled"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Fetch information"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Fetch information and keywords"
-msgstr ""
-
-#: ../../mod/contacts.php:513
+#: mod/contacts.php:605
 msgid "Blacklisted keywords"
 msgstr ""
 
-#: ../../mod/contacts.php:513
+#: mod/contacts.php:605
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: ../../mod/contacts.php:564
+#: mod/contacts.php:612
+msgid "Profile URL"
+msgstr ""
+
+#: mod/contacts.php:658
 msgid "Suggestions"
 msgstr "Sugestie"
 
-#: ../../mod/contacts.php:567
+#: mod/contacts.php:661
 msgid "Suggest potential friends"
 msgstr "Sugerowani znajomi"
 
-#: ../../mod/contacts.php:570 ../../mod/group.php:194
+#: mod/contacts.php:665 mod/group.php:192
 msgid "All Contacts"
 msgstr "Wszystkie kontakty"
 
-#: ../../mod/contacts.php:573
+#: mod/contacts.php:668
 msgid "Show all contacts"
 msgstr "Pokaż wszystkie kontakty"
 
-#: ../../mod/contacts.php:576
+#: mod/contacts.php:672
 msgid "Unblocked"
 msgstr "Odblokowany"
 
-#: ../../mod/contacts.php:579
+#: mod/contacts.php:675
 msgid "Only show unblocked contacts"
 msgstr "Pokaż tylko odblokowane kontakty"
 
-#: ../../mod/contacts.php:583
+#: mod/contacts.php:680
 msgid "Blocked"
 msgstr "Zablokowany"
 
-#: ../../mod/contacts.php:586
+#: mod/contacts.php:683
 msgid "Only show blocked contacts"
 msgstr "Pokaż tylko zablokowane kontakty"
 
-#: ../../mod/contacts.php:590
+#: mod/contacts.php:688
 msgid "Ignored"
 msgstr "Zignorowany"
 
-#: ../../mod/contacts.php:593
+#: mod/contacts.php:691
 msgid "Only show ignored contacts"
 msgstr "Pokaż tylko ignorowane kontakty"
 
-#: ../../mod/contacts.php:597
+#: mod/contacts.php:696
 msgid "Archived"
 msgstr "Zarchiwizowane"
 
-#: ../../mod/contacts.php:600
+#: mod/contacts.php:699
 msgid "Only show archived contacts"
 msgstr "Pokaż tylko zarchiwizowane kontakty"
 
-#: ../../mod/contacts.php:604
+#: mod/contacts.php:704
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: ../../mod/contacts.php:607
+#: mod/contacts.php:707
 msgid "Only show hidden contacts"
 msgstr "Pokaż tylko ukryte kontakty"
 
-#: ../../mod/contacts.php:655
-msgid "Mutual Friendship"
-msgstr "Wzajemna przyjaźń"
-
-#: ../../mod/contacts.php:659
-msgid "is a fan of yours"
-msgstr "jest twoim fanem"
-
-#: ../../mod/contacts.php:663
-msgid "you are a fan of"
-msgstr "jesteś fanem"
-
-#: ../../mod/contacts.php:680 ../../mod/nogroup.php:41
-msgid "Edit contact"
-msgstr "Edytuj kontakt"
-
-#: ../../mod/contacts.php:702 ../../include/nav.php:177
-#: ../../view/theme/diabook/theme.php:125
+#: mod/contacts.php:758 include/text.php:1005 include/nav.php:124
+#: include/nav.php:186 view/theme/diabook/theme.php:125
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ../../mod/contacts.php:706
+#: mod/contacts.php:762
 msgid "Search your contacts"
 msgstr "Wyszukaj w kontaktach"
 
-#: ../../mod/contacts.php:707 ../../mod/directory.php:61
+#: mod/contacts.php:763 mod/directory.php:63
 msgid "Finding: "
 msgstr "Znalezione:"
 
-#: ../../mod/contacts.php:708 ../../mod/directory.php:63
-#: ../../include/contact_widgets.php:34
+#: mod/contacts.php:764 mod/directory.php:65 include/contact_widgets.php:34
 msgid "Find"
 msgstr "Znajdź"
 
-#: ../../mod/contacts.php:713 ../../mod/settings.php:132
-#: ../../mod/settings.php:640
+#: mod/contacts.php:769 mod/settings.php:146 mod/settings.php:658
 msgid "Update"
 msgstr "Zaktualizuj"
 
-#: ../../mod/contacts.php:717 ../../mod/group.php:171 ../../mod/admin.php:1007
-#: ../../mod/content.php:438 ../../mod/content.php:741
-#: ../../mod/settings.php:677 ../../mod/photos.php:1654
-#: ../../object/Item.php:130 ../../include/conversation.php:614
+#: mod/contacts.php:773 mod/group.php:171 mod/admin.php:1081
+#: mod/content.php:440 mod/content.php:743 mod/settings.php:695
+#: mod/photos.php:1673 object/Item.php:131 include/conversation.php:613
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../../mod/hcard.php:10
+#: mod/contacts.php:786
+msgid "Mutual Friendship"
+msgstr "Wzajemna przyjaźń"
+
+#: mod/contacts.php:790
+msgid "is a fan of yours"
+msgstr "jest twoim fanem"
+
+#: mod/contacts.php:794
+msgid "you are a fan of"
+msgstr "jesteś fanem"
+
+#: mod/contacts.php:811 mod/nogroup.php:41
+msgid "Edit contact"
+msgstr "Edytuj kontakt"
+
+#: mod/hcard.php:10
 msgid "No profile"
 msgstr "Brak profilu"
 
-#: ../../mod/manage.php:106
+#: mod/manage.php:106
 msgid "Manage Identities and/or Pages"
 msgstr "Zarządzaj Tożsamościami i/lub Stronami."
 
-#: ../../mod/manage.php:107
+#: mod/manage.php:107
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/manage.php:108
+#: mod/manage.php:108
 msgid "Select an identity to manage: "
 msgstr "Wybierz tożsamość do zarządzania:"
 
-#: ../../mod/oexchange.php:25
+#: mod/oexchange.php:25
 msgid "Post successful."
 msgstr "Post dodany pomyślnie"
 
-#: ../../mod/profperm.php:19 ../../mod/group.php:72 ../../index.php:368
+#: mod/profperm.php:19 mod/group.php:72 index.php:381
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+#: mod/profperm.php:25 mod/profperm.php:56
 msgid "Invalid profile identifier."
 msgstr "Nieprawidłowa nazwa użytkownika."
 
-#: ../../mod/profperm.php:101
+#: mod/profperm.php:102
 msgid "Profile Visibility Editor"
 msgstr "Ustawienia widoczności profilu"
 
-#: ../../mod/profperm.php:103 ../../mod/newmember.php:32 ../../boot.php:2119
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:87
-#: ../../include/nav.php:77 ../../view/theme/diabook/theme.php:124
+#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:529
+#: include/identity.php:610 include/identity.php:640 include/nav.php:77
+#: view/theme/diabook/theme.php:124
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../mod/profperm.php:105 ../../mod/group.php:224
+#: mod/profperm.php:106 mod/group.php:222
 msgid "Click on a contact to add or remove."
 msgstr "Kliknij na kontakt w celu dodania lub usunięcia."
 
-#: ../../mod/profperm.php:114
+#: mod/profperm.php:115
 msgid "Visible To"
 msgstr "Widoczne dla"
 
-#: ../../mod/profperm.php:130
+#: mod/profperm.php:131
 msgid "All Contacts (with secure profile access)"
 msgstr "Wszystkie kontakty (z bezpiecznym dostępem do profilu)"
 
-#: ../../mod/display.php:82 ../../mod/display.php:284
-#: ../../mod/display.php:503 ../../mod/viewsrc.php:15 ../../mod/admin.php:169
-#: ../../mod/admin.php:1052 ../../mod/admin.php:1265 ../../mod/notice.php:15
-#: ../../include/items.php:4516
+#: mod/display.php:82 mod/display.php:295 mod/display.php:512
+#: mod/viewsrc.php:15 mod/admin.php:173 mod/admin.php:1126 mod/admin.php:1346
+#: mod/notice.php:15 include/items.php:4814
 msgid "Item not found."
 msgstr "Element nie znaleziony."
 
-#: ../../mod/display.php:212 ../../mod/videos.php:115
-#: ../../mod/viewcontacts.php:19 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:762 ../../mod/search.php:89
-#: ../../mod/directory.php:33 ../../mod/photos.php:920
+#: mod/display.php:223 mod/videos.php:187 mod/viewcontacts.php:19
+#: mod/community.php:18 mod/dfrn_request.php:777 mod/search.php:93
+#: mod/directory.php:35 mod/photos.php:942
 msgid "Public access denied."
 msgstr "Publiczny dostęp zabroniony"
 
-#: ../../mod/display.php:332 ../../mod/profile.php:155
+#: mod/display.php:343 mod/profile.php:155
 msgid "Access to this profile has been restricted."
 msgstr "Ograniczony dostęp do tego konta"
 
-#: ../../mod/display.php:496
+#: mod/display.php:505
 msgid "Item has been removed."
 msgstr "Przedmiot został usunięty"
 
-#: ../../mod/newmember.php:6
+#: mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr "Witamy na Friendica"
 
-#: ../../mod/newmember.php:8
+#: mod/newmember.php:8
 msgid "New Member Checklist"
 msgstr "Lista nowych członków"
 
-#: ../../mod/newmember.php:12
+#: mod/newmember.php:12
 msgid ""
 "We would like to offer some tips and links to help make your experience "
 "enjoyable. Click any item to visit the relevant page. A link to this page "
@@ -583,40 +568,39 @@ msgid ""
 "registration and then will quietly disappear."
 msgstr "Chcielibyśmy zaproponować kilka porad i linków, które pomogą uczynić twoje doświadczenie przyjemnym. Kliknij dowolny element, aby odwiedzić odpowiednią stronę. Link do tej strony będzie widoczny na stronie głównej przez dwa tygodnie od czasu rejestracji, a następnie zniknie."
 
-#: ../../mod/newmember.php:14
+#: mod/newmember.php:14
 msgid "Getting Started"
 msgstr "Pierwsze kroki"
 
-#: ../../mod/newmember.php:18
+#: mod/newmember.php:18
 msgid "Friendica Walk-Through"
 msgstr ""
 
-#: ../../mod/newmember.php:18
+#: mod/newmember.php:18
 msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to"
 " join."
 msgstr ""
 
-#: ../../mod/newmember.php:22 ../../mod/admin.php:1104
-#: ../../mod/admin.php:1325 ../../mod/settings.php:85
-#: ../../include/nav.php:172 ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:648
+#: mod/newmember.php:22 mod/admin.php:1178 mod/admin.php:1406
+#: mod/settings.php:99 include/nav.php:181 view/theme/diabook/theme.php:544
+#: view/theme/diabook/theme.php:648
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../../mod/newmember.php:26
+#: mod/newmember.php:26
 msgid "Go to Your Settings"
 msgstr "Idź do swoich ustawień"
 
-#: ../../mod/newmember.php:26
+#: mod/newmember.php:26
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:28
+#: mod/newmember.php:28
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished"
 " directory listing is like having an unlisted phone number. In general, you "
@@ -624,99 +608,97 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
-#: ../../mod/profiles.php:699
+#: mod/newmember.php:36 mod/profile_photo.php:244 mod/profiles.php:696
 msgid "Upload Profile Photo"
 msgstr "Wyślij zdjęcie profilowe"
 
-#: ../../mod/newmember.php:36
+#: mod/newmember.php:36
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
 msgstr "Dodaj swoje zdjęcie profilowe jeśli jeszcze tego nie zrobiłeś. Twoje szanse na zwiększenie liczby znajomych rosną dziesięciokrotnie, kiedy na tym zdjęciu jesteś ty."
 
-#: ../../mod/newmember.php:38
+#: mod/newmember.php:38
 msgid "Edit Your Profile"
 msgstr "Edytuj własny profil"
 
-#: ../../mod/newmember.php:38
+#: mod/newmember.php:38
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: mod/newmember.php:40
 msgid "Profile Keywords"
 msgstr "Słowa kluczowe profilu"
 
-#: ../../mod/newmember.php:40
+#: mod/newmember.php:40
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:44
+#: mod/newmember.php:44
 msgid "Connecting"
 msgstr "Łączę się..."
 
-#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../include/contact_selectors.php:81
+#: mod/newmember.php:49 mod/newmember.php:51 include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../mod/newmember.php:49
+#: mod/newmember.php:49
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php:51
+#: mod/newmember.php:51
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:56
+#: mod/newmember.php:56
 msgid "Importing Emails"
 msgstr "Importuję emaile..."
 
-#: ../../mod/newmember.php:56
+#: mod/newmember.php:56
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 
-#: ../../mod/newmember.php:58
+#: mod/newmember.php:58
 msgid "Go to Your Contacts Page"
 msgstr "Idź do strony z Twoimi kontaktami"
 
-#: ../../mod/newmember.php:58
+#: mod/newmember.php:58
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:60
+#: mod/newmember.php:60
 msgid "Go to Your Site's Directory"
 msgstr "Idż do twojej strony"
 
-#: ../../mod/newmember.php:60
+#: mod/newmember.php:60
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:62
+#: mod/newmember.php:62
 msgid "Finding New People"
 msgstr "Poszukiwanie Nowych Ludzi"
 
-#: ../../mod/newmember.php:62
+#: mod/newmember.php:62
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -725,456 +707,493 @@ msgid ""
 "hours."
 msgstr ""
 
-#: ../../mod/newmember.php:66 ../../include/group.php:270
+#: mod/newmember.php:66 include/group.php:270
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../../mod/newmember.php:70
+#: mod/newmember.php:70
 msgid "Group Your Contacts"
 msgstr "Grupuj Swoje kontakty"
 
-#: ../../mod/newmember.php:70
+#: mod/newmember.php:70
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:73
+#: mod/newmember.php:73
 msgid "Why Aren't My Posts Public?"
 msgstr "Dlaczego moje posty nie są publiczne?"
 
-#: ../../mod/newmember.php:73
+#: mod/newmember.php:73
 msgid ""
 "Friendica respects your privacy. By default, your posts will only show up to"
 " people you've added as friends. For more information, see the help section "
 "from the link above."
 msgstr ""
 
-#: ../../mod/newmember.php:78
+#: mod/newmember.php:78
 msgid "Getting Help"
 msgstr "Otrzymywanie pomocy"
 
-#: ../../mod/newmember.php:82
+#: mod/newmember.php:82
 msgid "Go to the Help Section"
 msgstr "Idź do części o pomocy"
 
-#: ../../mod/newmember.php:82
+#: mod/newmember.php:82
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
 msgstr ""
 
-#: ../../mod/openid.php:24
+#: mod/openid.php:24
 msgid "OpenID protocol error. No ID returned."
 msgstr "błąd OpenID . Brak zwróconego ID. "
 
-#: ../../mod/openid.php:53
+#: mod/openid.php:53
 msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nie znaleziono konta i OpenID rejestracja nie jest dopuszczalna na tej stronie."
 
-#: ../../mod/openid.php:93 ../../include/auth.php:112
-#: ../../include/auth.php:175
+#: mod/openid.php:93 include/auth.php:112 include/auth.php:175
 msgid "Login failed."
 msgstr "Niepowodzenie logowania"
 
-#: ../../mod/profile_photo.php:44
+#: mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
 msgstr "Obrazek załadowany, ale oprawanie powiodła się."
 
-#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:81
-#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:204
-#: ../../mod/profile_photo.php:296 ../../mod/profile_photo.php:305
-#: ../../mod/photos.php:155 ../../mod/photos.php:731 ../../mod/photos.php:1187
-#: ../../mod/photos.php:1210 ../../include/user.php:335
-#: ../../include/user.php:342 ../../include/user.php:349
-#: ../../view/theme/diabook/theme.php:500
+#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
+#: mod/profile_photo.php:204 mod/profile_photo.php:296
+#: mod/profile_photo.php:305 mod/photos.php:177 mod/photos.php:753
+#: mod/photos.php:1207 mod/photos.php:1230 include/user.php:343
+#: include/user.php:350 include/user.php:357 view/theme/diabook/theme.php:500
 msgid "Profile Photos"
 msgstr "Zdjęcia profilowe"
 
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
-#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
+#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
+#: mod/profile_photo.php:308
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Redukcja rozmiaru obrazka [%s] nie powiodła się."
 
-#: ../../mod/profile_photo.php:118
+#: mod/profile_photo.php:118
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../mod/profile_photo.php:128
+#: mod/profile_photo.php:128
 msgid "Unable to process image"
 msgstr "Nie udało się przetworzyć obrazu."
 
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:122
+#: mod/profile_photo.php:144 mod/wall_upload.php:137 mod/photos.php:789
 #, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "Rozmiar obrazka przekracza limit %d"
+msgid "Image exceeds size limit of %s"
+msgstr ""
 
-#: ../../mod/profile_photo.php:153 ../../mod/wall_upload.php:144
-#: ../../mod/photos.php:807
+#: mod/profile_photo.php:153 mod/wall_upload.php:169 mod/photos.php:829
 msgid "Unable to process image."
 msgstr "Przetwarzanie obrazu nie powiodło się."
 
-#: ../../mod/profile_photo.php:242
+#: mod/profile_photo.php:242
 msgid "Upload File:"
 msgstr "Wyślij plik:"
 
-#: ../../mod/profile_photo.php:243
+#: mod/profile_photo.php:243
 msgid "Select a profile:"
 msgstr "Wybierz profil:"
 
-#: ../../mod/profile_photo.php:245
+#: mod/profile_photo.php:245
 msgid "Upload"
 msgstr "Załaduj"
 
-#: ../../mod/profile_photo.php:248 ../../mod/settings.php:1062
+#: mod/profile_photo.php:248
 msgid "or"
 msgstr "lub"
 
-#: ../../mod/profile_photo.php:248
+#: mod/profile_photo.php:248
 msgid "skip this step"
 msgstr "Pomiń ten krok"
 
-#: ../../mod/profile_photo.php:248
+#: mod/profile_photo.php:248
 msgid "select a photo from your photo albums"
 msgstr "wybierz zdjęcie z twojego albumu"
 
-#: ../../mod/profile_photo.php:262
+#: mod/profile_photo.php:262
 msgid "Crop Image"
 msgstr "Przytnij zdjęcie"
 
-#: ../../mod/profile_photo.php:263
+#: mod/profile_photo.php:263
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Proszę dostosować oprawę obrazka w celu optymalizacji oglądania."
 
-#: ../../mod/profile_photo.php:265
+#: mod/profile_photo.php:265
 msgid "Done Editing"
 msgstr "Zakończ Edycję "
 
-#: ../../mod/profile_photo.php:299
+#: mod/profile_photo.php:299
 msgid "Image uploaded successfully."
 msgstr "Zdjęcie wczytano pomyślnie "
 
-#: ../../mod/profile_photo.php:301 ../../mod/wall_upload.php:172
-#: ../../mod/photos.php:834
+#: mod/profile_photo.php:301 mod/wall_upload.php:202 mod/photos.php:856
 msgid "Image upload failed."
 msgstr "Przesyłanie obrazu nie powiodło się"
 
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:149
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../include/text.php:1968 ../../include/diaspora.php:2087
-#: ../../view/theme/diabook/theme.php:471
+#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149
+#: include/conversation.php:126 include/conversation.php:253
+#: include/text.php:2034 include/diaspora.php:2127
+#: view/theme/diabook/theme.php:471
 msgid "photo"
 msgstr "zdjęcie"
 
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:149
-#: ../../mod/like.php:319 ../../include/conversation.php:121
-#: ../../include/conversation.php:130 ../../include/conversation.php:249
-#: ../../include/conversation.php:258 ../../include/diaspora.php:2087
-#: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475
+#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149 mod/like.php:319
+#: include/conversation.php:121 include/conversation.php:130
+#: include/conversation.php:248 include/conversation.php:257
+#: include/diaspora.php:2127 view/theme/diabook/theme.php:466
+#: view/theme/diabook/theme.php:475
 msgid "status"
 msgstr "status"
 
-#: ../../mod/subthread.php:103
+#: mod/subthread.php:103
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
+#: mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "Tag usunięty"
 
-#: ../../mod/tagrm.php:79
+#: mod/tagrm.php:79
 msgid "Remove Item Tag"
 msgstr "Usuń pozycję Tag"
 
-#: ../../mod/tagrm.php:81
+#: mod/tagrm.php:81
 msgid "Select a tag to remove: "
 msgstr "Wybierz tag do usunięcia"
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:139
+#: mod/tagrm.php:93 mod/delegate.php:139
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:1006
-#: ../../include/conversation.php:1024
+#: mod/filer.php:30 include/conversation.php:1005
+#: include/conversation.php:1023
 msgid "Save to Folder:"
 msgstr "Zapisz w folderze:"
 
-#: ../../mod/filer.php:30
+#: mod/filer.php:30
 msgid "- select -"
 msgstr "- wybierz -"
 
-#: ../../mod/filer.php:31 ../../mod/editpost.php:109 ../../mod/notes.php:63
-#: ../../include/text.php:956
+#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:59 include/text.php:997
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../../mod/follow.php:27
+#: mod/follow.php:26
+msgid "You already added this contact."
+msgstr ""
+
+#: mod/follow.php:58 mod/dfrn_request.php:847
+msgid "Please answer the following:"
+msgstr "Proszę odpowiedzieć na poniższe:"
+
+#: mod/follow.php:59 mod/dfrn_request.php:848
+#, php-format
+msgid "Does %s know you?"
+msgstr "Czy %s Cię zna?"
+
+#: mod/follow.php:59 mod/settings.php:1066 mod/settings.php:1072
+#: mod/settings.php:1080 mod/settings.php:1084 mod/settings.php:1089
+#: mod/settings.php:1095 mod/settings.php:1101 mod/settings.php:1107
+#: mod/settings.php:1133 mod/settings.php:1134 mod/settings.php:1135
+#: mod/settings.php:1136 mod/settings.php:1137 mod/dfrn_request.php:848
+#: mod/register.php:236 mod/profiles.php:658 mod/profiles.php:662
+#: mod/api.php:106
+msgid "No"
+msgstr "Nie"
+
+#: mod/follow.php:60 mod/dfrn_request.php:852
+msgid "Add a personal note:"
+msgstr "Dodaj osobistą notkę:"
+
+#: mod/follow.php:66 mod/dfrn_request.php:858
+msgid "Your Identity Address:"
+msgstr "Twój zidentyfikowany adres:"
+
+#: mod/follow.php:69 mod/dfrn_request.php:861
+msgid "Submit Request"
+msgstr "Wyślij zgłoszenie"
+
+#: mod/follow.php:108
 msgid "Contact added"
 msgstr "Kontakt dodany"
 
-#: ../../mod/item.php:113
+#: mod/item.php:115
 msgid "Unable to locate original post."
 msgstr "Nie można zlokalizować oryginalnej wiadomości."
 
-#: ../../mod/item.php:345
+#: mod/item.php:347
 msgid "Empty post discarded."
 msgstr "Pusty wpis wyrzucony."
 
-#: ../../mod/item.php:484 ../../mod/wall_upload.php:169
-#: ../../mod/wall_upload.php:178 ../../mod/wall_upload.php:185
-#: ../../include/Photo.php:916 ../../include/Photo.php:931
-#: ../../include/Photo.php:938 ../../include/Photo.php:960
-#: ../../include/message.php:144
+#: mod/item.php:486 mod/wall_upload.php:199 mod/wall_upload.php:213
+#: mod/wall_upload.php:220 include/Photo.php:951 include/Photo.php:966
+#: include/Photo.php:973 include/Photo.php:995 include/message.php:145
 msgid "Wall Photos"
 msgstr "Tablica zdjęć"
 
-#: ../../mod/item.php:938
+#: mod/item.php:860
 msgid "System error. Post not saved."
 msgstr "Błąd. Post niezapisany."
 
-#: ../../mod/item.php:964
+#: mod/item.php:989
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Wiadomość została wysłana do ciebie od %s , członka portalu Friendica"
 
-#: ../../mod/item.php:966
+#: mod/item.php:991
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Możesz ich odwiedzić online u %s"
 
-#: ../../mod/item.php:967
+#: mod/item.php:992
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Skontaktuj się z nadawcą odpowiadając na ten post jeśli nie chcesz otrzymywać tych wiadomości."
 
-#: ../../mod/item.php:971
+#: mod/item.php:996
 #, php-format
 msgid "%s posted an update."
 msgstr "%s zaktualizował wpis."
 
-#: ../../mod/group.php:29
+#: mod/group.php:29
 msgid "Group created."
 msgstr "Grupa utworzona."
 
-#: ../../mod/group.php:35
+#: mod/group.php:35
 msgid "Could not create group."
 msgstr "Nie mogę stworzyć grupy"
 
-#: ../../mod/group.php:47 ../../mod/group.php:140
+#: mod/group.php:47 mod/group.php:140
 msgid "Group not found."
 msgstr "Nie znaleziono grupy"
 
-#: ../../mod/group.php:60
+#: mod/group.php:60
 msgid "Group name changed."
 msgstr "Nazwa grupy zmieniona"
 
-#: ../../mod/group.php:87
+#: mod/group.php:87
 msgid "Save Group"
 msgstr ""
 
-#: ../../mod/group.php:93
+#: mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "Stwórz grupę znajomych."
 
-#: ../../mod/group.php:94 ../../mod/group.php:180
+#: mod/group.php:94 mod/group.php:178 include/group.php:273
 msgid "Group Name: "
 msgstr "Nazwa grupy: "
 
-#: ../../mod/group.php:113
+#: mod/group.php:113
 msgid "Group removed."
 msgstr "Grupa usunięta."
 
-#: ../../mod/group.php:115
+#: mod/group.php:115
 msgid "Unable to remove group."
 msgstr "Nie można usunąć grupy."
 
-#: ../../mod/group.php:179
+#: mod/group.php:177
 msgid "Group Editor"
 msgstr "Edytor grupy"
 
-#: ../../mod/group.php:192
+#: mod/group.php:190
 msgid "Members"
 msgstr "Członkowie"
 
-#: ../../mod/apps.php:7 ../../index.php:212
+#: mod/apps.php:7 index.php:225
 msgid "You must be logged in to use addons. "
 msgstr "Musisz się zalogować, aby móc używać dodatkowych wtyczek."
 
-#: ../../mod/apps.php:11
+#: mod/apps.php:11
 msgid "Applications"
 msgstr "Aplikacje"
 
-#: ../../mod/apps.php:14
+#: mod/apps.php:14
 msgid "No installed applications."
 msgstr "Brak zainstalowanych aplikacji."
 
-#: ../../mod/dfrn_confirm.php:64 ../../mod/profiles.php:18
-#: ../../mod/profiles.php:133 ../../mod/profiles.php:179
-#: ../../mod/profiles.php:630
+#: mod/dfrn_confirm.php:64 mod/profiles.php:18 mod/profiles.php:133
+#: mod/profiles.php:179 mod/profiles.php:627
 msgid "Profile not found."
 msgstr "Nie znaleziono profilu."
 
-#: ../../mod/dfrn_confirm.php:120 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/crepair.php:133
+#: mod/dfrn_confirm.php:120 mod/fsuggest.php:20 mod/fsuggest.php:92
+#: mod/crepair.php:134
 msgid "Contact not found."
 msgstr "Kontakt nie znaleziony"
 
-#: ../../mod/dfrn_confirm.php:121
+#: mod/dfrn_confirm.php:121
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:240
+#: mod/dfrn_confirm.php:240
 msgid "Response from remote site was not understood."
 msgstr "Odpowiedź do zdalnej strony nie została zrozumiana"
 
-#: ../../mod/dfrn_confirm.php:249 ../../mod/dfrn_confirm.php:254
+#: mod/dfrn_confirm.php:249 mod/dfrn_confirm.php:254
 msgid "Unexpected response from remote site: "
 msgstr "Nieoczekiwana odpowiedź od strony zdalnej"
 
-#: ../../mod/dfrn_confirm.php:263
+#: mod/dfrn_confirm.php:263
 msgid "Confirmation completed successfully."
 msgstr "Potwierdzenie ukończone poprawnie"
 
-#: ../../mod/dfrn_confirm.php:265 ../../mod/dfrn_confirm.php:279
-#: ../../mod/dfrn_confirm.php:286
+#: mod/dfrn_confirm.php:265 mod/dfrn_confirm.php:279 mod/dfrn_confirm.php:286
 msgid "Remote site reported: "
 msgstr "Zdalna strona zgłoszona:"
 
-#: ../../mod/dfrn_confirm.php:277
+#: mod/dfrn_confirm.php:277
 msgid "Temporary failure. Please wait and try again."
 msgstr "Tymczasowo uszkodzone. Proszę poczekać i spróbować później."
 
-#: ../../mod/dfrn_confirm.php:284
+#: mod/dfrn_confirm.php:284
 msgid "Introduction failed or was revoked."
 msgstr "Nieudane lub unieważnione wprowadzenie."
 
-#: ../../mod/dfrn_confirm.php:429
+#: mod/dfrn_confirm.php:430
 msgid "Unable to set contact photo."
 msgstr "Nie można ustawić zdjęcia kontaktu."
 
-#: ../../mod/dfrn_confirm.php:486 ../../include/conversation.php:172
-#: ../../include/diaspora.php:620
+#: mod/dfrn_confirm.php:487 include/conversation.php:172
+#: include/diaspora.php:634
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s jest teraz znajomym z %2$s"
 
-#: ../../mod/dfrn_confirm.php:571
+#: mod/dfrn_confirm.php:572
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Nie znaleziono użytkownika dla '%s'"
 
-#: ../../mod/dfrn_confirm.php:581
+#: mod/dfrn_confirm.php:582
 msgid "Our site encryption key is apparently messed up."
 msgstr "Klucz kodujący jest najwyraźniej zepsuty"
 
-#: ../../mod/dfrn_confirm.php:592
+#: mod/dfrn_confirm.php:593
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "Został dostarczony pusty URL lub nie może zostać rozszyfrowany przez nas."
 
-#: ../../mod/dfrn_confirm.php:613
+#: mod/dfrn_confirm.php:614
 msgid "Contact record was not found for you on our site."
 msgstr "Nie znaleziono kontaktu na naszej stronie"
 
-#: ../../mod/dfrn_confirm.php:627
+#: mod/dfrn_confirm.php:628
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:647
+#: mod/dfrn_confirm.php:648
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "ID dostarczone przez Twój system jest już w naszeym systemie. Powinno zadziałać jeżeli spróbujesz ponownie."
 
-#: ../../mod/dfrn_confirm.php:658
+#: mod/dfrn_confirm.php:659
 msgid "Unable to set your contact credentials on our system."
 msgstr "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie"
 
-#: ../../mod/dfrn_confirm.php:725
+#: mod/dfrn_confirm.php:726
 msgid "Unable to update your contact profile details on our system"
 msgstr "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie"
 
-#: ../../mod/dfrn_confirm.php:752 ../../mod/dfrn_request.php:717
-#: ../../include/items.php:4008
+#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:732 include/items.php:4237
 msgid "[Name Withheld]"
 msgstr "[Nazwa wstrzymana]"
 
-#: ../../mod/dfrn_confirm.php:797
+#: mod/dfrn_confirm.php:798
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr "%1$s dołączył/a do %2$s"
 
-#: ../../mod/profile.php:21 ../../boot.php:1458
+#: mod/profile.php:21 include/identity.php:77
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny"
 
-#: ../../mod/profile.php:180
+#: mod/profile.php:179
 msgid "Tips for New Members"
 msgstr "Wskazówki dla nowych użytkowników"
 
-#: ../../mod/videos.php:125
+#: mod/videos.php:113
+msgid "Do you really want to delete this video?"
+msgstr ""
+
+#: mod/videos.php:118
+msgid "Delete Video"
+msgstr ""
+
+#: mod/videos.php:197
 msgid "No videos selected"
 msgstr "Nie zaznaczono filmów"
 
-#: ../../mod/videos.php:226 ../../mod/photos.php:1031
+#: mod/videos.php:298 mod/photos.php:1053
 msgid "Access to this item is restricted."
 msgstr "Dostęp do tego obiektu jest ograniczony."
 
-#: ../../mod/videos.php:301 ../../include/text.php:1405
+#: mod/videos.php:373 include/text.php:1460
 msgid "View Video"
 msgstr "Zobacz film"
 
-#: ../../mod/videos.php:308 ../../mod/photos.php:1808
+#: mod/videos.php:380 mod/photos.php:1827
 msgid "View Album"
 msgstr "Zobacz album"
 
-#: ../../mod/videos.php:317
+#: mod/videos.php:389
 msgid "Recent Videos"
 msgstr "Ostatnio dodane filmy"
 
-#: ../../mod/videos.php:319
+#: mod/videos.php:391
 msgid "Upload New Videos"
 msgstr "Wstaw nowe filmy"
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:266
+#: mod/tagger.php:95 include/conversation.php:265
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s zaznaczył %2$s'go %3$s przy użyciu %4$s"
 
-#: ../../mod/fsuggest.php:63
+#: mod/fsuggest.php:63
 msgid "Friend suggestion sent."
 msgstr "Propozycja znajomych wysłana."
 
-#: ../../mod/fsuggest.php:97
+#: mod/fsuggest.php:97
 msgid "Suggest Friends"
 msgstr "Zaproponuj znajomych"
 
-#: ../../mod/fsuggest.php:99
+#: mod/fsuggest.php:99
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr "Zaproponuj znajomych dla %s"
 
-#: ../../mod/lostpass.php:19
+#: mod/wall_upload.php:19 mod/wall_upload.php:29 mod/wall_upload.php:76
+#: mod/wall_upload.php:110 mod/wall_upload.php:111 mod/wall_attach.php:16
+#: mod/wall_attach.php:21 mod/wall_attach.php:66 include/api.php:1692
+msgid "Invalid request."
+msgstr ""
+
+#: mod/lostpass.php:19
 msgid "No valid account found."
 msgstr "Nie znaleziono ważnego konta."
 
-#: ../../mod/lostpass.php:35
+#: mod/lostpass.php:35
 msgid "Password reset request issued. Check your email."
 msgstr "Prośba o zresetowanie hasła została zatwierdzona. Sprawdź swój adres email."
 
-#: ../../mod/lostpass.php:42
+#: mod/lostpass.php:42
 #, php-format
 msgid ""
 "\n"
@@ -1190,7 +1209,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: ../../mod/lostpass.php:53
+#: mod/lostpass.php:53
 #, php-format
 msgid ""
 "\n"
@@ -1207,44 +1226,44 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr ""
 
-#: ../../mod/lostpass.php:72
+#: mod/lostpass.php:72
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Prośba o reset hasła na %s"
 
-#: ../../mod/lostpass.php:92
+#: mod/lostpass.php:92
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się."
 
-#: ../../mod/lostpass.php:109 ../../boot.php:1280
+#: mod/lostpass.php:109 boot.php:1287
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
-#: ../../mod/lostpass.php:110
+#: mod/lostpass.php:110
 msgid "Your password has been reset as requested."
 msgstr "Twoje hasło zostało zresetowane na twoje życzenie."
 
-#: ../../mod/lostpass.php:111
+#: mod/lostpass.php:111
 msgid "Your new password is"
 msgstr "Twoje nowe hasło to"
 
-#: ../../mod/lostpass.php:112
+#: mod/lostpass.php:112
 msgid "Save or copy your new password - and then"
 msgstr "Zapisz lub skopiuj swoje nowe hasło - i wtedy"
 
-#: ../../mod/lostpass.php:113
+#: mod/lostpass.php:113
 msgid "click here to login"
 msgstr "Kliknij tutaj aby zalogować"
 
-#: ../../mod/lostpass.php:114
+#: mod/lostpass.php:114
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Twoje hasło może być zmienione w <em>Ustawieniach</em> po udanym zalogowaniu."
 
-#: ../../mod/lostpass.php:125
+#: mod/lostpass.php:125
 #, php-format
 msgid ""
 "\n"
@@ -1255,7 +1274,7 @@ msgid ""
 "\t\t\t"
 msgstr ""
 
-#: ../../mod/lostpass.php:131
+#: mod/lostpass.php:131
 #, php-format
 msgid ""
 "\n"
@@ -1269,432 +1288,422 @@ msgid ""
 "\t\t\t"
 msgstr ""
 
-#: ../../mod/lostpass.php:147
+#: mod/lostpass.php:147
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Twoje hasło zostało zmienione na %s"
 
-#: ../../mod/lostpass.php:159
+#: mod/lostpass.php:159
 msgid "Forgot your Password?"
 msgstr "Zapomniałeś hasła?"
 
-#: ../../mod/lostpass.php:160
+#: mod/lostpass.php:160
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Wpisz swój adres email i wyślij, aby zresetować hasło. Później sprawdź swojego emaila w celu uzyskania dalszych instrukcji."
 
-#: ../../mod/lostpass.php:161
+#: mod/lostpass.php:161
 msgid "Nickname or Email: "
 msgstr "Pseudonim lub Email:"
 
-#: ../../mod/lostpass.php:162
+#: mod/lostpass.php:162
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: ../../mod/like.php:166 ../../include/conversation.php:137
-#: ../../include/diaspora.php:2103 ../../view/theme/diabook/theme.php:480
+#: mod/like.php:166 include/conversation.php:137 include/diaspora.php:2143
+#: view/theme/diabook/theme.php:480
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s lubi %2$s's %3$s"
 
-#: ../../mod/like.php:168 ../../include/conversation.php:140
+#: mod/like.php:168 include/conversation.php:140
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nie lubi %2$s's %3$s"
 
-#: ../../mod/ping.php:240
+#: mod/ping.php:233
 msgid "{0} wants to be your friend"
 msgstr "{0} chce być Twoim znajomym"
 
-#: ../../mod/ping.php:245
+#: mod/ping.php:248
 msgid "{0} sent you a message"
 msgstr "{0} wysyła Ci wiadomość"
 
-#: ../../mod/ping.php:250
+#: mod/ping.php:263
 msgid "{0} requested registration"
 msgstr "{0} żądana rejestracja"
 
-#: ../../mod/ping.php:256
-#, php-format
-msgid "{0} commented %s's post"
-msgstr "{0} skomentował %s wpis"
-
-#: ../../mod/ping.php:261
-#, php-format
-msgid "{0} liked %s's post"
-msgstr "{0} polubił wpis %s"
-
-#: ../../mod/ping.php:266
-#, php-format
-msgid "{0} disliked %s's post"
-msgstr "{0} przestał lubić post %s"
-
-#: ../../mod/ping.php:271
-#, php-format
-msgid "{0} is now friends with %s"
-msgstr "{0} jest teraz znajomym %s"
-
-#: ../../mod/ping.php:276
-msgid "{0} posted"
-msgstr "{0} utworzony"
-
-#: ../../mod/ping.php:281
-#, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr "{0} zaznaczony %s'go post z #%s"
-
-#: ../../mod/ping.php:287
-msgid "{0} mentioned you in a post"
-msgstr "{0} wspomniał Cię w swoim wpisie"
-
-#: ../../mod/viewcontacts.php:41
+#: mod/viewcontacts.php:41
 msgid "No contacts."
 msgstr "brak kontaktów"
 
-#: ../../mod/viewcontacts.php:78 ../../include/text.php:876
+#: mod/viewcontacts.php:78 include/text.php:917
 msgid "View Contacts"
 msgstr "widok kontaktów"
 
-#: ../../mod/notifications.php:26
+#: mod/notifications.php:26
 msgid "Invalid request identifier."
 msgstr "Niewłaściwy identyfikator wymagania."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
-#: ../../mod/notifications.php:211
+#: mod/notifications.php:35 mod/notifications.php:175
+#: mod/notifications.php:234
 msgid "Discard"
 msgstr "Odrzuć"
 
-#: ../../mod/notifications.php:78
+#: mod/notifications.php:78
 msgid "System"
 msgstr "System"
 
-#: ../../mod/notifications.php:83 ../../include/nav.php:145
+#: mod/notifications.php:84 mod/admin.php:205 include/nav.php:153
 msgid "Network"
 msgstr "Sieć"
 
-#: ../../mod/notifications.php:88 ../../mod/network.php:371
+#: mod/notifications.php:90 mod/network.php:375
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../../mod/notifications.php:93 ../../include/nav.php:105
-#: ../../include/nav.php:148 ../../view/theme/diabook/theme.php:123
+#: mod/notifications.php:96 include/nav.php:105 include/nav.php:156
+#: view/theme/diabook/theme.php:123
 msgid "Home"
 msgstr "Dom"
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:154
+#: mod/notifications.php:102 include/nav.php:161
 msgid "Introductions"
 msgstr "Wstępy"
 
-#: ../../mod/notifications.php:122
+#: mod/notifications.php:127
 msgid "Show Ignored Requests"
 msgstr "Pokaż ignorowane żądania"
 
-#: ../../mod/notifications.php:122
+#: mod/notifications.php:127
 msgid "Hide Ignored Requests"
 msgstr "Ukryj ignorowane żądania"
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
+#: mod/notifications.php:159 mod/notifications.php:209
 msgid "Notification type: "
 msgstr "Typ zawiadomień:"
 
-#: ../../mod/notifications.php:150
+#: mod/notifications.php:160
 msgid "Friend Suggestion"
 msgstr "Propozycja znajomych"
 
-#: ../../mod/notifications.php:152
+#: mod/notifications.php:162
 #, php-format
 msgid "suggested by %s"
 msgstr "zaproponowane przez %s"
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+#: mod/notifications.php:168 mod/notifications.php:228
 msgid "Post a new friend activity"
 msgstr "Pisz o nowej działalności przyjaciela"
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+#: mod/notifications.php:168 mod/notifications.php:228
 msgid "if applicable"
 msgstr "jeśli odpowiednie"
 
-#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
-#: ../../mod/admin.php:1005
+#: mod/notifications.php:171 mod/notifications.php:231 mod/admin.php:1079
 msgid "Approve"
 msgstr "Zatwierdź"
 
-#: ../../mod/notifications.php:181
+#: mod/notifications.php:191
 msgid "Claims to be known to you: "
 msgstr "Twierdzi, że go znasz:"
 
-#: ../../mod/notifications.php:181
+#: mod/notifications.php:191
 msgid "yes"
 msgstr "tak"
 
-#: ../../mod/notifications.php:181
+#: mod/notifications.php:191
 msgid "no"
 msgstr "nie"
 
-#: ../../mod/notifications.php:188
-msgid "Approve as: "
-msgstr "Zatwierdź jako:"
+#: mod/notifications.php:192
+msgid ""
+"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: "
+msgstr ""
 
-#: ../../mod/notifications.php:189
+#: mod/notifications.php:195
+msgid ""
+"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: "
+msgstr ""
+
+#: mod/notifications.php:203
 msgid "Friend"
 msgstr "Znajomy"
 
-#: ../../mod/notifications.php:190
+#: mod/notifications.php:204
 msgid "Sharer"
 msgstr "Udostępniający/a"
 
-#: ../../mod/notifications.php:190
+#: mod/notifications.php:204
 msgid "Fan/Admirer"
 msgstr "Fan"
 
-#: ../../mod/notifications.php:196
+#: mod/notifications.php:210
 msgid "Friend/Connect Request"
 msgstr "Prośba o dodanie do przyjaciół/powiązanych"
 
-#: ../../mod/notifications.php:196
+#: mod/notifications.php:210
 msgid "New Follower"
 msgstr "Nowy obserwator"
 
-#: ../../mod/notifications.php:217
+#: mod/notifications.php:218 mod/notifications.php:220 mod/events.php:503
+#: mod/directory.php:152 include/identity.php:268 include/bb2diaspora.php:170
+#: include/event.php:42
+msgid "Location:"
+msgstr "Lokalizacja"
+
+#: mod/notifications.php:222 mod/directory.php:160 include/identity.php:277
+#: include/identity.php:581
+msgid "About:"
+msgstr "O:"
+
+#: mod/notifications.php:224 include/identity.php:575
+msgid "Tags:"
+msgstr "Tagi:"
+
+#: mod/notifications.php:226 mod/directory.php:154 include/identity.php:270
+#: include/identity.php:540
+msgid "Gender:"
+msgstr "Płeć:"
+
+#: mod/notifications.php:240
 msgid "No introductions."
 msgstr "Brak wstępu."
 
-#: ../../mod/notifications.php:220 ../../include/nav.php:155
+#: mod/notifications.php:243 include/nav.php:164
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:387
-#: ../../mod/notifications.php:478
+#: mod/notifications.php:281 mod/notifications.php:410
+#: mod/notifications.php:501
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s polubił wpis %s"
 
-#: ../../mod/notifications.php:268 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:488
+#: mod/notifications.php:291 mod/notifications.php:420
+#: mod/notifications.php:511
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s przestał lubić post %s"
 
-#: ../../mod/notifications.php:283 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:503
+#: mod/notifications.php:306 mod/notifications.php:435
+#: mod/notifications.php:526
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s jest teraz znajomym %s"
 
-#: ../../mod/notifications.php:290 ../../mod/notifications.php:419
+#: mod/notifications.php:313 mod/notifications.php:442
 #, php-format
 msgid "%s created a new post"
 msgstr "%s dodał nowy wpis"
 
-#: ../../mod/notifications.php:291 ../../mod/notifications.php:420
-#: ../../mod/notifications.php:513
+#: mod/notifications.php:314 mod/notifications.php:443
+#: mod/notifications.php:536
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s skomentował wpis %s"
 
-#: ../../mod/notifications.php:306
+#: mod/notifications.php:329
 msgid "No more network notifications."
 msgstr "Nie ma więcej powiadomień sieciowych"
 
-#: ../../mod/notifications.php:310
+#: mod/notifications.php:333
 msgid "Network Notifications"
 msgstr "Powiadomienia z sieci"
 
-#: ../../mod/notifications.php:336 ../../mod/notify.php:75
+#: mod/notifications.php:359 mod/notify.php:72
 msgid "No more system notifications."
 msgstr "Nie ma więcej powiadomień systemowych."
 
-#: ../../mod/notifications.php:340 ../../mod/notify.php:79
+#: mod/notifications.php:363 mod/notify.php:76
 msgid "System Notifications"
 msgstr "Powiadomienia systemowe"
 
-#: ../../mod/notifications.php:435
+#: mod/notifications.php:458
 msgid "No more personal notifications."
 msgstr "Nie ma więcej powiadomień osobistych"
 
-#: ../../mod/notifications.php:439
+#: mod/notifications.php:462
 msgid "Personal Notifications"
 msgstr "Prywatne powiadomienia"
 
-#: ../../mod/notifications.php:520
+#: mod/notifications.php:543
 msgid "No more home notifications."
 msgstr "Nie ma więcej powiadomień domu"
 
-#: ../../mod/notifications.php:524
+#: mod/notifications.php:547
 msgid "Home Notifications"
 msgstr "Powiadomienia z instancji"
 
-#: ../../mod/babel.php:17
+#: mod/babel.php:17
 msgid "Source (bbcode) text:"
 msgstr "Źródło - tekst (BBcode) :"
 
-#: ../../mod/babel.php:23
+#: mod/babel.php:23
 msgid "Source (Diaspora) text to convert to BBcode:"
 msgstr "Źródło tekst (Diaspora) by przekonwerterować na BBcode :"
 
-#: ../../mod/babel.php:31
+#: mod/babel.php:31
 msgid "Source input: "
 msgstr "Źródło wejścia:"
 
-#: ../../mod/babel.php:35
+#: mod/babel.php:35
 msgid "bb2html (raw HTML): "
 msgstr "bb2html (raw HTML): "
 
-#: ../../mod/babel.php:39
+#: mod/babel.php:39
 msgid "bb2html: "
 msgstr "bb2html: "
 
-#: ../../mod/babel.php:43
+#: mod/babel.php:43
 msgid "bb2html2bb: "
 msgstr "bb2html2bb: "
 
-#: ../../mod/babel.php:47
+#: mod/babel.php:47
 msgid "bb2md: "
 msgstr "bb2md: "
 
-#: ../../mod/babel.php:51
+#: mod/babel.php:51
 msgid "bb2md2html: "
 msgstr "bb2md2html: "
 
-#: ../../mod/babel.php:55
+#: mod/babel.php:55
 msgid "bb2dia2bb: "
 msgstr "bb2dia2bb: "
 
-#: ../../mod/babel.php:59
+#: mod/babel.php:59
 msgid "bb2md2html2bb: "
 msgstr "bb2md2html2bb: "
 
-#: ../../mod/babel.php:69
+#: mod/babel.php:69
 msgid "Source input (Diaspora format): "
 msgstr "Źródło wejścia(format Diaspory):"
 
-#: ../../mod/babel.php:74
+#: mod/babel.php:74
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
-#: ../../mod/navigation.php:20 ../../include/nav.php:34
+#: mod/navigation.php:20 include/nav.php:34
 msgid "Nothing new here"
 msgstr "Brak nowych zdarzeń"
 
-#: ../../mod/navigation.php:24 ../../include/nav.php:38
+#: mod/navigation.php:24 include/nav.php:38
 msgid "Clear notifications"
 msgstr "Wyczyść powiadomienia"
 
-#: ../../mod/message.php:9 ../../include/nav.php:164
+#: mod/message.php:9 include/nav.php:173
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: ../../mod/message.php:63 ../../mod/wallmessage.php:56
+#: mod/message.php:64 mod/wallmessage.php:56
 msgid "No recipient selected."
 msgstr "Nie wybrano odbiorcy."
 
-#: ../../mod/message.php:67
+#: mod/message.php:68
 msgid "Unable to locate contact information."
 msgstr "Niezdolny do uzyskania informacji kontaktowych."
 
-#: ../../mod/message.php:70 ../../mod/wallmessage.php:62
+#: mod/message.php:71 mod/wallmessage.php:62
 msgid "Message could not be sent."
 msgstr "Wiadomość nie może zostać wysłana"
 
-#: ../../mod/message.php:73 ../../mod/wallmessage.php:65
+#: mod/message.php:74 mod/wallmessage.php:65
 msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/message.php:76 ../../mod/wallmessage.php:68
+#: mod/message.php:77 mod/wallmessage.php:68
 msgid "Message sent."
 msgstr "Wysłano."
 
-#: ../../mod/message.php:182 ../../include/nav.php:161
+#: mod/message.php:183 include/nav.php:170
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: ../../mod/message.php:207
+#: mod/message.php:208
 msgid "Do you really want to delete this message?"
 msgstr "Czy na pewno chcesz usunąć tę wiadomość?"
 
-#: ../../mod/message.php:227
+#: mod/message.php:228
 msgid "Message deleted."
 msgstr "Wiadomość usunięta."
 
-#: ../../mod/message.php:258
+#: mod/message.php:259
 msgid "Conversation removed."
 msgstr "Rozmowa usunięta."
 
-#: ../../mod/message.php:283 ../../mod/message.php:291
-#: ../../mod/message.php:466 ../../mod/message.php:474
-#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
-#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
+#: mod/message.php:284 mod/message.php:292 mod/message.php:467
+#: mod/message.php:475 mod/wallmessage.php:127 mod/wallmessage.php:135
+#: include/conversation.php:1001 include/conversation.php:1019
 msgid "Please enter a link URL:"
 msgstr "Proszę wpisać adres URL:"
 
-#: ../../mod/message.php:319 ../../mod/wallmessage.php:142
+#: mod/message.php:320 mod/wallmessage.php:142
 msgid "Send Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../../mod/message.php:320 ../../mod/message.php:553
-#: ../../mod/wallmessage.php:144
+#: mod/message.php:321 mod/message.php:554 mod/wallmessage.php:144
 msgid "To:"
 msgstr "Do:"
 
-#: ../../mod/message.php:325 ../../mod/message.php:555
-#: ../../mod/wallmessage.php:145
+#: mod/message.php:326 mod/message.php:556 mod/wallmessage.php:145
 msgid "Subject:"
 msgstr "Temat:"
 
-#: ../../mod/message.php:329 ../../mod/message.php:558
-#: ../../mod/wallmessage.php:151 ../../mod/invite.php:134
+#: mod/message.php:330 mod/message.php:559 mod/wallmessage.php:151
+#: mod/invite.php:134
 msgid "Your message:"
 msgstr "Twoja wiadomość:"
 
-#: ../../mod/message.php:332 ../../mod/message.php:562
-#: ../../mod/wallmessage.php:154 ../../mod/editpost.php:110
-#: ../../include/conversation.php:1091
+#: mod/message.php:333 mod/message.php:563 mod/wallmessage.php:154
+#: mod/editpost.php:110 include/conversation.php:1056
 msgid "Upload photo"
 msgstr "Wyślij zdjęcie"
 
-#: ../../mod/message.php:333 ../../mod/message.php:563
-#: ../../mod/wallmessage.php:155 ../../mod/editpost.php:114
-#: ../../include/conversation.php:1095
+#: mod/message.php:334 mod/message.php:564 mod/wallmessage.php:155
+#: mod/editpost.php:114 include/conversation.php:1060
 msgid "Insert web link"
 msgstr "Wstaw link"
 
-#: ../../mod/message.php:334 ../../mod/message.php:565
-#: ../../mod/content.php:499 ../../mod/content.php:883
-#: ../../mod/wallmessage.php:156 ../../mod/editpost.php:124
-#: ../../mod/photos.php:1545 ../../object/Item.php:364
-#: ../../include/conversation.php:692 ../../include/conversation.php:1109
+#: mod/message.php:335 mod/message.php:566 mod/content.php:501
+#: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:124
+#: mod/photos.php:1564 object/Item.php:366 include/conversation.php:691
+#: include/conversation.php:1074
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../../mod/message.php:371
+#: mod/message.php:372
 msgid "No messages."
 msgstr "Brak wiadomości."
 
-#: ../../mod/message.php:378
+#: mod/message.php:379
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "Nieznany wysyłający - %s"
 
-#: ../../mod/message.php:381
+#: mod/message.php:382
 #, php-format
 msgid "You and %s"
 msgstr "Ty i %s"
 
-#: ../../mod/message.php:384
+#: mod/message.php:385
 #, php-format
 msgid "%s and You"
 msgstr "%s i ty"
 
-#: ../../mod/message.php:405 ../../mod/message.php:546
+#: mod/message.php:406 mod/message.php:547
 msgid "Delete conversation"
 msgstr "Usuń rozmowę"
 
-#: ../../mod/message.php:408
+#: mod/message.php:409
 msgid "D, d M Y - g:i A"
 msgstr "D, d M R - g:m AM/PM"
 
-#: ../../mod/message.php:411
+#: mod/message.php:412
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1702,622 +1711,702 @@ msgstr[0] " %d wiadomość"
 msgstr[1] " %d wiadomości"
 msgstr[2] " %d wiadomości"
 
-#: ../../mod/message.php:450
+#: mod/message.php:451
 msgid "Message not available."
 msgstr "Wiadomość nie jest dostępna."
 
-#: ../../mod/message.php:520
+#: mod/message.php:521
 msgid "Delete message"
 msgstr "Usuń wiadomość"
 
-#: ../../mod/message.php:548
+#: mod/message.php:549
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:552
+#: mod/message.php:553
 msgid "Send Reply"
 msgstr "Odpowiedz"
 
-#: ../../mod/update_display.php:22 ../../mod/update_community.php:18
-#: ../../mod/update_notes.php:37 ../../mod/update_profile.php:41
-#: ../../mod/update_network.php:25
+#: mod/update_display.php:22 mod/update_community.php:18
+#: mod/update_notes.php:37 mod/update_profile.php:41 mod/update_network.php:25
 msgid "[Embedded content - reload page to view]"
 msgstr "[Dodatkowa zawartość - odśwież stronę by zobaczyć]"
 
-#: ../../mod/crepair.php:106
+#: mod/crepair.php:107
 msgid "Contact settings applied."
 msgstr "Ustawienia kontaktu zaktualizowane."
 
-#: ../../mod/crepair.php:108
+#: mod/crepair.php:109
 msgid "Contact update failed."
 msgstr "Nie udało się zaktualizować kontaktu."
 
-#: ../../mod/crepair.php:139
+#: mod/crepair.php:140
 msgid "Repair Contact Settings"
 msgstr "Napraw ustawienia kontaktów"
 
-#: ../../mod/crepair.php:141
+#: mod/crepair.php:142
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
 msgstr "<strong> UWAGA: To jest wysoce zaawansowane</strong> i jeśli wprowadzisz niewłaściwą informację twoje komunikacje z tym kontaktem mogą przestać działać."
 
-#: ../../mod/crepair.php:142
+#: mod/crepair.php:143
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>teraz</strong> przycisku 'powrót' na swojej przeglądarce."
 
-#: ../../mod/crepair.php:148
+#: mod/crepair.php:149
 msgid "Return to contact editor"
 msgstr "Wróć do edytora kontaktów"
 
-#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
+#: mod/crepair.php:160 mod/crepair.php:162
 msgid "No mirroring"
 msgstr ""
 
-#: ../../mod/crepair.php:159
+#: mod/crepair.php:160
 msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
+#: mod/crepair.php:160 mod/crepair.php:162
 msgid "Mirror as my own posting"
 msgstr ""
 
-#: ../../mod/crepair.php:165 ../../mod/admin.php:1003 ../../mod/admin.php:1015
-#: ../../mod/admin.php:1016 ../../mod/admin.php:1029
-#: ../../mod/settings.php:616 ../../mod/settings.php:642
+#: mod/crepair.php:169
+msgid "Refetch contact data"
+msgstr ""
+
+#: mod/crepair.php:170 mod/admin.php:1077 mod/admin.php:1089
+#: mod/admin.php:1090 mod/admin.php:1103 mod/settings.php:634
+#: mod/settings.php:660
 msgid "Name"
 msgstr "Imię"
 
-#: ../../mod/crepair.php:166
+#: mod/crepair.php:171
 msgid "Account Nickname"
 msgstr "Nazwa konta"
 
-#: ../../mod/crepair.php:167
+#: mod/crepair.php:172
 msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/crepair.php:168
+#: mod/crepair.php:173
 msgid "Account URL"
 msgstr "URL konta"
 
-#: ../../mod/crepair.php:169
+#: mod/crepair.php:174
 msgid "Friend Request URL"
 msgstr "URL żądajacy znajomości"
 
-#: ../../mod/crepair.php:170
+#: mod/crepair.php:175
 msgid "Friend Confirm URL"
 msgstr "URL potwierdzający znajomość"
 
-#: ../../mod/crepair.php:171
+#: mod/crepair.php:176
 msgid "Notification Endpoint URL"
 msgstr "Zgłoszenie Punktu Końcowego URL"
 
-#: ../../mod/crepair.php:172
+#: mod/crepair.php:177
 msgid "Poll/Feed URL"
 msgstr "Adres Ankiety / RSS"
 
-#: ../../mod/crepair.php:173
+#: mod/crepair.php:178
 msgid "New photo from this URL"
 msgstr "Nowe zdjęcie z tej ścieżki"
 
-#: ../../mod/crepair.php:174
+#: mod/crepair.php:179
 msgid "Remote Self"
 msgstr ""
 
-#: ../../mod/crepair.php:176
+#: mod/crepair.php:181
 msgid "Mirror postings from this contact"
 msgstr ""
 
-#: ../../mod/crepair.php:176
+#: mod/crepair.php:181
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr ""
 
-#: ../../mod/bookmarklet.php:12 ../../boot.php:1266 ../../include/nav.php:92
+#: mod/bookmarklet.php:12 boot.php:1273 include/nav.php:92
 msgid "Login"
 msgstr "Login"
 
-#: ../../mod/bookmarklet.php:41
+#: mod/bookmarklet.php:41
 msgid "The post was created"
 msgstr ""
 
-#: ../../mod/viewsrc.php:7
+#: mod/viewsrc.php:7
 msgid "Access denied."
 msgstr "Brak dostępu"
 
-#: ../../mod/dirfind.php:26
-msgid "People Search"
-msgstr "Szukaj osób"
+#: mod/dirfind.php:36
+#, php-format
+msgid "People Search - %s"
+msgstr ""
 
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+#: mod/dirfind.php:125 mod/match.php:65 mod/suggest.php:92
+#: include/contact_widgets.php:10 include/identity.php:188
+msgid "Connect"
+msgstr "Połącz"
+
+#: mod/dirfind.php:139 mod/match.php:73
 msgid "No matches"
 msgstr "brak dopasowań"
 
-#: ../../mod/fbrowser.php:25 ../../boot.php:2126 ../../include/nav.php:78
-#: ../../view/theme/diabook/theme.php:126
+#: mod/fbrowser.php:32 include/identity.php:648 include/nav.php:78
+#: view/theme/diabook/theme.php:126
 msgid "Photos"
 msgstr "Zdjęcia"
 
-#: ../../mod/fbrowser.php:113
+#: mod/fbrowser.php:122
 msgid "Files"
 msgstr "Pliki"
 
-#: ../../mod/nogroup.php:59
+#: mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr "Kontakty spoza członków grupy"
 
-#: ../../mod/admin.php:57
+#: mod/admin.php:57
 msgid "Theme settings updated."
 msgstr "Ustawienia szablonu zmienione."
 
-#: ../../mod/admin.php:104 ../../mod/admin.php:619
+#: mod/admin.php:104 mod/admin.php:682
 msgid "Site"
 msgstr "Strona"
 
-#: ../../mod/admin.php:105 ../../mod/admin.php:998 ../../mod/admin.php:1013
+#: mod/admin.php:105 mod/admin.php:628 mod/admin.php:1072 mod/admin.php:1087
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:1102 ../../mod/admin.php:1155
-#: ../../mod/settings.php:57
+#: mod/admin.php:106 mod/admin.php:1176 mod/admin.php:1236 mod/settings.php:66
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:1323 ../../mod/admin.php:1357
+#: mod/admin.php:107 mod/admin.php:1404 mod/admin.php:1438
 msgid "Themes"
 msgstr "Temat"
 
-#: ../../mod/admin.php:108
+#: mod/admin.php:108
 msgid "DB updates"
 msgstr "Aktualizacje DB"
 
-#: ../../mod/admin.php:123 ../../mod/admin.php:132 ../../mod/admin.php:1444
+#: mod/admin.php:109 mod/admin.php:200
+msgid "Inspect Queue"
+msgstr ""
+
+#: mod/admin.php:124 mod/admin.php:133 mod/admin.php:1525
 msgid "Logs"
 msgstr "Logi"
 
-#: ../../mod/admin.php:124
+#: mod/admin.php:125
 msgid "probe address"
 msgstr ""
 
-#: ../../mod/admin.php:125
+#: mod/admin.php:126
 msgid "check webfinger"
 msgstr ""
 
-#: ../../mod/admin.php:130 ../../include/nav.php:184
+#: mod/admin.php:131 include/nav.php:193
 msgid "Admin"
 msgstr "Administator"
 
-#: ../../mod/admin.php:131
+#: mod/admin.php:132
 msgid "Plugin Features"
 msgstr "Polecane wtyczki"
 
-#: ../../mod/admin.php:133
+#: mod/admin.php:134
 msgid "diagnostics"
 msgstr ""
 
-#: ../../mod/admin.php:134
+#: mod/admin.php:135
 msgid "User registrations waiting for confirmation"
 msgstr "Rejestracje użytkownika czekają na potwierdzenie."
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:952
-msgid "Normal Account"
-msgstr "Konto normalne"
-
-#: ../../mod/admin.php:194 ../../mod/admin.php:953
-msgid "Soapbox Account"
-msgstr "Konto Soapbox"
-
-#: ../../mod/admin.php:195 ../../mod/admin.php:954
-msgid "Community/Celebrity Account"
-msgstr "Konto społeczności/gwiazdy"
-
-#: ../../mod/admin.php:196 ../../mod/admin.php:955
-msgid "Automatic Friend Account"
-msgstr "Automatyczny przyjaciel konta"
-
-#: ../../mod/admin.php:197
-msgid "Blog Account"
-msgstr "Konto Bloga"
-
-#: ../../mod/admin.php:198
-msgid "Private Forum"
-msgstr "Forum Prywatne"
-
-#: ../../mod/admin.php:217
-msgid "Message queues"
-msgstr "Wiadomości"
-
-#: ../../mod/admin.php:222 ../../mod/admin.php:618 ../../mod/admin.php:997
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1154 ../../mod/admin.php:1322
-#: ../../mod/admin.php:1356 ../../mod/admin.php:1443
+#: mod/admin.php:199 mod/admin.php:249 mod/admin.php:681 mod/admin.php:1071
+#: mod/admin.php:1175 mod/admin.php:1235 mod/admin.php:1403 mod/admin.php:1437
+#: mod/admin.php:1524
 msgid "Administration"
 msgstr "Administracja"
 
-#: ../../mod/admin.php:223
+#: mod/admin.php:202
+msgid "ID"
+msgstr ""
+
+#: mod/admin.php:203
+msgid "Recipient Name"
+msgstr ""
+
+#: mod/admin.php:204
+msgid "Recipient Profile"
+msgstr ""
+
+#: mod/admin.php:206
+msgid "Created"
+msgstr ""
+
+#: mod/admin.php:207
+msgid "Last Tried"
+msgstr ""
+
+#: mod/admin.php:208
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:220 mod/admin.php:1025
+msgid "Normal Account"
+msgstr "Konto normalne"
+
+#: mod/admin.php:221 mod/admin.php:1026
+msgid "Soapbox Account"
+msgstr "Konto Soapbox"
+
+#: mod/admin.php:222 mod/admin.php:1027
+msgid "Community/Celebrity Account"
+msgstr "Konto społeczności/gwiazdy"
+
+#: mod/admin.php:223 mod/admin.php:1028
+msgid "Automatic Friend Account"
+msgstr "Automatyczny przyjaciel konta"
+
+#: mod/admin.php:224
+msgid "Blog Account"
+msgstr "Konto Bloga"
+
+#: mod/admin.php:225
+msgid "Private Forum"
+msgstr "Forum Prywatne"
+
+#: mod/admin.php:244
+msgid "Message queues"
+msgstr "Wiadomości"
+
+#: mod/admin.php:250
 msgid "Summary"
 msgstr "Skrót"
 
-#: ../../mod/admin.php:225
+#: mod/admin.php:252
 msgid "Registered users"
 msgstr "Zarejestrowani użytkownicy"
 
-#: ../../mod/admin.php:227
+#: mod/admin.php:254
 msgid "Pending registrations"
 msgstr "Rejestracje w toku."
 
-#: ../../mod/admin.php:228
+#: mod/admin.php:255
 msgid "Version"
 msgstr "Wersja"
 
-#: ../../mod/admin.php:232
+#: mod/admin.php:260
 msgid "Active plugins"
 msgstr "Aktywne pluginy"
 
-#: ../../mod/admin.php:255
+#: mod/admin.php:283
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: mod/admin.php:565
 msgid "Site settings updated."
 msgstr "Ustawienia strony zaktualizowane"
 
-#: ../../mod/admin.php:545 ../../mod/settings.php:828
+#: mod/admin.php:594 mod/settings.php:883
 msgid "No special theme for mobile devices"
 msgstr "Brak specialnego motywu dla urządzeń mobilnych"
 
-#: ../../mod/admin.php:562
+#: mod/admin.php:611
 msgid "No community page"
 msgstr ""
 
-#: ../../mod/admin.php:563
+#: mod/admin.php:612
 msgid "Public postings from users of this site"
 msgstr ""
 
-#: ../../mod/admin.php:564
+#: mod/admin.php:613
 msgid "Global community page"
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: mod/admin.php:619
 msgid "At post arrival"
 msgstr ""
 
-#: ../../mod/admin.php:571 ../../include/contact_selectors.php:56
+#: mod/admin.php:620 include/contact_selectors.php:56
 msgid "Frequently"
 msgstr "Jak najczęściej"
 
-#: ../../mod/admin.php:572 ../../include/contact_selectors.php:57
+#: mod/admin.php:621 include/contact_selectors.php:57
 msgid "Hourly"
 msgstr "Godzinowo"
 
-#: ../../mod/admin.php:573 ../../include/contact_selectors.php:58
+#: mod/admin.php:622 include/contact_selectors.php:58
 msgid "Twice daily"
 msgstr "Dwa razy dziennie"
 
-#: ../../mod/admin.php:574 ../../include/contact_selectors.php:59
+#: mod/admin.php:623 include/contact_selectors.php:59
 msgid "Daily"
 msgstr "Dziennie"
 
-#: ../../mod/admin.php:579
+#: mod/admin.php:629
+msgid "Users, Global Contacts"
+msgstr ""
+
+#: mod/admin.php:630
+msgid "Users, Global Contacts/fallback"
+msgstr ""
+
+#: mod/admin.php:634
+msgid "One month"
+msgstr "Miesiąc"
+
+#: mod/admin.php:635
+msgid "Three months"
+msgstr "Trzy miesiące"
+
+#: mod/admin.php:636
+msgid "Half a year"
+msgstr "Pół roku"
+
+#: mod/admin.php:637
+msgid "One year"
+msgstr "Rok"
+
+#: mod/admin.php:642
 msgid "Multi user instance"
 msgstr "Tryb MultiUsera"
 
-#: ../../mod/admin.php:602
+#: mod/admin.php:665
 msgid "Closed"
 msgstr "Zamknięty"
 
-#: ../../mod/admin.php:603
+#: mod/admin.php:666
 msgid "Requires approval"
 msgstr "Wymagane zatwierdzenie."
 
-#: ../../mod/admin.php:604
+#: mod/admin.php:667
 msgid "Open"
 msgstr "Otwórz"
 
-#: ../../mod/admin.php:608
+#: mod/admin.php:671
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Brak SSL , linki będą śledzić stan SSL ."
 
-#: ../../mod/admin.php:609
+#: mod/admin.php:672
 msgid "Force all links to use SSL"
 msgstr "Wymuś by linki używały SSL."
 
-#: ../../mod/admin.php:610
+#: mod/admin.php:673
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Wewnętrzne Certyfikaty , użyj SSL tylko dla linków lokalnych . "
 
-#: ../../mod/admin.php:620 ../../mod/admin.php:1156 ../../mod/admin.php:1358
-#: ../../mod/admin.php:1445 ../../mod/settings.php:614
-#: ../../mod/settings.php:724 ../../mod/settings.php:798
-#: ../../mod/settings.php:880 ../../mod/settings.php:1113
+#: mod/admin.php:683 mod/admin.php:1237 mod/admin.php:1439 mod/admin.php:1526
+#: mod/settings.php:632 mod/settings.php:742 mod/settings.php:784
+#: mod/settings.php:853 mod/settings.php:935 mod/settings.php:1165
 msgid "Save Settings"
-msgstr ""
+msgstr "Zapisz ustawienia"
 
-#: ../../mod/admin.php:621 ../../mod/register.php:255
+#: mod/admin.php:684 mod/register.php:260
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: ../../mod/admin.php:622
+#: mod/admin.php:685
 msgid "File upload"
 msgstr "Plik załadowano"
 
-#: ../../mod/admin.php:623
+#: mod/admin.php:686
 msgid "Policies"
 msgstr "zasady"
 
-#: ../../mod/admin.php:624
+#: mod/admin.php:687
 msgid "Advanced"
 msgstr "Zaawansowany"
 
-#: ../../mod/admin.php:625
+#: mod/admin.php:688
+msgid "Auto Discovered Contact Directory"
+msgstr ""
+
+#: mod/admin.php:689
 msgid "Performance"
 msgstr "Ustawienia"
 
-#: ../../mod/admin.php:626
+#: mod/admin.php:690
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: ../../mod/admin.php:629
+#: mod/admin.php:693
 msgid "Site name"
 msgstr "Nazwa strony"
 
-#: ../../mod/admin.php:630
+#: mod/admin.php:694
 msgid "Host name"
 msgstr ""
 
-#: ../../mod/admin.php:631
+#: mod/admin.php:695
 msgid "Sender Email"
 msgstr ""
 
-#: ../../mod/admin.php:632
+#: mod/admin.php:695
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr ""
+
+#: mod/admin.php:696
 msgid "Banner/Logo"
 msgstr "Logo"
 
-#: ../../mod/admin.php:633
+#: mod/admin.php:697
 msgid "Shortcut icon"
 msgstr ""
 
-#: ../../mod/admin.php:634
+#: mod/admin.php:697
+msgid "Link to an icon that will be used for browsers."
+msgstr ""
+
+#: mod/admin.php:698
 msgid "Touch icon"
 msgstr ""
 
-#: ../../mod/admin.php:635
+#: mod/admin.php:698
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr ""
+
+#: mod/admin.php:699
 msgid "Additional Info"
 msgstr "Dodatkowe informacje"
 
-#: ../../mod/admin.php:635
+#: mod/admin.php:699
+#, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
-"listed at dir.friendica.com/siteinfo."
+"listed at %s/siteinfo."
 msgstr ""
 
-#: ../../mod/admin.php:636
+#: mod/admin.php:700
 msgid "System language"
 msgstr "Język systemu"
 
-#: ../../mod/admin.php:637
+#: mod/admin.php:701
 msgid "System theme"
 msgstr "Motyw systemowy"
 
-#: ../../mod/admin.php:637
+#: mod/admin.php:701
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Domyślny motyw systemu - może być nadpisany przez profil użytkownika  <a href='#' id='cnftheme'>zmień ustawienia motywów</a>"
 
-#: ../../mod/admin.php:638
+#: mod/admin.php:702
 msgid "Mobile system theme"
 msgstr "Mobilny motyw systemowy"
 
-#: ../../mod/admin.php:638
+#: mod/admin.php:702
 msgid "Theme for mobile devices"
 msgstr "Szablon dla mobilnych urządzeń"
 
-#: ../../mod/admin.php:639
+#: mod/admin.php:703
 msgid "SSL link policy"
 msgstr "polityka SSL"
 
-#: ../../mod/admin.php:639
+#: mod/admin.php:703
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Określa kiedy generowane linki powinny używać wymuszonego SSl."
 
-#: ../../mod/admin.php:640
+#: mod/admin.php:704
 msgid "Force SSL"
 msgstr ""
 
-#: ../../mod/admin.php:640
+#: mod/admin.php:704
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: mod/admin.php:705
 msgid "Old style 'Share'"
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: mod/admin.php:705
 msgid "Deactivates the bbcode element 'share' for repeating items."
 msgstr ""
 
-#: ../../mod/admin.php:642
+#: mod/admin.php:706
 msgid "Hide help entry from navigation menu"
 msgstr "Wyłącz pomoc w menu nawigacyjnym "
 
-#: ../../mod/admin.php:642
+#: mod/admin.php:706
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Chowa pozycje menu dla stron pomocy ze strony nawigacyjnej. Możesz nadal ją wywołać poprzez komendę /help."
 
-#: ../../mod/admin.php:643
+#: mod/admin.php:707
 msgid "Single user instance"
 msgstr "Tryb SingleUsera"
 
-#: ../../mod/admin.php:643
+#: mod/admin.php:707
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Ustawia tryb multi lub single dla wybranych użytkowników."
 
-#: ../../mod/admin.php:644
+#: mod/admin.php:708
 msgid "Maximum image size"
 msgstr "Maksymalny rozmiar zdjęcia"
 
-#: ../../mod/admin.php:644
+#: mod/admin.php:708
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maksymalny rozmiar w bitach dla wczytywanego obrazu . Domyślnie jest to  0 , co oznacza bez limitu ."
 
-#: ../../mod/admin.php:645
+#: mod/admin.php:709
 msgid "Maximum image length"
 msgstr "Maksymalna długość obrazu"
 
-#: ../../mod/admin.php:645
+#: mod/admin.php:709
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maksymalna długość najdłuższej strony przesyłanego obrazu w pikselach.\nDomyślnie jest to -1, co oznacza brak limitu."
 
-#: ../../mod/admin.php:646
+#: mod/admin.php:710
 msgid "JPEG image quality"
 msgstr "jakość obrazu JPEG"
 
-#: ../../mod/admin.php:646
+#: mod/admin.php:710
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Wczytywanie JPEGS będzie zapisane z tymi ustawieniami jakości [0-100] . Domyslnie jest ustawione 100 co oznacza brak strat jakości . "
 
-#: ../../mod/admin.php:648
+#: mod/admin.php:712
 msgid "Register policy"
 msgstr "Zarejestruj polisę"
 
-#: ../../mod/admin.php:649
+#: mod/admin.php:713
 msgid "Maximum Daily Registrations"
 msgstr "Maksymalnie dziennych rejestracji"
 
-#: ../../mod/admin.php:649
+#: mod/admin.php:713
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr ""
 
-#: ../../mod/admin.php:650
+#: mod/admin.php:714
 msgid "Register text"
 msgstr "Zarejestruj tekst"
 
-#: ../../mod/admin.php:650
+#: mod/admin.php:714
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:651
+#: mod/admin.php:715
 msgid "Accounts abandoned after x days"
 msgstr "Konto porzucone od x dni."
 
-#: ../../mod/admin.php:651
+#: mod/admin.php:715
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Nie będzie marnować zasobów systemu wypytując zewnętrzne strony o opuszczone konta. Ustaw 0 dla braku limitu czasu ."
 
-#: ../../mod/admin.php:652
+#: mod/admin.php:716
 msgid "Allowed friend domains"
 msgstr "Dozwolone domeny przyjaciół"
 
-#: ../../mod/admin.php:652
+#: mod/admin.php:716
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista domen separowana przecinkami  które mogą zaprzyjaźnić się z tą stroną . Wildcards są akceptowane . Pozostaw puste by zezwolić każdej domenie na zapryjaźnienie. "
 
-#: ../../mod/admin.php:653
+#: mod/admin.php:717
 msgid "Allowed email domains"
 msgstr "Dozwolone domeny e-mailowe"
 
-#: ../../mod/admin.php:653
+#: mod/admin.php:717
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:654
+#: mod/admin.php:718
 msgid "Block public"
 msgstr "Blokuj publicznie"
 
-#: ../../mod/admin.php:654
+#: mod/admin.php:718
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:655
+#: mod/admin.php:719
 msgid "Force publish"
 msgstr "Wymuś publikację"
 
-#: ../../mod/admin.php:655
+#: mod/admin.php:719
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:656
+#: mod/admin.php:720
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:656
+#: mod/admin.php:720
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:657
+#: mod/admin.php:721
 msgid "Allow threaded items"
 msgstr "Zezwalaj na wątkowanie tematów"
 
-#: ../../mod/admin.php:657
+#: mod/admin.php:721
 msgid "Allow infinite level threading for items on this site."
 msgstr "Zezwalaj na nieograniczoną liczbę wątków tematycznych na tej stronie."
 
-#: ../../mod/admin.php:658
+#: mod/admin.php:722
 msgid "Private posts by default for new users"
 msgstr "Prywatne posty domyślnie dla nowych użytkowników"
 
-#: ../../mod/admin.php:658
+#: mod/admin.php:722
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: mod/admin.php:723
 msgid "Don't include post content in email notifications"
 msgstr "Nie wklejaj zawartości postu do powiadomienia o poczcie"
 
-#: ../../mod/admin.php:659
+#: mod/admin.php:723
 msgid ""
 "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."
 msgstr "W celu ochrony prywatności, nie włączaj zawartości postu/komentarza/wiadomości prywatnej/etc. do powiadomień w wiadomościach mailowych wysyłanych z tej strony."
 
-#: ../../mod/admin.php:660
+#: mod/admin.php:724
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Nie zezwalaj na publiczny dostęp do dodatkowych wtyczek wyszczególnionych w menu aplikacji."
 
-#: ../../mod/admin.php:660
+#: mod/admin.php:724
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: mod/admin.php:725
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: mod/admin.php:725
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -2325,319 +2414,431 @@ msgid ""
 "while."
 msgstr ""
 
-#: ../../mod/admin.php:662
+#: mod/admin.php:726
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: ../../mod/admin.php:662
+#: mod/admin.php:726
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr ""
 
-#: ../../mod/admin.php:663
+#: mod/admin.php:727
 msgid "Block multiple registrations"
 msgstr "Zablokuj wielokrotną rejestrację"
 
-#: ../../mod/admin.php:663
+#: mod/admin.php:727
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Nie pozwalaj użytkownikom na zakładanie dodatkowych kont do używania jako strony. "
 
-#: ../../mod/admin.php:664
+#: mod/admin.php:728
 msgid "OpenID support"
 msgstr "Wsparcie OpenID"
 
-#: ../../mod/admin.php:664
+#: mod/admin.php:728
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: mod/admin.php:729
 msgid "Fullname check"
 msgstr "Sprawdzanie pełnej nazwy"
 
-#: ../../mod/admin.php:665
+#: mod/admin.php:729
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Aby ograniczyć spam, wymagaj by użytkownik przy rejestracji w polu Imię i nazwisko użył spacji pomiędzy imieniem i nazwiskiem."
 
-#: ../../mod/admin.php:666
+#: mod/admin.php:730
 msgid "UTF-8 Regular expressions"
 msgstr "Wyrażenia regularne UTF-8"
 
-#: ../../mod/admin.php:666
+#: mod/admin.php:730
 msgid "Use PHP UTF8 regular expressions"
 msgstr "Użyj regularnych wyrażeń PHP UTF8"
 
-#: ../../mod/admin.php:667
+#: mod/admin.php:731
 msgid "Community Page Style"
 msgstr ""
 
-#: ../../mod/admin.php:667
+#: mod/admin.php:731
 msgid ""
 "Type of community page to show. 'Global community' shows every public "
 "posting from an open distributed network that arrived on this server."
 msgstr ""
 
-#: ../../mod/admin.php:668
+#: mod/admin.php:732
 msgid "Posts per user on community page"
 msgstr ""
 
-#: ../../mod/admin.php:668
+#: mod/admin.php:732
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr ""
 
-#: ../../mod/admin.php:669
+#: mod/admin.php:733
 msgid "Enable OStatus support"
 msgstr "Włącz wsparcie OStatus"
 
-#: ../../mod/admin.php:669
+#: mod/admin.php:733
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: mod/admin.php:734
 msgid "OStatus conversation completion interval"
 msgstr ""
 
-#: ../../mod/admin.php:670
+#: mod/admin.php:734
 msgid ""
 "How often shall the poller check for new entries in OStatus conversations? "
 "This can be a very ressource task."
 msgstr ""
 
-#: ../../mod/admin.php:671
+#: mod/admin.php:735
 msgid "Enable Diaspora support"
 msgstr "Włączyć obsługę Diaspory"
 
-#: ../../mod/admin.php:671
+#: mod/admin.php:735
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:672
+#: mod/admin.php:736
 msgid "Only allow Friendica contacts"
 msgstr "Dopuść tylko kontakty Friendrica"
 
-#: ../../mod/admin.php:672
+#: mod/admin.php:736
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:673
+#: mod/admin.php:737
 msgid "Verify SSL"
 msgstr "Weryfikacja SSL"
 
-#: ../../mod/admin.php:673
+#: mod/admin.php:737
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:674
+#: mod/admin.php:738
 msgid "Proxy user"
 msgstr "Użytkownik proxy"
 
-#: ../../mod/admin.php:675
+#: mod/admin.php:739
 msgid "Proxy URL"
 msgstr "URL Proxy"
 
-#: ../../mod/admin.php:676
+#: mod/admin.php:740
 msgid "Network timeout"
 msgstr "Network timeout"
 
-#: ../../mod/admin.php:676
+#: mod/admin.php:740
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:677
+#: mod/admin.php:741
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:677
+#: mod/admin.php:741
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:678
+#: mod/admin.php:742
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:678
+#: mod/admin.php:742
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:679
+#: mod/admin.php:743
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:679
+#: mod/admin.php:743
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:681
+#: mod/admin.php:744
+msgid "Maximum Load Average (Frontend)"
+msgstr ""
+
+#: mod/admin.php:744
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr ""
+
+#: mod/admin.php:746
+msgid "Periodical check of global contacts"
+msgstr ""
+
+#: mod/admin.php:746
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr ""
+
+#: mod/admin.php:747
+msgid "Discover contacts from other servers"
+msgstr ""
+
+#: mod/admin.php:747
+msgid ""
+"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'."
+msgstr ""
+
+#: mod/admin.php:748
+msgid "Timeframe for fetching global contacts"
+msgstr ""
+
+#: mod/admin.php:748
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr ""
+
+#: mod/admin.php:749
+msgid "Search the local directory"
+msgstr ""
+
+#: mod/admin.php:749
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:751
+msgid "Publish server information"
+msgstr ""
+
+#: mod/admin.php:751
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:753
 msgid "Use MySQL full text engine"
 msgstr ""
 
-#: ../../mod/admin.php:681
+#: mod/admin.php:753
 msgid ""
 "Activates the full text engine. Speeds up search - but can only search for "
 "four and more characters."
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: mod/admin.php:754
 msgid "Suppress Language"
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: mod/admin.php:754
 msgid "Suppress language information in meta information about a posting."
 msgstr ""
 
-#: ../../mod/admin.php:683
+#: mod/admin.php:755
 msgid "Suppress Tags"
 msgstr ""
 
-#: ../../mod/admin.php:683
+#: mod/admin.php:755
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: ../../mod/admin.php:684
+#: mod/admin.php:756
 msgid "Path to item cache"
 msgstr ""
 
-#: ../../mod/admin.php:685
+#: mod/admin.php:756
+msgid "The item caches buffers generated bbcode and external images."
+msgstr ""
+
+#: mod/admin.php:757
 msgid "Cache duration in seconds"
 msgstr ""
 
-#: ../../mod/admin.php:685
+#: mod/admin.php:757
 msgid ""
 "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."
 msgstr ""
 
-#: ../../mod/admin.php:686
+#: mod/admin.php:758
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: ../../mod/admin.php:686
+#: mod/admin.php:758
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: ../../mod/admin.php:687
+#: mod/admin.php:759
 msgid "Path for lock file"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: mod/admin.php:759
+msgid ""
+"The lock file is used to avoid multiple pollers at one time. Only define a "
+"folder here."
+msgstr ""
+
+#: mod/admin.php:760
 msgid "Temp path"
 msgstr "Ścieżka do Temp"
 
-#: ../../mod/admin.php:689
+#: mod/admin.php:760
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr ""
+
+#: mod/admin.php:761
 msgid "Base path to installation"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: mod/admin.php:761
+msgid ""
+"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."
+msgstr ""
+
+#: mod/admin.php:762
 msgid "Disable picture proxy"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: mod/admin.php:762
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwith."
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: mod/admin.php:763
 msgid "Enable old style pager"
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: mod/admin.php:763
 msgid ""
 "The old style pager has page numbers but slows down massively the page "
 "speed."
 msgstr ""
 
-#: ../../mod/admin.php:692
+#: mod/admin.php:764
 msgid "Only search in tags"
 msgstr ""
 
-#: ../../mod/admin.php:692
+#: mod/admin.php:764
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: ../../mod/admin.php:694
+#: mod/admin.php:766
 msgid "New base url"
 msgstr ""
 
-#: ../../mod/admin.php:711
+#: mod/admin.php:766
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts"
+" of all users."
+msgstr ""
+
+#: mod/admin.php:768
+msgid "RINO Encryption"
+msgstr ""
+
+#: mod/admin.php:768
+msgid "Encryption layer between nodes."
+msgstr ""
+
+#: mod/admin.php:769
+msgid "Embedly API key"
+msgstr ""
+
+#: mod/admin.php:769
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr ""
+
+#: mod/admin.php:787
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:719
+#: mod/admin.php:795
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:722
+#: mod/admin.php:798
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: ../../mod/admin.php:734
+#: mod/admin.php:810
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: ../../mod/admin.php:737
+#: mod/admin.php:813
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:741
+#: mod/admin.php:817
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:743
+#: mod/admin.php:819
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: ../../mod/admin.php:762
+#: mod/admin.php:838
 msgid "No failed updates."
 msgstr "Brak błędów aktualizacji."
 
-#: ../../mod/admin.php:763
+#: mod/admin.php:839
 msgid "Check database structure"
 msgstr ""
 
-#: ../../mod/admin.php:768
+#: mod/admin.php:844
 msgid "Failed Updates"
 msgstr "Błąd aktualizacji"
 
-#: ../../mod/admin.php:769
+#: mod/admin.php:845
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:770
+#: mod/admin.php:846
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:771
+#: mod/admin.php:847
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:803
+#: mod/admin.php:879
 #, php-format
 msgid ""
 "\n"
@@ -2645,7 +2846,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: ../../mod/admin.php:806
+#: mod/admin.php:882
 #, php-format
 msgid ""
 "\n"
@@ -2675,12 +2876,12 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: ../../mod/admin.php:838 ../../include/user.php:413
+#: mod/admin.php:914 include/user.php:421
 #, php-format
 msgid "Registration details for %s"
 msgstr "Szczegóły rejestracji dla %s"
 
-#: ../../mod/admin.php:850
+#: mod/admin.php:926
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -2688,7 +2889,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../mod/admin.php:857
+#: mod/admin.php:933
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -2696,269 +2897,268 @@ msgstr[0] " %s użytkownik usunięty"
 msgstr[1] " %s użytkownicy usunięci"
 msgstr[2] " %s usuniętych użytkowników "
 
-#: ../../mod/admin.php:896
+#: mod/admin.php:972
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Użytkownik '%s' usunięty"
 
-#: ../../mod/admin.php:904
+#: mod/admin.php:980
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Użytkownik '%s' odblokowany"
 
-#: ../../mod/admin.php:904
+#: mod/admin.php:980
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Użytkownik '%s' zablokowany"
 
-#: ../../mod/admin.php:999
+#: mod/admin.php:1073
 msgid "Add User"
 msgstr ""
 
-#: ../../mod/admin.php:1000
+#: mod/admin.php:1074
 msgid "select all"
 msgstr "Zaznacz wszystko"
 
-#: ../../mod/admin.php:1001
+#: mod/admin.php:1075
 msgid "User registrations waiting for confirm"
 msgstr "zarejestrowany użytkownik czeka na potwierdzenie"
 
-#: ../../mod/admin.php:1002
+#: mod/admin.php:1076
 msgid "User waiting for permanent deletion"
 msgstr "Użytkownik czekający na trwałe usunięcie"
 
-#: ../../mod/admin.php:1003
+#: mod/admin.php:1077
 msgid "Request date"
 msgstr "Data prośby"
 
-#: ../../mod/admin.php:1003 ../../mod/admin.php:1015 ../../mod/admin.php:1016
-#: ../../mod/admin.php:1031 ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86
+#: mod/admin.php:1077 mod/admin.php:1089 mod/admin.php:1090 mod/admin.php:1105
+#: include/contact_selectors.php:79 include/contact_selectors.php:86
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../mod/admin.php:1004
+#: mod/admin.php:1078
 msgid "No registrations."
 msgstr "brak rejestracji"
 
-#: ../../mod/admin.php:1006
+#: mod/admin.php:1080
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../../mod/admin.php:1010
+#: mod/admin.php:1084
 msgid "Site admin"
 msgstr "Administracja stroną"
 
-#: ../../mod/admin.php:1011
+#: mod/admin.php:1085
 msgid "Account expired"
 msgstr "Konto wygasło."
 
-#: ../../mod/admin.php:1014
+#: mod/admin.php:1088
 msgid "New User"
 msgstr ""
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: mod/admin.php:1089 mod/admin.php:1090
 msgid "Register date"
 msgstr "Data rejestracji"
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: mod/admin.php:1089 mod/admin.php:1090
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: mod/admin.php:1089 mod/admin.php:1090
 msgid "Last item"
 msgstr "Ostatni element"
 
-#: ../../mod/admin.php:1015
+#: mod/admin.php:1089
 msgid "Deleted since"
 msgstr "Skasowany od"
 
-#: ../../mod/admin.php:1016 ../../mod/settings.php:36
+#: mod/admin.php:1090 mod/settings.php:41
 msgid "Account"
 msgstr "Konto"
 
-#: ../../mod/admin.php:1018
+#: mod/admin.php:1092
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Zaznaczeni użytkownicy zostaną usunięci!\\n\\nWszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
 
-#: ../../mod/admin.php:1019
+#: mod/admin.php:1093
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Użytkownik {0} zostanie usunięty!\\n\\nWszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
 
-#: ../../mod/admin.php:1029
+#: mod/admin.php:1103
 msgid "Name of the new user."
 msgstr "Nazwa nowego użytkownika."
 
-#: ../../mod/admin.php:1030
+#: mod/admin.php:1104
 msgid "Nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1030
+#: mod/admin.php:1104
 msgid "Nickname of the new user."
 msgstr ""
 
-#: ../../mod/admin.php:1031
+#: mod/admin.php:1105
 msgid "Email address of the new user."
 msgstr "Adres email nowego użytkownika."
 
-#: ../../mod/admin.php:1064
+#: mod/admin.php:1138
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Wtyczka %s wyłączona."
 
-#: ../../mod/admin.php:1068
+#: mod/admin.php:1142
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Wtyczka %s właczona."
 
-#: ../../mod/admin.php:1078 ../../mod/admin.php:1294
+#: mod/admin.php:1152 mod/admin.php:1375
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../../mod/admin.php:1080 ../../mod/admin.php:1296
+#: mod/admin.php:1154 mod/admin.php:1377
 msgid "Enable"
 msgstr "Zezwól"
 
-#: ../../mod/admin.php:1103 ../../mod/admin.php:1324
+#: mod/admin.php:1177 mod/admin.php:1405
 msgid "Toggle"
 msgstr "Włącz"
 
-#: ../../mod/admin.php:1111 ../../mod/admin.php:1334
+#: mod/admin.php:1185 mod/admin.php:1415
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:1112 ../../mod/admin.php:1335
+#: mod/admin.php:1186 mod/admin.php:1416
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1254
+#: mod/admin.php:1335
 msgid "No themes found."
 msgstr "Nie znaleziono tematu."
 
-#: ../../mod/admin.php:1316
+#: mod/admin.php:1397
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: ../../mod/admin.php:1362
+#: mod/admin.php:1443
 msgid "[Experimental]"
 msgstr "[Eksperymentalne]"
 
-#: ../../mod/admin.php:1363
+#: mod/admin.php:1444
 msgid "[Unsupported]"
 msgstr "[Niewspieralne]"
 
-#: ../../mod/admin.php:1390
+#: mod/admin.php:1471
 msgid "Log settings updated."
 msgstr "Zaktualizowano ustawienia logów."
 
-#: ../../mod/admin.php:1446
+#: mod/admin.php:1527
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: ../../mod/admin.php:1452
+#: mod/admin.php:1533
 msgid "Enable Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1453
+#: mod/admin.php:1534
 msgid "Log file"
 msgstr "Plik logów"
 
-#: ../../mod/admin.php:1453
+#: mod/admin.php:1534
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1454
+#: mod/admin.php:1535
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: ../../mod/admin.php:1504
+#: mod/admin.php:1585 include/acl_selectors.php:347
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../../mod/admin.php:1510
+#: mod/admin.php:1591
 msgid "FTP Host"
 msgstr "Założyciel FTP"
 
-#: ../../mod/admin.php:1511
+#: mod/admin.php:1592
 msgid "FTP Path"
 msgstr "Ścieżka FTP"
 
-#: ../../mod/admin.php:1512
+#: mod/admin.php:1593
 msgid "FTP User"
 msgstr "Użytkownik FTP"
 
-#: ../../mod/admin.php:1513
+#: mod/admin.php:1594
 msgid "FTP Password"
 msgstr "FTP Hasło"
 
-#: ../../mod/network.php:142
-msgid "Search Results For:"
-msgstr "Szukaj wyników dla:"
+#: mod/network.php:143
+#, php-format
+msgid "Search Results For: %s"
+msgstr ""
 
-#: ../../mod/network.php:185 ../../mod/search.php:21
+#: mod/network.php:187 mod/search.php:25
 msgid "Remove term"
 msgstr "Usuń wpis"
 
-#: ../../mod/network.php:194 ../../mod/search.php:30
-#: ../../include/features.php:42
+#: mod/network.php:196 mod/search.php:34 include/features.php:42
 msgid "Saved Searches"
 msgstr "Zapisane wyszukiwania"
 
-#: ../../mod/network.php:195 ../../include/group.php:275
+#: mod/network.php:197 include/group.php:277
 msgid "add"
 msgstr "dodaj"
 
-#: ../../mod/network.php:356
+#: mod/network.php:358
 msgid "Commented Order"
 msgstr "Porządek wg komentarzy"
 
-#: ../../mod/network.php:359
+#: mod/network.php:361
 msgid "Sort by Comment Date"
 msgstr "Sortuj po dacie komentarza"
 
-#: ../../mod/network.php:362
+#: mod/network.php:365
 msgid "Posted Order"
 msgstr "Porządek wg wpisów"
 
-#: ../../mod/network.php:365
+#: mod/network.php:368
 msgid "Sort by Post Date"
 msgstr "Sortuj po dacie posta"
 
-#: ../../mod/network.php:374
+#: mod/network.php:378
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:380
+#: mod/network.php:385
 msgid "New"
 msgstr "Nowy"
 
-#: ../../mod/network.php:383
+#: mod/network.php:388
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:389
+#: mod/network.php:395
 msgid "Shared Links"
 msgstr "Współdzielone linki"
 
-#: ../../mod/network.php:392
+#: mod/network.php:398
 msgid "Interesting Links"
 msgstr "Interesujące linki"
 
-#: ../../mod/network.php:398
+#: mod/network.php:405
 msgid "Starred"
-msgstr ""
+msgstr "Ulubione"
 
-#: ../../mod/network.php:401
+#: mod/network.php:408
 msgid "Favourite Posts"
 msgstr "Ulubione posty"
 
-#: ../../mod/network.php:463
+#: mod/network.php:466
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2967,151 +3167,150 @@ msgstr[0] "Uwaga: Ta grupa posiada %s członka z niezabezpieczonej sieci."
 msgstr[1] "Uwaga: Ta grupa posiada %s członków z niezabezpieczonej sieci."
 msgstr[2] "Uwaga: Ta grupa posiada %s członków z niezabezpieczonej sieci."
 
-#: ../../mod/network.php:466
+#: mod/network.php:469
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Prywatne wiadomości do tej grupy mogą zostać publicznego ujawnienia"
 
-#: ../../mod/network.php:520 ../../mod/content.php:119
+#: mod/network.php:532 mod/content.php:119
 msgid "No such group"
 msgstr "Nie ma takiej grupy"
 
-#: ../../mod/network.php:537 ../../mod/content.php:130
+#: mod/network.php:549 mod/content.php:130
 msgid "Group is empty"
 msgstr "Grupa jest pusta"
 
-#: ../../mod/network.php:544 ../../mod/content.php:134
-msgid "Group: "
-msgstr "Grupa:"
+#: mod/network.php:560 mod/content.php:135
+#, php-format
+msgid "Group: %s"
+msgstr ""
 
-#: ../../mod/network.php:554
-msgid "Contact: "
-msgstr "Kontakt: "
+#: mod/network.php:578
+#, php-format
+msgid "Contact: %s"
+msgstr ""
 
-#: ../../mod/network.php:556
+#: mod/network.php:582
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
 
-#: ../../mod/network.php:561
+#: mod/network.php:587
 msgid "Invalid contact."
 msgstr "Zły kontakt"
 
-#: ../../mod/allfriends.php:34
+#: mod/allfriends.php:37
 #, php-format
 msgid "Friends of %s"
 msgstr "Znajomy %s"
 
-#: ../../mod/allfriends.php:40
+#: mod/allfriends.php:44
 msgid "No friends to display."
 msgstr "Brak znajomych do wyświetlenia"
 
-#: ../../mod/events.php:66
+#: mod/events.php:71 mod/events.php:73
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: mod/events.php:80 mod/events.php:82
 msgid "Event title and start time are required."
 msgstr "Wymagany tytuł wydarzenia i czas rozpoczęcia."
 
-#: ../../mod/events.php:291
+#: mod/events.php:317
 msgid "l, F j"
 msgstr "d, M d "
 
-#: ../../mod/events.php:313
+#: mod/events.php:339
 msgid "Edit event"
 msgstr "Edytuj wydarzenie"
 
-#: ../../mod/events.php:335 ../../include/text.php:1647
-#: ../../include/text.php:1657
+#: mod/events.php:361 include/text.php:1716 include/text.php:1723
 msgid "link to source"
 msgstr "link do źródła"
 
-#: ../../mod/events.php:370 ../../boot.php:2143 ../../include/nav.php:80
-#: ../../view/theme/diabook/theme.php:127
+#: mod/events.php:396 include/identity.php:667 include/nav.php:80
+#: view/theme/diabook/theme.php:127
 msgid "Events"
 msgstr "Wydarzenia"
 
-#: ../../mod/events.php:371
+#: mod/events.php:397
 msgid "Create New Event"
 msgstr "Stwórz nowe wydarzenie"
 
-#: ../../mod/events.php:372
+#: mod/events.php:398
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../../mod/events.php:373 ../../mod/install.php:207
+#: mod/events.php:399 mod/install.php:209
 msgid "Next"
 msgstr "Następny"
 
-#: ../../mod/events.php:446
-msgid "hour:minute"
-msgstr "godzina:minuta"
-
-#: ../../mod/events.php:456
+#: mod/events.php:491
 msgid "Event details"
 msgstr "Szczegóły wydarzenia"
 
-#: ../../mod/events.php:457
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
-msgstr "Wymagany format %s %s. Data rozpoczęcia i Tytuł są konieczne."
+#: mod/events.php:492
+msgid "Starting date and Title are required."
+msgstr ""
 
-#: ../../mod/events.php:459
+#: mod/events.php:493
 msgid "Event Starts:"
 msgstr "Rozpoczęcie wydarzenia:"
 
-#: ../../mod/events.php:459 ../../mod/events.php:473
+#: mod/events.php:493 mod/events.php:505
 msgid "Required"
 msgstr "Wymagany"
 
-#: ../../mod/events.php:462
+#: mod/events.php:495
 msgid "Finish date/time is not known or not relevant"
 msgstr "Data/czas zakończenia nie jest znana lub jest nieistotna"
 
-#: ../../mod/events.php:464
+#: mod/events.php:497
 msgid "Event Finishes:"
 msgstr "Zakończenie wydarzenia:"
 
-#: ../../mod/events.php:467
+#: mod/events.php:499
 msgid "Adjust for viewer timezone"
 msgstr "Dopasuj dla strefy czasowej widza"
 
-#: ../../mod/events.php:469
+#: mod/events.php:501
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../../mod/events.php:471 ../../mod/directory.php:136 ../../boot.php:1648
-#: ../../include/bb2diaspora.php:170 ../../include/event.php:40
-msgid "Location:"
-msgstr "Lokalizacja"
-
-#: ../../mod/events.php:473
+#: mod/events.php:505
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../../mod/events.php:475
+#: mod/events.php:507
 msgid "Share this event"
 msgstr "Udostępnij te wydarzenie"
 
-#: ../../mod/content.php:437 ../../mod/content.php:740
-#: ../../mod/photos.php:1653 ../../object/Item.php:129
-#: ../../include/conversation.php:613
+#: mod/events.php:509 mod/content.php:721 mod/editpost.php:145
+#: mod/photos.php:1585 mod/photos.php:1629 mod/photos.php:1717
+#: object/Item.php:689 include/conversation.php:1089
+msgid "Preview"
+msgstr "Podgląd"
+
+#: mod/content.php:439 mod/content.php:742 mod/photos.php:1672
+#: object/Item.php:130 include/conversation.php:612
 msgid "Select"
 msgstr "Wybierz"
 
-#: ../../mod/content.php:471 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../object/Item.php:326
-#: ../../object/Item.php:327 ../../include/conversation.php:654
+#: mod/content.php:473 mod/content.php:854 mod/content.php:855
+#: object/Item.php:328 object/Item.php:329 include/conversation.php:653
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Pokaż %s's profil @ %s"
 
-#: ../../mod/content.php:481 ../../mod/content.php:864
-#: ../../object/Item.php:340 ../../include/conversation.php:674
+#: mod/content.php:483 mod/content.php:866 object/Item.php:342
+#: include/conversation.php:673
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
 
-#: ../../mod/content.php:497 ../../include/conversation.php:690
+#: mod/content.php:499 include/conversation.php:689
 msgid "View in context"
 msgstr "Zobacz w kontekście"
 
-#: ../../mod/content.php:603 ../../object/Item.php:387
+#: mod/content.php:605 object/Item.php:389
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3119,1202 +3318,1213 @@ msgstr[0] " %d komentarz"
 msgstr[1] " %d komentarzy"
 msgstr[2] " %d komentarzy"
 
-#: ../../mod/content.php:605 ../../object/Item.php:389
-#: ../../object/Item.php:402 ../../include/text.php:1972
+#: mod/content.php:607 object/Item.php:391 object/Item.php:404
+#: include/text.php:2038
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "komentarz"
 
-#: ../../mod/content.php:606 ../../boot.php:751 ../../object/Item.php:390
-#: ../../include/contact_widgets.php:205
+#: mod/content.php:608 boot.php:765 object/Item.php:392
+#: include/contact_widgets.php:205 include/items.php:5134
 msgid "show more"
 msgstr "Pokaż więcej"
 
-#: ../../mod/content.php:620 ../../mod/photos.php:1359
-#: ../../object/Item.php:116
+#: mod/content.php:622 mod/photos.php:1379 object/Item.php:117
 msgid "Private Message"
 msgstr "Wiadomość prywatna"
 
-#: ../../mod/content.php:684 ../../mod/photos.php:1542
-#: ../../object/Item.php:231
+#: mod/content.php:686 mod/photos.php:1561 object/Item.php:232
 msgid "I like this (toggle)"
 msgstr "Lubię to (zmień)"
 
-#: ../../mod/content.php:684 ../../object/Item.php:231
+#: mod/content.php:686 object/Item.php:232
 msgid "like"
 msgstr "polub"
 
-#: ../../mod/content.php:685 ../../mod/photos.php:1543
-#: ../../object/Item.php:232
+#: mod/content.php:687 mod/photos.php:1562 object/Item.php:233
 msgid "I don't like this (toggle)"
 msgstr "Nie lubię (zmień)"
 
-#: ../../mod/content.php:685 ../../object/Item.php:232
+#: mod/content.php:687 object/Item.php:233
 msgid "dislike"
 msgstr "Nie lubię"
 
-#: ../../mod/content.php:687 ../../object/Item.php:234
+#: mod/content.php:689 object/Item.php:235
 msgid "Share this"
 msgstr "Udostępnij to"
 
-#: ../../mod/content.php:687 ../../object/Item.php:234
+#: mod/content.php:689 object/Item.php:235
 msgid "share"
 msgstr "udostępnij"
 
-#: ../../mod/content.php:707 ../../mod/photos.php:1562
-#: ../../mod/photos.php:1606 ../../mod/photos.php:1694
-#: ../../object/Item.php:675
+#: mod/content.php:709 mod/photos.php:1581 mod/photos.php:1625
+#: mod/photos.php:1713 object/Item.php:677
 msgid "This is you"
 msgstr "To jesteś ty"
 
-#: ../../mod/content.php:709 ../../mod/photos.php:1564
-#: ../../mod/photos.php:1608 ../../mod/photos.php:1696 ../../boot.php:750
-#: ../../object/Item.php:361 ../../object/Item.php:677
+#: mod/content.php:711 mod/photos.php:1583 mod/photos.php:1627
+#: mod/photos.php:1715 boot.php:764 object/Item.php:363 object/Item.php:679
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../../mod/content.php:711 ../../object/Item.php:679
+#: mod/content.php:713 object/Item.php:681
 msgid "Bold"
 msgstr "Pogrubienie"
 
-#: ../../mod/content.php:712 ../../object/Item.php:680
+#: mod/content.php:714 object/Item.php:682
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../../mod/content.php:713 ../../object/Item.php:681
+#: mod/content.php:715 object/Item.php:683
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../../mod/content.php:714 ../../object/Item.php:682
+#: mod/content.php:716 object/Item.php:684
 msgid "Quote"
 msgstr "Cytat"
 
-#: ../../mod/content.php:715 ../../object/Item.php:683
+#: mod/content.php:717 object/Item.php:685
 msgid "Code"
 msgstr "Kod"
 
-#: ../../mod/content.php:716 ../../object/Item.php:684
+#: mod/content.php:718 object/Item.php:686
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../mod/content.php:717 ../../object/Item.php:685
+#: mod/content.php:719 object/Item.php:687
 msgid "Link"
 msgstr "Link"
 
-#: ../../mod/content.php:718 ../../object/Item.php:686
+#: mod/content.php:720 object/Item.php:688
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:719 ../../mod/editpost.php:145
-#: ../../mod/photos.php:1566 ../../mod/photos.php:1610
-#: ../../mod/photos.php:1698 ../../object/Item.php:687
-#: ../../include/conversation.php:1126
-msgid "Preview"
-msgstr "Podgląd"
-
-#: ../../mod/content.php:728 ../../mod/settings.php:676
-#: ../../object/Item.php:120
+#: mod/content.php:730 mod/settings.php:694 object/Item.php:121
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../../mod/content.php:753 ../../object/Item.php:195
+#: mod/content.php:755 object/Item.php:196
 msgid "add star"
 msgstr "dodaj gwiazdkę"
 
-#: ../../mod/content.php:754 ../../object/Item.php:196
+#: mod/content.php:756 object/Item.php:197
 msgid "remove star"
 msgstr "anuluj gwiazdkę"
 
-#: ../../mod/content.php:755 ../../object/Item.php:197
+#: mod/content.php:757 object/Item.php:198
 msgid "toggle star status"
 msgstr "włącz status gwiazdy"
 
-#: ../../mod/content.php:758 ../../object/Item.php:200
+#: mod/content.php:760 object/Item.php:201
 msgid "starred"
 msgstr "gwiazdką"
 
-#: ../../mod/content.php:759 ../../object/Item.php:220
+#: mod/content.php:761 object/Item.php:221
 msgid "add tag"
 msgstr "dodaj tag"
 
-#: ../../mod/content.php:763 ../../object/Item.php:133
+#: mod/content.php:765 object/Item.php:134
 msgid "save to folder"
 msgstr "zapisz w folderze"
 
-#: ../../mod/content.php:854 ../../object/Item.php:328
+#: mod/content.php:856 object/Item.php:330
 msgid "to"
 msgstr "do"
 
-#: ../../mod/content.php:855 ../../object/Item.php:330
+#: mod/content.php:857 object/Item.php:332
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../mod/content.php:856 ../../object/Item.php:331
+#: mod/content.php:858 object/Item.php:333
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../mod/removeme.php:46 ../../mod/removeme.php:49
+#: mod/removeme.php:46 mod/removeme.php:49
 msgid "Remove My Account"
 msgstr "Usuń konto"
 
-#: ../../mod/removeme.php:47
+#: mod/removeme.php:47
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "Kompletne usunięcie konta. Jeżeli zostanie wykonane, konto nie może zostać odzyskane."
 
-#: ../../mod/removeme.php:48
+#: mod/removeme.php:48
 msgid "Please enter your password for verification:"
 msgstr "Wprowadź hasło w celu weryfikacji."
 
-#: ../../mod/install.php:117
+#: mod/install.php:119
 msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/install.php:123
+#: mod/install.php:125
 msgid "Could not connect to database."
 msgstr "Nie można nawiązać połączenia z bazą danych"
 
-#: ../../mod/install.php:127
+#: mod/install.php:129
 msgid "Could not create table."
 msgstr "Nie mogę stworzyć tabeli."
 
-#: ../../mod/install.php:133
+#: mod/install.php:135
 msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/install.php:138
+#: mod/install.php:140
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql."
 
-#: ../../mod/install.php:139 ../../mod/install.php:206
-#: ../../mod/install.php:525
+#: mod/install.php:141 mod/install.php:208 mod/install.php:530
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Proszę przejrzeć plik \"INSTALL.txt\"."
 
-#: ../../mod/install.php:203
+#: mod/install.php:153
+msgid "Database already in use."
+msgstr ""
+
+#: mod/install.php:205
 msgid "System check"
 msgstr "Sprawdzanie systemu"
 
-#: ../../mod/install.php:208
+#: mod/install.php:210
 msgid "Check again"
 msgstr "Sprawdź ponownie"
 
-#: ../../mod/install.php:227
+#: mod/install.php:229
 msgid "Database connection"
 msgstr "Połączenie z bazą danych"
 
-#: ../../mod/install.php:228
+#: mod/install.php:230
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych."
 
-#: ../../mod/install.php:229
+#: mod/install.php:231
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień ."
 
-#: ../../mod/install.php:230
+#: mod/install.php:232
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją."
 
-#: ../../mod/install.php:234
+#: mod/install.php:236
 msgid "Database Server Name"
 msgstr "Baza danych - Nazwa serwera"
 
-#: ../../mod/install.php:235
+#: mod/install.php:237
 msgid "Database Login Name"
 msgstr "Baza danych - Nazwa loginu"
 
-#: ../../mod/install.php:236
+#: mod/install.php:238
 msgid "Database Login Password"
 msgstr "Baza danych - Hasło loginu"
 
-#: ../../mod/install.php:237
+#: mod/install.php:239
 msgid "Database Name"
 msgstr "Baza danych - Nazwa"
 
-#: ../../mod/install.php:238 ../../mod/install.php:277
+#: mod/install.php:240 mod/install.php:279
 msgid "Site administrator email address"
 msgstr "Adres e-mail administratora strony"
 
-#: ../../mod/install.php:238 ../../mod/install.php:277
+#: mod/install.php:240 mod/install.php:279
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/install.php:242 ../../mod/install.php:280
+#: mod/install.php:244 mod/install.php:282
 msgid "Please select a default timezone for your website"
 msgstr "Proszę wybrać domyślną strefę czasową dla swojej strony"
 
-#: ../../mod/install.php:267
+#: mod/install.php:269
 msgid "Site settings"
 msgstr "Ustawienia strony"
 
-#: ../../mod/install.php:321
+#: mod/install.php:323
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nie można znaleźć wersji PHP komendy w serwerze PATH"
 
-#: ../../mod/install.php:322
+#: mod/install.php:324
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: ../../mod/install.php:326
+#: mod/install.php:328
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:326
+#: mod/install.php:328
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/install.php:331
+#: mod/install.php:333
 msgid "Command line PHP"
 msgstr "Linia komend PHP"
 
-#: ../../mod/install.php:340
+#: mod/install.php:342
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: ../../mod/install.php:341
+#: mod/install.php:343
 msgid "Found PHP version: "
 msgstr "Znaleziono wersje PHP:"
 
-#: ../../mod/install.php:343
+#: mod/install.php:345
 msgid "PHP cli binary"
 msgstr ""
 
-#: ../../mod/install.php:354
+#: mod/install.php:356
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Wersja linii poleceń PHP w twoim systemie nie ma aktywowanego \"register_argc_argv\"."
 
-#: ../../mod/install.php:355
+#: mod/install.php:357
 msgid "This is required for message delivery to work."
 msgstr "To jest wymagane do dostarczenia wiadomości do pracy."
 
-#: ../../mod/install.php:357
+#: mod/install.php:359
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:378
+#: mod/install.php:380
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Błąd : funkcja systemu  \"openssl_pkey_new\"  nie jest  w stanie wygenerować klucza szyfrującego ."
 
-#: ../../mod/install.php:379
+#: mod/install.php:381
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Jeśli korzystasz z Windowsa, proszę odwiedzić \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/install.php:381
+#: mod/install.php:383
 msgid "Generate encryption keys"
 msgstr "Generuj klucz kodowania"
 
-#: ../../mod/install.php:388
+#: mod/install.php:390
 msgid "libCurl PHP module"
 msgstr "Moduł libCurl PHP"
 
-#: ../../mod/install.php:389
+#: mod/install.php:391
 msgid "GD graphics PHP module"
 msgstr "Moduł PHP-GD"
 
-#: ../../mod/install.php:390
+#: mod/install.php:392
 msgid "OpenSSL PHP module"
 msgstr "Moduł PHP OpenSSL"
 
-#: ../../mod/install.php:391
+#: mod/install.php:393
 msgid "mysqli PHP module"
 msgstr "Moduł mysql PHP"
 
-#: ../../mod/install.php:392
+#: mod/install.php:394
 msgid "mb_string PHP module"
 msgstr "Moduł mb_string PHP"
 
-#: ../../mod/install.php:397 ../../mod/install.php:399
+#: mod/install.php:399 mod/install.php:401
 msgid "Apache mod_rewrite module"
 msgstr "Moduł Apache mod_rewrite"
 
-#: ../../mod/install.php:397
+#: mod/install.php:399
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Błąd: moduł Apache webserver mod-rewrite jest potrzebny, jednakże nie jest zainstalowany."
 
-#: ../../mod/install.php:405
+#: mod/install.php:407
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Błąd: libCURL PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:409
+#: mod/install.php:411
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany."
 
-#: ../../mod/install.php:413
+#: mod/install.php:415
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:417
+#: mod/install.php:419
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany."
 
-#: ../../mod/install.php:421
+#: mod/install.php:423
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Błąd: moduł PHP mb_string  jest wymagany ale nie jest zainstalowany"
 
-#: ../../mod/install.php:438
+#: mod/install.php:440
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Instalator WWW musi być w stanie utworzyć plik o nazwie \". Htconfig.php\"  i nie jest w stanie tego zrobić."
 
-#: ../../mod/install.php:439
+#: mod/install.php:441
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:440
+#: mod/install.php:442
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:441
+#: mod/install.php:443
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:444
+#: mod/install.php:446
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php jest zapisywalny"
 
-#: ../../mod/install.php:454
+#: mod/install.php:456
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/install.php:455
+#: mod/install.php:457
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
 msgstr ""
 
-#: ../../mod/install.php:456
+#: mod/install.php:458
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr ""
 
-#: ../../mod/install.php:457
+#: mod/install.php:459
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/install.php:460
+#: mod/install.php:462
 msgid "view/smarty3 is writable"
 msgstr ""
 
-#: ../../mod/install.php:472
+#: mod/install.php:478
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/install.php:474
+#: mod/install.php:480
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/install.php:484
+#: mod/install.php:489
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera."
 
-#: ../../mod/install.php:523
+#: mod/install.php:528
 msgid "<h1>What next</h1>"
 msgstr "<h1>Co dalej</h1>"
 
-#: ../../mod/install.php:524
+#: mod/install.php:529
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "WAŻNE: Musisz [ręcznie] skonfigurowć zaplanowane zadanie dla poller."
 
-#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#: mod/wallmessage.php:42 mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr "Dzienny limit wiadomości na murze dla %s został przekroczony. Wiadomość została odrzucona."
 
-#: ../../mod/wallmessage.php:59
+#: mod/wallmessage.php:59
 msgid "Unable to check your home location."
 msgstr "Nie można sprawdzić twojej lokalizacji."
 
-#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
 msgid "No recipient."
 msgstr "Brak odbiorcy."
 
-#: ../../mod/wallmessage.php:143
+#: mod/wallmessage.php:143
 #, php-format
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/help.php:79
+#: mod/help.php:31
 msgid "Help:"
 msgstr "Pomoc:"
 
-#: ../../mod/help.php:84 ../../include/nav.php:114
+#: mod/help.php:36 include/nav.php:114
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../../mod/help.php:90 ../../index.php:256
+#: mod/help.php:42 mod/p.php:16 mod/p.php:25 index.php:269
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: ../../mod/help.php:93 ../../index.php:259
+#: mod/help.php:45 index.php:272
 msgid "Page not found."
 msgstr "Strona nie znaleziona."
 
-#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
+#: mod/dfrn_poll.php:103 mod/dfrn_poll.php:536
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr "%1$s witamy %2$s"
 
-#: ../../mod/home.php:35
+#: mod/home.php:35
 #, php-format
 msgid "Welcome to %s"
 msgstr "Witamy w %s"
 
-#: ../../mod/wall_attach.php:75
+#: mod/wall_attach.php:83
 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: ../../mod/wall_attach.php:75
+#: mod/wall_attach.php:83
 msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: ../../mod/wall_attach.php:81
+#: mod/wall_attach.php:94
 #, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Plik przekracza dozwolony rozmiar %d"
+msgid "File exceeds size limit of %s"
+msgstr ""
 
-#: ../../mod/wall_attach.php:122 ../../mod/wall_attach.php:133
+#: mod/wall_attach.php:145 mod/wall_attach.php:161
 msgid "File upload failed."
 msgstr "Przesyłanie pliku nie powiodło się."
 
-#: ../../mod/match.php:12
+#: mod/match.php:13
 msgid "Profile Match"
 msgstr "Profil zgodny "
 
-#: ../../mod/match.php:20
+#: mod/match.php:22
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Brak słów-kluczy do wyszukania. Dodaj słowa-klucze do swojego domyślnego profilu."
 
-#: ../../mod/match.php:57
+#: mod/match.php:64
 msgid "is interested in:"
 msgstr "interesuje się:"
 
-#: ../../mod/match.php:58 ../../mod/suggest.php:90 ../../boot.php:1568
-#: ../../include/contact_widgets.php:10
-msgid "Connect"
-msgstr "Połącz"
-
-#: ../../mod/share.php:44
+#: mod/share.php:38
 msgid "link"
 msgstr "Link"
 
-#: ../../mod/community.php:23
+#: mod/community.php:23
 msgid "Not available."
 msgstr "Niedostępne."
 
-#: ../../mod/community.php:32 ../../include/nav.php:129
-#: ../../include/nav.php:131 ../../view/theme/diabook/theme.php:129
+#: mod/community.php:32 include/nav.php:137 include/nav.php:139
+#: view/theme/diabook/theme.php:129
 msgid "Community"
 msgstr "Społeczność"
 
-#: ../../mod/community.php:62 ../../mod/community.php:71
-#: ../../mod/search.php:168 ../../mod/search.php:192
+#: mod/community.php:62 mod/community.php:71 mod/search.php:192
 msgid "No results."
 msgstr "Brak wyników."
 
-#: ../../mod/settings.php:29 ../../mod/photos.php:80
+#: mod/settings.php:34 mod/photos.php:102
 msgid "everybody"
 msgstr "wszyscy"
 
-#: ../../mod/settings.php:41
+#: mod/settings.php:47
 msgid "Additional features"
 msgstr ""
 
-#: ../../mod/settings.php:46
+#: mod/settings.php:53
 msgid "Display"
 msgstr ""
 
-#: ../../mod/settings.php:52 ../../mod/settings.php:780
+#: mod/settings.php:60 mod/settings.php:835
 msgid "Social Networks"
 msgstr ""
 
-#: ../../mod/settings.php:62 ../../include/nav.php:170
+#: mod/settings.php:72 include/nav.php:179
 msgid "Delegations"
 msgstr ""
 
-#: ../../mod/settings.php:67
+#: mod/settings.php:78
 msgid "Connected apps"
 msgstr "Powiązane aplikacje"
 
-#: ../../mod/settings.php:72 ../../mod/uexport.php:85
+#: mod/settings.php:84 mod/uexport.php:85
 msgid "Export personal data"
 msgstr "Eksportuje dane personalne"
 
-#: ../../mod/settings.php:77
+#: mod/settings.php:90
 msgid "Remove account"
 msgstr "Usuń konto"
 
-#: ../../mod/settings.php:129
+#: mod/settings.php:143
 msgid "Missing some important data!"
 msgstr "Brakuje ważnych danych!"
 
-#: ../../mod/settings.php:238
+#: mod/settings.php:256
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Połączenie z kontem email używając wybranych ustawień nie powiodło się."
 
-#: ../../mod/settings.php:243
+#: mod/settings.php:261
 msgid "Email settings updated."
 msgstr "Zaktualizowano ustawienia email."
 
-#: ../../mod/settings.php:258
+#: mod/settings.php:276
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:321
+#: mod/settings.php:339
 msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: ../../mod/settings.php:335
+#: mod/settings.php:353 include/user.php:39
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hasło nie pasuje. Hasło nie zmienione."
 
-#: ../../mod/settings.php:340
+#: mod/settings.php:358
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Brak hasła niedozwolony. Hasło nie zmienione."
 
-#: ../../mod/settings.php:348
+#: mod/settings.php:366
 msgid "Wrong password."
 msgstr "Złe hasło."
 
-#: ../../mod/settings.php:359
+#: mod/settings.php:377
 msgid "Password changed."
 msgstr "Hasło zostało zmianione."
 
-#: ../../mod/settings.php:361
+#: mod/settings.php:379
 msgid "Password update failed. Please try again."
 msgstr "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie."
 
-#: ../../mod/settings.php:428
+#: mod/settings.php:446
 msgid " Please use a shorter name."
 msgstr "Proszę użyć krótszej nazwy."
 
-#: ../../mod/settings.php:430
+#: mod/settings.php:448
 msgid " Name too short."
 msgstr "Za krótka nazwa."
 
-#: ../../mod/settings.php:439
+#: mod/settings.php:457
 msgid "Wrong Password"
 msgstr "Złe hasło"
 
-#: ../../mod/settings.php:444
+#: mod/settings.php:462
 msgid " Not valid email."
 msgstr "Zły email."
 
-#: ../../mod/settings.php:450
+#: mod/settings.php:468
 msgid " Cannot change to that email."
 msgstr "Nie mogę zmienić na ten email."
 
-#: ../../mod/settings.php:506
+#: mod/settings.php:524
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:510
+#: mod/settings.php:528
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:540
+#: mod/settings.php:558
 msgid "Settings updated."
 msgstr "Zaktualizowano ustawienia."
 
-#: ../../mod/settings.php:613 ../../mod/settings.php:639
-#: ../../mod/settings.php:675
+#: mod/settings.php:631 mod/settings.php:657 mod/settings.php:693
 msgid "Add application"
 msgstr "Dodaj aplikacje"
 
-#: ../../mod/settings.php:617 ../../mod/settings.php:643
+#: mod/settings.php:635 mod/settings.php:661
 msgid "Consumer Key"
 msgstr "Klucz konsumenta"
 
-#: ../../mod/settings.php:618 ../../mod/settings.php:644
+#: mod/settings.php:636 mod/settings.php:662
 msgid "Consumer Secret"
 msgstr "Sekret konsumenta"
 
-#: ../../mod/settings.php:619 ../../mod/settings.php:645
+#: mod/settings.php:637 mod/settings.php:663
 msgid "Redirect"
 msgstr "Przekierowanie"
 
-#: ../../mod/settings.php:620 ../../mod/settings.php:646
+#: mod/settings.php:638 mod/settings.php:664
 msgid "Icon url"
 msgstr "Adres ikony"
 
-#: ../../mod/settings.php:631
+#: mod/settings.php:649
 msgid "You can't edit this application."
 msgstr "Nie możesz edytować tej aplikacji."
 
-#: ../../mod/settings.php:674
+#: mod/settings.php:692
 msgid "Connected Apps"
 msgstr "Powiązane aplikacje"
 
-#: ../../mod/settings.php:678
+#: mod/settings.php:696
 msgid "Client key starts with"
 msgstr "Klucz klienta zaczyna się od"
 
-#: ../../mod/settings.php:679
+#: mod/settings.php:697
 msgid "No name"
 msgstr "Bez nazwy"
 
-#: ../../mod/settings.php:680
+#: mod/settings.php:698
 msgid "Remove authorization"
 msgstr "Odwołaj upoważnienie"
 
-#: ../../mod/settings.php:692
+#: mod/settings.php:710
 msgid "No Plugin settings configured"
 msgstr "Ustawienia wtyczki nieskonfigurowane"
 
-#: ../../mod/settings.php:700
+#: mod/settings.php:718
 msgid "Plugin Settings"
 msgstr "Ustawienia wtyczki"
 
-#: ../../mod/settings.php:714
+#: mod/settings.php:732
 msgid "Off"
 msgstr "Wyłącz"
 
-#: ../../mod/settings.php:714
+#: mod/settings.php:732
 msgid "On"
 msgstr "Włącz"
 
-#: ../../mod/settings.php:722
+#: mod/settings.php:740
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:736 ../../mod/settings.php:737
+#: mod/settings.php:750 mod/settings.php:754
+msgid "General Social Media Settings"
+msgstr ""
+
+#: mod/settings.php:760
+msgid "Disable intelligent shortening"
+msgstr ""
+
+#: mod/settings.php:762
+msgid ""
+"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."
+msgstr ""
+
+#: mod/settings.php:768
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr ""
+
+#: mod/settings.php:770
+msgid ""
+"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."
+msgstr ""
+
+#: mod/settings.php:791 mod/settings.php:792
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:736 ../../mod/dfrn_request.php:838
-#: ../../include/contact_selectors.php:80
+#: mod/settings.php:791 mod/dfrn_request.php:856
+#: include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/settings.php:736 ../../mod/settings.php:737
+#: mod/settings.php:791 mod/settings.php:792
 msgid "enabled"
 msgstr "włączony"
 
-#: ../../mod/settings.php:736 ../../mod/settings.php:737
+#: mod/settings.php:791 mod/settings.php:792
 msgid "disabled"
 msgstr "wyłączony"
 
-#: ../../mod/settings.php:737
-msgid "StatusNet"
-msgstr "StatusNet"
+#: mod/settings.php:792
+msgid "GNU Social (OStatus)"
+msgstr ""
 
-#: ../../mod/settings.php:773
+#: mod/settings.php:828
 msgid "Email access is disabled on this site."
 msgstr "Dostęp do e-maila nie jest w pełni sprawny na tej stronie"
 
-#: ../../mod/settings.php:785
+#: mod/settings.php:840
 msgid "Email/Mailbox Setup"
 msgstr "Ustawienia  emaila/skrzynki mailowej"
 
-#: ../../mod/settings.php:786
+#: mod/settings.php:841
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email."
 
-#: ../../mod/settings.php:787
+#: mod/settings.php:842
 msgid "Last successful email check:"
 msgstr "Ostatni sprawdzony e-mail:"
 
-#: ../../mod/settings.php:789
+#: mod/settings.php:844
 msgid "IMAP server name:"
 msgstr "Nazwa serwera IMAP:"
 
-#: ../../mod/settings.php:790
+#: mod/settings.php:845
 msgid "IMAP port:"
 msgstr "Port IMAP:"
 
-#: ../../mod/settings.php:791
+#: mod/settings.php:846
 msgid "Security:"
 msgstr "Ochrona:"
 
-#: ../../mod/settings.php:791 ../../mod/settings.php:796
+#: mod/settings.php:846 mod/settings.php:851
 msgid "None"
 msgstr "Brak"
 
-#: ../../mod/settings.php:792
+#: mod/settings.php:847
 msgid "Email login name:"
 msgstr "Login emaila:"
 
-#: ../../mod/settings.php:793
+#: mod/settings.php:848
 msgid "Email password:"
 msgstr "Hasło emaila:"
 
-#: ../../mod/settings.php:794
+#: mod/settings.php:849
 msgid "Reply-to address:"
 msgstr "Odpowiedz na adres:"
 
-#: ../../mod/settings.php:795
+#: mod/settings.php:850
 msgid "Send public posts to all email contacts:"
 msgstr "Wyślij publiczny post do wszystkich kontaktów e-mail"
 
-#: ../../mod/settings.php:796
+#: mod/settings.php:851
 msgid "Action after import:"
 msgstr "Akcja po zaimportowaniu:"
 
-#: ../../mod/settings.php:796
+#: mod/settings.php:851
 msgid "Mark as seen"
 msgstr "Oznacz jako przeczytane"
 
-#: ../../mod/settings.php:796
+#: mod/settings.php:851
 msgid "Move to folder"
 msgstr "Przenieś do folderu"
 
-#: ../../mod/settings.php:797
+#: mod/settings.php:852
 msgid "Move to folder:"
 msgstr "Przenieś do folderu:"
 
-#: ../../mod/settings.php:878
+#: mod/settings.php:933
 msgid "Display Settings"
 msgstr "Wyświetl ustawienia"
 
-#: ../../mod/settings.php:884 ../../mod/settings.php:899
+#: mod/settings.php:939 mod/settings.php:955
 msgid "Display Theme:"
 msgstr "Wyświetl motyw:"
 
-#: ../../mod/settings.php:885
+#: mod/settings.php:940
 msgid "Mobile Theme:"
 msgstr "Mobilny motyw:"
 
-#: ../../mod/settings.php:886
+#: mod/settings.php:941
 msgid "Update browser every xx seconds"
 msgstr "Odświeżaj stronę co xx sekund"
 
-#: ../../mod/settings.php:886
+#: mod/settings.php:941
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Dolny limit 10 sekund, brak górnego limitu"
 
-#: ../../mod/settings.php:887
+#: mod/settings.php:942
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:887 ../../mod/settings.php:888
+#: mod/settings.php:942 mod/settings.php:943
 msgid "Maximum of 100 items"
 msgstr "Maksymalnie 100 elementów"
 
-#: ../../mod/settings.php:888
+#: mod/settings.php:943
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: ../../mod/settings.php:889
+#: mod/settings.php:944
 msgid "Don't show emoticons"
 msgstr "Nie pokazuj emotikonek"
 
-#: ../../mod/settings.php:890
+#: mod/settings.php:945
 msgid "Don't show notices"
-msgstr ""
+msgstr "Nie pokazuj powiadomień"
 
-#: ../../mod/settings.php:891
+#: mod/settings.php:946
 msgid "Infinite scroll"
-msgstr ""
+msgstr "Nieskończone przewijanie"
 
-#: ../../mod/settings.php:892
+#: mod/settings.php:947
 msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: ../../mod/settings.php:969
-msgid "User Types"
-msgstr ""
+#: mod/settings.php:949 view/theme/cleanzero/config.php:82
+#: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66
+#: view/theme/diabook/config.php:150 view/theme/vier/config.php:58
+#: view/theme/duepuntozero/config.php:61
+msgid "Theme settings"
+msgstr "Ustawienia motywu"
 
-#: ../../mod/settings.php:970
+#: mod/settings.php:1025
+msgid "User Types"
+msgstr "Użytkownik pisze"
+
+#: mod/settings.php:1026
 msgid "Community Types"
 msgstr ""
 
-#: ../../mod/settings.php:971
+#: mod/settings.php:1027
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: mod/settings.php:1028
 msgid "This account is a normal personal profile"
 msgstr "To konto jest normalnym osobistym profilem"
 
-#: ../../mod/settings.php:975
+#: mod/settings.php:1031
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:976
+#: mod/settings.php:1032
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Automatycznie zatwierdzaj wszystkie żądania połączenia/przyłączenia do znajomych jako fanów 'tylko do odczytu'"
 
-#: ../../mod/settings.php:979
+#: mod/settings.php:1035
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:980
+#: mod/settings.php:1036
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Automatycznie potwierdza wszystkie połączenia jako pełnoprawne z możliwością zapisu."
 
-#: ../../mod/settings.php:983
+#: mod/settings.php:1039
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: mod/settings.php:1040
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Automatycznie traktuj wszystkie prośby o połączenia/zaproszenia do grona przyjaciół, jako przyjaciół"
 
-#: ../../mod/settings.php:987
+#: mod/settings.php:1043
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: mod/settings.php:1044
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:1000
+#: mod/settings.php:1056
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:1000
+#: mod/settings.php:1056
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "Przeznacz to OpenID do logowania się na to konto."
 
-#: ../../mod/settings.php:1010
+#: mod/settings.php:1066
 msgid "Publish your default profile in your local site directory?"
 msgstr "Czy publikować Twój profil w lokalnym katalogu tej instancji?"
 
-#: ../../mod/settings.php:1010 ../../mod/settings.php:1016
-#: ../../mod/settings.php:1024 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1033 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1045 ../../mod/settings.php:1051
-#: ../../mod/settings.php:1081 ../../mod/settings.php:1082
-#: ../../mod/settings.php:1083 ../../mod/settings.php:1084
-#: ../../mod/settings.php:1085 ../../mod/dfrn_request.php:830
-#: ../../mod/register.php:234 ../../mod/profiles.php:661
-#: ../../mod/profiles.php:665 ../../mod/api.php:106
-msgid "No"
-msgstr "Nie"
-
-#: ../../mod/settings.php:1016
+#: mod/settings.php:1072
 msgid "Publish your default profile in the global social directory?"
 msgstr "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?"
 
-#: ../../mod/settings.php:1024
+#: mod/settings.php:1080
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Ukryć listę znajomych przed odwiedzającymi Twój profil?"
 
-#: ../../mod/settings.php:1028 ../../include/conversation.php:1057
+#: mod/settings.php:1084 include/acl_selectors.php:330
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Ukryć szczegóły twojego profilu przed nieznajomymi ?"
 
-#: ../../mod/settings.php:1028
+#: mod/settings.php:1084
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: mod/settings.php:1089
 msgid "Allow friends to post to your profile page?"
 msgstr "Zezwól na dodawanie postów na twoim profilu przez znajomych"
 
-#: ../../mod/settings.php:1039
+#: mod/settings.php:1095
 msgid "Allow friends to tag your posts?"
 msgstr "Zezwól na oznaczanie twoich postów przez znajomych"
 
-#: ../../mod/settings.php:1045
+#: mod/settings.php:1101
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:1051
+#: mod/settings.php:1107
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:1059
+#: mod/settings.php:1115
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil <strong>nie jest opublikowany</strong>"
 
-#: ../../mod/settings.php:1067
-msgid "Your Identity Address is"
-msgstr "Twój adres identyfikacyjny to"
+#: mod/settings.php:1123
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr ""
 
-#: ../../mod/settings.php:1078
+#: mod/settings.php:1130
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: mod/settings.php:1130
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte."
 
-#: ../../mod/settings.php:1079
+#: mod/settings.php:1131
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1080
+#: mod/settings.php:1132
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1081
+#: mod/settings.php:1133
 msgid "Expire posts:"
 msgstr "Wygasające posty:"
 
-#: ../../mod/settings.php:1082
+#: mod/settings.php:1134
 msgid "Expire personal notes:"
 msgstr "Wygasające notatki osobiste:"
 
-#: ../../mod/settings.php:1083
+#: mod/settings.php:1135
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1084
+#: mod/settings.php:1136
 msgid "Expire photos:"
 msgstr "Wygasające zdjęcia:"
 
-#: ../../mod/settings.php:1085
+#: mod/settings.php:1137
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1111
+#: mod/settings.php:1163
 msgid "Account Settings"
 msgstr "Ustawienia konta"
 
-#: ../../mod/settings.php:1119
+#: mod/settings.php:1171
 msgid "Password Settings"
 msgstr "Ustawienia hasła"
 
-#: ../../mod/settings.php:1120
+#: mod/settings.php:1172 mod/register.php:271
 msgid "New Password:"
 msgstr "Nowe hasło:"
 
-#: ../../mod/settings.php:1121
+#: mod/settings.php:1173 mod/register.php:272
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: ../../mod/settings.php:1121
+#: mod/settings.php:1173
 msgid "Leave password fields blank unless changing"
 msgstr "Pozostaw pola hasła puste, chyba że chcesz je zmienić."
 
-#: ../../mod/settings.php:1122
+#: mod/settings.php:1174
 msgid "Current Password:"
 msgstr "Obecne hasło:"
 
-#: ../../mod/settings.php:1122 ../../mod/settings.php:1123
+#: mod/settings.php:1174 mod/settings.php:1175
 msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: ../../mod/settings.php:1123
+#: mod/settings.php:1175
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../../mod/settings.php:1127
+#: mod/settings.php:1179
 msgid "Basic Settings"
 msgstr "Ustawienia podstawowe"
 
-#: ../../mod/settings.php:1128 ../../include/profile_advanced.php:15
+#: mod/settings.php:1180 include/identity.php:538
 msgid "Full Name:"
 msgstr "Imię i nazwisko:"
 
-#: ../../mod/settings.php:1129
+#: mod/settings.php:1181
 msgid "Email Address:"
 msgstr "Adres email:"
 
-#: ../../mod/settings.php:1130
+#: mod/settings.php:1182
 msgid "Your Timezone:"
 msgstr "Twoja strefa czasowa:"
 
-#: ../../mod/settings.php:1131
+#: mod/settings.php:1183
 msgid "Default Post Location:"
 msgstr "Standardowa lokalizacja wiadomości:"
 
-#: ../../mod/settings.php:1132
+#: mod/settings.php:1184
 msgid "Use Browser Location:"
 msgstr "Użyj położenia przeglądarki:"
 
-#: ../../mod/settings.php:1135
+#: mod/settings.php:1187
 msgid "Security and Privacy Settings"
 msgstr "Ustawienia bezpieczeństwa i prywatności"
 
-#: ../../mod/settings.php:1137
+#: mod/settings.php:1189
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksymalna liczba zaproszeń do grona przyjaciół na dzień:"
 
-#: ../../mod/settings.php:1137 ../../mod/settings.php:1167
+#: mod/settings.php:1189 mod/settings.php:1219
 msgid "(to prevent spam abuse)"
 msgstr "(aby zapobiec spamowaniu)"
 
-#: ../../mod/settings.php:1138
+#: mod/settings.php:1190
 msgid "Default Post Permissions"
 msgstr "Domyślne prawa dostępu wiadomości"
 
-#: ../../mod/settings.php:1139
+#: mod/settings.php:1191
 msgid "(click to open/close)"
 msgstr "(kliknij by otworzyć/zamknąć)"
 
-#: ../../mod/settings.php:1148 ../../mod/photos.php:1146
-#: ../../mod/photos.php:1519
+#: mod/settings.php:1200 mod/photos.php:1166 mod/photos.php:1538
 msgid "Show to Groups"
 msgstr "Pokaż Grupy"
 
-#: ../../mod/settings.php:1149 ../../mod/photos.php:1147
-#: ../../mod/photos.php:1520
+#: mod/settings.php:1201 mod/photos.php:1167 mod/photos.php:1539
 msgid "Show to Contacts"
 msgstr "Pokaż kontakty"
 
-#: ../../mod/settings.php:1150
+#: mod/settings.php:1202
 msgid "Default Private Post"
 msgstr ""
 
-#: ../../mod/settings.php:1151
+#: mod/settings.php:1203
 msgid "Default Public Post"
 msgstr ""
 
-#: ../../mod/settings.php:1155
+#: mod/settings.php:1207
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: ../../mod/settings.php:1167
+#: mod/settings.php:1219
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1170
+#: mod/settings.php:1222
 msgid "Notification Settings"
 msgstr "Ustawienia powiadomień"
 
-#: ../../mod/settings.php:1171
+#: mod/settings.php:1223
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1172
+#: mod/settings.php:1224
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1173
+#: mod/settings.php:1225
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1174
+#: mod/settings.php:1226
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1175
+#: mod/settings.php:1227
 msgid "Send a notification email when:"
 msgstr "Wyślij powiadmonienia na email, kiedy:"
 
-#: ../../mod/settings.php:1176
+#: mod/settings.php:1228
 msgid "You receive an introduction"
 msgstr "Otrzymałeś zaproszenie"
 
-#: ../../mod/settings.php:1177
+#: mod/settings.php:1229
 msgid "Your introductions are confirmed"
 msgstr "Dane zatwierdzone"
 
-#: ../../mod/settings.php:1178
+#: mod/settings.php:1230
 msgid "Someone writes on your profile wall"
 msgstr "Ktoś pisze na twojej ścianie profilowej"
 
-#: ../../mod/settings.php:1179
+#: mod/settings.php:1231
 msgid "Someone writes a followup comment"
 msgstr "Ktoś pisze komentarz nawiązujący."
 
-#: ../../mod/settings.php:1180
+#: mod/settings.php:1232
 msgid "You receive a private message"
 msgstr "Otrzymałeś prywatną wiadomość"
 
-#: ../../mod/settings.php:1181
+#: mod/settings.php:1233
 msgid "You receive a friend suggestion"
 msgstr "Otrzymane propozycje znajomych"
 
-#: ../../mod/settings.php:1182
+#: mod/settings.php:1234
 msgid "You are tagged in a post"
 msgstr "Jesteś oznaczony w poście"
 
-#: ../../mod/settings.php:1183
+#: mod/settings.php:1235
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1185
+#: mod/settings.php:1237
+msgid "Activate desktop notifications"
+msgstr ""
+
+#: mod/settings.php:1237
+msgid "Show desktop popup on new notifications"
+msgstr ""
+
+#: mod/settings.php:1239
 msgid "Text-only notification emails"
 msgstr ""
 
-#: ../../mod/settings.php:1187
+#: mod/settings.php:1241
 msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: ../../mod/settings.php:1189
+#: mod/settings.php:1243
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1190
+#: mod/settings.php:1244
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/settings.php:1193
+#: mod/settings.php:1247
 msgid "Relocate"
 msgstr ""
 
-#: ../../mod/settings.php:1194
+#: mod/settings.php:1248
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr ""
 
-#: ../../mod/settings.php:1195
+#: mod/settings.php:1249
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:95
+#: mod/dfrn_request.php:95
 msgid "This introduction has already been accepted."
 msgstr "To wprowadzenie zostało już zaakceptowane."
 
-#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:518
+#: mod/dfrn_request.php:120 mod/dfrn_request.php:518
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Położenie profilu jest niepoprawne lub nie zawiera żadnych informacji."
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:523
+#: mod/dfrn_request.php:125 mod/dfrn_request.php:523
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Ostrzeżenie: położenie profilu ma taką samą nazwę jak użytkownik."
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:525
+#: mod/dfrn_request.php:127 mod/dfrn_request.php:525
 msgid "Warning: profile location has no profile photo."
 msgstr "Ostrzeżenie: położenie profilu nie zawiera zdjęcia."
 
-#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:528
+#: mod/dfrn_request.php:130 mod/dfrn_request.php:528
 #, 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"
@@ -4322,934 +4532,917 @@ msgstr[0] "%d wymagany parametr nie został znaleziony w podanej lokacji"
 msgstr[1] "%d wymagane parametry nie zostały znalezione w podanej lokacji"
 msgstr[2] "%d wymagany parametr nie został znaleziony w podanej lokacji"
 
-#: ../../mod/dfrn_request.php:172
+#: mod/dfrn_request.php:172
 msgid "Introduction complete."
 msgstr "wprowadzanie zakończone."
 
-#: ../../mod/dfrn_request.php:214
+#: mod/dfrn_request.php:214
 msgid "Unrecoverable protocol error."
 msgstr "Nieodwracalny błąd protokołu."
 
-#: ../../mod/dfrn_request.php:242
+#: mod/dfrn_request.php:242
 msgid "Profile unavailable."
 msgstr "Profil niedostępny."
 
-#: ../../mod/dfrn_request.php:267
+#: mod/dfrn_request.php:267
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s otrzymał dziś zbyt wiele żądań połączeń."
 
-#: ../../mod/dfrn_request.php:268
+#: mod/dfrn_request.php:268
 msgid "Spam protection measures have been invoked."
 msgstr "Ochrona przed spamem została wywołana."
 
-#: ../../mod/dfrn_request.php:269
+#: mod/dfrn_request.php:269
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Przyjaciele namawiają do spróbowania za 24h."
 
-#: ../../mod/dfrn_request.php:331
+#: mod/dfrn_request.php:331
 msgid "Invalid locator"
 msgstr "Niewłaściwy lokalizator "
 
-#: ../../mod/dfrn_request.php:340
+#: mod/dfrn_request.php:340
 msgid "Invalid email address."
 msgstr "Nieprawidłowy adres email."
 
-#: ../../mod/dfrn_request.php:367
+#: mod/dfrn_request.php:367
 msgid "This account has not been configured for email. Request failed."
 msgstr "Te konto nie zostało skonfigurowane do poczty e mail . Niepowodzenie ."
 
-#: ../../mod/dfrn_request.php:463
+#: mod/dfrn_request.php:463
 msgid "Unable to resolve your name at the provided location."
 msgstr "Nie można rozpoznać twojej nazwy w przewidzianym miejscu."
 
-#: ../../mod/dfrn_request.php:476
+#: mod/dfrn_request.php:476
 msgid "You have already introduced yourself here."
 msgstr "Już się tu przedstawiłeś."
 
-#: ../../mod/dfrn_request.php:480
+#: mod/dfrn_request.php:480
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Widocznie jesteście już znajomymi z %s"
 
-#: ../../mod/dfrn_request.php:501
+#: mod/dfrn_request.php:501
 msgid "Invalid profile URL."
 msgstr "Zły adres URL profilu."
 
-#: ../../mod/dfrn_request.php:507 ../../include/follow.php:27
+#: mod/dfrn_request.php:507 include/follow.php:70
 msgid "Disallowed profile URL."
 msgstr "Nie dozwolony adres URL profilu."
 
-#: ../../mod/dfrn_request.php:597
+#: mod/dfrn_request.php:597
 msgid "Your introduction has been sent."
 msgstr "Twoje dane zostały wysłane."
 
-#: ../../mod/dfrn_request.php:650
+#: mod/dfrn_request.php:650
 msgid "Please login to confirm introduction."
 msgstr "Proszę zalogować się do potwierdzenia wstępu."
 
-#: ../../mod/dfrn_request.php:660
+#: mod/dfrn_request.php:660
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na <strong>tego</strong> użytkownika. "
 
-#: ../../mod/dfrn_request.php:671
+#: mod/dfrn_request.php:674 mod/dfrn_request.php:691
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#: mod/dfrn_request.php:686
 msgid "Hide this contact"
 msgstr "Ukryj kontakt"
 
-#: ../../mod/dfrn_request.php:674
+#: mod/dfrn_request.php:689
 #, php-format
 msgid "Welcome home %s."
 msgstr "Welcome home %s."
 
-#: ../../mod/dfrn_request.php:675
+#: mod/dfrn_request.php:690
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."
 
-#: ../../mod/dfrn_request.php:676
-msgid "Confirm"
-msgstr "Potwierdź"
-
-#: ../../mod/dfrn_request.php:804
+#: mod/dfrn_request.php:819
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Proszę podaj swój \"Adres tożsamości \" z jednej z możliwych wspieranych sieci komunikacyjnych ."
 
-#: ../../mod/dfrn_request.php:824
+#: mod/dfrn_request.php:840
+#, php-format
 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 "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>."
+"href=\"%s/siteinfo\">follow this link to find a public Friendica site and "
+"join us today</a>."
+msgstr ""
 
-#: ../../mod/dfrn_request.php:827
+#: mod/dfrn_request.php:845
 msgid "Friend/Connection Request"
 msgstr "Przyjaciel/Prośba o połączenie"
 
-#: ../../mod/dfrn_request.php:828
+#: mod/dfrn_request.php:846
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "Przykład : jojo@demo.friendica.com , http://demofriendica.com/profile/jojo , testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:829
-msgid "Please answer the following:"
-msgstr "Proszę odpowiedzieć na poniższe:"
-
-#: ../../mod/dfrn_request.php:830
-#, php-format
-msgid "Does %s know you?"
-msgstr "Czy %s Cię zna?"
-
-#: ../../mod/dfrn_request.php:834
-msgid "Add a personal note:"
-msgstr "Dodaj osobistą notkę:"
-
-#: ../../mod/dfrn_request.php:836 ../../include/contact_selectors.php:76
+#: mod/dfrn_request.php:854 include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:837
+#: mod/dfrn_request.php:855
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Sieć społeczna"
 
-#: ../../mod/dfrn_request.php:839
+#: mod/dfrn_request.php:857
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr "- proszę wyraź to inaczej . Zamiast tego ,wprowadź %s do swojej belki wyszukiwarki."
 
-#: ../../mod/dfrn_request.php:840
-msgid "Your Identity Address:"
-msgstr "Twój zidentyfikowany adres:"
-
-#: ../../mod/dfrn_request.php:843
-msgid "Submit Request"
-msgstr "Wyślij zgłoszenie"
-
-#: ../../mod/register.php:90
+#: mod/register.php:92
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila."
 
-#: ../../mod/register.php:96
+#: mod/register.php:97
 #, php-format
 msgid ""
 "Failed to send email message. Here your accout details:<br> login: %s<br> "
 "password: %s<br><br>You can change your password after login."
 msgstr ""
 
-#: ../../mod/register.php:105
+#: mod/register.php:107
 msgid "Your registration can not be processed."
 msgstr "Twoja rejestracja nie może zostać przeprowadzona. "
 
-#: ../../mod/register.php:148
+#: mod/register.php:150
 msgid "Your registration is pending approval by the site owner."
 msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."
 
-#: ../../mod/register.php:186 ../../mod/uimport.php:50
+#: mod/register.php:188 mod/uimport.php:50
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."
 
-#: ../../mod/register.php:214
+#: mod/register.php:216
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Masz możliwość (opcjonalnie) wypełnić ten formularz przez OpenID poprzez załączenie Twojego OpenID i kliknięcie 'Zarejestruj'."
 
-#: ../../mod/register.php:215
+#: mod/register.php:217
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów."
 
-#: ../../mod/register.php:216
+#: mod/register.php:218
 msgid "Your OpenID (optional): "
 msgstr "Twój OpenID (opcjonalnie):"
 
-#: ../../mod/register.php:230
+#: mod/register.php:232
 msgid "Include your profile in member directory?"
 msgstr "Czy dołączyć twój profil do katalogu członków?"
 
-#: ../../mod/register.php:251
+#: mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu."
 
-#: ../../mod/register.php:252
+#: mod/register.php:257
 msgid "Your invitation ID: "
 msgstr "Twoje zaproszenia ID:"
 
-#: ../../mod/register.php:263
+#: mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Imię i nazwisko (np. Jan Kowalski):"
 
-#: ../../mod/register.php:264
+#: mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Twój adres email:"
 
-#: ../../mod/register.php:265
+#: mod/register.php:271
+msgid "Leave empty for an auto generated password."
+msgstr ""
+
+#: mod/register.php:273
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wybierz login. Login musi zaczynać się literą. Adres twojego profilu na tej stronie będzie wyglądać następująco '<strong>login@$nazwastrony</strong>'."
 
-#: ../../mod/register.php:266
+#: mod/register.php:274
 msgid "Choose a nickname: "
 msgstr "Wybierz pseudonim:"
 
-#: ../../mod/register.php:269 ../../boot.php:1241 ../../include/nav.php:109
+#: mod/register.php:277 boot.php:1248 include/nav.php:109
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: ../../mod/register.php:275 ../../mod/uimport.php:64
+#: mod/register.php:283 mod/uimport.php:64
 msgid "Import"
 msgstr "Import"
 
-#: ../../mod/register.php:276
+#: mod/register.php:284
 msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: ../../mod/maintenance.php:5
+#: mod/maintenance.php:5
 msgid "System down for maintenance"
 msgstr ""
 
-#: ../../mod/search.php:99 ../../include/text.php:953
-#: ../../include/text.php:954 ../../include/nav.php:119
+#: mod/search.php:100 include/text.php:996 include/nav.php:119
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../../mod/directory.php:51 ../../view/theme/diabook/theme.php:525
+#: mod/search.php:198
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: mod/search.php:200
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
+#: mod/directory.php:53 view/theme/diabook/theme.php:525
 msgid "Global Directory"
 msgstr "Globalne Położenie"
 
-#: ../../mod/directory.php:59
+#: mod/directory.php:61
 msgid "Find on this site"
 msgstr "Znajdź na tej stronie"
 
-#: ../../mod/directory.php:62
+#: mod/directory.php:64
 msgid "Site Directory"
 msgstr "Katalog Strony"
 
-#: ../../mod/directory.php:113 ../../mod/profiles.php:750
+#: mod/directory.php:129 mod/profiles.php:747
 msgid "Age: "
 msgstr "Wiek: "
 
-#: ../../mod/directory.php:116
+#: mod/directory.php:132
 msgid "Gender: "
 msgstr "Płeć: "
 
-#: ../../mod/directory.php:138 ../../boot.php:1650
-#: ../../include/profile_advanced.php:17
-msgid "Gender:"
-msgstr "Płeć:"
-
-#: ../../mod/directory.php:140 ../../boot.php:1653
-#: ../../include/profile_advanced.php:37
+#: mod/directory.php:156 include/identity.php:273 include/identity.php:560
 msgid "Status:"
 msgstr "Status"
 
-#: ../../mod/directory.php:142 ../../boot.php:1655
-#: ../../include/profile_advanced.php:48
+#: mod/directory.php:158 include/identity.php:275 include/identity.php:571
 msgid "Homepage:"
 msgstr "Strona główna:"
 
-#: ../../mod/directory.php:144 ../../boot.php:1657
-#: ../../include/profile_advanced.php:58
-msgid "About:"
-msgstr "O:"
-
-#: ../../mod/directory.php:189
+#: mod/directory.php:205
 msgid "No entries (some entries may be hidden)."
 msgstr "Brak odwiedzin (niektóre odwiedziny mogą być ukryte)."
 
-#: ../../mod/delegate.php:101
+#: mod/delegate.php:101
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:130 ../../include/nav.php:170
+#: mod/delegate.php:130 include/nav.php:179
 msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/delegate.php:132
+#: mod/delegate.php:132
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/delegate.php:133
+#: mod/delegate.php:133
 msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/delegate.php:135
+#: mod/delegate.php:135
 msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/delegate.php:137
+#: mod/delegate.php:137
 msgid "Potential Delegates"
 msgstr ""
 
-#: ../../mod/delegate.php:140
+#: mod/delegate.php:140
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../mod/delegate.php:141
+#: mod/delegate.php:141
 msgid "No entries."
 msgstr "Brak wpisów."
 
-#: ../../mod/common.php:42
+#: mod/common.php:45
 msgid "Common Friends"
 msgstr "Wspólni znajomi"
 
-#: ../../mod/common.php:78
+#: mod/common.php:82
 msgid "No contacts in common."
 msgstr "Brak wspólnych kontaktów."
 
-#: ../../mod/uexport.php:77
+#: mod/uexport.php:77
 msgid "Export account"
 msgstr "Eksportuj konto"
 
-#: ../../mod/uexport.php:77
+#: mod/uexport.php:77
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
 msgstr ""
 
-#: ../../mod/uexport.php:78
+#: mod/uexport.php:78
 msgid "Export all"
 msgstr "Eksportuj wszystko"
 
-#: ../../mod/uexport.php:78
+#: mod/uexport.php:78
 msgid ""
 "Export your accout info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
 "of your account (photos are not exported)"
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:227
+#: mod/mood.php:62 include/conversation.php:226
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: ../../mod/mood.php:133
+#: mod/mood.php:133
 msgid "Mood"
 msgstr "Nastrój"
 
-#: ../../mod/mood.php:134
+#: mod/mood.php:134
 msgid "Set your current mood and tell your friends"
 msgstr "Wskaż swój obecny nastrój i powiedz o tym znajomym"
 
-#: ../../mod/suggest.php:27
+#: mod/suggest.php:27
 msgid "Do you really want to delete this suggestion?"
 msgstr "Czy na pewno chcesz usunąć te sugestie ?"
 
-#: ../../mod/suggest.php:68 ../../include/contact_widgets.php:35
-#: ../../view/theme/diabook/theme.php:527
+#: mod/suggest.php:69 include/contact_widgets.php:35
+#: view/theme/diabook/theme.php:527
 msgid "Friend Suggestions"
 msgstr "Osoby, które możesz znać"
 
-#: ../../mod/suggest.php:74
+#: mod/suggest.php:76
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../mod/suggest.php:92
+#: mod/suggest.php:94
 msgid "Ignore/Hide"
 msgstr "Ignoruj/Ukryj"
 
-#: ../../mod/profiles.php:37
+#: mod/profiles.php:37
 msgid "Profile deleted."
 msgstr "Konto usunięte."
 
-#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
+#: mod/profiles.php:55 mod/profiles.php:89
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
+#: mod/profiles.php:74 mod/profiles.php:117
 msgid "New profile created."
 msgstr "Utworzono nowy profil."
 
-#: ../../mod/profiles.php:95
+#: mod/profiles.php:95
 msgid "Profile unavailable to clone."
 msgstr "Nie można powileić profilu "
 
-#: ../../mod/profiles.php:189
+#: mod/profiles.php:189
 msgid "Profile Name is required."
 msgstr "Nazwa Profilu jest wymagana"
 
-#: ../../mod/profiles.php:340
+#: mod/profiles.php:336
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:344
+#: mod/profiles.php:340
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:348
+#: mod/profiles.php:344
 msgid "Likes"
 msgstr "Polubień"
 
-#: ../../mod/profiles.php:352
+#: mod/profiles.php:348
 msgid "Dislikes"
 msgstr "Nie lubień"
 
-#: ../../mod/profiles.php:356
+#: mod/profiles.php:352
 msgid "Work/Employment"
 msgstr "Praca/Zatrudnienie"
 
-#: ../../mod/profiles.php:359
+#: mod/profiles.php:355
 msgid "Religion"
 msgstr "Religia"
 
-#: ../../mod/profiles.php:363
+#: mod/profiles.php:359
 msgid "Political Views"
 msgstr "Poglądy polityczne"
 
-#: ../../mod/profiles.php:367
+#: mod/profiles.php:363
 msgid "Gender"
 msgstr "Płeć"
 
-#: ../../mod/profiles.php:371
+#: mod/profiles.php:367
 msgid "Sexual Preference"
 msgstr "Orientacja seksualna"
 
-#: ../../mod/profiles.php:375
+#: mod/profiles.php:371
 msgid "Homepage"
 msgstr "Strona Główna"
 
-#: ../../mod/profiles.php:379 ../../mod/profiles.php:698
+#: mod/profiles.php:375 mod/profiles.php:695
 msgid "Interests"
 msgstr "Zainteresowania"
 
-#: ../../mod/profiles.php:383
+#: mod/profiles.php:379
 msgid "Address"
 msgstr "Adres"
 
-#: ../../mod/profiles.php:390 ../../mod/profiles.php:694
+#: mod/profiles.php:386 mod/profiles.php:691
 msgid "Location"
 msgstr "Położenie"
 
-#: ../../mod/profiles.php:473
+#: mod/profiles.php:469
 msgid "Profile updated."
 msgstr "Konto zaktualizowane."
 
-#: ../../mod/profiles.php:568
+#: mod/profiles.php:565
 msgid " and "
 msgstr " i "
 
-#: ../../mod/profiles.php:576
+#: mod/profiles.php:573
 msgid "public profile"
 msgstr "profil publiczny"
 
-#: ../../mod/profiles.php:579
+#: mod/profiles.php:576
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: mod/profiles.php:577
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " - Odwiedźa %1$s's %2$s"
 
-#: ../../mod/profiles.php:583
+#: mod/profiles.php:580
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:658
+#: mod/profiles.php:655
 msgid "Hide contacts and friends:"
 msgstr ""
 
-#: ../../mod/profiles.php:663
+#: mod/profiles.php:660
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Czy chcesz ukryć listę kontaktów dla przeglądających to konto?"
 
-#: ../../mod/profiles.php:685
+#: mod/profiles.php:682
 msgid "Edit Profile Details"
 msgstr "Edytuj profil."
 
-#: ../../mod/profiles.php:687
+#: mod/profiles.php:684
 msgid "Change Profile Photo"
 msgstr "Zmień profilowe zdjęcie"
 
-#: ../../mod/profiles.php:688
+#: mod/profiles.php:685
 msgid "View this profile"
 msgstr "Zobacz ten profil"
 
-#: ../../mod/profiles.php:689
+#: mod/profiles.php:686
 msgid "Create a new profile using these settings"
 msgstr "Stwórz nowy profil wykorzystując te ustawienia"
 
-#: ../../mod/profiles.php:690
+#: mod/profiles.php:687
 msgid "Clone this profile"
 msgstr "Sklonuj ten profil"
 
-#: ../../mod/profiles.php:691
+#: mod/profiles.php:688
 msgid "Delete this profile"
 msgstr "Usuń ten profil"
 
-#: ../../mod/profiles.php:692
+#: mod/profiles.php:689
 msgid "Basic information"
 msgstr ""
 
-#: ../../mod/profiles.php:693
+#: mod/profiles.php:690
 msgid "Profile picture"
 msgstr ""
 
-#: ../../mod/profiles.php:695
+#: mod/profiles.php:692
 msgid "Preferences"
 msgstr ""
 
-#: ../../mod/profiles.php:696
+#: mod/profiles.php:693
 msgid "Status information"
 msgstr ""
 
-#: ../../mod/profiles.php:697
+#: mod/profiles.php:694
 msgid "Additional information"
 msgstr ""
 
-#: ../../mod/profiles.php:700
+#: mod/profiles.php:697
 msgid "Profile Name:"
 msgstr "Nazwa profilu :"
 
-#: ../../mod/profiles.php:701
+#: mod/profiles.php:698
 msgid "Your Full Name:"
 msgstr "Twoje imię i nazwisko:"
 
-#: ../../mod/profiles.php:702
+#: mod/profiles.php:699
 msgid "Title/Description:"
 msgstr "Tytuł/Opis :"
 
-#: ../../mod/profiles.php:703
+#: mod/profiles.php:700
 msgid "Your Gender:"
 msgstr "Twoja płeć:"
 
-#: ../../mod/profiles.php:704
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Urodziny (%s):"
+#: mod/profiles.php:701
+msgid "Birthday :"
+msgstr ""
 
-#: ../../mod/profiles.php:705
+#: mod/profiles.php:702
 msgid "Street Address:"
 msgstr "Ulica:"
 
-#: ../../mod/profiles.php:706
+#: mod/profiles.php:703
 msgid "Locality/City:"
 msgstr "Miejscowość/Miasto :"
 
-#: ../../mod/profiles.php:707
+#: mod/profiles.php:704
 msgid "Postal/Zip Code:"
 msgstr "Kod Pocztowy :"
 
-#: ../../mod/profiles.php:708
+#: mod/profiles.php:705
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../../mod/profiles.php:709
+#: mod/profiles.php:706
 msgid "Region/State:"
 msgstr "Region / Stan :"
 
-#: ../../mod/profiles.php:710
+#: mod/profiles.php:707
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Stan :"
 
-#: ../../mod/profiles.php:711
+#: mod/profiles.php:708
 msgid "Who: (if applicable)"
 msgstr "Kto: (jeśli dotyczy)"
 
-#: ../../mod/profiles.php:712
+#: mod/profiles.php:709
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Przykłady : cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:713
+#: mod/profiles.php:710
 msgid "Since [date]:"
 msgstr "Od [data]:"
 
-#: ../../mod/profiles.php:714 ../../include/profile_advanced.php:46
+#: mod/profiles.php:711 include/identity.php:569
 msgid "Sexual Preference:"
 msgstr "Interesują mnie:"
 
-#: ../../mod/profiles.php:715
+#: mod/profiles.php:712
 msgid "Homepage URL:"
 msgstr "Strona główna URL:"
 
-#: ../../mod/profiles.php:716 ../../include/profile_advanced.php:50
+#: mod/profiles.php:713 include/identity.php:573
 msgid "Hometown:"
 msgstr "Miasto rodzinne:"
 
-#: ../../mod/profiles.php:717 ../../include/profile_advanced.php:54
+#: mod/profiles.php:714 include/identity.php:577
 msgid "Political Views:"
 msgstr "Poglądy polityczne:"
 
-#: ../../mod/profiles.php:718
+#: mod/profiles.php:715
 msgid "Religious Views:"
 msgstr "Poglądy religijne:"
 
-#: ../../mod/profiles.php:719
+#: mod/profiles.php:716
 msgid "Public Keywords:"
 msgstr "Publiczne słowa kluczowe :"
 
-#: ../../mod/profiles.php:720
+#: mod/profiles.php:717
 msgid "Private Keywords:"
 msgstr "Prywatne słowa kluczowe :"
 
-#: ../../mod/profiles.php:721 ../../include/profile_advanced.php:62
+#: mod/profiles.php:718 include/identity.php:585
 msgid "Likes:"
 msgstr "Lubi:"
 
-#: ../../mod/profiles.php:722 ../../include/profile_advanced.php:64
+#: mod/profiles.php:719 include/identity.php:587
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:723
+#: mod/profiles.php:720
 msgid "Example: fishing photography software"
 msgstr "Przykład: kończenie oprogramowania fotografii"
 
-#: ../../mod/profiles.php:724
+#: mod/profiles.php:721
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Używany do sugerowania potencjalnych znajomych, jest widoczny dla innych)"
 
-#: ../../mod/profiles.php:725
+#: mod/profiles.php:722
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Używany do wyszukiwania profili, niepokazywany innym)"
 
-#: ../../mod/profiles.php:726
+#: mod/profiles.php:723
 msgid "Tell us about yourself..."
 msgstr "Napisz o sobie..."
 
-#: ../../mod/profiles.php:727
+#: mod/profiles.php:724
 msgid "Hobbies/Interests"
 msgstr "Zainteresowania"
 
-#: ../../mod/profiles.php:728
+#: mod/profiles.php:725
 msgid "Contact information and Social Networks"
 msgstr "Informacje kontaktowe i Sieci Społeczne"
 
-#: ../../mod/profiles.php:729
+#: mod/profiles.php:726
 msgid "Musical interests"
 msgstr "Muzyka"
 
-#: ../../mod/profiles.php:730
+#: mod/profiles.php:727
 msgid "Books, literature"
 msgstr "Literatura"
 
-#: ../../mod/profiles.php:731
+#: mod/profiles.php:728
 msgid "Television"
 msgstr "Telewizja"
 
-#: ../../mod/profiles.php:732
+#: mod/profiles.php:729
 msgid "Film/dance/culture/entertainment"
 msgstr "Film/taniec/kultura/rozrywka"
 
-#: ../../mod/profiles.php:733
+#: mod/profiles.php:730
 msgid "Love/romance"
 msgstr "Miłość/romans"
 
-#: ../../mod/profiles.php:734
+#: mod/profiles.php:731
 msgid "Work/employment"
 msgstr "Praca/zatrudnienie"
 
-#: ../../mod/profiles.php:735
+#: mod/profiles.php:732
 msgid "School/education"
 msgstr "Szkoła/edukacja"
 
-#: ../../mod/profiles.php:740
+#: mod/profiles.php:737
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "To jest Twój <strong> publiczny </strong> profil. <br/><strong>Może </strong> zostać wyświetlony przez każdego kto używa internetu."
 
-#: ../../mod/profiles.php:803
+#: mod/profiles.php:800
 msgid "Edit/Manage Profiles"
 msgstr "Edytuj/Zarządzaj Profilami"
 
-#: ../../mod/profiles.php:804 ../../boot.php:1611 ../../boot.php:1637
+#: mod/profiles.php:801 include/identity.php:231 include/identity.php:257
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: ../../mod/profiles.php:805 ../../boot.php:1612
+#: mod/profiles.php:802 include/identity.php:232
 msgid "Create New Profile"
 msgstr "Stwórz nowy profil"
 
-#: ../../mod/profiles.php:816 ../../boot.php:1622
+#: mod/profiles.php:813 include/identity.php:242
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: ../../mod/profiles.php:818 ../../boot.php:1625
+#: mod/profiles.php:815 include/identity.php:245
 msgid "visible to everybody"
 msgstr "widoczne dla wszystkich"
 
-#: ../../mod/profiles.php:819 ../../boot.php:1626
+#: mod/profiles.php:816 include/identity.php:246
 msgid "Edit visibility"
 msgstr "Edytuj widoczność"
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+#: mod/editpost.php:17 mod/editpost.php:27
 msgid "Item not found"
 msgstr "Artykuł nie znaleziony"
 
-#: ../../mod/editpost.php:39
+#: mod/editpost.php:40
 msgid "Edit post"
 msgstr "Edytuj post"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1092
+#: mod/editpost.php:111 include/conversation.php:1057
 msgid "upload photo"
 msgstr "dodaj zdjęcie"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1093
+#: mod/editpost.php:112 include/conversation.php:1058
 msgid "Attach file"
 msgstr "Przyłącz plik"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1094
+#: mod/editpost.php:113 include/conversation.php:1059
 msgid "attach file"
 msgstr "załącz plik"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1096
+#: mod/editpost.php:115 include/conversation.php:1061
 msgid "web link"
 msgstr "Adres www"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1097
+#: mod/editpost.php:116 include/conversation.php:1062
 msgid "Insert video link"
 msgstr "Wstaw link wideo"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1098
+#: mod/editpost.php:117 include/conversation.php:1063
 msgid "video link"
 msgstr "link do filmu"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1099
+#: mod/editpost.php:118 include/conversation.php:1064
 msgid "Insert audio link"
 msgstr "Wstaw link audio"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1100
+#: mod/editpost.php:119 include/conversation.php:1065
 msgid "audio link"
 msgstr "Link audio"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1101
+#: mod/editpost.php:120 include/conversation.php:1066
 msgid "Set your location"
 msgstr "Ustaw swoje położenie"
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1102
+#: mod/editpost.php:121 include/conversation.php:1067
 msgid "set location"
 msgstr "wybierz lokalizację"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1103
+#: mod/editpost.php:122 include/conversation.php:1068
 msgid "Clear browser location"
 msgstr "Wyczyść położenie przeglądarki"
 
-#: ../../mod/editpost.php:123 ../../include/conversation.php:1104
+#: mod/editpost.php:123 include/conversation.php:1069
 msgid "clear location"
 msgstr "wyczyść lokalizację"
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1110
+#: mod/editpost.php:125 include/conversation.php:1075
 msgid "Permission settings"
 msgstr "Ustawienia uprawnień"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:1119
+#: mod/editpost.php:133 include/acl_selectors.php:343
 msgid "CC: email addresses"
 msgstr "CC: adresy e-mail"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1120
+#: mod/editpost.php:134 include/conversation.php:1084
 msgid "Public post"
 msgstr "Publiczny post"
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1106
+#: mod/editpost.php:137 include/conversation.php:1071
 msgid "Set title"
 msgstr "Ustaw tytuł"
 
-#: ../../mod/editpost.php:139 ../../include/conversation.php:1108
+#: mod/editpost.php:139 include/conversation.php:1073
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (lista słów oddzielonych przecinkiem)"
 
-#: ../../mod/editpost.php:140 ../../include/conversation.php:1122
+#: mod/editpost.php:140 include/acl_selectors.php:344
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Przykład: bob@example.com, mary@example.com"
 
-#: ../../mod/friendica.php:59
+#: mod/friendica.php:59
 msgid "This is Friendica, version"
 msgstr "To jest Friendica, wersja"
 
-#: ../../mod/friendica.php:60
+#: mod/friendica.php:60
 msgid "running at web location"
 msgstr "otwierane na serwerze"
 
-#: ../../mod/friendica.php:62
+#: mod/friendica.php:62
 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
 msgstr "Odwiedź <a href=\"http://friendica.com\">Friendica.com</a>, aby dowiedzieć się więcej o projekcie Friendica."
 
-#: ../../mod/friendica.php:64
+#: mod/friendica.php:64
 msgid "Bug reports and issues: please visit"
 msgstr "Reportowanie błędów i problemów: proszę odwiedź"
 
-#: ../../mod/friendica.php:65
+#: mod/friendica.php:64
+msgid "the bugtracker at github"
+msgstr ""
+
+#: mod/friendica.php:65
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr ""
 
-#: ../../mod/friendica.php:79
+#: mod/friendica.php:79
 msgid "Installed plugins/addons/apps:"
 msgstr "Zainstalowane pluginy/dodatki/aplikacje:"
 
-#: ../../mod/friendica.php:92
+#: mod/friendica.php:92
 msgid "No installed plugins/addons/apps"
 msgstr "Brak zainstalowanych pluginów/dodatków/aplikacji"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
+#: mod/api.php:76 mod/api.php:102
 msgid "Authorize application connection"
 msgstr "Autoryzacja połączenia aplikacji"
 
-#: ../../mod/api.php:77
+#: mod/api.php:77
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:"
 
-#: ../../mod/api.php:89
+#: mod/api.php:89
 msgid "Please login to continue."
 msgstr "Zaloguj się aby kontynuować."
 
-#: ../../mod/api.php:104
+#: mod/api.php:104
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Czy chcesz umożliwić tej aplikacji dostęp do Twoich wpisów, kontaktów oraz pozwolić jej na pisanie za Ciebie postów?"
 
-#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
+#: mod/lockview.php:31 mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr "Dane prywatne nie są dostępne zdalnie "
 
-#: ../../mod/lockview.php:48
+#: mod/lockview.php:48
 msgid "Visible to:"
 msgstr "Widoczne dla:"
 
-#: ../../mod/notes.php:44 ../../boot.php:2150
+#: mod/notes.php:44 include/identity.php:675
 msgid "Personal Notes"
 msgstr "Osobiste notatki"
 
-#: ../../mod/localtime.php:12 ../../include/bb2diaspora.php:148
-#: ../../include/event.php:11
+#: mod/localtime.php:12 include/bb2diaspora.php:148 include/event.php:13
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../mod/localtime.php:24
+#: mod/localtime.php:24
 msgid "Time Conversion"
 msgstr "Zmiana czasu"
 
-#: ../../mod/localtime.php:26
+#: mod/localtime.php:26
 msgid ""
 "Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr ""
 
-#: ../../mod/localtime.php:30
+#: mod/localtime.php:30
 #, php-format
 msgid "UTC time: %s"
 msgstr "Czas UTC %s"
 
-#: ../../mod/localtime.php:33
+#: mod/localtime.php:33
 #, php-format
 msgid "Current timezone: %s"
 msgstr "Obecna strefa czasowa: %s"
 
-#: ../../mod/localtime.php:36
+#: mod/localtime.php:36
 #, php-format
 msgid "Converted localtime: %s"
 msgstr "Zmień strefę czasową: %s"
 
-#: ../../mod/localtime.php:41
+#: mod/localtime.php:41
 msgid "Please select your timezone:"
 msgstr "Wybierz swoją strefę czasową:"
 
-#: ../../mod/poke.php:192
+#: mod/poke.php:192
 msgid "Poke/Prod"
 msgstr ""
 
-#: ../../mod/poke.php:193
+#: mod/poke.php:193
 msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../mod/poke.php:194
+#: mod/poke.php:194
 msgid "Recipient"
 msgstr ""
 
-#: ../../mod/poke.php:195
+#: mod/poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../mod/poke.php:198
+#: mod/poke.php:198
 msgid "Make this post private"
 msgstr "Zrób ten post prywatnym"
 
-#: ../../mod/invite.php:27
+#: mod/invite.php:27
 msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../mod/invite.php:49
+#: mod/invite.php:49
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : Niepoprawny adres email."
 
-#: ../../mod/invite.php:73
+#: mod/invite.php:73
 msgid "Please join us on Friendica"
 msgstr "Dołącz do nas na Friendica"
 
-#: ../../mod/invite.php:84
+#: mod/invite.php:84
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../mod/invite.php:89
+#: mod/invite.php:89
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Dostarczenie wiadomości nieudane."
 
-#: ../../mod/invite.php:93
+#: mod/invite.php:93
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
@@ -5257,11 +5450,11 @@ msgstr[0] "%d wiadomość wysłana."
 msgstr[1] "%d wiadomości wysłane."
 msgstr[2] "%d wysłano ."
 
-#: ../../mod/invite.php:112
+#: mod/invite.php:112
 msgid "You have no more invitations available"
 msgstr "Nie masz więcej zaproszeń"
 
-#: ../../mod/invite.php:120
+#: mod/invite.php:120
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -5269,14 +5462,14 @@ msgid ""
 " other social networks."
 msgstr ""
 
-#: ../../mod/invite.php:122
+#: mod/invite.php:122
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr ""
 
-#: ../../mod/invite.php:123
+#: mod/invite.php:123
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -5285,446 +5478,368 @@ msgid ""
 "sites you can join."
 msgstr ""
 
-#: ../../mod/invite.php:126
+#: mod/invite.php:126
 msgid ""
 "Our apologies. This system is not currently configured to connect with other"
 " public sites or invite members."
 msgstr ""
 
-#: ../../mod/invite.php:132
+#: mod/invite.php:132
 msgid "Send invitations"
 msgstr "Wyślij zaproszenia"
 
-#: ../../mod/invite.php:133
+#: mod/invite.php:133
 msgid "Enter email addresses, one per line:"
 msgstr "Wprowadź adresy email, jeden na linijkę:"
 
-#: ../../mod/invite.php:135
+#: mod/invite.php:135
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/invite.php:137
+#: mod/invite.php:137
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/invite.php:137
+#: mod/invite.php:137
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "Gdy już się zarejestrujesz, skontaktuj się ze mną przez moją stronkę profilową :"
 
-#: ../../mod/invite.php:139
+#: mod/invite.php:139
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendica.com"
 msgstr ""
 
-#: ../../mod/photos.php:52 ../../boot.php:2129
-msgid "Photo Albums"
-msgstr "Albumy zdjęć"
-
-#: ../../mod/photos.php:60 ../../mod/photos.php:155 ../../mod/photos.php:1064
-#: ../../mod/photos.php:1187 ../../mod/photos.php:1210
-#: ../../mod/photos.php:1760 ../../mod/photos.php:1772
-#: ../../view/theme/diabook/theme.php:499
+#: mod/photos.php:50 mod/photos.php:177 mod/photos.php:1086
+#: mod/photos.php:1207 mod/photos.php:1230 mod/photos.php:1779
+#: mod/photos.php:1791 view/theme/diabook/theme.php:499
 msgid "Contact Photos"
 msgstr "Zdjęcia kontaktu"
 
-#: ../../mod/photos.php:67 ../../mod/photos.php:1262 ../../mod/photos.php:1819
+#: mod/photos.php:84 include/identity.php:651
+msgid "Photo Albums"
+msgstr "Albumy zdjęć"
+
+#: mod/photos.php:85 mod/photos.php:1836
+msgid "Recent Photos"
+msgstr "Ostatnio dodane zdjęcia"
+
+#: mod/photos.php:88 mod/photos.php:1282 mod/photos.php:1838
 msgid "Upload New Photos"
 msgstr "Wyślij nowe zdjęcie"
 
-#: ../../mod/photos.php:144
+#: mod/photos.php:166
 msgid "Contact information unavailable"
 msgstr "Informacje o kontakcie nie dostępne."
 
-#: ../../mod/photos.php:165
+#: mod/photos.php:187
 msgid "Album not found."
 msgstr "Album nie znaleziony"
 
-#: ../../mod/photos.php:188 ../../mod/photos.php:200 ../../mod/photos.php:1204
+#: mod/photos.php:210 mod/photos.php:222 mod/photos.php:1224
 msgid "Delete Album"
 msgstr "Usuń album"
 
-#: ../../mod/photos.php:198
+#: mod/photos.php:220
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego albumu?"
 
-#: ../../mod/photos.php:278 ../../mod/photos.php:289 ../../mod/photos.php:1515
+#: mod/photos.php:300 mod/photos.php:311 mod/photos.php:1534
 msgid "Delete Photo"
 msgstr "Usuń zdjęcie"
 
-#: ../../mod/photos.php:287
+#: mod/photos.php:309
 msgid "Do you really want to delete this photo?"
 msgstr "Czy na pewno chcesz usunąć to zdjęcie ?"
 
-#: ../../mod/photos.php:662
+#: mod/photos.php:684
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/photos.php:662
+#: mod/photos.php:684
 msgid "a photo"
 msgstr "zdjęcie"
 
-#: ../../mod/photos.php:767
-msgid "Image exceeds size limit of "
-msgstr "obrazek przekracza limit rozmiaru"
-
-#: ../../mod/photos.php:775
+#: mod/photos.php:797
 msgid "Image file is empty."
 msgstr "Plik obrazka jest pusty."
 
-#: ../../mod/photos.php:930
+#: mod/photos.php:952
 msgid "No photos selected"
 msgstr "Nie zaznaczono zdjęć"
 
-#: ../../mod/photos.php:1094
+#: mod/photos.php:1114
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1129
+#: mod/photos.php:1149
 msgid "Upload Photos"
 msgstr "Prześlij zdjęcia"
 
-#: ../../mod/photos.php:1133 ../../mod/photos.php:1199
+#: mod/photos.php:1153 mod/photos.php:1219
 msgid "New album name: "
 msgstr "Nazwa nowego albumu:"
 
-#: ../../mod/photos.php:1134
+#: mod/photos.php:1154
 msgid "or existing album name: "
 msgstr "lub istniejąca nazwa albumu:"
 
-#: ../../mod/photos.php:1135
+#: mod/photos.php:1155
 msgid "Do not show a status post for this upload"
 msgstr "Nie pokazuj postów statusu dla tego wysłania"
 
-#: ../../mod/photos.php:1137 ../../mod/photos.php:1510
+#: mod/photos.php:1157 mod/photos.php:1529 include/acl_selectors.php:346
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: ../../mod/photos.php:1148
+#: mod/photos.php:1168
 msgid "Private Photo"
 msgstr "Zdjęcie prywatne"
 
-#: ../../mod/photos.php:1149
+#: mod/photos.php:1169
 msgid "Public Photo"
 msgstr "Zdjęcie publiczne"
 
-#: ../../mod/photos.php:1212
+#: mod/photos.php:1232
 msgid "Edit Album"
 msgstr "Edytuj album"
 
-#: ../../mod/photos.php:1218
+#: mod/photos.php:1238
 msgid "Show Newest First"
 msgstr "Najpierw pokaż najnowsze"
 
-#: ../../mod/photos.php:1220
+#: mod/photos.php:1240
 msgid "Show Oldest First"
 msgstr "Najpierw pokaż najstarsze"
 
-#: ../../mod/photos.php:1248 ../../mod/photos.php:1802
+#: mod/photos.php:1268 mod/photos.php:1821
 msgid "View Photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1294
+#: mod/photos.php:1314
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Odmowa dostępu. Dostęp do tych danych może być ograniczony."
 
-#: ../../mod/photos.php:1296
+#: mod/photos.php:1316
 msgid "Photo not available"
 msgstr "Zdjęcie niedostępne"
 
-#: ../../mod/photos.php:1352
+#: mod/photos.php:1372
 msgid "View photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1352
+#: mod/photos.php:1372
 msgid "Edit photo"
 msgstr "Edytuj zdjęcie"
 
-#: ../../mod/photos.php:1353
+#: mod/photos.php:1373
 msgid "Use as profile photo"
 msgstr "Ustaw jako zdjęcie profilowe"
 
-#: ../../mod/photos.php:1378
+#: mod/photos.php:1398
 msgid "View Full Size"
 msgstr "Zobacz w pełnym rozmiarze"
 
-#: ../../mod/photos.php:1457
+#: mod/photos.php:1477
 msgid "Tags: "
 msgstr "Tagi:"
 
-#: ../../mod/photos.php:1460
+#: mod/photos.php:1480
 msgid "[Remove any tag]"
 msgstr "[Usunąć znacznik]"
 
-#: ../../mod/photos.php:1500
-msgid "Rotate CW (right)"
-msgstr "Obróć CW (w prawo)"
-
-#: ../../mod/photos.php:1501
-msgid "Rotate CCW (left)"
-msgstr "Obróć CCW (w lewo)"
-
-#: ../../mod/photos.php:1503
+#: mod/photos.php:1520
 msgid "New album name"
 msgstr "Nazwa nowego albumu"
 
-#: ../../mod/photos.php:1506
+#: mod/photos.php:1521
 msgid "Caption"
 msgstr "Zawartość"
 
-#: ../../mod/photos.php:1508
+#: mod/photos.php:1522
 msgid "Add a Tag"
 msgstr "Dodaj tag"
 
-#: ../../mod/photos.php:1512
+#: mod/photos.php:1522
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1521
+#: mod/photos.php:1523
+msgid "Do not rotate"
+msgstr ""
+
+#: mod/photos.php:1524
+msgid "Rotate CW (right)"
+msgstr "Obróć CW (w prawo)"
+
+#: mod/photos.php:1525
+msgid "Rotate CCW (left)"
+msgstr "Obróć CCW (w lewo)"
+
+#: mod/photos.php:1540
 msgid "Private photo"
 msgstr "Prywatne zdjęcie."
 
-#: ../../mod/photos.php:1522
+#: mod/photos.php:1541
 msgid "Public photo"
 msgstr "Zdjęcie publiczne"
 
-#: ../../mod/photos.php:1544 ../../include/conversation.php:1090
+#: mod/photos.php:1563 include/conversation.php:1055
 msgid "Share"
 msgstr "Podziel się"
 
-#: ../../mod/photos.php:1817
-msgid "Recent Photos"
-msgstr "Ostatnio dodane zdjęcia"
+#: mod/p.php:9
+msgid "Not Extended"
+msgstr ""
 
-#: ../../mod/regmod.php:55
+#: mod/regmod.php:55
 msgid "Account approved."
 msgstr "Konto zatwierdzone."
 
-#: ../../mod/regmod.php:92
+#: mod/regmod.php:92
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Rejestracja dla %s odwołana"
 
-#: ../../mod/regmod.php:104
+#: mod/regmod.php:104
 msgid "Please login."
 msgstr "Proszę się zalogować."
 
-#: ../../mod/uimport.php:66
+#: mod/uimport.php:66
 msgid "Move account"
 msgstr "Przenieś konto"
 
-#: ../../mod/uimport.php:67
+#: mod/uimport.php:67
 msgid "You can import an account from another Friendica server."
 msgstr ""
 
-#: ../../mod/uimport.php:68
+#: mod/uimport.php:68
 msgid ""
 "You need to export your account from the old server and upload it here. We "
 "will recreate your old account here with all your contacts. We will try also"
 " to inform your friends that you moved here."
 msgstr ""
 
-#: ../../mod/uimport.php:69
+#: mod/uimport.php:69
 msgid ""
 "This feature is experimental. We can't import contacts from the OStatus "
 "network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
-#: ../../mod/uimport.php:70
+#: mod/uimport.php:70
 msgid "Account file"
 msgstr ""
 
-#: ../../mod/uimport.php:70
+#: mod/uimport.php:70
 msgid ""
 "To export your account, go to \"Settings->Export your personal data\" and "
 "select \"Export account\""
 msgstr "Aby eksportować konto, wejdź w \"Ustawienia->Eksport danych osobistych\" i wybierz \"Eksportuj konto\""
 
-#: ../../mod/attach.php:8
+#: mod/attach.php:8
 msgid "Item not available."
 msgstr "Element nie dostępny."
 
-#: ../../mod/attach.php:20
+#: mod/attach.php:20
 msgid "Item was not found."
 msgstr "Element nie znaleziony."
 
-#: ../../boot.php:749
+#: boot.php:763
 msgid "Delete this item?"
 msgstr "Usunąć ten element?"
 
-#: ../../boot.php:752
+#: boot.php:766
 msgid "show fewer"
 msgstr "Pokaż mniej"
 
-#: ../../boot.php:1122
+#: boot.php:1140
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1240
+#: boot.php:1247
 msgid "Create a New Account"
 msgstr "Załóż nowe konto"
 
-#: ../../boot.php:1265 ../../include/nav.php:73
+#: boot.php:1272 include/nav.php:73
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: ../../boot.php:1268
+#: boot.php:1275
 msgid "Nickname or Email address: "
 msgstr "Nick lub adres email:"
 
-#: ../../boot.php:1269
+#: boot.php:1276
 msgid "Password: "
 msgstr "Hasło:"
 
-#: ../../boot.php:1270
+#: boot.php:1277
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: ../../boot.php:1273
+#: boot.php:1280
 msgid "Or login using OpenID: "
 msgstr "Lub zaloguj się korzystając z OpenID:"
 
-#: ../../boot.php:1279
+#: boot.php:1286
 msgid "Forgot your password?"
 msgstr "Zapomniałeś swojego hasła?"
 
-#: ../../boot.php:1282
+#: boot.php:1289
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1283
+#: boot.php:1290
 msgid "terms of service"
 msgstr "warunki użytkowania"
 
-#: ../../boot.php:1285
+#: boot.php:1292
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1286
+#: boot.php:1293
 msgid "privacy policy"
 msgstr "polityka prywatności"
 
-#: ../../boot.php:1419
-msgid "Requested account is not available."
-msgstr ""
-
-#: ../../boot.php:1501 ../../boot.php:1635
-#: ../../include/profile_advanced.php:84
-msgid "Edit profile"
-msgstr "Edytuj profil"
-
-#: ../../boot.php:1600
-msgid "Message"
-msgstr "Wiadomość"
-
-#: ../../boot.php:1606 ../../include/nav.php:175
-msgid "Profiles"
-msgstr "Profile"
-
-#: ../../boot.php:1606
-msgid "Manage/edit profiles"
-msgstr "Zarządzaj profilami"
-
-#: ../../boot.php:1706
-msgid "Network:"
-msgstr ""
-
-#: ../../boot.php:1736 ../../boot.php:1822
-msgid "g A l F d"
-msgstr "g A I F d"
-
-#: ../../boot.php:1737 ../../boot.php:1823
-msgid "F d"
-msgstr ""
-
-#: ../../boot.php:1782 ../../boot.php:1863
-msgid "[today]"
-msgstr "[dziś]"
-
-#: ../../boot.php:1794
-msgid "Birthday Reminders"
-msgstr "Przypomnienia o urodzinach"
-
-#: ../../boot.php:1795
-msgid "Birthdays this week:"
-msgstr "Urodziny w tym tygodniu:"
-
-#: ../../boot.php:1856
-msgid "[No description]"
-msgstr "[Brak opisu]"
-
-#: ../../boot.php:1874
-msgid "Event Reminders"
-msgstr "Przypominacze wydarzeń"
-
-#: ../../boot.php:1875
-msgid "Events this week:"
-msgstr "Wydarzenia w tym tygodniu:"
-
-#: ../../boot.php:2112 ../../include/nav.php:76
-msgid "Status"
-msgstr "Status"
-
-#: ../../boot.php:2115
-msgid "Status Messages and Posts"
-msgstr "Status wiadomości i postów"
-
-#: ../../boot.php:2122
-msgid "Profile Details"
-msgstr "Szczegóły profilu"
-
-#: ../../boot.php:2133 ../../boot.php:2136 ../../include/nav.php:79
-msgid "Videos"
-msgstr "Filmy"
-
-#: ../../boot.php:2146
-msgid "Events and Calendar"
-msgstr "Wydarzenia i kalendarz"
-
-#: ../../boot.php:2153
-msgid "Only You Can See This"
-msgstr "Tylko ty możesz to zobaczyć"
-
-#: ../../object/Item.php:94
+#: object/Item.php:95
 msgid "This entry was edited"
 msgstr "Ten wpis został zedytowany"
 
-#: ../../object/Item.php:208
+#: object/Item.php:209
 msgid "ignore thread"
 msgstr ""
 
-#: ../../object/Item.php:209
+#: object/Item.php:210
 msgid "unignore thread"
 msgstr ""
 
-#: ../../object/Item.php:210
+#: object/Item.php:211
 msgid "toggle ignore status"
 msgstr ""
 
-#: ../../object/Item.php:213
+#: object/Item.php:214
 msgid "ignored"
 msgstr ""
 
-#: ../../object/Item.php:316 ../../include/conversation.php:666
+#: object/Item.php:318 include/conversation.php:665
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../object/Item.php:317 ../../include/conversation.php:667
+#: object/Item.php:319 include/conversation.php:666
 msgid "Filed under:"
 msgstr "Zapisano pod:"
 
-#: ../../object/Item.php:329
+#: object/Item.php:331
 msgid "via"
 msgstr "przez"
 
-#: ../../include/dbstructure.php:26
+#: include/dbstructure.php:26
 #, php-format
 msgid ""
 "\n"
@@ -5734,48 +5849,48 @@ msgid ""
 "\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
 msgstr ""
 
-#: ../../include/dbstructure.php:31
+#: include/dbstructure.php:31
 #, php-format
 msgid ""
 "The error message is\n"
 "[pre]%s[/pre]"
 msgstr ""
 
-#: ../../include/dbstructure.php:162
+#: include/dbstructure.php:152
 msgid "Errors encountered creating database tables."
 msgstr "Zostały napotkane błędy przy tworzeniu tabeli bazy danych."
 
-#: ../../include/dbstructure.php:220
+#: include/dbstructure.php:210
 msgid "Errors encountered performing database changes."
 msgstr ""
 
-#: ../../include/auth.php:38
+#: include/auth.php:38
 msgid "Logged out."
 msgstr "Wyloguj"
 
-#: ../../include/auth.php:128 ../../include/user.php:67
+#: include/auth.php:128 include/user.php:75
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:128 ../../include/user.php:67
+#: include/auth.php:128 include/user.php:75
 msgid "The error message was:"
 msgstr "Komunikat o błędzie:"
 
-#: ../../include/contact_widgets.php:6
+#: include/contact_widgets.php:6
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: ../../include/contact_widgets.php:7
+#: include/contact_widgets.php:7
 msgid "Enter address or web location"
 msgstr "Wpisz adres lub lokalizację sieciową"
 
-#: ../../include/contact_widgets.php:8
+#: include/contact_widgets.php:8
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Przykład: bob@przykład.com, http://przykład.com/barbara"
 
-#: ../../include/contact_widgets.php:24
+#: include/contact_widgets.php:24
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
@@ -5783,619 +5898,768 @@ msgstr[0] "%d zaproszenie dostępne"
 msgstr[1] "%d zaproszeń dostępnych"
 msgstr[2] "%d zaproszenia dostępne"
 
-#: ../../include/contact_widgets.php:30
+#: include/contact_widgets.php:30
 msgid "Find People"
 msgstr "Znajdź ludzi"
 
-#: ../../include/contact_widgets.php:31
+#: include/contact_widgets.php:31
 msgid "Enter name or interest"
 msgstr "Wpisz nazwę lub zainteresowanie"
 
-#: ../../include/contact_widgets.php:32
+#: include/contact_widgets.php:32
 msgid "Connect/Follow"
 msgstr "Połącz/Obserwuj"
 
-#: ../../include/contact_widgets.php:33
+#: include/contact_widgets.php:33
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Przykładowo:  Jan Kowalski, Wędkarstwo"
 
-#: ../../include/contact_widgets.php:36 ../../view/theme/diabook/theme.php:526
+#: include/contact_widgets.php:36 view/theme/diabook/theme.php:526
 msgid "Similar Interests"
 msgstr "Podobne zainteresowania"
 
-#: ../../include/contact_widgets.php:37
+#: include/contact_widgets.php:37
 msgid "Random Profile"
 msgstr "Domyślny profil"
 
-#: ../../include/contact_widgets.php:38 ../../view/theme/diabook/theme.php:528
+#: include/contact_widgets.php:38 view/theme/diabook/theme.php:528
 msgid "Invite Friends"
 msgstr "Zaproś znajomych"
 
-#: ../../include/contact_widgets.php:71
+#: include/contact_widgets.php:71
 msgid "Networks"
 msgstr "Sieci"
 
-#: ../../include/contact_widgets.php:74
+#: include/contact_widgets.php:74
 msgid "All Networks"
 msgstr "Wszystkie Sieci"
 
-#: ../../include/contact_widgets.php:104 ../../include/features.php:60
+#: include/contact_widgets.php:104 include/features.php:60
 msgid "Saved Folders"
 msgstr "Zapisane foldery"
 
-#: ../../include/contact_widgets.php:107 ../../include/contact_widgets.php:139
+#: include/contact_widgets.php:107 include/contact_widgets.php:139
 msgid "Everything"
 msgstr "Wszystko"
 
-#: ../../include/contact_widgets.php:136
+#: include/contact_widgets.php:136
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/features.php:23
+#: include/features.php:23
 msgid "General Features"
 msgstr ""
 
-#: ../../include/features.php:25
+#: include/features.php:25
 msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/features.php:25
+#: include/features.php:25
 msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/features.php:30
+#: include/features.php:30
 msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/features.php:31
+#: include/features.php:31
 msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/features.php:31
+#: include/features.php:31
 msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/features.php:32
+#: include/features.php:32
 msgid "Post Preview"
 msgstr "Podgląd posta"
 
-#: ../../include/features.php:32
+#: include/features.php:32
 msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/features.php:33
+#: include/features.php:33
 msgid "Auto-mention Forums"
 msgstr ""
 
-#: ../../include/features.php:33
+#: include/features.php:33
 msgid ""
 "Add/remove mention when a fourm page is selected/deselected in ACL window."
 msgstr ""
 
-#: ../../include/features.php:38
+#: include/features.php:38
 msgid "Network Sidebar Widgets"
 msgstr ""
 
-#: ../../include/features.php:39
+#: include/features.php:39
 msgid "Search by Date"
 msgstr "Szukanie wg daty"
 
-#: ../../include/features.php:39
+#: include/features.php:39
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:40
+#: include/features.php:40
 msgid "Group Filter"
 msgstr "Filtrowanie grupowe"
 
-#: ../../include/features.php:40
+#: include/features.php:40
 msgid "Enable widget to display Network posts only from selected group"
 msgstr ""
 
-#: ../../include/features.php:41
+#: include/features.php:41
 msgid "Network Filter"
 msgstr ""
 
-#: ../../include/features.php:41
+#: include/features.php:41
 msgid "Enable widget to display Network posts only from selected network"
 msgstr ""
 
-#: ../../include/features.php:42
+#: include/features.php:42
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:47
+#: include/features.php:47
 msgid "Network Tabs"
 msgstr ""
 
-#: ../../include/features.php:48
+#: include/features.php:48
 msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/features.php:48
+#: include/features.php:48
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:49
+#: include/features.php:49
 msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/features.php:49
+#: include/features.php:49
 msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: ../../include/features.php:50
+#: include/features.php:50
 msgid "Network Shared Links Tab"
 msgstr ""
 
-#: ../../include/features.php:50
+#: include/features.php:50
 msgid "Enable tab to display only Network posts with links in them"
 msgstr ""
 
-#: ../../include/features.php:55
+#: include/features.php:55
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/features.php:56
+#: include/features.php:56
 msgid "Multiple Deletion"
 msgstr ""
 
-#: ../../include/features.php:56
+#: include/features.php:56
 msgid "Select and delete multiple posts/comments at once"
 msgstr ""
 
-#: ../../include/features.php:57
+#: include/features.php:57
 msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/features.php:57
+#: include/features.php:57
 msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/features.php:58
+#: include/features.php:58
 msgid "Tagging"
 msgstr "Oznaczanie"
 
-#: ../../include/features.php:58
+#: include/features.php:58
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:59
+#: include/features.php:59
 msgid "Post Categories"
-msgstr ""
+msgstr "Kategorie postów"
 
-#: ../../include/features.php:59
+#: include/features.php:59
 msgid "Add categories to your posts"
 msgstr "Dodaj kategorie do twoich postów"
 
-#: ../../include/features.php:60
+#: include/features.php:60
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/features.php:61
+#: include/features.php:61
 msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:61
+#: include/features.php:61
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:62
+#: include/features.php:62
 msgid "Star Posts"
 msgstr "Oznacz posty gwiazdką"
 
-#: ../../include/features.php:62
+#: include/features.php:62
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/features.php:63
+#: include/features.php:63
 msgid "Mute Post Notifications"
 msgstr ""
 
-#: ../../include/features.php:63
+#: include/features.php:63
 msgid "Ability to mute notifications for a thread"
 msgstr ""
 
-#: ../../include/follow.php:32
+#: include/follow.php:75
 msgid "Connect URL missing."
 msgstr "Brak adresu URL połączenia."
 
-#: ../../include/follow.php:59
+#: include/follow.php:102
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr "Ta strona nie jest skonfigurowana do pozwalania na komunikację z innymi sieciami"
 
-#: ../../include/follow.php:60 ../../include/follow.php:80
+#: include/follow.php:103 include/follow.php:123
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../include/follow.php:78
+#: include/follow.php:121
 msgid "The profile address specified does not provide adequate information."
 msgstr "Dany adres profilu nie dostarcza odpowiednich informacji."
 
-#: ../../include/follow.php:82
+#: include/follow.php:125
 msgid "An author or name was not found."
 msgstr "Autor lub nazwa nie zostało znalezione."
 
-#: ../../include/follow.php:84
+#: include/follow.php:127
 msgid "No browser URL could be matched to this address."
 msgstr "Przeglądarka WWW nie może odnaleźć podanego adresu"
 
-#: ../../include/follow.php:86
+#: include/follow.php:129
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: ../../include/follow.php:87
+#: include/follow.php:130
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: ../../include/follow.php:93
+#: include/follow.php:136
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr "Określony adres profilu należy do sieci, która została wyłączona na tej stronie."
 
-#: ../../include/follow.php:103
+#: include/follow.php:146
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie."
 
-#: ../../include/follow.php:205
+#: include/follow.php:249
 msgid "Unable to retrieve contact information."
 msgstr "Nie można otrzymać informacji kontaktowych"
 
-#: ../../include/follow.php:258
+#: include/follow.php:302
 msgid "following"
 msgstr "następujący"
 
-#: ../../include/group.php:25
+#: include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/group.php:207
+#: include/group.php:207
 msgid "Default privacy group for new contacts"
 msgstr "Domyślne ustawienia prywatności dla nowych kontaktów"
 
-#: ../../include/group.php:226
+#: include/group.php:226
 msgid "Everybody"
 msgstr "Wszyscy"
 
-#: ../../include/group.php:249
+#: include/group.php:249
 msgid "edit"
 msgstr "edytuj"
 
-#: ../../include/group.php:271
+#: include/group.php:271
 msgid "Edit group"
 msgstr "Edytuj grupy"
 
-#: ../../include/group.php:272
+#: include/group.php:272
 msgid "Create a new group"
 msgstr "Stwórz nową grupę"
 
-#: ../../include/group.php:273
+#: include/group.php:275
 msgid "Contacts not in any group"
 msgstr "Kontakt nie jest w żadnej grupie"
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
+#: include/datetime.php:43 include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "Różny"
 
-#: ../../include/datetime.php:153 ../../include/datetime.php:290
-msgid "year"
-msgstr "rok"
+#: include/datetime.php:141
+msgid "YYYY-MM-DD or MM-DD"
+msgstr ""
 
-#: ../../include/datetime.php:158 ../../include/datetime.php:291
-msgid "month"
-msgstr "miesiąc"
-
-#: ../../include/datetime.php:163 ../../include/datetime.php:293
-msgid "day"
-msgstr "dzień"
-
-#: ../../include/datetime.php:276
+#: include/datetime.php:256
 msgid "never"
 msgstr "nigdy"
 
-#: ../../include/datetime.php:282
+#: include/datetime.php:262
 msgid "less than a second ago"
 msgstr "mniej niż sekundę temu"
 
-#: ../../include/datetime.php:290
+#: include/datetime.php:272
+msgid "year"
+msgstr "rok"
+
+#: include/datetime.php:272
 msgid "years"
 msgstr "lata"
 
-#: ../../include/datetime.php:291
+#: include/datetime.php:273
+msgid "month"
+msgstr "miesiąc"
+
+#: include/datetime.php:273
 msgid "months"
 msgstr "miesiące"
 
-#: ../../include/datetime.php:292
+#: include/datetime.php:274
 msgid "week"
 msgstr "tydzień"
 
-#: ../../include/datetime.php:292
+#: include/datetime.php:274
 msgid "weeks"
 msgstr "tygodnie"
 
-#: ../../include/datetime.php:293
+#: include/datetime.php:275
+msgid "day"
+msgstr "dzień"
+
+#: include/datetime.php:275
 msgid "days"
 msgstr "dni"
 
-#: ../../include/datetime.php:294
+#: include/datetime.php:276
 msgid "hour"
 msgstr "godzina"
 
-#: ../../include/datetime.php:294
+#: include/datetime.php:276
 msgid "hours"
 msgstr "godziny"
 
-#: ../../include/datetime.php:295
+#: include/datetime.php:277
 msgid "minute"
 msgstr "minuta"
 
-#: ../../include/datetime.php:295
+#: include/datetime.php:277
 msgid "minutes"
 msgstr "minuty"
 
-#: ../../include/datetime.php:296
+#: include/datetime.php:278
 msgid "second"
 msgstr "sekunda"
 
-#: ../../include/datetime.php:296
+#: include/datetime.php:278
 msgid "seconds"
 msgstr "sekundy"
 
-#: ../../include/datetime.php:305
+#: include/datetime.php:287
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s temu"
 
-#: ../../include/datetime.php:477 ../../include/items.php:2211
+#: include/datetime.php:459 include/items.php:2432
 #, php-format
 msgid "%s's birthday"
 msgstr "Urodziny %s"
 
-#: ../../include/datetime.php:478 ../../include/items.php:2212
+#: include/datetime.php:460 include/items.php:2433
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Urodziny %s"
 
-#: ../../include/acl_selectors.php:333
+#: include/identity.php:38
+msgid "Requested account is not available."
+msgstr ""
+
+#: include/identity.php:121 include/identity.php:255 include/identity.php:607
+msgid "Edit profile"
+msgstr "Edytuj profil"
+
+#: include/identity.php:220
+msgid "Message"
+msgstr "Wiadomość"
+
+#: include/identity.php:226 include/nav.php:184
+msgid "Profiles"
+msgstr "Profile"
+
+#: include/identity.php:226
+msgid "Manage/edit profiles"
+msgstr "Zarządzaj profilami"
+
+#: include/identity.php:341
+msgid "Network:"
+msgstr ""
+
+#: include/identity.php:373 include/identity.php:459
+msgid "g A l F d"
+msgstr "g A I F d"
+
+#: include/identity.php:374 include/identity.php:460
+msgid "F d"
+msgstr ""
+
+#: include/identity.php:419 include/identity.php:506
+msgid "[today]"
+msgstr "[dziś]"
+
+#: include/identity.php:431
+msgid "Birthday Reminders"
+msgstr "Przypomnienia o urodzinach"
+
+#: include/identity.php:432
+msgid "Birthdays this week:"
+msgstr "Urodziny w tym tygodniu:"
+
+#: include/identity.php:493
+msgid "[No description]"
+msgstr "[Brak opisu]"
+
+#: include/identity.php:517
+msgid "Event Reminders"
+msgstr "Przypominacze wydarzeń"
+
+#: include/identity.php:518
+msgid "Events this week:"
+msgstr "Wydarzenia w tym tygodniu:"
+
+#: include/identity.php:545
+msgid "j F, Y"
+msgstr "d M, R"
+
+#: include/identity.php:546
+msgid "j F"
+msgstr "d M"
+
+#: include/identity.php:553
+msgid "Birthday:"
+msgstr "Urodziny:"
+
+#: include/identity.php:557
+msgid "Age:"
+msgstr "Wiek:"
+
+#: include/identity.php:566
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "od %1$d %2$s"
+
+#: include/identity.php:579
+msgid "Religion:"
+msgstr "Religia:"
+
+#: include/identity.php:583
+msgid "Hobbies/Interests:"
+msgstr "Hobby/Zainteresowania:"
+
+#: include/identity.php:590
+msgid "Contact information and Social Networks:"
+msgstr "Informacje kontaktowe i sieci społeczne"
+
+#: include/identity.php:592
+msgid "Musical interests:"
+msgstr "Zainteresowania muzyczne:"
+
+#: include/identity.php:594
+msgid "Books, literature:"
+msgstr "Książki, literatura:"
+
+#: include/identity.php:596
+msgid "Television:"
+msgstr "Telewizja:"
+
+#: include/identity.php:598
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/taniec/kultura/rozrywka"
+
+#: include/identity.php:600
+msgid "Love/Romance:"
+msgstr "Miłość/Romans:"
+
+#: include/identity.php:602
+msgid "Work/employment:"
+msgstr "Praca/zatrudnienie:"
+
+#: include/identity.php:604
+msgid "School/education:"
+msgstr "Szkoła/edukacja:"
+
+#: include/identity.php:632 include/nav.php:76
+msgid "Status"
+msgstr "Status"
+
+#: include/identity.php:635
+msgid "Status Messages and Posts"
+msgstr "Status wiadomości i postów"
+
+#: include/identity.php:643
+msgid "Profile Details"
+msgstr "Szczegóły profilu"
+
+#: include/identity.php:656 include/identity.php:659 include/nav.php:79
+msgid "Videos"
+msgstr "Filmy"
+
+#: include/identity.php:670
+msgid "Events and Calendar"
+msgstr "Wydarzenia i kalendarz"
+
+#: include/identity.php:678
+msgid "Only You Can See This"
+msgstr "Tylko ty możesz to zobaczyć"
+
+#: include/acl_selectors.php:324
+msgid "Post to Email"
+msgstr "Wyślij poprzez email"
+
+#: include/acl_selectors.php:329
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr ""
+
+#: include/acl_selectors.php:335
 msgid "Visible to everybody"
 msgstr "Widoczny dla wszystkich"
 
-#: ../../include/acl_selectors.php:334 ../../view/theme/diabook/config.php:142
-#: ../../view/theme/diabook/theme.php:621
+#: include/acl_selectors.php:336 view/theme/diabook/config.php:142
+#: view/theme/diabook/theme.php:621
 msgid "show"
 msgstr "pokaż"
 
-#: ../../include/acl_selectors.php:335 ../../view/theme/diabook/config.php:142
-#: ../../view/theme/diabook/theme.php:621
+#: include/acl_selectors.php:337 view/theme/diabook/config.php:142
+#: view/theme/diabook/theme.php:621
 msgid "don't show"
 msgstr "nie pokazuj"
 
-#: ../../include/message.php:15 ../../include/message.php:172
+#: include/message.php:15 include/message.php:173
 msgid "[no subject]"
 msgstr "[bez tematu]"
 
-#: ../../include/Contact.php:115
+#: include/Contact.php:119
 msgid "stopped following"
 msgstr "przestań obserwować"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:882
+#: include/Contact.php:232 include/conversation.php:881
 msgid "Poke"
 msgstr "Zaczepka"
 
-#: ../../include/Contact.php:229 ../../include/conversation.php:876
+#: include/Contact.php:233 include/conversation.php:875
 msgid "View Status"
 msgstr "Zobacz status"
 
-#: ../../include/Contact.php:230 ../../include/conversation.php:877
+#: include/Contact.php:234 include/conversation.php:876
 msgid "View Profile"
 msgstr "Zobacz profil"
 
-#: ../../include/Contact.php:231 ../../include/conversation.php:878
+#: include/Contact.php:235 include/conversation.php:877
 msgid "View Photos"
 msgstr "Zobacz zdjęcia"
 
-#: ../../include/Contact.php:232 ../../include/Contact.php:255
-#: ../../include/conversation.php:879
+#: include/Contact.php:236 include/Contact.php:259
+#: include/conversation.php:878
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:233 ../../include/Contact.php:255
-#: ../../include/conversation.php:880
+#: include/Contact.php:237 include/Contact.php:259
+#: include/conversation.php:879
 msgid "Edit Contact"
 msgstr "Edytuj kontakt"
 
-#: ../../include/Contact.php:234
+#: include/Contact.php:238
 msgid "Drop Contact"
 msgstr ""
 
-#: ../../include/Contact.php:235 ../../include/Contact.php:255
-#: ../../include/conversation.php:881
+#: include/Contact.php:239 include/Contact.php:259
+#: include/conversation.php:880
 msgid "Send PM"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../../include/security.php:22
+#: include/security.php:22
 msgid "Welcome "
 msgstr "Witaj "
 
-#: ../../include/security.php:23
+#: include/security.php:23
 msgid "Please upload a profile photo."
 msgstr "Proszę dodać zdjęcie profilowe."
 
-#: ../../include/security.php:26
+#: include/security.php:26
 msgid "Welcome back "
 msgstr "Witaj ponownie "
 
-#: ../../include/security.php:366
+#: include/security.php:375
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/conversation.php:118 ../../include/conversation.php:246
-#: ../../include/text.php:1966 ../../view/theme/diabook/theme.php:463
+#: include/conversation.php:118 include/conversation.php:245
+#: include/text.php:2032 view/theme/diabook/theme.php:463
 msgid "event"
 msgstr "wydarzenie"
 
-#: ../../include/conversation.php:207
+#: include/conversation.php:206
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:211 ../../include/text.php:1005
-msgid "poked"
-msgstr "zaczepiony"
-
-#: ../../include/conversation.php:291
+#: include/conversation.php:290
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:292
+#: include/conversation.php:291
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:772
+#: include/conversation.php:771
 msgid "remove"
 msgstr "usuń"
 
-#: ../../include/conversation.php:776
+#: include/conversation.php:775
 msgid "Delete Selected Items"
 msgstr "Usuń zaznaczone elementy"
 
-#: ../../include/conversation.php:875
+#: include/conversation.php:874
 msgid "Follow Thread"
 msgstr "Śledź wątek"
 
-#: ../../include/conversation.php:944
+#: include/conversation.php:943
 #, php-format
 msgid "%s likes this."
 msgstr "%s lubi to."
 
-#: ../../include/conversation.php:944
+#: include/conversation.php:943
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s nie lubi tego."
 
-#: ../../include/conversation.php:949
+#: include/conversation.php:948
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:952
+#: include/conversation.php:951
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:966
+#: include/conversation.php:965
 msgid "and"
 msgstr "i"
 
-#: ../../include/conversation.php:972
+#: include/conversation.php:971
 #, php-format
 msgid ", and %d other people"
 msgstr ", i %d innych ludzi"
 
-#: ../../include/conversation.php:974
+#: include/conversation.php:973
 #, php-format
 msgid "%s like this."
 msgstr "%s lubi to."
 
-#: ../../include/conversation.php:974
+#: include/conversation.php:973
 #, php-format
 msgid "%s don't like this."
 msgstr "%s nie lubi tego."
 
-#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
+#: include/conversation.php:1000 include/conversation.php:1018
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Widoczne dla <strong>wszystkich</strong>"
 
-#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
+#: include/conversation.php:1002 include/conversation.php:1020
 msgid "Please enter a video link/URL:"
 msgstr "Podaj link do filmu"
 
-#: ../../include/conversation.php:1004 ../../include/conversation.php:1022
+#: include/conversation.php:1003 include/conversation.php:1021
 msgid "Please enter an audio link/URL:"
 msgstr "Podaj link do muzyki"
 
-#: ../../include/conversation.php:1005 ../../include/conversation.php:1023
+#: include/conversation.php:1004 include/conversation.php:1022
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1007 ../../include/conversation.php:1025
+#: include/conversation.php:1006 include/conversation.php:1024
 msgid "Where are you right now?"
 msgstr "Gdzie teraz jesteś?"
 
-#: ../../include/conversation.php:1008
+#: include/conversation.php:1007
 msgid "Delete item(s)?"
 msgstr "Usunąć pozycję (pozycje)?"
 
-#: ../../include/conversation.php:1051
-msgid "Post to Email"
-msgstr "Wyślij poprzez email"
-
-#: ../../include/conversation.php:1056
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr ""
-
-#: ../../include/conversation.php:1111
+#: include/conversation.php:1076
 msgid "permissions"
 msgstr "zezwolenia"
 
-#: ../../include/conversation.php:1135
+#: include/conversation.php:1099
 msgid "Post to Groups"
 msgstr "Wstaw na strony grup"
 
-#: ../../include/conversation.php:1136
+#: include/conversation.php:1100
 msgid "Post to Contacts"
 msgstr "Wstaw do kontaktów"
 
-#: ../../include/conversation.php:1137
+#: include/conversation.php:1101
 msgid "Private post"
 msgstr "Prywatne posty"
 
-#: ../../include/network.php:895
+#: include/network.php:959
 msgid "view full size"
 msgstr "Zobacz w pełnym wymiarze"
 
-#: ../../include/text.php:297
+#: include/text.php:299
 msgid "newer"
 msgstr "nowsze"
 
-#: ../../include/text.php:299
+#: include/text.php:301
 msgid "older"
 msgstr "starsze"
 
-#: ../../include/text.php:304
+#: include/text.php:306
 msgid "prev"
 msgstr "poprzedni"
 
-#: ../../include/text.php:306
+#: include/text.php:308
 msgid "first"
 msgstr "pierwszy"
 
-#: ../../include/text.php:338
+#: include/text.php:340
 msgid "last"
 msgstr "ostatni"
 
-#: ../../include/text.php:341
+#: include/text.php:343
 msgid "next"
 msgstr "następny"
 
-#: ../../include/text.php:855
+#: include/text.php:398
+msgid "Loading more entries..."
+msgstr ""
+
+#: include/text.php:399
+msgid "The end"
+msgstr ""
+
+#: include/text.php:890
 msgid "No contacts"
 msgstr "Brak kontaktów"
 
-#: ../../include/text.php:864
+#: include/text.php:905
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -6403,715 +6667,667 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktów"
 msgstr[2] "%d kontakty"
 
-#: ../../include/text.php:1005
+#: include/text.php:1003 include/nav.php:122
+msgid "Full Text"
+msgstr ""
+
+#: include/text.php:1004 include/nav.php:123
+msgid "Tags"
+msgstr ""
+
+#: include/text.php:1008 include/nav.php:127
+msgid "Forums"
+msgstr ""
+
+#: include/text.php:1058
 msgid "poke"
 msgstr "zaczep"
 
-#: ../../include/text.php:1006
+#: include/text.php:1058
+msgid "poked"
+msgstr "zaczepiony"
+
+#: include/text.php:1059
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:1006
+#: include/text.php:1059
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:1007
+#: include/text.php:1060
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:1007
+#: include/text.php:1060
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:1008
+#: include/text.php:1061
 msgid "slap"
 msgstr "spoliczkuj"
 
-#: ../../include/text.php:1008
+#: include/text.php:1061
 msgid "slapped"
 msgstr "spoliczkowany"
 
-#: ../../include/text.php:1009
+#: include/text.php:1062
 msgid "finger"
 msgstr "dotknąć"
 
-#: ../../include/text.php:1009
+#: include/text.php:1062
 msgid "fingered"
 msgstr "dotknięty"
 
-#: ../../include/text.php:1010
+#: include/text.php:1063
 msgid "rebuff"
 msgstr "odprawiać"
 
-#: ../../include/text.php:1010
+#: include/text.php:1063
 msgid "rebuffed"
 msgstr "odprawiony"
 
-#: ../../include/text.php:1024
+#: include/text.php:1077
 msgid "happy"
 msgstr "szczęśliwy"
 
-#: ../../include/text.php:1025
+#: include/text.php:1078
 msgid "sad"
 msgstr "smutny"
 
-#: ../../include/text.php:1026
+#: include/text.php:1079
 msgid "mellow"
 msgstr "spokojny"
 
-#: ../../include/text.php:1027
+#: include/text.php:1080
 msgid "tired"
 msgstr "zmęczony"
 
-#: ../../include/text.php:1028
+#: include/text.php:1081
 msgid "perky"
 msgstr "pewny siebie"
 
-#: ../../include/text.php:1029
+#: include/text.php:1082
 msgid "angry"
 msgstr "wściekły"
 
-#: ../../include/text.php:1030
+#: include/text.php:1083
 msgid "stupified"
 msgstr "odurzony"
 
-#: ../../include/text.php:1031
+#: include/text.php:1084
 msgid "puzzled"
 msgstr "zdziwiony"
 
-#: ../../include/text.php:1032
+#: include/text.php:1085
 msgid "interested"
 msgstr "interesujący"
 
-#: ../../include/text.php:1033
+#: include/text.php:1086
 msgid "bitter"
 msgstr "zajadły"
 
-#: ../../include/text.php:1034
+#: include/text.php:1087
 msgid "cheerful"
 msgstr "wesoły"
 
-#: ../../include/text.php:1035
+#: include/text.php:1088
 msgid "alive"
 msgstr "żywy"
 
-#: ../../include/text.php:1036
+#: include/text.php:1089
 msgid "annoyed"
 msgstr "irytujący"
 
-#: ../../include/text.php:1037
+#: include/text.php:1090
 msgid "anxious"
 msgstr "zazdrosny"
 
-#: ../../include/text.php:1038
+#: include/text.php:1091
 msgid "cranky"
 msgstr "zepsuty"
 
-#: ../../include/text.php:1039
+#: include/text.php:1092
 msgid "disturbed"
 msgstr "przeszkadzający"
 
-#: ../../include/text.php:1040
+#: include/text.php:1093
 msgid "frustrated"
 msgstr "rozbity"
 
-#: ../../include/text.php:1041
+#: include/text.php:1094
 msgid "motivated"
 msgstr "zmotywowany"
 
-#: ../../include/text.php:1042
+#: include/text.php:1095
 msgid "relaxed"
 msgstr "zrelaksowany"
 
-#: ../../include/text.php:1043
+#: include/text.php:1096
 msgid "surprised"
 msgstr "zaskoczony"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Wednesday"
 msgstr "Środa"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Friday"
 msgstr "Piątek"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../../include/text.php:1213
+#: include/text.php:1266
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "January"
 msgstr "Styczeń"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "February"
 msgstr "Luty"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "March"
 msgstr "Marzec"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "April"
 msgstr "Kwiecień"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "May"
 msgstr "Maj"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "June"
 msgstr "Czerwiec"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "July"
 msgstr "Lipiec"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "August"
 msgstr "Sierpień"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "September"
 msgstr "Wrzesień"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "October"
 msgstr "Październik"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "November"
 msgstr "Listopad"
 
-#: ../../include/text.php:1217
+#: include/text.php:1270
 msgid "December"
 msgstr "Grudzień"
 
-#: ../../include/text.php:1437
+#: include/text.php:1492
 msgid "bytes"
 msgstr "bajty"
 
-#: ../../include/text.php:1461 ../../include/text.php:1473
+#: include/text.php:1524 include/text.php:1536
 msgid "Click to open/close"
 msgstr "Kliknij aby otworzyć/zamknąć"
 
-#: ../../include/text.php:1702 ../../include/user.php:247
-#: ../../view/theme/duepuntozero/config.php:44
+#: include/text.php:1710
+msgid "View on separate page"
+msgstr ""
+
+#: include/text.php:1711
+msgid "view on separate page"
+msgstr ""
+
+#: include/text.php:1768 include/user.php:255
+#: view/theme/duepuntozero/config.php:44
 msgid "default"
 msgstr "standardowe"
 
-#: ../../include/text.php:1714
+#: include/text.php:1780
 msgid "Select an alternate language"
 msgstr "Wybierz alternatywny język"
 
-#: ../../include/text.php:1970
+#: include/text.php:2036
 msgid "activity"
 msgstr "aktywność"
 
-#: ../../include/text.php:1973
+#: include/text.php:2039
 msgid "post"
 msgstr "post"
 
-#: ../../include/text.php:2141
+#: include/text.php:2207
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/bbcode.php:428 ../../include/bbcode.php:1047
-#: ../../include/bbcode.php:1048
+#: include/bbcode.php:458 include/bbcode.php:1112 include/bbcode.php:1113
 msgid "Image/photo"
 msgstr "Obrazek/zdjęcie"
 
-#: ../../include/bbcode.php:528
+#: include/bbcode.php:556
 #, php-format
 msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: ../../include/bbcode.php:562
+#: include/bbcode.php:590
 #, php-format
 msgid ""
 "<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a "
 "href=\"%s\" target=\"_blank\">post</a>"
 msgstr ""
 
-#: ../../include/bbcode.php:1011 ../../include/bbcode.php:1031
+#: include/bbcode.php:1076 include/bbcode.php:1096
 msgid "$1 wrote:"
 msgstr "$1 napisał:"
 
-#: ../../include/bbcode.php:1056 ../../include/bbcode.php:1057
+#: include/bbcode.php:1121 include/bbcode.php:1122
 msgid "Encrypted content"
 msgstr "Szyfrowana treść"
 
-#: ../../include/notifier.php:786 ../../include/delivery.php:456
+#: include/notifier.php:830 include/delivery.php:456
 msgid "(no subject)"
 msgstr "(bez tematu)"
 
-#: ../../include/notifier.php:796 ../../include/delivery.php:467
-#: ../../include/enotify.php:33
+#: include/notifier.php:840 include/delivery.php:467 include/enotify.php:33
 msgid "noreply"
 msgstr "brak odpowiedzi"
 
-#: ../../include/dba_pdo.php:72 ../../include/dba.php:56
+#: include/dba_pdo.php:72 include/dba.php:56
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Nie można zlokalizować serwera DNS dla bazy danych '%s'"
 
-#: ../../include/contact_selectors.php:32
+#: include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr "Nieznany | Bez kategori"
 
-#: ../../include/contact_selectors.php:33
+#: include/contact_selectors.php:33
 msgid "Block immediately"
 msgstr "Zablokować natychmiast "
 
-#: ../../include/contact_selectors.php:34
+#: include/contact_selectors.php:34
 msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
+#: include/contact_selectors.php:35
 msgid "Known to me, but no opinion"
 msgstr "Znam, ale nie mam zdania"
 
-#: ../../include/contact_selectors.php:36
+#: include/contact_selectors.php:36
 msgid "OK, probably harmless"
 msgstr "Ok, bez problemów"
 
-#: ../../include/contact_selectors.php:37
+#: include/contact_selectors.php:37
 msgid "Reputable, has my trust"
 msgstr "Zaufane, ma moje poparcie"
 
-#: ../../include/contact_selectors.php:60
+#: include/contact_selectors.php:60
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: ../../include/contact_selectors.php:61
+#: include/contact_selectors.php:61
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: ../../include/contact_selectors.php:77
+#: include/contact_selectors.php:77
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../include/contact_selectors.php:78
+#: include/contact_selectors.php:78
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:82
+#: include/contact_selectors.php:82
 msgid "Zot!"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
+#: include/contact_selectors.php:83
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/contact_selectors.php:84
+#: include/contact_selectors.php:84
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/contact_selectors.php:85
+#: include/contact_selectors.php:85
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/contact_selectors.php:87
+#: include/contact_selectors.php:87
 msgid "Google+"
 msgstr "Google+"
 
-#: ../../include/contact_selectors.php:88
+#: include/contact_selectors.php:88
 msgid "pump.io"
 msgstr ""
 
-#: ../../include/contact_selectors.php:89
+#: include/contact_selectors.php:89
 msgid "Twitter"
 msgstr ""
 
-#: ../../include/contact_selectors.php:90
+#: include/contact_selectors.php:90
 msgid "Diaspora Connector"
 msgstr ""
 
-#: ../../include/contact_selectors.php:91
+#: include/contact_selectors.php:91
 msgid "Statusnet"
 msgstr ""
 
-#: ../../include/contact_selectors.php:92
+#: include/contact_selectors.php:92
 msgid "App.net"
 msgstr ""
 
-#: ../../include/Scrape.php:614
+#: include/contact_selectors.php:103
+msgid "Redmatrix"
+msgstr ""
+
+#: include/Scrape.php:603
 msgid " on Last.fm"
 msgstr "na Last.fm"
 
-#: ../../include/bb2diaspora.php:154 ../../include/event.php:20
+#: include/bb2diaspora.php:154 include/event.php:22
 msgid "Starts:"
 msgstr "Start:"
 
-#: ../../include/bb2diaspora.php:162 ../../include/event.php:30
+#: include/bb2diaspora.php:162 include/event.php:32
 msgid "Finishes:"
 msgstr "Wykończenia:"
 
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr "d M, R"
-
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr "d M"
-
-#: ../../include/profile_advanced.php:30
-msgid "Birthday:"
-msgstr "Urodziny:"
-
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr "Wiek:"
-
-#: ../../include/profile_advanced.php:43
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "od %1$d %2$s"
-
-#: ../../include/profile_advanced.php:52
-msgid "Tags:"
-msgstr "Tagi:"
-
-#: ../../include/profile_advanced.php:56
-msgid "Religion:"
-msgstr "Religia:"
-
-#: ../../include/profile_advanced.php:60
-msgid "Hobbies/Interests:"
-msgstr "Hobby/Zainteresowania:"
-
-#: ../../include/profile_advanced.php:67
-msgid "Contact information and Social Networks:"
-msgstr "Informacje kontaktowe i sieci społeczne"
-
-#: ../../include/profile_advanced.php:69
-msgid "Musical interests:"
-msgstr "Zainteresowania muzyczne:"
-
-#: ../../include/profile_advanced.php:71
-msgid "Books, literature:"
-msgstr "Książki, literatura:"
-
-#: ../../include/profile_advanced.php:73
-msgid "Television:"
-msgstr "Telewizja:"
-
-#: ../../include/profile_advanced.php:75
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/taniec/kultura/rozrywka"
-
-#: ../../include/profile_advanced.php:77
-msgid "Love/Romance:"
-msgstr "Miłość/Romans:"
-
-#: ../../include/profile_advanced.php:79
-msgid "Work/employment:"
-msgstr "Praca/zatrudnienie:"
-
-#: ../../include/profile_advanced.php:81
-msgid "School/education:"
-msgstr "Szkoła/edukacja:"
-
-#: ../../include/plugin.php:455 ../../include/plugin.php:457
+#: include/plugin.php:458 include/plugin.php:460
 msgid "Click here to upgrade."
 msgstr "Kliknij tu, aby zaktualizować."
 
-#: ../../include/plugin.php:463
+#: include/plugin.php:466
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/plugin.php:468
+#: include/plugin.php:471
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/nav.php:73
+#: include/nav.php:73
 msgid "End this session"
 msgstr "Zakończ sesję"
 
-#: ../../include/nav.php:76 ../../include/nav.php:148
-#: ../../view/theme/diabook/theme.php:123
+#: include/nav.php:76 include/nav.php:156 view/theme/diabook/theme.php:123
 msgid "Your posts and conversations"
 msgstr "Twoje posty i rozmowy"
 
-#: ../../include/nav.php:77 ../../view/theme/diabook/theme.php:124
+#: include/nav.php:77 view/theme/diabook/theme.php:124
 msgid "Your profile page"
 msgstr "Twoja strona profilowa"
 
-#: ../../include/nav.php:78 ../../view/theme/diabook/theme.php:126
+#: include/nav.php:78 view/theme/diabook/theme.php:126
 msgid "Your photos"
 msgstr "Twoje zdjęcia"
 
-#: ../../include/nav.php:79
+#: include/nav.php:79
 msgid "Your videos"
 msgstr ""
 
-#: ../../include/nav.php:80 ../../view/theme/diabook/theme.php:127
+#: include/nav.php:80 view/theme/diabook/theme.php:127
 msgid "Your events"
 msgstr "Twoje wydarzenia"
 
-#: ../../include/nav.php:81 ../../view/theme/diabook/theme.php:128
+#: include/nav.php:81 view/theme/diabook/theme.php:128
 msgid "Personal notes"
 msgstr "Osobiste notatki"
 
-#: ../../include/nav.php:81
+#: include/nav.php:81
 msgid "Your personal notes"
 msgstr ""
 
-#: ../../include/nav.php:92
+#: include/nav.php:92
 msgid "Sign in"
 msgstr "Zaloguj się"
 
-#: ../../include/nav.php:105
+#: include/nav.php:105
 msgid "Home Page"
 msgstr "Strona startowa"
 
-#: ../../include/nav.php:109
+#: include/nav.php:109
 msgid "Create an account"
 msgstr "Załóż konto"
 
-#: ../../include/nav.php:114
+#: include/nav.php:114
 msgid "Help and documentation"
 msgstr "Pomoc i dokumentacja"
 
-#: ../../include/nav.php:117
+#: include/nav.php:117
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: ../../include/nav.php:117
+#: include/nav.php:117
 msgid "Addon applications, utilities, games"
 msgstr "Wtyczki, aplikacje, narzędzia, gry"
 
-#: ../../include/nav.php:119
+#: include/nav.php:119
 msgid "Search site content"
 msgstr "Przeszukaj zawartość strony"
 
-#: ../../include/nav.php:129
+#: include/nav.php:137
 msgid "Conversations on this site"
 msgstr "Rozmowy na tej stronie"
 
-#: ../../include/nav.php:131
+#: include/nav.php:139
 msgid "Conversations on the network"
 msgstr ""
 
-#: ../../include/nav.php:133
+#: include/nav.php:141
 msgid "Directory"
 msgstr "Katalog"
 
-#: ../../include/nav.php:133
+#: include/nav.php:141
 msgid "People directory"
 msgstr ""
 
-#: ../../include/nav.php:135
+#: include/nav.php:143
 msgid "Information"
 msgstr ""
 
-#: ../../include/nav.php:135
+#: include/nav.php:143
 msgid "Information about this friendica instance"
 msgstr ""
 
-#: ../../include/nav.php:145
+#: include/nav.php:153
 msgid "Conversations from your friends"
 msgstr "Rozmowy Twoich przyjaciół"
 
-#: ../../include/nav.php:146
+#: include/nav.php:154
 msgid "Network Reset"
 msgstr ""
 
-#: ../../include/nav.php:146
+#: include/nav.php:154
 msgid "Load Network page with no filters"
 msgstr ""
 
-#: ../../include/nav.php:154
+#: include/nav.php:161
 msgid "Friend Requests"
 msgstr "Podania o przyjęcie do grona znajomych"
 
-#: ../../include/nav.php:156
+#: include/nav.php:165
 msgid "See all notifications"
 msgstr "Zobacz wszystkie powiadomienia"
 
-#: ../../include/nav.php:157
+#: include/nav.php:166
 msgid "Mark all system notifications seen"
 msgstr "Oznacz wszystkie powiadomienia systemu jako przeczytane"
 
-#: ../../include/nav.php:161
+#: include/nav.php:170
 msgid "Private mail"
 msgstr "Prywatne maile"
 
-#: ../../include/nav.php:162
+#: include/nav.php:171
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: ../../include/nav.php:163
+#: include/nav.php:172
 msgid "Outbox"
 msgstr "Wysłane"
 
-#: ../../include/nav.php:167
+#: include/nav.php:176
 msgid "Manage"
 msgstr "Zarządzaj"
 
-#: ../../include/nav.php:167
+#: include/nav.php:176
 msgid "Manage other pages"
 msgstr "Zarządzaj innymi stronami"
 
-#: ../../include/nav.php:172
+#: include/nav.php:181
 msgid "Account settings"
 msgstr "Ustawienia konta"
 
-#: ../../include/nav.php:175
+#: include/nav.php:184
 msgid "Manage/Edit Profiles"
 msgstr "Zarządzaj/Edytuj profile"
 
-#: ../../include/nav.php:177
+#: include/nav.php:186
 msgid "Manage/edit friends and contacts"
 msgstr "Zarządzaj listą przyjaciół i kontaktami"
 
-#: ../../include/nav.php:184
+#: include/nav.php:193
 msgid "Site setup and configuration"
 msgstr "Konfiguracja i ustawienia instancji"
 
-#: ../../include/nav.php:188
+#: include/nav.php:197
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: ../../include/nav.php:188
+#: include/nav.php:197
 msgid "Site map"
 msgstr "Mapa strony"
 
-#: ../../include/api.php:304 ../../include/api.php:315
-#: ../../include/api.php:416 ../../include/api.php:1063
-#: ../../include/api.php:1065
+#: include/api.php:321 include/api.php:332 include/api.php:441
+#: include/api.php:1141 include/api.php:1143
 msgid "User not found."
 msgstr ""
 
-#: ../../include/api.php:771
+#: include/api.php:795
 #, php-format
 msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/api.php:790
+#: include/api.php:814
 #, php-format
 msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/api.php:809
+#: include/api.php:833
 #, php-format
 msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/api.php:1272
+#: include/api.php:1350
 msgid "There is no status with this id."
 msgstr ""
 
-#: ../../include/api.php:1342
+#: include/api.php:1424
 msgid "There is no conversation with this id."
 msgstr ""
 
-#: ../../include/api.php:1614
-msgid "Invalid request."
-msgstr ""
-
-#: ../../include/api.php:1625
+#: include/api.php:1703
 msgid "Invalid item."
 msgstr ""
 
-#: ../../include/api.php:1635
+#: include/api.php:1713
 msgid "Invalid action. "
 msgstr ""
 
-#: ../../include/api.php:1643
+#: include/api.php:1721
 msgid "DB error"
 msgstr ""
 
-#: ../../include/user.php:40
+#: include/user.php:48
 msgid "An invitation is required."
 msgstr "Wymagane zaproszenie."
 
-#: ../../include/user.php:45
+#: include/user.php:53
 msgid "Invitation could not be verified."
 msgstr "Zaproszenie niezweryfikowane."
 
-#: ../../include/user.php:53
+#: include/user.php:61
 msgid "Invalid OpenID url"
 msgstr "Nieprawidłowy adres url OpenID"
 
-#: ../../include/user.php:74
+#: include/user.php:82
 msgid "Please enter the required information."
 msgstr "Wprowadź wymagane informacje"
 
-#: ../../include/user.php:88
+#: include/user.php:96
 msgid "Please use a shorter name."
 msgstr "Użyj dłuższej nazwy."
 
-#: ../../include/user.php:90
+#: include/user.php:98
 msgid "Name too short."
 msgstr "Nazwa jest za krótka."
 
-#: ../../include/user.php:105
+#: include/user.php:113
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Zdaje mi się że to nie jest twoje pełne Imię(Nazwisko)."
 
-#: ../../include/user.php:110
+#: include/user.php:118
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Twoja domena internetowa nie jest obsługiwana na tej stronie."
 
-#: ../../include/user.php:113
+#: include/user.php:121
 msgid "Not a valid email address."
 msgstr "Niepoprawny adres e mail.."
 
-#: ../../include/user.php:126
+#: include/user.php:134
 msgid "Cannot use that email."
 msgstr "Nie możesz użyć tego e-maila. "
 
-#: ../../include/user.php:132
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr "Twój login może składać się tylko z \"a-z\",  \"0-9\", \"-\", \"_\", i musi mieć na początku literę."
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+msgstr ""
 
-#: ../../include/user.php:138 ../../include/user.php:236
+#: include/user.php:146 include/user.php:244
 msgid "Nickname is already registered. Please choose another."
 msgstr "Ten login jest zajęty. Wybierz inny."
 
-#: ../../include/user.php:148
+#: include/user.php:156
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr "Ten nick był już zarejestrowany na tej stronie i nie może być użyty ponownie."
 
-#: ../../include/user.php:164
+#: include/user.php:172
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń."
 
-#: ../../include/user.php:222
+#: include/user.php:230
 msgid "An error occurred during registration. Please try again."
 msgstr "Wystąpił bład podczas rejestracji, Spróbuj ponownie."
 
-#: ../../include/user.php:257
+#: include/user.php:265
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Wystąpił błąd podczas tworzenia profilu. Spróbuj ponownie."
 
-#: ../../include/user.php:289 ../../include/user.php:293
-#: ../../include/profile_selectors.php:42
+#: include/user.php:297 include/user.php:301 include/profile_selectors.php:42
 msgid "Friends"
 msgstr "Przyjaciele"
 
-#: ../../include/user.php:377
+#: include/user.php:385
 #, php-format
 msgid ""
 "\n"
@@ -7120,7 +7336,7 @@ msgid ""
 "\t"
 msgstr ""
 
-#: ../../include/user.php:381
+#: include/user.php:389
 #, php-format
 msgid ""
 "\n"
@@ -7150,495 +7366,494 @@ msgid ""
 "\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: ../../include/diaspora.php:703
+#: include/diaspora.php:717
 msgid "Sharing notification from Diaspora network"
 msgstr "Wspólne powiadomienie z sieci Diaspora"
 
-#: ../../include/diaspora.php:2520
+#: include/diaspora.php:2560
 msgid "Attachments:"
 msgstr "Załączniki:"
 
-#: ../../include/items.php:4555
+#: include/items.php:4853
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: ../../include/items.php:4778
+#: include/items.php:5128
 msgid "Archives"
 msgstr "Archiwum"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Female"
 msgstr "Kobieta"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Currently Male"
 msgstr "Aktualnie Mężczyzna"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Currently Female"
 msgstr "Aktualnie Kobieta"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Mostly Male"
 msgstr "Bardziej Mężczyzna"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Mostly Female"
 msgstr "Bardziej Kobieta"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Transgender"
 msgstr "Transpłciowy"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Intersex"
 msgstr "Międzypłciowy"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Transsexual"
 msgstr "Transseksualista"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Hermaphrodite"
 msgstr "Hermafrodyta"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Neuter"
 msgstr "Bezpłciowy"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Non-specific"
 msgstr "Niespecyficzne"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Other"
 msgstr "Inne"
 
-#: ../../include/profile_selectors.php:6
+#: include/profile_selectors.php:6
 msgid "Undecided"
 msgstr "Niezdecydowany"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Males"
 msgstr "Mężczyźni"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Females"
 msgstr "Kobiety"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Gay"
 msgstr "Gej"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Lesbian"
 msgstr "Lesbijka"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "No Preference"
 msgstr "Brak preferencji"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Bisexual"
 msgstr "Biseksualny"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Autosexual"
 msgstr "Niezidentyfikowany"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Abstinent"
 msgstr "Abstynent"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Virgin"
 msgstr "Dziewica"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Deviant"
 msgstr "Zboczeniec"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Fetish"
 msgstr "Fetysz"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Oodles"
 msgstr "Nadmiar"
 
-#: ../../include/profile_selectors.php:23
+#: include/profile_selectors.php:23
 msgid "Nonsexual"
 msgstr "Nieseksualny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Single"
 msgstr "Singiel"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Lonely"
 msgstr "Samotny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Unavailable"
 msgstr "Niedostępny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Has crush"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Infatuated"
 msgstr "zakochany"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Dating"
 msgstr "Randki"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Unfaithful"
 msgstr "Niewierny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Sex Addict"
 msgstr "Uzależniony od seksu"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr "Przyjaciele/Korzyści"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Casual"
 msgstr "Przypadkowy"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Engaged"
 msgstr "Zaręczeni"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Married"
 msgstr "Małżeństwo"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Imaginarily married"
 msgstr "Fikcyjnie w związku małżeńskim"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Partners"
 msgstr "Partnerzy"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Cohabiting"
 msgstr "Konkubinat"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Common law"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Happy"
 msgstr "Szczęśliwy"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Not looking"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Swinger"
 msgstr "Swinger"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Betrayed"
 msgstr "Zdradzony"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Separated"
 msgstr "W separacji"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Unstable"
 msgstr "Niestabilny"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Divorced"
 msgstr "Rozwiedzeni"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Imaginarily divorced"
 msgstr "Fikcyjnie rozwiedziony/a"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Widowed"
 msgstr "Wdowiec"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Uncertain"
 msgstr "Nieokreślony"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "It's complicated"
 msgstr "To skomplikowane"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Don't care"
 msgstr "Nie obchodzi mnie to"
 
-#: ../../include/profile_selectors.php:42
+#: include/profile_selectors.php:42
 msgid "Ask me"
 msgstr "Zapytaj mnie "
 
-#: ../../include/enotify.php:18
+#: include/enotify.php:18
 msgid "Friendica Notification"
 msgstr "Powiadomienia Friendica"
 
-#: ../../include/enotify.php:21
+#: include/enotify.php:21
 msgid "Thank You,"
 msgstr "Dziękuję,"
 
-#: ../../include/enotify.php:23
+#: include/enotify.php:23
 #, php-format
 msgid "%s Administrator"
 msgstr "%s administrator"
 
-#: ../../include/enotify.php:64
+#: include/enotify.php:64
 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/enotify.php:68
+#: include/enotify.php:78
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Notify] Nowa wiadomość otrzymana od %s"
 
-#: ../../include/enotify.php:70
+#: include/enotify.php:80
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:71
+#: include/enotify.php:81
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s wysyła ci %2$s"
 
-#: ../../include/enotify.php:71
+#: include/enotify.php:81
 msgid "a private message"
 msgstr "prywatna wiadomość"
 
-#: ../../include/enotify.php:72
+#: include/enotify.php:82
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na twoje prywatne wiadomości"
 
-#: ../../include/enotify.php:124
+#: include/enotify.php:134
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s skomentował [url=%2$s]a %3$s[/url]"
 
-#: ../../include/enotify.php:131
+#: include/enotify.php:141
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:139
+#: include/enotify.php:149
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:149
+#: include/enotify.php:159
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:150
+#: include/enotify.php:160
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s skomentował rozmowę którą śledzisz"
 
-#: ../../include/enotify.php:153 ../../include/enotify.php:168
-#: ../../include/enotify.php:181 ../../include/enotify.php:194
-#: ../../include/enotify.php:212 ../../include/enotify.php:225
+#: include/enotify.php:163 include/enotify.php:178 include/enotify.php:191
+#: include/enotify.php:204 include/enotify.php:222 include/enotify.php:235
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na rozmowę"
 
-#: ../../include/enotify.php:160
+#: include/enotify.php:170
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica:Notify] %s napisał na twoim profilu"
 
-#: ../../include/enotify.php:162
+#: include/enotify.php:172
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:164
+#: include/enotify.php:174
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:175
+#: include/enotify.php:185
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Notify] %s oznaczył cię"
 
-#: ../../include/enotify.php:176
+#: include/enotify.php:186
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s oznaczył/a cię w %2$s"
 
-#: ../../include/enotify.php:177
+#: include/enotify.php:187
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:188
+#: include/enotify.php:198
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr ""
 
-#: ../../include/enotify.php:189
+#: include/enotify.php:199
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:190
+#: include/enotify.php:200
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:202
+#: include/enotify.php:212
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/enotify.php:203
+#: include/enotify.php:213
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:204
+#: include/enotify.php:214
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:219
+#: include/enotify.php:229
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:220
+#: include/enotify.php:230
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:221
+#: include/enotify.php:231
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:232
+#: include/enotify.php:242
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:233
+#: include/enotify.php:243
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:234
+#: include/enotify.php:244
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:237 ../../include/enotify.php:279
+#: include/enotify.php:247 include/enotify.php:289
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Możesz obejrzeć ich profile na %s"
 
-#: ../../include/enotify.php:239
+#: include/enotify.php:249
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Odwiedż %s aby zatwierdzić lub odrzucić przedstawienie."
 
-#: ../../include/enotify.php:247
+#: include/enotify.php:257
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr ""
 
-#: ../../include/enotify.php:248 ../../include/enotify.php:249
+#: include/enotify.php:258 include/enotify.php:259
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:255
+#: include/enotify.php:265
 msgid "[Friendica:Notify] You have a new follower"
 msgstr ""
 
-#: ../../include/enotify.php:256 ../../include/enotify.php:257
+#: include/enotify.php:266 include/enotify.php:267
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr ""
 
-#: ../../include/enotify.php:270
+#: include/enotify.php:280
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:271
+#: include/enotify.php:281
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:272
+#: include/enotify.php:282
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:277
+#: include/enotify.php:287
 msgid "Name:"
 msgstr "Imię:"
 
-#: ../../include/enotify.php:278
+#: include/enotify.php:288
 msgid "Photo:"
 msgstr "Zdjęcie:"
 
-#: ../../include/enotify.php:281
+#: include/enotify.php:291
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/enotify.php:289 ../../include/enotify.php:302
+#: include/enotify.php:299 include/enotify.php:312
 msgid "[Friendica:Notify] Connection accepted"
 msgstr ""
 
-#: ../../include/enotify.php:290 ../../include/enotify.php:303
+#: include/enotify.php:300 include/enotify.php:313
 #, php-format
-msgid "'%1$s' has acepted your connection request at %2$s"
+msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:291 ../../include/enotify.php:304
+#: include/enotify.php:301 include/enotify.php:314
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:294
+#: include/enotify.php:304
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and email\n"
 "\twithout restriction."
 msgstr ""
 
-#: ../../include/enotify.php:297 ../../include/enotify.php:311
+#: include/enotify.php:307 include/enotify.php:321
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr ""
 
-#: ../../include/enotify.php:307
+#: include/enotify.php:317
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
@@ -7647,71 +7862,71 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../../include/enotify.php:309
+#: include/enotify.php:319
 #, php-format
 msgid ""
 "'%1$s' may choose to extend this into a two-way or more permissive "
 "relationship in the future. "
 msgstr ""
 
-#: ../../include/enotify.php:322
+#: include/enotify.php:332
 msgid "[Friendica System:Notify] registration request"
 msgstr ""
 
-#: ../../include/enotify.php:323
+#: include/enotify.php:333
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:324
+#: include/enotify.php:334
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:327
+#: include/enotify.php:337
 #, php-format
 msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgstr ""
 
-#: ../../include/enotify.php:330
+#: include/enotify.php:340
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
-#: ../../include/oembed.php:212
+#: include/oembed.php:220
 msgid "Embedded content"
 msgstr "Osadzona zawartość"
 
-#: ../../include/oembed.php:221
+#: include/oembed.php:229
 msgid "Embedding disabled"
 msgstr "Osadzanie wyłączone"
 
-#: ../../include/uimport.php:94
+#: include/uimport.php:94
 msgid "Error decoding account file"
 msgstr "Błąd podczas odczytu pliku konta"
 
-#: ../../include/uimport.php:100
+#: include/uimport.php:100
 msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: ../../include/uimport.php:116 ../../include/uimport.php:127
+#: include/uimport.php:116 include/uimport.php:127
 msgid "Error! Cannot check nickname"
 msgstr ""
 
-#: ../../include/uimport.php:120 ../../include/uimport.php:131
+#: include/uimport.php:120 include/uimport.php:131
 #, php-format
 msgid "User '%s' already exists on this server!"
 msgstr "Użytkownik '%s' już istnieje na tym serwerze!"
 
-#: ../../include/uimport.php:153
+#: include/uimport.php:153
 msgid "User creation error"
 msgstr ""
 
-#: ../../include/uimport.php:171
+#: include/uimport.php:173
 msgid "User profile creation error"
 msgstr ""
 
-#: ../../include/uimport.php:220
+#: include/uimport.php:222
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
@@ -7719,194 +7934,172 @@ msgstr[0] "Nie zaimportowano %d kontaktu."
 msgstr[1] "Nie zaimportowano %d kontaktów."
 msgstr[2] "Nie zaimportowano %d kontaktów."
 
-#: ../../include/uimport.php:290
+#: include/uimport.php:292
 msgid "Done. You can now login with your username and password"
 msgstr "Wykonano. Teraz możesz się zalogować z użyciem loginu i hasła."
 
-#: ../../index.php:428
+#: index.php:441
 msgid "toggle mobile"
 msgstr "przełącz na mobilny"
 
-#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/dispy/config.php:72 ../../view/theme/quattro/config.php:66
-#: ../../view/theme/diabook/config.php:150 ../../view/theme/vier/config.php:55
-#: ../../view/theme/duepuntozero/config.php:61
-msgid "Theme settings"
-msgstr "Ustawienia motywu"
-
-#: ../../view/theme/cleanzero/config.php:83
+#: view/theme/cleanzero/config.php:83
 msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""
 
-#: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/dispy/config.php:73
-#: ../../view/theme/diabook/config.php:151
+#: view/theme/cleanzero/config.php:84 view/theme/dispy/config.php:73
+#: view/theme/diabook/config.php:151
 msgid "Set font-size for posts and comments"
 msgstr "Ustaw rozmiar fontów dla postów i komentarzy"
 
-#: ../../view/theme/cleanzero/config.php:85
+#: view/theme/cleanzero/config.php:85
 msgid "Set theme width"
 msgstr "Ustaw szerokość motywu"
 
-#: ../../view/theme/cleanzero/config.php:86
-#: ../../view/theme/quattro/config.php:68
+#: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
 msgid "Color scheme"
 msgstr "Zestaw kolorów"
 
-#: ../../view/theme/dispy/config.php:74
-#: ../../view/theme/diabook/config.php:152
+#: view/theme/dispy/config.php:74 view/theme/diabook/config.php:152
 msgid "Set line-height for posts and comments"
 msgstr ""
 
-#: ../../view/theme/dispy/config.php:75
+#: view/theme/dispy/config.php:75
 msgid "Set colour scheme"
 msgstr "Zestaw kolorów"
 
-#: ../../view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:67
 msgid "Alignment"
 msgstr "Wyrównanie"
 
-#: ../../view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:67
 msgid "Left"
 msgstr "Lewo"
 
-#: ../../view/theme/quattro/config.php:67
+#: view/theme/quattro/config.php:67
 msgid "Center"
 msgstr "Środek"
 
-#: ../../view/theme/quattro/config.php:69
+#: view/theme/quattro/config.php:69
 msgid "Posts font size"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:70
+#: view/theme/quattro/config.php:70
 msgid "Textareas font size"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:153
+#: view/theme/diabook/config.php:153
 msgid "Set resolution for middle column"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:154
+#: view/theme/diabook/config.php:154
 msgid "Set color scheme"
 msgstr "Zestaw kolorów"
 
-#: ../../view/theme/diabook/config.php:155
+#: view/theme/diabook/config.php:155
 msgid "Set zoomfactor for Earth Layer"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:156
-#: ../../view/theme/diabook/theme.php:585
+#: view/theme/diabook/config.php:156 view/theme/diabook/theme.php:585
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:157
-#: ../../view/theme/diabook/theme.php:586
+#: view/theme/diabook/config.php:157 view/theme/diabook/theme.php:586
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:158
-#: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:624
+#: view/theme/diabook/config.php:158 view/theme/diabook/theme.php:130
+#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
 msgid "Community Pages"
 msgstr "Strony społecznościowe"
 
-#: ../../view/theme/diabook/config.php:159
-#: ../../view/theme/diabook/theme.php:579
-#: ../../view/theme/diabook/theme.php:625
+#: view/theme/diabook/config.php:159 view/theme/diabook/theme.php:579
+#: view/theme/diabook/theme.php:625
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:160
-#: ../../view/theme/diabook/theme.php:391
-#: ../../view/theme/diabook/theme.php:626
+#: view/theme/diabook/config.php:160 view/theme/diabook/theme.php:391
+#: view/theme/diabook/theme.php:626
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:161
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:627
+#: view/theme/diabook/config.php:161 view/theme/diabook/theme.php:599
+#: view/theme/diabook/theme.php:627
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:162
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:628
+#: view/theme/diabook/config.php:162 view/theme/diabook/theme.php:606
+#: view/theme/diabook/theme.php:628
 msgid "Connect Services"
 msgstr "Połączone serwisy"
 
-#: ../../view/theme/diabook/config.php:163
-#: ../../view/theme/diabook/theme.php:523
-#: ../../view/theme/diabook/theme.php:629
+#: view/theme/diabook/config.php:163 view/theme/diabook/theme.php:523
+#: view/theme/diabook/theme.php:629
 msgid "Find Friends"
 msgstr "Znajdź znajomych"
 
-#: ../../view/theme/diabook/config.php:164
-#: ../../view/theme/diabook/theme.php:412
-#: ../../view/theme/diabook/theme.php:630
+#: view/theme/diabook/config.php:164 view/theme/diabook/theme.php:412
+#: view/theme/diabook/theme.php:630
 msgid "Last users"
 msgstr "Ostatni użytkownicy"
 
-#: ../../view/theme/diabook/config.php:165
-#: ../../view/theme/diabook/theme.php:486
-#: ../../view/theme/diabook/theme.php:631
+#: view/theme/diabook/config.php:165 view/theme/diabook/theme.php:486
+#: view/theme/diabook/theme.php:631
 msgid "Last photos"
 msgstr "Ostatnie zdjęcia"
 
-#: ../../view/theme/diabook/config.php:166
-#: ../../view/theme/diabook/theme.php:441
-#: ../../view/theme/diabook/theme.php:632
+#: view/theme/diabook/config.php:166 view/theme/diabook/theme.php:441
+#: view/theme/diabook/theme.php:632
 msgid "Last likes"
 msgstr "Ostatnie polubienia"
 
-#: ../../view/theme/diabook/theme.php:125
+#: view/theme/diabook/theme.php:125
 msgid "Your contacts"
 msgstr "Twoje kontakty"
 
-#: ../../view/theme/diabook/theme.php:128
+#: view/theme/diabook/theme.php:128
 msgid "Your personal photos"
 msgstr "Twoje osobiste zdjęcia"
 
-#: ../../view/theme/diabook/theme.php:524
+#: view/theme/diabook/theme.php:524
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:584
+#: view/theme/diabook/theme.php:584
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:622
+#: view/theme/diabook/theme.php:622
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
-#: ../../view/theme/vier/config.php:56
+#: view/theme/vier/config.php:59
 msgid "Set style"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:45
+#: view/theme/duepuntozero/config.php:45
 msgid "greenzero"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:46
+#: view/theme/duepuntozero/config.php:46
 msgid "purplezero"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:47
+#: view/theme/duepuntozero/config.php:47
 msgid "easterbunny"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:48
+#: view/theme/duepuntozero/config.php:48
 msgid "darkzero"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:49
+#: view/theme/duepuntozero/config.php:49
 msgid "comix"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:50
+#: view/theme/duepuntozero/config.php:50
 msgid "slackr"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:62
+#: view/theme/duepuntozero/config.php:62
 msgid "Variations"
 msgstr ""
diff --git a/view/pl/strings.php b/view/pl/strings.php
index d28af9051..90cec9965 100644
--- 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";

From c7b80b532aa6d20e091bc65c3dd679a951f6d566 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 25 Sep 2015 17:47:37 +0200
Subject: [PATCH 20/22] Bugfix: The "about" field in the introductions should
 be send through bbcode

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

diff --git a/mod/notifications.php b/mod/notifications.php
index 82e13b1be..44f6dd567 100644
--- 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:'),

From 32ce091fe2a5ed1965dcc465235e09466c8a63d4 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 29 Sep 2015 09:25:36 +0200
Subject: [PATCH 21/22] Update CHANGELOG

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index df571e552..5b51a5511 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,10 @@ Version 3.4.2
 	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
 

From 2376cf143cc6e20543b93373c2845e8fb6951afa Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 29 Sep 2015 09:25:59 +0200
Subject: [PATCH 22/22] Bump Friendica version

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index e2eed38eb..dcf6c65b1 100644
--- 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"     );