Merge https://github.com/friendica/friendica into pull

boot.php

@@ -520,6 +520,19 @@ if(! class_exists('App')) {
 			$this->is_tablet = $mobile_detect->isTablet();
 		}
 
+		function get_basepath() {
+
+			$basepath = get_config("system", "basepath");
+
+			if ($basepath == "")
+				$basepath = $_SERVER["DOCUMENT_ROOT"];
+
+			if ($basepath == "")
+				$basepath = $_SERVER["PWD"];
+
+			return($basepath);
+		}
+
 		function get_baseurl($ssl = false) {
 
 			$scheme = $this->scheme;
@@ -1895,7 +1908,7 @@ function clear_cache($basepath = "", $path = "") {
 			$fullpath = $path."/".$file;
 			if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
 				clear_cache($basepath, $fullpath);
-			if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - $cachetime))
+			if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
 				unlink($fullpath);
 		}
 		closedir($dh);

include/bb2diaspora.php

@@ -155,6 +155,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 	//	$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
 	//				"[url]$1[/url]\n[img]$2[/img]", $Text);
 
+	// Remove the avatar picture since that isn't looking good on the other side
+	//$Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
+
 	// Convert it to HTML - don't try oembed
 	$Text = bbcode($Text, $preserve_nl, false);
 

include/bbcode.php

@@ -206,7 +206,59 @@ function bb_replace_images($body, $images) {
 	return $newbody;
 }}
 
+function bb_ShareAttributes($match) {
 
+        $attributes = $match[1];
+
+        $author = "";
+        preg_match("/author='(.*?)'/ism", $attributes, $matches);
+        if ($matches[1] != "")
+                $author = $matches[1];
+
+        preg_match('/author="(.*?)"/ism', $attributes, $matches);
+        if ($matches[1] != "")
+                $author = $matches[1];
+
+        $link = "";
+        preg_match("/link='(.*?)'/ism", $attributes, $matches);
+        if ($matches[1] != "")
+                $link = $matches[1];
+
+        preg_match('/link="(.*?)"/ism', $attributes, $matches);
+        if ($matches[1] != "")
+                $link = $matches[1];
+
+        $avatar = "";
+        preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+        if ($matches[1] != "")
+                $avatar = $matches[1];
+
+        preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
+        if ($matches[1] != "")
+                $avatar = $matches[1];
+
+        $profile = "";
+        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+        if ($matches[1] != "")
+                $profile = $matches[1];
+
+        preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+        if ($matches[1] != "")
+                $profile = $matches[1];
+
+        $headline = '<div class="shared_header">';
+
+	if ($avatar != "")
+		$headline .= '<img src="'.$avatar.'" height="32" width="32" >';
+
+	$headline .= sprintf(t('<span><a href="%s">%s</a> wrote the following <a href="%s">post</a>:</span>'), $profile, $author, $link);
+
+        $headline .= "</div>";
+
+        $text = "<br />".$headline.'<blockquote class="shared_content">'.trim($match[2])."</blockquote>";
+
+        return($text);
+}
 
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendica - Mike Macgirvin
@@ -248,6 +300,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = str_replace("<", "&lt;", $Text);
 	$Text = str_replace(">", "&gt;", $Text);
 
+	// remove some newlines before the general conversion
+	$Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text);
+
+	// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
+	if (!$tryoembed)
+		$Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
+
 	// Convert new line chars to html <br /> tags
 
 	// nlbr seems to be hopelessly messed up
@@ -271,7 +330,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	// Perform URL Search
 
-	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
+	$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
 
 	if ($tryoembed)
 		$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
@@ -422,7 +481,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	// [img]pathtoimage[/img]
 	$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
-
+	// Shared content
+	$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
 
 	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
 	$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);

include/delivery.php

@@ -458,13 +458,17 @@ function delivery_run(&$argv, &$argc){
 
 					// only expose our real email address to true friends
 
-					if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
+					if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked'])) {
-						$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
+						if($reply_to) {
-					else
+							$headers  = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
+							$headers .= 'Sender: '.$local_user[0]['email']."\n";
+						} else
+							$headers  = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
+					} else
 						$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
 
-					if($reply_to)
+					//if($reply_to)
-						$headers .= 'Reply-to: ' . $reply_to . "\n";
+					//	$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 					// for testing purposes: Collect exported mails
 					// $file = tempnam("/tmp/friendica/", "mail-out-");

include/nav.php

