diff --git a/boot.php b/boot.php
index 17fd628f..8e79d6d9 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1521' );
+define ( 'FRIENDICA_VERSION',      '3.0.1527' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 
@@ -1009,6 +1009,13 @@ if(! function_exists('remote_user')) {
 // a page is loaded. Usually used for errors or alerts.
 
 if(! function_exists('notice')) {
+	/**
+	 * Show an error message to user.
+	 * 
+	 * This function save text in session, to be shown to the user at next page load
+	 * 
+	 * @param string $s - Text of notice
+	 */
 	function notice($s) {
 		$a = get_app();
 		if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
@@ -1017,6 +1024,13 @@ if(! function_exists('notice')) {
 	}
 }
 if(! function_exists('info')) {
+	/**
+	 * Show an info message to user.
+	 * 
+	 * This function save text in session, to be shown to the user at next page load
+	 * 
+	 * @param string $s - Text of notice
+	 */
 	function info($s) {
 		$a = get_app();
 		if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 41ca95b3..2c3c05e8 100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -73,5 +73,7 @@ You can export a copy of your personal data in XML format from the "Export perso
 
 * [Groups and Privacy](help/Groups-and-Privacy)
 
+* [Move Account](help/Move-Account)
+
 * [Remove Account](help/Remove-Account)
 
diff --git a/doc/Home.md b/doc/Home.md
index 1df74b5f..7c86ce80 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -14,6 +14,7 @@ Friendica Documentation and Resources
 * [Groups and Privacy](help/Groups-and-Privacy)
 * [Tags and Mentions](help/Tags-and-Mentions)
 * [Pages](help/Pages)
+* [Move Account](help/Move-Account)
 * [Remove Account](help/Remove-Account)
 * [Bugs and Issues](help/Bugs-and-Issues)
 
diff --git a/doc/Move-Account.md b/doc/Move-Account.md
new file mode 100644
index 00000000..2813f710
--- /dev/null
+++ b/doc/Move-Account.md
@@ -0,0 +1,33 @@
+Move Account
+============
+
+* [Home](help)
+
+
+! **this is an experimental feature**
+
+** How to move an account between servers **
+
+Go to "Settings" -> "[Export personal data](uexport)"
+Click on "Export account" to save your account data.
+This file contains your details, your contacts, groups, and personal settings.
+It also contains your secret keys to authenticate yourself to your contacts:
+**save this file in a secure place**!
+
+Go to your new server, and open *http://newserver.com/uimport* (there is not a 
+direct link to this page at the moment).
+
+Load your saved account file and click "Import".
+
+Friendica will recreate your account on the new server, with your contacts and groups.
+A message is sent to Friendica contacts, to inform them about your move: if your
+contacts are runnning on an updated server, your details on their
+side will be automatically updated.
+Contacts on Statusnet/Identi.ca or Diaspora will be archived, as we can't inform
+them about your move.
+You should ask them to remove your contact from their lists and re-add you, and you
+should do the same with their contact.
+
+After the move, the account on the old server will not work reliably anymore, and
+should be not used.
+
diff --git a/include/Scrape.php b/include/Scrape.php
index 7eaac3b4..611cbda8 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -590,6 +590,12 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
 		$check_feed = false;
 
+		if(stristr($url,'tumblr.com') && (! stristr($url,'/rss'))) {
+			$poll = $url . '/rss';
+			$check_feed = true;
+			// Will leave it to others to figure out how to grab the avatar, which is on the $url page in the open graph meta links
+		}
+
 		if($twitter || ! $poll)
 			$check_feed = true;
 		if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))
diff --git a/include/message.php b/include/message.php
index 377d7c71..07e90fa2 100644
--- a/include/message.php
+++ b/include/message.php
@@ -165,6 +165,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$a = get_app();
 
+
 	if(! $recipient) return -1;
 	
 	if(! strlen($subject))
@@ -195,7 +196,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 	$handles = $recip_handle . ';' . $sender_handle;
 
 	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
-		intval(local_user()),
+		intval($recipient['uid']),
 		dbesc($conv_guid),
 		dbesc($sender_handle),
 		dbesc(datetime_convert()),
diff --git a/include/text.php b/include/text.php
index 0e33c678..044a1f89 100644
--- a/include/text.php
+++ b/include/text.php
@@ -336,11 +336,18 @@ function sanitise_acl(&$item) {
 
 
 // Convert an ACL array to a storable string
+// Normally ACL permissions will be an array.
+// We'll also allow a comma-separated string.
 
 if(! function_exists('perms2str')) {
 function perms2str($p) {
 	$ret = '';
-	$tmp = $p;
+
+	if(is_array($p))
+		$tmp = $p;
+	else
+		$tmp = explode(',',$p);
+
 	if(is_array($tmp)) {
 		array_walk($tmp,'sanitise_acl');
 		$ret = implode('',$tmp);
diff --git a/include/uimport.php b/include/uimport.php
index 94279316..38b17724 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -73,6 +73,18 @@ function import_account(&$a, $file) {
         return;
     }
    
+	
+	// check for username
+	$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
+	if ($r===false) {
+		logger("uimport:check nickname : ERROR : ".last_error(), LOGGER_NORMAL);
+		notice(t('Error! Cannot check nickname'));
+		return;
+	}
+	if (count($r)>0) {
+		notice(sprintf(t("User '%s' already exists on this server!"),$account['user']['nickname']));
+		return;
+	}
 
     $oldbaseurl  = $account['baseurl'];
     $newbaseurl = $a->get_baseurl();
diff --git a/mod/content.php b/mod/content.php
index e0634b3e..c4b0ca2f 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -784,8 +784,9 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 				$indent = (($toplevelpost) ? '' : ' comment');
 
+				$shiny = "";
 				if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-					$indent .= ' shiny'; 
+					$shiny = 'shiny'; 
 
 				// 
 				localize_item($item);
@@ -829,6 +830,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					'lock' => $lock,
 					'location' => template_escape($location),
 					'indent' => $indent,
+					'shiny' => $shiny,
 					'owner_url' => $owner_url,
 					'owner_photo' => $owner_photo,
 					'owner_name' => template_escape($owner_name),
diff --git a/mod/help.php b/mod/help.php
index af05bd47..44edbf93 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,47 +1,101 @@
 <?php
+define( 'MARKDOWN_PARSER_CLASS',  'ExtendedMarkdown' );
+require_once('library/markdown.php');
 
-if(! function_exists('load_doc_file')) {
-function load_doc_file($s) {
-	global $lang;
-	if(! isset($lang))
-		$lang = 'en';
-	$b = basename($s);
-	$d = dirname($s);
-	if(file_exists("$d/$lang/$b"))
-		return file_get_contents("$d/$lang/$b");
-	if(file_exists($s))
-		return file_get_contents($s);
-	return '';
-}}
+class ExtendedMarkdown extends MarkdownExtra_Parser {
 
+	function ExtendedMarkdown() {
+		$this->block_gamut += array(
+			"doBlockWarning" => 45,
+		);
+		parent::MarkdownExtra_Parser();
+	}
 
+	function doBlockWarning($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*![ ]?				# "!" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm', array(&$this, '_doBlockWarning_callback'), $text);
+
+		return $text;
+	}
+
+	function _doBlockWarning_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*![ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);  # recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content, 
+		# so we need to fix that:
+//		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', array(&$this, '__doBlockWarning_callback2'), $bq);
+
+		return "\n" . $this->hashBlock("<div class='md_warning'>\n$bq\n</div>") . "\n\n";
+	}
+
+	function _doBlockWarning_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+}
+
+if (!function_exists('load_doc_file')) {
+
+	function load_doc_file($s) {
+		global $lang;
+		if (!isset($lang))
+			$lang = 'en';
+		$b = basename($s);
+		$d = dirname($s);
+		if (file_exists("$d/$lang/$b"))
+			return file_get_contents("$d/$lang/$b");
+		if (file_exists($s))
+			return file_get_contents($s);
+		return '';
+	}
+
+}
 
 function help_content(&$a) {
+	
+	
 	nav_set_selected('help');
 
 	global $lang;
 
-	require_once('library/markdown.php');
-
 	$text = '';
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$text = load_doc_file('doc/' . $a->argv[1] . '.md');
-		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1]));
+		$a->page['title'] = t('Help:') . ' ' . str_replace('-', ' ', notags($a->argv[1]));
 	}
-	if(! $text) {
-		$text = load_doc_file('doc/Home.md');
+	$home = load_doc_file('doc/Home.md');
+	if (!$text) {
+		$text = $home;
 		$a->page['title'] = t('Help');
+	} else {
+		$a->page['aside'] = Markdown($home);
 	}
-	
-	if(! strlen($text)) {
+
+	if (!strlen($text)) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
 		$tpl = get_markup_template("404.tpl");
 		return replace_macros($tpl, array(
-			'$message' =>  t('Page not found.' )
-		));
+					'$message' => t('Page not found.')
+				));
 	}
 	
-	return Markdown($text);
-
+	$html = Markdown($text);
+	$html = "<style>.md_warning { padding: 1em; border: #ff0000 solid 2px; background-color: #f9a3a3; color: #ffffff;</style>".$html;
+	return $html;
+		
 }
diff --git a/mod/network.php b/mod/network.php
index 28893dda..bbdd0130 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -782,9 +782,10 @@ function network_content(&$a, $update = 0) {
 			intval(local_user())
 		);
 	}
-
-//	if($update_unseen)
-//		$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+	else {
+		if($update_unseen)
+			$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+	}
 
 	// Set this so that the conversation function can find out contact info for our wall-wall items
 	$a->page_contact = $a->contact;
