Merge remote-tracking branch 'upstream/master'

boot.php

@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1545' );
+define ( 'FRIENDICA_VERSION',      '3.1.1559' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 

include/acl_selectors.php

@@ -227,6 +227,23 @@ function fixacl(&$item) {
 	$item = intval(str_replace(array('<','>'),array('',''),$item));
 }
 
+function prune_deadguys($arr) {
+
+	if(! $arr)
+		return $arr;
+	$str = dbesc(implode(',',$arr));
+	$r = q("select id from contact where id in ( " . $str . ") and blocked = 0 and pending = 0 and archive = 0 ");
+	if($r) {
+		$ret = array();
+		foreach($r as $rr) 
+			$ret[] = $rr['id'];
+		return $ret;
+	}
+	return array();
+}
+
+
+
 function populate_acl($user = null,$celeb = false) {
 
 	$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
@@ -246,6 +263,14 @@ function populate_acl($user = null,$celeb = false) {
 		array_walk($deny_gid,'fixacl');
 	}
 
+	$allow_cid = prune_deadguys($allow_cid);
+
+	// We shouldn't need to prune deadguys from the block list. Either way they can't get the message.
+	// Also no point enumerating groups and checking them, that will take place on delivery.
+
+//	$deny_cid = prune_deadguys($deny_cid);
+
+
 	/*$o = '';
 	$o .= '<div id="acl-wrapper">';
 	$o .= '<div id="acl-permit-outer-wrapper">';

include/api.php

@@ -12,6 +12,17 @@
 	$API = Array();
 	$called_api = Null;
 
+        function api_user() {
+          // It is not sufficient to use local_user() to check whether someone is allowed to use the API,
+          // because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
+          // into a page, and visitors will post something without noticing it).
+          // Instead, use this function.
+          if ($_SESSION["allow_api"])
+            return local_user();
+
+          return false;
+        }
+
 	function api_date($str){
 		//Wed May 23 06:01:13 +0000 2007
 		return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
@@ -89,7 +100,7 @@
 		}
 
 		require_once('include/security.php');
-		authenticate_success($record);
+		authenticate_success($record); $_SESSION["allow_api"] = true;
 
 		call_hooks('logged_in', $a->user);
 
@@ -108,11 +119,11 @@
 			if (strpos($a->query_string, $p)===0){
 				$called_api= explode("/",$p);
 				//unset($_SERVER['PHP_AUTH_USER']);
-				if ($info['auth']===true && local_user()===false) {
+				if ($info['auth']===true && api_user()===false) {
 						api_login($a);
 				}
 
-				load_contact_links(local_user());
+				load_contact_links(api_user());
 
 				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
 				logger('API parameters: ' . print_r($_REQUEST,true));
@@ -219,7 +230,7 @@
 		if(is_null($user) && x($_GET, 'screen_name')) {
 			$user = dbesc($_GET['screen_name']);	
 			$extra_query = "AND `contact`.`nick` = '%s' ";
-			if (local_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(local_user());
+			if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
 			
 		}
 		
@@ -232,12 +243,12 @@
 			} else {
 				$user = dbesc($user);
 				$extra_query = "AND `contact`.`nick` = '%s' ";
-				if (local_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(local_user());
+				if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
 			}
 		}
 		
 		if (! $user) {
-			if (local_user()===false) {
+			if (api_user()===false) {
 				api_login($a); return False;
 			} else {
 				$user = $_SESSION['uid'];
@@ -259,10 +270,10 @@
 		
 		if($uinfo[0]['self']) {
 			$usr = q("select * from user where uid = %d limit 1",
-				intval(local_user())
+				intval(api_user())
 			);
 			$profile = q("select * from profile where uid = %d and `is-default` = 1 limit 1",
-				intval(local_user())
+				intval(api_user())
 			);
 
 			// count public wall messages
@@ -458,7 +469,7 @@
 	 * http://developer.twitter.com/doc/get/account/verify_credentials
 	 */
 	function api_account_verify_credentials(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 		$user_info = api_get_user($a);
 		
 		return api_apply_template("user", $type, array('$user' => $user_info));
@@ -482,14 +493,14 @@
 
 /*Waitman Gobble Mod*/
         function api_statuses_mediap(&$a, $type) {
-                if (local_user()===false) {
+                if (api_user()===false) {
                         logger('api_statuses_update: no user');
                         return false;
                 }
                 $user_info = api_get_user($a);
 
                 $_REQUEST['type'] = 'wall';
-                $_REQUEST['profile_uid'] = local_user();
+                $_REQUEST['profile_uid'] = api_user();
                 $_REQUEST['api_source'] = true;
                 $txt = requestdata('status');
                 //$txt = urldecode(requestdata('status'));
@@ -525,7 +536,7 @@
 
 
 	function api_statuses_update(&$a, $type) {
-		if (local_user()===false) {
+		if (api_user()===false) {
 			logger('api_statuses_update: no user');
 			return false;
 		}
@@ -569,7 +580,7 @@
 
 		if(requestdata('lat') && requestdata('long'))
 			$_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
-		$_REQUEST['profile_uid'] = local_user();
+		$_REQUEST['profile_uid'] = api_user();
 
 		if($parent)
 			$_REQUEST['type'] = 'net-comment';
@@ -713,7 +724,7 @@
 	 * TODO: Add reply info
 	 */
 	function api_statuses_home_timeline(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 		// get last newtork messages
@@ -787,7 +798,7 @@
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
 	function api_statuses_public_timeline(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 		// get last newtork messages
@@ -869,7 +880,7 @@
 	 * 
 	 */
 	function api_statuses_show(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 
@@ -921,7 +932,7 @@
 	 * 
 	 */
 	function api_statuses_repeat(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 
@@ -947,7 +958,7 @@
 
 		if ($r[0]['body'] != "") {
 			$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
-			$_REQUEST['profile_uid'] = local_user();
+			$_REQUEST['profile_uid'] = api_user();
 			$_REQUEST['type'] = 'wall';
 			$_REQUEST['api_source'] = true;
 
@@ -968,7 +979,7 @@
 	 * 
 	 */
 	function api_statuses_destroy(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 
@@ -995,7 +1006,7 @@
 	 * 
 	 */
 	function api_statuses_mentions(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 				
 		$user_info = api_get_user($a);
 		// get last newtork messages
@@ -1075,13 +1086,13 @@
 
 
 	function api_statuses_user_timeline(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 		
 		$user_info = api_get_user($a);
 		// get last newtork messages
 
 
-		logger("api_statuses_user_timeline: local_user: ". local_user() .
+		logger("api_statuses_user_timeline: api_user: ". api_user() .
 			   "\nuser_info: ".print_r($user_info, true) .
 			   "\n_REQUEST:  ".print_r($_REQUEST, true),
 			   LOGGER_DEBUG);
@@ -1113,7 +1124,7 @@
 			$sql_extra
 			AND `item`.`id`>%d
 			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
-			intval(local_user()),
+			intval(api_user()),
 			intval($user_info['id']),
 			intval($since_id),
 			intval($start),	intval($count)
@@ -1136,7 +1147,7 @@
 
 
 	function api_favorites(&$a, $type){
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 
 		$user_info = api_get_user($a);
 		// in friendica starred item are private
@@ -1408,7 +1419,7 @@
 	 *  returns: json, xml 
 	 **/
 	function api_statuses_f(&$a, $type, $qtype) {
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 		$user_info = api_get_user($a);
 		
 		
@@ -1434,7 +1445,7 @@
 			$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
  
 		$r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
-			intval(local_user())
+			intval(api_user())
 		);
 
 		$ret = array();
@@ -1516,7 +1527,7 @@
 
 
 	function api_ff_ids(&$a,$type,$qtype) {
-		if(! local_user())
+		if(! api_user())
 			return false;
 
 		if($qtype == 'friends')
@@ -1526,7 +1537,7 @@
  
 
 		$r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
-			intval(local_user())
+			intval(api_user())
 		);
 
 		if(is_array($r)) {
@@ -1559,7 +1570,7 @@
 
 
 	function api_direct_messages_new(&$a, $type) {
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 		
 		if (!x($_POST, "text") || !x($_POST,"screen_name")) return;
 
@@ -1568,7 +1579,7 @@
 		require_once("include/message.php");
 
 		$r = q("SELECT `id` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
-				intval(local_user()),
+				intval(api_user()),
 				dbesc($_POST['screen_name']));
 
 		$recipient = api_get_user($a, $r[0]['id']);			
@@ -1576,7 +1587,7 @@
 		$sub     = '';
 		if (x($_REQUEST,'replyto')) {
 			$r = q('SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
-					intval(local_user()),
+					intval(api_user()),
 					intval($_REQUEST['replyto']));
 			$replyto = $r[0]['parent-uri'];
 			$sub     = $r[0]['title'];
@@ -1614,7 +1625,7 @@
 	api_register_func('api/direct_messages/new','api_direct_messages_new',true);
 
 	function api_direct_messages_box(&$a, $type, $box) {
-		if (local_user()===false) return false;
+		if (api_user()===false) return false;
 		
 		$user_info = api_get_user($a);
 		
@@ -1640,7 +1651,7 @@
 		}
 		
 		$r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d,%d",
-				intval(local_user()),
+				intval(api_user()),
 				intval($start),	intval($count)
 		);
 		

include/group.php

@@ -279,7 +279,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 	return $o;
 }
 
-function expand_groups($a) {
+function expand_groups($a,$check_dead = false) {
 	if(! (is_array($a) && count($a)))
 		return array();
 	$groups = implode(',', $a);
@@ -289,6 +289,10 @@ function expand_groups($a) {
 	if(count($r))
 		foreach($r as $rr)
 			$ret[] = $rr['contact-id'];
+	if($check_dead) {
+		require_once('include/acl_selectors.php');
+		$ret = prune_deadguys($ret);
+	}
 	return $ret;
 }
 

include/notifier.php

@@ -309,7 +309,7 @@ function notifier_run(&$argv, &$argc){
 			}
 
 			$allow_people = expand_acl($parent['allow_cid']);
-			$allow_groups = expand_groups(expand_acl($parent['allow_gid']));
+			$allow_groups = expand_groups(expand_acl($parent['allow_gid']),true);
 			$deny_people  = expand_acl($parent['deny_cid']);
 			$deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 

include/oembed.php

@@ -74,9 +74,10 @@ function oembed_format_object($j){
 	switch ($j->type) {
 		case "video": {
 			if (isset($j->thumbnail_url)) {
-				$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+				$tw = (isset($j->thumbnail_width) && intval($j->thumbnail_width)) ? $j->thumbnail_width:200;
-				$th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
+				$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
-				$tr = $tw/$th;
+				// make sure we don't attempt divide by zero, fallback is a 1:1 ratio
+				$tr = (($th) ? $tw/$th : 1);
 				
 				$th=120; $tw = $th*$tr;
 				$tpl=get_markup_template('oembed_video.tpl');

include/onepoll.php

@@ -118,6 +118,7 @@ function onepoll_run(&$argv, &$argc){
 
 	if($contact['network'] === NETWORK_DFRN) {
 
+		
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 		if(intval($contact['duplex']) && $contact['dfrn-id'])
 			$idtosend = '0:' . $orig_id;
@@ -127,6 +128,12 @@ function onepoll_run(&$argv, &$argc){
 		// they have permission to write to us. We already filtered this in the contact query.
 		$perm = 'rw';
 
+		// But this may be our first communication, so set the writable flag if it isn't set already.
+
+		if(! intval($contact['writable']))
+			q("update contact set writable = 1 where id = %d limit 1", intval($contact['id']));
+
+
 		$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 			. '&type=data&last_update=' . $last_update 

include/template_processor.php

@@ -1,250 +1,295 @@
 <?php
-	define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
-	class Template {
+define("KEY_NOT_EXISTS", '^R_key_not_Exists^');
-		var $r;
+
-		var $search;
+class Template {
-		var $replace;
+
-		var $stack = array();
+	var $r;
-		var $nodes = array();
+	var $search;
-		var $done = false;
+	var $replace;
-		var $d = false;
+	var $stack = array();
-		var $lang = null;
+	var $nodes = array();
-		var $debug=false;
+	var $done = false;
-		
+	var $d = false;
-		private function _preg_error(){
+	var $lang = null;
-			
+	var $debug = false;
-			switch(preg_last_error()){
+
-			    case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
+	private function _preg_error() {
-			    case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
+
-			    case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
+		switch (preg_last_error()) {
-			    case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
+			case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR');
-// This is only valid for php > 5.3, not certain how to code around it for unit tests
+				break;
-//			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+			case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR');
-			    default:
+				break;
-					//die("Unknown preg error.");
+			case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR');
-					return;
+				break;
-			}
+			case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR');
-			echo "<hr><pre>";
+				break;
-			debug_print_backtrace();
+//			This is only valid for php > 5.3, not certain how to code around it for unit tests
-			die();
+//			case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+			default:
+				//die("Unknown preg error.");
+				return;
 		}
-		
+		echo "<hr><pre>";
-		
+		debug_print_backtrace();
-		private function _push_stack(){
+		die();
-			$this->stack[] = array($this->r, $this->nodes);
+	}
+
+	private function _push_stack() {
+		$this->stack[] = array($this->r, $this->nodes);
+	}
+
+	private function _pop_stack() {
+		list($this->r, $this->nodes) = array_pop($this->stack);
+	}
+
+	private function _get_var($name, $retNoKey = false) {
+		$keys = array_map('trim', explode(".", $name));
+		if ($retNoKey && !array_key_exists($keys[0], $this->r))
+			return KEY_NOT_EXISTS;
+		$val = $this->r;
+		foreach ($keys as $k) {
+			$val = (isset($val[$k]) ? $val[$k] : null);
 		}
-		private function _pop_stack(){
+		return $val;
-			list($this->r, $this->nodes) = array_pop($this->stack);
+	}
-			
+
+	/**
+	 * IF node
+	 * 
+	 * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
+	 * {{ if <$var>==<val|$var> }}...[{{ else }} ...]{{ endif }}
+	 * {{ if <$var>!=<val|$var> }}...[{{ else }} ...]{{ endif }}
+	 */
+	private function _replcb_if($args) {
+		if (strpos($args[2], "==") > 0) {
+			list($a, $b) = array_map("trim", explode("==", $args[2]));
+			$a = $this->_get_var($a);
+			if ($b[0] == "$")
+				$b = $this->_get_var($b);
+			$val = ($a == $b);
+		} else if (strpos($args[2], "!=") > 0) {
+			list($a, $b) = array_map("trim", explode("!=", $args[2]));
+			$a = $this->_get_var($a);
+			if ($b[0] == "$")
+				$b = $this->_get_var($b);
+			$val = ($a != $b);
+		} else {
+			$val = $this->_get_var($args[2]);
 		}
-		
+		$x = preg_split("|{{ *else *}}|", $args[3]);
-		private function _get_var($name, $retNoKey=false){
+		return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
-			$keys = array_map('trim',explode(".",$name));
+	}
-			if ($retNoKey && !array_key_exists($keys[0], $this->r)) return KEY_NOT_EXISTS;
+
-			$val = $this->r;
+	/**
-			foreach($keys as $k) {
+	 * FOR node
-				$val = (isset($val[$k]) ? $val[$k] : null);
+	 * 
-			}
+	 * {{ for <$var> as $name }}...{{ endfor }}
-			return $val;
+	 * {{ for <$var> as $key=>$name }}...{{ endfor }}
+	 */
+	private function _replcb_for($args) {
+		$m = array_map('trim', explode(" as ", $args[2]));
+		$x = explode("=>", $m[1]);
+		if (count($x) == 1) {
+			$varname = $x[0];
+			$keyname = "";
+		} else {
+			list($keyname, $varname) = $x;
 		}
-		
+		if ($m[0] == "" || $varname == "" || is_null($varname))
-		/**
+			die("template error: 'for " . $m[0] . " as " . $varname . "'");
-		 * IF node
+		//$vals = $this->r[$m[0]];
-		 * 
+		$vals = $this->_get_var($m[0]);
-		 * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
+		$ret = "";
-		 * {{ if <$var>==<val|$var> }}...[{{ else }} ...]{{ endif }}
+		if (!is_array($vals))
-		 * {{ if <$var>!=<val|$var> }}...[{{ else }} ...]{{ endif }}
-		 */
-		private function _replcb_if($args){
-			if (strpos($args[2],"==")>0){
-				list($a,$b) = array_map("trim",explode("==",$args[2]));
-				$a = $this->_get_var($a);
-				if ($b[0]=="$") $b =  $this->_get_var($b);
-				$val = ($a == $b);
-			} else if (strpos($args[2],"!=")>0){
-				list($a,$b) = array_map("trim", explode("!=",$args[2]));
-				$a = $this->_get_var($a);
-				if ($b[0]=="$") $b =  $this->_get_var($b);
-				$val = ($a != $b);
-			} else {
-				$val = $this->_get_var($args[2]);
-			}
-			$x = preg_split("|{{ *else *}}|", $args[3]);
-			return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
-		}
-		
-		/**
-		 * FOR node
-		 * 
-		 * {{ for <$var> as $name }}...{{ endfor }}
-		 * {{ for <$var> as $key=>$name }}...{{ endfor }}
-		 */
-		private function _replcb_for($args){
-			$m = array_map('trim', explode(" as ", $args[2]));
-			$x = explode("=>",$m[1]);
-			if (count($x) == 1) {
-				$varname = $x[0];
-				$keyname = "";
-			} else {
-				list($keyname, $varname) = $x;
-			}
-			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
-			//$vals = $this->r[$m[0]];
-			$vals = $this->_get_var($m[0]);
-			$ret="";
-			if (!is_array($vals)) return $ret; 
-			foreach ($vals as $k=>$v){
-				$this->_push_stack();
-				$r = $this->r;
-				$r[$varname] = $v;
-				if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
-				$ret .=  $this->replace($args[3], $r);
-				$this->_pop_stack();
-			}
 			return $ret;
-		}
+		foreach ($vals as $k => $v) {
-
-		/**
-		 * INC node
-		 * 
-		 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
-		 */
-		private function _replcb_inc($args){
-			if (strpos($args[2],"with")) {
-				list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
-			} else {
-				$tplfile = trim($args[2]);
-				$newctx = null;
-			}
-			
-			if ($tplfile[0]=="$") $tplfile = $this->_get_var($tplfile);
-			
 			$this->_push_stack();
 			$r = $this->r;
-			if (!is_null($newctx)) {
+			$r[$varname] = $v;
-				list($a,$b) = array_map('trim', explode("=",$newctx));
+			if ($keyname != '')
-				$r[$a] = $this->_get_var($b); 
+				$r[$keyname] = (($k === 0) ? '0' : $k);
-			}
+			$ret .= $this->replace($args[3], $r);
-			$this->nodes = Array();
-			$tpl = get_markup_template($tplfile);
-			$ret = $this->replace($tpl, $r);
 			$this->_pop_stack();
-			return $ret;
-			
 		}
-		
+		return $ret;
-		/**
+	}
-		 * DEBUG node
+
-		 * 
+	/**
-		 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+	 * INC node
-		 * 
+	 * 
-		 * replace node with <pre>var_dump($var, $var, ...);</pre>
+	 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
+	 */
+	private function _replcb_inc($args) {
+		if (strpos($args[2], "with")) {
+			list($tplfile, $newctx) = array_map('trim', explode("with", $args[2]));
+		} else {
+			$tplfile = trim($args[2]);
+			$newctx = null;
+		}
+
+		if ($tplfile[0] == "$")
+			$tplfile = $this->_get_var($tplfile);
+
+		$this->_push_stack();
+		$r = $this->r;
+		if (!is_null($newctx)) {
+			list($a, $b) = array_map('trim', explode("=", $newctx));
+			$r[$a] = $this->_get_var($b);
+		}
+		$this->nodes = Array();
+		$tpl = get_markup_template($tplfile);
+		$ret = $this->replace($tpl, $r);
+		$this->_pop_stack();
+		return $ret;
+	}
+
+	/**
+	 * DEBUG node
+	 * 
+	 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+	 * 
+	 * replace node with <pre>var_dump($var, $var, ...);</pre>
+	 */
+	private function _replcb_debug($args) {
+		$vars = array_map('trim', explode(" ", $args[2]));
+		$vars[] = $args[1];
+
+		$ret = "<pre>";
+		foreach ($vars as $var) {
+			$ret .= htmlspecialchars(var_export($this->_get_var($var), true));
+			$ret .= "\n";
+		}
+		$ret .= "</pre>";
+		return $ret;
+	}
+
+	private function _replcb_node($m) {
+		$node = $this->nodes[$m[1]];
+		if (method_exists($this, "_replcb_" . $node[1])) {
+			$s = call_user_func(array($this, "_replcb_" . $node[1]), $node);
+		} else {
+			$s = "";
+		}
+		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+		return $s;
+	}
+
+	private function _replcb($m) {
+		//var_dump(array_map('htmlspecialchars', $m));
+		$this->done = false;
+		$this->nodes[] = (array) $m;
+		return "||" . (count($this->nodes) - 1) . "||";
+	}
+
+	private function _build_nodes($s) {
+		$this->done = false;
+		while (!$this->done) {
+			$this->done = true;
+			$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
+			if ($s == Null)
+				$this->_preg_error();
+		}
+		//({{ *else *}}[^{]*)?
+		krsort($this->nodes);
+		return $s;
+	}
+
+	private function var_replace($s) {
+		$m = array();
+		/** regexp:
+		 * \$ 						literal $
+		 * (\[)?					optional open square bracket
+		 * ([a-zA-Z0-9-_]+\.?)+		var name, followed by optional
+		 * 							dot, repeated at least 1 time
+		 * (|[a-zA-Z0-9-_:]+)*		pipe followed by filter name and args, zero or many
+		 * (?(1)\])					if there was opened square bracket
+		 * 							(subgrup 1), match close bracket
 		 */
-		private function _replcb_debug($args){
+		if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(\|[a-zA-Z0-9-_:]+)*(?(1)\])/', $s, $m)) {
-			$vars = array_map('trim', explode(" ",$args[2]));
+			foreach ($m[0] as $var) {
-			$vars[] = $args[1];
 
-			$ret = "<pre>";
+				$exp = str_replace(array("[", "]"), array("", ""), $var);
-			foreach ($vars as $var){
+				$exptks = explode("|", $exp);
-				$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
-				$ret .= "\n";
-			}
-			$ret .= "</pre>";
-			return $ret;
-		}
 
-		private function _replcb_node($m) {
+				$varn = $exptks[0];
-			$node = $this->nodes[$m[1]];
+				unset($exptks[0]);
-			if (method_exists($this, "_replcb_".$node[1])){
+				$val = $this->_get_var($varn, true);
-				$s = call_user_func(array($this, "_replcb_".$node[1]),  $node);
+				if ($val != KEY_NOT_EXISTS) {
-			} else {
+					/* run filters */
-				$s = "";
+					/*
-			}
+					 * Filter are in form of:
-			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+					 * filtername:arg:arg:arg
-			return $s;
+					 * 
-		}
+					 * "filtername" is function name
-						
+					 * "arg"s are optional, var value is appended to the end
-		private function _replcb($m){
+					 *			if one "arg"==='x' , is replaced with var value
-			//var_dump(array_map('htmlspecialchars', $m));
+					 * 
-			$this->done = false;	
+					 * examples:
-			$this->nodes[] = (array) $m;
+					 * $item.body|htmlspecialchars				// escape html chars
-			return "||". (count($this->nodes)-1) ."||";
+					 * $item.body|htmlspecialchars|strtoupper   // escape html and uppercase result
-		}
+					 * $item.created|date:%Y %M %j				// format date (created is a timestamp)
-		
+					 * $item.body|str_replace:cat:dog			// replace all "cat" with "dog"
-		private function _build_nodes($s){
+					 * $item.body|str_replace:cat:dog:x:1		// replace one "cat" with "dog"
-			$this->done = false;
+					 
-			while (!$this->done){
+					 */
-				$this->done=true;
+					foreach ($exptks as $filterstr) {
-				$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
+						$filter = explode(":", $filterstr);
-				if ($s==Null) $this->_preg_error();
+						$filtername = $filter[0];
-			}
+						unset($filter[0]);
-			//({{ *else *}}[^{]*)?
+						$valkey = array_search("x", $filter);
-			krsort($this->nodes);
+						if ($valkey === false) {
-			return $s;
+							$filter[] = $val;
-		}
+						} else {
-		
+							$filter[$valkey] = $val;
-
+						}
-		private function var_replace($s){
+						if (function_exists($filtername)) {
-			$m = array();
+							$val = call_user_func_array($filtername, $filter);
-			/** regexp:
+						}
-			 * \$ 						literal $
+					}
-			 * (\[)?					optional open square bracket
+					$s = str_replace($var, $val, $s);
-			 * ([a-zA-Z0-9-_]+\.?)+		var name, followed by optional
-			 * 							dot, repeated at least 1 time
-			 * (?(1)\])					if there was opened square bracket
-			 * 							(subgrup 1), match close bracket
-			 */
-			if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)){
-				
-				foreach($m[0] as $var){
-					$varn = str_replace(array("[","]"), array("",""), $var);
-					$val = $this->_get_var($varn, true);
-					if ($val!=KEY_NOT_EXISTS)
-						$s = str_replace($var, $val, $s);
 				}
 			}
-			
-			return $s;
 		}
-	
-		public function replace($s, $r) {
-			$this->r = $r;
-			
-			$s = $this->_build_nodes($s);
 
-			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+		return $s;
-			if ($s==Null) $this->_preg_error();
-			
-			// remove comments block
-			$s = preg_replace('/{#[^#]*#}/', "" , $s);
-			
-			// replace strings recursively (limit to 10 loops)
-			$os = ""; $count=0;
-			while($os!=$s && $count<10){
-				$os=$s; $count++;
-				$s = $this->var_replace($s);
-			}
-			return $s;
-		}
 	}
-	
-	$t = new Template;
 
+	public function replace($s, $r) {
+		$this->r = $r;
 
+		$s = $this->_build_nodes($s);
 
+		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+		if ($s == Null)
+			$this->_preg_error();
+
+		// remove comments block
+		$s = preg_replace('/{#[^#]*#}/', "", $s);
+
+		// replace strings recursively (limit to 10 loops)
+		$os = "";
+		$count = 0;
+		while ($os != $s && $count < 10) {
+			$os = $s;
+			$count++;
+			$s = $this->var_replace($s);
+		}
+		return $s;
+	}
+
+}
+
+$t = new Template;
 
 function template_escape($s) {
 
-	return str_replace(array('$','{{'),array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),$s);
+	return str_replace(array('$', '{{'), array('!_Doll^Ars1Az_!', '!_DoubLe^BraceS4Rw_!'), $s);
-
-
 }
 
 function template_unescape($s) {
 
-	return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),array('$','{{'),$s);
+	return str_replace(array('!_Doll^Ars1Az_!', '!_DoubLe^BraceS4Rw_!'), array('$', '{{'), $s);
-
-
-
 }
+

mod/parse_url.php

@@ -239,6 +239,9 @@ function parse_url_content(&$a) {
 	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
 		$textmode = true;
 
+	if(local_user() && (! feature_enabled(local_user(),'richtext')))
+		$textmode = true;
+
 	//if($textmode)
 	$br = (($textmode) ? "\n" : '<br />');
 

mod/profiles.php

@@ -602,6 +602,7 @@ function profiles_content(&$a) {
 			'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 			'$banner' => t('Edit Profile Details'),
 			'$submit' => t('Submit'),
+			'$profpic' => t('Change Profile Photo'),
 			'$viewprof' => t('View this profile'),
 			'$cr_prof' => t('Create a new profile using these settings'),
 			'$cl_prof' => t('Clone this profile'),

mod/wall_attach.php

@@ -122,10 +122,7 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	$lf = '<br />';
+	$lf = "\n";
-
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-		$lf = "\n";
 
 	echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
 	

mod/wall_upload.php

@@ -160,17 +160,9 @@ function wall_upload_post(&$a) {
 
 //if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
 	if ($_REQUEST['hush']!='yeah') {
-
+		echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
-		/*existing code*/
+	}
-		if(local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || x($_REQUEST['nomce'])) ) {
+	else {
-			echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
-		}
-		else {
-			echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
-		}
-		/*existing code*/
-		
-	} else {
 		$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
 		return($m);
 	}

mods/sample-nginx.config

@@ -0,0 +1,111 @@
+##
+# Friendica Nginx configuration
+# by Olaf Conradi
+#
+# On Debian based distributions you can add this file to
+# /etc/nginx/sites-available
+#
+# Then customize to your needs. To enable the configuration
+# symlink it to /etc/nginx/sites-enabled and reload Nginx
+# using /etc/init.d/nginx reload
+##
+
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+#
+# http://wiki.nginx.org/Pitfalls
+# http://wiki.nginx.org/QuickStart
+# http://wiki.nginx.org/Configuration
+##
+
+##
+# This configuration assumes your domain is example.net
+# You have a separate subdomain friendica.example.net
+# You want all friendica traffic to be https
+# You have an SSL certificate and key for your subdomain
+# You have PHP FastCGI Process Manager (php5-fpm) running on localhost
+# You have Friendica installed in /mnt/friendica/www
+##
+
+server {
+  server_name friendica.example.net;
+  index index.php;
+  root /mnt/friendica/www;
+  rewrite ^ https://friendica.example.net$request_uri? permanent;
+}
+
+##
+# Configure Friendica with SSL
+#
+# All requests are routed to the front controller
+# except for certain known file types like images, css, etc.
+# Those are served statically whenever possible with a
+# fall back to the front controller (needed for avatars, for example)
+##
+
+server {
+  listen 443 ssl;
+  server_name friendica.example.net;
+
+  index index.php;
+  root /mnt/friendica/www;
+
+  ssl on;
+  ssl_certificate /etc/nginx/ssl/friendica.example.net.chain.pem;
+  ssl_certificate_key /etc/nginx/ssl/example.net.key;
+  ssl_session_timeout 5m;
+  ssl_protocols SSLv3 TLSv1;
+  ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+  ssl_prefer_server_ciphers on;
+
+  # allow uploads up to 20MB in size
+  client_max_body_size 20m;
+  client_body_buffer_size 128k;
+
+  # rewrite to front controller as default rule
+  location / {
+    rewrite ^/(.*) /index.php?q=$uri&$args last;
+  }
+
+  # make sure webfinger and other well known services aren't blocked
+  # by denying dot files and rewrite request to the front controller
+  location ^~ /.well-known/ {
+    allow all;
+    rewrite ^/(.*) /index.php?q=$uri&$args last;
+  }
+
+  # statically serve these file types when possible
+  # otherwise fall back to front controller
+  # allow browser to cache them
+  # added .htm for advanced source code editor library
+  location ~* \.(jpg|jpeg|gif|png|css|js|htm|html)$ {
+    expires 30d;
+    try_files $uri /index.php?q=$uri&$args;
+  }
+
+  # block these file types
+  location ~* \.(tpl|md|tgz|log|out)$ {
+    deny all;
+  }
+
+  # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+  location ~* \.php$ {
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+
+    # With php5-cgi alone:
+    # fastcgi_pass 127.0.0.1:9000;
+
+    # With php5-fpm:
+    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    fastcgi_index index.php;
+    include fastcgi_params;
+  }
+
+  # deny access to all dot files
+  location ~ /\. {
+    deny all;
+  }
+}
+

object/Item.php

@@ -99,6 +99,7 @@ class Item extends BaseObject {
 
 		$conv = $this->get_conversation();
 
+
 		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
@@ -496,6 +497,12 @@ class Item extends BaseObject {
 		if($conv) {
 			// This will allow us to comment on wall-to-wall items owned by our friends
 			// and community forums even if somebody else wrote the post.
+
+			// bug #517 - this fixes for conversation owner
+			if($conv->get_mode() == 'profile' && $conv->get_profile_owner() == local_user())
+				return true; 
+
+			// this fixes for visitors
 			return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile'));
 		}
 		return $this->writable;

view/nb-no/strings.php

@@ -11,18 +11,18 @@ $a->strings["Contact update failed."] = "Kontaktoppdatering mislyktes.";
 $a->strings["Permission denied."] = "Ingen tilgang.";
 $a->strings["Contact not found."] = "Kontakt ikke funnet.";
 $a->strings["Repair Contact Settings"] = "Reparer kontaktinnstillinger";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVARSEL: Dette er meget avansert</strong> og hvis du skriver feil informasjon her, så kan kommunikasjonen med denne kontakten slutte å virke.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Vennligst bruk Tilbake-knappen i nettleseren din <strong>nå</strong> hvis du er usikker på hva du bør gjøre på denne siden.";
 $a->strings["Return to contact editor"] = "";
 $a->strings["Name"] = "Navn";
 $a->strings["Account Nickname"] = "Konto Kallenavn";
-$a->strings["@Tagname - overrides Name/Nickname"] = "";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Merkelappnavn - overstyrer Navn/Kallenavn";
 $a->strings["Account URL"] = "Konto URL";
 $a->strings["Friend Request URL"] = "Venneforespørsel URL";
 $a->strings["Friend Confirm URL"] = "Vennebekreftelse URL";
 $a->strings["Notification Endpoint URL"] = "Endepunkt URL for beskjed";
 $a->strings["Poll/Feed URL"] = "Poll/Feed URL";
-$a->strings["New photo from this URL"] = "";
+$a->strings["New photo from this URL"] = "Nytt bilde fra denne URL-en";
 $a->strings["Submit"] = "Lagre";
 $a->strings["Help:"] = "Hjelp:";
 $a->strings["Help"] = "Hjelp";
@@ -58,11 +58,11 @@ $a->strings["Tag removed"] = "Fjernet tag";
 $a->strings["Remove Item Tag"] = "Fjern tag";
 $a->strings["Select a tag to remove: "] = "Velg en tag å fjerne:";
 $a->strings["Remove"] = "Slett";
-$a->strings["%s welcomes %s"] = "%s hilser %s velkommen";
+$a->strings["%1\$s welcomes %2\$s"] = "";
-$a->strings["Authorize application connection"] = "";
+$a->strings["Authorize application connection"] = "Tillat forbindelse til program";
-$a->strings["Return to your app and insert this Securty Code:"] = "";
+$a->strings["Return to your app and insert this Securty Code:"] = "Gå tilbake til din app og legg inn denne sikkerhetskoden:";
-$a->strings["Please login to continue."] = "";
+$a->strings["Please login to continue."] = "Vennligst logg inn for å fortsette.";
-$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?"] = "Vil du tillate at dette programmet får tilgang til dine innlegg og kontakter, og/eller kan opprette nye innlegg for deg?";
 $a->strings["Yes"] = "Ja";
 $a->strings["No"] = "Nei";
 $a->strings["Photo Albums"] = "Fotoalbum";
@@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Profilbilder";
 $a->strings["Album not found."] = "Album ble ikke funnet.";
 $a->strings["Delete Album"] = "Slett album";
 $a->strings["Delete Photo"] = "Slett bilde";
-$a->strings["was tagged in a"] = "ble tagget i et";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
-$a->strings["photo"] = "bilde";
+$a->strings["a photo"] = "";
-$a->strings["by"] = "av";
 $a->strings["Image exceeds size limit of "] = "Bilde overstiger størrelsesbegrensningen på ";
 $a->strings["Image file is empty."] = "Bildefilen er tom.";
 $a->strings["Unable to process image."] = "Ikke i stand til å behandle bildet.";
@@ -85,7 +84,6 @@ $a->strings["Public access denied."] = "Offentlig tilgang ikke tillatt.";
 $a->strings["No photos selected"] = "Ingen bilder er valgt";
 $a->strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset.";
 $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"] = "Last opp bilder";
 $a->strings["New album name: "] = "Nytt albumnavn:";
 $a->strings["or existing album name: "] = "eller eksisterende albumnavn:";
@@ -135,13 +133,19 @@ $a->strings["Edit post"] = "Endre innlegg";
 $a->strings["Post to Email"] = "Innlegg til e-post";
 $a->strings["Edit"] = "Endre";
 $a->strings["Upload photo"] = "Last opp bilde";
+$a->strings["upload photo"] = "";
 $a->strings["Attach file"] = "Legg ved fil";
+$a->strings["attach file"] = "";
 $a->strings["Insert web link"] = "Sett inn web-adresse";
-$a->strings["Insert YouTube video"] = "Sett inn YouTube-video";
+$a->strings["web link"] = "";
-$a->strings["Insert Vorbis [.ogg] video"] = "Sett inn Vorbis [.ogg] video";
+$a->strings["Insert video link"] = "";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Sett inn Vorbis [ogg] lydfil";
+$a->strings["video link"] = "";
+$a->strings["Insert audio link"] = "";
+$a->strings["audio link"] = "";
 $a->strings["Set your location"] = "Angi din plassering";
+$a->strings["set location"] = "";
 $a->strings["Clear browser location"] = "Fjern nettleserplassering";
+$a->strings["clear location"] = "";
 $a->strings["Permission settings"] = "Tillatelser";
 $a->strings["CC: email addresses"] = "Kopi: e-postadresser";
 $a->strings["Public post"] = "Offentlig innlegg";
@@ -183,16 +187,28 @@ $a->strings["Please enter your 'Identity Address' from one of the following supp
 $a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "";
 $a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
 $a->strings["Friend/Connection Request"] = "Venne-/Koblings-forespørsel";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Eksempler: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Vennligst svar på følgende:";
 $a->strings["Does %s know you?"] = "Kjenner %s deg?";
 $a->strings["Add a personal note:"] = "Legg til en personlig melding:";
-$a->strings["Friendica"] = "";
+$a->strings["Friendica"] = "Friendica";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federeated Social Web";
 $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "";
 $a->strings["Your Identity Address:"] = "Din identitetsadresse:";
 $a->strings["Submit Request"] = "Send forespørsel";
+$a->strings["Account settings"] = "Kontoinnstillinger";
+$a->strings["Display settings"] = "";
+$a->strings["Connector settings"] = "Koblingsinnstillinger";
+$a->strings["Plugin settings"] = "Tilleggsinnstillinger";
+$a->strings["Connected apps"] = "Tilkoblede programmer";
+$a->strings["Export personal data"] = "Eksporter personlige data";
+$a->strings["Remove account"] = "";
+$a->strings["Settings"] = "Innstillinger";
+$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."] = "";
 $a->strings["Could not create table."] = "";
@@ -249,7 +265,7 @@ $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "VIKTIG: Du må [manuelt] sette opp en planlagt oppgave for oppdatering.";
 $a->strings["l F d, Y \\@ g:i A"] = "";
 $a->strings["Time Conversion"] = "Tidskonvertering";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "UTC tid: %s";
 $a->strings["Current timezone: %s"] = "Gjeldende tidssone: %s";
 $a->strings["Converted localtime: %s"] = "Konvertert lokaltid: %s";
@@ -311,7 +327,7 @@ $a->strings["System"] = "";
 $a->strings["Network"] = "Nettverk";
 $a->strings["Personal"] = "";
 $a->strings["Home"] = "Hjem";
-$a->strings["Introductions"] = "";
+$a->strings["Introductions"] = "Introduksjoner";
 $a->strings["Messages"] = "Meldinger";
 $a->strings["Show Ignored Requests"] = "Vis ignorerte forespørsler";
 $a->strings["Hide Ignored Requests"] = "Skjul ignorerte forespørsler";
@@ -327,17 +343,17 @@ $a->strings["yes"] = "ja";
 $a->strings["no"] = "ei";
 $a->strings["Approve as: "] = "Godkjenn som:";
 $a->strings["Friend"] = "Venn";
-$a->strings["Sharer"] = "";
+$a->strings["Sharer"] = "Deler";
 $a->strings["Fan/Admirer"] = "Fan/Beundrer";
 $a->strings["Friend/Connect Request"] = "Venn/kontakt-forespørsel";
 $a->strings["New Follower"] = "Ny følgesvenn";
 $a->strings["No introductions."] = "";
 $a->strings["Notifications"] = "Varslinger";
-$a->strings["%s liked %s's post"] = "";
+$a->strings["%s liked %s's post"] = "%s likte %s sitt innlegg";
-$a->strings["%s disliked %s's post"] = "";
+$a->strings["%s disliked %s's post"] = "%s mislikte %s sitt innlegg";
-$a->strings["%s is now friends with %s"] = "";
+$a->strings["%s is now friends with %s"] = "%s er nå venner med %s";
-$a->strings["%s created a new post"] = "";
+$a->strings["%s created a new post"] = "%s skrev et nytt innlegg";
-$a->strings["%s commented on %s's post"] = "";
+$a->strings["%s commented on %s's post"] = "%s kommenterte på %s sitt innlegg";
 $a->strings["No more network notifications."] = "";
 $a->strings["Network Notifications"] = "";
 $a->strings["No more system notifications."] = "";
@@ -436,18 +452,12 @@ $a->strings["Forgot your Password?"] = "Glemte du passordet?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Skriv inn e-postadressen og send inn for å tilbakestille passordet ditt. Sjekk deretter e-posten din for nærmere forklaring.";
 $a->strings["Nickname or Email: "] = "Kallenavn eller e-post:";
 $a->strings["Reset"] = "Tilbakestill";
-$a->strings["Account settings"] = "Kontoinnstillinger";
+$a->strings["Additional features"] = "";
-$a->strings["Display settings"] = "";
-$a->strings["Connector settings"] = "Koblingsinnstillinger";
-$a->strings["Plugin settings"] = "Tilleggsinnstillinger";
-$a->strings["Connected apps"] = "Tilkoblede programmer";
-$a->strings["Export personal data"] = "Eksporter personlige data";
-$a->strings["Remove account"] = "";
-$a->strings["Settings"] = "Innstillinger";
 $a->strings["Missing some important data!"] = "Mangler noen viktige data!";
 $a->strings["Update"] = "Oppdater";
 $a->strings["Failed to connect with email account using the settings provided."] = "Mislyktes i å opprette forbindelse med e-postkontoen med de oppgitte innstillingene.";
 $a->strings["Email settings updated."] = "E-postinnstillinger er oppdatert.";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "Passordene er ikke like. Passord uendret.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Tomme passord er ikke lov. Passord uendret.";
 $a->strings["Password changed."] = "Passord endret.";
@@ -471,6 +481,9 @@ $a->strings["No name"] = "Ingen navn";
 $a->strings["Remove authorization"] = "Fjern tillatelse";
 $a->strings["No Plugin settings configured"] = "Ingen tilleggsinnstillinger konfigurert";
 $a->strings["Plugin Settings"] = "Tilleggsinnstillinger";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "Innebygget støtte for %s forbindelse er %s";
 $a->strings["enabled"] = "aktivert";
 $a->strings["disabled"] = "avskrudd";
@@ -573,17 +586,17 @@ $a->strings["Search Results For:"] = "";
 $a->strings["Remove term"] = "Fjern uttrykk";
 $a->strings["Saved Searches"] = "Lagrede søk";
 $a->strings["add"] = "";
-$a->strings["Commented Order"] = "";
+$a->strings["Commented Order"] = "Etter kommentarer";
 $a->strings["Sort by Comment Date"] = "";
-$a->strings["Posted Order"] = "";
+$a->strings["Posted Order"] = "Etter innlegg";
 $a->strings["Sort by Post Date"] = "";
 $a->strings["Posts that mention or involve you"] = "";
-$a->strings["New"] = "";
+$a->strings["New"] = "Ny";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "";
-$a->strings["Favourite Posts"] = "";
 $a->strings["Shared Links"] = "";
 $a->strings["Interesting Links"] = "";
+$a->strings["Starred"] = "Med stjerne";
+$a->strings["Favourite Posts"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Advarsel: denne gruppen inneholder %s medlem fra et usikkert nettverk.",
 	1 => "Advarsel: denne gruppe inneholder %s medlemmer fra et usikkert nettverk.",
@@ -594,6 +607,12 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ugyldig kontakt.";
 $a->strings["Personal Notes"] = "Personlige notater";
 $a->strings["Save"] = "Lagre";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
+$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."] = "Antall daglige veggmeldinger for %s er overskredet. Melding mislyktes.";
 $a->strings["No recipient selected."] = "Ingen mottaker valgt.";
 $a->strings["Unable to check your home location."] = "";
@@ -669,7 +688,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "Din registrering kan ikke behandles.";
 $a->strings["Registration request at %s"] = "Henvendelse om registrering ved %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Din registrering venter på godkjenning fra eier av stedet.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kan (valgfritt) fylle ut dette skjemaet via OpenID ved å oppgi din OpenID og klikke \"Registrer\".";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Hvis du ikke er kjent med OpenID, vennligst la feltet stå tomt, og fyll ut de andre feltene.";
 $a->strings["Your OpenID (optional): "] = "Din OpenID (valgfritt):";
@@ -683,6 +701,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
 $a->strings["Choose a nickname: "] = "Velg et kallenavn:";
 $a->strings["Register"] = "Registrer";
 $a->strings["People Search"] = "Personsøk";
+$a->strings["photo"] = "bilde";
 $a->strings["status"] = "status";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s liker %2\$s's %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s liker ikke %2\$s's %3\$s";
@@ -741,7 +760,7 @@ $a->strings["Delete message"] = "Slett melding";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "";
 $a->strings["Send Reply"] = "Send svar";
 $a->strings["Friends of %s"] = "Venner av %s";
-$a->strings["No friends to display."] = "";
+$a->strings["No friends to display."] = "Ingen venner å vise.";
 $a->strings["Theme settings updated."] = "";
 $a->strings["Site"] = "Nettsted";
 $a->strings["Users"] = "Brukere";
@@ -791,6 +810,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
 $a->strings["Register policy"] = "Registrer retningslinjer";
+$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"] = "Registrer tekst";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "";
@@ -913,6 +934,7 @@ $a->strings["Login failed."] = "Innlogging mislyktes.";
 $a->strings["Contact added"] = "";
 $a->strings["Common Friends"] = "";
 $a->strings["No contacts in common."] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "";
 $a->strings["Item has been removed."] = "Elementet har blitt slettet.";
 $a->strings["Applications"] = "Programmer";
@@ -995,7 +1017,7 @@ $a->strings["visible to everybody"] = "synlig for alle";
 $a->strings["Edit visibility"] = "Endre synlighet";
 $a->strings["Save to Folder:"] = "";
 $a->strings["- select -"] = "";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s merket %2\$s sitt %3\$s med %4\$s";
 $a->strings["No potential page delegates located."] = "";
 $a->strings["Delegate Page Management"] = "Deleger sidebehandling";
 $a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Delegater kan behandle alle sider ved denne kontoen/siden, bortsett fra grunnleggende kontoinnstillinger. Vennligst ikke deleger din personlige konto til noen som du ikke stoler fullt og fast på.";
@@ -1113,9 +1135,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "";
 $a->strings["StatusNet AutoFollow Settings"] = "";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "";
-$a->strings["Bg settings updated."] = "";
-$a->strings["Bg Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "";
 $a->strings["Lifetime of the cache (in hours)"] = "";
 $a->strings["Cache Statistics"] = "";
 $a->strings["Number of items"] = "";
@@ -1203,6 +1222,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"] = "";
 $a->strings["Login"] = "Logg inn";
 $a->strings["OpenID"] = "";
 $a->strings["Latest users"] = "";
@@ -1358,16 +1378,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "";
 $a->strings["dreamwidth username"] = "";
 $a->strings["dreamwidth password"] = "";
 $a->strings["Post to dreamwidth by default"] = "";
-$a->strings["Post to Drupal"] = "";
+$a->strings["Remote Permissions Settings"] = "";
-$a->strings["Drupal Post Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
-$a->strings["Enable Drupal Post Plugin"] = "";
+$a->strings["Remote Permissions settings updated."] = "";
-$a->strings["Drupal username"] = "";
+$a->strings["Visible to"] = "";
-$a->strings["Drupal password"] = "";
+$a->strings["may only be a partial list"] = "";
-$a->strings["Post Type - article,page,or blog"] = "";
+$a->strings["Global"] = "";
-$a->strings["Drupal site URL"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Drupal site uses clean URLS"] = "";
+$a->strings["Individual"] = "";
-$a->strings["Post to Drupal by default"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
-$a->strings["Post from Friendica"] = "";
 $a->strings["Startpage Settings"] = "";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
@@ -1384,15 +1403,13 @@ $a->strings["No files were uploaded."] = "Ingen filer ble lastet opp.";
 $a->strings["Uploaded file is empty"] = "Opplastet fil er tom";
 $a->strings["File has an invalid extension, it should be one of "] = "Filen har en ugyldig endelse, den må være en av ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Opplasting avbrutt, eller det oppstod en feil på tjeneren";
-$a->strings["OEmbed settings updated"] = "OEmbed-innstillingene er oppdatert";
-$a->strings["Use OEmbed for YouTube videos"] = "Bruk OEmbed til YouTube-videoer";
-$a->strings["URL to embed:"] = "URL som skal innebygges:";
 $a->strings["show/hide"] = "";
 $a->strings["No forum subscriptions"] = "";
 $a->strings["Forumlist settings updated."] = "";
 $a->strings["Forumlist Settings"] = "";
 $a->strings["Randomise forum list"] = "";
 $a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Informasjon om nettstedet";
 $a->strings["Site Owner"] = "Nettstedets eier";
 $a->strings["Email Address"] = "E-postadresse";
@@ -1524,6 +1541,7 @@ $a->strings["Tumblr password"] = "";
 $a->strings["Post to Tumblr by default"] = "";
 $a->strings["Numfriends settings updated."] = "";
 $a->strings["Numfriends Settings"] = "";
+$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."] = "";
@@ -1537,6 +1555,7 @@ $a->strings["WordPress password"] = "";
 $a->strings["WordPress API URL"] = "";
 $a->strings["Post to WordPress by default"] = "";
 $a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Post from Friendica"] = "";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
 $a->strings["\"Show more\" Settings"] = "";
 $a->strings["Enable Show More"] = "";
@@ -1628,6 +1647,8 @@ $a->strings["Last tweets"] = "";
 $a->strings["Alignment"] = "";
 $a->strings["Left"] = "";
 $a->strings["Center"] = "";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -1660,6 +1681,7 @@ $a->strings["Zot!"] = "";
 $a->strings["LinkedIn"] = "";
 $a->strings["XMPP/IM"] = "";
 $a->strings["MySpace"] = "";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "Mann";
 $a->strings["Female"] = "Kvinne";
 $a->strings["Currently Male"] = "For øyeblikket mann";
@@ -1789,6 +1811,18 @@ $a->strings["Attachments:"] = "";
 $a->strings["view full size"] = "";
 $a->strings["Embedded content"] = "";
 $a->strings["Embedding disabled"] = "Innebygging avskrudd";
+$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["Error! Cannot check nickname"] = "";
+$a->strings["User '%s' already exists on this server!"] = "";
+$a->strings["User creation error"] = "";
+$a->strings["User profile creation error"] = "";
+$a->strings["%d contact not imported"] = array(
+	0 => "",
+	1 => "",
+);
+$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"] = "";
 $a->strings["Everybody"] = "Alle";
@@ -1810,6 +1844,8 @@ $a->strings["Conversations on this site"] = "Samtaler på dette nettstedet";
 $a->strings["Directory"] = "Katalog";
 $a->strings["People directory"] = "Personkatalog";
 $a->strings["Conversations from your friends"] = "Samtaler fra dine venner";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "";
 $a->strings["See all notifications"] = "";
 $a->strings["Mark all system notifications seen"] = "";
@@ -1819,7 +1855,7 @@ $a->strings["Outbox"] = "Utboks";
 $a->strings["Manage"] = "Behandle";
 $a->strings["Manage other pages"] = "Behandle andre sider";
 $a->strings["Profiles"] = "Profiler";
-$a->strings["Manage/edit profiles"] = "Behandle/endre profiler";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "Behandle/endre venner og kontakter";
 $a->strings["Site setup and configuration"] = "Nettstedsoppsett og konfigurasjon";
 $a->strings["Nothing new here"] = "";
@@ -1863,6 +1899,43 @@ $a->strings["From: "] = "Fra: ";
 $a->strings["Image/photo"] = "Bilde/fotografi";
 $a->strings["$1 wrote:"] = "";
 $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"] = "";
+$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'"] = "Kan ikke finne DNS informasjon for databasetjeneren '%s' ";
 $a->strings["[no subject]"] = "[ikke noe emne]";
 $a->strings["Visible to everybody"] = "Synlig for alle";
@@ -1954,6 +2027,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "";
 $a->strings["Delete Selected Items"] = "Slette valgte elementer";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s liker dette.";
 $a->strings["%s doesn't like this."] = "%s liker ikke dette.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span %1\$s>%2\$d personer</span> liker dette.";
@@ -1967,15 +2041,7 @@ $a->strings["Please enter a video link/URL:"] = "";
 $a->strings["Please enter an audio link/URL:"] = "";
 $a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "Hvor er du akkurat nå?";
-$a->strings["upload photo"] = "";
+$a->strings["Delete item(s)?"] = "";
-$a->strings["attach file"] = "";
-$a->strings["web link"] = "";
-$a->strings["Insert video link"] = "";
-$a->strings["video link"] = "";
-$a->strings["Insert audio link"] = "";
-$a->strings["audio link"] = "";
-$a->strings["set location"] = "";
-$a->strings["clear location"] = "";
 $a->strings["permissions"] = "";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
@@ -1987,11 +2053,13 @@ $a->strings["Update Error at %s"] = "";
 $a->strings["Create a New Account"] = "Lag en ny konto";
 $a->strings["Nickname or Email address: "] = "Kallenavn eller epostadresse: ";
 $a->strings["Password: "] = "Passord: ";
+$a->strings["Remember me"] = "";
 $a->strings["Or login using OpenID: "] = "";
 $a->strings["Forgot your password?"] = "Glemt passordet?";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Rediger profil";
 $a->strings["Message"] = "";
+$a->strings["Manage/edit profiles"] = "Behandle/endre profiler";
 $a->strings["g A l F d"] = "";
 $a->strings["F d"] = "";
 $a->strings["[today]"] = "[idag]";
@@ -2004,3 +2072,19 @@ $a->strings["Status Messages and Posts"] = "";
 $a->strings["Profile Details"] = "";
 $a->strings["Events and Calendar"] = "";
 $a->strings["Only You Can See This"] = "";
+$a->strings["via"] = "";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "";
+$a->strings["Bg Settings"] = "";
+$a->strings["Post to Drupal"] = "";
+$a->strings["Drupal Post Settings"] = "";
+$a->strings["Enable Drupal Post Plugin"] = "";
+$a->strings["Drupal username"] = "";
+$a->strings["Drupal password"] = "";
+$a->strings["Post Type - article,page,or blog"] = "";
+$a->strings["Drupal site URL"] = "";
+$a->strings["Drupal site uses clean URLS"] = "";
+$a->strings["Post to Drupal by default"] = "";
+$a->strings["OEmbed settings updated"] = "OEmbed-innstillingene er oppdatert";
+$a->strings["Use OEmbed for YouTube videos"] = "Bruk OEmbed til YouTube-videoer";
+$a->strings["URL to embed:"] = "URL som skal innebygges:";

view/profile_edit.tpl

@@ -4,6 +4,7 @@ $default
 
 <div id="profile-edit-links">
 <ul>
+<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li>
 <li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
 <li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
 <li></li>

view/pt-br/intro_complete_eml.tpl

@@ -0,0 +1,22 @@
+
+Prezado/a $[username],
+
+	'$[fn]' em '$[dfrn_url]' aceitou 
+seu pedido de coneção em '$[sitename]'.
+
+	'$[fn]' optou por aceitá-lo com "fan", que restringe 
+algumas formas de comunicação, tais como mensagens privadas e algumas interações
+com o  perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram
+aplicadas automaticamente.
+
+	'$[fn]' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo 
+no futuro. 
+
+	Você começará a receber atualizações públicas de '$[fn]' 
+que aparecerão na sua página 'Rede'   
+
+$[siteurl]
+
+Cordialmente,
+
+	Administrador do $[sitemname]

view/pt-br/strings.php

@@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "A etiqueta foi removida";
 $a->strings["Remove Item Tag"] = "Remover a etiqueta do item";
 $a->strings["Select a tag to remove: "] = "Selecione uma etiqueta para remover: ";
 $a->strings["Remove"] = "Remover";
-$a->strings["%s welcomes %s"] = "%s dá as boas vindas a %s";
+$a->strings["%1\$s welcomes %2\$s"] = "";
 $a->strings["Authorize application connection"] = "Autorizar a conexão com a aplicação";
 $a->strings["Return to your app and insert this Securty Code:"] = "Volte para a sua aplicação e digite este código de segurança:";
 $a->strings["Please login to continue."] = "Por favor, autentique-se para continuar.";
@@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Fotos do perfil";
 $a->strings["Album not found."] = "O álbum não foi encontrado.";
 $a->strings["Delete Album"] = "Excluir o álbum";
 $a->strings["Delete Photo"] = "Excluir a foto";
-$a->strings["was tagged in a"] = "foi etiquetada em uma";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
-$a->strings["photo"] = "foto";
+$a->strings["a photo"] = "";
-$a->strings["by"] = "por";
 $a->strings["Image exceeds size limit of "] = "A imagem excede o tamanho máximo de ";
 $a->strings["Image file is empty."] = "O arquivo de imagem está vazio.";
 $a->strings["Unable to process image."] = "Não foi possível processar a imagem.";
@@ -85,7 +84,6 @@ $a->strings["Public access denied."] = "Acesso público negado.";
 $a->strings["No photos selected"] = "Não foi selecionada nenhuma foto";
 $a->strings["Access to this item is restricted."] = "O acesso a este item é restrito.";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Você está usando %1$.2f Mbytes dos %2$.2f Mbytes liberados para armazenamento de fotos.";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Você está usando %1$.2f Mbytes do armazenamento de fotos.";
 $a->strings["Upload Photos"] = "Enviar fotos";
 $a->strings["New album name: "] = "Nome do novo álbum: ";
 $a->strings["or existing album name: "] = "ou o nome de um álbum já existente: ";
@@ -199,6 +197,18 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - Por favor, não utilize esse formulário.  Ao invés disso, digite %s na sua barra de pesquisa do Diaspora.";
 $a->strings["Your Identity Address:"] = "Seu endereço de identificação:";
 $a->strings["Submit Request"] = "Enviar solicitação";
+$a->strings["Account settings"] = "Configurações da conta";
+$a->strings["Display settings"] = "Configurações de exibição";
+$a->strings["Connector settings"] = "Configurações do conector";
+$a->strings["Plugin settings"] = "Configurações dos plugins";
+$a->strings["Connected apps"] = "Aplicações conectadas";
+$a->strings["Export personal data"] = "Exportar dados pessoais";
+$a->strings["Remove account"] = "Remover a conta";
+$a->strings["Settings"] = "Configurações";
+$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"] = "Servidor de Comunicações Sociais Friendica - Configuração";
 $a->strings["Could not connect to database."] = "Não foi possível conectar ao banco de dados.";
 $a->strings["Could not create table."] = "Não foi possível criar tabela.";
@@ -249,13 +259,13 @@ $a->strings["You can alternatively skip this procedure and perform a manual inst
 $a->strings[".htconfig.php is writable"] = ".htconfig.php tem permissão de escrita";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "A reescrita de URLs definida no .htaccess não está funcionando. Por favor, verifique as configurações do seu servidor.";
 $a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendica em seu servidor web.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
 $a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
 $a->strings["<h1>What next</h1>"] = "<h1>A seguir</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o captador.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ H:i";
 $a->strings["Time Conversion"] = "Conversão de tempo";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "Hora UTC: %s";
 $a->strings["Current timezone: %s"] = "Fuso horário atual: %s";
 $a->strings["Converted localtime: %s"] = "Horário local convertido: %s";
@@ -442,18 +452,12 @@ $a->strings["Forgot your Password?"] = "Esqueceu a sua senha?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Digite o seu endereço de e-mail e clique em 'Reiniciar' para prosseguir com a reiniciação da sua senha. Após isso, verifique seu e-mail para mais instruções.";
 $a->strings["Nickname or Email: "] = "Identificação ou e-mail: ";
 $a->strings["Reset"] = "Reiniciar";
-$a->strings["Account settings"] = "Configurações da conta";
+$a->strings["Additional features"] = "";
-$a->strings["Display settings"] = "Configurações de exibição";
-$a->strings["Connector settings"] = "Configurações do conector";
-$a->strings["Plugin settings"] = "Configurações dos plugins";
-$a->strings["Connected apps"] = "Aplicações conectadas";
-$a->strings["Export personal data"] = "Exportar dados pessoais";
-$a->strings["Remove account"] = "Remover a conta";
-$a->strings["Settings"] = "Configurações";
 $a->strings["Missing some important data!"] = "Está faltando algum dado importante!";
 $a->strings["Update"] = "Atualizar";
 $a->strings["Failed to connect with email account using the settings provided."] = "Não foi possível conectar à conta de e-mail com as configurações fornecidas.";
 $a->strings["Email settings updated."] = "As configurações de e-mail foram atualizadas.";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
 $a->strings["Password changed."] = "A senha foi modificada.";
@@ -477,6 +481,9 @@ $a->strings["No name"] = "Sem nome";
 $a->strings["Remove authorization"] = "Remover autorização";
 $a->strings["No Plugin settings configured"] = "Não foi definida nenhuma configuração de plugin";
 $a->strings["Plugin Settings"] = "Configurações do plugin";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "O suporte interno para conectividade de %s está %s";
 $a->strings["enabled"] = "habilitado";
 $a->strings["disabled"] = "desabilitado";
@@ -586,10 +593,10 @@ $a->strings["Sort by Post Date"] = "Ordenar pela data de publicação";
 $a->strings["Posts that mention or involve you"] = "Publicações que mencionem ou envolvam você";
 $a->strings["New"] = "Nova";
 $a->strings["Activity Stream - by date"] = "Fluxo de atividades - por data";
-$a->strings["Starred"] = "Destacada";
-$a->strings["Favourite Posts"] = "Publicações favoritas";
 $a->strings["Shared Links"] = "Links compartilhados";
 $a->strings["Interesting Links"] = "Links interessantes";
+$a->strings["Starred"] = "Destacada";
+$a->strings["Favourite Posts"] = "Publicações favoritas";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Aviso: Este grupo contém %s membro de uma rede insegura.",
 	1 => "Aviso: Este grupo contém %s membros de uma rede insegura.",
@@ -600,6 +607,12 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Contato inválido.";
 $a->strings["Personal Notes"] = "Notas pessoais";
 $a->strings["Save"] = "Salvar";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este site excedeu o limite diário permitido para registros de novas contas.\nPor favor tente novamente amanhã.";
+$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."] = "O número diário de mensagens do mural de %s foi excedido. Não foi possível enviar a mensagem.";
 $a->strings["No recipient selected."] = "Não foi selecionado nenhum destinatário.";
 $a->strings["Unable to check your home location."] = "Não foi possível verificar a sua localização.";
@@ -645,7 +658,7 @@ $a->strings["Groups"] = "Grupos";
 $a->strings["Group Your Contacts"] = "Agrupe seus contatos";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Após fazer novas amizades, organize-as em grupos de conversa privados, a partir da barra lateral na sua página de Contatos. A partir daí, você poderá interagir com cada grupo privativamente, na sua página de Rede.";
 $a->strings["Why Aren't My Posts Public?"] = "Por que as minhas publicações não são públicas?";
-$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "";
+$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "A friendica respeita sua privacidade. Por padrão, suas publicações estarão visíveis apenas para as pessoas que você adicionou como amigos. Para mais informações, veja a página de ajuda, a partir do link acima.";
 $a->strings["Getting Help"] = "Obtendo ajuda";
 $a->strings["Go to the Help Section"] = "Ir para a seção de ajuda";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Nossas páginas de <strong>ajuda</strong> podem ser consultadas para mais detalhes sobre características e recursos do programa.";
@@ -675,7 +688,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "Não foi possível processar o seu registro.";
 $a->strings["Registration request at %s"] = "Solicitação de registro em %s";
 $a->strings["Your registration is pending approval by the site owner."] = "A aprovação do seu registro está pendente junto ao administrador do site.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este site excedeu o limite diário permitido para registros de novas contas.\nPor favor tente novamente amanhã.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Você pode (opcionalmente) preencher este formulário via OpenID, fornecendo seu OpenID e clicando em 'Registrar'.";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se você não está familiarizado com o OpenID, por favor, deixe esse campo em branco e preencha os outros itens.";
 $a->strings["Your OpenID (optional): "] = "Seu OpenID (opcional): ";
@@ -689,6 +701,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
 $a->strings["Choose a nickname: "] = "Escolha uma identificação: ";
 $a->strings["Register"] = "Registrar";
 $a->strings["People Search"] = "Pesquisar pessoas";
+$a->strings["photo"] = "foto";
 $a->strings["status"] = "status";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gosta de %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s não gosta de %3\$s de %2\$s";
@@ -785,7 +798,7 @@ $a->strings["Site name"] = "Nome do site";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Idioma do sistema";
 $a->strings["System theme"] = "Tema do sistema";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema padrão do sistema. Pode ser substituído nos perfis de usuário -  <a href='#' id='cnftheme'>alterar configurações do tema</a>";
 $a->strings["Mobile system theme"] = "Tema do sistema para dispositivos móveis";
 $a->strings["Theme for mobile devices"] = "Tema para dispositivos móveis";
 $a->strings["SSL link policy"] = "Política de link SSL";
@@ -793,10 +806,12 @@ $a->strings["Determines whether generated links should be forced to use SSL"] =
 $a->strings["Maximum image size"] = "Tamanho máximo da imagem";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamanho máximo, em bytes, das imagens enviadas. O padrão é 0, o que significa sem limites";
 $a->strings["Maximum image length"] = "Tamanho máximo da imagem";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Tamanho máximo em pixels do lado mais largo das imagens enviadas. O padrão é -1, que significa sem limites.";
 $a->strings["JPEG image quality"] = "Qualidade da imagem JPEG";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Imagens JPEG enviadas serão salvas com essa qualidade [0-100]. O padrão é 100, que significa a melhor qualidade.";
 $a->strings["Register policy"] = "Política de registro";
+$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"] = "Texto de registro";
 $a->strings["Will be displayed prominently on the registration page."] = "Será exibido com destaque na página de registro.";
 $a->strings["Accounts abandoned after x days"] = "Contas abandonadas após x dias";
@@ -806,15 +821,15 @@ $a->strings["Comma separated list of domains which are allowed to establish frie
 $a->strings["Allowed email domains"] = "Domínios de e-mail permitidos";
 $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"] = "Lista de domínios separados por vírgula, que são permitidos em endereços de e-mail para registro nesse site. Caracteres-curinga são aceitos. Vazio para aceitar qualquer domínio";
 $a->strings["Block public"] = "Bloquear acesso público";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Marque para bloquear o acesso público a todas as páginas desse site, com exceção das páginas pessoais públicas, a não ser que a pessoa esteja autenticada.";
 $a->strings["Force publish"] = "Forçar a listagem";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Marque para forçar todos os perfis desse site a serem listados no diretório do site.";
 $a->strings["Global directory update URL"] = "URL de atualização do diretório global";
-$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL para atualizar o diretório global. Se isso não for definido, o diretório global não estará disponível neste site.";
 $a->strings["Allow threaded items"] = "";
 $a->strings["Allow infinite level threading for items on this site."] = "";
 $a->strings["Private posts by default for new users"] = "Publicações privadas por padrão para novos usuários";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Define as permissões padrão de publicação de todos os novos membros para o grupo de privacidade padrão, ao invés de torná-las públicas.";
 $a->strings["Block multiple registrations"] = "Bloquear registros repetidos";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Desabilitar o registro de contas adicionais para serem usadas como páginas.";
 $a->strings["OpenID support"] = "Suporte ao OpenID";
@@ -826,13 +841,13 @@ $a->strings["Use PHP UTF8 regular expressions"] = "Use expressões regulares do
 $a->strings["Show Community Page"] = "Exibir a página da comunidade";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Exibe uma página da Comunidade, mostrando todas as publicações recentes feitas nesse site.";
 $a->strings["Enable OStatus support"] = "Habilitar suporte ao OStatus";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Fornece compatibilidade nativa ao OStatus (identi,.ca, status.net, etc.). Todas as comunicações via OStatus são públicas, por isso avisos de privacidade serão exibidos ocasionalmente.";
 $a->strings["Enable Diaspora support"] = "Habilitar suporte ao Diaspora";
 $a->strings["Provide built-in Diaspora network compatibility."] = "Fornece compatibilidade nativa com a rede Diaspora.";
 $a->strings["Only allow Friendica contacts"] = "Permitir somente contatos Friendica";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Todos os contatos devem usar protocolos Friendica. Todos os outros protocolos de comunicação embarcados estão desabilitados";
 $a->strings["Verify SSL"] = "Verificar 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["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Caso deseje, você pode habilitar a restrição de certificações. Isso significa que você não poderá conectar-se a nenhum site que use certificados auto-assinados.";
 $a->strings["Proxy user"] = "Usuário do proxy";
 $a->strings["Proxy URL"] = "URL do proxy";
 $a->strings["Network timeout"] = "Limite de tempo da rede";
@@ -936,7 +951,7 @@ $a->strings["Religion"] = "Religião";
 $a->strings["Political Views"] = "Posicionamento político";
 $a->strings["Gender"] = "Gênero";
 $a->strings["Sexual Preference"] = "Preferência sexual";
-$a->strings["Homepage"] = "";
+$a->strings["Homepage"] = "Página Principal";
 $a->strings["Interests"] = "Interesses";
 $a->strings["Address"] = "Endereço";
 $a->strings["Location"] = "Localização";
@@ -945,7 +960,7 @@ $a->strings[" and "] = " e ";
 $a->strings["public profile"] = "perfil público";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
 $a->strings[" - Visit %1\$s's %2\$s"] = "";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s foi atualizado %2\$s, mudando %3\$s.";
 $a->strings["Profile deleted."] = "O perfil foi excluído.";
 $a->strings["Profile-"] = "Perfil-";
 $a->strings["New profile created."] = "O novo perfil foi criado.";
@@ -1042,13 +1057,13 @@ $a->strings["%d message sent."] = array(
 	1 => "%d mensagens enviadas.",
 );
 $a->strings["You have no more invitations available"] = "Você não possui mais convites disponíveis";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visite %s para obter uma lista de sites públicos onde você pode se cadastrar. Membros da friendica podem se conectar, mesmo que estejam em sites separados. Além disso você também pode se conectar com membros de várias outras redes sociais.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Para aceitar esse convite, por favor cadastre-se em %s ou qualquer outro site friendica público.";
-$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Os sites friendica estão todos interconectados para criar uma grande rede social com foco na privacidade e controlada por seus membros, que também podem se conectar com várias redes sociais tradicionais. Dê uma olhada em %s para uma lista de sites friendica onde você pode se cadastrar.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Desculpe, mas esse sistema não está configurado para conectar-se com outros sites públicos nem permite convidar novos membros.";
 $a->strings["Send invitations"] = "Enviar convites.";
 $a->strings["Enter email addresses, one per line:"] = "Digite os endereços de e-mail, um por linha:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Você está convidado a se juntar a mim e outros amigos em friendica - e também nos ajudar a criar uma experiência social melhor na web.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Você preciso informar este código de convite: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Após você se registrar, por favor conecte-se comigo através da minha página de perfil em:";
 $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Para mais informações sobre o projeto Friendica e porque nós achamos que ele é importante, por favor visite-nos em http://friendica.com.";
@@ -1096,8 +1111,8 @@ $a->strings["Comma separated applications to ignore"] = "Ignorar aplicações se
 $a->strings["Problems with Facebook Real-Time Updates"] = "Problemas com as atualizações em tempo real do Facebook";
 $a->strings["Facebook Connector Settings"] = "Configurações do conector do Facebook";
 $a->strings["Facebook API Key"] = "Chave da API do Facebook";
-$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>"] = "";
+$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>"] = "Erro: parece que você especificou o App-ID e o -Secret no arquivo .htconfig.php. Uma vez estão especificado lá, eles não podem ser definidos neste formulário.<br><br>";
-$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "";
+$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Erro: a chave de API fornecida parece estar incorreta (não foi possível recuperar o token de acesso à aplicação).";
 $a->strings["The given API Key seems to work correctly."] = "A chave de API fornecida aparentemente está funcionando corretamente.";
 $a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
@@ -1116,13 +1131,10 @@ $a->strings["View on Friendica"] = "Ver no Friendica";
 $a->strings["Facebook post failed. Queued for retry."] = "Não foi possível publicar no Facebook. Armazenado na fila para nova tentativa.";
 $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "A sua conexão com o Facebook tornou-se invalida. Por favor autentique-se novamente.";
 $a->strings["Facebook connection became invalid"] = "A conexão com o Facebook tornou-se inválida";
-$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "";
+$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Olá %1\$s,\n\nA conexão entre suas contas em %2\$s e o Facebook se tornou inválida. Isso geralmente acontece quando se troca a senha do Facebook. Para habilitar a conexão novamente vocẽ deve %3\$sreautenticar o conector do Facebook%4\$s.";
 $a->strings["StatusNet AutoFollow settings updated."] = "";
 $a->strings["StatusNet AutoFollow Settings"] = "";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "";
-$a->strings["Bg settings updated."] = "";
-$a->strings["Bg Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "Quantos contatos mostrar na barra lateral do perfil";
 $a->strings["Lifetime of the cache (in hours)"] = "Tempo de vida do cache (em horas)";
 $a->strings["Cache Statistics"] = "Estatísticas do cache";
 $a->strings["Number of items"] = "Número de itens";
@@ -1194,7 +1206,7 @@ $a->strings["Enable LiveJournal Post Plugin"] = "Habilitar o plugin de publicaç
 $a->strings["LiveJournal username"] = "Nome de usuário do LiveJournal";
 $a->strings["LiveJournal password"] = "Senha do LiveJournal";
 $a->strings["Post to LiveJournal by default"] = "Publicar no LiveJournal por padrão";
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configurações do filtro de conteúdo impróprio para o local de trabalho (Not Safe For Work)";
 $a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
 $a->strings["Enable Content filter"] = "Habilitar o filtro de conteúdo";
 $a->strings["Comma separated list of keywords to hide"] = "Lista de palavras-chave a serem ocultadas, separadas por vírgula";
@@ -1208,8 +1220,9 @@ $a->strings["Page Settings"] = "Configurações da página";
 $a->strings["How many forums to display on sidebar without paging"] = "";
 $a->strings["Randomise Page/Forum list"] = "";
 $a->strings["Show pages/forums on profile page"] = "";
-$a->strings["Planets Settings"] = "";
+$a->strings["Planets Settings"] = "Configuração dos planetas";
-$a->strings["Enable Planets Plugin"] = "";
+$a->strings["Enable Planets Plugin"] = "Habilita configuração dos planetas";
+$a->strings["Forum Directory"] = "";
 $a->strings["Login"] = "Entrar";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Últimos usuários";
@@ -1365,16 +1378,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Habilitar o plugin de publicaç
 $a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth";
 $a->strings["dreamwidth password"] = "Senha do Dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão";
-$a->strings["Post to Drupal"] = "Postar no Drupal";
+$a->strings["Remote Permissions Settings"] = "";
-$a->strings["Drupal Post Settings"] = "Configurações de Postagem no Drupal";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
-$a->strings["Enable Drupal Post Plugin"] = "Habilitar Plugin de Postagem do Drupal";
+$a->strings["Remote Permissions settings updated."] = "";
-$a->strings["Drupal username"] = "Nome de Usuário Drupal";
+$a->strings["Visible to"] = "";
-$a->strings["Drupal password"] = "Senha Drupal";
+$a->strings["may only be a partial list"] = "";
-$a->strings["Post Type - article,page,or blog"] = "Tipo de Postagem - artigo, página ou blog";
+$a->strings["Global"] = "";
-$a->strings["Drupal site URL"] = "URL do site Drupal";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Drupal site uses clean URLS"] = "Site Drupal usa URLs limpas";
+$a->strings["Individual"] = "";
-$a->strings["Post to Drupal by default"] = "Postar para o Drupal como padrão";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
-$a->strings["Post from Friendica"] = "Postar do Friendica";
 $a->strings["Startpage Settings"] = "Configurações da página inicial";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Página a ser carregada após a autenticação - deixe em branco para o mural do perfil";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemplos: &quot;network&quot; or &quot;notifications/system&quot;";
@@ -1391,9 +1403,6 @@ $a->strings["No files were uploaded."] = "Nenhum arquivo foi enviado.";
 $a->strings["Uploaded file is empty"] = "O arquivo enviado está em branco";
 $a->strings["File has an invalid extension, it should be one of "] = "O arquivo possui uma extensão inválida, são aceitas somente ";
 $a->strings["Upload was cancelled, or server error encountered"] = "O envio foi cancelado ou ocorreu algum erro no servidor";
-$a->strings["OEmbed settings updated"] = "As configurações OEmbed foram atualizadas";
-$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para vídeos do YouTube";
-$a->strings["URL to embed:"] = "URL a ser incorporada:";
 $a->strings["show/hide"] = "";
 $a->strings["No forum subscriptions"] = "";
 $a->strings["Forumlist settings updated."] = "";
@@ -1406,13 +1415,13 @@ $a->strings["Site Owner"] = "Responsável pelo site";
 $a->strings["Email Address"] = "Endereço de e-mail";
 $a->strings["Postal Address"] = "Endereço postal";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "O complemento Impressum necessita ser configurado!<br/>Por favor, adicione ao menos o nome do <tt>responsável</tt> ao arquivo de configuração. Para outras informações, por favor, consulte o arquivo README do complemento.";
-$a->strings["The page operators name."] = "";
+$a->strings["The page operators name."] = "O nome da página  operadores";
 $a->strings["Site Owners Profile"] = "Perfil do responsável pelo site";
-$a->strings["Profile address of the operator."] = "";
+$a->strings["Profile address of the operator."] = "Endereço do perfil do operador";
 $a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
 $a->strings["Notes"] = "Notas";
 $a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Como entrar em contato com o operador por e-mail. (não será mostrado)";
 $a->strings["Footer note"] = "Nota de rodapé";
 $a->strings["Text for the footer. You can use BBCode here."] = "";
 $a->strings["Report Bug"] = "Relate um Bug";
@@ -1441,16 +1450,16 @@ $a->strings["Editplain settings updated."] = "Configurações Editplain atualiza
 $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"] = "";
-$a->strings["generic profile image"] = "";
+$a->strings["generic profile image"] = "Imagem genérica de perfil";
-$a->strings["random geometric pattern"] = "";
+$a->strings["random geometric pattern"] = "Padrão geométrico randômico";
-$a->strings["monster face"] = "";
+$a->strings["monster face"] = "cara de monstro";
-$a->strings["computer generated face"] = "";
+$a->strings["computer generated face"] = "face gerada por computador";
-$a->strings["retro arcade style face"] = "";
+$a->strings["retro arcade style face"] = "estilo de face arcade retrô";
 $a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "";
 $a->strings["This addon is not functional on your server."] = "";
 $a->strings["Information"] = "";
 $a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
-$a->strings["Default avatar image"] = "";
+$a->strings["Default avatar image"] = "Imagem padrão do Avatar ";
 $a->strings["Select default avatar image if none was found. See README"] = "";
 $a->strings["Libravatar settings updated."] = "";
 $a->strings["Post to libertree"] = "";
@@ -1469,11 +1478,11 @@ $a->strings["The URL for the javascript file that should be included to use Math
 $a->strings["Editplain Settings"] = "Configurações Editplain";
 $a->strings["Disable richtext status editor"] = "Disabilite o modo de edição richtext";
 $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."] = "";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecione a imagem  padrão do Avatar se nenhuma for encontrada no Gravatar. Veja o Leiame";
-$a->strings["Rating of images"] = "";
+$a->strings["Rating of images"] = "Avaliação de imagens";
 $a->strings["Select the appropriate avatar rating for your site. See README"] = "";
-$a->strings["Gravatar settings updated."] = "";
+$a->strings["Gravatar settings updated."] = "Configurações do Avatar atualizadas";
-$a->strings["Your Friendica test account is about to expire."] = "";
+$a->strings["Your Friendica test account is about to expire."] = "Sua conta de teste no Friendica vai expirar.";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "Configurações do \"pageheader\"";
 $a->strings["pageheader Settings saved."] = "Configurações do pageheader armazenadas.";
@@ -1532,6 +1541,7 @@ $a->strings["Tumblr password"] = "Senha Tumblr";
 $a->strings["Post to Tumblr by default"] = "Postar para o Tumblr como default";
 $a->strings["Numfriends settings updated."] = "Configurações Numfriends atualizadas.";
 $a->strings["Numfriends Settings"] = "Configurações Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quantos contatos mostrar na barra lateral do perfil";
 $a->strings["Gnot settings updated."] = "As configurações do Gnot foram atualizadas.";
 $a->strings["Gnot Settings"] = "Configurações do Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite o encadeamento das notificações por e-mail de comentário no GMail, tornando a a linha de assunto anônima.";
@@ -1545,6 +1555,7 @@ $a->strings["WordPress password"] = "Senha WordPress";
 $a->strings["WordPress API URL"] = "URL da API do WordPress";
 $a->strings["Post to WordPress by default"] = "Postar para o WordPress como padrão";
 $a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Post from Friendica"] = "Postar do Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
 $a->strings["\"Show more\" Settings"] = "Configurações de \"Exibir mais\"";
 $a->strings["Enable Show More"] = "Habilitar \"Exibir mais\"";
@@ -1571,23 +1582,23 @@ $a->strings["Send public postings to Twitter by default"] = "Enviar as publicaç
 $a->strings["Send linked #-tags and @-names to Twitter"] = "";
 $a->strings["Consumer key"] = "Chave de consumidor";
 $a->strings["Consumer secret"] = "Segredo de consumidor";
-$a->strings["IRC Settings"] = "";
+$a->strings["IRC Settings"] = "Configurações de IRC";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(is) para auto conectar (separados por vírgulas)";
-$a->strings["Popular Channels (comma separated)"] = "";
+$a->strings["Popular Channels (comma separated)"] = "Canais Populares (separados por vírgula)";
-$a->strings["IRC settings saved."] = "";
+$a->strings["IRC settings saved."] = "Configurações de IRC salvas";
-$a->strings["IRC Chatroom"] = "";
+$a->strings["IRC Chatroom"] = "sala de IRC";
 $a->strings["Popular Channels"] = "Canais populares ";
 $a->strings["Fromapp settings updated."] = "";
 $a->strings["FromApp Settings"] = "";
 $a->strings["The application name you would like to show your posts originating from."] = "";
 $a->strings["Use this application name even if another application was used."] = "";
-$a->strings["Post to blogger"] = "";
+$a->strings["Post to blogger"] = "publica no blogger";
-$a->strings["Blogger Post Settings"] = "";
+$a->strings["Blogger Post Settings"] = "Configuração de publicação no blogger";
-$a->strings["Enable Blogger Post Plugin"] = "";
+$a->strings["Enable Blogger Post Plugin"] = "Habilita plugin para publicar no Blogger";
-$a->strings["Blogger username"] = "";
+$a->strings["Blogger username"] = "nome de usuário no Blogger";
-$a->strings["Blogger password"] = "";
+$a->strings["Blogger password"] = "senha no Blogger";
-$a->strings["Blogger API URL"] = "";
+$a->strings["Blogger API URL"] = "URL da API do Blogger";
-$a->strings["Post to Blogger by default"] = "";
+$a->strings["Post to Blogger by default"] = "Publica no Blogger por padrão";
 $a->strings["Post to Posterous"] = "Postar no Posterous";
 $a->strings["Posterous Post Settings"] = "Configurações de Postagem do Posterous";
 $a->strings["Enable Posterous Post Plugin"] = "Habilitar Plugin de Postagem do Posterous";
@@ -1598,7 +1609,7 @@ $a->strings["Posterous API token"] = "";
 $a->strings["Post to Posterous by default"] = "Postar para o Posterous como padrão";
 $a->strings["Theme settings"] = "Configurações do tema";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "";
-$a->strings["Set font-size for posts and comments"] = "";
+$a->strings["Set font-size for posts and comments"] = "Escolha o tamanho da fonte para publicações e comentários";
 $a->strings["Set theme width"] = "";
 $a->strings["Color scheme"] = "Esquema de cores";
 $a->strings["Your posts and conversations"] = "Suas publicações e conversas";
@@ -1614,22 +1625,22 @@ $a->strings["Last users"] = "Últimos usuários";
 $a->strings["Last likes"] = "Últimos \"likes\"";
 $a->strings["Last photos"] = "Últimas fotos";
 $a->strings["Find Friends"] = "Encontrar amigos";
-$a->strings["Local Directory"] = "";
+$a->strings["Local Directory"] = "Diretório Local";
 $a->strings["Similar Interests"] = "Interesses Parecidos";
 $a->strings["Invite Friends"] = "Convidar amigos";
 $a->strings["Earth Layers"] = "";
 $a->strings["Set zoomfactor for Earth Layers"] = "";
 $a->strings["Set longitude (X) for Earth Layers"] = "";
 $a->strings["Set latitude (Y) for Earth Layers"] = "";
-$a->strings["Help or @NewHere ?"] = "";
+$a->strings["Help or @NewHere ?"] = "Ajuda ou @NewHere ?";
 $a->strings["Connect Services"] = "Conectar serviços";
 $a->strings["Last Tweets"] = "";
 $a->strings["Set twitter search term"] = "";
 $a->strings["don't show"] = "não exibir";
 $a->strings["show"] = "exibir";
 $a->strings["Show/hide boxes at right-hand column:"] = "";
-$a->strings["Set line-height for posts and comments"] = "";
+$a->strings["Set line-height for posts and comments"] = "Escolha comprimento da linha para publicações e comentários";
-$a->strings["Set resolution for middle column"] = "";
+$a->strings["Set resolution for middle column"] = "Escolha a resolução para a coluna do meio";
 $a->strings["Set color scheme"] = "";
 $a->strings["Set zoomfactor for Earth Layer"] = "";
 $a->strings["Last tweets"] = "";
@@ -1670,6 +1681,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "Masculino";
 $a->strings["Female"] = "Feminino";
 $a->strings["Currently Male"] = "Atualmente masculino";
@@ -1799,13 +1811,25 @@ $a->strings["Attachments:"] = "Anexos:";
 $a->strings["view full size"] = "ver tela cheia";
 $a->strings["Embedded content"] = "Conteúdo incorporado";
 $a->strings["Embedding disabled"] = "A incorporação está desabilitada";
+$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["Error! Cannot check nickname"] = "";
+$a->strings["User '%s' already exists on this server!"] = "";
+$a->strings["User creation error"] = "";
+$a->strings["User profile creation error"] = "";
+$a->strings["%d contact not imported"] = array(
+	0 => "",
+	1 => "",
+);
+$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."] = "Um grupo removido com esse nome foi reativado. Permissões de items já existentes <strong>poderão</strong> se aplicar a esse grupo e a qualquer membro no futuro. Se não é essa a sua intenção, favor criar outro grupo com um nome diferente.";
 $a->strings["Default privacy group for new contacts"] = "";
 $a->strings["Everybody"] = "Todos";
 $a->strings["edit"] = "editar";
 $a->strings["Edit group"] = "Editar grupo";
 $a->strings["Create a new group"] = "Criar um novo grupo";
-$a->strings["Contacts not in any group"] = "";
+$a->strings["Contacts not in any group"] = "Contatos não estão dentro de nenhum grupo";
 $a->strings["Logout"] = "Sair";
 $a->strings["End this session"] = "Terminar esta sessão";
 $a->strings["Status"] = "Status";
@@ -1820,6 +1844,8 @@ $a->strings["Conversations on this site"] = "Conversas neste site";
 $a->strings["Directory"] = "Diretório";
 $a->strings["People directory"] = "Diretório de pessoas";
 $a->strings["Conversations from your friends"] = "Conversas dos seus amigos";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "Requisições de Amizade";
 $a->strings["See all notifications"] = "Ver todas notificações";
 $a->strings["Mark all system notifications seen"] = "Marcar todas as notificações de sistema como vistas";
@@ -1829,7 +1855,7 @@ $a->strings["Outbox"] = "Enviadas";
 $a->strings["Manage"] = "Gerenciar";
 $a->strings["Manage other pages"] = "Gerenciar outras páginas";
 $a->strings["Profiles"] = "Perfis";
-$a->strings["Manage/edit profiles"] = "Gerenciar/editar perfis";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "Gerenciar/editar amigos e contatos";
 $a->strings["Site setup and configuration"] = "Configurações do site";
 $a->strings["Nothing new here"] = "Nada de novo aqui";
@@ -1844,7 +1870,7 @@ $a->strings["Find People"] = "Pesquisar por pessoas";
 $a->strings["Enter name or interest"] = "Fornecer nome ou interesse";
 $a->strings["Connect/Follow"] = "Conectar-se/acompanhar";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Examplos: Robert Morgenstein, Fishing";
-$a->strings["Random Profile"] = "";
+$a->strings["Random Profile"] = "Perfil Randômico";
 $a->strings["Networks"] = "Redes";
 $a->strings["All Networks"] = "Todas as redes";
 $a->strings["Saved Folders"] = "Pastas salvas";
@@ -1873,6 +1899,43 @@ $a->strings["From: "] = "De: ";
 $a->strings["Image/photo"] = "Imagem/foto";
 $a->strings["$1 wrote:"] = "$1 escreveu:";
 $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"] = "";
+$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'"] = "Não foi possível localizar a informação de DNS para o servidor de banco de dados '%s'";
 $a->strings["[no subject]"] = "[sem assunto]";
 $a->strings["Visible to everybody"] = "Visível para todos";
@@ -1951,11 +2014,11 @@ $a->strings["Welcome back "] = "Bem-vindo(a) de volta ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "";
 $a->strings["stopped following"] = "parou de acompanhar";
 $a->strings["Poke"] = "";
-$a->strings["View Status"] = "";
+$a->strings["View Status"] = "Ver Status";
-$a->strings["View Profile"] = "";
+$a->strings["View Profile"] = "Ver Perfil";
-$a->strings["View Photos"] = "";
+$a->strings["View Photos"] = "Ver Fotos";
-$a->strings["Network Posts"] = "";
+$a->strings["Network Posts"] = "Publicações da Rede";
-$a->strings["Edit Contact"] = "";
+$a->strings["Edit Contact"] = "Editar Contato";
 $a->strings["Send PM"] = "Enviar MP";
 $a->strings["%1\$s poked %2\$s"] = "";
 $a->strings["post/item"] = "postagem/item";
@@ -1978,6 +2041,7 @@ $a->strings["Please enter a video link/URL:"] = "Favor fornecer um link/URL de v
 $a->strings["Please enter an audio link/URL:"] = "Favor fornecer um link/URL de áudio";
 $a->strings["Tag term:"] = "Termo da tag:";
 $a->strings["Where are you right now?"] = "Onde você está agora?";
+$a->strings["Delete item(s)?"] = "";
 $a->strings["permissions"] = "permissões";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
@@ -1989,11 +2053,13 @@ $a->strings["Update Error at %s"] = "";
 $a->strings["Create a New Account"] = "Criar uma nova conta";
 $a->strings["Nickname or Email address: "] = "Identificação ou endereço de e-mail: ";
 $a->strings["Password: "] = "Senha: ";
+$a->strings["Remember me"] = "";
 $a->strings["Or login using OpenID: "] = "Ou login usando OpendID:";
 $a->strings["Forgot your password?"] = "Esqueceu a sua senha?";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Editar perfil";
 $a->strings["Message"] = "Mensagem";
+$a->strings["Manage/edit profiles"] = "Gerenciar/editar perfis";
 $a->strings["g A l F d"] = "G l d F";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[hoje]";
@@ -2006,4 +2072,19 @@ $a->strings["Status Messages and Posts"] = "";
 $a->strings["Profile Details"] = "";
 $a->strings["Events and Calendar"] = "";
 $a->strings["Only You Can See This"] = "";
+$a->strings["via"] = "";
 $a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "";
+$a->strings["Bg Settings"] = "";
+$a->strings["Post to Drupal"] = "Postar no Drupal";
+$a->strings["Drupal Post Settings"] = "Configurações de Postagem no Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Habilitar Plugin de Postagem do Drupal";
+$a->strings["Drupal username"] = "Nome de Usuário Drupal";
+$a->strings["Drupal password"] = "Senha Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipo de Postagem - artigo, página ou blog";
+$a->strings["Drupal site URL"] = "URL do site Drupal";
+$a->strings["Drupal site uses clean URLS"] = "Site Drupal usa URLs limpas";
+$a->strings["Post to Drupal by default"] = "Postar para o Drupal como padrão";
+$a->strings["OEmbed settings updated"] = "As configurações OEmbed foram atualizadas";
+$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para vídeos do YouTube";
+$a->strings["URL to embed:"] = "URL a ser incorporada:";

view/pt-br/update_fail_eml.tpl

@@ -0,0 +1,11 @@
+Oi, 
+Eu sou $sitename   
+Os desenvolvedores do friendica lançaram uma atualização $update recentemente, 
+mas quando tentei instalá-la algo de errado aconeteceu.  
+Isso precisa ser corrigido logo e não posso fazê-lo sozinho. Por favor contacte um 
+desenvolvedor do friendica se você não puder fazer a correção. Meu banco de dados pode estar inválido. 
+
+A mensagem de erro é : '$error'.   
+
+Lamento. 
+Seu servidor friendica em $siteurl

view/ru/strings.php

@@ -58,11 +58,11 @@ $a->strings["Tag removed"] = "Ключевое слово удалено";
 $a->strings["Remove Item Tag"] = "Удалить ключевое слово";
 $a->strings["Select a tag to remove: "] = "Выберите ключевое слово для удаления: ";
 $a->strings["Remove"] = "Удалить";
-$a->strings["%s welcomes %s"] = "%s приветствует %s";
+$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["Please login to continue."] = "Пожалуйста, войдите для продолжения.";
-$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?"] = "Вы действительно хотите разрешить этому приложению доступ к своим постам и контактам, а также создавать новые записи от вашего имени?";
 $a->strings["Yes"] = "Да";
 $a->strings["No"] = "Нет";
 $a->strings["Photo Albums"] = "Фотоальбомы";
@@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Фотографии профиля";
 $a->strings["Album not found."] = "Альбом не найден.";
 $a->strings["Delete Album"] = "Удалить альбом";
 $a->strings["Delete Photo"] = "Удалить фото";
-$a->strings["was tagged in a"] = "отмечен/а/ в";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
-$a->strings["photo"] = "фото";
+$a->strings["a photo"] = "";
-$a->strings["by"] = "с";
 $a->strings["Image exceeds size limit of "] = "Размер фото превышает лимит ";
 $a->strings["Image file is empty."] = "Файл изображения пуст.";
 $a->strings["Unable to process image."] = "Невозможно обработать фото.";
@@ -85,7 +84,6 @@ $a->strings["Public access denied."] = "Свободный доступ закр
 $a->strings["No photos selected"] = "Не выбрано фото.";
 $a->strings["Access to this item is restricted."] = "Доступ к этому пункту ограничен.";
 $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"] = "Загрузить фото";
 $a->strings["New album name: "] = "Название нового альбома: ";
 $a->strings["or existing album name: "] = "или название существующего альбома: ";
@@ -127,7 +125,7 @@ $a->strings["This is Friendica, version"] = "Это Friendica, версия";
 $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["Bug reports and issues: please visit"] = "Отчет об ошибках и проблемах: пожалуйста, посетите";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Предложения, похвала, пожертвования? Пишите на \"info\" на Friendica - точка com";
 $a->strings["Installed plugins/addons/apps:"] = "";
 $a->strings["No installed plugins/addons/apps"] = "Нет установленных плагинов / добавок / приложений";
 $a->strings["Item not found"] = "Элемент не найден";
@@ -135,13 +133,19 @@ $a->strings["Edit post"] = "Редактировать сообщение";
 $a->strings["Post to Email"] = "Отправить на Email";
 $a->strings["Edit"] = "Редактировать";
 $a->strings["Upload photo"] = "Загрузить фото";
+$a->strings["upload photo"] = "загрузить фото";
 $a->strings["Attach file"] = "Приложить файл";
+$a->strings["attach file"] = "приложить файл";
 $a->strings["Insert web link"] = "Вставить веб-ссылку";
-$a->strings["Insert YouTube video"] = "Вставить видео YouTube";
+$a->strings["web link"] = "веб-ссылка";
-$a->strings["Insert Vorbis [.ogg] video"] = "Вставить Vorbis [.ogg] видео";
+$a->strings["Insert video link"] = "Вставить ссылку видео";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Вставить Vorbis [.ogg] аудио";
+$a->strings["video link"] = "видео-ссылка";
+$a->strings["Insert audio link"] = "Вставить ссылку аудио";
+$a->strings["audio link"] = "аудио-ссылка";
 $a->strings["Set your location"] = "Задать ваше местоположение";
+$a->strings["set location"] = "установить местонахождение";
 $a->strings["Clear browser location"] = "Очистить местонахождение браузера";
+$a->strings["clear location"] = "убрать местонахождение";
 $a->strings["Permission settings"] = "Настройки разрешений";
 $a->strings["CC: email addresses"] = "Копии на email адреса";
 $a->strings["Public post"] = "Публичное сообщение";
@@ -194,6 +198,18 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "";
 $a->strings["Your Identity Address:"] = "Ваш идентификационный адрес:";
 $a->strings["Submit Request"] = "Отправить запрос";
+$a->strings["Account settings"] = "Настройки аккаунта";
+$a->strings["Display settings"] = "Параметры дисплея";
+$a->strings["Connector settings"] = "Настройки соединителя";
+$a->strings["Plugin settings"] = "Настройки плагина";
+$a->strings["Connected apps"] = "";
+$a->strings["Export personal data"] = "Экспорт личных данных";
+$a->strings["Remove account"] = "";
+$a->strings["Settings"] = "Настройки";
+$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."] = "Не удалось подключиться к базе данных.";
 $a->strings["Could not create table."] = "Не удалось создать таблицу.";
@@ -375,16 +391,16 @@ $a->strings["%d contact in common"] = array(
 );
 $a->strings["View all contacts"] = "Показать все контакты";
 $a->strings["Unblock"] = "Разблокировать";
-$a->strings["Block"] = "Блокировать";
+$a->strings["Block"] = "Заблокировать";
-$a->strings["Toggle Blocked status"] = "";
+$a->strings["Toggle Blocked status"] = "Изменить статус блокированности (заблокировать/разблокировать)";
 $a->strings["Unignore"] = "Не игнорировать";
-$a->strings["Toggle Ignored status"] = "";
+$a->strings["Toggle Ignored status"] = "Изменить статус игнорирования";
-$a->strings["Unarchive"] = "";
+$a->strings["Unarchive"] = "Разархивировать";
-$a->strings["Archive"] = "";
+$a->strings["Archive"] = "Архивировать";
-$a->strings["Toggle Archive status"] = "";
+$a->strings["Toggle Archive status"] = "Сменить статус архивации (архивирова/не архивировать)";
 $a->strings["Repair"] = "Восстановить";
-$a->strings["Advanced Contact Settings"] = "";
+$a->strings["Advanced Contact Settings"] = "Дополнительные Настройки Контакта";
-$a->strings["Communications lost with this contact!"] = "";
+$a->strings["Communications lost with this contact!"] = "Связь с контактом утеряна!";
 $a->strings["Contact Editor"] = "Редактор контакта";
 $a->strings["Profile Visibility"] = "Видимость профиля";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Пожалуйста, выберите профиль, который вы хотите отображать %s, когда просмотр вашего профиля безопасен.";
@@ -401,21 +417,21 @@ $a->strings["Update public posts"] = "Обновить публичные соо
 $a->strings["Update now"] = "Обновить сейчас";
 $a->strings["Currently blocked"] = "В настоящее время заблокирован";
 $a->strings["Currently ignored"] = "В настоящее время игнорируется";
-$a->strings["Currently archived"] = "";
+$a->strings["Currently archived"] = "В данный момент архивирован";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "";
 $a->strings["Suggestions"] = "";
-$a->strings["Suggest potential friends"] = "";
+$a->strings["Suggest potential friends"] = "Предложить потенциального знакомого";
 $a->strings["All Contacts"] = "Все контакты";
-$a->strings["Show all contacts"] = "";
+$a->strings["Show all contacts"] = "Показать все контакты";
-$a->strings["Unblocked"] = "";
+$a->strings["Unblocked"] = "Не блокирован";
-$a->strings["Only show unblocked contacts"] = "";
+$a->strings["Only show unblocked contacts"] = "Показать только не блокированные контакты";
-$a->strings["Blocked"] = "";
+$a->strings["Blocked"] = "Заблокирован";
-$a->strings["Only show blocked contacts"] = "";
+$a->strings["Only show blocked contacts"] = "Показать только блокированные контакты";
-$a->strings["Ignored"] = "";
+$a->strings["Ignored"] = "Игнорирован";
-$a->strings["Only show ignored contacts"] = "";
+$a->strings["Only show ignored contacts"] = "Показать только игнорируемые контакты";
-$a->strings["Archived"] = "";
+$a->strings["Archived"] = "Архивированные";
 $a->strings["Only show archived contacts"] = "";
-$a->strings["Hidden"] = "";
+$a->strings["Hidden"] = "Скрытые";
 $a->strings["Only show hidden contacts"] = "";
 $a->strings["Mutual Friendship"] = "Взаимная дружба";
 $a->strings["is a fan of yours"] = "является вашим поклонником";
@@ -440,18 +456,12 @@ $a->strings["Forgot your Password?"] = "Забыли пароль?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Введите адрес электронной почты и подтвердите, что вы хотите сбросить ваш пароль. Затем проверьте свою электронную почту для получения дальнейших инструкций.";
 $a->strings["Nickname or Email: "] = "Ник или E-mail: ";
 $a->strings["Reset"] = "Сброс";
-$a->strings["Account settings"] = "Настройки аккаунта";
+$a->strings["Additional features"] = "";
-$a->strings["Display settings"] = "Параметры дисплея";
-$a->strings["Connector settings"] = "Настройки соединителя";
-$a->strings["Plugin settings"] = "Настройки плагина";
-$a->strings["Connected apps"] = "";
-$a->strings["Export personal data"] = "Экспорт личных данных";
-$a->strings["Remove account"] = "";
-$a->strings["Settings"] = "Настройки";
 $a->strings["Missing some important data!"] = "Не хватает важных данных!";
 $a->strings["Update"] = "Обновление";
 $a->strings["Failed to connect with email account using the settings provided."] = "Не удалось подключиться к аккаунту e-mail, используя указанные настройки.";
 $a->strings["Email settings updated."] = "Настройки эл. почты обновлены.";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "Пароли не совпадают. Пароль не изменен.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Пустые пароли не допускаются. Пароль не изменен.";
 $a->strings["Password changed."] = "Пароль изменен.";
@@ -475,6 +485,9 @@ $a->strings["No name"] = "Нет имени";
 $a->strings["Remove authorization"] = "Удалить авторизацию";
 $a->strings["No Plugin settings configured"] = "Нет сконфигурированных настроек плагина";
 $a->strings["Plugin Settings"] = "Настройки плагина";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "Встроенная  поддержка для %s подключение %s";
 $a->strings["enabled"] = "подключено";
 $a->strings["disabled"] = "отключено";
@@ -584,10 +597,10 @@ $a->strings["Sort by Post Date"] = "";
 $a->strings["Posts that mention or involve you"] = "";
 $a->strings["New"] = "Новый";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "Помеченный";
-$a->strings["Favourite Posts"] = "";
 $a->strings["Shared Links"] = "";
 $a->strings["Interesting Links"] = "";
+$a->strings["Starred"] = "Помеченный";
+$a->strings["Favourite Posts"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Внимание: Эта группа содержит %s участника с незащищенной сети.",
 	1 => "Внимание: Эта группа содержит %s участников с незащищенной сети.",
@@ -599,6 +612,12 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Недопустимый контакт.";
 $a->strings["Personal Notes"] = "Личные заметки";
 $a->strings["Save"] = "Сохранить";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
+$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."] = "Не выбран получатель.";
 $a->strings["Unable to check your home location."] = "";
@@ -674,7 +693,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "Ваша регистрация не может быть обработана.";
 $a->strings["Registration request at %s"] = "Запрос на регистрацию на %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Ваша регистрация в ожидании одобрения владельцем сайта.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Вы можете (по желанию), заполнить эту форму с помощью OpenID, поддерживая ваш OpenID и нажав клавишу \"Регистрация\".";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Если вы не знакомы с OpenID, пожалуйста, оставьте это поле пустым и заполните остальные элементы.";
 $a->strings["Your OpenID (optional): "] = "Ваш OpenID (необязательно):";
@@ -688,6 +706,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
 $a->strings["Choose a nickname: "] = "Выберите псевдоним: ";
 $a->strings["Register"] = "Регистрация";
 $a->strings["People Search"] = "Поиск людей";
+$a->strings["photo"] = "фото";
 $a->strings["status"] = "статус";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %3\$s от %2\$s ";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравится %3\$s от %2\$s ";
@@ -711,7 +730,7 @@ $a->strings["Mood"] = "";
 $a->strings["Set your current mood and tell your friends"] = "";
 $a->strings["Image uploaded but image cropping failed."] = "Изображение загружено, но обрезка изображения не удалась.";
 $a->strings["Image size reduction [%s] failed."] = "Уменьшение размера изображения [%s] не удалось.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Перезагрузите страницу с зажатой клавишей \"Shift\" для того, чтобы увидеть свое новое фото немедленно.";
 $a->strings["Unable to process image"] = "Не удается обработать изображение";
 $a->strings["Image exceeds size limit of %d"] = "Изображение превышает предельный размер %d";
 $a->strings["Upload File:"] = "Загрузить файл:";
@@ -797,10 +816,12 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "";
 $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["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"] = "Текст регистрации";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "Аккаунт считается после x дней не воспользованным";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Не будет тратить ресурсы для опроса сайтов для бесхозных контактов. Введите 0 для отключения лимита времени.";
 $a->strings["Allowed friend domains"] = "Разрешенные домены друзей";
 $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"] = "Разрешенные почтовые домены";
@@ -921,6 +942,7 @@ $a->strings["Login failed."] = "Войти не удалось.";
 $a->strings["Contact added"] = "";
 $a->strings["Common Friends"] = "Общие друзья";
 $a->strings["No contacts in common."] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "";
 $a->strings["Item has been removed."] = "Пункт был удален.";
 $a->strings["Applications"] = "Приложения";
@@ -1067,7 +1089,7 @@ $a->strings["No user record found for '%s' "] = "Не найдено запис
 $a->strings["Our site encryption key is apparently messed up."] = "Наш ключ шифрования сайта, по-видимому, перепутался.";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Был предоставлен пустой URL сайта ​​или URL не может быть расшифрован нами.";
 $a->strings["Contact record was not found for you on our site."] = "Запись контакта не найдена для вас на нашем сайте.";
-$a->strings["Site public key not available in contact record for URL %s."] = "";
+$a->strings["Site public key not available in contact record for URL %s."] = "Публичный ключ недоступен в записи о контакте по ссылке %s";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "ID, предложенный вашей системой, является дубликатом в нашей системе. Он должен работать, если вы повторите попытку.";
 $a->strings["Unable to set your contact credentials on our system."] = "Не удалось установить ваши учетные данные контакта в нашей системе.";
 $a->strings["Unable to update your contact profile details on our system"] = "Не удается обновить ваши контактные детали профиля в нашей системе";
@@ -1083,15 +1105,15 @@ $a->strings["Facebook API key is missing."] = "Отсутствует ключ F
 $a->strings["Facebook Connect"] = "Facebook подключение";
 $a->strings["Install Facebook connector for this account."] = "Установить Facebook Connector для этого аккаунта.";
 $a->strings["Remove Facebook connector"] = "Удалить Facebook Connector";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Переаутентификация [Это необходимо, если вы изменили пароль на Facebook.]";
 $a->strings["Post to Facebook by default"] = "Отправлять на Facebook по умолчанию";
 $a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "";
 $a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "";
-$a->strings["Link all your Facebook friends and conversations on this website"] = "";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "Прикрепите своих друзей и общение с Facebook на этот сайт";
 $a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "";
-$a->strings["On this website, your Facebook friend stream is only visible to you."] = "";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "Facebook-лента друзей видна только вам.";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Следующие настройки определяют параметры приватности вашей стены с Facebook на этом сайте.";
-$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Ваша лента профиля Facebook будет видна только вам";
 $a->strings["Do not import your Facebook profile wall conversations"] = "Не импортировать Facebook разговоров с Вашей страницы";
 $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"] = "Игнорировать приложения (список через запятую)";
@@ -1122,9 +1144,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "";
 $a->strings["StatusNet AutoFollow Settings"] = "";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "";
-$a->strings["Bg settings updated."] = "";
-$a->strings["Bg Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "";
 $a->strings["Lifetime of the cache (in hours)"] = "";
 $a->strings["Cache Statistics"] = "";
 $a->strings["Number of items"] = "";
@@ -1214,6 +1233,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"] = "";
 $a->strings["Login"] = "Вход";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "";
@@ -1369,16 +1389,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Включить dreamwidth пл
 $a->strings["dreamwidth username"] = "dreamwidth имя пользователя";
 $a->strings["dreamwidth password"] = "dreamwidth пароль";
 $a->strings["Post to dreamwidth by default"] = "";
-$a->strings["Post to Drupal"] = "";
+$a->strings["Remote Permissions Settings"] = "";
-$a->strings["Drupal Post Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
-$a->strings["Enable Drupal Post Plugin"] = "Включить Drupal  плагин сообщений";
+$a->strings["Remote Permissions settings updated."] = "";
-$a->strings["Drupal username"] = "Drupal имя пользователя";
+$a->strings["Visible to"] = "";
-$a->strings["Drupal password"] = "Drupal пароль";
+$a->strings["may only be a partial list"] = "";
-$a->strings["Post Type - article,page,or blog"] = "";
+$a->strings["Global"] = "";
-$a->strings["Drupal site URL"] = "Drupal site URL";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Drupal site uses clean URLS"] = "";
+$a->strings["Individual"] = "";
-$a->strings["Post to Drupal by default"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
-$a->strings["Post from Friendica"] = "Сообщение от Friendica";
 $a->strings["Startpage Settings"] = "";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
@@ -1395,15 +1414,13 @@ $a->strings["No files were uploaded."] = "Нет загруженных файл
 $a->strings["Uploaded file is empty"] = "Загруженный файл пустой";
 $a->strings["File has an invalid extension, it should be one of "] = "Файл имеет недопустимое расширение, оно должно быть одним из следующих ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Загрузка была отменена, или произошла ошибка сервера";
-$a->strings["OEmbed settings updated"] = "OEmbed настройки обновлены";
-$a->strings["Use OEmbed for YouTube videos"] = "Использовать OEmbed для видео YouTube";
-$a->strings["URL to embed:"] = "URL для встраивания:";
 $a->strings["show/hide"] = "";
 $a->strings["No forum subscriptions"] = "";
 $a->strings["Forumlist settings updated."] = "";
 $a->strings["Forumlist Settings"] = "";
 $a->strings["Randomise forum list"] = "";
 $a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Владелец сайта";
 $a->strings["Email Address"] = "Адрес электронной почты";
@@ -1535,6 +1552,7 @@ $a->strings["Tumblr password"] = "Tumblr пароль";
 $a->strings["Post to Tumblr by default"] = "Сообщение Tumblr по умолчанию";
 $a->strings["Numfriends settings updated."] = "";
 $a->strings["Numfriends Settings"] = "";
+$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."] = "";
@@ -1548,6 +1566,7 @@ $a->strings["WordPress password"] = "WordPress паролъ";
 $a->strings["WordPress API URL"] = "WordPress API URL";
 $a->strings["Post to WordPress by default"] = "Сообщение WordPress по умолчанию";
 $a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Post from Friendica"] = "Сообщение от Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
 $a->strings["\"Show more\" Settings"] = "";
 $a->strings["Enable Show More"] = "Включить Показать больше";
@@ -1639,6 +1658,8 @@ $a->strings["Last tweets"] = "";
 $a->strings["Alignment"] = "Выравнивание";
 $a->strings["Left"] = "";
 $a->strings["Center"] = "Центр";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -1671,6 +1692,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "Мужчина";
 $a->strings["Female"] = "Женщина";
 $a->strings["Currently Male"] = "В данный момент мужчина";
@@ -1801,6 +1823,19 @@ $a->strings["Attachments:"] = "Вложения:";
 $a->strings["view full size"] = "посмотреть в полный размер";
 $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["Error! Cannot check nickname"] = "";
+$a->strings["User '%s' already exists on this server!"] = "";
+$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"] = "";
 $a->strings["Everybody"] = "Каждый";
@@ -1822,6 +1857,8 @@ $a->strings["Conversations on this site"] = "Беседы на этом сайт
 $a->strings["Directory"] = "Каталог";
 $a->strings["People directory"] = "Каталог участников";
 $a->strings["Conversations from your friends"] = "Беседы с друзьями";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "Запросы на добавление в список друзей";
 $a->strings["See all notifications"] = "Посмотреть все уведомления";
 $a->strings["Mark all system notifications seen"] = "";
@@ -1831,7 +1868,7 @@ $a->strings["Outbox"] = "Исходящие";
 $a->strings["Manage"] = "Управлять";
 $a->strings["Manage other pages"] = "Управление другими страницами";
 $a->strings["Profiles"] = "Профили";
-$a->strings["Manage/edit profiles"] = "Управление / редактирование профилей";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "Управление / редактирование друзей и контактов";
 $a->strings["Site setup and configuration"] = "Установка и конфигурация сайта";
 $a->strings["Nothing new here"] = "Ничего нового здесь";
@@ -1876,6 +1913,43 @@ $a->strings["From: "] = "От: ";
 $a->strings["Image/photo"] = "Изображение / Фото";
 $a->strings["$1 wrote:"] = "$1 написал:";
 $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"] = "";
+$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'"] = "Не могу найти информацию для DNS-сервера базы данных '%s'";
 $a->strings["[no subject]"] = "[без темы]";
 $a->strings["Visible to everybody"] = "Видимо всем";
@@ -1967,6 +2041,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "удалить";
 $a->strings["Delete Selected Items"] = "Удалить выбранные позиции";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s нравится это.";
 $a->strings["%s doesn't like this."] = "%s не нравится это.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d чел.</span> нравится это.";
@@ -1980,15 +2055,7 @@ $a->strings["Please enter a video link/URL:"] = "";
 $a->strings["Please enter an audio link/URL:"] = "";
 $a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "И где вы сейчас?";
-$a->strings["upload photo"] = "загрузить фото";
+$a->strings["Delete item(s)?"] = "";
-$a->strings["attach file"] = "приложить файл";
-$a->strings["web link"] = "веб-ссылка";
-$a->strings["Insert video link"] = "Вставить ссылку видео";
-$a->strings["video link"] = "видео-ссылка";
-$a->strings["Insert audio link"] = "Вставить ссылку аудио";
-$a->strings["audio link"] = "аудио-ссылка";
-$a->strings["set location"] = "установить местонахождение";
-$a->strings["clear location"] = "убрать местонахождение";
 $a->strings["permissions"] = "разрешения";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
@@ -2000,11 +2067,13 @@ $a->strings["Update Error at %s"] = "";
 $a->strings["Create a New Account"] = "Создать новый аккаунт";
 $a->strings["Nickname or Email address: "] = "Ник или адрес электронной почты: ";
 $a->strings["Password: "] = "Пароль: ";
+$a->strings["Remember me"] = "";
 $a->strings["Or login using OpenID: "] = "";
 $a->strings["Forgot your password?"] = "Забыли пароль?";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "Редактировать профиль";
 $a->strings["Message"] = "";
+$a->strings["Manage/edit profiles"] = "Управление / редактирование профилей";
 $a->strings["g A l F d"] = "g A l F d";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[сегодня]";
@@ -2017,3 +2086,19 @@ $a->strings["Status Messages and Posts"] = "";
 $a->strings["Profile Details"] = "";
 $a->strings["Events and Calendar"] = "";
 $a->strings["Only You Can See This"] = "";
+$a->strings["via"] = "";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "";
+$a->strings["Bg Settings"] = "";
+$a->strings["Post to Drupal"] = "";
+$a->strings["Drupal Post Settings"] = "";
+$a->strings["Enable Drupal Post Plugin"] = "Включить Drupal  плагин сообщений";
+$a->strings["Drupal username"] = "Drupal имя пользователя";
+$a->strings["Drupal password"] = "Drupal пароль";
+$a->strings["Post Type - article,page,or blog"] = "";
+$a->strings["Drupal site URL"] = "Drupal site URL";
+$a->strings["Drupal site uses clean URLS"] = "";
+$a->strings["Post to Drupal by default"] = "";
+$a->strings["OEmbed settings updated"] = "OEmbed настройки обновлены";
+$a->strings["Use OEmbed for YouTube videos"] = "Использовать OEmbed для видео YouTube";
+$a->strings["URL to embed:"] = "URL для встраивания:";

view/search_item.tpl

@@ -31,12 +31,12 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
 			{{ 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 class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ 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 class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
 			</div>
 			{{ endif }}
 		</div>

view/wall_thread.tpl

@@ -50,12 +50,12 @@
 						{{ endfor }}
 					</div>
 			{{ 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 class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ 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 class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
 			</div>
 			{{ endif }}
 			</div>