@@ -44,14 +44,14 @@ function nav(&$a) {
 
 	if(local_user()) {
 		$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
-		
+
 		// user menu
 		$nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
 		$nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
 		$nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
 		$nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
 		$nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		
+
 		// user info
 		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
 		$userinfo = array(
@@ -130,11 +130,13 @@ function nav(&$a) {
 		$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
 		$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
 		$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
-		
+
 		if(is_array($a->identities) && count($a->identities) > 1) {
 			$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
 		}
 
+		$nav['delegations'] = Array('delegate', t('Delegations'), "", t('Delegate Page Management'));
+
 		$nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
 		if(feature_enabled(local_user(),'multi_profiles'))
 			$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles'));

include/network.php

@@ -854,8 +854,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 	}
 
 	// replace the special char encoding
-
+	$s = htmlspecialchars($s,ENT_NOQUOTES,'UTF-8');
-	$s = htmlspecialchars($s,ENT_QUOTES,'UTF-8');
 	return $s;
 }
 

include/notifier.php

@@ -771,14 +771,17 @@ function notifier_run(&$argv, &$argc){
 						$subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
 
 						// only expose our real email address to true friends
-
 						if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
-							$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
+							if($reply_to) {
+								$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n";
+								$headers .= 'Sender: '.$local_user[0]['email']."\n";
+							} else
+								$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
 						else
 							$headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
 
-						if($reply_to)
+						//if($reply_to)
-							$headers .= 'Reply-to: ' . $reply_to . "\n";
+						//	$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 						// for testing purposes: Collect exported mails
 						//$file = tempnam("/tmp/friendica/", "mail-out2-");

include/onepoll.php

@@ -2,6 +2,13 @@
 
 require_once("boot.php");
 
+function RemoveReply($subject) {
+	while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:")))
+		$subject = trim(substr($subject, 4));
+
+	return($subject);
+}
+
 function onepoll_run(&$argv, &$argc){
 	global $a, $db;
 
@@ -374,10 +381,6 @@ function onepoll_run(&$argv, &$argc){
 	//							$datarray['parent-uri'] = $r[0]['uri'];
 						}
 
-
-						if(! x($datarray,'parent-uri'))
-							$datarray['parent-uri'] = $datarray['uri'];
-
 						// Decoding the header
 						$subject = imap_mime_header_decode($meta->subject);
 						$datarray['title'] = "";
@@ -392,11 +395,26 @@ function onepoll_run(&$argv, &$argc){
 						//$datarray['title'] = notags(trim($meta->subject));
 						$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
 
-						// Is it  reply?
+						// Is it a reply?
 						$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
 							(substr(strtolower($datarray['title']), 0, 3) == "re-") or
 							(raw_refs != ""));
 
+						// Remove Reply-signs in the subject
+						$datarray['title'] = RemoveReply($datarray['title']);
+
+						// If it seems to be a reply but a header couldn't be found take the last message with matching subject
+						if(!x($datarray,'parent-uri') and $reply) {
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) ORDER BY `created` DESC LIMIT 1",
+								dbesc(protect_sprintf($datarray['title'])));
+							if(count($r))
+								$datarray['parent-uri'] = $r[0]['parent-uri'];
+						}
+
+						if(! x($datarray,'parent-uri'))
+							$datarray['parent-uri'] = $datarray['uri'];
+
+
 						$r = email_get_msg($mbox,$msg_uid, $reply);
 						if(! $r) {
 							logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);

include/poller.php

@@ -105,6 +105,9 @@ function poller_run(&$argv, &$argc){
 	// clear old item cache files
 	clear_cache();
 
+	// clear cache for photos
+	clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;

include/text.php

@@ -292,11 +292,11 @@ function alt_pager(&$a, $i) {
         $o .= '<div class="pager">';
 
 	if($a->pager['page']>1)
-	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'">' . t('newer') . '</a>';
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'" class="pager_newer">' . t('newer') . '</a>';
         if($i>0) {
           if($a->pager['page']>1)
 	          $o .= "&nbsp;-&nbsp;";
-	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('older') . '</a>';
+	  $o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'" class="pager_older">' . t('older') . '</a>';
 	}
 
 

mod/photo.php

@@ -7,6 +7,7 @@ function photo_init(&$a) {
 	global $_SERVER;
 
 	$prvcachecontrol = false;
+	$file = "";
 
 	switch($a->argc) {
 		case 4:
@@ -20,6 +21,7 @@ function photo_init(&$a) {
 			break;
 		case 2:
 			$photo = $a->argv[1];
+			$file = $photo;
 			break;
 		case 1:
 		default:
@@ -42,7 +44,6 @@ function photo_init(&$a) {
 		exit;
 	}
 
-
 	$default = 'images/person-175.jpg';
 
 	if(isset($type)) {
@@ -94,7 +95,7 @@ function photo_init(&$a) {
 		foreach( Photo::supportedTypes() as $m=>$e){
 			$photo = str_replace(".$e",'',$photo);
 		}
-	
+
 		if(substr($photo,-2,1) == '-') {
 			$resolution = intval(substr($photo,-1,1));
 			$photo = substr($photo,0,-2);
@@ -115,6 +116,8 @@ function photo_init(&$a) {
 				intval($resolution)
 			);
 
+			$public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+
 			if(count($r)) {
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
@@ -198,6 +201,12 @@ function photo_init(&$a) {
 		header("Cache-Control: max-age=31536000");
 	}
 	echo $data;
+
+	// If the photo is public and there is an existing photo directory store the photo there
+	if ($public and ($file != ""))
+		if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+
 	killme();
 	// NOTREACHED
 }

mod/settings.php

@@ -209,6 +209,7 @@ function settings_post(&$a) {
 					intval($mail_pubmail),
 					intval(local_user())
 				);
+				logger("mail: updating mailaccount. Response: ".print_r($r, true));
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
@@ -731,7 +732,7 @@ function settings_content(&$a) {
 			'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', array( 'notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
 			'$mail_user'	=> array('mail_user',    t('Email login name:'), $mail_user, ''),
 			'$mail_pass'	=> array('mail_pass', 	 t('Email password:'), '', ''),
-			'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
+			'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), $mail_replyto, 'Optional'),
 			'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
 			'$mail_action'	=> array('mail_action',	 t('Action after import:'), $mail_action, '', array(0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder'))),
 			'$mail_movetofolder'	=> array('mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''),

view/de/strings.php

@@ -810,6 +810,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "Qualität des JPEG Bildes";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust.";
 $a->strings["Register policy"] = "Registrierungsmethode";
+$a->strings["Maximum Daily Registrations"] = "Maximum täglicher Neuanmeldungen";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag.   Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt.";
 $a->strings["Register text"] = "Registrierungstext";
 $a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
 $a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tagen als unbenutzt";
@@ -965,6 +967,7 @@ $a->strings["New profile created."] = "Neues Profil angelegt.";
 $a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
 $a->strings["Edit Profile Details"] = "Profil bearbeiten";
+$a->strings["Change Profile Photo"] = "Profilbild ändern";
 $a->strings["View this profile"] = "Dieses Profil anzeigen";
 $a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
 $a->strings["Clone this profile"] = "Dieses Profil duplizieren";
@@ -1142,6 +1145,8 @@ $a->strings["Facebook Post disabled"] = "Nach Facebook senden deaktiviert";
 $a->strings["Facebook Post"] = "Facebook Relai";
 $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
+$a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\"";
+$a->strings["Post to page/group:"] = "";
 $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
@@ -1444,7 +1449,7 @@ $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
-$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
+$a->strings["Group Text settings updated."] = "Gruppen Text Einstellungen aktualisiert";
 $a->strings["Group Text"] = "Gruppen als Text";
 $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
@@ -1469,10 +1474,13 @@ $a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree ver
 $a->strings["Altpager settings updated."] = "Altpager Einstellungen sind aktualisiert.";
 $a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?";
+$a->strings["Force global use of the alternate pager"] = "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server";
+$a->strings["Each user chooses whether to use the alternate pager"] = "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
 $a->strings["Use the MathJax renderer"] = "MathJax verwenden";
 $a->strings["MathJax Base URL"] = "MathJax Basis-URL";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
+$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
@@ -1531,12 +1539,15 @@ $a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
 $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
+$a->strings["You are now authenticated to tumblr."] = "Du bist nun auf tumblr authentifiziert.";
+$a->strings["return to the connector page"] = "zurück zur Connector Seite";
 $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen";
 $a->strings["Tumblr Post Settings"] = "Tumblr-Beitragseinstellungen";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)Authentifizierung deiner tumblr Seite";
 $a->strings["Enable Tumblr Post Plugin"] = "Tumblr-Plugin aktivieren";
-$a->strings["Tumblr login"] = "Tumblr Login";
-$a->strings["Tumblr password"] = "Tumblr Passwort";
 $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen";
+$a->strings["Post to page:"] = "Auf tumblr veröffentlichen";
+$a->strings["You are not authenticated to tumblr"] = "Du bist gegenüber tumblr nicht authentifiziert";
 $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
 $a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
 $a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
@@ -1897,12 +1908,15 @@ $a->strings["From: "] = "Von: ";
 $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
 $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
+$a->strings["Post Composition Features"] = "Beitragserstellung Features";
 $a->strings["Richtext Editor"] = "Web-Editor";
 $a->strings["Enable richtext editor"] = "Den Web-Editor für neue Beiträge aktivieren";
 $a->strings["Post Preview"] = "Beitragsvorschau";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Die Vorschau von Beiträgen und Kommentaren vor dem absenden erlauben.";
+$a->strings["Network Sidebar Widgets"] = "Widgets für Netzwerk und Seitenleiste";
 $a->strings["Search by Date"] = "Archiv";
 $a->strings["Ability to select posts by date ranges"] = "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren";
 $a->strings["Group Filter"] = "Gruppen Filter";
@@ -1910,12 +1924,14 @@ $a->strings["Enable widget to display Network posts only from selected group"] =
 $a->strings["Network Filter"] = "Netzwerk Filter";
 $a->strings["Enable widget to display Network posts only from selected network"] = "Widget zum filtern der Beiträge in Abhängigkeit des Netzwerks aus dem der Ersteller sendet aktivieren.";
 $a->strings["Save search terms for re-use"] = "Speichere Suchanfragen für spätere Wiederholung.";
+$a->strings["Network Tabs"] = "Netzwerk Reiter";
 $a->strings["Network Personal Tab"] = "Netzwerk-Reiter: Persönlich";
 $a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Netzwerk-Reiter in dem Nachrichten angezeigt werden mit denen du interagiert hast";
 $a->strings["Network New Tab"] = "Netzwerk-Reiter: Neue";
 $a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden";
 $a->strings["Network Shared Links Tab"] = "Netzwerk-Reiter: Geteilte Links";
 $a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält";
+$a->strings["Post/Comment Tools"] = "Werkzeuge für Beiträge und Kommentare";
 $a->strings["Multiple Deletion"] = "Mehrere Beiträge löschen";
 $a->strings["Select and delete multiple posts/comments at once"] = "Mehrere Beiträge/Kommentare markieren und gleichzeitig löschen";
 $a->strings["Edit Sent Posts"] = "Gesendete Beiträge editieren";
@@ -2081,3 +2097,5 @@ $a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträ
 $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
 $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
 $a->strings["URL to embed:"] = "URL zum Einbetten:";
+$a->strings["Tumblr login"] = "Tumblr Login";
+$a->strings["Tumblr password"] = "Tumblr Passwort";

view/pl/strings.php

@@ -28,7 +28,7 @@ $a->strings["Help:"] = "Pomoc:";
 $a->strings["Help"] = "Pomoc";
 $a->strings["Not Found"] = "Nie znaleziono";
 $a->strings["Page not found."] = "Strona nie znaleziona.";
-$a->strings["File exceeds size limit of %d"] = "";
+$a->strings["File exceeds size limit of %d"] = "Plik przekracza dozwolony rozmiar %d";
 $a->strings["File upload failed."] = "Przesyłanie pliku nie powiodło się.";
 $a->strings["Friend suggestion sent."] = "Propozycja znajomych wysłana.";
 $a->strings["Suggest Friends"] = "Zaproponuj znajomych";
@@ -62,7 +62,7 @@ $a->strings["%1\$s welcomes %2\$s"] = "";
 $a->strings["Authorize application connection"] = "";
 $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["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Czy chcesz umożliwić tej aplikacji dostęp do Twoich wpisów, kontaktów oraz pozwolić jej na pisanie za Ciebie postów?";
 $a->strings["Yes"] = "Tak";
 $a->strings["No"] = "Nie";
 $a->strings["Photo Albums"] = "Albumy zdjęć";
@@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "Publiczny dostęp zabroniony";
 $a->strings["No photos selected"] = "Nie zaznaczono zdjęć";
 $a->strings["Access to this item is restricted."] = "Dostęp do tego obiektu jest ograniczony.";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "";
 $a->strings["Upload Photos"] = "Prześlij zdjęcia";
 $a->strings["New album name: "] = "Nazwa nowego albumu:";
 $a->strings["or existing album name: "] = "lub istniejąca nazwa albumu:";
@@ -123,7 +122,7 @@ $a->strings["Not available."] = "Niedostępne.";
 $a->strings["Community"] = "Społeczność";
 $a->strings["No results."] = "Brak wyników.";
 $a->strings["This is Friendica, version"] = "To jest Friendica, wersja";
-$a->strings["running at web location"] = "";
+$a->strings["running at web location"] = "otwierane na serwerze";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Odwiedź <a href=\"http://friendica.com\">Friendica.com</a>, aby dowiedzieć się więcej o projekcie Friendica.";
 $a->strings["Bug reports and issues: please visit"] = "Reportowanie błędów i problemów: proszę odwiedź";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "";
@@ -201,7 +200,7 @@ $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["Connector settings"] = "Ustawienia konektora";
 $a->strings["Plugin settings"] = "Ustawienia wtyczek";
 $a->strings["Connected apps"] = "";
 $a->strings["Export personal data"] = "Eksportuje dane personalne";
@@ -253,7 +252,7 @@ $a->strings["Error: libCURL PHP module required but not installed."] = "Błąd:
 $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany.";
 $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["Error: mb_string PHP module required but not installed."] = "Błąd: moduł PHP mb_string  jest wymagany ale nie jest zainstalowany";
 $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."] = "";
@@ -270,7 +269,7 @@ $a->strings["Time Conversion"] = "Zmiana czasu";
 $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "";
 $a->strings["Current timezone: %s"] = "Obecna strefa czasowa: %s";
-$a->strings["Converted localtime: %s"] = "";
+$a->strings["Converted localtime: %s"] = "Zmień strefę czasową: %s";
 $a->strings["Please select your timezone:"] = "Wybierz swoją strefę czasową:";
 $a->strings["Poke/Prod"] = "";
 $a->strings["poke, prod or do other things to somebody"] = "";
@@ -359,13 +358,13 @@ $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."] = "Nie ma więcej powiadomień sieciowych";
-$a->strings["Network Notifications"] = "";
+$a->strings["Network Notifications"] = "Powiadomienia z sieci";
-$a->strings["No more system notifications."] = "";
+$a->strings["No more system notifications."] = "Nie ma więcej powiadomień systemowych.";
-$a->strings["System Notifications"] = "";
+$a->strings["System Notifications"] = "Powiadomienia systemowe";
 $a->strings["No more personal notifications."] = "Nie ma więcej powiadomień osobistych";
-$a->strings["Personal Notifications"] = "";
+$a->strings["Personal Notifications"] = "Prywatne powiadomienia";
 $a->strings["No more home notifications."] = "Nie ma więcej powiadomień domu";
-$a->strings["Home Notifications"] = "";
+$a->strings["Home Notifications"] = "Powiadomienia z instancji";
 $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.";
 $a->strings["Contact updated."] = "Kontakt zaktualizowany";
@@ -419,7 +418,7 @@ $a->strings["Update now"] = "Aktualizuj teraz";
 $a->strings["Currently blocked"] = "Obecnie zablokowany";
 $a->strings["Currently ignored"] = "Obecnie zignorowany";
 $a->strings["Currently archived"] = "Obecnie zarchiwizowany";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
 $a->strings["Suggestions"] = "Sugestie";
 $a->strings["Suggest potential friends"] = "Sugerowani znajomi";
 $a->strings["All Contacts"] = "Wszystkie kontakty";
@@ -457,10 +456,12 @@ $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["Additional features"] = "";
 $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."] = "Połączenie z kontem email używając wybranych ustawień nie powiodło się.";
 $a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
+$a->strings["Features updated"] = "";
 $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.";
@@ -484,12 +485,15 @@ $a->strings["No name"] = "Bez nazwy";
 $a->strings["Remove authorization"] = "Odwołaj upoważnienie";
 $a->strings["No Plugin settings configured"] = "Ustawienia wtyczki nieskonfigurowane";
 $a->strings["Plugin Settings"] = "Ustawienia wtyczki";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "";
 $a->strings["enabled"] = "włączony";
 $a->strings["disabled"] = "wyłączony";
 $a->strings["StatusNet"] = "";
 $a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
-$a->strings["Connector Settings"] = "";
+$a->strings["Connector Settings"] = "Ustawienia konektora";
 $a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "";
 $a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
@@ -519,14 +523,14 @@ $a->strings["This account is a normal personal profile"] = "To konto jest normal
 $a->strings["Soapbox Page"] = "";
 $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Automatycznie zatwierdzaj wszystkie żądania połączenia/przyłączenia do znajomych jako fanów 'tylko do odczytu'";
 $a->strings["Community Forum/Celebrity Account"] = "";
-$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Automatycznie potwierdza wszystkie połączenia jako pełnoprawne z możliwością zapisu.";
 $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:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "Przeznacz to OpenID do logowania się na to konto.";
-$a->strings["Publish your default profile in your local site directory?"] = "";
+$a->strings["Publish your default profile in your local site directory?"] = "Czy publikować Twój profil w lokalnym katalogu tej instancji?";
 $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 ?";
@@ -583,20 +587,20 @@ $a->strings["Manage Identities and/or Pages"] = "";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
 $a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:";
 $a->strings["Search Results For:"] = "Szukaj wyników dla:";
-$a->strings["Remove term"] = "";
+$a->strings["Remove term"] = "Usuń wpis";
 $a->strings["Saved Searches"] = "";
 $a->strings["add"] = "dodaj";
-$a->strings["Commented Order"] = "";
+$a->strings["Commented Order"] = "Porządek wg komentarzy";
 $a->strings["Sort by Comment Date"] = "Sortuj po dacie komentarza";
-$a->strings["Posted Order"] = "";
+$a->strings["Posted Order"] = "Porządek wg wpisów";
 $a->strings["Sort by Post Date"] = "Sortuj po dacie posta";
 $a->strings["Posts that mention or involve you"] = "";
 $a->strings["New"] = "Nowy";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "";
-$a->strings["Favourite Posts"] = "Ulubione posty";
 $a->strings["Shared Links"] = "Współdzielone linki";
 $a->strings["Interesting Links"] = "Interesujące linki";
+$a->strings["Starred"] = "";
+$a->strings["Favourite Posts"] = "Ulubione posty";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "",
 	1 => "",
@@ -629,7 +633,7 @@ $a->strings["Subject:"] = "Temat:";
 $a->strings["Your message:"] = "Twoja wiadomość:";
 $a->strings["Welcome to Friendica"] = "Witamy na Friendica";
 $a->strings["New Member Checklist"] = "Lista nowych członków";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Chcielibyśmy zaproponować kilka porad i linków, które pomogą uczynić twoje doświadczenie przyjemnym. Kliknij dowolny element, aby odwiedzić odpowiednią stronę. Link do tej strony będzie widoczny na stronie głównej przez dwa tygodnie od czasu rejestracji, a następnie zniknie.";
 $a->strings["Getting Started"] = "";
 $a->strings["Friendica Walk-Through"] = "";
 $a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "";
@@ -794,7 +798,7 @@ $a->strings["No SSL policy, links will track page SSL state"] = "";
 $a->strings["Force all links to use SSL"] = "";
 $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "";
 $a->strings["File upload"] = "Plik załadowano";
-$a->strings["Policies"] = "";
+$a->strings["Policies"] = "zasady";
 $a->strings["Advanced"] = "Zaawansowany";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Banner/Logo"] = "Logo";
@@ -812,6 +816,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $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"] = "Zarejestruj polisę";
+$a->strings["Maximum Daily Registrations"] = "";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "";
 $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.";
@@ -874,9 +880,9 @@ $a->strings["%s user blocked/unblocked"] = array(
 	2 => "",
 );
 $a->strings["%s user deleted"] = array(
-	0 => "",
+	0 => " %s użytkownik usunięty",
-	1 => "",
+	1 => " %s użytkownicy usunięci",
-	2 => "",
+	2 => " %s usuniętych użytkowników ",
 );
 $a->strings["User '%s' deleted"] = "Użytkownik '%s' usunięty";
 $a->strings["User '%s' unblocked"] = "Użytkownik '%s' odblokowany";
@@ -969,6 +975,7 @@ $a->strings["New profile created."] = "Utworzono nowy profil.";
 $a->strings["Profile unavailable to clone."] = "Nie można powileić profilu ";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Czy chcesz ukryć listę kontaktów dla przeglądających to konto?";
 $a->strings["Edit Profile Details"] = "Edytuj profil.";
+$a->strings["Change Profile Photo"] = "";
 $a->strings["View this profile"] = "Zobacz ten profil";
 $a->strings["Create a new profile using these settings"] = "Stwórz nowy profil wykorzystując te ustawienia";
 $a->strings["Clone this profile"] = "Sklonuj ten profil";
@@ -1081,7 +1088,7 @@ $a->strings["Unable to set contact photo."] = "Nie można ustawić zdjęcia kont
 $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."] = "Klucz kodujący jest najwyraźniej zepsuty";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Został dostarczony pusty URL lub nie może zostać rozszyfrowany przez nas.";
 $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."] = "";
@@ -1147,6 +1154,8 @@ $a->strings["Facebook Post disabled"] = "";
 $a->strings["Facebook Post"] = "Wpis z Facebooka";
 $a->strings["Install Facebook Post connector for this account."] = "";
 $a->strings["Remove Facebook Post connector"] = "";
+$a->strings["Suppress \"View on friendica\""] = "";
+$a->strings["Post to page/group:"] = "Napisz na stronę/grupę:";
 $a->strings["Facebook Post Settings"] = "Ustawienia wpisu z Facebooka";
 $a->strings["%d person likes this"] = array(
 	0 => " %d osoba lubi to",
@@ -1227,6 +1236,7 @@ $a->strings["Randomise Page/Forum list"] = "";
 $a->strings["Show pages/forums on profile page"] = "";
 $a->strings["Planets Settings"] = "";
 $a->strings["Enable Planets Plugin"] = "";
+$a->strings["Forum Directory"] = "Katalog Forum";
 $a->strings["Login"] = "Login";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Ostatni użytkownicy";
@@ -1450,7 +1460,7 @@ $a->strings["Tile Server URL"] = "";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
 $a->strings["Default zoom"] = "Domyślne przybliżenie";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "";
-$a->strings["Editplain settings updated."] = "";
+$a->strings["Group Text settings updated."] = "";
 $a->strings["Group Text"] = "";
 $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
@@ -1475,10 +1485,13 @@ $a->strings["Post to Libertree by default"] = "";
 $a->strings["Altpager settings updated."] = "";
 $a->strings["Alternate Pagination Setting"] = "";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
+$a->strings["Force global use of the alternate pager"] = "";
+$a->strings["Each user chooses whether to use the alternate pager"] = "";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
 $a->strings["Use the MathJax renderer"] = "";
 $a->strings["MathJax Base URL"] = "";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
+$a->strings["Editplain settings updated."] = "";
 $a->strings["Editplain Settings"] = "";
 $a->strings["Disable richtext status editor"] = "";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
@@ -1537,12 +1550,15 @@ $a->strings["Send linked #-tags and @-names to StatusNet"] = "";
 $a->strings["Clear OAuth configuration"] = "";
 $a->strings["API URL"] = "";
 $a->strings["Infinite Improbability Drive"] = "";
-$a->strings["Post to Tumblr"] = "";
+$a->strings["You are now authenticated to tumblr."] = "";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to Tumblr"] = "Opublikuj na Tumblrze";
 $a->strings["Tumblr Post Settings"] = "";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Plugin"] = "";
-$a->strings["Tumblr login"] = "";
-$a->strings["Tumblr password"] = "";
 $a->strings["Post to Tumblr by default"] = "";
+$a->strings["Post to page:"] = "Napisz na stronę:";
+$a->strings["You are not authenticated to tumblr"] = "";
 $a->strings["Numfriends settings updated."] = "";
 $a->strings["Numfriends Settings"] = "";
 $a->strings["How many contacts to display on profile sidebar"] = "";
@@ -1685,6 +1701,7 @@ $a->strings["Zot!"] = "";
 $a->strings["LinkedIn"] = "";
 $a->strings["XMPP/IM"] = "";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "Mężczyzna";
 $a->strings["Female"] = "Kobieta";
 $a->strings["Currently Male"] = "Aktualnie Mężczyzna";
@@ -1814,7 +1831,7 @@ $a->strings["Sharing notification from Diaspora network"] = "";
 $a->strings["Attachments:"] = "Załączniki:";
 $a->strings["view full size"] = "Zobacz pełen rozmiar";
 $a->strings["Embedded content"] = "";
-$a->strings["Embedding disabled"] = "";
+$a->strings["Embedding disabled"] = "Osadzanie wyłączone";
 $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."] = "";
@@ -1827,7 +1844,7 @@ $a->strings["%d contact not imported"] = array(
 	1 => "",
 	2 => "",
 );
-$a->strings["Done. You can now login with your username and password"] = "";
+$a->strings["Done. You can now login with your username and password"] = "Wykonano. Teraz możesz się zalogować z użyciem loginu i hasła.";
 $a->strings["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";
@@ -1848,7 +1865,9 @@ $a->strings["Search site content"] = "Przeszukaj zawartość strony";
 $a->strings["Conversations on this site"] = "Rozmowy na tej stronie";
 $a->strings["Directory"] = "Katalog";
 $a->strings["People directory"] = "";
-$a->strings["Conversations from your friends"] = "";
+$a->strings["Conversations from your friends"] = "Rozmowy Twoich przyjaciół";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "Podania o przyjęcie do grona znajomych";
 $a->strings["See all notifications"] = "Zobacz wszystkie powiadomienia";
 $a->strings["Mark all system notifications seen"] = "";
@@ -1858,9 +1877,9 @@ $a->strings["Outbox"] = "Wysłane";
 $a->strings["Manage"] = "Zarządzaj";
 $a->strings["Manage other pages"] = "Zarządzaj innymi stronami";
 $a->strings["Profiles"] = "Profile";
-$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
+$a->strings["Manage/Edit Profiles"] = "";
-$a->strings["Manage/edit friends and contacts"] = "";
+$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
-$a->strings["Site setup and configuration"] = "";
+$a->strings["Site setup and configuration"] = "Konfiguracja i ustawienia instancji";
 $a->strings["Nothing new here"] = "Brak nowych zdarzeń";
 $a->strings["Add New Contact"] = "Dodaj nowy kontakt";
 $a->strings["Enter address or web location"] = "";
@@ -1903,6 +1922,43 @@ $a->strings["From: "] = "Z:";
 $a->strings["Image/photo"] = "Obrazek/zdjęcie";
 $a->strings["$1 wrote:"] = "$1 napisał:";
 $a->strings["Encrypted content"] = "";
+$a->strings["General Features"] = "";
+$a->strings["Multiple Profiles"] = "";
+$a->strings["Ability to create multiple profiles"] = "";
+$a->strings["Post Composition Features"] = "";
+$a->strings["Richtext Editor"] = "";
+$a->strings["Enable richtext editor"] = "";
+$a->strings["Post Preview"] = "";
+$a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Network Sidebar Widgets"] = "";
+$a->strings["Search by Date"] = "Szukanie wg daty";
+$a->strings["Ability to select posts by date ranges"] = "";
+$a->strings["Group Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected group"] = "";
+$a->strings["Network Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected network"] = "";
+$a->strings["Save search terms for re-use"] = "";
+$a->strings["Network Tabs"] = "";
+$a->strings["Network Personal Tab"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
+$a->strings["Network New Tab"] = "";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "";
+$a->strings["Network Shared Links Tab"] = "";
+$a->strings["Enable tab to display only Network posts with links in them"] = "";
+$a->strings["Post/Comment Tools"] = "";
+$a->strings["Multiple Deletion"] = "";
+$a->strings["Select and delete multiple posts/comments at once"] = "";
+$a->strings["Edit Sent Posts"] = "";
+$a->strings["Edit and correct posts and comments after sending"] = "";
+$a->strings["Tagging"] = "";
+$a->strings["Ability to tag existing posts"] = "";
+$a->strings["Post Categories"] = "";
+$a->strings["Add categories to your posts"] = "";
+$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Dislike Posts"] = "";
+$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Star Posts"] = "";
+$a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'";
 $a->strings["[no subject]"] = "[bez tematu]";
 $a->strings["Visible to everybody"] = "Widoczny dla wszystkich";
@@ -2026,6 +2082,7 @@ $a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Edytuj profil";
 $a->strings["Message"] = "Wiadomość";
+$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
 $a->strings["g A l F d"] = "";
 $a->strings["F d"] = "";
 $a->strings["[today]"] = "[dziś]";
@@ -2053,4 +2110,6 @@ $a->strings["Drupal site uses clean URLS"] = "";
 $a->strings["Post to Drupal by default"] = "";
 $a->strings["OEmbed settings updated"] = "";
 $a->strings["Use OEmbed for YouTube videos"] = "";
-$a->strings["URL to embed:"] = "";
+$a->strings["URL to embed:"] = "URL do osadzenia";
+$a->strings["Tumblr login"] = "";
+$a->strings["Tumblr password"] = "Hasło do twojego Tumblra";

view/theme/vier/nav.tpl

@@ -41,6 +41,7 @@
 				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
 				<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
 				<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li>
+				{{ if $nav.delegations }}<li><a class="$nav.delegations.2" href="$nav.delegations.0" title="$nav.delegations.3">$nav.delegations.1</a></li>{{ endif }}
 				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
@@ -74,7 +75,6 @@
 					{{ for $nav.usermenu as $usermenu }}
 						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
 					{{ endfor }}
-					
 					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
 					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
 					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	

view/theme/vier/style.css

@@ -314,6 +314,66 @@
 }
 
 
+div.pager, .birthday-notice {
+  text-align: center;
+  height: 1.2em;
+  padding-bottom: 12px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  background-color: #f2f2f2;
+  clear: left;
+  margin-top: 15px;
+  padding: 1%;
+  height: 1em;
+  margin-bottom: 15px;
+}
+
+.birthday-notice {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+#live-network {
+/*  border-bottom: 1px solid #BDCDD4; */
+  border-bottom: 1px solid #D2D2D2;
+  width: 100%;
+  height: 10px;
+}
+
+.pager a {
+}
+
+.pager a.pager_older {
+  float: right;
+}
+
+.pager a.pager_newer {
+  float: left;
+}
+
+.shared_header {
+  height: 32px;
+  color: #999;
+  border-top: 1px solid #D2D2D2;
+  padding-top: 16px;
+  margin-top: 16px;
+}
+
+.shared_header img {
+  float: left;
+}
+
+.shared_header span {
+  margin-left: 9px;
+}
+
+blockquote.shared_content {
+  margin-left: 32px;
+  color: #000;
+  border: none;
+}
+
 #contact-edit-links ul {
   list-style: none;
   list-style-type: none;
@@ -332,10 +392,10 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 14px;
   background-color: #ffffff;
   color: #2d2d2d;
-  margin: 50px 0px 0px 0px;
+  margin: 37px 0px 0px 0px;
   display: table;
 }
 h4 {
@@ -345,7 +405,8 @@ h4 {
 a {
 	/*  color: #36C; */
 	/* color: #3e3e8c; */
-	color: #3465A4;
+	/* color: #3465A4; */
+	color: #3E3E8C;
 	text-decoration: none;
 }
 a:hover {
@@ -379,7 +440,8 @@ a:hover {
 .fakelink {
   /* color: #36c; */
   /* color: #3e3e8c; */
-  color: #3465A4;
+  /* color: #3465A4; */
+  color: #3E3E8C;
   text-decoration: none;
   cursor: pointer;
 }
@@ -580,7 +642,7 @@ nav .nav-menu {
   padding-left: 5px;
   padding-right: 5px;
   margin: 3px 3px 0px;
-  font-size: 13px;
+  font-size: 14px;
   border-bottom: 3px solid #364A84;
 }
 nav .nav-menu.selected {
@@ -790,6 +852,8 @@ aside {
   width: 185px;
   padding: 0px 10px 0px 20px;
   border-right: 1px solid #D2D2D2;
+  background-color: #ECECF2;
+  font-size: 14px;
   /* background: #F1F1F1; */
 }
 aside .vcard .fn {
@@ -983,7 +1047,8 @@ section {
 }
 /* wall item */
 .tread-wrapper {
-  border-bottom: 1px solid #D2D2D2;
+/*    border-bottom: 1px solid #BDCDD4; */
+border-bottom: 1px solid #D2D2D2;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
@@ -1006,7 +1071,7 @@ section {
   display: table-row;
 }
 .wall-item-bottom {
-  font-size: 13px;
+  font-size: 14px;
 }
 .wall-item-container .wall-item-bottom {
   opacity: 0.5;
@@ -1045,10 +1110,10 @@ section {
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
+  font-size: 14px;
   max-width: 660px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.36;
 }
 
 .wall-item-container .wall-item-content img {
@@ -1620,15 +1685,51 @@ section {
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
-  font-size: 13px;
+  font-size: 14px;
 }
 ul.tabs li {
   float: left;
   margin-left: 7px;
 }
-ul.tabs li .active {
+/*ul.tabs li .active {
   border-bottom: 1px solid #005c94;
+}*/
+ul.tabs a {
+    display: block;
+    float: left;
+    padding: 0px 10px 1px 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    border: 1px solid #ECECF2;
+    font-weight: bold;
+    line-height: 1.4em;
+    color: #3e3e8c;
+    text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
+    background: #ececf2;
+    background: -moz-linear-gradient(top, #ffffff 0%, #ececf2 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2));
+    background: -webkit-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
+    background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
 }
+ul.tabs li .active, ul.tabs a:hover {
+    color: #fff;
+    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    border: 1px solid #ececf2;
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    text-decoration: none;
+}
+
 /**
  * Form fields
  */
@@ -1808,7 +1909,7 @@ ul.tabs li .active {
 
 /* page footer */
 footer {
-  height: 100px;
+  /* height: 100px; */
   display: table-row;
 }
 

view/theme/vier/theme.php

@@ -6,4 +6,101 @@
  * Author: Ike <http://pirati.ca/profile/heluecht>
  * Maintainer: Ike <http://pirati.ca/profile/heluecht>
  */
- 
+
+$a->theme_info = array();
+
+function vier_init(&$a) {
+$a->page['htmlhead'] .= <<< EOT
+<script>
+/*function insertFormatting(comment,BBcode,id) {
+
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == comment) {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+			$("#comment-edit-text-" + id).val(tmpStr);
+		}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+*/
+
+function showThread(id) {
+	$("#collapsed-comments-" + id).show()
+	$("#collapsed-comments-" + id + " .collapsed-comments").show()
+}
+function hideThread(id) {
+	$("#collapsed-comments-" + id).hide()
+	$("#collapsed-comments-" + id + " .collapsed-comments").hide()
+}
+
+/*
+function cmtBbOpen(id) {
+	$("#comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$("#comment-edit-bb-" + id).hide();
+}
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+*/
+</script>
+EOT;
+}