diff --git a/mod/uimport.php b/mod/uimport.php
index 5fe2642f..3f11023d 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -36,6 +36,29 @@ function uimport_post(&$a) {
 }
 
 function uimport_content(&$a) {
+	
+	if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
+		notice("Permission denied." . EOL);
+		return;
+	}
+
+	$max_dailies = intval(get_config('system','max_daily_registrations'));
+	if($max_dailies) {
+		$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
+		if($r && $r[0]['total'] >= $max_dailies) {
+			logger('max daily registrations exceeded.');
+			notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
+			return;
+		}
+	}
+	
+	
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+	if(x($_SESSION,'mobile-theme'))
+		unset($_SESSION['mobile-theme']);
+	
+	
     $tpl = get_markup_template("uimport.tpl");
     return replace_macros($tpl, array(
         '$regbutt' => t('Import'),
diff --git a/object/Item.php b/object/Item.php
index d13399cf..27992911 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -93,6 +93,7 @@ class Item extends BaseObject {
 		$star = false;
 		$isstarred = "unstarred";
 		$indent = '';
+		$shiny = '';
 		$osparkle = '';
 		$total_children = $this->count_descendants();
 
@@ -199,8 +200,9 @@ class Item extends BaseObject {
 			if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
 		}
 
-		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-			$indent .= ' shiny';
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
+			$shiny = 'shiny';
+		}
 
 		localize_item($item);
 
@@ -242,6 +244,7 @@ class Item extends BaseObject {
 			'lock' => $lock,
 			'location' => template_escape($location),
 			'indent' => $indent,
+			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
 			'owner_photo' => $this->get_owner_photo(),
 			'owner_name' => template_escape($this->get_owner_name()),
diff --git a/util/messages.po b/util/messages.po
index b0ef4a5e..59f7a397 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1521\n"
+"Project-Id-Version: 3.0.1527\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-08 10:00-0800\n"
+"POT-Creation-Date: 2012-11-14 10:00-0800\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"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
@@ -52,7 +52,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
-#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
+#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
 #: ../../mod/display.php:165 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
@@ -60,7 +60,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
 #: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
-#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
+#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
 #: ../../addon.old/dav/friendica/layout.fnk.php:354
@@ -130,10 +130,10 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1027
-#: ../../mod/photos.php:1103 ../../mod/photos.php:1366
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/install.php:246
+#: ../../mod/events.php:455 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
+#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
+#: ../../mod/photos.php:1523 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:351
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
@@ -182,7 +182,7 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:599
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:562 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -231,20 +231,20 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:79
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:228
+#: ../../mod/help.php:90 ../../index.php:218
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:231
+#: ../../mod/help.php:93 ../../index.php:221
 msgid "Page not found."
 msgstr ""
 
@@ -282,12 +282,12 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:323 ../../include/text.php:1185
+#: ../../mod/events.php:323 ../../include/text.php:1192
 msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1711
+#: ../../include/nav.php:52 ../../boot.php:1745
 msgid "Events"
 msgstr ""
 
@@ -345,7 +345,7 @@ msgstr ""
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1241
+#: ../../boot.php:1275
 msgid "Location:"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgstr ""
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1001
+#: ../../include/conversation.php:1005
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -430,33 +430,33 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:50 ../../boot.php:1704
+#: ../../mod/photos.php:51 ../../boot.php:1738
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
-#: ../../mod/photos.php:1565 ../../mod/photos.php:1577
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
+#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
+#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:485
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
+#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:78 ../../mod/settings.php:23
+#: ../../mod/photos.php:79 ../../mod/settings.php:23
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:142
+#: ../../mod/photos.php:143
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095
-#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1111 ../../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
@@ -467,220 +467,220 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:163
+#: ../../mod/photos.php:164
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:181 ../../mod/photos.php:1104
+#: ../../mod/photos.php:182 ../../mod/photos.php:1105
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:244 ../../mod/photos.php:1367
+#: ../../mod/photos.php:245 ../../mod/photos.php:1368
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:719
+#: ../../mod/photos.php:720
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153
-#: ../../mod/wall_upload.php:110
+#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301
-#: ../../mod/wall_upload.php:136
+#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:864 ../../mod/community.php:18
+#: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:874
+#: ../../mod/photos.php:875
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:975
+#: ../../mod/photos.php:976
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1037
+#: ../../mod/photos.php:1038
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1040
+#: ../../mod/photos.php:1041
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1047
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1050 ../../mod/photos.php:1099
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1051
+#: ../../mod/photos.php:1052
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1053
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1054 ../../mod/photos.php:1362
+#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1114
+#: ../../mod/photos.php:1115
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1121
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1122
+#: ../../mod/photos.php:1123
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1598
+#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1181
+#: ../../mod/photos.php:1182
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1183
+#: ../../mod/photos.php:1184
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1240
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1240
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1241
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1246 ../../mod/content.php:603
-#: ../../object/Item.php:103
+#: ../../mod/photos.php:1247 ../../mod/content.php:603
+#: ../../object/Item.php:104
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1266
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1340
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1342
+#: ../../mod/photos.php:1343
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1353
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1354
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1356
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1358
+#: ../../mod/photos.php:1359
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1360
+#: ../../mod/photos.php:1361
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1364
+#: ../../mod/photos.php:1365
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1384 ../../mod/content.php:667
-#: ../../object/Item.php:196
+#: ../../mod/photos.php:1385 ../../mod/content.php:667
+#: ../../object/Item.php:197
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:668
-#: ../../object/Item.php:197
+#: ../../mod/photos.php:1386 ../../mod/content.php:668
+#: ../../object/Item.php:198
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1386 ../../include/conversation.php:962
+#: ../../mod/photos.php:1387 ../../include/conversation.php:966
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:846
+#: ../../mod/photos.php:1388 ../../mod/editpost.php:118
+#: ../../mod/content.php:482 ../../mod/content.php:848
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
 #: ../../mod/message.php:481 ../../include/conversation.php:624
-#: ../../include/conversation.php:981 ../../object/Item.php:258
+#: ../../include/conversation.php:985 ../../object/Item.php:261
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/content.php:690
-#: ../../object/Item.php:556
+#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1520 ../../mod/content.php:690
+#: ../../object/Item.php:559
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
-#: ../../object/Item.php:558
+#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
+#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605
+#: ../../object/Item.php:561
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:999
-#: ../../object/Item.php:568
+#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
+#: ../../mod/photos.php:1524 ../../mod/editpost.php:139
+#: ../../mod/content.php:702 ../../include/conversation.php:1003
+#: ../../object/Item.php:571
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1491 ../../mod/content.php:439
+#: ../../mod/photos.php:1492 ../../mod/content.php:439
 #: ../../mod/content.php:724 ../../mod/settings.php:606
 #: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:569 ../../object/Item.php:117
+#: ../../include/conversation.php:569 ../../object/Item.php:118
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1604
+#: ../../mod/photos.php:1605
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1613
+#: ../../mod/photos.php:1614
 msgid "Recent Photos"
 msgstr ""
 
@@ -738,96 +738,96 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:948
+#: ../../mod/editpost.php:88 ../../include/conversation.php:952
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:103 ../../mod/content.php:711
-#: ../../mod/settings.php:605 ../../object/Item.php:107
+#: ../../mod/settings.php:605 ../../object/Item.php:108
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:963
+#: ../../include/conversation.php:967
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:964
+#: ../../mod/editpost.php:105 ../../include/conversation.php:968
 msgid "upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:965
+#: ../../mod/editpost.php:106 ../../include/conversation.php:969
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:966
+#: ../../mod/editpost.php:107 ../../include/conversation.php:970
 msgid "attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:971
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:968
+#: ../../mod/editpost.php:109 ../../include/conversation.php:972
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:969
+#: ../../mod/editpost.php:110 ../../include/conversation.php:973
 msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:970
+#: ../../mod/editpost.php:111 ../../include/conversation.php:974
 msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:971
+#: ../../mod/editpost.php:112 ../../include/conversation.php:975
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:972
+#: ../../mod/editpost.php:113 ../../include/conversation.php:976
 msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:973
+#: ../../mod/editpost.php:114 ../../include/conversation.php:977
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:974
+#: ../../mod/editpost.php:115 ../../include/conversation.php:978
 msgid "set location"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:975
+#: ../../mod/editpost.php:116 ../../include/conversation.php:979
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "clear location"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:986
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:991
+#: ../../mod/editpost.php:127 ../../include/conversation.php:995
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:992
+#: ../../mod/editpost.php:128 ../../include/conversation.php:996
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:978
+#: ../../mod/editpost.php:131 ../../include/conversation.php:982
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:980
+#: ../../mod/editpost.php:133 ../../include/conversation.php:984
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:994
+#: ../../mod/editpost.php:134 ../../include/conversation.php:998
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1020,36 +1020,35 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/uexport.php:10 ../../mod/settings.php:30
-#: ../../include/nav.php:137
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+#: ../../mod/uexport.php:14 ../../mod/settings.php:35
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+#: ../../mod/uexport.php:20 ../../mod/settings.php:41
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+#: ../../mod/uexport.php:25 ../../mod/settings.php:46
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+#: ../../mod/uexport.php:30 ../../mod/settings.php:51
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+#: ../../mod/uexport.php:40 ../../mod/settings.php:61
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/uexport.php:49 ../../mod/settings.php:69
+#: ../../mod/uexport.php:48 ../../mod/settings.php:69
 #: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
@@ -1058,21 +1057,21 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/uexport.php:73
+#: ../../mod/uexport.php:72
 msgid "Export account"
 msgstr ""
 
-#: ../../mod/uexport.php:73
+#: ../../mod/uexport.php:72
 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:74
+#: ../../mod/uexport.php:73
 msgid "Export all"
 msgstr ""
 
-#: ../../mod/uexport.php:74
+#: ../../mod/uexport.php:73
 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 "
@@ -1399,7 +1398,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1179
+#: ../../include/contact_widgets.php:9 ../../boot.php:1213
 msgid "Connect"
 msgstr ""
 
@@ -1429,19 +1428,19 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:723
-#: ../../include/conversation.php:568 ../../object/Item.php:116
+#: ../../include/conversation.php:568 ../../object/Item.php:117
 msgid "Select"
 msgstr ""
 
-#: ../../mod/content.php:455 ../../mod/content.php:816
-#: ../../mod/content.php:817 ../../include/conversation.php:587
-#: ../../object/Item.php:227 ../../object/Item.php:228
+#: ../../mod/content.php:455 ../../mod/content.php:817
+#: ../../mod/content.php:818 ../../include/conversation.php:587
+#: ../../object/Item.php:229 ../../object/Item.php:230
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../mod/content.php:465 ../../mod/content.php:828
-#: ../../include/conversation.php:607 ../../object/Item.php:240
+#: ../../mod/content.php:465 ../../mod/content.php:829
+#: ../../include/conversation.php:607 ../../object/Item.php:242
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -1450,15 +1449,15 @@ msgstr ""
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../object/Item.php:277
+#: ../../mod/content.php:586 ../../object/Item.php:280
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/content.php:588 ../../include/text.php:1441
-#: ../../object/Item.php:279 ../../object/Item.php:292
+#: ../../mod/content.php:588 ../../include/text.php:1448
+#: ../../object/Item.php:282 ../../object/Item.php:295
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -1466,93 +1465,93 @@ msgstr[1] ""
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:590
-#: ../../object/Item.php:280 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:195 ../../boot.php:606
+#: ../../object/Item.php:283 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:667 ../../object/Item.php:196
+#: ../../mod/content.php:667 ../../object/Item.php:197
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../object/Item.php:197
+#: ../../mod/content.php:668 ../../object/Item.php:198
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:200
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:200
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../object/Item.php:560
+#: ../../mod/content.php:694 ../../object/Item.php:563
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../object/Item.php:561
+#: ../../mod/content.php:695 ../../object/Item.php:564
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../object/Item.php:562
+#: ../../mod/content.php:696 ../../object/Item.php:565
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../object/Item.php:563
+#: ../../mod/content.php:697 ../../object/Item.php:566
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../object/Item.php:564
+#: ../../mod/content.php:698 ../../object/Item.php:567
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../object/Item.php:565
+#: ../../mod/content.php:699 ../../object/Item.php:568
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../object/Item.php:566
+#: ../../mod/content.php:700 ../../object/Item.php:569
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../object/Item.php:567
+#: ../../mod/content.php:701 ../../object/Item.php:570
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../object/Item.php:180
+#: ../../mod/content.php:736 ../../object/Item.php:181
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../object/Item.php:181
+#: ../../mod/content.php:737 ../../object/Item.php:182
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../object/Item.php:182
+#: ../../mod/content.php:738 ../../object/Item.php:183
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:741 ../../object/Item.php:185
+#: ../../mod/content.php:741 ../../object/Item.php:186
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../object/Item.php:186
+#: ../../mod/content.php:742 ../../object/Item.php:187
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:746 ../../object/Item.php:120
+#: ../../mod/content.php:746 ../../object/Item.php:121
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:818 ../../object/Item.php:229
+#: ../../mod/content.php:819 ../../object/Item.php:231
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../object/Item.php:230
+#: ../../mod/content.php:820 ../../object/Item.php:232
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:820 ../../object/Item.php:231
+#: ../../mod/content.php:821 ../../object/Item.php:233
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -2072,7 +2071,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
-#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
+#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2086,7 +2085,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:940
+#: ../../mod/lostpass.php:83 ../../boot.php:960
 msgid "Password Reset"
 msgstr ""
 
@@ -2739,7 +2738,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1718
+#: ../../mod/notes.php:44 ../../boot.php:1752
 msgid "Personal Notes"
 msgstr ""
 
@@ -2748,7 +2747,7 @@ msgstr ""
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon/fbpost/fbpost.php:267
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2757,30 +2756,36 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: ../../mod/uimport.php:41
+#: ../../mod/uimport.php:50 ../../mod/register.php:190
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/uimport.php:64
 msgid "Import"
 msgstr ""
 
-#: ../../mod/uimport.php:43
+#: ../../mod/uimport.php:66
 msgid "Move account"
 msgstr ""
 
-#: ../../mod/uimport.php:44
+#: ../../mod/uimport.php:67
 msgid ""
-"You can move here an account from another Friendica server. <br>\r\n"
-"                            You need to export your account form the old "
-"server and upload it here. We will create here your old account with all "
-"your contacts. We will try also to inform you friends that you moved here."
+"You can import an account from another Friendica server. <br>\r\n"
+"                            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."
 "<br>\r\n"
-"                            <b>This feature is experimental. We can't move "
-"here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
+"                            <b>This feature is experimental. We can't import "
+"contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
 msgstr ""
 
-#: ../../mod/uimport.php:47
+#: ../../mod/uimport.php:70
 msgid "Account file"
 msgstr ""
 
-#: ../../mod/uimport.php:47
+#: ../../mod/uimport.php:70
 msgid ""
 "To export your accont, go to \"Settings->Export your porsonal data\" and "
 "select \"Export account\""
@@ -2817,7 +2822,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:898 ../../include/conversation.php:916
+#: ../../include/conversation.php:902 ../../include/conversation.php:920
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2900,7 +2905,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1694
+#: ../../boot.php:1728
 msgid "Profile"
 msgstr ""
 
@@ -3071,7 +3076,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
 msgid "Permission denied"
 msgstr ""
 
@@ -3123,7 +3128,7 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:618
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
 msgid "View Contacts"
 msgstr ""
 
@@ -3154,12 +3159,6 @@ msgstr ""
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:190
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
 #: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
@@ -3211,7 +3210,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920
 msgid "Register"
 msgstr ""
 
@@ -3221,7 +3220,7 @@ msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1444
 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
@@ -3268,7 +3267,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1701
+#: ../../include/nav.php:51 ../../boot.php:1735
 msgid "Photos"
 msgstr ""
 
@@ -3297,8 +3296,8 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:420 ../../mod/wall_upload.php:133
-#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
+#: ../../mod/item.php:420 ../../mod/wall_upload.php:135
+#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
@@ -3362,7 +3361,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
@@ -4145,7 +4144,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1089
+#: ../../mod/profile.php:21 ../../boot.php:1123
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -4215,8 +4214,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:98
-#: ../../include/auth.php:161
+#: ../../mod/openid.php:93 ../../include/auth.php:110
+#: ../../include/auth.php:173
 msgid "Login failed."
 msgstr ""
 
@@ -4253,8 +4252,8 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:96 ../../include/text.php:678
-#: ../../include/text.php:679 ../../include/nav.php:91
+#: ../../mod/search.php:96 ../../include/text.php:685
+#: ../../include/text.php:686 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
@@ -4546,28 +4545,28 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:689 ../../boot.php:1207
+#: ../../mod/profiles.php:689 ../../boot.php:1241
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:690 ../../boot.php:1208
+#: ../../mod/profiles.php:690 ../../boot.php:1242
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1218
+#: ../../mod/profiles.php:701 ../../boot.php:1252
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:703 ../../boot.php:1221
+#: ../../mod/profiles.php:703 ../../boot.php:1255
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:704 ../../boot.php:1222
+#: ../../mod/profiles.php:704 ../../boot.php:1256
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:902
-#: ../../include/conversation.php:920
+#: ../../mod/filer.php:29 ../../include/conversation.php:906
+#: ../../include/conversation.php:924
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4691,17 +4690,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1243
+#: ../../boot.php:1277
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1246
+#: ../../boot.php:1280
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1248
+#: ../../boot.php:1282
 msgid "Homepage:"
 msgstr ""
 
@@ -5572,7 +5571,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:927
+#: ../../include/nav.php:64 ../../boot.php:946
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5612,7 +5611,7 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
+#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1442
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5766,7 +5765,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5777,7 +5776,7 @@ msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5785,35 +5784,35 @@ msgid "Monday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -8205,218 +8204,218 @@ msgstr ""
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:597
+#: ../../include/text.php:604
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:606
+#: ../../include/text.php:613
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:719
+#: ../../include/text.php:726
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:719 ../../include/conversation.php:210
+#: ../../include/text.php:726 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:736
+#: ../../include/text.php:743
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:737
+#: ../../include/text.php:744
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:738
+#: ../../include/text.php:745
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:746
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:740
+#: ../../include/text.php:747
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:741
+#: ../../include/text.php:748
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:742
+#: ../../include/text.php:749
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:743
+#: ../../include/text.php:750
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:744
+#: ../../include/text.php:751
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:745
+#: ../../include/text.php:752
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:746
+#: ../../include/text.php:753
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:747
+#: ../../include/text.php:754
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:748
+#: ../../include/text.php:755
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/text.php:756
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:750
+#: ../../include/text.php:757
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:751
+#: ../../include/text.php:758
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:752
+#: ../../include/text.php:759
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:753
+#: ../../include/text.php:760
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:754
+#: ../../include/text.php:761
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:755
+#: ../../include/text.php:762
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1005
+#: ../../include/text.php:1012
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1032 ../../include/text.php:1044
+#: ../../include/text.php:1039 ../../include/text.php:1051
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1217 ../../include/user.php:236
+#: ../../include/text.php:1224 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1229
+#: ../../include/text.php:1236
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1439
+#: ../../include/text.php:1446
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1442
+#: ../../include/text.php:1449
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1597
+#: ../../include/text.php:1604
 msgid "Item filed"
 msgstr ""
 
@@ -8452,22 +8451,31 @@ msgstr ""
 msgid "Error! I can't import this file: DB schema version is not compatible."
 msgstr ""
 
-#: ../../include/uimport.php:92
+#: ../../include/uimport.php:81
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: ../../include/uimport.php:85
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: ../../include/uimport.php:104
 msgid "User creation error"
 msgstr ""
 
-#: ../../include/uimport.php:110
+#: ../../include/uimport.php:122
 msgid "User profile creation error"
 msgstr ""
 
-#: ../../include/uimport.php:155
+#: ../../include/uimport.php:167
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/uimport.php:233
+#: ../../include/uimport.php:245
 msgid "Done. You can now login with your username and password"
 msgstr ""
 
@@ -8502,7 +8510,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:926
+#: ../../include/nav.php:46 ../../boot.php:945
 msgid "Logout"
 msgstr ""
 
@@ -8510,7 +8518,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1687
+#: ../../include/nav.php:49 ../../boot.php:1721
 msgid "Status"
 msgstr ""
 
@@ -8590,11 +8598,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1201
+#: ../../include/nav.php:138 ../../boot.php:1235
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1201
+#: ../../include/nav.php:138 ../../boot.php:1235
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -8669,17 +8677,17 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:35
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:114
+#: ../../include/auth.php:126
 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:114
+#: ../../include/auth.php:126
 msgid "The error message was:"
 msgstr ""
 
@@ -9111,7 +9119,7 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/security.php:354
+#: ../../include/security.php:357
 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."
@@ -9166,11 +9174,11 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:599 ../../object/Item.php:218
+#: ../../include/conversation.php:599 ../../object/Item.php:220
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:600 ../../object/Item.php:219
+#: ../../include/conversation.php:600 ../../object/Item.php:221
 msgid "Filed under:"
 msgstr ""
 
@@ -9210,46 +9218,46 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:875
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:897 ../../include/conversation.php:915
+#: ../../include/conversation.php:901 ../../include/conversation.php:919
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:899 ../../include/conversation.php:917
+#: ../../include/conversation.php:903 ../../include/conversation.php:921
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:900 ../../include/conversation.php:918
+#: ../../include/conversation.php:904 ../../include/conversation.php:922
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:901 ../../include/conversation.php:919
+#: ../../include/conversation.php:905 ../../include/conversation.php:923
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:903 ../../include/conversation.php:921
+#: ../../include/conversation.php:907 ../../include/conversation.php:925
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:904
+#: ../../include/conversation.php:908
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:983
+#: ../../include/conversation.php:987
 msgid "permissions"
 msgstr ""
 
@@ -9265,105 +9273,109 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:588
+#: ../../boot.php:604
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:591
+#: ../../boot.php:607
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:798
+#: ../../boot.php:816
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:800
+#: ../../boot.php:818
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:901
+#: ../../boot.php:919
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:929
+#: ../../boot.php:948
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:930
+#: ../../boot.php:949
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:933
+#: ../../boot.php:950
+msgid "Remember me"
+msgstr ""
+
+#: ../../boot.php:953
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:939
+#: ../../boot.php:959
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1050
+#: ../../boot.php:1084
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1127
+#: ../../boot.php:1161
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1193
+#: ../../boot.php:1227
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1315 ../../boot.php:1401
+#: ../../boot.php:1349 ../../boot.php:1435
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1316 ../../boot.php:1402
+#: ../../boot.php:1350 ../../boot.php:1436
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1361 ../../boot.php:1442
+#: ../../boot.php:1395 ../../boot.php:1476
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1373
+#: ../../boot.php:1407
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1374
+#: ../../boot.php:1408
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1435
+#: ../../boot.php:1469
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1453
+#: ../../boot.php:1487
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1454
+#: ../../boot.php:1488
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1690
+#: ../../boot.php:1724
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1697
+#: ../../boot.php:1731
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1714
+#: ../../boot.php:1748
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1721
+#: ../../boot.php:1755
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../index.php:380
+#: ../../index.php:398
 msgid "toggle mobile"
 msgstr ""
 
diff --git a/util/po2php.php b/util/po2php.php
index f29980d6..147c4a58 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -1,4 +1,5 @@
 <?php
+define("DQ_ESCAPE", "__DQ__");
 
 
 function po2php_run(&$argv, &$argc) {
@@ -38,6 +39,7 @@ function po2php_run(&$argv, &$argc) {
 		return str_replace('$','\$',$match[0]);
 	}
 	foreach ($infile as $l) {
+		$l = str_replace('\"', DQ_ESCAPE, $l);
 		$len = strlen($l);
 		if ($l[0]=="#") $l="";
 		if (substr($l,0,15)=='"Plural-Forms: '){
@@ -54,7 +56,7 @@ function po2php_run(&$argv, &$argc) {
 
 		if ($k!="" && substr($l,0,7)=="msgstr "){
 			if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; }
-			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
+			if ($inv) { $inv = False; $out .= '"'.$v.'"'; }
 			
 			$v = substr($l,8,$len-10);
 			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
@@ -113,6 +115,7 @@ function po2php_run(&$argv, &$argc) {
 	if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
 	if ($k!="") $out .= $arr?");\n":";\n";
 	
+	$out = str_replace(DQ_ESCAPE, '\"', $out);
 	file_put_contents($outfile, $out);
 	
 }
diff --git a/view/ca/strings.php b/view/ca/strings.php
index dc7207bb..08d9d523 100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -236,7 +236,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Error: El mòdul enssl de PHP és necessari però no està instal·lat.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Error: El mòdul mysqli de PHP és necessari però no està instal·lat.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Error: mòdul mb_string de PHP requerit però no instal·lat.";
-$a->strings["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."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
+$a->strings["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."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
 $a->strings["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."] = "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible.";
 $a->strings["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."] = "Al final d'aquest procediment, et facilitarem un text que hauràs de guardar en un arxiu que s'anomena .htconfig.php que hi es a la carpeta principal del teu Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativament, pots saltar-te aquest procediment i configurar-ho manualment. Per favor, mira l'arxiu \"INTALL.txt\" per a instruccions.";
diff --git a/view/cs/messages.po b/view/cs/messages.po
index 4f6c4f94..cf9b1d67 100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-10-18 10:00-0700\n"
-"PO-Revision-Date: 2012-10-17 19:52+0000\n"
+"POT-Creation-Date: 2012-11-08 10:00-0800\n"
+"PO-Revision-Date: 2012-11-10 18:38+0000\n"
 "Last-Translator: Michal Šupler <msupler@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,7 @@ msgstr "Příspěvek úspěšně odeslán"
 
 #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+#: ../../mod/update_display.php:22
 msgid "[Embedded content - reload page to view]"
 msgstr "[Vložený obsah - obnovení stránky pro zobrazení]"
 
@@ -42,24 +43,24 @@ msgstr "Aktualizace kontaktu selhala."
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
-#: ../../mod/item.php:142 ../../mod/mood.php:114
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
-#: ../../mod/display.php:141 ../../mod/profiles.php:7
+#: ../../mod/display.php:165 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -132,10 +133,10 @@ msgstr "Nové foto z této URL adresy"
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 #: ../../mod/events.php:455 ../../mod/photos.php:1027
 #: ../../mod/photos.php:1103 ../../mod/photos.php:1366
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1520 ../../mod/install.php:246
+#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
+#: ../../mod/photos.php:1522 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:348
+#: ../../mod/content.php:693 ../../mod/contacts.php:351
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@@ -179,10 +180,10 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:599
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -282,12 +283,12 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Editovat událost"
 
-#: ../../mod/events.php:323 ../../include/text.php:1187
+#: ../../mod/events.php:323 ../../include/text.php:1185
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1701
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:52 ../../boot.php:1711
 msgid "Events"
 msgstr "Události"
 
@@ -345,7 +346,7 @@ msgstr "Popis:"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1237
+#: ../../boot.php:1241
 msgid "Location:"
 msgstr "Místo:"
 
@@ -360,7 +361,7 @@ msgstr "Sdílet tuto událost"
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:995
+#: ../../include/conversation.php:1001
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Zrušit"
@@ -385,8 +386,8 @@ msgstr "Odstranit"
 
 #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530
 #, php-format
-msgid "%s welcomes %s"
-msgstr "%s vítá %s "
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s vítá %2$s"
 
 #: ../../mod/api.php:76 ../../mod/api.php:102
 msgid "Authorize application connection"
@@ -413,7 +414,7 @@ msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a konta
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/settings.php:967 ../../mod/register.php:237
 #: ../../mod/profiles.php:574
 msgid "Yes"
 msgstr "Ano"
@@ -425,25 +426,25 @@ msgstr "Ano"
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/settings.php:967 ../../mod/register.php:238
 #: ../../mod/profiles.php:575
 msgid "No"
 msgstr "Ne"
 
-#: ../../mod/photos.php:50 ../../boot.php:1694
+#: ../../mod/photos.php:50 ../../boot.php:1704
 msgid "Photo Albums"
 msgstr "Fotoalba"
 
 #: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
+#: ../../mod/photos.php:1565 ../../mod/photos.php:1577
 #: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:492
+#: ../../view/theme/diabook/theme.php:485
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Fotogalerie kontaktu"
 
-#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612
+#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
 msgid "Upload New Photos"
 msgstr "Nahrát nové fotografie"
 
@@ -461,7 +462,7 @@ msgstr "Kontakt byl zablokován"
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@@ -480,21 +481,13 @@ msgid "Delete Photo"
 msgstr "Smazat fotografii"
 
 #: ../../mod/photos.php:606
-msgid "was tagged in a"
-msgstr "štítek byl přidán v"
-
-#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
-#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
-#: ../../include/conversation.php:253
-#: ../../addon.old/communityhome/communityhome.php:163
-msgid "photo"
-msgstr "fotografie"
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s byl označen v %2$s uživatelem %3$s"
 
 #: ../../mod/photos.php:606
-msgid "by"
-msgstr "od"
+msgid "a photo"
+msgstr "fotografie"
 
 #: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
 #: ../../addon.old/js_upload/js_upload.php:315
@@ -571,7 +564,7 @@ msgstr "Zobrazit nejprve nejnovější:"
 msgid "Show Oldest First"
 msgstr "Zobrazit nejprve nejstarší:"
 
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1598
 msgid "View Photo"
 msgstr "Zobraz fotografii"
 
@@ -647,49 +640,49 @@ msgstr "Líbí se mi to (přepínač)"
 msgid "I don't like this (toggle)"
 msgstr "Nelíbí se mi to (přepínač)"
 
-#: ../../mod/photos.php:1386 ../../include/conversation.php:956
+#: ../../mod/photos.php:1386 ../../include/conversation.php:962
 msgid "Share"
 msgstr "Sdílet"
 
 #: ../../mod/photos.php:1387 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:845
+#: ../../mod/content.php:482 ../../mod/content.php:846
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:619
-#: ../../include/conversation.php:975 ../../object/Item.php:258
+#: ../../mod/message.php:481 ../../include/conversation.php:624
+#: ../../include/conversation.php:981 ../../object/Item.php:258
 msgid "Please wait"
 msgstr "Čekejte prosím"
 
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1517 ../../mod/content.php:690
-#: ../../object/Item.php:555
+#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
+#: ../../mod/photos.php:1519 ../../mod/content.php:690
+#: ../../object/Item.php:556
 msgid "This is you"
 msgstr "Nastavte Vaši polohu"
 
-#: ../../mod/photos.php:1405 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585
-#: ../../object/Item.php:557
+#: ../../mod/photos.php:1405 ../../mod/photos.php:1449
+#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
+#: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Okomentovat"
 
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1521 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:993
-#: ../../object/Item.php:567
+#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
+#: ../../mod/photos.php:1523 ../../mod/editpost.php:139
+#: ../../mod/content.php:702 ../../include/conversation.php:999
+#: ../../object/Item.php:568
 msgid "Preview"
 msgstr "Náhled"
 
-#: ../../mod/photos.php:1489 ../../mod/content.php:439
-#: ../../mod/content.php:723 ../../mod/settings.php:606
+#: ../../mod/photos.php:1491 ../../mod/content.php:439
+#: ../../mod/content.php:724 ../../mod/settings.php:606
 #: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:564 ../../object/Item.php:117
+#: ../../include/conversation.php:569 ../../object/Item.php:117
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../../mod/photos.php:1601
+#: ../../mod/photos.php:1604
 msgid "View Album"
 msgstr "Zobrazit album"
 
-#: ../../mod/photos.php:1610
+#: ../../mod/photos.php:1613
 msgid "Recent Photos"
 msgstr "Aktuální fotografie"
 
@@ -697,7 +690,7 @@ msgstr "Aktuální fotografie"
 msgid "Not available."
 msgstr "Není k dispozici."
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr "Komunita"
@@ -747,96 +740,96 @@ msgstr "Položka nenalezena"
 msgid "Edit post"
 msgstr "Upravit příspěvek"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:942
+#: ../../mod/editpost.php:88 ../../include/conversation.php:948
 msgid "Post to Email"
 msgstr "Poslat příspěvek na e-mail"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:710
+#: ../../mod/editpost.php:103 ../../mod/content.php:711
 #: ../../mod/settings.php:605 ../../object/Item.php:107
 msgid "Edit"
 msgstr "Upravit"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:963
 msgid "Upload photo"
 msgstr "Nahrát fotografii"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:958
+#: ../../mod/editpost.php:105 ../../include/conversation.php:964
 msgid "upload photo"
 msgstr "nahrát fotky"
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:959
+#: ../../mod/editpost.php:106 ../../include/conversation.php:965
 msgid "Attach file"
 msgstr "Přiložit soubor"
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:960
+#: ../../mod/editpost.php:107 ../../include/conversation.php:966
 msgid "attach file"
 msgstr "přidat soubor"
 
 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:967
 msgid "Insert web link"
 msgstr "Vložit webový odkaz"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:962
+#: ../../mod/editpost.php:109 ../../include/conversation.php:968
 msgid "web link"
 msgstr "webový odkaz"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:963
+#: ../../mod/editpost.php:110 ../../include/conversation.php:969
 msgid "Insert video link"
 msgstr "Zadejte odkaz na video"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:964
+#: ../../mod/editpost.php:111 ../../include/conversation.php:970
 msgid "video link"
 msgstr "odkaz na video"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:965
+#: ../../mod/editpost.php:112 ../../include/conversation.php:971
 msgid "Insert audio link"
 msgstr "Zadejte odkaz na zvukový záznam"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:966
+#: ../../mod/editpost.php:113 ../../include/conversation.php:972
 msgid "audio link"
 msgstr "odkaz na audio"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:967
+#: ../../mod/editpost.php:114 ../../include/conversation.php:973
 msgid "Set your location"
 msgstr "Nastavte vaši polohu"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:968
+#: ../../mod/editpost.php:115 ../../include/conversation.php:974
 msgid "set location"
 msgstr "nastavit místo"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:969
+#: ../../mod/editpost.php:116 ../../include/conversation.php:975
 msgid "Clear browser location"
 msgstr "Odstranit adresu v prohlížeči"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:970
+#: ../../mod/editpost.php:117 ../../include/conversation.php:976
 msgid "clear location"
 msgstr "vymazat místo"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:976
+#: ../../mod/editpost.php:119 ../../include/conversation.php:982
 msgid "Permission settings"
 msgstr "Nastavení oprávnění"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:985
+#: ../../mod/editpost.php:127 ../../include/conversation.php:991
 msgid "CC: email addresses"
 msgstr "skrytá kopie: e-mailové adresy"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:986
+#: ../../mod/editpost.php:128 ../../include/conversation.php:992
 msgid "Public post"
 msgstr "Veřejný příspěvek"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:972
+#: ../../mod/editpost.php:131 ../../include/conversation.php:978
 msgid "Set title"
 msgstr "Nastavit titulek"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:974
+#: ../../mod/editpost.php:133 ../../include/conversation.php:980
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (čárkou oddělený seznam)"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:988
+#: ../../mod/editpost.php:134 ../../include/conversation.php:994
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Příklad: bob@example.com, mary@example.com"
 
@@ -958,7 +951,7 @@ msgstr "Prosím potvrďte Vaši žádost o propojení %s."
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
 msgid "[Name Withheld]"
 msgstr "[Jméno odepřeno]"
 
@@ -1030,6 +1023,65 @@ msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"re
 msgid "Submit Request"
 msgstr "Odeslat žádost"
 
+#: ../../mod/uexport.php:10 ../../mod/settings.php:30
+#: ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Nastavení účtu"
+
+#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Nastavení zobrazení"
+
+#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr "Nastavení konektoru"
+
+#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Nastavení pluginu"
+
+#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr "Propojené aplikace"
+
+#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Export osobních údajů"
+
+#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Odstranit účet"
+
+#: ../../mod/uexport.php:49 ../../mod/settings.php:69
+#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../../mod/uexport.php:73
+msgid "Export account"
+msgstr "Exportovat účet"
+
+#: ../../mod/uexport.php:73
+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 "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server."
+
+#: ../../mod/uexport.php:74
+msgid "Export all"
+msgstr "Exportovat vše"
+
+#: ../../mod/uexport.php:74
+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 "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)"
+
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica Sociální komunkační server - Nastavení"
@@ -1295,9 +1347,9 @@ msgstr "Časová konverze"
 
 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
-msgstr "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem."
+msgstr "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách"
 
 #: ../../mod/localtime.php:30
 #, php-format
@@ -1351,7 +1403,7 @@ msgid "is interested in:"
 msgstr "zajímá se o:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1175
+#: ../../include/contact_widgets.php:9 ../../boot.php:1179
 msgid "Connect"
 msgstr "Spojit"
 
@@ -1380,25 +1432,25 @@ msgstr "Skupina je prázdná"
 msgid "Group: "
 msgstr "Skupina: "
 
-#: ../../mod/content.php:438 ../../mod/content.php:722
-#: ../../include/conversation.php:563 ../../object/Item.php:116
+#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../include/conversation.php:568 ../../object/Item.php:116
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../../mod/content.php:455 ../../mod/content.php:815
-#: ../../mod/content.php:816 ../../include/conversation.php:582
+#: ../../mod/content.php:455 ../../mod/content.php:816
+#: ../../mod/content.php:817 ../../include/conversation.php:587
 #: ../../object/Item.php:227 ../../object/Item.php:228
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Zobrazit profil uživatele %s na %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:827
-#: ../../include/conversation.php:602 ../../object/Item.php:240
+#: ../../mod/content.php:465 ../../mod/content.php:828
+#: ../../include/conversation.php:607 ../../object/Item.php:240
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:617
+#: ../../mod/content.php:480 ../../include/conversation.php:622
 msgid "View in context"
 msgstr "Pohled v kontextu"
 
@@ -1410,7 +1462,7 @@ msgstr[0] "%d komentář"
 msgstr[1] "%d komentářů"
 msgstr[2] "%d komentářů"
 
-#: ../../mod/content.php:588 ../../include/text.php:1443
+#: ../../mod/content.php:588 ../../include/text.php:1441
 #: ../../object/Item.php:279 ../../object/Item.php:292
 msgid "comment"
 msgid_plural "comments"
@@ -1420,7 +1472,7 @@ msgstr[2] "komentář"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:586
+#: ../../include/contact_widgets.php:195 ../../boot.php:590
 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -1442,75 +1494,75 @@ msgstr "Sdílet toto"
 msgid "share"
 msgstr "sdílí"
 
-#: ../../mod/content.php:694 ../../object/Item.php:559
+#: ../../mod/content.php:694 ../../object/Item.php:560
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../../mod/content.php:695 ../../object/Item.php:560
+#: ../../mod/content.php:695 ../../object/Item.php:561
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../../mod/content.php:696 ../../object/Item.php:561
+#: ../../mod/content.php:696 ../../object/Item.php:562
 msgid "Underline"
 msgstr "Podrtžené"
 
-#: ../../mod/content.php:697 ../../object/Item.php:562
+#: ../../mod/content.php:697 ../../object/Item.php:563
 msgid "Quote"
 msgstr "Citovat"
 
-#: ../../mod/content.php:698 ../../object/Item.php:563
+#: ../../mod/content.php:698 ../../object/Item.php:564
 msgid "Code"
 msgstr "Kód"
 
-#: ../../mod/content.php:699 ../../object/Item.php:564
+#: ../../mod/content.php:699 ../../object/Item.php:565
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../../mod/content.php:700 ../../object/Item.php:565
+#: ../../mod/content.php:700 ../../object/Item.php:566
 msgid "Link"
 msgstr "Odkaz"
 
-#: ../../mod/content.php:701 ../../object/Item.php:566
+#: ../../mod/content.php:701 ../../object/Item.php:567
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:735 ../../object/Item.php:180
+#: ../../mod/content.php:736 ../../object/Item.php:180
 msgid "add star"
 msgstr "přidat hvězdu"
 
-#: ../../mod/content.php:736 ../../object/Item.php:181
+#: ../../mod/content.php:737 ../../object/Item.php:181
 msgid "remove star"
 msgstr "odebrat hvězdu"
 
-#: ../../mod/content.php:737 ../../object/Item.php:182
+#: ../../mod/content.php:738 ../../object/Item.php:182
 msgid "toggle star status"
 msgstr "přepnout hvězdu"
 
-#: ../../mod/content.php:740 ../../object/Item.php:185
+#: ../../mod/content.php:741 ../../object/Item.php:185
 msgid "starred"
 msgstr "označeno hvězdou"
 
-#: ../../mod/content.php:741 ../../object/Item.php:186
+#: ../../mod/content.php:742 ../../object/Item.php:186
 msgid "add tag"
 msgstr "přidat štítek"
 
-#: ../../mod/content.php:745 ../../object/Item.php:120
+#: ../../mod/content.php:746 ../../object/Item.php:120
 msgid "save to folder"
 msgstr "uložit do složky"
 
-#: ../../mod/content.php:817 ../../object/Item.php:229
+#: ../../mod/content.php:818 ../../object/Item.php:229
 msgid "to"
 msgstr "pro"
 
-#: ../../mod/content.php:818 ../../object/Item.php:230
+#: ../../mod/content.php:819 ../../object/Item.php:230
 msgid "Wall-to-Wall"
 msgstr "Zeď-na-Zeď"
 
-#: ../../mod/content.php:819 ../../object/Item.php:231
+#: ../../mod/content.php:820 ../../object/Item.php:231
 msgid "via Wall-To-Wall:"
 msgstr "přes Zeď-na-Zeď "
 
-#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1526,8 +1578,8 @@ msgid "Discard"
 msgstr "Odstranit"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:321
-#: ../../mod/contacts.php:375
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
+#: ../../mod/contacts.php:378
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -1543,7 +1595,7 @@ msgstr "Síť"
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr "Domů"
@@ -1579,7 +1631,7 @@ msgid "suggested by %s"
 msgstr "navrhl %s"
 
 #: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid "Hide this contact from others"
 msgstr "Skrýt tento kontakt před ostatními"
 
@@ -1729,59 +1781,59 @@ msgstr "Kontakt bude ignorován"
 msgid "Contact has been unignored"
 msgstr "Kontakt přestal být ignorován"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been archived"
 msgstr "Kontakt byl archivován"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been unarchived"
 msgstr "Kontakt byl vrácen z archívu."
 
-#: ../../mod/contacts.php:229
+#: ../../mod/contacts.php:232
 msgid "Contact has been removed."
 msgstr "Kontakt byl odstraněn."
 
-#: ../../mod/contacts.php:263
+#: ../../mod/contacts.php:266
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Jste vzájemní přátelé s uživatelem %s"
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:270
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Sdílíte s uživatelem %s"
 
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:275
 #, php-format
 msgid "%s is sharing with you"
 msgstr "uživatel %s sdílí s vámi"
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:292
 msgid "Private communications are not available for this contact."
 msgstr "Soukromá komunikace není dostupná pro tento kontakt."
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:295
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was successful)"
 msgstr "(Aktualizace byla úspěšná)"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was not successful)"
 msgstr "(Aktualizace nebyla úspěšná)"
 
-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:301
 msgid "Suggest friends"
 msgstr "Navrhněte přátelé"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:305
 #, php-format
 msgid "Network type: %s"
 msgstr "Typ sítě: %s"
 
-#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
@@ -1789,220 +1841,220 @@ msgstr[0] "%d sdílený kontakt"
 msgstr[1] "%d sdílených kontaktů"
 msgstr[2] "%d sdílených kontaktů"
 
-#: ../../mod/contacts.php:310
+#: ../../mod/contacts.php:313
 msgid "View all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:698
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:697
 msgid "Block"
 msgstr "Blokovat"
 
-#: ../../mod/contacts.php:318
+#: ../../mod/contacts.php:321
 msgid "Toggle Blocked status"
 msgstr "Přepnout stav Blokováno"
 
-#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
+#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
 msgid "Unignore"
 msgstr "Přestat ignorovat"
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:327
 msgid "Toggle Ignored status"
 msgstr "Přepnout stav Ignorováno"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Unarchive"
 msgstr "Vrátit z archívu"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Archive"
 msgstr "Archivovat"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:334
 msgid "Toggle Archive status"
 msgstr "Přepnout stav Archivováno"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:337
 msgid "Repair"
 msgstr "Opravit"
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:340
 msgid "Advanced Contact Settings"
 msgstr "Pokročilé nastavení kontaktu"
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:346
 msgid "Communications lost with this contact!"
 msgstr "Komunikace s tímto kontaktem byla ztracena!"
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:349
 msgid "Contact Editor"
 msgstr "Editor kontaktu"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:352
 msgid "Profile Visibility"
 msgstr "Viditelnost profilu"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:353
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu."
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:354
 msgid "Contact Information / Notes"
 msgstr "Kontaktní informace / poznámky"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:355
 msgid "Edit contact notes"
 msgstr "Editovat poznámky kontaktu"
 
-#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
+#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Navštivte profil uživatele %s [%s]"
 
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:361
 msgid "Block/Unblock contact"
 msgstr "Blokovat / Odblokovat kontakt"
 
-#: ../../mod/contacts.php:359
+#: ../../mod/contacts.php:362
 msgid "Ignore contact"
 msgstr "Ignorovat kontakt"
 
-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:363
 msgid "Repair URL settings"
 msgstr "Opravit nastavení adresy URL "
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:364
 msgid "View conversations"
 msgstr "Zobrazit konverzace"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:366
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:370
 msgid "Last update:"
 msgstr "Poslední aktualizace:"
 
-#: ../../mod/contacts.php:369
+#: ../../mod/contacts.php:372
 msgid "Update public posts"
 msgstr "Aktualizovat veřejné příspěvky"
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
 msgid "Update now"
 msgstr "Aktualizovat"
 
-#: ../../mod/contacts.php:378
+#: ../../mod/contacts.php:381
 msgid "Currently blocked"
 msgstr "V současnosti zablokováno"
 
-#: ../../mod/contacts.php:379
+#: ../../mod/contacts.php:382
 msgid "Currently ignored"
 msgstr "V současnosti ignorováno"
 
-#: ../../mod/contacts.php:380
+#: ../../mod/contacts.php:383
 msgid "Currently archived"
 msgstr "Aktuálně archivován"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Odpovědi/Libí se na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné"
 
-#: ../../mod/contacts.php:434
+#: ../../mod/contacts.php:437
 msgid "Suggestions"
 msgstr "Doporučení"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:440
 msgid "Suggest potential friends"
 msgstr "Navrhnout potenciální přátele"
 
-#: ../../mod/contacts.php:440 ../../mod/group.php:191
+#: ../../mod/contacts.php:443 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Všechny kontakty"
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:446
 msgid "Show all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:449
 msgid "Unblocked"
 msgstr "Odblokován"
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:452
 msgid "Only show unblocked contacts"
 msgstr "Zobrazit pouze neblokované kontakty"
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:456
 msgid "Blocked"
 msgstr "Blokován"
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:459
 msgid "Only show blocked contacts"
 msgstr "Zobrazit pouze blokované kontakty"
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:463
 msgid "Ignored"
 msgstr "Ignorován"
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:466
 msgid "Only show ignored contacts"
 msgstr "Zobrazit pouze ignorované kontakty"
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:470
 msgid "Archived"
 msgstr "Archivován"
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:473
 msgid "Only show archived contacts"
 msgstr "Zobrazit pouze archivované kontakty"
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:477
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:480
 msgid "Only show hidden contacts"
 msgstr "Zobrazit pouze skryté kontakty"
 
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:528
 msgid "Mutual Friendship"
 msgstr "Vzájemné přátelství"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:532
 msgid "is a fan of yours"
 msgstr "je Váš fanoušek"
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:536
 msgid "you are a fan of"
 msgstr "jste fanouškem"
 
-#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Editovat kontakt"
 
-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
+#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ../../mod/contacts.php:575
+#: ../../mod/contacts.php:578
 msgid "Search your contacts"
 msgstr "Prohledat Vaše kontakty"
 
-#: ../../mod/contacts.php:576 ../../mod/directory.php:59
+#: ../../mod/contacts.php:579 ../../mod/directory.php:59
 msgid "Finding: "
 msgstr "Zjištění: "
 
-#: ../../mod/contacts.php:577 ../../mod/directory.php:61
+#: ../../mod/contacts.php:580 ../../mod/directory.php:61
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Najít"
@@ -2021,13 +2073,13 @@ msgid "Password reset requested at %s"
 msgstr "Na %s bylo zažádáno o resetování hesla"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
-#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
+#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2041,7 +2093,7 @@ msgid ""
 "Password reset failed."
 msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:936
+#: ../../mod/lostpass.php:83 ../../boot.php:940
 msgid "Password Reset"
 msgstr "Obnovení hesla"
 
@@ -2085,44 +2137,6 @@ msgstr "Přezdívka nebo e-mail: "
 msgid "Reset"
 msgstr "Reset"
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Nastavení účtu"
-
-#: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr "Nastavení zobrazení"
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
-msgstr "Nastavení konektoru"
-
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr "Nastavení pluginu"
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr "Propojené aplikace"
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr "Export osobních údajů"
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr "Odstranit účet"
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Nastavení"
-
 #: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr "Chybí některé důležité údaje!"
@@ -2734,7 +2748,7 @@ msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1708
+#: ../../mod/notes.php:44 ../../boot.php:1718
 msgid "Personal Notes"
 msgstr "Osobní poznámky"
 
@@ -2752,6 +2766,31 @@ msgstr "Osobní poznámky"
 msgid "Save"
 msgstr "Uložit"
 
+#: ../../mod/uimport.php:41
+msgid "Import"
+msgstr "Import"
+
+#: ../../mod/uimport.php:43
+msgid "Move account"
+msgstr "Přesunout účet"
+
+#: ../../mod/uimport.php:44
+msgid ""
+"You can move here an account from another Friendica server. <br>\r\n"
+"                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n"
+"                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
+msgstr "Zde si můžete přesunout účet z jiného serveru Friendika. <br>\n                            Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.<br>\n                            <b>Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory"
+
+#: ../../mod/uimport.php:47
+msgid "Account file"
+msgstr "Soubor s účtem"
+
+#: ../../mod/uimport.php:47
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -2783,7 +2822,7 @@ msgstr "Žádný příjemce."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:893 ../../include/conversation.php:910
+#: ../../include/conversation.php:898 ../../include/conversation.php:916
 msgid "Please enter a link URL:"
 msgstr "Zadejte prosím URL odkaz:"
 
@@ -2864,9 +2903,9 @@ msgid ""
 msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný, leda by všichni vaši potenciální přátelé věděli, jak vás přesně najít."
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1684
+#: ../../boot.php:1694
 msgid "Profile"
 msgstr "Profil"
 
@@ -3093,91 +3132,91 @@ msgstr "Žádné kontakty."
 msgid "View Contacts"
 msgstr "Zobrazit kontakty"
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registrační údaje pro %s"
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."
 
-#: ../../mod/register.php:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Nepodařilo se odeslat zprávu na e-mail. Zde je zpráva, která nebyla odeslána."
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr "Vaši registraci nelze zpracovat."
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr "Žádost o registraci na %s"
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Vaše registrace čeká na schválení vlastníkem serveru."
 
-#: ../../mod/register.php:189
+#: ../../mod/register.php:190
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu."
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'."
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr "Vaše OpenID (nepovinné): "
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Toto je Váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu."
 
-#: ../../mod/register.php:255
+#: ../../mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Členství na tomto webu je pouze na pozvání."
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
 msgstr "Vaše pozvání ID:"
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Registrace"
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vaše celé jméno (např. Jan Novák):"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Vaše e-mailová adresa:"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 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 "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaše profilová adresa na tomto webu pak bude \"<strong>přezdívka@$sitename</strong>\"."
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr "Vyberte přezdívku:"
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
 msgid "Register"
 msgstr "Registrovat"
 
@@ -3185,12 +3224,21 @@ msgstr "Registrovat"
 msgid "People Search"
 msgstr "Vyhledávání lidí"
 
+#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
+#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
+#: ../../include/conversation.php:253
+#: ../../addon.old/communityhome/communityhome.php:163
+msgid "photo"
+msgstr "fotografie"
+
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
+#: ../../view/theme/diabook/theme.php:452
+#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3201,7 +3249,7 @@ msgstr "Stav"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3215,8 +3263,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nemá rád %2$s na %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3779
+#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3837
 msgid "Item not found."
 msgstr "Položka nenalezena."
 
@@ -3224,8 +3272,8 @@ msgstr "Položka nenalezena."
 msgid "Access denied."
 msgstr "Přístup odmítnut"
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1691
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:51 ../../boot.php:1701
 msgid "Photos"
 msgstr "Fotografie"
 
@@ -3246,43 +3294,43 @@ msgstr "Registrace zrušena pro %s"
 msgid "Please login."
 msgstr "Přihlaste se, prosím."
 
-#: ../../mod/item.php:91
+#: ../../mod/item.php:104
 msgid "Unable to locate original post."
 msgstr "Nelze nalézt původní příspěvek."
 
-#: ../../mod/item.php:275
+#: ../../mod/item.php:288
 msgid "Empty post discarded."
 msgstr "Prázdný příspěvek odstraněn."
 
-#: ../../mod/item.php:407 ../../mod/wall_upload.php:133
+#: ../../mod/item.php:420 ../../mod/wall_upload.php:133
 #: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "Fotografie na zdi"
 
-#: ../../mod/item.php:820
+#: ../../mod/item.php:833
 msgid "System error. Post not saved."
 msgstr "Chyba systému. Příspěvek nebyl uložen."
 
-#: ../../mod/item.php:845
+#: ../../mod/item.php:858
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica."
 
-#: ../../mod/item.php:847
+#: ../../mod/item.php:860
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Můžete je navštívit online na adrese %s"
 
-#: ../../mod/item.php:848
+#: ../../mod/item.php:861
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam."
 
-#: ../../mod/item.php:850
+#: ../../mod/item.php:863
 #, php-format
 msgid "%s posted an update."
 msgstr "%s poslal aktualizaci."
@@ -4106,11 +4154,11 @@ msgstr "FTP uživatel"
 msgid "FTP Password"
 msgstr "FTP heslo"
 
-#: ../../mod/profile.php:21 ../../boot.php:1085
+#: ../../mod/profile.php:21 ../../boot.php:1089
 msgid "Requested profile is not available."
 msgstr "Požadovaný profil není k dispozici."
 
-#: ../../mod/profile.php:155 ../../mod/display.php:77
+#: ../../mod/profile.php:155 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
 msgstr "Přístup na tento profil byl omezen."
 
@@ -4202,7 +4250,7 @@ msgstr "%1$s následuje %3$s uživatele %2$s"
 msgid "link"
 msgstr "odkaz"
 
-#: ../../mod/display.php:138
+#: ../../mod/display.php:162
 msgid "Item has been removed."
 msgstr "Položka byla odstraněna."
 
@@ -4507,28 +4555,28 @@ msgstr "Věk: "
 msgid "Edit/Manage Profiles"
 msgstr "Upravit / Spravovat profily"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1203
+#: ../../mod/profiles.php:689 ../../boot.php:1207
 msgid "Change profile photo"
 msgstr "Změnit profilovou fotografii"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1204
+#: ../../mod/profiles.php:690 ../../boot.php:1208
 msgid "Create New Profile"
 msgstr "Vytvořit nový profil"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1214
+#: ../../mod/profiles.php:701 ../../boot.php:1218
 msgid "Profile Image"
 msgstr "Profilový obrázek"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1217
+#: ../../mod/profiles.php:703 ../../boot.php:1221
 msgid "visible to everybody"
 msgstr "viditelné pro všechny"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1218
+#: ../../mod/profiles.php:704 ../../boot.php:1222
 msgid "Edit visibility"
 msgstr "Upravit viditelnost"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:897
-#: ../../include/conversation.php:914
+#: ../../mod/filer.php:29 ../../include/conversation.php:902
+#: ../../include/conversation.php:920
 msgid "Save to Folder:"
 msgstr "Uložit do složky:"
 
@@ -4620,7 +4668,7 @@ msgstr "Vstupní data (ve formátu Diaspora): "
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Návrhy přátel"
@@ -4635,7 +4683,7 @@ msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to
 msgid "Ignore/Hide"
 msgstr "Ignorovat / skrýt"
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
 msgid "Global Directory"
 msgstr "Globální adresář"
 
@@ -4652,17 +4700,17 @@ msgid "Gender: "
 msgstr "Pohlaví: "
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1239
+#: ../../boot.php:1243
 msgid "Gender:"
 msgstr "Pohlaví:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1242
+#: ../../boot.php:1246
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1244
+#: ../../boot.php:1248
 msgid "Homepage:"
 msgstr "Domácí stránka:"
 
@@ -5535,7 +5583,7 @@ msgstr "Povolit Planets plugin"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../include/nav.php:64 ../../boot.php:927
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5575,7 +5623,7 @@ msgid "Latest likes"
 msgstr "Poslední \"líbí se mi\""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5729,7 +5777,7 @@ msgstr "Dny"
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5740,7 +5788,7 @@ msgstr "Neděle"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5748,35 +5796,35 @@ msgid "Monday"
 msgstr "Pondělí"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "Úterý"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "Středa"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "Čtvrtek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "Pátek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6144,7 +6192,7 @@ msgstr "Rozšířený kalendář s podporou CalDAV"
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:710
+#: ../../include/enotify.php:28 ../../include/notifier.php:774
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -7589,137 +7637,135 @@ msgstr "Nastavení šířku grafické šablony"
 msgid "Color scheme"
 msgstr "Barevné schéma"
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr "Vaše příspěvky a konverzace"
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Vaše profilová stránka"
 
-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:88
 msgid "Your contacts"
 msgstr "Vaše kontakty"
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Vaše fotky"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Vaše události"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Osobní poznámky"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Vaše osobní fotky"
 
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:93
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr "Komunitní stránky"
 
-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:377
+#: ../../view/theme/diabook/theme.php:591
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr "Komunitní profily"
 
-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:398
+#: ../../view/theme/diabook/theme.php:596
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "Poslední uživatelé"
 
-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:427
+#: ../../view/theme/diabook/theme.php:598
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr "Poslední líbí/nelíbí"
 
-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:472
+#: ../../view/theme/diabook/theme.php:597
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "Poslední fotografie"
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:509
+#: ../../view/theme/diabook/theme.php:594
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr "Nalézt Přátele"
 
-#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:510
 msgid "Local Directory"
 msgstr "Lokální Adresář"
 
-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Podobné zájmy"
 
-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Pozvat přátele"
 
-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:531
+#: ../../view/theme/diabook/theme.php:590
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr "Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:577
+#: ../../view/theme/diabook/theme.php:536
 msgid "Set zoomfactor for Earth Layers"
 msgstr "Nastavit faktor přiblížení pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:537
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr "Nastavit zeměpistnou délku (X) pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:538
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr "Nastavit zeměpistnou šířku (X) pro Earth Layers"
 
+#: ../../view/theme/diabook/theme.php:551
 #: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr "Pomoc nebo @ProNováčky ?"
 
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:558
+#: ../../view/theme/diabook/theme.php:593
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr "Propojené služby"
 
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:595
 msgid "Last Tweets"
 msgstr "Poslední tweety"
 
-#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/theme.php:568
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr "Nastavit vyhledávací frázi na twitteru"
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:587
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr "nikdy nezobrazit"
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:587
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr "zobrazit"
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:588
 msgid "Show/hide boxes at right-hand column:"
 msgstr "Zobrazit/skrýt boxy na pravém sloupci:"
 
@@ -8134,7 +8180,7 @@ msgstr "Začíná:"
 msgid "Finishes:"
 msgstr "Končí:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:703
+#: ../../include/delivery.php:457 ../../include/notifier.php:767
 msgid "(no subject)"
 msgstr "(Bez předmětu)"
 
@@ -8306,79 +8352,79 @@ msgstr "uvolněný"
 msgid "surprised"
 msgstr "překvapený"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "January"
 msgstr "Ledna"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "February"
 msgstr "Února"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "March"
 msgstr "Března"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "April"
 msgstr "Dubna"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "May"
 msgstr "Května"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "June"
 msgstr "Června"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "July"
 msgstr "Července"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "August"
 msgstr "Srpna"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "September"
 msgstr "Září"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "October"
 msgstr "Října"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "November"
 msgstr "Listopadu"
 
-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "December"
 msgstr "Prosinec"
 
-#: ../../include/text.php:1007
+#: ../../include/text.php:1005
 msgid "bytes"
 msgstr "bytů"
 
-#: ../../include/text.php:1034 ../../include/text.php:1046
+#: ../../include/text.php:1032 ../../include/text.php:1044
 msgid "Click to open/close"
 msgstr "Klikněte pro otevření/zavření"
 
-#: ../../include/text.php:1219 ../../include/user.php:236
+#: ../../include/text.php:1217 ../../include/user.php:236
 msgid "default"
 msgstr "standardní"
 
-#: ../../include/text.php:1231
+#: ../../include/text.php:1229
 msgid "Select an alternate language"
 msgstr "Vyběr alternativního jazyka"
 
-#: ../../include/text.php:1441
+#: ../../include/text.php:1439
 msgid "activity"
 msgstr "aktivita"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1442
 msgid "post"
 msgstr "příspěvek"
 
-#: ../../include/text.php:1599
+#: ../../include/text.php:1597
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
@@ -8402,6 +8448,38 @@ msgstr "vložený obsah"
 msgid "Embedding disabled"
 msgstr "Vkládání zakázáno"
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr "Chyba dekódování uživatelského účtu"
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?"
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní."
+
+#: ../../include/uimport.php:92
+msgid "User creation error"
+msgstr "Chyba vytváření uživatele"
+
+#: ../../include/uimport.php:110
+msgid "User profile creation error"
+msgstr "Chyba vytváření uživatelského účtu"
+
+#: ../../include/uimport.php:155
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d kontakt nenaimporován"
+msgstr[1] "%d kontaktů nenaimporováno"
+msgstr[2] "%d kontakty nenaimporovány"
+
+#: ../../include/uimport.php:233
+msgid "Done. You can now login with your username and password"
+msgstr "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem"
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8433,7 +8511,7 @@ msgstr "Vytvořit novou skupinu"
 msgid "Contacts not in any group"
 msgstr "Kontakty, které nejsou v žádné skupině"
 
-#: ../../include/nav.php:46 ../../boot.php:922
+#: ../../include/nav.php:46 ../../boot.php:926
 msgid "Logout"
 msgstr "Odhlásit se"
 
@@ -8441,7 +8519,7 @@ msgstr "Odhlásit se"
 msgid "End this session"
 msgstr "Konec této relace"
 
-#: ../../include/nav.php:49 ../../boot.php:1677
+#: ../../include/nav.php:49 ../../boot.php:1687
 msgid "Status"
 msgstr "Stav"
 
@@ -8521,11 +8599,11 @@ msgstr "Spravovat"
 msgid "Manage other pages"
 msgstr "Spravovat jiné stránky"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Profiles"
 msgstr "Profily"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Manage/edit profiles"
 msgstr "Spravovat/upravit profily"
 
@@ -8672,17 +8750,17 @@ msgstr "sekund"
 msgid "%1$d %2$s ago"
 msgstr "před %1$d %2$s"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1688
+#: ../../include/datetime.php:472 ../../include/items.php:1689
 #, php-format
 msgid "%s's birthday"
 msgstr "%s má narozeniny"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1689
+#: ../../include/datetime.php:473 ../../include/items.php:1690
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Veselé narozeniny %s"
 
-#: ../../include/onepoll.php:409
+#: ../../include/onepoll.php:414
 msgid "From: "
 msgstr "Od:"
 
@@ -8952,15 +9030,15 @@ msgstr "Nepodařilo se získat kontaktní informace."
 msgid "following"
 msgstr "následující"
 
-#: ../../include/items.php:3299
+#: ../../include/items.php:3357
 msgid "A new person is sharing with you at "
 msgstr "Nový člověk si s vámi sdílí na"
 
-#: ../../include/items.php:3299
+#: ../../include/items.php:3357
 msgid "You have a new follower at "
 msgstr "Máte nového následovníka na"
 
-#: ../../include/items.php:3980
+#: ../../include/items.php:4038
 msgid "Archives"
 msgstr "Archív"
 
@@ -9050,38 +9128,38 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním."
 
-#: ../../include/Contact.php:111
+#: ../../include/Contact.php:115
 msgid "stopped following"
 msgstr "následování zastaveno"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:790
+#: ../../include/Contact.php:225 ../../include/conversation.php:795
 msgid "Poke"
 msgstr "Šťouchnout"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:784
+#: ../../include/Contact.php:226 ../../include/conversation.php:789
 msgid "View Status"
 msgstr "Zobrazit Status"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:785
+#: ../../include/Contact.php:227 ../../include/conversation.php:790
 msgid "View Profile"
 msgstr "Zobrazit Profil"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:786
+#: ../../include/Contact.php:228 ../../include/conversation.php:791
 msgid "View Photos"
 msgstr "Zobrazit Fotky"
 
-#: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:787
+#: ../../include/Contact.php:229 ../../include/Contact.php:242
+#: ../../include/conversation.php:792
 msgid "Network Posts"
 msgstr "Zobrazit Příspěvky sítě"
 
-#: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:788
+#: ../../include/Contact.php:230 ../../include/Contact.php:242
+#: ../../include/conversation.php:793
 msgid "Edit Contact"
 msgstr "Editovat Kontakty"
 
-#: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:789
+#: ../../include/Contact.php:231 ../../include/Contact.php:242
+#: ../../include/conversation.php:794
 msgid "Send PM"
 msgstr "Poslat soukromou zprávu"
 
@@ -9099,86 +9177,90 @@ msgstr "příspěvek/položka"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného"
 
-#: ../../include/conversation.php:594 ../../object/Item.php:218
+#: ../../include/conversation.php:599 ../../object/Item.php:218
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../include/conversation.php:595 ../../object/Item.php:219
+#: ../../include/conversation.php:600 ../../object/Item.php:219
 msgid "Filed under:"
 msgstr "Vyplněn pod:"
 
-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:685
 msgid "remove"
 msgstr "odstranit"
 
-#: ../../include/conversation.php:684
+#: ../../include/conversation.php:689
 msgid "Delete Selected Items"
 msgstr "Smazat vybrané položky"
 
-#: ../../include/conversation.php:783
+#: ../../include/conversation.php:788
 msgid "Follow Thread"
 msgstr "Následovat vlákno"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:857
 #, php-format
 msgid "%s likes this."
 msgstr "%s se to líbí."
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:857
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s se to nelíbí."
 
-#: ../../include/conversation.php:856
+#: ../../include/conversation.php:861
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d lidem</span> se to líbí."
 
-#: ../../include/conversation.php:858
+#: ../../include/conversation.php:863
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d lidem</span> se to nelíbí."
 
-#: ../../include/conversation.php:864
+#: ../../include/conversation.php:869
 msgid "and"
 msgstr "a"
 
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:872
 #, php-format
 msgid ", and %d other people"
 msgstr ", a %d dalších lidí"
 
-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:873
 #, php-format
 msgid "%s like this."
 msgstr "%s se to líbí."
 
-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:873
 #, php-format
 msgid "%s don't like this."
 msgstr "%s se to nelíbí."
 
-#: ../../include/conversation.php:892 ../../include/conversation.php:909
+#: ../../include/conversation.php:897 ../../include/conversation.php:915
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Viditelné pro <strong>všechny</strong>"
 
-#: ../../include/conversation.php:894 ../../include/conversation.php:911
+#: ../../include/conversation.php:899 ../../include/conversation.php:917
 msgid "Please enter a video link/URL:"
 msgstr "Prosím zadejte URL adresu videa:"
 
-#: ../../include/conversation.php:895 ../../include/conversation.php:912
+#: ../../include/conversation.php:900 ../../include/conversation.php:918
 msgid "Please enter an audio link/URL:"
 msgstr "Prosím zadejte URL adresu zvukového záznamu:"
 
-#: ../../include/conversation.php:896 ../../include/conversation.php:913
+#: ../../include/conversation.php:901 ../../include/conversation.php:919
 msgid "Tag term:"
 msgstr "Štítek:"
 
-#: ../../include/conversation.php:898 ../../include/conversation.php:915
+#: ../../include/conversation.php:903 ../../include/conversation.php:921
 msgid "Where are you right now?"
 msgstr "Kde právě jste?"
 
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:904
+msgid "Delete item(s)?"
+msgstr "Smazat položku(y)?"
+
+#: ../../include/conversation.php:983
 msgid "permissions"
 msgstr "oprávnění"
 
@@ -9194,101 +9276,101 @@ msgstr "Tato akce překročí limit nastavené Vaším předplatným."
 msgid "This action is not available under your subscription plan."
 msgstr "Tato akce není v rámci Vašeho předplatného dostupná."
 
-#: ../../boot.php:584
+#: ../../boot.php:588
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: ../../boot.php:587
+#: ../../boot.php:591
 msgid "show fewer"
 msgstr "zobrazit méně"
 
-#: ../../boot.php:794
+#: ../../boot.php:798
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb."
 
-#: ../../boot.php:796
+#: ../../boot.php:800
 #, php-format
 msgid "Update Error at %s"
 msgstr "Chyba aktualizace na %s"
 
-#: ../../boot.php:897
+#: ../../boot.php:901
 msgid "Create a New Account"
 msgstr "Vytvořit nový účet"
 
-#: ../../boot.php:925
+#: ../../boot.php:929
 msgid "Nickname or Email address: "
 msgstr "Přezdívka nebo e-mailová adresa:"
 
-#: ../../boot.php:926
+#: ../../boot.php:930
 msgid "Password: "
 msgstr "Heslo: "
 
-#: ../../boot.php:929
+#: ../../boot.php:933
 msgid "Or login using OpenID: "
 msgstr "Nebo přihlášení pomocí OpenID: "
 
-#: ../../boot.php:935
+#: ../../boot.php:939
 msgid "Forgot your password?"
 msgstr "Zapomněli jste své heslo?"
 
-#: ../../boot.php:1046
+#: ../../boot.php:1050
 msgid "Requested account is not available."
 msgstr "Požadovaný účet není dostupný."
 
-#: ../../boot.php:1123
+#: ../../boot.php:1127
 msgid "Edit profile"
 msgstr "Upravit profil"
 
-#: ../../boot.php:1189
+#: ../../boot.php:1193
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1315 ../../boot.php:1401
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1312 ../../boot.php:1398
+#: ../../boot.php:1316 ../../boot.php:1402
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1357 ../../boot.php:1438
+#: ../../boot.php:1361 ../../boot.php:1442
 msgid "[today]"
 msgstr "[Dnes]"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1373
 msgid "Birthday Reminders"
 msgstr "Připomínka narozenin"
 
-#: ../../boot.php:1370
+#: ../../boot.php:1374
 msgid "Birthdays this week:"
 msgstr "Narozeniny tento týden:"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1435
 msgid "[No description]"
 msgstr "[Žádný popis]"
 
-#: ../../boot.php:1449
+#: ../../boot.php:1453
 msgid "Event Reminders"
 msgstr "Připomenutí událostí"
 
-#: ../../boot.php:1450
+#: ../../boot.php:1454
 msgid "Events this week:"
 msgstr "Události tohoto týdne:"
 
-#: ../../boot.php:1680
+#: ../../boot.php:1690
 msgid "Status Messages and Posts"
 msgstr "Statusové zprávy a příspěvky "
 
-#: ../../boot.php:1687
+#: ../../boot.php:1697
 msgid "Profile Details"
 msgstr "Detaily profilu"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1714
 msgid "Events and Calendar"
 msgstr "Události a kalendář"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1721
 msgid "Only You Can See This"
 msgstr "Toto můžete vidět jen Vy"
 
diff --git a/view/cs/strings.php b/view/cs/strings.php
index 72fc58bc..cf5b9281 100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "Štítek odstraněn";
 $a->strings["Remove Item Tag"] = "Odebrat štítek položky";
 $a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: ";
 $a->strings["Remove"] = "Odstranit";
-$a->strings["%s welcomes %s"] = "%s vítá %s ";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá %2\$s";
 $a->strings["Authorize application connection"] = "Povolit připojení aplikacím";
 $a->strings["Return to your app and insert this Securty Code:"] = "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:";
 $a->strings["Please login to continue."] = "Pro pokračování se prosím přihlaste.";
@@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Profilové fotografie";
 $a->strings["Album not found."] = "Album nenalezeno.";
 $a->strings["Delete Album"] = "Smazat album";
 $a->strings["Delete Photo"] = "Smazat fotografii";
-$a->strings["was tagged in a"] = "štítek byl přidán v";
-$a->strings["photo"] = "fotografie";
-$a->strings["by"] = "od";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s byl označen v %2\$s uživatelem %3\$s";
+$a->strings["a photo"] = "fotografie";
 $a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti";
 $a->strings["Image file is empty."] = "Soubor obrázku je prázdný.";
 $a->strings["Unable to process image."] = "Obrázek není možné zprocesovat";
@@ -200,6 +199,18 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole.";
 $a->strings["Your Identity Address:"] = "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\".";
 $a->strings["Submit Request"] = "Odeslat žádost";
+$a->strings["Account settings"] = "Nastavení účtu";
+$a->strings["Display settings"] = "Nastavení zobrazení";
+$a->strings["Connector settings"] = "Nastavení konektoru";
+$a->strings["Plugin settings"] = "Nastavení pluginu";
+$a->strings["Connected apps"] = "Propojené aplikace";
+$a->strings["Export personal data"] = "Export osobních údajů";
+$a->strings["Remove account"] = "Odstranit účet";
+$a->strings["Settings"] = "Nastavení";
+$a->strings["Export account"] = "Exportovat účet";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server.";
+$a->strings["Export all"] = "Exportovat vše";
+$a->strings["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)"] = "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica Sociální komunkační server - Nastavení";
 $a->strings["Could not connect to database."] = "Nelze se připojit k databázi.";
 $a->strings["Could not create table."] = "Nelze vytvořit tabulku.";
@@ -243,7 +254,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Chyba: požadovaný openssl PHP modul není nainstalován.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Chyba: požadovaný mysqli PHP modul není nainstalován.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován.";
-$a->strings["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."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři vašeho webového serveru ale nyní mu to není umožněno.";
+$a->strings["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."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři vašeho webového serveru ale nyní mu to není umožněno.";
 $a->strings["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."] = "Toto je nejčastěji nastavením oprávnění, kdy webový server nemusí být schopen zapisovat soubory do vašeho adresáře - i když Vy můžete.";
 $a->strings["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."] = "Na konci této procedury obd nás obdržíte text k uložení v souboru pojmenovaném .htconfig.php ve Vašem Friendica kořenovém adresáři.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativně můžete tento krok přeskočit a provést manuální instalaci. Přečtěte si prosím soubor \"INSTALL.txt\" pro další instrukce.";
@@ -256,7 +267,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Co dál<h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Časová konverze";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách";
 $a->strings["UTC time: %s"] = "UTC čas: %s";
 $a->strings["Current timezone: %s"] = "Aktuální časové pásmo: %s";
 $a->strings["Converted localtime: %s"] = "Převedený lokální čas : %s";
@@ -446,14 +457,6 @@ $a->strings["Forgot your Password?"] = "Zapomněli jste heslo?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce.";
 $a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: ";
 $a->strings["Reset"] = "Reset";
-$a->strings["Account settings"] = "Nastavení účtu";
-$a->strings["Display settings"] = "Nastavení zobrazení";
-$a->strings["Connector settings"] = "Nastavení konektoru";
-$a->strings["Plugin settings"] = "Nastavení pluginu";
-$a->strings["Connected apps"] = "Propojené aplikace";
-$a->strings["Export personal data"] = "Export osobních údajů";
-$a->strings["Remove account"] = "Odstranit účet";
-$a->strings["Settings"] = "Nastavení";
 $a->strings["Missing some important data!"] = "Chybí některé důležité údaje!";
 $a->strings["Update"] = "Aktualizace";
 $a->strings["Failed to connect with email account using the settings provided."] = "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení.";
@@ -605,6 +608,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Neplatný kontakt.";
 $a->strings["Personal Notes"] = "Osobní poznámky";
 $a->strings["Save"] = "Uložit";
+$a->strings["Import"] = "Import";
+$a->strings["Move account"] = "Přesunout účet";
+$a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Zde si můžete přesunout účet z jiného serveru Friendika. <br>\n                            Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.<br>\n                            <b>Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory";
+$a->strings["Account file"] = "Soubor s účtem";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena.";
 $a->strings["No recipient selected."] = "Nevybrán příjemce.";
 $a->strings["Unable to check your home location."] = "Nebylo možné zjistit Vaši domácí lokaci.";
@@ -694,6 +702,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
 $a->strings["Choose a nickname: "] = "Vyberte přezdívku:";
 $a->strings["Register"] = "Registrovat";
 $a->strings["People Search"] = "Vyhledávání lidí";
+$a->strings["photo"] = "fotografie";
 $a->strings["status"] = "Stav";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s má rád %2\$s' na %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nemá rád %2\$s na %3\$s";
@@ -1806,6 +1815,17 @@ $a->strings["Attachments:"] = "Přílohy:";
 $a->strings["view full size"] = "zobrazit v plné velikosti";
 $a->strings["Embedded content"] = "vložený obsah";
 $a->strings["Embedding disabled"] = "Vkládání zakázáno";
+$a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní.";
+$a->strings["User creation error"] = "Chyba vytváření uživatele";
+$a->strings["User profile creation error"] = "Chyba vytváření uživatelského účtu";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d kontakt nenaimporován",
+	1 => "%d kontaktů nenaimporováno",
+	2 => "%d kontakty nenaimporovány",
+);
+$a->strings["Done. You can now login with your username and password"] = "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem";
 $a->strings["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."] = "Dříve smazaná skupina s tímto jménem byla obnovena. Stávající oprávnění <strong>může</ strong> ovlivnit tuto skupinu a její budoucí členy. Pokud to není to, co jste chtěli, vytvořte, prosím,  další skupinu s jiným názvem.";
 $a->strings["Default privacy group for new contacts"] = "Defaultní soukromá skrupina pro nové kontakty.";
 $a->strings["Everybody"] = "Všichni";
@@ -1986,6 +2006,7 @@ $a->strings["Please enter a video link/URL:"] = "Prosím zadejte URL adresu vide
 $a->strings["Please enter an audio link/URL:"] = "Prosím zadejte URL adresu zvukového záznamu:";
 $a->strings["Tag term:"] = "Štítek:";
 $a->strings["Where are you right now?"] = "Kde právě jste?";
+$a->strings["Delete item(s)?"] = "Smazat položku(y)?";
 $a->strings["permissions"] = "oprávnění";
 $a->strings["Click here to upgrade."] = "Klikněte zde pro aktualizaci.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Tato akce překročí limit nastavené Vaším předplatným.";
diff --git a/view/de/messages.po b/view/de/messages.po
index 827318d6..0f0c64da 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-03 15:31-0700\n"
-"PO-Revision-Date: 2012-11-05 06:28+0000\n"
+"POT-Creation-Date: 2012-11-08 10:00-0800\n"
+"PO-Revision-Date: 2012-11-10 07:33+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
@@ -74,7 +74,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -150,7 +150,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1406 ../../mod/photos.php:1450
 #: ../../mod/photos.php:1522 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:348
+#: ../../mod/content.php:693 ../../mod/contacts.php:351
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@@ -302,7 +302,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1701
+#: ../../include/nav.php:52 ../../boot.php:1711
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -360,7 +360,7 @@ msgstr "Beschreibung"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1237
+#: ../../boot.php:1241
 msgid "Location:"
 msgstr "Ort:"
 
@@ -428,7 +428,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/settings.php:967 ../../mod/register.php:237
 #: ../../mod/profiles.php:574
 msgid "Yes"
 msgstr "Ja"
@@ -440,12 +440,12 @@ msgstr "Ja"
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/settings.php:967 ../../mod/register.php:238
 #: ../../mod/profiles.php:575
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:50 ../../boot.php:1694
+#: ../../mod/photos.php:50 ../../boot.php:1704
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -673,7 +673,7 @@ msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585
+#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
 #: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Kommentar"
@@ -964,7 +964,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -1036,6 +1036,65 @@ msgstr "Adresse deines Profils:"
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
+#: ../../mod/uexport.php:10 ../../mod/settings.php:30
+#: ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr "Connector-Einstellungen"
+
+#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Persönliche Daten exportieren"
+
+#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Konto löschen"
+
+#: ../../mod/uexport.php:49 ../../mod/settings.php:69
+#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../mod/uexport.php:73
+msgid "Export account"
+msgstr "Account exportieren"
+
+#: ../../mod/uexport.php:73
+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 "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen."
+
+#: ../../mod/uexport.php:74
+msgid "Export all"
+msgstr "Alles exportieren"
+
+#: ../../mod/uexport.php:74
+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 "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert)."
+
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica-Server für soziale Netzwerke – Setup"
@@ -1357,7 +1416,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1175
+#: ../../include/contact_widgets.php:9 ../../boot.php:1179
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1424,7 +1483,7 @@ msgstr[1] "Kommentar"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:586
+#: ../../include/contact_widgets.php:195 ../../boot.php:590
 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -1514,7 +1573,7 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1530,8 +1589,8 @@ msgid "Discard"
 msgstr "Verwerfen"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:321
-#: ../../mod/contacts.php:375
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
+#: ../../mod/contacts.php:378
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -1583,7 +1642,7 @@ msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
 #: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
@@ -1733,279 +1792,279 @@ msgstr "Kontakt wurde ignoriert"
 msgid "Contact has been unignored"
 msgstr "Kontakt wird nicht mehr ignoriert"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been archived"
 msgstr "Kontakt wurde archiviert"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been unarchived"
 msgstr "Kontakt wurde aus dem Archiv geholt"
 
-#: ../../mod/contacts.php:229
+#: ../../mod/contacts.php:232
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/contacts.php:263
+#: ../../mod/contacts.php:266
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Du hast mit %s eine beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:270
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Du teilst mit %s"
 
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:275
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s teilt mit Dir"
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:292
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:295
 msgid "Never"
 msgstr "Niemals"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was not successful)"
 msgstr "(Aktualisierung war nicht erfolgreich)"
 
-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:301
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:305
 #, php-format
 msgid "Network type: %s"
 msgstr "Netzwerktyp: %s"
 
-#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
-#: ../../mod/contacts.php:310
+#: ../../mod/contacts.php:313
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:698
 msgid "Unblock"
 msgstr "Entsperren"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:697
 msgid "Block"
 msgstr "Sperren"
 
-#: ../../mod/contacts.php:318
+#: ../../mod/contacts.php:321
 msgid "Toggle Blocked status"
 msgstr "Geblockt-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
+#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:327
 msgid "Toggle Ignored status"
 msgstr "Ignoriert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:334
 msgid "Toggle Archive status"
 msgstr "Archiviert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:337
 msgid "Repair"
 msgstr "Reparieren"
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:340
 msgid "Advanced Contact Settings"
 msgstr "Fortgeschrittene Kontakteinstellungen"
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:346
 msgid "Communications lost with this contact!"
 msgstr "Verbindungen mit diesem Kontakt verloren!"
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:349
 msgid "Contact Editor"
 msgstr "Kontakt Editor"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:352
 msgid "Profile Visibility"
 msgstr "Profil-Sichtbarkeit"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:353
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:354
 msgid "Contact Information / Notes"
 msgstr "Kontakt Informationen / Notizen"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:355
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
+#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:361
 msgid "Block/Unblock contact"
 msgstr "Kontakt blockieren/freischalten"
 
-#: ../../mod/contacts.php:359
+#: ../../mod/contacts.php:362
 msgid "Ignore contact"
 msgstr "Ignoriere den Kontakt"
 
-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:363
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:364
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:366
 msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:370
 msgid "Last update:"
 msgstr "letzte Aktualisierung:"
 
-#: ../../mod/contacts.php:369
+#: ../../mod/contacts.php:372
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/contacts.php:378
+#: ../../mod/contacts.php:381
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
 
-#: ../../mod/contacts.php:379
+#: ../../mod/contacts.php:382
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/contacts.php:380
+#: ../../mod/contacts.php:383
 msgid "Currently archived"
 msgstr "Momentan archiviert"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:434
+#: ../../mod/contacts.php:437
 msgid "Suggestions"
 msgstr "Kontaktvorschläge"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:440
 msgid "Suggest potential friends"
 msgstr "Freunde vorschlagen"
 
-#: ../../mod/contacts.php:440 ../../mod/group.php:191
+#: ../../mod/contacts.php:443 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:446
 msgid "Show all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:449
 msgid "Unblocked"
 msgstr "Ungeblockt"
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:452
 msgid "Only show unblocked contacts"
 msgstr "Nur nicht-blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:456
 msgid "Blocked"
 msgstr "Geblockt"
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:459
 msgid "Only show blocked contacts"
 msgstr "Nur blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:463
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:466
 msgid "Only show ignored contacts"
 msgstr "Nur ignorierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:470
 msgid "Archived"
 msgstr "Archiviert"
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:473
 msgid "Only show archived contacts"
 msgstr "Nur archivierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:477
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:480
 msgid "Only show hidden contacts"
 msgstr "Nur verborgene Kontakte anzeigen"
 
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:528
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:532
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:536
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
+#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../mod/contacts.php:575
+#: ../../mod/contacts.php:578
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:576 ../../mod/directory.php:59
+#: ../../mod/contacts.php:579 ../../mod/directory.php:59
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:577 ../../mod/directory.php:61
+#: ../../mod/contacts.php:580 ../../mod/directory.php:61
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Finde"
@@ -2024,13 +2083,13 @@ msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
-#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
+#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2044,7 +2103,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:936
+#: ../../mod/lostpass.php:83 ../../boot.php:940
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -2088,43 +2147,6 @@ msgstr "Spitzname oder E-Mail:"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
-msgstr "Connector-Einstellungen"
-
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr "Plugin-Einstellungen"
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr "Verbundene Programme"
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr "Persönliche Daten exportieren"
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr "Konto löschen"
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
-#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
@@ -2735,7 +2757,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1708
+#: ../../mod/notes.php:44 ../../boot.php:1718
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2753,6 +2775,31 @@ msgstr "Persönliche Notizen"
 msgid "Save"
 msgstr "Speichern"
 
+#: ../../mod/uimport.php:41
+msgid "Import"
+msgstr "Import"
+
+#: ../../mod/uimport.php:43
+msgid "Move account"
+msgstr "Account umziehen"
+
+#: ../../mod/uimport.php:44
+msgid ""
+"You can move here an account from another Friendica server. <br>\r\n"
+"                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n"
+"                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
+msgstr "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>"
+
+#: ../../mod/uimport.php:47
+msgid "Account file"
+msgstr "Account Datei"
+
+#: ../../mod/uimport.php:47
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -2867,7 +2914,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1684
+#: ../../boot.php:1694
 msgid "Profile"
 msgstr "Profil"
 
@@ -3094,91 +3141,91 @@ msgstr "Keine Kontakte."
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:189
+#: ../../mod/register.php:190
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:255
+#: ../../mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 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 "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
 msgid "Register"
 msgstr "Registrieren"
 
@@ -3226,7 +3273,7 @@ msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3780
+#: ../../mod/display.php:169 ../../include/items.php:3837
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -3235,7 +3282,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1691
+#: ../../include/nav.php:51 ../../boot.php:1701
 msgid "Photos"
 msgstr "Bilder"
 
@@ -4113,7 +4160,7 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:21 ../../boot.php:1085
+#: ../../mod/profile.php:21 ../../boot.php:1089
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -4514,23 +4561,23 @@ msgstr "Alter: "
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1203
+#: ../../mod/profiles.php:689 ../../boot.php:1207
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1204
+#: ../../mod/profiles.php:690 ../../boot.php:1208
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1214
+#: ../../mod/profiles.php:701 ../../boot.php:1218
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1217
+#: ../../mod/profiles.php:703 ../../boot.php:1221
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1218
+#: ../../mod/profiles.php:704 ../../boot.php:1222
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -4659,17 +4706,17 @@ msgid "Gender: "
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1239
+#: ../../boot.php:1243
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1242
+#: ../../boot.php:1246
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1244
+#: ../../boot.php:1248
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5539,7 +5586,7 @@ msgstr "Aktiviere Planeten Plugin"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../include/nav.php:64 ../../boot.php:927
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6148,7 +6195,7 @@ msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:710
+#: ../../include/enotify.php:28 ../../include/notifier.php:774
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8136,7 +8183,7 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:703
+#: ../../include/delivery.php:457 ../../include/notifier.php:767
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -8403,6 +8450,37 @@ msgstr "Eingebetteter Inhalt"
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account Datei"
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel."
+
+#: ../../include/uimport.php:92
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
+
+#: ../../include/uimport.php:110
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzerkontos"
+
+#: ../../include/uimport.php:155
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: ../../include/uimport.php:233
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8434,7 +8512,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:922
+#: ../../include/nav.php:46 ../../boot.php:926
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -8442,7 +8520,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1677
+#: ../../include/nav.php:49 ../../boot.php:1687
 msgid "Status"
 msgstr "Status"
 
@@ -8522,11 +8600,11 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
@@ -8952,15 +9030,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/items.php:3981
+#: ../../include/items.php:4038
 msgid "Archives"
 msgstr "Archiv"
 
@@ -9050,37 +9128,37 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
-#: ../../include/Contact.php:111
+#: ../../include/Contact.php:115
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:795
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:789
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:790
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:791
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: ../../include/Contact.php:224 ../../include/Contact.php:237
+#: ../../include/Contact.php:229 ../../include/Contact.php:242
 #: ../../include/conversation.php:792
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: ../../include/Contact.php:225 ../../include/Contact.php:237
+#: ../../include/Contact.php:230 ../../include/Contact.php:242
 #: ../../include/conversation.php:793
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../include/Contact.php:226 ../../include/Contact.php:237
+#: ../../include/Contact.php:231 ../../include/Contact.php:242
 #: ../../include/conversation.php:794
 msgid "Send PM"
 msgstr "Private Nachricht senden"
@@ -9198,101 +9276,101 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
-#: ../../boot.php:584
+#: ../../boot.php:588
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:587
+#: ../../boot.php:591
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:794
+#: ../../boot.php:798
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:796
+#: ../../boot.php:800
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:897
+#: ../../boot.php:901
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:925
+#: ../../boot.php:929
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:926
+#: ../../boot.php:930
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:929
+#: ../../boot.php:933
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:935
+#: ../../boot.php:939
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1046
+#: ../../boot.php:1050
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1123
+#: ../../boot.php:1127
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1189
+#: ../../boot.php:1193
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1315 ../../boot.php:1401
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1312 ../../boot.php:1398
+#: ../../boot.php:1316 ../../boot.php:1402
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1357 ../../boot.php:1438
+#: ../../boot.php:1361 ../../boot.php:1442
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1373
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1370
+#: ../../boot.php:1374
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1435
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1449
+#: ../../boot.php:1453
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1450
+#: ../../boot.php:1454
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1680
+#: ../../boot.php:1690
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1687
+#: ../../boot.php:1697
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1714
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1721
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
 
diff --git a/view/de/strings.php b/view/de/strings.php
index 26ac10b0..c7ba7005 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -198,6 +198,18 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
+$a->strings["Account settings"] = "Kontoeinstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connector settings"] = "Connector-Einstellungen";
+$a->strings["Plugin settings"] = "Plugin-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Remove account"] = "Konto löschen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Export account"] = "Account exportieren";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen.";
+$a->strings["Export all"] = "Alles exportieren";
+$a->strings["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)"] = "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert).";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
 $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
 $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
@@ -241,7 +253,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
-$a->strings["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."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
+$a->strings["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."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
 $a->strings["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."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
 $a->strings["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."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
@@ -441,14 +453,6 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
 $a->strings["Reset"] = "Zurücksetzen";
-$a->strings["Account settings"] = "Kontoeinstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connector settings"] = "Connector-Einstellungen";
-$a->strings["Plugin settings"] = "Plugin-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Programme";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
-$a->strings["Remove account"] = "Konto löschen";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
@@ -599,6 +603,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Save"] = "Speichern";
+$a->strings["Import"] = "Import";
+$a->strings["Move account"] = "Account umziehen";
+$a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>";
+$a->strings["Account file"] = "Account Datei";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
 $a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
 $a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen.";
@@ -1794,6 +1803,16 @@ $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel.";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d Kontakt nicht importiert",
+	1 => "%d Kontakte nicht importiert",
+);
+$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden";
 $a->strings["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."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
 $a->strings["Everybody"] = "Alle Kontakte";
diff --git a/view/eo/strings.php b/view/eo/strings.php
index bc31c1a2..23dca759 100644
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
@@ -236,7 +236,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Eraro: La modulo OpenSSL en PHP estas bezonata sed ne instalita.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Eraro: La modulo mysqli en PHP estas bezonata sed ne instalita.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Eraro: La modulo mb_string en PHP estas bezonata sed ne instalita.";
-$a->strings["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."] = "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis.";
+$a->strings["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."] = "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis.";
 $a->strings["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."] = "Tio ĉi plej ofte estas agordo rilate al permesoj, ĉar la servilo eble ne povas skribi en via dosierujo, eĉ se vi mem povas skribi.";
 $a->strings["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."] = "Post la fino de tiu proceduro, ni donos al vi tekston por konservi en dosiero .htconfig.php en via baza Friendica dosierujo.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vi ankaŭ povas preterpasi tiun proceduron kaj fari permanan instaladon. Bonvolu legi la dosieron \"INSTALL.txt\" por trovi instrukciojn.";
diff --git a/view/es/strings.php b/view/es/strings.php
index d001a277..689989b0 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -242,7 +242,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
-$a->strings["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."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
+$a->strings["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."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
 $a->strings["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."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
 $a->strings["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."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 70059fa2..41d76a8c 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -242,7 +242,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Erreur: Le module PHP \"openssl\" est requis mais pas installé.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Erreur: Le module PHP \"mysqli\" est requis mais pas installé.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Erreur: le module PHP mb_string est requis mais pas installé.";
-$a->strings["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."] = "L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais il en est incapable.";
+$a->strings["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."] = "L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais il en est incapable.";
 $a->strings["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."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
 $a->strings["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."] = "A la fin de cette étape, nous vous fournirons un texte à sauvegarder dans un fichier nommé .htconfig.php à la racine de votre répertoire Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
diff --git a/view/head.tpl b/view/head.tpl
index f861060c..f5998703 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -8,6 +8,11 @@
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
 <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+
+<link rel="apple-touch-icon" href="$baseurl/images/friendica-128.png"/>
+<meta name="apple-mobile-web-app-capable" content="yes" /> 
+
+
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
diff --git a/view/is/strings.php b/view/is/strings.php
index 5af23236..b0dc1808 100644
--- a/view/is/strings.php
+++ b/view/is/strings.php
@@ -236,7 +236,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Villa: openssl PHP eining skilyrði og er ekki uppsett.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Villa: mysqli PHP eining er skilyrði og er ekki uppsett";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Villa: mb_string PHP eining skilyrði en ekki uppsett.";
-$a->strings["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."] = "Vef uppsetningar forrit þarf að geta stofnað skránna \".htconfig.php\" in efsta skráarsafninu á vefþjóninum og það getur ekki gert það.";
+$a->strings["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."] = "Vef uppsetningar forrit þarf að geta stofnað skránna \".htconfig.php\" in efsta skráarsafninu á vefþjóninum og það getur ekki gert það.";
 $a->strings["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."] = "Þetta er oftast aðgangsstýringa stilling, þar sem vefþjónninn getur ekki skrifað út skrár í skráarsafnið - þó þú getir það.";
 $a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
diff --git a/view/it/strings.php b/view/it/strings.php
index 70544ced..6c6c2281 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -242,7 +242,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto, ma non risulta installato.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto, ma non risulta installato";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto, ma non risulta installato.";
-$a->strings["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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
+$a->strings["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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
 $a->strings["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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server può non essere in grado di scrivere il file nella tua cartella, anche se tu puoi.";
 $a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
diff --git a/view/nb-no/strings.php b/view/nb-no/strings.php
index 8ac2b58f..2e02190d 100644
--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
@@ -1,6 +1,6 @@
 <?php
 
-function string_plural_select_nb_NO($n){
+function string_plural_select_nb_no($n){
 	return ($n != 1);;
 }
 ;
@@ -236,7 +236,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Feil: openssl PHP-modulen er påkrevet, men er ikke installert.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Feil: mysqli PHP-modulen er påkrevet, men er ikke installert.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Feil: mb_string PHP-modulen er påkrevet men ikke installert.";
-$a->strings["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."] = "Web-installatøren trenger å kunne lage filen \".htconfig.php\" i topp-folderen på web-tjeneren din, men den får ikke til dette.";
+$a->strings["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."] = "Web-installatøren trenger å kunne lage filen \".htconfig.php\" i topp-folderen på web-tjeneren din, men den får ikke til dette.";
 $a->strings["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."] = "Dette skyldes oftest manglende tillatelse, ettersom web-tjeneren kanskje ikke kan skrive filer i din mappe - selv om du kan.";
 $a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
diff --git a/view/pl/messages.po b/view/pl/messages.po
index ab0dd274..d2884fe1 100644
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
@@ -5,9 +5,11 @@
 # Translators:
 #   <a.jurkiewicz@abix.info.pl>, 2012.
 #   <braknazwy@autograf.pl>, 2012.
+#   <charizard@autograf.pl>, 2012.
 #   <czarnystokrotek@mailoo.org>, 2012.
 #   <d.exax@hotmail.com>, 2012.
 #   <hubertkoscianski@op.pl>, 2012.
+#   <jakub.hag96@gmail.com>, 2012.
 #   <jawiadomokto@o2.pl>, 2012.
 #   <johnnywiertara@gmail.com>, 2012.
 #   <karolinaa9506@gmail.com>, 2012.
@@ -21,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-05 10:00-0800\n"
-"PO-Revision-Date: 2012-11-07 19:36+0000\n"
-"Last-Translator: Lea1995polish <m.dauter@tlen.pl>\n"
+"POT-Creation-Date: 2012-11-11 10:00-0800\n"
+"PO-Revision-Date: 2012-11-13 08:34+0000\n"
+"Last-Translator: Pitruss <piotr.blonkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,12 +53,12 @@ msgstr "Nie udało się zaktualizować kontaktu."
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
@@ -66,15 +68,15 @@ msgstr "Nie udało się zaktualizować kontaktu."
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
-#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
+#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
 #: ../../mod/display.php:165 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
-#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
+#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
 #: ../../addon.old/dav/friendica/layout.fnk.php:354
@@ -141,13 +143,13 @@ msgstr "Adres Ankiety / RSS"
 
 #: ../../mod/crepair.php:156
 msgid "New photo from this URL"
-msgstr ""
+msgstr "Nowe zdjęcie z tej ścieżki"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1027
-#: ../../mod/photos.php:1103 ../../mod/photos.php:1366
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/install.php:246
+#: ../../mod/events.php:455 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
+#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
+#: ../../mod/photos.php:1523 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:351
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
@@ -245,20 +247,20 @@ msgstr ""
 msgid "Submit"
 msgstr "Potwierdź"
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:79
 msgid "Help:"
 msgstr "Pomoc:"
 
-#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../../mod/help.php:38 ../../index.php:228
+#: ../../mod/help.php:90 ../../index.php:218
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: ../../mod/help.php:41 ../../index.php:231
+#: ../../mod/help.php:93 ../../index.php:221
 msgid "Page not found."
 msgstr "Strona nie znaleziona."
 
@@ -301,7 +303,7 @@ msgid "link to source"
 msgstr "link do źródła"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1701
+#: ../../include/nav.php:52 ../../boot.php:1745
 msgid "Events"
 msgstr "Wydarzenia"
 
@@ -359,7 +361,7 @@ msgstr "Opis:"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1237
+#: ../../boot.php:1275
 msgid "Location:"
 msgstr "Lokalizacja"
 
@@ -374,7 +376,7 @@ msgstr "Udostępnij te wydarzenie"
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1001
+#: ../../include/conversation.php:1005
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Anuluj"
@@ -408,7 +410,7 @@ msgstr ""
 
 #: ../../mod/api.php:77
 msgid "Return to your app and insert this Securty Code:"
-msgstr ""
+msgstr "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:"
 
 #: ../../mod/api.php:89
 msgid "Please login to continue."
@@ -427,7 +429,7 @@ msgstr ""
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/settings.php:967 ../../mod/register.php:237
 #: ../../mod/profiles.php:574
 msgid "Yes"
 msgstr "Tak"
@@ -439,38 +441,38 @@ msgstr "Tak"
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/settings.php:967 ../../mod/register.php:238
 #: ../../mod/profiles.php:575
 msgid "No"
 msgstr "Nie"
 
-#: ../../mod/photos.php:50 ../../boot.php:1694
+#: ../../mod/photos.php:51 ../../boot.php:1738
 msgid "Photo Albums"
 msgstr "Albumy zdjęć"
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
-#: ../../mod/photos.php:1565 ../../mod/photos.php:1577
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
+#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
+#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:485
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Zdjęcia kontaktu"
 
-#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
+#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
 msgid "Upload New Photos"
 msgstr "Wyślij nowe zdjęcie"
 
-#: ../../mod/photos.php:78 ../../mod/settings.php:23
+#: ../../mod/photos.php:79 ../../mod/settings.php:23
 msgid "everybody"
 msgstr "wszyscy"
 
-#: ../../mod/photos.php:142
+#: ../../mod/photos.php:143
 msgid "Contact information unavailable"
 msgstr "Informacje o kontakcie nie dostępne."
 
-#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095
-#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1111 ../../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
@@ -481,221 +483,221 @@ msgstr "Informacje o kontakcie nie dostępne."
 msgid "Profile Photos"
 msgstr "Zdjęcia profilowe"
 
-#: ../../mod/photos.php:163
+#: ../../mod/photos.php:164
 msgid "Album not found."
 msgstr "Album nie znaleziony"
 
-#: ../../mod/photos.php:181 ../../mod/photos.php:1104
+#: ../../mod/photos.php:182 ../../mod/photos.php:1105
 msgid "Delete Album"
 msgstr "Usuń album"
 
-#: ../../mod/photos.php:244 ../../mod/photos.php:1367
+#: ../../mod/photos.php:245 ../../mod/photos.php:1368
 msgid "Delete Photo"
 msgstr "Usuń zdjęcie"
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "obrazek przekracza limit rozmiaru"
 
-#: ../../mod/photos.php:719
+#: ../../mod/photos.php:720
 msgid "Image file is empty."
 msgstr "Plik obrazka jest pusty."
 
-#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153
-#: ../../mod/wall_upload.php:110
+#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr "Przetwarzanie obrazu nie powiodło się."
 
-#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301
-#: ../../mod/wall_upload.php:136
+#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr "Przesyłanie obrazu nie powiodło się"
 
-#: ../../mod/photos.php:864 ../../mod/community.php:18
+#: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
 msgid "Public access denied."
 msgstr "Publiczny dostęp zabroniony"
 
-#: ../../mod/photos.php:874
+#: ../../mod/photos.php:875
 msgid "No photos selected"
 msgstr "Nie zaznaczono zdjęć"
 
-#: ../../mod/photos.php:975
+#: ../../mod/photos.php:976
 msgid "Access to this item is restricted."
 msgstr "Dostęp do tego obiektu jest ograniczony."
 
-#: ../../mod/photos.php:1037
+#: ../../mod/photos.php:1038
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1040
+#: ../../mod/photos.php:1041
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1047
 msgid "Upload Photos"
 msgstr "Prześlij zdjęcia"
 
-#: ../../mod/photos.php:1050 ../../mod/photos.php:1099
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
 msgid "New album name: "
 msgstr "Nazwa nowego albumu:"
 
-#: ../../mod/photos.php:1051
+#: ../../mod/photos.php:1052
 msgid "or existing album name: "
 msgstr "lub istniejąca nazwa albumu:"
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1053
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1054 ../../mod/photos.php:1362
+#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: ../../mod/photos.php:1114
+#: ../../mod/photos.php:1115
 msgid "Edit Album"
 msgstr "Edytuj album"
 
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1121
 msgid "Show Newest First"
 msgstr "Najpierw pokaż najnowsze"
 
-#: ../../mod/photos.php:1122
+#: ../../mod/photos.php:1123
 msgid "Show Oldest First"
 msgstr "Najpierw pokaż najstarsze"
 
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1598
+#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
 msgid "View Photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1181
+#: ../../mod/photos.php:1182
 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:1183
+#: ../../mod/photos.php:1184
 msgid "Photo not available"
 msgstr "Zdjęcie niedostępne"
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1240
 msgid "View photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1240
 msgid "Edit photo"
 msgstr "Edytuj zdjęcie"
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1241
 msgid "Use as profile photo"
 msgstr "Ustaw jako zdjęcie profilowe"
 
-#: ../../mod/photos.php:1246 ../../mod/content.php:603
+#: ../../mod/photos.php:1247 ../../mod/content.php:603
 #: ../../object/Item.php:103
 msgid "Private Message"
 msgstr "Wiadomość prywatna"
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1266
 msgid "View Full Size"
 msgstr "Zobacz w pełnym rozmiarze"
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1340
 msgid "Tags: "
 msgstr "Tagi:"
 
-#: ../../mod/photos.php:1342
+#: ../../mod/photos.php:1343
 msgid "[Remove any tag]"
 msgstr "[Usunąć znacznik]"
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1353
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1354
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1356
 msgid "New album name"
 msgstr "Nazwa nowego albumu"
 
-#: ../../mod/photos.php:1358
+#: ../../mod/photos.php:1359
 msgid "Caption"
 msgstr "Zawartość"
 
-#: ../../mod/photos.php:1360
+#: ../../mod/photos.php:1361
 msgid "Add a Tag"
 msgstr "Dodaj tag"
 
-#: ../../mod/photos.php:1364
+#: ../../mod/photos.php:1365
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1384 ../../mod/content.php:667
+#: ../../mod/photos.php:1385 ../../mod/content.php:667
 #: ../../object/Item.php:196
 msgid "I like this (toggle)"
 msgstr "Lubię to (zmień)"
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:668
+#: ../../mod/photos.php:1386 ../../mod/content.php:668
 #: ../../object/Item.php:197
 msgid "I don't like this (toggle)"
 msgstr "Nie lubię (zmień)"
 
-#: ../../mod/photos.php:1386 ../../include/conversation.php:962
+#: ../../mod/photos.php:1387 ../../include/conversation.php:966
 msgid "Share"
 msgstr "Podziel się"
 
-#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
+#: ../../mod/photos.php:1388 ../../mod/editpost.php:118
 #: ../../mod/content.php:482 ../../mod/content.php:846
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
 #: ../../mod/message.php:481 ../../include/conversation.php:624
-#: ../../include/conversation.php:981 ../../object/Item.php:258
+#: ../../include/conversation.php:985 ../../object/Item.php:258
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/content.php:690
+#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1520 ../../mod/content.php:690
 #: ../../object/Item.php:556
 msgid "This is you"
 msgstr "To jesteś ty"
 
-#: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585
+#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
+#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605
 #: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:999
+#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
+#: ../../mod/photos.php:1524 ../../mod/editpost.php:139
+#: ../../mod/content.php:702 ../../include/conversation.php:1003
 #: ../../object/Item.php:568
 msgid "Preview"
 msgstr "Podgląd"
 
-#: ../../mod/photos.php:1491 ../../mod/content.php:439
+#: ../../mod/photos.php:1492 ../../mod/content.php:439
 #: ../../mod/content.php:724 ../../mod/settings.php:606
 #: ../../mod/group.php:168 ../../mod/admin.php:696
 #: ../../include/conversation.php:569 ../../object/Item.php:117
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../../mod/photos.php:1604
+#: ../../mod/photos.php:1605
 msgid "View Album"
 msgstr "Zobacz album"
 
-#: ../../mod/photos.php:1613
+#: ../../mod/photos.php:1614
 msgid "Recent Photos"
 msgstr "Ostatnio dodane zdjęcia"
 
@@ -715,7 +717,7 @@ msgstr "Brak wyników."
 
 #: ../../mod/friendica.php:55
 msgid "This is Friendica, version"
-msgstr ""
+msgstr "To jest Friendica, wersja"
 
 #: ../../mod/friendica.php:56
 msgid "running at web location"
@@ -725,7 +727,7 @@ msgstr ""
 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
-msgstr ""
+msgstr "Odwiedź <a href=\"http://friendica.com\">Friendica.com</a>, aby dowiedzieć się więcej o projekcie Friendica."
 
 #: ../../mod/friendica.php:60
 msgid "Bug reports and issues: please visit"
@@ -753,7 +755,7 @@ msgstr "Artykuł nie znaleziony"
 msgid "Edit post"
 msgstr "Edytuj post"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:948
+#: ../../mod/editpost.php:88 ../../include/conversation.php:952
 msgid "Post to Email"
 msgstr "Wyślij poprzez email"
 
@@ -764,85 +766,85 @@ msgstr "Edytuj"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:963
+#: ../../include/conversation.php:967
 msgid "Upload photo"
 msgstr "Wyślij zdjęcie"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:964
+#: ../../mod/editpost.php:105 ../../include/conversation.php:968
 msgid "upload photo"
 msgstr "dodaj zdjęcie"
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:965
+#: ../../mod/editpost.php:106 ../../include/conversation.php:969
 msgid "Attach file"
 msgstr "Przyłącz plik"
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:966
+#: ../../mod/editpost.php:107 ../../include/conversation.php:970
 msgid "attach file"
 msgstr "załącz plik"
 
 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:971
 msgid "Insert web link"
 msgstr "Wstaw link"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:968
+#: ../../mod/editpost.php:109 ../../include/conversation.php:972
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:969
+#: ../../mod/editpost.php:110 ../../include/conversation.php:973
 msgid "Insert video link"
 msgstr "Wstaw link wideo"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:970
+#: ../../mod/editpost.php:111 ../../include/conversation.php:974
 msgid "video link"
 msgstr "link do filmu"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:971
+#: ../../mod/editpost.php:112 ../../include/conversation.php:975
 msgid "Insert audio link"
 msgstr "Wstaw link audio"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:972
+#: ../../mod/editpost.php:113 ../../include/conversation.php:976
 msgid "audio link"
 msgstr "Link audio"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:973
+#: ../../mod/editpost.php:114 ../../include/conversation.php:977
 msgid "Set your location"
 msgstr "Ustaw swoje położenie"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:974
+#: ../../mod/editpost.php:115 ../../include/conversation.php:978
 msgid "set location"
 msgstr "wybierz lokalizację"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:975
+#: ../../mod/editpost.php:116 ../../include/conversation.php:979
 msgid "Clear browser location"
 msgstr "Wyczyść położenie przeglądarki"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "clear location"
 msgstr "wyczyść lokalizację"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:986
 msgid "Permission settings"
 msgstr "Ustawienia uprawnień"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:991
+#: ../../mod/editpost.php:127 ../../include/conversation.php:995
 msgid "CC: email addresses"
 msgstr "CC: adresy e-mail"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:992
+#: ../../mod/editpost.php:128 ../../include/conversation.php:996
 msgid "Public post"
 msgstr "Publiczny post"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:978
+#: ../../mod/editpost.php:131 ../../include/conversation.php:982
 msgid "Set title"
 msgstr "Ustaw tytuł"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:980
+#: ../../mod/editpost.php:133 ../../include/conversation.php:984
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:994
+#: ../../mod/editpost.php:134 ../../include/conversation.php:998
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Przykład: bob@example.com, mary@example.com"
 
@@ -964,7 +966,7 @@ msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
 msgid "[Name Withheld]"
 msgstr "[Nazwa wstrzymana]"
 
@@ -1036,6 +1038,64 @@ msgstr "Twój zidentyfikowany adres:"
 msgid "Submit Request"
 msgstr "Wyślij zgłoszenie"
 
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Ustawienia konta"
+
+#: ../../mod/uexport.php:14 ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Wyświetl ustawienia"
+
+#: ../../mod/uexport.php:20 ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr ""
+
+#: ../../mod/uexport.php:25 ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Ustawienia wtyczek"
+
+#: ../../mod/uexport.php:30 ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Eksportuje dane personalne"
+
+#: ../../mod/uexport.php:40 ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Usuń konto"
+
+#: ../../mod/uexport.php:48 ../../mod/settings.php:69
+#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: ../../mod/uexport.php:72
+msgid "Export account"
+msgstr ""
+
+#: ../../mod/uexport.php:72
+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:73
+msgid "Export all"
+msgstr ""
+
+#: ../../mod/uexport.php:73
+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/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""
@@ -1046,7 +1106,7 @@ msgstr "Nie można nawiązać połączenia z bazą danych"
 
 #: ../../mod/install.php:127
 msgid "Could not create table."
-msgstr ""
+msgstr "Nie mogę stworzyć tabeli."
 
 #: ../../mod/install.php:133
 msgid "Your Friendica site database has been installed."
@@ -1065,7 +1125,7 @@ msgstr "Proszę przejrzeć plik \"INSTALL.txt\"."
 
 #: ../../mod/install.php:201
 msgid "System check"
-msgstr ""
+msgstr "Sprawdzanie systemu"
 
 #: ../../mod/install.php:206
 msgid "Check again"
@@ -1073,13 +1133,13 @@ msgstr "Sprawdź ponownie"
 
 #: ../../mod/install.php:225
 msgid "Database connection"
-msgstr ""
+msgstr "Połączenie z bazą danych"
 
 #: ../../mod/install.php:226
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
-msgstr ""
+msgstr "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych."
 
 #: ../../mod/install.php:227
 msgid ""
@@ -1111,7 +1171,7 @@ msgstr "Baza danych - Nazwa"
 
 #: ../../mod/install.php:236 ../../mod/install.php:275
 msgid "Site administrator email address"
-msgstr ""
+msgstr "Adres e-mail administratora strony"
 
 #: ../../mod/install.php:236 ../../mod/install.php:275
 msgid ""
@@ -1357,7 +1417,7 @@ msgid "is interested in:"
 msgstr "interesuje się:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1175
+#: ../../include/contact_widgets.php:9 ../../boot.php:1213
 msgid "Connect"
 msgstr "Połącz"
 
@@ -1406,7 +1466,7 @@ msgstr "%s od %s"
 
 #: ../../mod/content.php:480 ../../include/conversation.php:622
 msgid "View in context"
-msgstr ""
+msgstr "Zobacz w kontekście"
 
 #: ../../mod/content.php:586 ../../object/Item.php:277
 #, php-format
@@ -1426,7 +1486,7 @@ msgstr[2] "komentarz"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:586
+#: ../../include/contact_widgets.php:195 ../../boot.php:606
 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -1490,7 +1550,7 @@ msgstr "anuluj gwiazdkę"
 
 #: ../../mod/content.php:738 ../../object/Item.php:182
 msgid "toggle star status"
-msgstr ""
+msgstr "włącz status gwiazdy"
 
 #: ../../mod/content.php:741 ../../object/Item.php:185
 msgid "starred"
@@ -1547,7 +1607,7 @@ msgstr "Sieć"
 
 #: ../../mod/notifications.php:88 ../../mod/network.php:407
 msgid "Personal"
-msgstr ""
+msgstr "Osobiste"
 
 #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
 #: ../../include/nav.php:77 ../../include/nav.php:115
@@ -1677,7 +1737,7 @@ msgstr "%s skomentował wpis %s"
 
 #: ../../mod/notifications.php:301
 msgid "No more network notifications."
-msgstr ""
+msgstr "Nie ma więcej powiadomień sieciowych"
 
 #: ../../mod/notifications.php:305
 msgid "Network Notifications"
@@ -1693,7 +1753,7 @@ msgstr ""
 
 #: ../../mod/notifications.php:426
 msgid "No more personal notifications."
-msgstr ""
+msgstr "Nie ma więcej powiadomień osobistych"
 
 #: ../../mod/notifications.php:430
 msgid "Personal Notifications"
@@ -1701,7 +1761,7 @@ msgstr ""
 
 #: ../../mod/notifications.php:507
 msgid "No more home notifications."
-msgstr ""
+msgstr "Nie ma więcej powiadomień domu"
 
 #: ../../mod/notifications.php:511
 msgid "Home Notifications"
@@ -1755,12 +1815,12 @@ msgstr "Jesteś już znajomym z %s"
 #: ../../mod/contacts.php:270
 #, php-format
 msgid "You are sharing with %s"
-msgstr ""
+msgstr "Współdzielisz z %s"
 
 #: ../../mod/contacts.php:275
 #, php-format
 msgid "%s is sharing with you"
-msgstr ""
+msgstr "%s współdzieli z tobą"
 
 #: ../../mod/contacts.php:292
 msgid "Private communications are not available for this contact."
@@ -1866,7 +1926,7 @@ msgstr "Informacja o kontakcie / Notka"
 
 #: ../../mod/contacts.php:355
 msgid "Edit contact notes"
-msgstr ""
+msgstr "Edytuj notatki kontaktu"
 
 #: ../../mod/contacts.php:360 ../../mod/contacts.php:552
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
@@ -2027,13 +2087,13 @@ msgid "Password reset requested at %s"
 msgstr "Prośba o reset hasła na %s"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
-#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
+#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2047,7 +2107,7 @@ msgid ""
 "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:83 ../../boot.php:936
+#: ../../mod/lostpass.php:83 ../../boot.php:960
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
@@ -2091,43 +2151,6 @@ msgstr "Pseudonim lub Email:"
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Ustawienia konta"
-
-#: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr "Wyświetl ustawienia"
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr "Ustawienia wtyczek"
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr ""
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr "Eksportuje dane personalne"
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr "Usuń konto"
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
-#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr "Brakuje ważnych danych!"
@@ -2138,11 +2161,11 @@ msgstr "Zaktualizuj"
 
 #: ../../mod/settings.php:221
 msgid "Failed to connect with email account using the settings provided."
-msgstr ""
+msgstr "Połączenie z kontem email używając wybranych ustawień nie powiodło się."
 
 #: ../../mod/settings.php:226
 msgid "Email settings updated."
-msgstr ""
+msgstr "Zaktualizowano ustawienia email."
 
 #: ../../mod/settings.php:290
 msgid "Passwords do not match. Password unchanged."
@@ -2209,13 +2232,13 @@ msgstr "Dodaj aplikacje"
 #: ../../addon/statusnet/statusnet.php:570
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
-msgstr ""
+msgstr "Klucz konsumenta"
 
 #: ../../mod/settings.php:547 ../../mod/settings.php:573
 #: ../../addon/statusnet/statusnet.php:569
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
-msgstr ""
+msgstr "Sekret konsumenta"
 
 #: ../../mod/settings.php:548 ../../mod/settings.php:574
 msgid "Redirect"
@@ -2223,7 +2246,7 @@ msgstr "Przekierowanie"
 
 #: ../../mod/settings.php:549 ../../mod/settings.php:575
 msgid "Icon url"
-msgstr ""
+msgstr "Adres ikony"
 
 #: ../../mod/settings.php:560
 msgid "You can't edit this application."
@@ -2329,7 +2352,7 @@ msgstr "Wyślij publiczny post do wszystkich kontaktów e-mail"
 
 #: ../../mod/settings.php:695
 msgid "Action after import:"
-msgstr ""
+msgstr "Akcja po zaimportowaniu:"
 
 #: ../../mod/settings.php:695
 msgid "Mark as seen"
@@ -2422,7 +2445,7 @@ msgstr ""
 
 #: ../../mod/settings.php:882
 msgid "OpenID:"
-msgstr ""
+msgstr "OpenID:"
 
 #: ../../mod/settings.php:882
 msgid "(Optional) Allow this OpenID to login to this account."
@@ -2434,7 +2457,7 @@ msgstr ""
 
 #: ../../mod/settings.php:898
 msgid "Publish your default profile in the global social directory?"
-msgstr ""
+msgstr "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?"
 
 #: ../../mod/settings.php:906
 msgid "Hide your contact/friend list from viewers of your default profile?"
@@ -2626,7 +2649,7 @@ msgstr "Otrzymane propozycje znajomych"
 
 #: ../../mod/settings.php:1032
 msgid "You are tagged in a post"
-msgstr ""
+msgstr "Jesteś oznaczony w poście"
 
 #: ../../mod/settings.php:1033
 msgid "You are poked/prodded/etc. in a post"
@@ -2739,7 +2762,7 @@ msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
 msgid "Invalid contact."
 msgstr "Zły kontakt"
 
-#: ../../mod/notes.php:44 ../../boot.php:1708
+#: ../../mod/notes.php:44 ../../boot.php:1752
 msgid "Personal Notes"
 msgstr "Osobiste notatki"
 
@@ -2757,6 +2780,31 @@ msgstr "Osobiste notatki"
 msgid "Save"
 msgstr "Zapisz"
 
+#: ../../mod/uimport.php:41
+msgid "Import"
+msgstr ""
+
+#: ../../mod/uimport.php:43
+msgid "Move account"
+msgstr ""
+
+#: ../../mod/uimport.php:44
+msgid ""
+"You can import an account from another Friendica server. <br>\r\n"
+"                            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.<br>\r\n"
+"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+msgstr ""
+
+#: ../../mod/uimport.php:47
+msgid "Account file"
+msgstr ""
+
+#: ../../mod/uimport.php:47
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr ""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -2788,7 +2836,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:898 ../../include/conversation.php:916
+#: ../../include/conversation.php:902 ../../include/conversation.php:920
 msgid "Please enter a link URL:"
 msgstr "Proszę wpisać adres URL:"
 
@@ -2871,7 +2919,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1684
+#: ../../boot.php:1728
 msgid "Profile"
 msgstr "Profil"
 
@@ -3042,7 +3090,7 @@ msgstr "Nie znaleziono grupy"
 msgid "Group name changed."
 msgstr "Nazwa grupy zmieniona"
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
@@ -3098,91 +3146,91 @@ msgstr "brak kontaktów"
 msgid "View Contacts"
 msgstr "widok kontaktów"
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Szczegóły rejestracji dla %s"
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 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:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
-msgstr ""
+msgstr "Nie udało się wysłać wiadomości e-mail. Wysyłanie nie powiodło się."
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr "Twoja rejestracja nie może zostać przeprowadzona. "
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr "Prośba o rejestrację u %s"
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."
 
-#: ../../mod/register.php:189
+#: ../../mod/register.php:190
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
-msgstr ""
+msgstr "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 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:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr "Twój OpenID (opcjonalnie):"
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Czy dołączyć twój profil do katalogu członków?"
 
-#: ../../mod/register.php:255
+#: ../../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:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
-msgstr ""
+msgstr "Twoje zaproszenia ID:"
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Imię i nazwisko (np. Jan Kowalski):"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Twój adres email:"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 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:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr "Wybierz pseudonim:"
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920
 msgid "Register"
 msgstr "Zarejestruj"
 
@@ -3230,7 +3278,7 @@ msgstr "%1$s nie lubi %2$s's %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3780
+#: ../../mod/display.php:169 ../../include/items.php:3837
 msgid "Item not found."
 msgstr "Element nie znaleziony."
 
@@ -3239,7 +3287,7 @@ msgid "Access denied."
 msgstr "Brak dostępu"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1691
+#: ../../include/nav.php:51 ../../boot.php:1735
 msgid "Photos"
 msgstr "Zdjęcia"
 
@@ -3268,8 +3316,8 @@ msgstr "Nie można zlokalizować oryginalnej wiadomości."
 msgid "Empty post discarded."
 msgstr "Pusty wpis wyrzucony."
 
-#: ../../mod/item.php:420 ../../mod/wall_upload.php:133
-#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
+#: ../../mod/item.php:420 ../../mod/wall_upload.php:135
+#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "Tablica zdjęć"
@@ -3334,7 +3382,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr "Nie udało się przetworzyć obrazu."
 
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Rozmiar obrazka przekracza limit %d"
@@ -3499,7 +3547,7 @@ msgstr ""
 
 #: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
 msgid "Logs"
-msgstr ""
+msgstr "Logi"
 
 #: ../../mod/admin.php:120 ../../include/nav.php:146
 msgid "Admin"
@@ -3511,7 +3559,7 @@ msgstr "Polecane wtyczki"
 
 #: ../../mod/admin.php:123
 msgid "User registrations waiting for confirmation"
-msgstr ""
+msgstr "Rejestracje użytkownika czekają na potwierdzenie."
 
 #: ../../mod/admin.php:183 ../../mod/admin.php:669
 msgid "Normal Account"
@@ -3557,7 +3605,7 @@ msgstr "Zarejestrowani użytkownicy"
 
 #: ../../mod/admin.php:217
 msgid "Pending registrations"
-msgstr ""
+msgstr "Rejestracje w toku."
 
 #: ../../mod/admin.php:218
 msgid "Version"
@@ -3565,7 +3613,7 @@ msgstr "Wersja"
 
 #: ../../mod/admin.php:220
 msgid "Active plugins"
-msgstr ""
+msgstr "Aktywne pluginy"
 
 #: ../../mod/admin.php:373
 msgid "Site settings updated."
@@ -3573,11 +3621,11 @@ msgstr "Ustawienia strony zaktualizowane"
 
 #: ../../mod/admin.php:428
 msgid "Closed"
-msgstr ""
+msgstr "Zamknięty"
 
 #: ../../mod/admin.php:429
 msgid "Requires approval"
-msgstr ""
+msgstr "Wymagane zatwierdzenie."
 
 #: ../../mod/admin.php:430
 msgid "Open"
@@ -3622,7 +3670,7 @@ msgstr "Język systemu"
 
 #: ../../mod/admin.php:454
 msgid "System theme"
-msgstr ""
+msgstr "Motyw systemowy"
 
 #: ../../mod/admin.php:454
 msgid ""
@@ -3678,11 +3726,11 @@ msgstr ""
 
 #: ../../mod/admin.php:461
 msgid "Register policy"
-msgstr ""
+msgstr "Zarejestruj polisę"
 
 #: ../../mod/admin.php:462
 msgid "Register text"
-msgstr ""
+msgstr "Zarejestruj tekst"
 
 #: ../../mod/admin.php:462
 msgid "Will be displayed prominently on the registration page."
@@ -3700,7 +3748,7 @@ msgstr ""
 
 #: ../../mod/admin.php:464
 msgid "Allowed friend domains"
-msgstr ""
+msgstr "Dozwolone domeny przyjaciół"
 
 #: ../../mod/admin.php:464
 msgid ""
@@ -3710,7 +3758,7 @@ msgstr ""
 
 #: ../../mod/admin.php:465
 msgid "Allowed email domains"
-msgstr ""
+msgstr "Dozwolone domeny e-mailowe"
 
 #: ../../mod/admin.php:465
 msgid ""
@@ -3721,7 +3769,7 @@ msgstr ""
 
 #: ../../mod/admin.php:466
 msgid "Block public"
-msgstr ""
+msgstr "Blokuj publicznie"
 
 #: ../../mod/admin.php:466
 msgid ""
@@ -3731,7 +3779,7 @@ msgstr ""
 
 #: ../../mod/admin.php:467
 msgid "Force publish"
-msgstr ""
+msgstr "Wymuś publikację"
 
 #: ../../mod/admin.php:467
 msgid ""
@@ -3776,7 +3824,7 @@ msgstr ""
 
 #: ../../mod/admin.php:473
 msgid "OpenID support"
-msgstr ""
+msgstr "Wsparcie OpenID"
 
 #: ../../mod/admin.php:473
 msgid "OpenID support for registration and logins."
@@ -3840,7 +3888,7 @@ msgstr ""
 
 #: ../../mod/admin.php:480
 msgid "Verify SSL"
-msgstr ""
+msgstr "Weryfikacja SSL"
 
 #: ../../mod/admin.php:480
 msgid ""
@@ -4048,7 +4096,7 @@ msgstr "Zezwól"
 
 #: ../../mod/admin.php:784 ../../mod/admin.php:989
 msgid "Toggle"
-msgstr ""
+msgstr "Włącz"
 
 #: ../../mod/admin.php:792 ../../mod/admin.php:999
 msgid "Author: "
@@ -4080,7 +4128,7 @@ msgstr ""
 
 #: ../../mod/admin.php:1113
 msgid "Clear"
-msgstr ""
+msgstr "Wyczyść"
 
 #: ../../mod/admin.php:1119
 msgid "Debugging"
@@ -4106,21 +4154,21 @@ msgstr "Zamknij"
 
 #: ../../mod/admin.php:1177
 msgid "FTP Host"
-msgstr ""
+msgstr "Założyciel FTP"
 
 #: ../../mod/admin.php:1178
 msgid "FTP Path"
-msgstr ""
+msgstr "Ścieżka FTP"
 
 #: ../../mod/admin.php:1179
 msgid "FTP User"
-msgstr ""
+msgstr "Użytkownik FTP"
 
 #: ../../mod/admin.php:1180
 msgid "FTP Password"
 msgstr "FTP Hasło"
 
-#: ../../mod/profile.php:21 ../../boot.php:1085
+#: ../../mod/profile.php:21 ../../boot.php:1123
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny"
 
@@ -4190,8 +4238,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:98
-#: ../../include/auth.php:161
+#: ../../mod/openid.php:93 ../../include/auth.php:110
+#: ../../include/auth.php:173
 msgid "Login failed."
 msgstr "Niepowodzenie logowania"
 
@@ -4521,28 +4569,28 @@ msgstr "Wiek: "
 msgid "Edit/Manage Profiles"
 msgstr "Edytuj/Zarządzaj Profilami"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1203
+#: ../../mod/profiles.php:689 ../../boot.php:1241
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1204
+#: ../../mod/profiles.php:690 ../../boot.php:1242
 msgid "Create New Profile"
 msgstr "Stwórz nowy profil"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1214
+#: ../../mod/profiles.php:701 ../../boot.php:1252
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1217
+#: ../../mod/profiles.php:703 ../../boot.php:1255
 msgid "visible to everybody"
 msgstr "widoczne dla wszystkich"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1218
+#: ../../mod/profiles.php:704 ../../boot.php:1256
 msgid "Edit visibility"
 msgstr "Edytuj widoczność"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:902
-#: ../../include/conversation.php:920
+#: ../../mod/filer.php:29 ../../include/conversation.php:906
+#: ../../include/conversation.php:924
 msgid "Save to Folder:"
 msgstr "Zapisz w folderze:"
 
@@ -4666,17 +4714,17 @@ msgid "Gender: "
 msgstr "Płeć: "
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1239
+#: ../../boot.php:1277
 msgid "Gender:"
 msgstr "Płeć:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1242
+#: ../../boot.php:1280
 msgid "Status:"
 msgstr "Status"
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1244
+#: ../../boot.php:1282
 msgid "Homepage:"
 msgstr "Strona główna:"
 
@@ -4794,7 +4842,7 @@ msgstr "Potwierdzenie ukończone poprawnie"
 #: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
 #: ../../mod/dfrn_confirm.php:277
 msgid "Remote site reported: "
-msgstr ""
+msgstr "Zdalna strona zgłoszona:"
 
 #: ../../mod/dfrn_confirm.php:268
 msgid "Temporary failure. Please wait and try again."
@@ -4802,7 +4850,7 @@ msgstr "Tymczasowo uszkodzone. Proszę poczekać i spróbować później."
 
 #: ../../mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
-msgstr ""
+msgstr "Nieudane lub unieważnione wprowadzenie."
 
 #: ../../mod/dfrn_confirm.php:420
 msgid "Unable to set contact photo."
@@ -4821,7 +4869,7 @@ msgstr "Nie znaleziono użytkownika dla '%s'"
 
 #: ../../mod/dfrn_confirm.php:572
 msgid "Our site encryption key is apparently messed up."
-msgstr ""
+msgstr "Klucz kodujący jest najwyraźniej zepsuty"
 
 #: ../../mod/dfrn_confirm.php:583
 msgid "Empty site URL was provided or URL could not be decrypted by us."
@@ -4844,11 +4892,11 @@ msgstr ""
 
 #: ../../mod/dfrn_confirm.php:649
 msgid "Unable to set your contact credentials on our system."
-msgstr ""
+msgstr "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie"
 
 #: ../../mod/dfrn_confirm.php:716
 msgid "Unable to update your contact profile details on our system"
-msgstr ""
+msgstr "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie"
 
 #: ../../mod/dfrn_confirm.php:750
 #, php-format
@@ -4894,7 +4942,7 @@ msgstr "Aktualizacja kontaktów"
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
-msgstr ""
+msgstr "Brakuje klucza API z facebooka."
 
 #: ../../addon/facebook/facebook.php:558
 #: ../../addon.old/facebook/facebook.php:558
@@ -4992,7 +5040,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:700
 #: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
-msgstr ""
+msgstr "Problemy z aktualizacjami w czasie rzeczywistym Facebook'a"
 
 #: ../../addon/facebook/facebook.php:729
 #: ../../addon.old/facebook/facebook.php:729
@@ -5061,27 +5109,27 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:773
 #: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
-msgstr ""
+msgstr "Aktualizacje w czasie rzeczywistym"
 
 #: ../../addon/facebook/facebook.php:777
 #: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
-msgstr ""
+msgstr "Aktualizacje w czasie rzeczywistym zostały aktywowane."
 
 #: ../../addon/facebook/facebook.php:778
 #: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
-msgstr ""
+msgstr "Zdezaktywuj aktualizacje w czasie rzeczywistym"
 
 #: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
-msgstr ""
+msgstr "Aktualizacje w czasie rzeczywistym nie zostały aktywowane."
 
 #: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
-msgstr ""
+msgstr "Aktywuj aktualizacje w czasie rzeczywistym"
 
 #: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
 #: ../../addon/dav/friendica/layout.fnk.php:361
@@ -5440,7 +5488,7 @@ msgstr "Hasło:"
 
 #: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72
 msgid "Use SSL "
-msgstr ""
+msgstr "Użyj SSL"
 
 #: ../../addon/yourls/yourls.php:92 ../../addon.old/yourls/yourls.php:92
 msgid "yourls Settings saved."
@@ -5498,18 +5546,18 @@ msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
-msgstr ""
+msgstr "NSFW Ustawienia zapisane."
 
 #: ../../addon/nsfw/nsfw.php:157 ../../addon.old/nsfw/nsfw.php:157
 #, php-format
 msgid "%s - Click to open/close"
-msgstr ""
+msgstr "%s - kliknij by otworzyć/zamknąć"
 
 #: ../../addon/page/page.php:62 ../../addon/page/page.php:92
 #: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60
 msgid "Forums"
-msgstr ""
+msgstr "Fora"
 
 #: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94
 #: ../../addon.old/page/page.php:130
@@ -5549,7 +5597,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../include/nav.php:64 ../../boot.php:946
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5562,7 +5610,7 @@ msgstr "Login"
 #: ../../addon.old/communityhome/communityhome.php:29
 #: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #: ../../addon/communityhome/communityhome.php:38
 #: ../../addon/communityhome/twillingham/communityhome.php:38
@@ -6158,7 +6206,7 @@ msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:724
+#: ../../include/enotify.php:28 ../../include/notifier.php:774
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6320,11 +6368,11 @@ msgstr "Data dołączenia:"
 
 #: ../../addon/tictac/tictac.php:20 ../../addon.old/tictac/tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
+msgstr "Trójwymiarowy Kółko i krzyżyk"
 
 #: ../../addon/tictac/tictac.php:53 ../../addon.old/tictac/tictac.php:53
 msgid "3D Tic-Tac-Toe"
-msgstr ""
+msgstr "Kółko i krzyżyk 3D"
 
 #: ../../addon/tictac/tictac.php:58 ../../addon.old/tictac/tictac.php:58
 msgid "New game"
@@ -6338,13 +6386,13 @@ msgstr "Nowa gra z utrudnieniem"
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
-msgstr ""
+msgstr "Trójwymiarowy tic-tac-toe jest taki sam jak tradycyjna gra, nie licząc tego, że jest grana na kilku poziomach jednocześnie."
 
 #: ../../addon/tictac/tictac.php:61 ../../addon.old/tictac/tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
-msgstr ""
+msgstr "W tym przypadku są trzy poziomy. Wygrywasz poprzez zdobycie trójki w szeregu na którymkolwiek z poziomów zarówno u góry, na dole, jak i na ukos poprzez kilka różnych poziomów."
 
 #: ../../addon/tictac/tictac.php:63 ../../addon.old/tictac/tictac.php:63
 msgid ""
@@ -6652,7 +6700,7 @@ msgstr ""
 
 #: ../../addon/buglink/buglink.php:15 ../../addon.old/buglink/buglink.php:15
 msgid "Report Bug"
-msgstr ""
+msgstr "Zgłoś problem"
 
 #: ../../addon/notimeline/notimeline.php:32
 #: ../../addon.old/notimeline/notimeline.php:32
@@ -7082,7 +7130,7 @@ msgstr "Podgląd źródła"
 #: ../../addon/statusnet/statusnet.php:134
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
-msgstr ""
+msgstr "Wyślij do sieci StatusNet"
 
 #: ../../addon/statusnet/statusnet.php:176
 #: ../../addon.old/statusnet/statusnet.php:176
@@ -7292,7 +7340,7 @@ msgstr ""
 
 #: ../../addon/gnot/gnot.php:82 ../../addon.old/gnot/gnot.php:82
 msgid "Enable this plugin/addon?"
-msgstr ""
+msgstr "Umożliwić tego plugina/wtyczkę?"
 
 #: ../../addon/gnot/gnot.php:97 ../../addon.old/gnot/gnot.php:97
 #, php-format
@@ -7405,7 +7453,7 @@ msgstr "Post na Twitter"
 
 #: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
-msgstr ""
+msgstr "Zaktualizowano ustawienia Twittera."
 
 #: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
@@ -7815,7 +7863,7 @@ msgstr "Hobby/Zainteresowania:"
 
 #: ../../include/profile_advanced.php:67
 msgid "Contact information and Social Networks:"
-msgstr ""
+msgstr "Informacje kontaktowe i sieci społeczne"
 
 #: ../../include/profile_advanced.php:69
 msgid "Musical interests:"
@@ -7831,7 +7879,7 @@ msgstr "Telewizja:"
 
 #: ../../include/profile_advanced.php:75
 msgid "Film/dance/culture/entertainment:"
-msgstr ""
+msgstr "Film/taniec/kultura/rozrywka"
 
 #: ../../include/profile_advanced.php:77
 msgid "Love/Romance:"
@@ -8146,7 +8194,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr "Wykończenia:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:717
+#: ../../include/delivery.php:457 ../../include/notifier.php:767
 msgid "(no subject)"
 msgstr "(bez tematu)"
 
@@ -8376,11 +8424,11 @@ msgstr "Kliknij aby otworzyć/zamknąć"
 
 #: ../../include/text.php:1217 ../../include/user.php:236
 msgid "default"
-msgstr ""
+msgstr "standardowe"
 
 #: ../../include/text.php:1229
 msgid "Select an alternate language"
-msgstr ""
+msgstr "Wybierz alternatywny język"
 
 #: ../../include/text.php:1439
 msgid "activity"
@@ -8414,6 +8462,38 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr ""
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr ""
+
+#: ../../include/uimport.php:92
+msgid "User creation error"
+msgstr ""
+
+#: ../../include/uimport.php:110
+msgid "User profile creation error"
+msgstr ""
+
+#: ../../include/uimport.php:155
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../include/uimport.php:233
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8445,7 +8525,7 @@ msgstr "Stwórz nową grupę"
 msgid "Contacts not in any group"
 msgstr "Kontakt nie jest w żadnej grupie"
 
-#: ../../include/nav.php:46 ../../boot.php:922
+#: ../../include/nav.php:46 ../../boot.php:945
 msgid "Logout"
 msgstr "Wyloguj się"
 
@@ -8453,7 +8533,7 @@ msgstr "Wyloguj się"
 msgid "End this session"
 msgstr "Zakończ sesję"
 
-#: ../../include/nav.php:49 ../../boot.php:1677
+#: ../../include/nav.php:49 ../../boot.php:1721
 msgid "Status"
 msgstr "Status"
 
@@ -8471,7 +8551,7 @@ msgstr "Załóż konto"
 
 #: ../../include/nav.php:86
 msgid "Help and documentation"
-msgstr ""
+msgstr "Pomoc i dokumentacja"
 
 #: ../../include/nav.php:89
 msgid "Apps"
@@ -8507,7 +8587,7 @@ msgstr "Podania o przyjęcie do grona znajomych"
 
 #: ../../include/nav.php:123
 msgid "See all notifications"
-msgstr ""
+msgstr "Zobacz wszystkie powiadomienia"
 
 #: ../../include/nav.php:124
 msgid "Mark all system notifications seen"
@@ -8533,11 +8613,11 @@ msgstr "Zarządzaj"
 msgid "Manage other pages"
 msgstr "Zarządzaj innymi stronami"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1235
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1235
 msgid "Manage/edit profiles"
 msgstr "Zarządzaj profilami"
 
@@ -8603,7 +8683,7 @@ msgstr "Wszystkie Sieci"
 
 #: ../../include/contact_widgets.php:98
 msgid "Saved Folders"
-msgstr ""
+msgstr "Zapisane foldery"
 
 #: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
 msgid "Everything"
@@ -8613,23 +8693,23 @@ msgstr "Wszystko"
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/auth.php:35
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr "Wyloguj"
 
-#: ../../include/auth.php:114
+#: ../../include/auth.php:126
 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:114
+#: ../../include/auth.php:126
 msgid "The error message was:"
 msgstr ""
 
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Różny"
 
 #: ../../include/datetime.php:153 ../../include/datetime.php:285
 msgid "year"
@@ -8704,7 +8784,7 @@ msgstr "Obrazek/zdjęcie"
 
 #: ../../include/bbcode.php:371 ../../include/bbcode.php:391
 msgid "$1 wrote:"
-msgstr ""
+msgstr "$1 napisał:"
 
 #: ../../include/bbcode.php:410 ../../include/bbcode.php:411
 msgid "Encrypted content"
@@ -8744,7 +8824,7 @@ msgstr ""
 #: ../../include/enotify.php:44
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
-msgstr ""
+msgstr "[Friendica:Notify] Nowa wiadomość otrzymana od %s"
 
 #: ../../include/enotify.php:46
 #, php-format
@@ -8800,7 +8880,7 @@ msgstr ""
 #: ../../include/enotify.php:125
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr ""
+msgstr "[Friendica:Notify] %s napisał na twoim profilu"
 
 #: ../../include/enotify.php:127
 #, php-format
@@ -8815,7 +8895,7 @@ msgstr ""
 #: ../../include/enotify.php:140
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
-msgstr ""
+msgstr "[Friendica:Notify] %s oznaczył cię"
 
 #: ../../include/enotify.php:141
 #, php-format
@@ -8948,7 +9028,7 @@ msgstr ""
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
-msgstr ""
+msgstr "Określony adres profilu należy do sieci, która została wyłączona na tej stronie."
 
 #: ../../include/follow.php:103
 msgid ""
@@ -8964,15 +9044,15 @@ msgstr "Nie można otrzymać informacji kontaktowych"
 msgid "following"
 msgstr "następujący"
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3981
+#: ../../include/items.php:4038
 msgid "Archives"
 msgstr "Archiwum"
 
@@ -9056,7 +9136,7 @@ msgstr "Proszę dodać zdjęcie profilowe."
 msgid "Welcome back "
 msgstr "Witaj ponownie "
 
-#: ../../include/security.php:354
+#: ../../include/security.php:357
 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."
@@ -9155,46 +9235,46 @@ msgstr "<span %1$s>%2$d people</span> nie lubię tego"
 msgid "and"
 msgstr "i"
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:875
 #, php-format
 msgid ", and %d other people"
 msgstr ", i %d innych ludzi"
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s like this."
 msgstr "%s lubi to."
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s don't like this."
 msgstr "%s nie lubi tego."
 
-#: ../../include/conversation.php:897 ../../include/conversation.php:915
+#: ../../include/conversation.php:901 ../../include/conversation.php:919
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Widoczne dla <strong>wszystkich</strong>"
 
-#: ../../include/conversation.php:899 ../../include/conversation.php:917
+#: ../../include/conversation.php:903 ../../include/conversation.php:921
 msgid "Please enter a video link/URL:"
 msgstr "Podaj link do filmu"
 
-#: ../../include/conversation.php:900 ../../include/conversation.php:918
+#: ../../include/conversation.php:904 ../../include/conversation.php:922
 msgid "Please enter an audio link/URL:"
 msgstr "Podaj link do muzyki"
 
-#: ../../include/conversation.php:901 ../../include/conversation.php:919
+#: ../../include/conversation.php:905 ../../include/conversation.php:923
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:903 ../../include/conversation.php:921
+#: ../../include/conversation.php:907 ../../include/conversation.php:925
 msgid "Where are you right now?"
 msgstr "Gdzie teraz jesteś?"
 
-#: ../../include/conversation.php:904
+#: ../../include/conversation.php:908
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:983
+#: ../../include/conversation.php:987
 msgid "permissions"
 msgstr "zezwolenia"
 
@@ -9210,105 +9290,109 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:584
+#: ../../boot.php:604
 msgid "Delete this item?"
 msgstr "Usunąć ten element?"
 
-#: ../../boot.php:587
+#: ../../boot.php:607
 msgid "show fewer"
 msgstr "Pokaż mniej"
 
-#: ../../boot.php:794
+#: ../../boot.php:816
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:796
+#: ../../boot.php:818
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:897
+#: ../../boot.php:919
 msgid "Create a New Account"
 msgstr "Załóż nowe konto"
 
-#: ../../boot.php:925
+#: ../../boot.php:948
 msgid "Nickname or Email address: "
 msgstr "Nick lub adres email:"
 
-#: ../../boot.php:926
+#: ../../boot.php:949
 msgid "Password: "
 msgstr "Hasło:"
 
-#: ../../boot.php:929
-msgid "Or login using OpenID: "
+#: ../../boot.php:950
+msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:935
+#: ../../boot.php:953
+msgid "Or login using OpenID: "
+msgstr "Lub zaloguj się korzystając z OpenID:"
+
+#: ../../boot.php:959
 msgid "Forgot your password?"
 msgstr "Zapomniałeś swojego hasła?"
 
-#: ../../boot.php:1046
+#: ../../boot.php:1084
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1161
 msgid "Edit profile"
 msgstr "Edytuj profil"
 
-#: ../../boot.php:1189
+#: ../../boot.php:1227
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1349 ../../boot.php:1435
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1312 ../../boot.php:1398
+#: ../../boot.php:1350 ../../boot.php:1436
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1357 ../../boot.php:1438
+#: ../../boot.php:1395 ../../boot.php:1476
 msgid "[today]"
 msgstr "[dziś]"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1407
 msgid "Birthday Reminders"
 msgstr "Przypomnienia o urodzinach"
 
-#: ../../boot.php:1370
+#: ../../boot.php:1408
 msgid "Birthdays this week:"
 msgstr "Urodziny w tym tygodniu:"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1469
 msgid "[No description]"
 msgstr "[Brak opisu]"
 
-#: ../../boot.php:1449
+#: ../../boot.php:1487
 msgid "Event Reminders"
-msgstr ""
+msgstr "Przypominacze wydarzeń"
 
-#: ../../boot.php:1450
+#: ../../boot.php:1488
 msgid "Events this week:"
 msgstr "Wydarzenia w tym tygodniu:"
 
-#: ../../boot.php:1680
+#: ../../boot.php:1724
 msgid "Status Messages and Posts"
 msgstr "Status wiadomości i postów"
 
-#: ../../boot.php:1687
+#: ../../boot.php:1731
 msgid "Profile Details"
 msgstr "Szczegóły profilu"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1748
 msgid "Events and Calendar"
 msgstr "Wydarzenia i kalendarz"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1755
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../index.php:380
+#: ../../index.php:398
 msgid "toggle mobile"
 msgstr ""
 
diff --git a/view/pl/strings.php b/view/pl/strings.php
index d4fda984..156cd785 100644
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@@ -22,7 +22,7 @@ $a->strings["Friend Request URL"] = "URL żądajacy znajomości";
 $a->strings["Friend Confirm URL"] = "URL potwierdzający znajomość";
 $a->strings["Notification Endpoint URL"] = "Zgłoszenie Punktu Końcowego URL";
 $a->strings["Poll/Feed URL"] = "Adres Ankiety / RSS";
-$a->strings["New photo from this URL"] = "";
+$a->strings["New photo from this URL"] = "Nowe zdjęcie z tej ścieżki";
 $a->strings["Submit"] = "Potwierdź";
 $a->strings["Help:"] = "Pomoc:";
 $a->strings["Help"] = "Pomoc";
@@ -60,7 +60,7 @@ $a->strings["Select a tag to remove: "] = "Wybierz tag do usunięcia";
 $a->strings["Remove"] = "Usuń";
 $a->strings["%1\$s welcomes %2\$s"] = "";
 $a->strings["Authorize application connection"] = "";
-$a->strings["Return to your app and insert this Securty Code:"] = "";
+$a->strings["Return to your app and insert this Securty Code:"] = "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:";
 $a->strings["Please login to continue."] = "Zaloguj się aby kontynuować.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "";
 $a->strings["Yes"] = "Tak";
@@ -122,9 +122,9 @@ $a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
 $a->strings["Not available."] = "Niedostępne.";
 $a->strings["Community"] = "Społeczność";
 $a->strings["No results."] = "Brak wyników.";
-$a->strings["This is Friendica, version"] = "";
+$a->strings["This is Friendica, version"] = "To jest Friendica, wersja";
 $a->strings["running at web location"] = "";
-$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "";
+$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["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "";
 $a->strings["Installed plugins/addons/apps:"] = "";
@@ -199,23 +199,35 @@ $a->strings["Diaspora"] = "";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "";
 $a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
 $a->strings["Submit Request"] = "Wyślij zgłoszenie";
+$a->strings["Account settings"] = "Ustawienia konta";
+$a->strings["Display settings"] = "Wyświetl ustawienia";
+$a->strings["Connector settings"] = "";
+$a->strings["Plugin settings"] = "Ustawienia wtyczek";
+$a->strings["Connected apps"] = "";
+$a->strings["Export personal data"] = "Eksportuje dane personalne";
+$a->strings["Remove account"] = "Usuń konto";
+$a->strings["Settings"] = "Ustawienia";
+$a->strings["Export account"] = "";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "";
+$a->strings["Export all"] = "";
+$a->strings["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)"] = "";
 $a->strings["Friendica Social Communications Server - Setup"] = "";
 $a->strings["Could not connect to database."] = "Nie można nawiązać połączenia z bazą danych";
-$a->strings["Could not create table."] = "";
+$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["System check"] = "";
+$a->strings["System check"] = "Sprawdzanie systemu";
 $a->strings["Check again"] = "Sprawdź ponownie";
-$a->strings["Database connection"] = "";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "";
+$a->strings["Database connection"] = "Połączenie z bazą danych";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień .";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją.";
 $a->strings["Database Server Name"] = "Baza danych - Nazwa serwera";
 $a->strings["Database Login Name"] = "Baza danych - Nazwa loginu";
 $a->strings["Database Login Password"] = "Baza danych - Hasło loginu";
 $a->strings["Database Name"] = "Baza danych - Nazwa";
-$a->strings["Site administrator email address"] = "";
+$a->strings["Site administrator email address"] = "Adres e-mail administratora strony";
 $a->strings["Your account email address must match this in order to use the web admin panel."] = "";
 $a->strings["Please select a default timezone for your website"] = "Proszę wybrać domyślną strefę czasową dla swojej strony";
 $a->strings["Site settings"] = "Ustawienia strony";
@@ -242,7 +254,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "";
-$a->strings["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."] = "";
+$a->strings["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."] = "";
 $a->strings["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."] = "";
 $a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
@@ -278,7 +290,7 @@ $a->strings["Group: "] = "Grupa:";
 $a->strings["Select"] = "Wybierz";
 $a->strings["View %s's profile @ %s"] = "Pokaż %s's profil @ %s";
 $a->strings["%s from %s"] = "%s od %s";
-$a->strings["View in context"] = "";
+$a->strings["View in context"] = "Zobacz w kontekście";
 $a->strings["%d comment"] = array(
 	0 => " %d komentarz",
 	1 => " %d komentarzy",
@@ -304,7 +316,7 @@ $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["add star"] = "dodaj gwiazdkę";
 $a->strings["remove star"] = "anuluj gwiazdkę";
-$a->strings["toggle star status"] = "";
+$a->strings["toggle star status"] = "włącz status gwiazdy";
 $a->strings["starred"] = "";
 $a->strings["add tag"] = "dodaj tag";
 $a->strings["save to folder"] = "zapisz w folderze";
@@ -317,7 +329,7 @@ $a->strings["Discard"] = "Odrzuć";
 $a->strings["Ignore"] = "Ignoruj";
 $a->strings["System"] = "System";
 $a->strings["Network"] = "Sieć";
-$a->strings["Personal"] = "";
+$a->strings["Personal"] = "Osobiste";
 $a->strings["Home"] = "Dom";
 $a->strings["Introductions"] = "";
 $a->strings["Messages"] = "Wiadomości";
@@ -346,13 +358,13 @@ $a->strings["%s disliked %s's post"] = "%s przestał lubić post %s";
 $a->strings["%s is now friends with %s"] = "%s jest teraz znajomym %s";
 $a->strings["%s created a new post"] = "%s dodał nowy wpis";
 $a->strings["%s commented on %s's post"] = "%s skomentował wpis %s";
-$a->strings["No more network notifications."] = "";
+$a->strings["No more network notifications."] = "Nie ma więcej powiadomień sieciowych";
 $a->strings["Network Notifications"] = "";
 $a->strings["No more system notifications."] = "";
 $a->strings["System Notifications"] = "";
-$a->strings["No more personal notifications."] = "";
+$a->strings["No more personal notifications."] = "Nie ma więcej powiadomień osobistych";
 $a->strings["Personal Notifications"] = "";
-$a->strings["No more home notifications."] = "";
+$a->strings["No more home notifications."] = "Nie ma więcej powiadomień domu";
 $a->strings["Home Notifications"] = "";
 $a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
 $a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
@@ -365,8 +377,8 @@ $a->strings["Contact has been archived"] = "";
 $a->strings["Contact has been unarchived"] = "";
 $a->strings["Contact has been removed."] = "Kontakt został usunięty.";
 $a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
-$a->strings["You are sharing with %s"] = "";
-$a->strings["%s is sharing with you"] = "";
+$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
+$a->strings["%s is sharing with you"] = "%s współdzieli z tobą";
 $a->strings["Private communications are not available for this contact."] = "Prywatna rozmowa jest niemożliwa dla tego kontaktu";
 $a->strings["Never"] = "Nigdy";
 $a->strings["(Update was successful)"] = "(Aktualizacja przebiegła pomyślnie)";
@@ -394,7 +406,7 @@ $a->strings["Contact Editor"] = "Edytor kontaktów";
 $a->strings["Profile Visibility"] = "Widoczność profilu";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Wybierz profil, który chcesz bezpiecznie wyświetlić %s";
 $a->strings["Contact Information / Notes"] = "Informacja o kontakcie / Notka";
-$a->strings["Edit contact notes"] = "";
+$a->strings["Edit contact notes"] = "Edytuj notatki kontaktu";
 $a->strings["Visit %s's profile [%s]"] = "Obejrzyj %s's profil [%s]";
 $a->strings["Block/Unblock contact"] = "Zablokuj/odblokuj kontakt";
 $a->strings["Ignore contact"] = "Ignoruj kontakt";
@@ -445,18 +457,10 @@ $a->strings["Forgot your Password?"] = "Zapomniałeś hasła?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Wpisz swój adres email i wyślij, aby zresetować hasło. Później sprawdź swojego emaila w celu uzyskania dalszych instrukcji.";
 $a->strings["Nickname or Email: "] = "Pseudonim lub Email:";
 $a->strings["Reset"] = "Zresetuj";
-$a->strings["Account settings"] = "Ustawienia konta";
-$a->strings["Display settings"] = "Wyświetl ustawienia";
-$a->strings["Connector settings"] = "";
-$a->strings["Plugin settings"] = "Ustawienia wtyczek";
-$a->strings["Connected apps"] = "";
-$a->strings["Export personal data"] = "Eksportuje dane personalne";
-$a->strings["Remove account"] = "Usuń konto";
-$a->strings["Settings"] = "Ustawienia";
 $a->strings["Missing some important data!"] = "Brakuje ważnych danych!";
 $a->strings["Update"] = "Zaktualizuj";
-$a->strings["Failed to connect with email account using the settings provided."] = "";
-$a->strings["Email settings updated."] = "";
+$a->strings["Failed to connect with email account using the settings provided."] = "Połączenie z kontem email używając wybranych ustawień nie powiodło się.";
+$a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
 $a->strings["Passwords do not match. Password unchanged."] = "Hasło nie pasuje. Hasło nie zmienione.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Brak hasła niedozwolony. Hasło nie zmienione.";
 $a->strings["Password changed."] = "Hasło zostało zmianione.";
@@ -469,10 +473,10 @@ $a->strings["Private forum has no privacy permissions. Using default privacy gro
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "";
 $a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
 $a->strings["Add application"] = "Dodaj aplikacje";
-$a->strings["Consumer Key"] = "";
-$a->strings["Consumer Secret"] = "";
+$a->strings["Consumer Key"] = "Klucz konsumenta";
+$a->strings["Consumer Secret"] = "Sekret konsumenta";
 $a->strings["Redirect"] = "Przekierowanie";
-$a->strings["Icon url"] = "";
+$a->strings["Icon url"] = "Adres ikony";
 $a->strings["You can't edit this application."] = "Nie możesz edytować tej aplikacji.";
 $a->strings["Connected Apps"] = "Powiązane aplikacje";
 $a->strings["Client key starts with"] = "";
@@ -497,7 +501,7 @@ $a->strings["Email login name:"] = "Login emaila:";
 $a->strings["Email password:"] = "Hasło emaila:";
 $a->strings["Reply-to address:"] = "Odpowiedz na adres:";
 $a->strings["Send public posts to all email contacts:"] = "Wyślij publiczny post do wszystkich kontaktów e-mail";
-$a->strings["Action after import:"] = "";
+$a->strings["Action after import:"] = "Akcja po zaimportowaniu:";
 $a->strings["Mark as seen"] = "Oznacz jako przeczytane";
 $a->strings["Move to folder"] = "Przenieś do folderu";
 $a->strings["Move to folder:"] = "Przenieś do folderu:";
@@ -520,10 +524,10 @@ $a->strings["Automatic Friend Page"] = "";
 $a->strings["Automatically approve all connection/friend requests as friends"] = "Automatycznie traktuj wszystkie prośby o połączenia/zaproszenia do grona przyjaciół, jako przyjaciół";
 $a->strings["Private Forum [Experimental]"] = "";
 $a->strings["Private forum - approved members only"] = "";
-$a->strings["OpenID:"] = "";
+$a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "";
 $a->strings["Publish your default profile in your local site directory?"] = "";
-$a->strings["Publish your default profile in the global social directory?"] = "";
+$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 ?";
 $a->strings["Allow friends to post to your profile page?"] = "Zezwól na dodawanie postów na twoim profilu przez znajomych";
@@ -571,7 +575,7 @@ $a->strings["Someone writes on your profile wall"] = "Ktoś pisze na twojej ści
 $a->strings["Someone writes a followup comment"] = "Ktoś pisze komentarz nawiązujący.";
 $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"] = "";
+$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["Advanced Account/Page Type Settings"] = "";
 $a->strings["Change the behaviour of this account for special situations"] = "";
@@ -604,6 +608,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Zły kontakt";
 $a->strings["Personal Notes"] = "Osobiste notatki";
 $a->strings["Save"] = "Zapisz";
+$a->strings["Import"] = "";
+$a->strings["Move account"] = "";
+$a->strings["You can import an account from another Friendica server. <br>\r\n                            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.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["Account file"] = "";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
 $a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
 $a->strings["Unable to check your home location."] = "";
@@ -675,17 +684,17 @@ $a->strings["No contacts."] = "brak kontaktów";
 $a->strings["View Contacts"] = "widok kontaktów";
 $a->strings["Registration details for %s"] = "Szczegóły rejestracji dla %s";
 $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 is the message that failed."] = "";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Nie udało się wysłać wiadomości e-mail. Wysyłanie nie powiodło się.";
 $a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
 $a->strings["Registration request at %s"] = "Prośba o rejestrację u %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów.";
 $a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
 $a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
 $a->strings["Membership on this site is by invitation only."] = "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu.";
-$a->strings["Your invitation ID: "] = "";
+$a->strings["Your invitation ID: "] = "Twoje zaproszenia ID:";
 $a->strings["Registration"] = "Rejestracja";
 $a->strings["Your Full Name (e.g. Joe Smith): "] = "Imię i nazwisko (np. Jan Kowalski):";
 $a->strings["Your Email Address: "] = "Twój adres email:";
@@ -760,10 +769,10 @@ $a->strings["Users"] = "Użytkownicy";
 $a->strings["Plugins"] = "Wtyczki";
 $a->strings["Themes"] = "Temat";
 $a->strings["DB updates"] = "";
-$a->strings["Logs"] = "";
+$a->strings["Logs"] = "Logi";
 $a->strings["Admin"] = "Administator";
 $a->strings["Plugin Features"] = "Polecane wtyczki";
-$a->strings["User registrations waiting for confirmation"] = "";
+$a->strings["User registrations waiting for confirmation"] = "Rejestracje użytkownika czekają na potwierdzenie.";
 $a->strings["Normal Account"] = "Konto normalne";
 $a->strings["Soapbox Account"] = "";
 $a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
@@ -774,12 +783,12 @@ $a->strings["Message queues"] = "";
 $a->strings["Administration"] = "Administracja";
 $a->strings["Summary"] = "Skrót";
 $a->strings["Registered users"] = "Zarejestrowani użytkownicy";
-$a->strings["Pending registrations"] = "";
+$a->strings["Pending registrations"] = "Rejestracje w toku.";
 $a->strings["Version"] = "Wersja";
-$a->strings["Active plugins"] = "";
+$a->strings["Active plugins"] = "Aktywne pluginy";
 $a->strings["Site settings updated."] = "Ustawienia strony zaktualizowane";
-$a->strings["Closed"] = "";
-$a->strings["Requires approval"] = "";
+$a->strings["Closed"] = "Zamknięty";
+$a->strings["Requires approval"] = "Wymagane zatwierdzenie.";
 $a->strings["Open"] = "Otwórz";
 $a->strings["No SSL policy, links will track page SSL state"] = "";
 $a->strings["Force all links to use SSL"] = "";
@@ -790,7 +799,7 @@ $a->strings["Advanced"] = "Zaawansowany";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Banner/Logo"] = "Logo";
 $a->strings["System language"] = "Język systemu";
-$a->strings["System theme"] = "";
+$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>"] = "";
 $a->strings["Mobile system theme"] = "";
 $a->strings["Theme for mobile devices"] = "";
@@ -802,18 +811,18 @@ $a->strings["Maximum image length"] = "Maksymalna długość obrazu";
 $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maksymalna długość najdłuższej strony przesyłanego obrazu w pikselach.\nDomyślnie jest to -1, co oznacza brak limitu.";
 $a->strings["JPEG image quality"] = "jakość obrazu JPEG";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
-$a->strings["Register policy"] = "";
-$a->strings["Register text"] = "";
+$a->strings["Register policy"] = "Zarejestruj polisę";
+$a->strings["Register text"] = "Zarejestruj tekst";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "Konto porzucone od x dni.";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "";
-$a->strings["Allowed friend domains"] = "";
+$a->strings["Allowed friend domains"] = "Dozwolone domeny przyjaciół";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "";
-$a->strings["Allowed email domains"] = "";
+$a->strings["Allowed email domains"] = "Dozwolone domeny e-mailowe";
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "";
-$a->strings["Block public"] = "";
+$a->strings["Block public"] = "Blokuj publicznie";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "";
-$a->strings["Force publish"] = "";
+$a->strings["Force publish"] = "Wymuś publikację";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "";
 $a->strings["Global directory update URL"] = "";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
@@ -823,7 +832,7 @@ $a->strings["Private posts by default for new users"] = "";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "";
 $a->strings["Block multiple registrations"] = "";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "";
-$a->strings["OpenID support"] = "";
+$a->strings["OpenID support"] = "Wsparcie OpenID";
 $a->strings["OpenID support for registration and logins."] = "";
 $a->strings["Fullname check"] = "";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "";
@@ -837,7 +846,7 @@ $a->strings["Enable Diaspora support"] = "";
 $a->strings["Provide built-in Diaspora network compatibility."] = "";
 $a->strings["Only allow Friendica contacts"] = "";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "";
-$a->strings["Verify SSL"] = "";
+$a->strings["Verify SSL"] = "Weryfikacja SSL";
 $a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "";
 $a->strings["Proxy user"] = "Użytkownik proxy";
 $a->strings["Proxy URL"] = "";
@@ -889,7 +898,7 @@ $a->strings["Plugin %s disabled."] = "Wtyczka %s wyłączona.";
 $a->strings["Plugin %s enabled."] = "Wtyczka %s właczona.";
 $a->strings["Disable"] = "Wyłącz";
 $a->strings["Enable"] = "Zezwól";
-$a->strings["Toggle"] = "";
+$a->strings["Toggle"] = "Włącz";
 $a->strings["Author: "] = "Autor: ";
 $a->strings["Maintainer: "] = "";
 $a->strings["No themes found."] = "Nie znaleziono tematu.";
@@ -897,15 +906,15 @@ $a->strings["Screenshot"] = "Zrzut ekranu";
 $a->strings["[Experimental]"] = "[Eksperymentalne]";
 $a->strings["[Unsupported]"] = "[Niewspieralne]";
 $a->strings["Log settings updated."] = "";
-$a->strings["Clear"] = "";
+$a->strings["Clear"] = "Wyczyść";
 $a->strings["Debugging"] = "";
 $a->strings["Log file"] = "";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "";
 $a->strings["Log level"] = "";
 $a->strings["Close"] = "Zamknij";
-$a->strings["FTP Host"] = "";
-$a->strings["FTP Path"] = "";
-$a->strings["FTP User"] = "";
+$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["Requested profile is not available."] = "Żądany profil jest niedostępny";
 $a->strings["Access to this profile has been restricted."] = "Ograniczony dostęp do tego konta";
@@ -1065,19 +1074,19 @@ $a->strings["This may occasionally happen if contact was requested by both perso
 $a->strings["Response from remote site was not understood."] = "Odpowiedź do zdalnej strony nie została zrozumiana";
 $a->strings["Unexpected response from remote site: "] = "Nieoczekiwana odpowiedź od strony zdalnej";
 $a->strings["Confirmation completed successfully."] = "Potwierdzenie ukończone poprawnie";
-$a->strings["Remote site reported: "] = "";
+$a->strings["Remote site reported: "] = "Zdalna strona zgłoszona:";
 $a->strings["Temporary failure. Please wait and try again."] = "Tymczasowo uszkodzone. Proszę poczekać i spróbować później.";
-$a->strings["Introduction failed or was revoked."] = "";
+$a->strings["Introduction failed or was revoked."] = "Nieudane lub unieważnione wprowadzenie.";
 $a->strings["Unable to set contact photo."] = "Nie można ustawić zdjęcia kontaktu.";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s jest teraz znajomym z %2\$s";
 $a->strings["No user record found for '%s' "] = "Nie znaleziono użytkownika dla '%s'";
-$a->strings["Our site encryption key is apparently messed up."] = "";
+$a->strings["Our site encryption key is apparently messed up."] = "Klucz kodujący jest najwyraźniej zepsuty";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "";
 $a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
 $a->strings["Site public key not available in contact record for URL %s."] = "";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "";
-$a->strings["Unable to set your contact credentials on our system."] = "";
-$a->strings["Unable to update your contact profile details on our system"] = "";
+$a->strings["Unable to set your contact credentials on our system."] = "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie";
+$a->strings["Unable to update your contact profile details on our system"] = "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie";
 $a->strings["Connection accepted at %s"] = "Połączenie zaakceptowane %s";
 $a->strings["%1\$s has joined %2\$s"] = "";
 $a->strings["Google+ Import Settings"] = "";
@@ -1086,7 +1095,7 @@ $a->strings["Google Account ID"] = "";
 $a->strings["Google+ Import Settings saved."] = "";
 $a->strings["Facebook disabled"] = "Facebook wyłączony";
 $a->strings["Updating contacts"] = "Aktualizacja kontaktów";
-$a->strings["Facebook API key is missing."] = "";
+$a->strings["Facebook API key is missing."] = "Brakuje klucza API z facebooka.";
 $a->strings["Facebook Connect"] = "Połącz konto z kontem Facebook";
 $a->strings["Install Facebook connector for this account."] = "Zainstaluj wtyczkę Facebook ";
 $a->strings["Remove Facebook connector"] = "Usuń wtyczkę Facebook";
@@ -1102,7 +1111,7 @@ $a->strings["On this website your Facebook profile wall conversations will only
 $a->strings["Do not import your Facebook profile wall conversations"] = "";
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "";
 $a->strings["Comma separated applications to ignore"] = "";
-$a->strings["Problems with Facebook Real-Time Updates"] = "";
+$a->strings["Problems with Facebook Real-Time Updates"] = "Problemy z aktualizacjami w czasie rzeczywistym Facebook'a";
 $a->strings["Facebook Connector Settings"] = "Ustawienia połączenia z Facebook";
 $a->strings["Facebook API Key"] = "Facebook API Key";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "";
@@ -1113,11 +1122,11 @@ $a->strings["App-ID / API-Key"] = "";
 $a->strings["Application secret"] = "";
 $a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "";
 $a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "";
-$a->strings["Real-Time Updates"] = "";
-$a->strings["Real-Time Updates are activated."] = "";
-$a->strings["Deactivate Real-Time Updates"] = "";
-$a->strings["Real-Time Updates not activated."] = "";
-$a->strings["Activate Real-Time Updates"] = "";
+$a->strings["Real-Time Updates"] = "Aktualizacje w czasie rzeczywistym";
+$a->strings["Real-Time Updates are activated."] = "Aktualizacje w czasie rzeczywistym zostały aktywowane.";
+$a->strings["Deactivate Real-Time Updates"] = "Zdezaktywuj aktualizacje w czasie rzeczywistym";
+$a->strings["Real-Time Updates not activated."] = "Aktualizacje w czasie rzeczywistym nie zostały aktywowane.";
+$a->strings["Activate Real-Time Updates"] = "Aktywuj aktualizacje w czasie rzeczywistym";
 $a->strings["The new values have been saved."] = "";
 $a->strings["Post to Facebook"] = "Post na Facebook";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Publikacja na stronie Facebook nie powiodła się z powodu braku dostępu do sieci";
@@ -1194,7 +1203,7 @@ $a->strings["YourLS Settings"] = "";
 $a->strings["URL: http://"] = "";
 $a->strings["Username:"] = "Nazwa użytkownika:";
 $a->strings["Password:"] = "Hasło:";
-$a->strings["Use SSL "] = "";
+$a->strings["Use SSL "] = "Użyj SSL";
 $a->strings["yourls Settings saved."] = "";
 $a->strings["Post to LiveJournal"] = "Post do LiveJournal";
 $a->strings["LiveJournal Post Settings"] = "Ustawienia postów do LiveJournal";
@@ -1207,9 +1216,9 @@ $a->strings["This plugin looks in posts for the words/text you specify below, an
 $a->strings["Enable Content filter"] = "";
 $a->strings["Comma separated list of keywords to hide"] = "";
 $a->strings["Use /expression/ to provide regular expressions"] = "";
-$a->strings["NSFW Settings saved."] = "";
-$a->strings["%s - Click to open/close"] = "";
-$a->strings["Forums"] = "";
+$a->strings["NSFW Settings saved."] = "NSFW Ustawienia zapisane.";
+$a->strings["%s - Click to open/close"] = "%s - kliknij by otworzyć/zamknąć";
+$a->strings["Forums"] = "Fora";
 $a->strings["Forums:"] = "";
 $a->strings["Page settings updated."] = "";
 $a->strings["Page Settings"] = "";
@@ -1219,7 +1228,7 @@ $a->strings["Show pages/forums on profile page"] = "";
 $a->strings["Planets Settings"] = "";
 $a->strings["Enable Planets Plugin"] = "";
 $a->strings["Login"] = "Login";
-$a->strings["OpenID"] = "";
+$a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Ostatni użytkownicy";
 $a->strings["Most active users"] = "najaktywniejsi użytkownicy";
 $a->strings["Latest photos"] = "Ostatnie zdjęcia";
@@ -1353,12 +1362,12 @@ $a->strings["Template URL (with {category})"] = "";
 $a->strings["OAuth end-point"] = "";
 $a->strings["Api"] = "";
 $a->strings["Member since:"] = "Data dołączenia:";
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "";
-$a->strings["3D Tic-Tac-Toe"] = "";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Trójwymiarowy Kółko i krzyżyk";
+$a->strings["3D Tic-Tac-Toe"] = "Kółko i krzyżyk 3D";
 $a->strings["New game"] = "Nowa gra";
 $a->strings["New game with handicap"] = "Nowa gra z utrudnieniem";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Trójwymiarowy tic-tac-toe jest taki sam jak tradycyjna gra, nie licząc tego, że jest grana na kilku poziomach jednocześnie.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "W tym przypadku są trzy poziomy. Wygrywasz poprzez zdobycie trójki w szeregu na którymkolwiek z poziomów zarówno u góry, na dole, jak i na ukos poprzez kilka różnych poziomów.";
 $a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
 $a->strings["You go first..."] = "Ty pierwszy...";
 $a->strings["I'm going first this time..."] = "Zaczynam...";
@@ -1419,7 +1428,7 @@ $a->strings["Additional notes that are displayed beneath the contact information
 $a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
 $a->strings["Footer note"] = "Notka w stopce";
 $a->strings["Text for the footer. You can use BBCode here."] = "";
-$a->strings["Report Bug"] = "";
+$a->strings["Report Bug"] = "Zgłoś problem";
 $a->strings["No Timeline settings updated."] = "";
 $a->strings["No Timeline Settings"] = "Brak ustawień Osi czasu";
 $a->strings["Disable Archive selector on profile wall"] = "";
@@ -1501,7 +1510,7 @@ $a->strings["Subscribe to Friendica contacts automatically"] = "";
 $a->strings["Purge internal list of jabber addresses of contacts"] = "";
 $a->strings["Add contact"] = "Dodaj kontakt";
 $a->strings["View Source"] = "Podgląd źródła";
-$a->strings["Post to StatusNet"] = "";
+$a->strings["Post to StatusNet"] = "Wyślij do sieci StatusNet";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
 $a->strings["We could not contact the StatusNet API with the Path you entered."] = "";
 $a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane";
@@ -1540,7 +1549,7 @@ $a->strings["How many contacts to display on profile sidebar"] = "";
 $a->strings["Gnot settings updated."] = "";
 $a->strings["Gnot Settings"] = "";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
-$a->strings["Enable this plugin/addon?"] = "";
+$a->strings["Enable this plugin/addon?"] = "Umożliwić tego plugina/wtyczkę?";
 $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";
 $a->strings["Post to Wordpress"] = "Opublikuj na Wordpress";
 $a->strings["WordPress Post Settings"] = "";
@@ -1564,7 +1573,7 @@ $a->strings["Site ID"] = "";
 $a->strings["Show opt-out cookie link?"] = "";
 $a->strings["Asynchronous tracking"] = "";
 $a->strings["Post to Twitter"] = "Post na Twitter";
-$a->strings["Twitter settings updated."] = "";
+$a->strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twittera.";
 $a->strings["Twitter Posting Settings"] = "Ustawienia wpisów z Twittera";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary dla Twittera. Proszę skontaktować się z admininstratorem strony.";
 $a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
@@ -1653,11 +1662,11 @@ $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:"] = "";
+$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:"] = "";
+$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:";
@@ -1796,8 +1805,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["default"] = "";
-$a->strings["Select an alternate language"] = "";
+$a->strings["default"] = "standardowe";
+$a->strings["Select an alternate language"] = "Wybierz alternatywny język";
 $a->strings["activity"] = "aktywność";
 $a->strings["post"] = "post";
 $a->strings["Item filed"] = "";
@@ -1806,6 +1815,17 @@ $a->strings["Attachments:"] = "Załączniki:";
 $a->strings["view full size"] = "Zobacz pełen rozmiar";
 $a->strings["Embedded content"] = "";
 $a->strings["Embedding disabled"] = "";
+$a->strings["Error decoding account file"] = "";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "";
+$a->strings["User creation error"] = "";
+$a->strings["User profile creation error"] = "";
+$a->strings["%d contact not imported"] = array(
+	0 => "",
+	1 => "",
+	2 => "",
+);
+$a->strings["Done. You can now login with your username and password"] = "";
 $a->strings["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."] = "";
 $a->strings["Default privacy group for new contacts"] = "Domyślne ustawienia prywatności dla nowych kontaktów";
 $a->strings["Everybody"] = "Wszyscy";
@@ -1819,7 +1839,7 @@ $a->strings["Status"] = "Status";
 $a->strings["Sign in"] = "Zaloguj się";
 $a->strings["Home Page"] = "Strona startowa";
 $a->strings["Create an account"] = "Załóż konto";
-$a->strings["Help and documentation"] = "";
+$a->strings["Help and documentation"] = "Pomoc i dokumentacja";
 $a->strings["Apps"] = "Aplikacje";
 $a->strings["Addon applications, utilities, games"] = "";
 $a->strings["Search site content"] = "Przeszukaj zawartość strony";
@@ -1828,7 +1848,7 @@ $a->strings["Directory"] = "";
 $a->strings["People directory"] = "";
 $a->strings["Conversations from your friends"] = "";
 $a->strings["Friend Requests"] = "Podania o przyjęcie do grona znajomych";
-$a->strings["See all notifications"] = "";
+$a->strings["See all notifications"] = "Zobacz wszystkie powiadomienia";
 $a->strings["Mark all system notifications seen"] = "";
 $a->strings["Private mail"] = "Prywatne maile";
 $a->strings["Inbox"] = "Odebrane";
@@ -1855,13 +1875,13 @@ $a->strings["Examples: Robert Morgenstein, Fishing"] = "Przykładowo:  Jan Kowal
 $a->strings["Random Profile"] = "Domyślny profil";
 $a->strings["Networks"] = "Sieci";
 $a->strings["All Networks"] = "Wszystkie Sieci";
-$a->strings["Saved Folders"] = "";
+$a->strings["Saved Folders"] = "Zapisane foldery";
 $a->strings["Everything"] = "Wszystko";
 $a->strings["Categories"] = "Kategorie";
 $a->strings["Logged out."] = "Wyloguj";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "";
 $a->strings["The error message was:"] = "";
-$a->strings["Miscellaneous"] = "";
+$a->strings["Miscellaneous"] = "Różny";
 $a->strings["year"] = "rok";
 $a->strings["month"] = "miesiąc";
 $a->strings["day"] = "dzień";
@@ -1879,7 +1899,7 @@ $a->strings["%s's birthday"] = "";
 $a->strings["Happy Birthday %s"] = "";
 $a->strings["From: "] = "Z:";
 $a->strings["Image/photo"] = "Obrazek/zdjęcie";
-$a->strings["$1 wrote:"] = "";
+$a->strings["$1 wrote:"] = "$1 napisał:";
 $a->strings["Encrypted content"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "";
 $a->strings["[no subject]"] = "[bez tematu]";
@@ -1888,7 +1908,7 @@ $a->strings["Friendica Notification"] = "";
 $a->strings["Thank You,"] = "Dziękuję,";
 $a->strings["%s Administrator"] = "%s administrator";
 $a->strings["%s <!item_type!>"] = "";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notify] Nowa wiadomość otrzymana od %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s wysyła ci %2\$s";
 $a->strings["a private message"] = "prywatna wiadomość";
@@ -1899,10 +1919,10 @@ $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "";
 $a->strings["%s commented on an item/conversation you have been following."] = "";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notify] %s napisał na twoim profilu";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "";
-$a->strings["[Friendica:Notify] %s tagged you"] = "";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s oznaczył cię";
 $a->strings["%1\$s tagged you at %2\$s"] = "";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "";
@@ -1930,7 +1950,7 @@ $a->strings["An author or name was not found."] = "Autor lub nazwa nie zostało
 $a->strings["No browser URL could be matched to this address."] = "";
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "";
 $a->strings["Use mailto: in front of address to force email check."] = "";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Określony adres profilu należy do sieci, która została wyłączona na tej stronie.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie.";
 $a->strings["Unable to retrieve contact information."] = "Nie można otrzymać informacji kontaktowych";
 $a->strings["following"] = "następujący";
@@ -1998,7 +2018,8 @@ $a->strings["Update Error at %s"] = "";
 $a->strings["Create a New Account"] = "Załóż nowe konto";
 $a->strings["Nickname or Email address: "] = "Nick lub adres email:";
 $a->strings["Password: "] = "Hasło:";
-$a->strings["Or login using OpenID: "] = "";
+$a->strings["Remember me"] = "";
+$a->strings["Or login using OpenID: "] = "Lub zaloguj się korzystając z OpenID:";
 $a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Edytuj profil";
@@ -2009,7 +2030,7 @@ $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"] = "";
+$a->strings["Event Reminders"] = "Przypominacze wydarzeń";
 $a->strings["Events this week:"] = "Wydarzenia w tym tygodniu:";
 $a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
 $a->strings["Profile Details"] = "Szczegóły profilu";
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index 7d96b0b8..9d2b0e87 100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@@ -242,7 +242,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Erro: o módulo openssl do PHP é necessário, mas não está instalado.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Erro: o módulo mysqli do PHP é necessário, mas não está instalado.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Erro: o módulo mb_string PHP é necessário, mas não está instalado.";
-$a->strings["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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
+$a->strings["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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
 $a->strings["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."] = "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta.";
 $a->strings["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."] = "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome. htconfig.php, na pasta raiz da instalação do seu Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"INSTALL.TXT\" para instruções.";
diff --git a/view/ru/strings.php b/view/ru/strings.php
index 91c7c4ea..87daa7b5 100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@@ -237,7 +237,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Ошибка: необходим PHP модуль OpenSSL, но он не установлен.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Ошибка: необходим PHP модуль MySQLi, но он не установлен.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Ошибка: необходим PHP модуль mb_string, но он не установлен.";
-$a->strings["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."] = "Веб-инсталлятору требуется создать файл с именем \". htconfig.php\" в верхней папке веб-сервера, но он не в состоянии это сделать.";
+$a->strings["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."] = "Веб-инсталлятору требуется создать файл с именем \". htconfig.php\" в верхней папке веб-сервера, но он не в состоянии это сделать.";
 $a->strings["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."] = "Это наиболее частые параметры разрешений, когда веб-сервер не может записать файлы в папке - даже если вы можете.";
 $a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
index cf1c388c..34c176ce 100644
--- a/view/theme/comix/search_item.tpl
+++ b/view/theme/comix/search_item.tpl
@@ -1,5 +1,5 @@
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
 				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
@@ -47,7 +47,7 @@
 	{{ endif }}
 	</div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 
 </div>
 
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
index 08952aad..1d15e460 100644
--- a/view/theme/diabook/bottom.tpl
+++ b/view/theme/diabook/bottom.tpl
@@ -15,7 +15,7 @@ $(document).ready(function() {
        
     });
     
-    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
+    $("div#pause").attr("style", "position: fixed;bottom: 25px;left: 5px;");
     $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
     $(document).keydown(function(event) {
     if (!$("div#pause").html()){
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index a9c0a374..1d94cb6d 100644
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -13,7 +13,6 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>		
 		<div id="character-counter" class="grey"></div>		
diff --git a/view/theme/diabook/js/jquery.mousewheel.js b/view/theme/diabook/js/jquery.mousewheel.js
deleted file mode 100644
index f1d5f72f..00000000
--- a/view/theme/diabook/js/jquery.mousewheel.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.6
- * 
- * Requires: 1.2.2+
- */
-
-(function($) {
-
-var types = ['DOMMouseScroll', 'mousewheel'];
-
-if ($.event.fixHooks) {
-    for ( var i=types.length; i; ) {
-        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
-    }
-}
-
-$.event.special.mousewheel = {
-    setup: function() {
-        if ( this.addEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.addEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = handler;
-        }
-    },
-    
-    teardown: function() {
-        if ( this.removeEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.removeEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = null;
-        }
-    }
-};
-
-$.fn.extend({
-    mousewheel: function(fn) {
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-    },
-    
-    unmousewheel: function(fn) {
-        return this.unbind("mousewheel", fn);
-    }
-});
-
-
-function handler(event) {
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
-    event = $.event.fix(orgEvent);
-    event.type = "mousewheel";
-    
-    // Old school scrollwheel delta
-    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
-    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }
-    
-    // New school multidimensional scroll (touchpads) deltas
-    deltaY = delta;
-    
-    // Gecko
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-        deltaY = 0;
-        deltaX = -1*delta;
-    }
-    
-    // Webkit
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-    
-    // Add event and delta to the front of the arguments
-    args.unshift(event, delta, deltaX, deltaY);
-    
-    return ($.event.dispatch || $.event.handle).apply(this, args);
-}
-
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 92ce03cb..d45836c2 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -137,11 +137,8 @@
 
 
 <div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
-<div style="position: fixed; bottom: 61px; left: 6px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
+<div style="position: fixed; bottom: 45px; left: 6px;">$langselector</div>
+</div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index d0c83c37..4fad4e30 100644
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
@@ -1,9 +1,9 @@
-{{ if $item.indent }}{{ else }}
+{{ if $item.indent $item.shiny }}{{ else }}
 <div class="wall-item-decor">
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
-<div class="wall-item-container $item.indent">
+<div class="wall-item-container $item.indent $item.shiny">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
index 95d30602..b15b829f 100644
--- a/view/theme/diabook/wall_thread.tpl
+++ b/view/theme/diabook/wall_thread.tpl
@@ -1,65 +1,96 @@
+{{if $mode == display}}
+{{ else }}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+		<span id="hide-comments-total-$item.id" 
+			class="hide-comments-total">$item.num_comments</span>
+			<span id="hide-comments-$item.id" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments($item.id);">$item.hide_text</span>
+			{{ if $item.thread_level==3 }} - 
+			<span id="hide-thread-$item-id"
+				class="fakelink"
+				onclick="showThread($item.id);">expand</span> /
+			<span id="hide-thread-$item-id"
+				class="fakelink"
+				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
 	</div>
 	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
 {{endif}}
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-{{ if $item.indent }}{{ else }}
+{{ endif }}
+
+{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
+
 <div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
+
+<div class="wall-item-container $item.indent $item.shiny" id="item-$item.id">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
+			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
 				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
 				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
 				
+			</div>	
+			{{ if $item.owner_url }}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
 			</div>
+			{{ endif }}			
+			<div class="wall-item-location">$item.location</div>	
 		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
+
+<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
+				 {{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
+				 {{ endif }}
 			</div>
 		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
 			$item.body
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
+			{{ for $item.hashtags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
+  			{{ for $item.mentions as $tag }}
+				<span class='mention'>$tag</span>
+			{{ endfor }}
+               {{ for $item.folders as $cat }}
+                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+               {{ endfor }}
+                {{ for $item.categories as $cat }}
+                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+                {{ endfor }}
 		</div>
-	</div>
+	</div>	
 	<div class="wall-item-bottom">
-		<div class="">
-
+		<div class="wall-item-links">
+			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
+		<div class="wall-item-actions">
+		
+			
 		<div class="wall-item-actions">
 
 			<div class="wall-item-actions-social">
@@ -106,31 +137,46 @@
 			<div class="wall-item-location">$item.location&nbsp;</div>
 		</div>
 	</div>
+	
+</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
 		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
+	
+	{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent $item.shiny==comment }}
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-comment-wrapper">
+					$item.comment
+		</div>
+	</div>
+	{{ endif }}{{ endif }}{{ endif }}
 </div>
 
-{{ if $item.threaded }}
-{{ if $item.comment }}
-<div class="wall-item-comment-wrapper $item.indent" >
-	$item.comment
-</div>
-{{ endif }}
-{{ endif }}
 
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-
-
-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child }}
+	{{ if $item.type == tag }}
+		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
+	{{ else }}
+		{{ inc $item.template with $item=$child }}{{ endinc }}
+	{{ endif }}
 {{ endfor }}
 
-</div>
+{{ if $item.thread_level!=1 }}</div>{{ endif }}
+
+
+{{if $mode == display}}
+{{ else }}
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}{{ endif }}{{ endif }}
+
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 0d9721fe..5fc8febe 100644
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -1,5 +1,5 @@
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
 				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
@@ -57,7 +57,7 @@
 	{{ endif }}
 	</div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 
 </div>
 
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
index 0883f88c..44517fab 100644
--- a/view/theme/dispy/wall_thread.tpl
+++ b/view/theme/dispy/wall_thread.tpl
@@ -6,8 +6,8 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
 			{{ if $item.owner_url }}
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
@@ -105,13 +105,13 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 		</div>
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-like $item.indent $item.shiny" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent $item.shiny" id="wall-item-dislike-$item.id">$item.dislike</div>
 	<div class="wall-item-comment-separator"></div>
 
 	{{ if $item.threaded }}
 	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent" >
+	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
 		$item.comment
 	</div>
 	{{ endif }}
@@ -123,7 +123,7 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 	</div>
 	{{ endif }}
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 </div>
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index fff08b2e..65f97624 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1050,6 +1050,34 @@ section {
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+.wall-item-container.comment .commentbox {
+  height: 0px;
+  overflow: hidden;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
+  border-top: 1px solid #999999;
+  height: 0px;
+  overflow: hidden;
+}
+.wall-item-container.comment:hover .commentbox {
+  height: auto;
+  overflow: visible;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
+  border-top: 0px;
+  height: auto;
+  overflow: visible;
+}
 /* 'tag' item type */
 .wall-item-container.item-tag .wall-item-content {
   opacity: 0.5;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 9584b019..5c875fea 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1050,6 +1050,34 @@ section {
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+.wall-item-container.comment .commentbox {
+  height: 0px;
+  overflow: hidden;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
+  border-top: 1px solid #999999;
+  height: 0px;
+  overflow: hidden;
+}
+.wall-item-container.comment:hover .commentbox {
+  height: auto;
+  overflow: visible;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
+  border-top: 0px;
+  height: auto;
+  overflow: visible;
+}
 /* 'tag' item type */
 .wall-item-container.item-tag .wall-item-content {
   opacity: 0.5;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 4c9c74e7..5640f5ba 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1050,6 +1050,34 @@ section {
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+.wall-item-container.comment .commentbox {
+  height: 0px;
+  overflow: hidden;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
+  border-top: 1px solid #999999;
+  height: 0px;
+  overflow: hidden;
+}
+.wall-item-container.comment:hover .commentbox {
+  height: auto;
+  overflow: visible;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
+  border-top: 0px;
+  height: auto;
+  overflow: visible;
+}
 /* 'tag' item type */
 .wall-item-container.item-tag .wall-item-content {
   opacity: 0.5;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 62260ef3..1c4da1bf 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -509,7 +509,7 @@ section {
 		a { float: right; }
 		input { float: right; }
 	}
-	
+		
 }
 
 
@@ -523,6 +523,25 @@ section {
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
+	
+	.commentbox {
+		height: 0px;
+		overflow: hidden;
+		.wall-item-comment-wrapper {
+			border-top: 1px solid @CommentBoxEmptyBorderColor;
+			height: 0px; overflow: hidden;
+		}
+		.transition();
+	}
+	
+	&:hover .commentbox {
+		height:auto; overflow: visible;
+		.wall-item-comment-wrapper {
+			border-top: 0px;
+			height:auto;overflow: visible;
+		}
+		.transition();
+	}
 }
 
 /* 'tag' item type */
@@ -544,6 +563,7 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
+	
 	textarea {	
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -555,7 +575,6 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
-	
 }
 
 .threaded .wall-item-comment-wrapper { margin-left: 0px; }
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
index e1ef9321..63373ab1 100644
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -1,6 +1,28 @@
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+		<span id="hide-comments-total-$item.id" 
+			class="hide-comments-total">$item.num_comments</span>
+			<span id="hide-comments-$item.id" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments($item.id);">$item.hide_text</span>
+			{{ if $item.thread_level==3 }} - 
+			<span id="hide-thread-$item-id"
+				class="fakelink"
+				onclick="showThread($item.id);">expand</span> /
+			<span id="hide-thread-$item-id"
+				class="fakelink"
+				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+{{ endif }}
+
 {{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
 
-<div class="wall-item-container item-tag $item.indent">
+
+<div class="wall-item-container item-tag $item.indent $item.shiny">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper">
@@ -17,11 +39,29 @@
 		<div class="wall-item-content">
 			$item.ago $item.body 
 		</div>
+			<div class="wall-item-tools">
+				{{ if $item.drop.pagedrop }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+				{{ endif }}
+				{{ if $item.drop.dropping }}
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+			</div>
 	</div>
 </div>
 
 {{ if $item.thread_level!=1 }}</div>{{ endif }}
 
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
+{# top thread comment box #}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}{{ endif }}{{ endif }}
+
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >$item.comment</div>
 {{ endif }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index 2e5c4939..b39dda3a 100644
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -27,7 +27,7 @@
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $item.indent" id="item-$item.id">
+<div class="wall-item-container $item.indent $item.shiny" id="item-$item.id">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
@@ -132,7 +132,7 @@
 	</div>
 	
 	{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
-	<div class="wall-item-bottom">
+	<div class="wall-item-bottom commentbox">
 		<div class="wall-item-links"></div>
 		<div class="wall-item-comment-wrapper">
 					$item.comment
@@ -143,7 +143,7 @@
 
 
 {{ for $item.children as $child }}
-	{{ if $item.type == tag }}
+	{{ if $child.type == tag }}
 		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
 	{{ else }}
 		{{ inc $item.template with $item=$child }}{{ endinc }}
@@ -158,6 +158,7 @@
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
 {{ endif }}
 
+{# top thread comment box #}
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
 <div class="wall-item-comment-wrapper" >$item.comment</div>
 {{ endif }}{{ endif }}{{ endif }}
diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index 7ae53a26..dce4657b 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -41,13 +41,13 @@ h4,
 h5,
 h6 {
 	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
-	font-weight: 400;
+	font-weight: 550;
 	color:#626262;
-	margin:0;
+	margin: 0;
 }
 
 h1 {
-	font-size:200%;
+	font-size: 200%;
 	line-height: 0.8571em;
 	margin: 0.4286em 0 0;
 }
@@ -59,18 +59,18 @@ h2 {
 }
 
 h3 {
-	font-size:145%;
-	margin:0 0 5px 0;
+	font-size: 145%;
+	margin: 0 0 5px 0;
 }
 
 h4 {
-	font-size:133.33%;
+	font-size: 133.33%;
 	line-height: 1.125em;
-	margin:1.125em 0 0 0;
+	margin: 1.125em 0 0 0;
 }
 
 h5 {
-	font-size:116.67%;
+	font-size: 116.67%;
 	line-height: 1.2857em;
 	margin: 1.2857em 0 0 0;
 }
diff --git a/view/theme/smoothly/events_reminder.tpl b/view/theme/smoothly/events_reminder.tpl
deleted file mode 100644
index 1e1148c5..00000000
--- a/view/theme/smoothly/events_reminder.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.fancybox(data);
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '$baseurl/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'H(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-
-<br />
-<div id="events-reminder"></div>
diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
index b5cfcd98..0d89c1c6 100644
--- a/view/theme/smoothly/jot-header.tpl
+++ b/view/theme/smoothly/jot-header.tpl
@@ -1,22 +1,23 @@
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
 
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
-            });
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+            		$(".jothidden").show();
+            		editor = true;
+            		$("a#jot-perms-icon").fancybox({
+                		'transitionIn' : 'elastic',
+                		'transitionOut' : 'elastic'
+            		});
 	                            $("#profile-jot-submit-wrapper").show();
 								{{ if $newpost }}
     	                            $("#profile-upload-wrapper").show();
@@ -32,8 +33,8 @@ function initEditor(cb) {
 								{{ endif }}   
 
 
-            if (typeof cb!="undefined") cb();
-            return;
+			if (typeof cb!="undefined") cb();
+			return;
         }
         tinyMCE.init({
                 theme : "advanced",
@@ -89,7 +90,7 @@ function initEditor(cb) {
                             $('#profile-jot-desc').html('&nbsp;');
                         }
 
-								//Character count
+				//Character count
 
                                 if(textlen <= 140) {
                                         $('#character-counter').removeClass('red');
@@ -140,18 +141,26 @@ function initEditor(cb) {
         if (typeof cb!="undefined") cb();
     }
 } // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
 
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+
+<script type="text/javascript" src="js/ajaxupload.js" >
+</script>
+
+<script>
+	var ispublic = '$ispublic';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -164,6 +173,7 @@ function initEditor(cb) {
 				}				 
 			}
 		);
+
 		var file_uploader = new window.AjaxUpload(
 			'wall-file-upload',
 			{ action: 'wall_attach/$nickname',
@@ -328,9 +338,9 @@ function initEditor(cb) {
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$.fancybox.close();
 				} else {
diff --git a/view/theme/smoothly/screenshot.png b/view/theme/smoothly/screenshot.png
new file mode 100644
index 00000000..09237d71
Binary files /dev/null and b/view/theme/smoothly/screenshot.png differ
diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
new file mode 100644
index 00000000..9c90fd04
--- /dev/null
+++ b/view/theme/smoothly/search_item.tpl
@@ -0,0 +1,53 @@
+<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id" >
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+	{{ endif }}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index ef7891f1..80e42dd6 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2012-10-25
+	Created by alex@friendica.pixelbits.de on 2012-11-14
 
 ** Colors ** 
 Blue links - #1873a2
@@ -2772,7 +2772,7 @@ margin-left: 0px;
 }
 
 #follow-sidebar {
-	margin-bottom: 80px;
+	margin-bottom: 10px;
 }
 
 #follow-sidebar h3:before {
@@ -3549,6 +3549,7 @@ margin-left: 0px;
 #adminpage h3 {
 	border-bottom: 1px solid #898989;
 	margin-bottom: 5px;
+	padding-bottom: 5px;
 	margin-top: 10px;
 }
 
@@ -3565,10 +3566,16 @@ margin-left: 0px;
 #adminpage .plugin {
 	list-style: none;
 	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
 	clear: left;
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	padding:10px;
+	margin:10px 10px 10px 0;
 }
 
 #adminpage .toggleplugin {
@@ -4197,7 +4204,6 @@ div.wall-item-content-wrapper.shiny {
 #profile-upload-wrapper,
 #wall-image-upload-div,
 #wall-file-upload-div,
-
 .hover, 
 .focus {
 	cursor: pointer;
@@ -4238,6 +4244,8 @@ hr.line-dots {
 .filer-icon {
 	display: block; width: 16px; height: 16px;
 	background-image: url('images/file.gif');
+	margin-left: 5px;
+	float: left;
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
@@ -4351,10 +4359,14 @@ div #datebrowse-sidebar.widget {
 
 #settings-notifications {
 	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 	border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	padding:10px;
+	margin:10px 10px 10px 0;
 }
 
 #id_npassword {}
@@ -4382,3 +4394,19 @@ div #datebrowse-sidebar.widget {
 
 #remote-friends-in-common  {}
 
+.settings-block {
+	border: 1px solid #7C7D7B;
+	box-shadow: 0 0 8px #BDBDBD;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	padding:10px;
+	margin:10px 10px 10px 0;
+}
+
+#page-settings-label{
+	width: auto !important;
+	margin-bottom: 5px !important;
+}
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 95dd4bb9..f5defdfe 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.10.25
+ * Version: Version 0.11.14-2
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index e57fba30..3b4deaff 100644
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -7,8 +7,9 @@
 {{endif}}
 
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<div class="wall-item-outside-wrapper $item.indent{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
+
 		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
 			{{ if $item.owner_url }}
 			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
@@ -76,9 +77,11 @@
 				{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
 				</div>
 				{{ endif }}
+
 			</div>
 		</div>
 		<div class="wall-item-social" id="wall-item-social-$item.id">
+
 			{{ if $item.vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
 				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
@@ -99,6 +102,10 @@
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
+
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+			{{ endif }}
 	
 		</div>
 
@@ -114,7 +121,9 @@
 			</div>
 
 			{{ if $item.drop.pagedrop }}
-			<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />			{{ endif }}
+			<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />
+			{{ endif }}
+
 			<div class="wall-item-delete-end"></div>
 		</div>
 
@@ -125,14 +134,14 @@
 
 	{{ if $item.threaded }}
 	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent" >
+        <div class="wall-item-comment-wrapper $item.indent $item.shiny" >
 		$item.comment
 	</div>
 	{{ endif }}
 	{{ endif }}
 </div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index 058986bf..9c90fd04 100644
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
@@ -1,5 +1,5 @@
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
 			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
 				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
@@ -50,4 +50,4 @@
 	<div class="wall-item-wrapper-end"></div>
 </div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl
index 4b6f25d0..f37f79bf 100644
--- a/view/theme/testbubble/wall_thread.tpl
+++ b/view/theme/testbubble/wall_thread.tpl
@@ -5,8 +5,8 @@
 	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<div class="wall-item-outside-wrapper $item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
 			{{ if $item.owner_url }}
 			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
@@ -83,14 +83,14 @@
 	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
 	{{ if $item.threaded }}
 	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent" >
+	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
 		$item.comment
 	</div>
 	{{ endif }}
 	{{ endif }}
 </div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
 
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index 851e2bc6..0e01532f 100644
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
@@ -5,7 +5,7 @@
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $item.indent">
+<div class="wall-item-container $item.indent $item.shiny ">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper"
diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 05fd005e..19b612b0 100644
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -27,7 +27,7 @@
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $item.indent" id="item-$item.id">
+<div class="wall-item-container $item.indent $item.shiny " id="item-$item.id">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
 			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index a67334e3..e891d571 100644
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -7,7 +7,7 @@
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
 			{{ if $item.owner_url }}
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >