Merge remote-tracking branch 'upstream/master'

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();

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)
 

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)
 

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.
+

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))

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()),

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);

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();

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),

mod/help.php

@@ -1,47 +1,101 @@
 <?php
+define( 'MARKDOWN_PARSER_CLASS',  'ExtendedMarkdown' );
+require_once('library/markdown.php');
 
-if(! function_exists('load_doc_file')) {
+class ExtendedMarkdown extends MarkdownExtra_Parser {
-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 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) {
+	$home = load_doc_file('doc/Home.md');
-		$text = 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;
+		
 }

mod/network.php

@@ -782,9 +782,10 @@ function network_content(&$a, $update = 0) {
 			intval(local_user())
 		);
 	}
-
+	else {
-//	if($update_unseen)
+		if($update_unseen)
-//		$r = q("UPDATE `item` SET `unseen` = 0 $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;

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'),

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)
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
-			$indent .= ' shiny';
+			$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()),

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);
 	
 }

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.";

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["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s byl označen v %2\$s uživatelem %3\$s";
-$a->strings["photo"] = "fotografie";
+$a->strings["a photo"] = "fotografie";
-$a->strings["by"] = "od";
 $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.";

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";

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.";

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.";

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\".";

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" 

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."] = "";

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."] = "";

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."] = "";

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["Database connection"] = "Połączenie z bazą danych";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "";
+$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["You are sharing with %s"] = "Współdzielisz z %s";
-$a->strings["%s is sharing with you"] = "";
+$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["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."] = "";
+$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 Key"] = "Klucz konsumenta";
-$a->strings["Consumer Secret"] = "";
+$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["Closed"] = "Zamknięty";
-$a->strings["Requires approval"] = "";
+$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 policy"] = "Zarejestruj polisę";
-$a->strings["Register text"] = "";
+$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 Host"] = "Założyciel FTP";
-$a->strings["FTP Path"] = "";
+$a->strings["FTP Path"] = "Ścieżka FTP";
-$a->strings["FTP User"] = "";
+$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 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"] = "";
+$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"] = "Aktualizacje w czasie rzeczywistym";
-$a->strings["Real-Time Updates are activated."] = "";
+$a->strings["Real-Time Updates are activated."] = "Aktualizacje w czasie rzeczywistym zostały aktywowane.";
-$a->strings["Deactivate Real-Time Updates"] = "";
+$a->strings["Deactivate Real-Time Updates"] = "Zdezaktywuj aktualizacje w czasie rzeczywistym";
-$a->strings["Real-Time Updates not activated."] = "";
+$a->strings["Real-Time Updates not activated."] = "Aktualizacje w czasie rzeczywistym nie zostały aktywowane.";
-$a->strings["Activate Real-Time Updates"] = "";
+$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["NSFW Settings saved."] = "NSFW Ustawienia zapisane.";
-$a->strings["%s - Click to open/close"] = "";
+$a->strings["%s - Click to open/close"] = "%s - kliknij by otworzyć/zamknąć";
-$a->strings["Forums"] = "";
+$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["Three Dimensional Tic-Tac-Toe"] = "Trójwymiarowy Kółko i krzyżyk";
-$a->strings["3D Tic-Tac-Toe"] = "";
+$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["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."] = "";
+$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["default"] = "standardowe";
-$a->strings["Select an alternate language"] = "";
+$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";

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.";

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."] = "";

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-outside-wrapper $item.indent $item.shiny$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-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>
 

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()){

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>		

view/theme/diabook/js/jquery.mousewheel.js

@@ -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);

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: 45px; 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>
-
-
-
 
 <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>

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"

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">
+{{ endif }}
-{{ if $item.indent }}{{ else }}
+
+{{ 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> 
+<div class="wall-item-actions-author">
-			<span class="wall-item-ago">-
+				<a href="$item.profile_url" target="redir"
-			{{ 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 }}
+                                title="$item.linktitle"
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+                                class="wall-item-name-link"><span
-			</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 }}
+{{ for $item.children as $child }}
-<div class="wall-item-comment-wrapper" >
+	{{ if $item.type == tag }}
-	$item.comment
+		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
-</div>
+	{{ else }}
-{{ endif }}
+		{{ inc $item.template with $item=$child }}{{ endinc }}
-
+	{{ endif }}
-
-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
 {{ 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 }}

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-outside-wrapper $item.indent $item.shiny$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-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>
 

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-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" 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" >
@@ -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-like $item.indent $item.shiny" 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-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 }}

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;

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;

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;

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; }

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 }}

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 }}

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%;
+	font-size: 145%;
-	margin:0 0 5px 0;
+	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;
 }

view/theme/smoothly/events_reminder.tpl

@@ -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>

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) {
+function initEditor(cb){
-    if (editor==false) {
+	if (editor==false){
-        $("#profile-jot-text-loading").show();
+		$("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
+		if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
+			$("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-            editor = true;
+            		$(".jothidden").show();
-            $("a#jot-perms-icon").fancybox({
+            		editor = true;
-                'transitionIn' : 'elastic',
+            		$("a#jot-perms-icon").fancybox({
-                'transitionOut' : 'elastic'
+                		'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();
+			if (typeof cb!="undefined") cb();
-            return;
+			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);
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-					if(timer) clearTimeout(timer);
+//					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
+//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$.fancybox.close();
 				} else {

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>

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;
+}

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>

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-outside-wrapper $item.indent $item.shiny 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-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 }}

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-outside-wrapper $item.indent $item.shiny$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-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>

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-outside-wrapper $item.indent $item.shiny 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-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 }}

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"

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 }}"

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" >