Merge remote-tracking branch 'upstream/master'

2024-12-22 23:20:16 +00:00 · 2014-05-29 23:04:57 +02:00 · 2014-05-29 23:04:57 +02:00 · 13fea42d8c
commit 13fea42d8c
parent 1fdfd614f0 f58104e357
78 changed files with 57969 additions and 48355 deletions
--- a/boot.php
+++ b/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.2.1748' );
+define ( 'FRIENDICA_VERSION',      '3.2.1750' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1170      );
 define ( 'EOL',                    "<br />\r\n"     );
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@ -382,7 +382,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 	$count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
 	$search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
 	$type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
-	
+	$conv_id = (x($_REQUEST,'conversation')?$_REQUEST['conversation']:null);

 	// For use with jquery.autocomplete for private mail completion

@ -450,6 +450,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 		$contact_count = 0;
 	}
 	
+	
 	$tot = $group_count+$contact_count;
 	
 	$groups = array();
@ -553,6 +554,52 @@ function acl_lookup(&$a, $out_type = 'json') {
 		
 	$items = array_merge($groups, $contacts);

+	if ($conv_id) {
+		/* if $conv_id is set, get unknow contacts in thread */ 
+		/* but first get know contacts url to filter them out */
+		function _contact_link($i){ return dbesc($i['link']); }
+		$known_contacts = array_map(_contact_link, $contacts);
+		$unknow_contacts=array();
+		$r = q("select 
+					`author-avatar`,`author-name`,`author-link`
+				from item where parent=%d
+				and (
+					`author-name` LIKE '%%%s%%' OR
+					`author-link` LIKE '%%%s%%'
+				) and 
+				`author-link` NOT IN ('%s')
+				GROUP BY `author-link`
+				ORDER BY `author-name` ASC
+				", 
+				intval($conv_id),
+				dbesc($search),
+				dbesc($search),
+				implode("','", $known_contacts)
+		);
+		if (is_array($r) && count($r)){
+			foreach($r as $row) {
+				// nickname..
+				$up = parse_url($row['author-link']);
+				$nick = explode("/",$up['path']);
+				$nick = $nick[count($nick)-1];
+				$nick .= "@".$up['host'];
+				// /nickname
+				$unknow_contacts[] = array(
+					"type"  => "c",
+					"photo" => $row['author-avatar'],
+					"name"  => $row['author-name'],
+					"id"	=> '',
+					"network" => "unknown",
+					"link" => $row['author-link'],
+					"nick" => $nick,
+					"forum" => false
+				);
+			}
+		}
+
+		$items = array_merge($items, $unknow_contacts);
+		$tot += count($unknow_contacts);
+	}

 	if($out_type === 'html') {
 		$o = array(
--- a/include/bbcode.php
+++ b/include/bbcode.php
@ -454,10 +454,9 @@ function bb_ShareAttributesForExport($match) {
 	$userid = GetProfileUsername($profile,$author);

 	$headline = '<div class="shared_header">';
-	$headline .= sprintf(t('<span><b>'.
-			html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').
-			'<a href="%s" target="_blank">%s</a>%s:</b></span>'), $link, $userid, $posted);
-        $headline .= "</div>";
+	$headline .= '<span><b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
+	$headline .= sprintf(t('<a href="%1$s" target="_blank">%2$s</a> %3$s'), $link, $userid, $posted);
+        $headline .= ":</b></span></div>";

 	$text = trim($match[1]);

--- a/include/items.php
+++ b/include/items.php
@ -176,7 +176,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		'$thumb'        => xmlify($owner['thumb']),
 		'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
 		'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
-		'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) , 
+		'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
 		'$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : ''),
 		'$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
 	));
@ -261,7 +261,7 @@ function construct_activity_object($item) {
 	}

 	return '';
-} 
+}

 function construct_activity_target($item) {

@ -560,14 +560,14 @@ function get_atom_elements($feed, $item, $contact = array()) {

 	$res['body'] = limit_body_size($res['body']);

-	// It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust 
-	// the content type. Our own network only emits text normally, though it might have been converted to 
+	// It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust
+	// the content type. Our own network only emits text normally, though it might have been converted to
 	// html if we used a pubsubhubbub transport. But if we see even one html tag in our text, we will
 	// have to assume it is all html and needs to be purified.

-	// It doesn't matter all that much security wise - because before this content is used anywhere, we are 
-	// going to escape any tags we find regardless, but this lets us import a limited subset of html from 
-	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining 
+	// It doesn't matter all that much security wise - because before this content is used anywhere, we are
+	// going to escape any tags we find regardless, but this lets us import a limited subset of html from
+	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
 	// html.

 	if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
@ -726,7 +726,7 @@ function get_atom_elements($feed, $item, $contact = array()) {
 			if(! $type)
 				$type = 'application/octet-stream';

-			$att_arr[] = '[attach]href="' . $link . '" length="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]'; 
+			$att_arr[] = '[attach]href="' . $link . '" length="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]';
 		}
 		$res['attach'] = implode(',', $att_arr);
 	}
@ -998,6 +998,23 @@ function item_store($arr,$force_parent = false) {
 	if(! x($arr,'type'))
 		$arr['type']      = 'remote';

+
+
+	/* check for create  date and expire time */
+	$uid = intval($arr['uid']);
+	$r = q("SELECT expire FROM user WHERE uid = %d", $uid);
+	if(count($r)) {
+		$expire_interval = $r[0]['expire'];
+		if ($expire_interval>0) {
+			$expire_date =  new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC'));
+			$created_date = new DateTime($arr['created'], new DateTimeZone('UTC'));
+			if ($created_date < $expire_date) {
+				logger('item-store: item created ('.$arr['created'].') before expiration time ('.$expire_date->format(DateTime::W3C).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG);
+				return 0;
+			}
+		}
+	}
+
 	// Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin.
 	// Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<"
 	//if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
@ -1656,7 +1673,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$final_dfrn_id = '';

 	if($perm) {
-		if((($perm == 'rw') && (! intval($contact['writable']))) 
+		if((($perm == 'rw') && (! intval($contact['writable'])))
 		|| (($perm == 'r') && (intval($contact['writable'])))) {
 			q("update contact set writable = %d where id = %d",
 				intval(($perm == 'rw') ? 1 : 0),
@ -1666,7 +1683,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		}
 	}

-	if(($contact['duplex'] && strlen($contact['pubkey'])) 
+	if(($contact['duplex'] && strlen($contact['pubkey']))
 		|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
 		|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
 		openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
@ -1684,7 +1701,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {

 	if($final_dfrn_id != $orig_id) {
 		logger('dfrn_deliver: wrong dfrn_id.');
-		// did not decode properly - cannot trust this site 
+		// did not decode properly - cannot trust this site
 		return 3;
 	}

@ -1707,16 +1724,16 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {

 	if($page)
 		$postvars['page'] = $page;
-	
+
 	if($rino && $rino_allowed && (! $dissolve)) {
 		$key = substr(random_string(),0,16);
 		$data = bin2hex(aes_encrypt($postvars['data'],$key));
 		$postvars['data'] = $data;
-		logger('rino: sent key = ' . $key, LOGGER_DEBUG);	
+		logger('rino: sent key = ' . $key, LOGGER_DEBUG);


-		if($dfrn_version >= 2.1) {	
-			if(($contact['duplex'] && strlen($contact['pubkey'])) 
+		if($dfrn_version >= 2.1) {
+			if(($contact['duplex'] && strlen($contact['pubkey']))
 				|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
 				|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {

@ -1767,7 +1784,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {

 	$res = parse_xml_string($xml);

-	return $res->status; 
+	return $res->status;
 }


@ -1800,12 +1817,12 @@ function edited_timestamp_is_newer($existing, $update) {
 * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
 *             It is this person's stuff that is going to be updated.
 * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
- *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST 
+ *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST
 *             have a contact record.
- * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or 
+ * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
 *        might not) try and subscribe to it.
 * $datedir sorts in reverse order
- * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been 
+ * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been
 *      imported prior to its children being seen in the stream unless we are certain
 *      of how the feed is arranged/ordered.
 * With $pass = 1, we only pull parent items out of the stream.
@ -1966,7 +1983,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 			 *
 			 * $bdtext is just a readable placeholder in case the event is shared
 			 * with others. We will replace it during presentation to our $importer
-			 * to contain a sparkle link and perhaps a photo. 
+			 * to contain a sparkle link and perhaps a photo.
 			 *
 			 */

@ -1997,7 +2014,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 			);

 			// This function is called twice without reloading the contact
-			// Make sure we only create one event. This is why &$contact 
+			// Make sure we only create one event. This is why &$contact
 			// is a reference var in this function

 			$contact['bdyear'] = substr($birthday,0,4);
@ -2036,7 +2053,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
 			}
 			if($deleted && is_array($contact)) {
-				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id` 
+				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
 					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
 					dbesc($uri),
 					intval($importer['uid']),
@ -2450,19 +2467,19 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray['contact-id'] = $contact['id'];

 				if(! link_compare($datarray['owner-link'],$contact['url'])) {
-					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
 					// but otherwise there's a possible data mixup on the sender's system.
 					// the tgroup delivery code called from item_store will correct it if it's a forum,
-					// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+					// but we're going to unconditionally correct it here so that the post will always be owned by our contact.
 					logger('consume_feed: Correcting item owner.', LOGGER_DEBUG);
 					$datarray['owner-name']   = $contact['name'];
 					$datarray['owner-link']   = $contact['url'];
 					$datarray['owner-avatar'] = $contact['thumb'];
 				}

-				// We've allowed "followers" to reach this point so we can decide if they are 
+				// We've allowed "followers" to reach this point so we can decide if they are
 				// posting an @-tag delivery, which followers are allowed to do for certain
-				// page types. Now that we've parsed the post, let's check if it is legit. Otherwise ignore it. 
+				// page types. Now that we've parsed the post, let's check if it is legit. Otherwise ignore it.

 				if(($contact['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['uid'],$datarray)))
 					continue;
@ -2820,7 +2837,7 @@ function local_delivery($importer,$data) {

 		dbesc_array($msg);

-		$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg)) 
+		$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
 			. "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );

 		// send notifications.
@ -2904,18 +2921,18 @@ function local_delivery($importer,$data) {
 					}
 					else
 						$sql_extra = " and contact.self = 1 and item.wall = 1 ";
- 
-					// was the top-level post for this reply written by somebody on this site? 
-					// Specifically, the recipient? 
+
+					// was the top-level post for this reply written by somebody on this site?
+					// Specifically, the recipient?

 					$is_a_remote_delete = false;

 					// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
-					$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
-						`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
-						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
+					$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
+						`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
+						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 						WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
-						AND `item`.`uid` = %d 
+						AND `item`.`uid` = %d
 						$sql_extra
 						LIMIT 1",
 						dbesc($parent_uri),
@ -2927,8 +2944,8 @@ function local_delivery($importer,$data) {
 						$is_a_remote_delete = true;

 					// Does this have the characteristics of a community or private group comment?
-					// If it's a reply to a wall post on a community/prvgroup page it's a 
-					// valid community comment. Also forum_mode makes it valid for sure. 
+					// If it's a reply to a wall post on a community/prvgroup page it's a
+					// valid community comment. Also forum_mode makes it valid for sure.
 					// If neither, it's not.

 					if($is_a_remote_delete && $community) {
@ -3103,8 +3120,8 @@ function local_delivery($importer,$data) {
 			}

 			// Does this have the characteristics of a community or private group comment?
-			// If it's a reply to a wall post on a community/prvgroup page it's a 
-			// valid community comment. Also forum_mode makes it valid for sure. 
+			// If it's a reply to a wall post on a community/prvgroup page it's a
+			// valid community comment. Also forum_mode makes it valid for sure.
 			// If neither, it's not.

 			if($is_a_remote_comment && $community) {
@ -3284,7 +3301,7 @@ function local_delivery($importer,$data) {
 								'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 								'source_name'  => stripslashes($datarray['author-name']),
 								'source_link'  => $datarray['author-link'],
-								'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+								'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
 									? $importer['thumb'] : $datarray['author-avatar']),
 								'verb'         => ACTIVITY_POST,
 								'otype'        => 'item',
@ -3448,7 +3465,7 @@ function local_delivery($importer,$data) {
 									'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 									'source_name'  => stripslashes($datarray['author-name']),
 									'source_link'  => $datarray['author-link'],
-									'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+									'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
 										? $importer['thumb'] : $datarray['author-avatar']),
 									'verb'         => ACTIVITY_POST,
 									'otype'        => 'item',
@ -3548,10 +3565,10 @@ function local_delivery($importer,$data) {


 			if(! link_compare($datarray['owner-link'],$importer['url'])) {
-				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
 				// but otherwise there's a possible data mixup on the sender's system.
 				// the tgroup delivery code called from item_store will correct it if it's a forum,
-				// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
+				// but we're going to unconditionally correct it here so that the post will always be owned by our contact.
 				logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
 				$datarray['owner-name']   = $importer['senderName'];
 				$datarray['owner-link']   = $importer['url'];
@ -3578,7 +3595,7 @@ function local_delivery($importer,$data) {
 			        foreach($links->link as $l) {
            			$atts = $l->attributes();
            			switch($atts['rel']) {
-                			case "alternate": 
+                			case "alternate":
 								$Blink = $atts['href'];
 								break;
 							default:
@ -3601,7 +3618,7 @@ function local_delivery($importer,$data) {
 							'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 							'source_name'  => stripslashes($datarray['author-name']),
 							'source_link'  => $datarray['author-link'],
-							'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+							'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
 								? $importer['thumb'] : $datarray['author-avatar']),
 							'verb'         => $datarray['verb'],
 							'otype'        => 'person',
@ -3610,7 +3627,7 @@ function local_delivery($importer,$data) {
 						));
 					}
 				}
-			}			
+			}

 			continue;
 		}
@ -3646,7 +3663,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {

 		// create contact record

-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, 
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
 			`blocked`, `readonly`, `pending`, `writable` )
 			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
 			intval($importer['uid']),
@ -3698,7 +3715,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 					'$siteurl' => $a->get_baseurl(),
 					'$sitename' => $a->config['sitename']
 				));
-				$res = mail($r[0]['email'], 
+				$res = mail($r[0]['email'],
 					email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'),
 					$email,
 					'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
@ -3747,7 +3764,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 		);
 	}

-	// Diaspora has different message-ids in feeds than they do 
+	// Diaspora has different message-ids in feeds than they do
 	// through the direct Diaspora protocol. If we try and use
 	// the feed, we'll get duplicates. So don't.

@ -3943,7 +3960,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 					// Check to see if we should replace this photo link with an embedded image
 					// 1. No need to do so if the photo is public
 					// 2. If there's a contact-id provided, see if they're in the access list
-					//    for the photo. If so, embed it. 
+					//    for the photo. If so, embed it.
 					// 3. Otherwise, if we have an item, see if the item permissions match the photo
 					//    permissions, regardless of order but first check to see if they're an exact
 					//    match to save some processing overhead.
@ -3952,7 +3969,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 						if($cid) {
 							$recips = enumerate_permissions($r[0]);
 							if(in_array($cid, $recips)) {
-								$replace = true;	
+								$replace = true;
 							}
 						}
 						elseif($item) {
@ -3985,7 +4002,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 					}
 				}
 			}
-		}	
+		}

 		$new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]';
 		$orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]'));
@ -4010,7 +4027,7 @@ function has_permissions($obj) {
 }

 function compare_permissions($obj1,$obj2) {
-	// first part is easy. Check that these are exactly the same. 
+	// first part is easy. Check that these are exactly the same.
 	if(($obj1['allow_cid'] == $obj2['allow_cid'])
 		&& ($obj1['allow_gid'] == $obj2['allow_gid'])
 		&& ($obj1['deny_cid'] == $obj2['deny_cid'])
@ -4052,14 +4069,14 @@ function item_getfeedtags($item) {
 				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
 		}
 	}
-	$matches = false; 
+	$matches = false;
 	$cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
 	if($cnt) {
 		for($x = 0; $x < $cnt; $x ++) {
 			if($matches[1][$x])
 				$ret[] = array('@',$matches[1][$x], $matches[2][$x]);
 		}
-	} 
+	}
 	return $ret;
 }

@ -4096,10 +4113,10 @@ function item_expire($uid,$days) {
 	$expire_network_only = get_pconfig($uid,'expire','network_only');
 	$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");

-	$r = q("SELECT * FROM `item` 
-		WHERE `uid` = %d 
-		AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY 
-		AND `id` = `parent` 
+	$r = q("SELECT * FROM `item`
+		WHERE `uid` = %d
+		AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY
+		AND `id` = `parent`
 		$sql_extra
 		AND `deleted` = 0",
 		intval($uid),
@ -4145,7 +4162,7 @@ function item_expire($uid,$days) {
 	}

 	proc_run('php',"include/notifier.php","expire","$uid");
-	
+
 }


@ -4266,10 +4283,10 @@ function drop_item($id,$interactive = true) {
 			}
 		}

-		// If item is a link to a photo resource, nuke all the associated photos 
+		// If item is a link to a photo resource, nuke all the associated photos
 		// (visitors will not have photo resources)
 		// This only applies to photos uploaded from the photos page. Photos inserted into a post do not
-		// generate a resource-id and therefore aren't intimately linked to the item. 
+		// generate a resource-id and therefore aren't intimately linked to the item.

 		if(strlen($item['resource-id'])) {
 			q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
@ -4409,7 +4426,7 @@ function posted_dates($uid,$wall) {
 	if(! $dthen)
 		return array();

-	// If it's near the end of a long month, backup to the 28th so that in 
+	// If it's near the end of a long month, backup to the 28th so that in
 	// consecutive loops we'll always get a whole month difference.

 	if(intval(substr($dnow,8)) > 28)
--- a/include/session.php
+++ b/include/session.php
@ -19,6 +19,8 @@ function ref_session_read ($id) {
  if(count($r)) {
    $session_exists = true;
    return $r[0]['data'];
+  } else {
+    logger("no data for session $id", LOGGER_TRACE);
  }
  return '';
 }}
--- a/include/template_processor.php
+++ b/include/template_processor.php
@ -1,4 +1,9 @@
 <?php
+/*
+ * This is the old template engine, now deprecated.
+ * Friendica's default template engine is Smarty3 (see include/friendica_smarty.php)
+ * 
+ */
 require_once 'object/TemplateEngine.php';

 define("KEY_NOT_EXISTS", '^R_key_not_Exists^');
--- a/include/text.php
+++ b/include/text.php
@ -1,13 +1,5 @@
 <?php

-// This is our template processor.
-// $s is the string requiring macro substitution.
-// $r is an array of key value pairs (search => replace)
-// returns substituted string.
-// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
-// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing, 
-// depending on the order in which they were declared in the array.
-
 require_once("include/template_processor.php");
 require_once("include/friendica_smarty.php");

@ -661,6 +653,9 @@ function attribute_contains($attr,$s) {
 }}

 if(! function_exists('logger')) {
+/* setup int->string log level map */
+$LOGGER_LEVELS = array();
+	
 /**
 * log levels:
 * LOGGER_NORMAL (default)
@ -678,9 +673,16 @@ function logger($msg,$level = 0) {
 	// turn off logger in install mode
 	global $a;
 	global $db;
-
+	global $LOGGER_LEVELS;
+	
 	if(($a->module == 'install') || (! ($db && $db->connected))) return;

+    if (count($LOGGER_LEVEL)==0){
+        foreach (get_defined_constants() as $k=>$v){
+            if (substr($k,0,7)=="LOGGER_") $LOGGER_LEVELS[$v] = substr($k,7,7);
+        }        
+    }
+    
 	$debugging = get_config('system','debugging');
 	$loglevel  = intval(get_config('system','loglevel'));
 	$logfile   = get_config('system','logfile');
@ -688,8 +690,19 @@ function logger($msg,$level = 0) {
 	if((! $debugging) || (! $logfile) || ($level > $loglevel))
 		return;

+	$callers = debug_backtrace(); 
+	$logline =  sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", 
+				 datetime_convert(), 
+				 session_id(),
+				 $LOGGER_LEVELS[$level],
+				 basename($callers[0]['file']),
+				 $callers[0]['line'],
+				 $callers[1]['function'],
+				 $msg
+				);
+	
 	$stamp1 = microtime(true);
-	@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
+	@file_put_contents($logfile, $logline, FILE_APPEND);
 	$a->save_timestamp($stamp1, "file");
 	return;
 }}
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@ -14,6 +14,11 @@ function ACPopup(elm,backend_url){
 	this.kp_timer = false;
 	this.url = backend_url;

+	this.conversation_id = null;
+	var conv_id = this.element.id.match(/\d+$/);
+	if (conv_id) this.conversation_id = conv_id[0];
+	console.log("ACPopup elm id",this.element.id,"conversation",this.conversation_id);
+
 	var w = 530;
 	var h = 130;

@ -67,6 +72,7 @@ ACPopup.prototype._search = function(){
 		count:100,
 		search:this.searchText,
 		type:'c',
+		conversation: this.conversation_id,
 	}
 	
 	$.ajax({
@ -79,8 +85,10 @@ ACPopup.prototype._search = function(){
 			if (data.tot>0){
 				that.cont.show();
 				$(data.items).each(function(){
-					html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
-						that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
+					var html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick);
+					var nick = this.nick.replace(' ','');
+					if (this.id!=='')  nick += '+' + this.id; 
+					that.add(html, nick + ' - ' + this.link);
 				});			
 			} else {
 				that.cont.hide();
--- a/mod/admin.php
+++ b/mod/admin.php
@ -405,6 +405,7 @@ function admin_page_site_post(&$a){
 	set_config('system','poll_interval',$poll_interval);
 	set_config('system','maxloadavg',$maxloadavg);
 	set_config('config','sitename',$sitename);
+	set_config('system','suppress_language',$suppress_language);
 	if ($banner==""){
 		// don't know why, but del_config doesn't work...
 		q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
--- a/util/messages.po
+++ b/util/messages.po
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
--- a/view/cs/smarty3/register_adminadd_eml.tpl
+++ b/view/cs/smarty3/register_adminadd_eml.tpl
@ -0,0 +1,32 @@
+Drahý {{$username}},
+	administrátor webu {{$sitename}} pro Vás vytvořil uživatelský účet.
+
+Vaše přihlašovací údaje jsou tyto:
+
+
+Adresa webu:	{{$siteurl}}
+Uživatelské jméno:	{{$email}}
+Heslo:	{{$password}}
+
+Vaše heslo si můžete po přihlášení změnit na stránce  
+.
+
+Prosím věnujte chvíli k revizi ostatních nastavení svého účtu.
+
+Můžete také přidat některé základní informace do Vašeho defaultního profilu 
+ (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt.
+
+Doporučujeme nastavit celé jméno, přidat profilové foto
+, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a 
+ zemi, ve které žijete. Nemusíte zadávat víc 
+informací.
+
+Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. 
+Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto 
+položek můžete získat nové a zajímavé přátele.  
+
+
+Díky a vítejte na {{$sitename}}.
+
+S pozdravem,
+	{{$sitename}} administrátor
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
--- a/view/fr/passchanged_eml.tpl
+++ b/view/fr/passchanged_eml.tpl
@ -1,20 +1,20 @@

-Cher(e) $username,
+Cher/Chère $[username],
+	Votre mot de passe a été changé comme demandé. Merci de 
+mémoriser cette information (ou de changer immédiatement pour un 
+mot de passe que vous retiendrez).

-	Votre mot de passe a été modifié comme demandé. Merci de conserver
-cette information pour un usage ultérieur (ou bien de changer votre mot de 
-passe immédiatement en quelque chose dont vous vous souviendrez).

-Vos informations de connexion sont désormais :
+Vos identifiants sont comme suit :

-Site :			$siteurl
-Pseudo/Courriel :	$email
-Mot de passe :		$new_password
+Adresse du site:	$[siteurl]
+Utilisateur:	$[email]
+Mot de passe:	$[new_password]

-Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, 
-après connexion
+Vous pouvez changer ce mot de passe depuis vos 'Réglages' une fois connecté.

-Sincèrement votre,
-	l'administrateur de $sitename

- 
+Sincèrement,
+	l'administrateur de $[sitename]
+
+ 
--- a/view/fr/register_open_eml.tpl
+++ b/view/fr/register_open_eml.tpl
@ -1,22 +1,34 @@

-Cher(e) $username,
+Cher $[username],
+	Merci de vous être inscrit sur $[sitename]. Votre compte est bien créé. 
+Vos informations de connexion sont comme suit : 

-	Merci de votre inscription à $sitename. Votre compte a été créé.
-Les informations de connexion sont les suivantes :

-Site :			$siteurl
-Pseudo/Courriel :	$email
-Mot de passe :		$password
+Adresse du site:	$[siteurl]
+Utilisateur:	$[email]
+Mot de passe:	$[password]

-Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte,
-après connexion.
+Vous pouvez changer votre mot de passe depuis la page "Réglages" une fois 
+connecté.

-Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
-sur cette page.
+Merci de prender quelques instants pour vérifier les autres réglages de cette page.

-Merci, et bienvenue sur $sitename.
+Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut 
+(sur la page "Profils") pour que les autres membres vous trouvent facilement.
+
+Nous vous recommandons d'indiquer un nom complet, d'ajouter une photo 
+de profil, quelques "mots-clés" (très efficace pour rencontrer des gens) - et 
+peut-être aussi votre pays de résidence ; sauf si vous souhaitez être plus
+précis, bien sûr.
+
+Nous avons le plus grand respect pour votre vie privée, et aucun de ces éléments n'est nécessaire. 
+Si vous êtes nouveau et ne connaissez personne, ils peuvent cependant vous
+aider à vous faire quelques nouveaux et intéressants contacts.  
+
+
+Merci, et bienvenue sur $[sitename].

 Sincèrement votre,
-	l'administrateur de $sitename
+	l'administrateur de $[sitename]

- 
+ 
--- a/view/fr/register_verify_eml.tpl
+++ b/view/fr/register_verify_eml.tpl
@ -1,27 +1,25 @@

-Une nouvelle demande d'inscription a été reçue sur $sitename, et elle
-nécessite votre approbation.
+Une nouvelle demande d'inscription a été reçue par $[sitename], elle  
+nécessite votre approbation. 


-Les informations de connexion sont les suivantes :
+Les détails du compte sont:

-Nom complet :		$username
-Site :			$siteurl
-Pseudo/Courriel :	$email
+Nom complet:	$[username]
+Adresse du site:	$[siteurl]
+Utilisateur:	$[email]


-Pour approuver cette demande, merci de suivre le lien :
+Pour approuver, merci de visiter le lien suivant:


-$siteurl/regmod/allow/$hash
+$[siteurl]/regmod/allow/$[hash] 


-Pour rejeter cette demande et supprimer le compte associé, 
-merci de suivre le lien :
+Pour refuser et supprimer le compte:


-$siteurl/regmod/deny/$hash
+$[siteurl]/regmod/deny/$[hash]


-En vous remerçiant.
-
+Merci d'avance.
--- a/view/fr/smarty3/register_adminadd_eml.tpl
+++ b/view/fr/smarty3/register_adminadd_eml.tpl
@ -0,0 +1,32 @@
+Chère, Cher {{$username}},
+	l'administrateur de {{$sitename}} vous à créé un compte.
+
+Les détails de connexion sont les suivants :
+
+
+Emplacement du site :	{{$siteurl}}
+Nom de connexion :	{{$email}}
+Mot de passe :	{{$password}}
+
+Vous pouvez modifier votre mot de passe à la page des "Paramètres" de votre compte, une fois 
+connecté.
+
+Veuillez prendre le temps d'examiner les autres paramètres de votre compte sur cette page.
+
+Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut 
+(sur la page "Profils") pour que d'autres personnes vous trouvent facilement.
+
+Nous vous recommandons d'indiquer votre nom complet, d'ajouter une photo pour votre profil,
+d'ajouter quelques "mots-clés" (très efficace pour se faire de nouveaux amis) - et 
+peut-être aussi votre pays de résidence ; sauf si vous souhaitez pas être
+aussi spécifique.
+
+Nous respectons entièrement votre vie privée, et aucun de ces éléments n'est nécessaire. 
+Si vous êtes nouveau et ne connaissez personne, ils peuvent vous
+aider à vous faire de nouveaux et interessants amis.  
+
+
+Merci, et bienvenue sur {{$sitename}}.
+
+Sincèrement votre,
+	L'administrateur de {{$sitename}}
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@ -109,17 +109,18 @@ $a->strings["Left"] = "Gauche";
 $a->strings["Center"] = "Centre";
 $a->strings["Color scheme"] = "Palette de couleurs";
 $a->strings["Posts font size"] = "Taille de texte des messages";
-$a->strings["Textareas font size"] = "";
+$a->strings["Textareas font size"] = "Taille de police des zones de texte";
 $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
 $a->strings["default"] = "défaut";
-$a->strings["Background Image"] = "";
+$a->strings["Background Image"] = "Image de fond";
 $a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "";
-$a->strings["Background Color"] = "";
+$a->strings["Background Color"] = "Couleur de fond";
 $a->strings["HEX value for the background color. Don't include the #"] = "";
-$a->strings["font size"] = "";
+$a->strings["font size"] = "Taille de police";
 $a->strings["base font size for your interface"] = "";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Choisir une taille pour les images dans les publications et commentaires (largeur et hauteur)";
 $a->strings["Set theme width"] = "Largeur du thème";
+$a->strings["Set style"] = "Définir le style";
 $a->strings["Delete this item?"] = "Effacer cet élément?";
 $a->strings["show fewer"] = "montrer moins";
 $a->strings["Update %s failed. See error logs."] = "Mise-à-jour %s échouée. Voir les journaux d'erreur.";
@ -134,10 +135,10 @@ $a->strings["Remember me"] = "Se souvenir de moi";
 $a->strings["Or login using OpenID: "] = "Ou connectez-vous via OpenID: ";
 $a->strings["Forgot your password?"] = "Mot de passe oublié?";
 $a->strings["Password Reset"] = "Réinitialiser le mot de passe";
-$a->strings["Website Terms of Service"] = "";
-$a->strings["terms of service"] = "";
-$a->strings["Website Privacy Policy"] = "";
-$a->strings["privacy policy"] = "";
+$a->strings["Website Terms of Service"] = "Conditions d'utilisation du site internet";
+$a->strings["terms of service"] = "conditions d'utilisation";
+$a->strings["Website Privacy Policy"] = "Politique de confidentialité du site internet";
+$a->strings["privacy policy"] = "politique de confidentialité";
 $a->strings["Requested account is not available."] = "Le compte demandé n'est pas disponible.";
 $a->strings["Requested profile is not available."] = "Le profil demandé n'est pas disponible.";
 $a->strings["Edit profile"] = "Editer le profil";
@ -166,7 +167,7 @@ $a->strings["Status"] = "Statut";
 $a->strings["Status Messages and Posts"] = "Messages d'état et publications";
 $a->strings["Profile Details"] = "Détails du profil";
 $a->strings["Photo Albums"] = "Albums photo";
-$a->strings["Videos"] = "";
+$a->strings["Videos"] = "Vidéos";
 $a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Personal Notes"] = "Notes personnelles";
 $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça";
@ -207,7 +208,7 @@ $a->strings["Your Email Address: "] = "Votre adresse courriel: ";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de votre profil en découlera sous la forme '&lt;strong&gt;pseudo@\$sitename&lt;/strong&gt;'.";
 $a->strings["Choose a nickname: "] = "Choisir un pseudo: ";
 $a->strings["Import"] = "Importer";
-$a->strings["Import your profile to this friendica instance"] = "";
+$a->strings["Import your profile to this friendica instance"] = "Importer votre profile dans cette instance de friendica";
 $a->strings["Profile not found."] = "Profil introuvable.";
 $a->strings["Contact not found."] = "Contact introuvable.";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Ceci peut se produire lorsque le contact a été requis par les deux personnes et a déjà été approuvé.";
@ -232,7 +233,7 @@ $a->strings["%1\$s has joined %2\$s"] = "%1\$s a rejoint %2\$s";
 $a->strings["Authorize application connection"] = "Autoriser l'application à se connecter";
 $a->strings["Return to your app and insert this Securty Code:"] = "Retournez à votre application et saisissez ce Code de Sécurité : ";
 $a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos notices et contacts, et/ou à créer des notices à votre place?";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos billets et contacts, et/ou à créer des billets à votre place?";
 $a->strings["No valid account found."] = "Impossible de trouver un compte valide.";
 $a->strings["Password reset request issued. Check your email."] = "Réinitialisation du mot de passe en cours. Vérifiez votre courriel.";
 $a->strings["Password reset requested at %s"] = "Requête de réinitialisation de mot de passe à %s";
@ -354,9 +355,9 @@ $a->strings["If you don't have a command line version of PHP installed on server
 $a->strings["PHP executable path"] = "Chemin vers l'exécutable de PHP";
 $a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin (absolu) vers l'exécutable 'php'. Vous pouvez laisser cette ligne vide pour continuer l'installation.";
 $a->strings["Command line PHP"] = "Version \"ligne de commande\" de PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "";
-$a->strings["Found PHP version: "] = "";
-$a->strings["PHP cli binary"] = "";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "L'executable PHP n'est pas le binaire php client (c'est peut être la version cgi-fcgi)";
+$a->strings["Found PHP version: "] = "Version de PHP:";
+$a->strings["PHP cli binary"] = "PHP cli binary";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
 $a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
@ -380,11 +381,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "A la fin de cette étape, nous vous fournirons un texte à sauvegarder dans un fichier nommé .htconfig.php à la racine de votre répertoire Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vous pouvez également sauter cette étape et procéder à une installation manuelle. Pour cela, merci de lire le fichier \"INSTALL.txt\".";
 $a->strings[".htconfig.php is writable"] = "Fichier .htconfig.php accessible en écriture";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
-$a->strings["view/smarty3 is writable"] = "";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica utilise le moteur de modèles Smarty3 pour le rendu d'affichage web. Smarty3 compile les modèles en PHP pour accélérer le rendu.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pour pouvoir stocker ces modèles compilés, le serveur internet doit avoir accès au droit d'écriture pour le répertoire view/smarty3/ sous le dossier racine de Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Veuillez vous assurer que l'utilisateur qui exécute votre serveur internet (p. ex. www-data) détient le droit d'accès en écriture sur ce dossier.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Note: pour plus de sécurité, vous devriez ne donner le droit d'accès en écriture qu'à view/smarty3/ et pas aux fichiers modèles (.tpl) qu'il contient.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écriture";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La réécriture d'URL dans le fichier .htaccess ne fonctionne pas. Vérifiez la configuration de votre serveur.";
 $a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
 $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."] = "Le fichier de configuration de la base (\".htconfig.php\") ne peut être créé. Merci d'utiliser le texte ci-joint pour créer ce fichier à la racine de votre hébergement.";
@ -418,6 +419,7 @@ $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] =
 $a->strings["Site settings updated."] = "Réglages du site mis-à-jour.";
 $a->strings["No special theme for mobile devices"] = "Pas de thème particulier pour les terminaux mobiles";
 $a->strings["Never"] = "Jamais";
+$a->strings["At post arrival"] = "A l'arrivé d'une publication";
 $a->strings["Frequently"] = "Fréquemment";
 $a->strings["Hourly"] = "Toutes les heures";
 $a->strings["Twice daily"] = "Deux fois par jour";
@ -429,7 +431,7 @@ $a->strings["Open"] = "Ouvert";
 $a->strings["No SSL policy, links will track page SSL state"] = "Pas de politique SSL, le liens conserveront l'état SSL de la page";
 $a->strings["Force all links to use SSL"] = "Forcer tous les liens à utiliser SSL";
 $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificat auto-signé, n'utiliser SSL que pour les liens locaux (non recommandé)";
-$a->strings["Save Settings"] = "";
+$a->strings["Save Settings"] = "Sauvegarder les paramétres";
 $a->strings["File upload"] = "Téléversement de fichier";
 $a->strings["Policies"] = "Politiques";
 $a->strings["Advanced"] = "Avancé";
@ -437,19 +439,19 @@ $a->strings["Performance"] = "Performance";
 $a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "";
 $a->strings["Site name"] = "Nom du site";
 $a->strings["Banner/Logo"] = "Bannière/Logo";
-$a->strings["Additional Info"] = "";
+$a->strings["Additional Info"] = "Informations supplémentaires";
 $a->strings["For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo."] = "";
 $a->strings["System language"] = "Langue du système";
 $a->strings["System theme"] = "Thème du système";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Thème par défaut sur ce site - peut être changé en fonction des profils - <a href='#' id='cnftheme'>changer les réglages du thème</a>";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Thème par défaut sur ce site - peut être changé au niveau du profile utilisateur - <a href='#' id='cnftheme'>changer les réglages du thème</a>";
 $a->strings["Mobile system theme"] = "Thème mobile";
 $a->strings["Theme for mobile devices"] = "Thème pour les terminaux mobiles";
 $a->strings["SSL link policy"] = "Politique SSL pour les liens";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "Détermine si les liens générés doivent forcer l'usage de SSL";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Détermine si les liens générés doivent forcer l'utilisation de SSL";
 $a->strings["Old style 'Share'"] = "";
 $a->strings["Deactivates the bbcode element 'share' for repeating items."] = "";
 $a->strings["Hide help entry from navigation menu"] = "Cacher l'aide du menu de navigation";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Cacher l'entrée du menu pour les pages d'Aide dans le menu de navigation. Vous pouvez toujours y accéder en tapant /help directement.";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Cacher du menu de navigation le l'entrée des vers les pages d'aide. Vous pouvez toujours y accéder en tapant directement /help.";
 $a->strings["Single user instance"] = "Instance mono-utilisateur";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Transformer cette en instance en multi-utilisateur ou mono-utilisateur pour cet l'utilisateur.";
 $a->strings["Maximum image size"] = "Taille maximale des images";
@ -475,17 +477,17 @@ $a->strings["Force publish"] = "Forcer la publication globale";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Cocher pour publier obligatoirement tous les profils locaux dans l'annuaire du site.";
 $a->strings["Global directory update URL"] = "URL de mise-à-jour de l'annuaire global";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL de mise-à-jour de l'annuaire global. Si vide, l'annuaire global sera complètement indisponible.";
-$a->strings["Allow threaded items"] = "Activer les commentaires imbriqués";
+$a->strings["Allow threaded items"] = "autoriser le suivi des éléments par fil conducteur";
 $a->strings["Allow infinite level threading for items on this site."] = "Permettre une imbrication infinie des commentaires.";
 $a->strings["Private posts by default for new users"] = "Publications privées par défaut pour les nouveaux utilisateurs";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Rendre les posts de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde.";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Rendre les publications de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde.";
 $a->strings["Don't include post content in email notifications"] = "Ne pas inclure le contenu posté dans l'e-mail de notification";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Ne pas inclure le contenu d'un postage/commentaire/message privé/etc dans l'e-mail de notification qui est envoyé à partir du site, par mesure de confidentialité.";
-$a->strings["Disallow public access to addons listed in the apps menu."] = "";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Ne pas inclure le contenu d'un billet/commentaire/message privé/etc dans l'e-mail de notification qui est envoyé à partir du site, par mesure de confidentialité.";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Interdire l'acces public pour les extentions listées dans le menu apps.";
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "";
 $a->strings["Don't embed private images in posts"] = "";
 $a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "";
-$a->strings["Allow Users to set remote_self"] = "";
+$a->strings["Allow Users to set remote_self"] = "Autoriser les utilisateurs à définir remote_self";
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "";
 $a->strings["Block multiple registrations"] = "Interdire les inscriptions multiples";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Ne pas permettre l'inscription de comptes multiples comme des pages.";
@ -498,7 +500,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "Utiliser les expressions rati
 $a->strings["Show Community Page"] = "Montrer la \"Place publique\"";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Afficher une page Communauté avec toutes les publications publiques récentes du site.";
 $a->strings["Enable OStatus support"] = "Activer le support d'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."] = "Fournir une compatibilité OStatus (identi.ca, status.net, etc.). Toutes les communications d'OStatus sont publiques, des avertissements liés à la vie privée seront affichés si utile.";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Fourni nativement la compatibilité avec OStatus (StatusNet, GNU Social etc.). Touts les communications utilisant OStatus sont public, des avertissements liés à la vie privée seront affichés si utile.";
 $a->strings["OStatus conversation completion interval"] = "";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "";
 $a->strings["Enable Diaspora support"] = "Activer le support de Diaspora";
@ -519,7 +521,7 @@ $a->strings["Maximum Load Average"] = "Plafond de la charge moyenne";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Charge système maximale à partir de laquelle l'émission et la réception seront soumises à un délai supplémentaire. Par défaut, 50.";
 $a->strings["Use MySQL full text engine"] = "Utiliser le moteur de recherche plein texte de MySQL";
 $a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Activer le moteur de recherche plein texte. Accélère la recherche mais peut seulement rechercher quatre lettres ou plus.";
-$a->strings["Suppress Language"] = "";
+$a->strings["Suppress Language"] = "Supprimer un langage";
 $a->strings["Suppress language information in meta information about a posting."] = "";
 $a->strings["Path to item cache"] = "Chemin vers le cache des objets.";
 $a->strings["Cache duration in seconds"] = "Durée du cache en secondes";
@ -538,7 +540,7 @@ $a->strings["Failed Updates"] = "Mises-à-jour échouées";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "Ceci n'inclut pas les versions antérieures à la 1139, qui ne retournaient jamais de détails.";
 $a->strings["Mark success (if update was manually applied)"] = "Marquer comme 'réussie' (dans le cas d'une mise-à-jour manuelle)";
 $a->strings["Attempt to execute this update step automatically"] = "Tenter d'éxecuter cette étape automatiquement";
-$a->strings["Registration successful. Email send to user"] = "";
+$a->strings["Registration successful. Email send to user"] = "Souscription réussi. Mail envoyé à l'utilisateur";
 $a->strings["%s user blocked/unblocked"] = array(
 	0 => "%s utilisateur a (dé)bloqué",
 	1 => "%s utilisateurs ont (dé)bloqué",
@ -550,7 +552,7 @@ $a->strings["%s user deleted"] = array(
 $a->strings["User '%s' deleted"] = "Utilisateur '%s' supprimé";
 $a->strings["User '%s' unblocked"] = "Utilisateur '%s' débloqué";
 $a->strings["User '%s' blocked"] = "Utilisateur '%s' bloqué";
-$a->strings["Add User"] = "";
+$a->strings["Add User"] = "Ajouter l'utilisateur";
 $a->strings["select all"] = "tout sélectionner";
 $a->strings["User registrations waiting for confirm"] = "Inscriptions d'utilisateurs en attente de confirmation";
 $a->strings["User waiting for permanent deletion"] = "";
@ -564,7 +566,7 @@ $a->strings["Block"] = "Bloquer";
 $a->strings["Unblock"] = "Débloquer";
 $a->strings["Site admin"] = "Administration du Site";
 $a->strings["Account expired"] = "Compte expiré";
-$a->strings["New User"] = "";
+$a->strings["New User"] = "Nouvel utilisateur";
 $a->strings["Register date"] = "Date d'inscription";
 $a->strings["Last login"] = "Dernière connexion";
 $a->strings["Last item"] = "Dernier élément";
@ -572,10 +574,10 @@ $a->strings["Deleted since"] = "";
 $a->strings["Account"] = "Compte";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
-$a->strings["Name of the new user."] = "";
-$a->strings["Nickname"] = "";
-$a->strings["Nickname of the new user."] = "";
-$a->strings["Email address of the new user."] = "";
+$a->strings["Name of the new user."] = "Nom du nouvel utilisateur.";
+$a->strings["Nickname"] = "Pseudo";
+$a->strings["Nickname of the new user."] = "Pseudo du nouvel utilisateur.";
+$a->strings["Email address of the new user."] = "Adresse mail du nouvel utilisateur.";
 $a->strings["Plugin %s disabled."] = "Extension %s désactivée.";
 $a->strings["Plugin %s enabled."] = "Extension %s activée.";
 $a->strings["Disable"] = "Désactiver";
@ -589,7 +591,7 @@ $a->strings["[Experimental]"] = "[Expérimental]";
 $a->strings["[Unsupported]"] = "[Non supporté]";
 $a->strings["Log settings updated."] = "Réglages des journaux mis-à-jour.";
 $a->strings["Clear"] = "Effacer";
-$a->strings["Enable Debugging"] = "";
+$a->strings["Enable Debugging"] = "Activer le déboggage";
 $a->strings["Log file"] = "Fichier de journaux";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Accès en écriture par le serveur web requis. Relatif à la racine de votre installation de Friendica.";
 $a->strings["Log level"] = "Niveau de journalisaton";
@ -605,7 +607,7 @@ $a->strings["Tips for New Members"] = "Conseils aux nouveaux venus";
 $a->strings["link"] = "lien";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a taggué %3\$s de %2\$s avec %4\$s";
 $a->strings["Item not found"] = "Élément introuvable";
-$a->strings["Edit post"] = "Éditer la publication";
+$a->strings["Edit post"] = "Éditer le billet";
 $a->strings["upload photo"] = "envoi image";
 $a->strings["Attach file"] = "Joindre fichier";
 $a->strings["attach file"] = "ajout fichier";
@ -620,7 +622,7 @@ $a->strings["Clear browser location"] = "Effacer la localisation du navigateur";
 $a->strings["clear location"] = "supp. localisation";
 $a->strings["Permission settings"] = "Réglages des permissions";
 $a->strings["CC: email addresses"] = "CC: adresses de courriel";
-$a->strings["Public post"] = "Notice publique";
+$a->strings["Public post"] = "Billet publique";
 $a->strings["Set title"] = "Définir un titre";
 $a->strings["Categories (comma-separated list)"] = "Catégories (séparées par des virgules)";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@exemple.com, mary@exemple.com";
@ -714,8 +716,8 @@ $a->strings["Submit Request"] = "Envoyer la requête";
 $a->strings["[Embedded content - reload page to view]"] = "[contenu incorporé - rechargez la page pour le voir]";
 $a->strings["View in context"] = "Voir dans le contexte";
 $a->strings["%d contact edited."] = array(
-	0 => "",
-	1 => "",
+	0 => "%d contact édité",
+	1 => "%d contacts édités.",
 );
 $a->strings["Could not access contact record."] = "Impossible d'accéder à l'enregistrement du contact.";
 $a->strings["Could not locate selected profile."] = "Impossible de localiser le profil séléctionné.";
@ -769,6 +771,9 @@ $a->strings["Currently ignored"] = "Actuellement ignoré";
 $a->strings["Currently archived"] = "Actuellement archivé";
 $a->strings["Hide this contact from others"] = "Cacher ce contact aux autres";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Les réponses et \"j'aime\" à vos contenus publics <strong>peuvent</strong> être toujours visibles";
+$a->strings["Notification for new posts"] = "Notification des nouvelles publications";
+$a->strings["Send a notification of every new post of this contact"] = "";
+$a->strings["Fetch further information for feeds"] = "";
 $a->strings["Suggestions"] = "Suggestions";
 $a->strings["Suggest potential friends"] = "Suggérer des amis potentiels";
 $a->strings["All Contacts"] = "Tous les contacts";
@ -790,11 +795,10 @@ $a->strings["Edit contact"] = "Éditer le contact";
 $a->strings["Search your contacts"] = "Rechercher dans vos contacts";
 $a->strings["Update"] = "Mises-à-jour";
 $a->strings["everybody"] = "tout le monde";
-$a->strings["Account settings"] = "Compte";
 $a->strings["Additional features"] = "Fonctions supplémentaires";
-$a->strings["Display settings"] = "Affichage";
-$a->strings["Connector settings"] = "Connecteurs";
-$a->strings["Plugin settings"] = "Extensions";
+$a->strings["Display"] = "Afficher";
+$a->strings["Social Networks"] = "Réseaux sociaux";
+$a->strings["Delegations"] = "Délégations";
 $a->strings["Connected apps"] = "Applications connectées";
 $a->strings["Export personal data"] = "Exporter";
 $a->strings["Remove account"] = "Supprimer le compte";
@ -805,12 +809,12 @@ $a->strings["Features updated"] = "Fonctionnalités mises à jour";
 $a->strings["Relocate message has been send to your contacts"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "Les mots de passe ne correspondent pas. Aucun changement appliqué.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Les mots de passe vides sont interdits. Aucun changement appliqué.";
-$a->strings["Wrong password."] = "";
+$a->strings["Wrong password."] = "Mauvais mot de passe.";
 $a->strings["Password changed."] = "Mots de passe changés.";
 $a->strings["Password update failed. Please try again."] = "Le changement de mot de passe a échoué. Merci de recommencer.";
 $a->strings[" Please use a shorter name."] = " Merci d'utiliser un nom plus court.";
 $a->strings[" Name too short."] = " Nom trop court.";
-$a->strings["Wrong Password"] = "";
+$a->strings["Wrong Password"] = "Mauvais mot de passe";
 $a->strings[" Not valid email."] = " Email invalide.";
 $a->strings[" Cannot change to that email."] = " Impossible de changer pour cet email.";
 $a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Ce forum privé n'a pas de paramètres de vie privée. Utilisation des paramètres de confidentialité par défaut.";
@ -836,7 +840,6 @@ $a->strings["enabled"] = "activé";
 $a->strings["disabled"] = "désactivé";
 $a->strings["StatusNet"] = "StatusNet";
 $a->strings["Email access is disabled on this site."] = "L'accès courriel est désactivé sur ce site.";
-$a->strings["Connector Settings"] = "Connecteurs";
 $a->strings["Email/Mailbox Setup"] = "Réglages de courriel/boîte à lettre";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vous souhaitez communiquer avec vos contacts \"courriel\" (facultatif), merci de nous indiquer comment vous connecter à votre boîte.";
 $a->strings["Last successful email check:"] = "Dernière vérification réussie des courriels:";
@ -859,9 +862,12 @@ $a->strings["Update browser every xx seconds"] = "Mettre-à-jour l'affichage tou
 $a->strings["Minimum of 10 seconds, no maximum"] = "Délai minimum de 10 secondes, pas de maximum";
 $a->strings["Number of items to display per page:"] = "Nombre d’éléments par page:";
 $a->strings["Maximum of 100 items"] = "Maximum de 100 éléments";
-$a->strings["Number of items to display per page when viewed from mobile device:"] = "";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "Nombre d'éléments a afficher par page pour un appareil mobile";
 $a->strings["Don't show emoticons"] = "Ne pas afficher les émoticônes (smileys grahiques)";
+$a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "";
+$a->strings["User Types"] = "";
+$a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "Compte normal";
 $a->strings["This account is a normal personal profile"] = "Ce compte correspond à un profil normal, pour une seule personne (physique, généralement)";
 $a->strings["Soapbox Page"] = "Compte \"boîte à savon\"";
@ -899,9 +905,9 @@ $a->strings["Password Settings"] = "Réglages de mot de passe";
 $a->strings["New Password:"] = "Nouveau mot de passe:";
 $a->strings["Confirm:"] = "Confirmer:";
 $a->strings["Leave password fields blank unless changing"] = "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer";
-$a->strings["Current Password:"] = "";
-$a->strings["Your current password to confirm the changes"] = "";
-$a->strings["Password:"] = "";
+$a->strings["Current Password:"] = "Mot de passe actuel:";
+$a->strings["Your current password to confirm the changes"] = "Votre mot de passe actuel pour confirmer les modifications";
+$a->strings["Password:"] = "Mot de passe:";
 $a->strings["Basic Settings"] = "Réglages basiques";
 $a->strings["Full Name:"] = "Nom complet:";
 $a->strings["Email Address:"] = "Adresse courriel:";
@ -1011,7 +1017,7 @@ $a->strings["Group created."] = "Groupe créé.";
 $a->strings["Could not create group."] = "Impossible de créer le groupe.";
 $a->strings["Group not found."] = "Groupe introuvable.";
 $a->strings["Group name changed."] = "Groupe renommé.";
-$a->strings["Save Group"] = "";
+$a->strings["Save Group"] = "Sauvegarder le groupe";
 $a->strings["Create a group of contacts/friends."] = "Créez un groupe de contacts/amis.";
 $a->strings["Group Name: "] = "Nom du groupe: ";
 $a->strings["Group removed."] = "Groupe enlevé.";
@ -1093,7 +1099,7 @@ $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Vo
 $a->strings["Upload Photos"] = "Téléverser des photos";
 $a->strings["New album name: "] = "Nom du nouvel album: ";
 $a->strings["or existing album name: "] = "ou nom d'un album existant: ";
-$a->strings["Do not show a status post for this upload"] = "Ne pas publier de notice pour cet envoi";
+$a->strings["Do not show a status post for this upload"] = "Ne pas publier de notice de statut pour cet envoi";
 $a->strings["Permissions"] = "Permissions";
 $a->strings["Private Photo"] = "Photo privée";
 $a->strings["Public Photo"] = "Photo publique";
@ -1120,12 +1126,14 @@ $a->strings["Public photo"] = "Photo publique";
 $a->strings["Share"] = "Partager";
 $a->strings["View Album"] = "Voir l'album";
 $a->strings["Recent Photos"] = "Photos récentes";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Désolé, il semble que votre fichier est plus important que ce que la configuration de PHP autorise";
+$a->strings["Or - did you try to upload an empty file?"] = "";
 $a->strings["File exceeds size limit of %d"] = "La taille du fichier dépasse la limite de %d";
 $a->strings["File upload failed."] = "Le téléversement a échoué.";
-$a->strings["No videos selected"] = "";
-$a->strings["View Video"] = "";
-$a->strings["Recent Videos"] = "";
-$a->strings["Upload New Videos"] = "";
+$a->strings["No videos selected"] = "Pas de vidéo sélectionné";
+$a->strings["View Video"] = "Regarder la vidéo";
+$a->strings["Recent Videos"] = "Vidéos récente";
+$a->strings["Upload New Videos"] = "Téléversé une nouvelle vidéo";
 $a->strings["Poke/Prod"] = "Solliciter";
 $a->strings["poke, prod or do other things to somebody"] = "solliciter (poke/...) quelqu'un";
 $a->strings["Recipient"] = "Destinataire";
@ -1241,11 +1249,11 @@ $a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
 $a->strings["New Follower"] = "Nouvel abonné";
 $a->strings["No introductions."] = "Aucune demande d'introduction.";
 $a->strings["Notifications"] = "Notifications";
-$a->strings["%s liked %s's post"] = "%s a aimé la notice de %s";
-$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la notice de %s";
+$a->strings["%s liked %s's post"] = "%s a aimé le billet de %s";
+$a->strings["%s disliked %s's post"] = "%s n'a pas aimé le billet de %s";
 $a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
-$a->strings["%s created a new post"] = "%s a publié une notice";
-$a->strings["%s commented on %s's post"] = "%s a commenté une notice de %s";
+$a->strings["%s created a new post"] = "%s a publié un billet";
+$a->strings["%s commented on %s's post"] = "%s a commenté le billet de %s";
 $a->strings["No more network notifications."] = "Aucune notification du réseau.";
 $a->strings["Network Notifications"] = "Notifications du réseau";
 $a->strings["No more personal notifications."] = "Aucun notification personnelle.";
@ -1298,11 +1306,13 @@ $a->strings["Categories"] = "Catégories";
 $a->strings["Click here to upgrade."] = "Cliquez ici pour mettre à jour.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Cette action dépasse les limites définies par votre abonnement.";
 $a->strings["This action is not available under your subscription plan."] = "Cette action n'est pas disponible avec votre abonnement.";
-$a->strings["User not found."] = "";
-$a->strings["There is no status with this id."] = "";
+$a->strings["User not found."] = "Utilisateur non trouvé";
+$a->strings["There is no status with this id."] = "Il n'y a pas de statut avec cet id.";
+$a->strings["There is no conversation with this id."] = "Il n'y a pas de conversation avec cet id.";
 $a->strings["view full size"] = "voir en pleine taille";
 $a->strings["Starts:"] = "Débute:";
 $a->strings["Finishes:"] = "Finit:";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Impossible de localiser les informations DNS pour le serveur de base de données '%s'";
 $a->strings["(no subject)"] = "(sans titre)";
 $a->strings["noreply"] = "noreply";
 $a->strings["An invitation is required."] = "Une invitation est requise.";
@ -1340,8 +1350,8 @@ $a->strings["Send PM"] = "Message privé";
 $a->strings["Poke"] = "Sollicitations (pokes)";
 $a->strings["%s likes this."] = "%s aime ça.";
 $a->strings["%s doesn't like this."] = "%s n'aime pas ça.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d personnes</span> aiment ça";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d personnes</span> n'aiment pas ça";
 $a->strings["and"] = "et";
 $a->strings[", and %d other people"] = ", et %d autres personnes";
 $a->strings["%s like this."] = "%s aiment ça.";
@ -1353,6 +1363,7 @@ $a->strings["Tag term:"] = "Tag : ";
 $a->strings["Where are you right now?"] = "Où êtes-vous présentemment?";
 $a->strings["Delete item(s)?"] = "Supprimer les élément(s) ?";
 $a->strings["Post to Email"] = "Publier aussi par courriel";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "permissions";
 $a->strings["Post to Groups"] = "";
 $a->strings["Post to Contacts"] = "";
@ -1360,15 +1371,15 @@ $a->strings["Private post"] = "Message privé";
 $a->strings["Logged out."] = "Déconnecté.";
 $a->strings["Error decoding account file"] = "";
 $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
-$a->strings["Error! Cannot check nickname"] = "";
-$a->strings["User '%s' already exists on this server!"] = "";
+$a->strings["Error! Cannot check nickname"] = "Erreur! Pseudo invalide";
+$a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
 $a->strings["User creation error"] = "Erreur de création d'utilisateur";
 $a->strings["User profile creation error"] = "Erreur de création du profil utilisateur";
 $a->strings["%d contact not imported"] = array(
 	0 => "%d contacts non importés",
 	1 => "%d contacts non importés",
 );
-$a->strings["Done. You can now login with your username and password"] = "";
+$a->strings["Done. You can now login with your username and password"] = "Action réalisé. Vous pouvez désormais vous connecter avec votre nom d'utilisateur et votre mot de passe";
 $a->strings["newer"] = "Plus récent";
 $a->strings["older"] = "Plus ancien";
 $a->strings["prev"] = "précédent";
@ -1457,6 +1468,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s a posté sur
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a repéré";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous parle sur %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a taggé[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notification] %s partage une nouvelle publication";
+$a->strings["%1\$s shared a new post at %2\$s"] = "";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]partage une publication[/url].";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s vous a sollicité";
 $a->strings["%1\$s poked you at %2\$s"] = "%1\$s vous a sollicité via %2\$s";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s vous a [url=%2\$s]sollicité[/url].";
@ -1506,9 +1520,11 @@ $a->strings["Search site content"] = "Rechercher dans le contenu du site";
 $a->strings["Conversations on this site"] = "Conversations ayant cours sur ce site";
 $a->strings["Directory"] = "Annuaire";
 $a->strings["People directory"] = "Annuaire des utilisateurs";
+$a->strings["Information"] = "Information";
+$a->strings["Information about this friendica instance"] = "Information au sujet de cette instance de friendica";
 $a->strings["Conversations from your friends"] = "Conversations de vos amis";
 $a->strings["Network Reset"] = "";
-$a->strings["Load Network page with no filters"] = "";
+$a->strings["Load Network page with no filters"] = "Chargement des pages du réseau sans filtre";
 $a->strings["Friend Requests"] = "Demande d'amitié";
 $a->strings["See all notifications"] = "Voir toute notification";
 $a->strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme 'vues'";
@ -1517,7 +1533,7 @@ $a->strings["Inbox"] = "Messages entrants";
 $a->strings["Outbox"] = "Messages sortants";
 $a->strings["Manage"] = "Gérer";
 $a->strings["Manage other pages"] = "Gérer les autres pages";
-$a->strings["Delegations"] = "Délégations";
+$a->strings["Account settings"] = "Compte";
 $a->strings["Manage/Edit Profiles"] = "Gérer/Éditer les profiles";
 $a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
 $a->strings["Site setup and configuration"] = "Démarrage et configuration du site";
@ -1540,7 +1556,8 @@ $a->strings["Love/Romance:"] = "Amour/Romance:";
 $a->strings["Work/employment:"] = "Activité professionnelle/Occupation:";
 $a->strings["School/education:"] = "Études/Formation:";
 $a->strings["Image/photo"] = "Image/photo";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a> a écris le <a href=\"%s\" target=\"external-link\">post</a> suivant";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
+$a->strings["<span><b>"] = "";
 $a->strings["$1 wrote:"] = "$1 a écrit:";
 $a->strings["Encrypted content"] = "Contenu chiffré";
 $a->strings["Unknown | Not categorised"] = "Inconnu | Non-classé";
@ -1558,8 +1575,10 @@ $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "Google+";
-$a->strings["pump.io"] = "";
-$a->strings["Twitter"] = "";
+$a->strings["pump.io"] = "pump.io";
+$a->strings["Twitter"] = "Twitter";
+$a->strings["Diaspora Connector"] = "Connecteur Diaspora";
+$a->strings["Statusnet"] = "Statusnet";
 $a->strings["Miscellaneous"] = "Divers";
 $a->strings["year"] = "an";
 $a->strings["month"] = "mois";
@ -1583,38 +1602,40 @@ $a->strings["Happy Birthday %s"] = "Joyeux anniversaire, %s !";
 $a->strings["General Features"] = "Fonctions générales";
 $a->strings["Multiple Profiles"] = "Profils multiples";
 $a->strings["Ability to create multiple profiles"] = "Possibilité de créer plusieurs profils";
-$a->strings["Post Composition Features"] = "";
+$a->strings["Post Composition Features"] = "Caractéristiques de composition de publication";
 $a->strings["Richtext Editor"] = "Éditeur de texte enrichi";
 $a->strings["Enable richtext editor"] = "Activer l'éditeur de texte enrichi";
-$a->strings["Post Preview"] = "";
-$a->strings["Allow previewing posts and comments before publishing them"] = "";
-$a->strings["Network Sidebar Widgets"] = "";
+$a->strings["Post Preview"] = "Aperçu du billet";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Permet la prévisualisation des billets et commentaires avant de les publier";
+$a->strings["Auto-mention Forums"] = "";
+$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "";
+$a->strings["Network Sidebar Widgets"] = "Widgets réseau pour barre latérale";
 $a->strings["Search by Date"] = "Rechercher par 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["Ability to select posts by date ranges"] = "Capacité de sélectionner les billets par intervalles de dates";
+$a->strings["Group Filter"] = "Filtre de groupe";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Activer le widget d’affichage des Posts du Réseau seulement pour le groupe sélectionné";
+$a->strings["Network Filter"] = "Filtre de réseau";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Activer le widget d’affichage des Posts du Réseau seulement pour le réseau sélectionné";
+$a->strings["Save search terms for re-use"] = "Sauvegarder la recherche pour une utilisation ultérieure";
+$a->strings["Network Tabs"] = "Onglets Réseau";
+$a->strings["Network Personal Tab"] = "Onglet Réseau Personnel";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Activer l'onglet pour afficher seulement les Posts du Réseau où vous avez interagit";
 $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["Post/Comment Tools"] = "outils de publication/commentaire";
+$a->strings["Multiple Deletion"] = "Suppression multiple";
 $a->strings["Select and delete multiple posts/comments at once"] = "";
-$a->strings["Edit Sent Posts"] = "";
+$a->strings["Edit Sent Posts"] = "Edité les publications envoyées";
 $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["Tagging"] = "Tagger";
+$a->strings["Ability to tag existing posts"] = "Autorisé à tagger des publications existantes";
+$a->strings["Post Categories"] = "Catégories des publications";
+$a->strings["Add categories to your posts"] = "Ajouter des catégories à vos publications";
 $a->strings["Ability to file posts under folders"] = "";
-$a->strings["Dislike Posts"] = "";
-$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Dislike Posts"] = "N'aime pas";
+$a->strings["Ability to dislike posts/comments"] = "Autorisé a ne pas aimer les publications/commentaires";
 $a->strings["Star Posts"] = "";
 $a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
@ -1688,5 +1709,4 @@ $a->strings["It's complicated"] = "C'est compliqué";
 $a->strings["Don't care"] = "S'en désintéresse";
 $a->strings["Ask me"] = "Me demander";
 $a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["Drop Contact"] = "";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Impossible de localiser les informations DNS pour le serveur de base de données '%s'";
+$a->strings["Drop Contact"] = "Supprimer le contact";
--- a/view/it/cmnt_received_eml.tpl
+++ b/view/it/cmnt_received_eml.tpl
@ -1,18 +0,0 @@
-
-Caro/a $username,
-
-	'$from' ha commentato un elemeto/conversazione che stai seguendo.
-
-----
-$body
-----
-
-Accedi a $siteurl per verdere la conversazione completa:
-
-$display
-
-Grazie,
-	L'amministratore di $sitename
-
- 
-
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Messaggio</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from ha commentato un elemeto/conversazione che stai seguendo.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-bottom:5px;"></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2"><a href="$display">Accedi a $siteurl per verdere la conversazione completa:</a>.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di $sitename</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/cmnt_received_text_body_eml.tpl
+++ b/view/it/cmnt_received_text_body_eml.tpl
@ -1,18 +0,0 @@
-
-Caro/a $username,
-
-	'$from' ha commentato un elemeto/conversazione che stai seguendo.
-
-----
-$body
-----
-
-Accedi a $siteurl per verdere la conversazione completa:
-
-$display
-
-Grazie,
-	L'amministratore di $sitename
-
- 
-
--- a/view/it/follow_notify_eml.tpl
+++ b/view/it/follow_notify_eml.tpl
@ -1,14 +0,0 @@
-
-Ciao $[myname],
-
-Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'.
-
-Puoi vedere il suo profilo su $[url].
-
-Accedi sul tuo sito per approvare o ignorare la richiesta.
-
-$[siteurl]
-
-Saluti,
-
-	L'amministratore di $[sitename]
--- a/view/it/friend_complete_eml.tpl
+++ b/view/it/friend_complete_eml.tpl
@ -1,22 +0,0 @@
-
-Ciao $[username],
-
-	Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato 
-la tua richiesta di connessione su '$[sitename]'.
-
-Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
-senza restrizioni.
-
-Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare 
-qualche modifica riguardo questa relazione 
-
-$[siteurl]
-
-[Ad esempio, potresti creare un profilo separato con le informazioni che non
-sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]'].
-
-Saluti,
-
-	l'amministratore di $[sitename]
-
- 
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$db_user = '$dbuser';
-$db_pass = '$dbpass';
-$db_data = '$dbdata';
-
-// If you are using a subdirectory of your domain you will need to put the
-// relative path (from the root of your domain) here.
-// For instance if your URL is 'http://example.com/directory/subdirectory',
-// set $a->path to 'directory/subdirectory'. 
-
-$a->path = '$urlpath';
- 
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "La Mia Rete di Amici";
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-$a->config['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['php_path'] = '$phpath';
-
-// Location of global directory submission page.
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
-
-// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
-
-$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
-
-// Server-to-server private message encryption (RINO) is allowed by default. 
-// Encryption will only be provided if this setting is true and the
-// PHP mcrypt extension is installed on both systems 
-
-$a->config['system']['rino_encrypt'] = true;
-
-// default system theme
-
-$a->config['system']['theme'] = 'duepuntozero';
-
--- a/view/it/intro_complete_eml.tpl
+++ b/view/it/intro_complete_eml.tpl
@ -1,22 +0,0 @@
-
-Ciao $[username],
-
-	'$[fn]' di '$[dfrn_url]' ha accettato 
-la tua richiesta di connessione a '$[sitename]'.
-
-	'$[fn]' ha deciso di accettarti come "fan", il che restringe 
-alcune forme di comunicazione - come i messaggi privati e alcune
-interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
-applicate automaticamente.
-
-	'$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva 
-. 
-
-	Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', 
-che apparirà nella tua pagina 'Rete'  
-
-$[siteurl]
-
-Saluti,
-
-	l'amministratore di $[sitename]
--- a/view/it/lostpass_eml.tpl
+++ b/view/it/lostpass_eml.tpl
@ -1,32 +0,0 @@
-
-Ciao $[username],
-	Su $[sitename] è stata ricevuta una richiesta di azzeramento di password per un account. 
-Per confermare la richiesta, clicca sul link di verifica
-qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. 
-
-Se NON hai richiesto l'azzeramento, NON seguire il link
-e ignora e/o cancella questa email. 
-
-La tua password non sarà modificata finché non avremo verificato che
-hai fatto questa richiesta. 
-
-Per verificare la tua identità clicca su:
-
-$[reset_link]
-
-Dopo la verifica riceverai un messaggio di risposta con la nuova password.
-
-Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
-
-I dati di accesso sono i seguenti:
-
-Sito:»$[siteurl]
-Nome utente:»$[email]
-
-
-
-
-Saluti,
-	l'amministratore di $[sitename]
-
- 
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Messsaggio</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a <a href="$siteurl">$siteurl</a> per leggere e rispondere ai tuoi messaggi privati.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di $siteName</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/mail_received_text_body_eml.tpl
+++ b/view/it/mail_received_text_body_eml.tpl
@ -1,10 +0,0 @@
-Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
-	
-$title
-
-$textversion
-				
-Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
-
-Grazie,
-L'amministratore di $siteName
--- a/view/it/messages.po
+++ b/view/it/messages.po
--- a/view/it/passchanged_eml.tpl
+++ b/view/it/passchanged_eml.tpl
@ -1,20 +0,0 @@
-
-Ciao $[username],
-	La tua password è cambiata come hai richiesto. Conserva queste 
-informazioni (oppure cambia immediatamente la password con 
-qualcosa che ti è più facile ricordare).
-
-
-I tuoi dati di access sono i seguenti:
-
-Sito:»$[siteurl]
-Nome utente:»$[email]
-Password:»$[new_password]
-
-Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
-
-
-Saluti,
-	l'amministratore di $[sitename]
-
- 
--- a/view/it/register_verify_eml.tpl
+++ b/view/it/register_verify_eml.tpl
@ -1,25 +0,0 @@
-
-Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
-la tua approvazione. 
-
-
-I tuoi dati di accesso sono i seguenti:
-
-Nome completo:»$[username]
-Sito:»$[siteurl]
-Nome utente:»$[email]
-
-
-Per approvare questa richiesta clicca su:
-
-
-$[siteurl]/regmod/allow/$[hash] 
-
-
-Per negare la richiesta e rimuove il profilo, clicca su:
-
-
-$[siteurl]/regmod/deny/$[hash]
-
-
-Grazie.
--- a/view/it/request_notify_eml.tpl
+++ b/view/it/request_notify_eml.tpl
@ -1,17 +0,0 @@
-
-Ciao $[myname],
-
-Hai appena ricevuto una richiesta di connessione da $[sitename] 
-
-da '$[requestor]'.
-
-Puoi visitare il suo profilo su $[url].
-
-Accedi al tuo sito per vedere la richiesta completa 
-e approva o ignora/annulla la richiesta.
-
-$[siteurl]
-
-Saluti,
-
-	l'amministratore di $[sitename]
--- a/view/it/smarty3/cmnt_received_eml.tpl
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-Caro/a {{$username}},
-
-	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
-
-----
-{{$body}}
-----
-
-Accedi a {{$siteurl}} per verdere la conversazione completa:
-
-{{$display}}
-
-Grazie,
-	L'amministratore di {{$sitename}}
-
- 
-
--- a/view/it/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl
@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Messaggio</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='{{$siteurl}}/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">{{$from}} ha commentato un elemeto/conversazione che stai seguendo.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$url}}"><img style="border:0px;width:48px;height:48px;" src="{{$thumb}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$url}}">{{$from}}</a></td></tr>
-	<tr><td style="padding-bottom:5px;"></td></tr>
-	<tr><td style="padding-right:22px;">{{$body}}</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2"><a href="{{$display}}">Accedi a {{$siteurl}} per verdere la conversazione completa:</a>.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di {{$sitename}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-Caro/a {{$username}},
-
-	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
-
-----
-{{$body}}
-----
-
-Accedi a {{$siteurl}} per verdere la conversazione completa:
-
-{{$display}}
-
-Grazie,
-	L'amministratore di {{$sitename}}
-
- 
-
--- a/view/it/smarty3/follow_notify_eml.tpl
+++ b/view/it/smarty3/follow_notify_eml.tpl
@ -1,19 +1,14 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$myname}},
+Ciao $[myname],

-Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'.
+Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'.

-Puoi vedere il suo profilo su {{$url}}.
+Puoi vedere il suo profilo su $[url].

 Accedi sul tuo sito per approvare o ignorare la richiesta.

-{{$siteurl}}
+$[siteurl]

 Saluti,

-	L'amministratore di {{$sitename}}
+	L'amministratore di $[sitename]
--- a/view/it/smarty3/friend_complete_eml.tpl
+++ b/view/it/smarty3/friend_complete_eml.tpl
@ -1,27 +1,22 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$username}},
+Ciao $[username],

-	Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato 
-la tua richiesta di connessione su '{{$sitename}}'.
+	Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato 
+la tua richiesta di connessione su '$[sitename]'.

 Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
 senza restrizioni.

-Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare 
+Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare 
 qualche modifica riguardo questa relazione 

-{{$siteurl}}
+$[siteurl]

 [Ad esempio, potresti creare un profilo separato con le informazioni che non
-sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}'].
+sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]'].

 Saluti,

-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]

 
--- a/view/it/smarty3/intro_complete_eml.tpl
+++ b/view/it/smarty3/intro_complete_eml.tpl
@ -1,27 +1,22 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$username}},
+Ciao $[username],

-	'{{$fn}}' di '{{$dfrn_url}}' ha accettato 
-la tua richiesta di connessione a '{{$sitename}}'.
+	'$[fn]' di '$[dfrn_url]' ha accettato 
+la tua richiesta di connessione a '$[sitename]'.

-	'{{$fn}}' ha deciso di accettarti come "fan", il che restringe 
+	'$[fn]' ha deciso di accettarti come "fan", il che restringe 
 alcune forme di comunicazione - come i messaggi privati e alcune
 interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
 applicate automaticamente.

-	'{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva 
+	'$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva 
 . 

-	Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', 
+	Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', 
 che apparirà nella tua pagina 'Rete'  

-{{$siteurl}}
+$[siteurl]

 Saluti,

-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]
--- a/view/it/smarty3/lostpass_eml.tpl
+++ b/view/it/smarty3/lostpass_eml.tpl
@ -1,11 +1,6 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$username}},
-	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
+Ciao $[username],
+	Su $[sitename] è stata ricevuta una richiesta di azzeramento della password del tuo account. 
 Per confermare la richiesta, clicca sul link di verifica
 qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. 

@ -17,7 +12,7 @@ hai fatto questa richiesta.

 Per verificare la tua identità clicca su:

-{{$reset_link}}
+$[reset_link]

 Dopo la verifica riceverai un messaggio di risposta con la nuova password.

@ -25,13 +20,13 @@ Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato

 I dati di accesso sono i seguenti:

-Sito:»{{$siteurl}}
-Nome utente:»{{$email}}
+Sito:»$[siteurl]
+Nome utente:»$[email]




 Saluti,
-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]

 
--- a/view/it/smarty3/mail_received_html_body_eml.tpl
+++ b/view/it/smarty3/mail_received_html_body_eml.tpl
@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Messsaggio</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='{{$siteurl}}/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$url}}"><img style="border:0px;width:48px;height:48px;" src="{{$thumb}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$url}}">{{$from}}</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a <a href="{{$siteurl}}">{{$siteurl}}</a> per leggere e rispondere ai tuoi messaggi privati.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di {{$siteName}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/smarty3/mail_received_text_body_eml.tpl
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
-	
-{{$title}}
-
-{{$textversion}}
-				
-Accedi a {{$siteurl}} per leggere e rispondere ai tuoi messaggi privati.
-
-Grazie,
-L'amministratore di {{$siteName}}
--- a/view/it/smarty3/passchanged_eml.tpl
+++ b/view/it/smarty3/passchanged_eml.tpl
@ -1,25 +1,20 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$username}},
-	La tua password è cambiata come hai richiesto. Conserva queste 
+Ciao $[username],
+	La tua password è stata cambiata, come hai richiesto. Conserva queste 
 informazioni (oppure cambia immediatamente la password con 
 qualcosa che ti è più facile ricordare).


-I tuoi dati di access sono i seguenti:
+I tuoi dati di accesso sono i seguenti:

-Sito:»{{$siteurl}}
-Nome utente:»{{$email}}
-Password:»{{$new_password}}
+Sito:»$[siteurl]
+Soprannome:»$[email]
+Password:»$[new_password]

 Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.


 Saluti,
-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]

 
--- a/view/it/smarty3/register_adminadd_eml.tpl
+++ b/view/it/smarty3/register_adminadd_eml.tpl
@ -1,20 +1,20 @@
-
 Ciao $[username],
-	Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. 
+	l'amministratore di {{$sitename}} ha creato un account per te.
+
 I dettagli di accesso sono i seguenti


 Sito:»$[siteurl]
-Nome utente:»$[email]
+Soprannome:»$[email]
 Password:»$[password]

 Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso 
-.
+ 

 Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina.

 Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo 
-(nella pagina "Profilo") per rendere agli altri più facile trovarti.
+(nella pagina "Profilo") per rendere più facile trovarti alle altre persone.

 Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto,
 di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e 
@ -22,13 +22,11 @@ magari il paese dove vivi; se non vuoi essere più dettagliato
 di così.

 Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. 
-Se  ancora non conosci nessuno qui, potrebbe esserti di aiuto
+Se non  ancora non conosci nessuno qui, posso essere d'aiuto 
 per farti nuovi e interessanti amici.  


 Grazie. Siamo contenti di darti il benvenuto su $[sitename]

 Saluti,
-	l'amministratore di $[sitename]
-
- 
+	l'amministratore di $[sitename]
--- a/view/it/smarty3/register_open_eml.tpl
+++ b/view/it/smarty3/register_open_eml.tpl
@ -1,17 +1,12 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$username}},
-	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
+Ciao $[username],
+	Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. 
 I dettagli di accesso sono i seguenti


-Sito:»{{$siteurl}}
-Nome utente:»{{$email}}
-Password:»{{$password}}
+Sito:»$[siteurl]
+Nome utente:»$[email]
+Password:»$[password]

 Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso 
 .
@ -31,9 +26,9 @@ Se  ancora non conosci nessuno qui, potrebbe esserti di aiuto
 per farti nuovi e interessanti amici.  


-Grazie. Siamo contenti di darti il benvenuto su {{$sitename}}
+Grazie. Siamo contenti di darti il benvenuto su $[sitename]

 Saluti,
-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]

 
--- a/view/it/smarty3/register_verify_eml.tpl
+++ b/view/it/smarty3/register_verify_eml.tpl
@ -1,30 +1,25 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
+Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
 la tua approvazione. 


-I tuoi dati di accesso sono i seguenti:
+I dati di accesso sono i seguenti:

-Nome completo:»{{$username}}
-Sito:»{{$siteurl}}
-Nome utente:»{{$email}}
+Nome completo:»$[username]
+Sito:»$[siteurl]
+Nome utente:»$[email]


 Per approvare questa richiesta clicca su:


-{{$siteurl}}/regmod/allow/{{$hash}} 
+$[siteurl]/regmod/allow/$[hash] 


-Per negare la richiesta e rimuove il profilo, clicca su:
+Per negare la richiesta e rimuovere il profilo, clicca su:


-{{$siteurl}}/regmod/deny/{{$hash}}
+$[siteurl]/regmod/deny/$[hash]


 Grazie.
--- a/view/it/smarty3/request_notify_eml.tpl
+++ b/view/it/smarty3/request_notify_eml.tpl
@ -1,22 +1,17 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

-Ciao {{$myname}},
+Ciao $[myname],

-Hai appena ricevuto una richiesta di connessione da {{$sitename}} 
+Hai appena ricevuto una richiesta di connessione su $[sitename] 

-da '{{$requestor}}'.
+da '$[requestor]'.

-Puoi visitare il suo profilo su {{$url}}.
+Puoi visitare il suo profilo su $[url].

 Accedi al tuo sito per vedere la richiesta completa 
 e approva o ignora/annulla la richiesta.

-{{$siteurl}}
+$[siteurl]

 Saluti,

-	l'amministratore di {{$sitename}}
+	l'amministratore di $[sitename]
--- a/view/it/smarty3/update_fail_eml.tpl
+++ b/view/it/smarty3/update_fail_eml.tpl
@ -0,0 +1,11 @@
+Ehi, 
+Sono $sitename;   
+Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione $update, 
+ma appena ho provato ad installarla qualcosa è andato tremendamente storto.  
+Le cose vanno messe a posto al più presto e non riesco a farlo da solo. Contatta uno 
+sviluppatore di friendica se non riesci ad aiutarmi da solo. Il mio database potrebbe non essere più a posto. 
+
+Il messaggio di errore è: '$error'.   
+
+Mi dispiace, 
+il tuo server friendica su $siteurl
--- a/view/it/smarty3/wall_received_eml.tpl
+++ b/view/it/smarty3/wall_received_eml.tpl
@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-Caro/a {{$username}},
-
-	'{{$from}}' ha scritto qualcosa sulla bachecha del tuo profilo.
-
-----
-{{$body}}
-----
-
-Accedi a  {{$siteurl}} per vedere o cancellare l'elemento:
-
-{{$display}}
-
-Grazie,
-	L'amministratore di {{$sitename}}
-
- 
-
--- a/view/it/smarty3/wall_received_html_body_eml.tpl
+++ b/view/it/smarty3/wall_received_html_body_eml.tpl
@ -1,29 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Messaggio da Friendica</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">{{$from}} ha scritto sulla tua bacheca.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$url}}"><img style="border:0px;width:48px;height:48px;" src="{{$thumb}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$url}}">{{$from}}</a></td></tr>
-	<tr><td style="padding-right:22px;">{{$body}}</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Vai su <a href="{{$siteurl}}">{{$siteurl}}</a> per <a href="{{$display}}">vedere o cancellare il post</a>.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di {{$sitename}}</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/smarty3/wall_received_text_body_eml.tpl
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-Caro {{$username}},
-
-	'{{$from}}' ha scritto sulla tua bacheca.
-
-----
-{{$body}}
-----
-
-Vai su {{$siteurl}} per vedere o cancellare il post:
-
-{{$display}}
-
-Grazie,
-	L'amministratore di {{$sitename}}
-
- 
-
--- a/view/it/strings.php
+++ b/view/it/strings.php
--- a/view/it/wall_received_eml.tpl
+++ b/view/it/wall_received_eml.tpl
@ -1,18 +0,0 @@
-
-Caro/a $username,
-
-	'$from' ha scritto qualcosa sulla bachecha del tuo profilo.
-
-----
-$body
-----
-
-Accedi a  $siteurl per vedere o cancellare l'elemento:
-
-$display
-
-Grazie,
-	L'amministratore di $sitename
-
- 
-
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Messaggio da Friendica</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from ha scritto sulla tua bacheca.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Vai su <a href="$siteurl">$siteurl</a> per <a href="$display">vedere o cancellare il post</a>.</td></tr>
-	<tr><td></td><td>Grazie,</td></tr>
-	<tr><td></td><td>L'amministratore di $sitename</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
--- a/view/it/wall_received_text_body_eml.tpl
+++ b/view/it/wall_received_text_body_eml.tpl
@ -1,18 +0,0 @@
-
-Caro $username,
-
-	'$from' ha scritto sulla tua bacheca.
-
-----
-$body
-----
-
-Vai su $siteurl per vedere o cancellare il post:
-
-$display
-
-Grazie,
-	L'amministratore di $sitename
-
- 
-
--- a/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
--- a/view/ro/messages.po
+++ b/view/ro/messages.po
--- a/view/ro/smarty3/follow_notify_eml.tpl
+++ b/view/ro/smarty3/follow_notify_eml.tpl
@ -0,0 +1,14 @@
+
+Dragă $[myname],
+
+Aveţi un nou urmăritoe la $[sitename] -  '$[requestor]'.
+
+Puteţi vizita profilul lor la $[url].
+
+Vă rugăm să vă logaţi pe site-ul dvs. pentru a aproba sau ignora / anula cererea.
+
+$[siteurl]
+
+Cu respect,
+
+	$[sitename] administrator
--- a/view/ro/smarty3/friend_complete_eml.tpl
+++ b/view/ro/smarty3/friend_complete_eml.tpl
@ -0,0 +1,22 @@
+
+Dragă  $[username],
+
+	Veşti  bune... '$[fn]' at '$[dfrn_url]' a acceptat 
+cererea dvs. de conectare la '$[sitename]'.
+
+Sunteți acum prieteni comuni și puteţi schimba actualizări de status, fotografii,  și e-mail 
+fără restricţii.
+
+Vizitaţi pagina dvs. 'Contacte' la $[sitename] dacă doriţi să faceţi 
+orice schimbare către această relaţie. 
+
+$[siteurl]
+
+[De exemplu, puteți crea un profil separat, cu informații care nu sunt
+la dispoziția publicului larg - și atribuiți drepturi de vizualizare la "$ [Fn] '].
+
+Cu stimă,
+
+	$[sitename] Administrator
+
+ 
--- a/view/ro/smarty3/intro_complete_eml.tpl
+++ b/view/ro/smarty3/intro_complete_eml.tpl
@ -0,0 +1,22 @@
+
+Dragă $[username],
+
+	'$[fn]' de la  '$[dfrn_url]' a acceptat 
+cererea dvs. de conectare la '$[sitename]'.
+
+	 '$[fn]' a decis să accepte un "fan", care restricționează 
+câteva forme de comunicare - cum ar fi mesageria privată şi unele profile
+interacțiuni. În cazul în care aceasta este o pagină celebritate sau comunitate, aceste setări au fost
+aplicat automat.
+
+	 '$[fn]' poate alege să se extindă aceasta în  două sau mai căi permisive 
+relaţie in viitor. 
+
+	Veți începe să primiți actualizări publice de status de la '$[fn]', 
+care va apare pe pagina dvs.  'Network' la  
+
+$[siteurl]
+
+Cu stimă,
+
+	$[sitename] Administrator
--- a/view/ro/smarty3/lostpass_eml.tpl
+++ b/view/ro/smarty3/lostpass_eml.tpl
@ -0,0 +1,32 @@
+
+Dragă $[username],
+	O cerere a fost primită recent de la $ [sitename] pentru a reseta  
+parola contului dvs. În scopul confitmării  aceastei cereri, vă rugăm să selectați link-ul de verificare
+de mai jos sau inserați în bara de adrese a web browser-ului . 
+
+Dacă nu ați solicitat această schimbare, vă rugăm să nu urmaţi link-ul
+furnizat și ignoră și / sau șterge acest e-mail. 
+
+Parola dvs nu va fi schimbată dacă nu putem verifica dacă dvs
+a emis această cerere. 
+
+Urmaţi acest link pentru a verifica identitatea dvs. :
+
+$[reset_link]
+
+Veți primi apoi un mesaj de follow-up care conține noua parolă.
+
+Puteți schimba această parola din pagina de setări a contului  dvs. după logare 
+
+Detaliile de login sunt următoarele ;
+
+Locaţie Site: »$[siteurl]
+Login Name:	$[email]
+
+
+
+
+Cu stimă,
+	$[sitename] Administrator
+
+ 
--- a/view/ro/smarty3/passchanged_eml.tpl
+++ b/view/ro/smarty3/passchanged_eml.tpl
@ -0,0 +1,20 @@
+
+Dragă $[username],
+	Parola dvs. a fost schimbată așa cum a solicitat. Vă rugăm să păstrați aceste 
+Informații pentru evidența dvs. (sau schimbaţi imediat parola  
+cu ceva care iti vei reaminti).
+
+
+Detaliile dvs. de login sunt următoarele ;
+
+Locaţie Site»$[siteurl]
+Login Name:	$[email]
+Parolă:»$[new_password]
+
+Puteți schimba această parolă de la pagina setări cont după logare.
+
+
+Cu stimă,
+	$[sitename] Administrator
+
+ 
--- a/view/ro/smarty3/register_adminadd_eml.tpl
+++ b/view/ro/smarty3/register_adminadd_eml.tpl
@ -0,0 +1,32 @@
+Dragă {{$username}},
+	administratorul {{$sitename}} v-a configurat un cont pentru dvs.
+
+Detaliile de autentificare sunt următoarele:
+
+
+Locație Site:	{{$siteurl}}
+Nume Autentificare:⇥{{$email}}
+Parolă:⇥{{$password}}
+
+Vă puteți schimba parola din pagina contului dvs. de "Configurări", după autentificare 
+în.
+
+Vă rugăm să acordați câteva momente pentru revizuirea altor configurări de cont de pe această pagină.
+
+Puteți de asemenea să adăugați câteva informații generale profilului dvs. implicit 
+(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor.
+
+Vă recomandăm să vă specificați numele complet, adăugând o fotografie de profil,
+adăugând profilului câteva "cuvinte cheie" (foarte utile pentru a vă face noi prieteni) - și 
+poate în ce țara locuiți; dacă nu doriți să dați mai multe detalii
+decât acestea.
+
+Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceste elemente nu sunt necesar. 
+Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta
+să vă  faceți niște prieteni noi și interesanţi.  
+
+
+Vă multumim și vă urăm bun venit la {{$sitename}}.
+
+Cu stimă,
+	Administratorul {{$sitename}}
--- a/view/ro/smarty3/register_open_eml.tpl
+++ b/view/ro/smarty3/register_open_eml.tpl
@ -0,0 +1,34 @@
+
+Dragă $[username],
+	Vă mulțumim pentru înregistrare de la $ [SITENAME]. Contul dvs. a fost creat. 
+Detaliile de login sunt următoarele ;
+
+
+Locaţie Site»$[siteurl]
+Login Name:	$[email]
+Parolă:	$[password]
+
+Puteți schimba parola dvs. de la pagina "Setări" cont după logare. 
+in.
+
+Vă rugăm ia câteva momente pentru revizuirea altor setări din cont pe această pagină.
+
+Ați putea dori, de asemenea, să adăugați câteva Informații generale la profilul dvs. implicit 
+(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor.
+
+Vă recomandăm să vă setați numele complet, adăugând o fotografie de profil,
+adăugând câteva "cuvinte cheie" de profil (foarte utile în a face noi prieteni) - și 
+poate în ce țara locuiți; dacă nu doriți să fie mai specifice
+decât atât.
+
+Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceşti itemi nu sunt necesari. 
+Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta
+să faceți niște prieteni noi și interesanţi.  
+
+
+Vă multumim si bine aţi venit la $[sitename].
+
+Cu stimă,
+	$[sitename] Administrator
+
+ 
--- a/view/ro/smarty3/register_verify_eml.tpl
+++ b/view/ro/smarty3/register_verify_eml.tpl
@ -0,0 +1,25 @@
+
+O nouă cererea  de înregistrare utilizator a fost primită la $ [sitename], care impune 
+aprobarea ta. 
+
+
+Detaliile de login sunt următoarele ;
+
+Nume complet:»[$[username],
+Locaţie Site»$[siteurl]
+Login Name:	$[email]
+
+
+Pentru a aproba această cerere va rugam sa accesati link-ul următor:
+
+
+$[siteurl]/regmod/allow/$[hash] 
+
+
+Pentru a refuza cererea și elimina contul, vă rugăm să vizitați:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Vă mulţumesc.
--- a/view/ro/smarty3/request_notify_eml.tpl
+++ b/view/ro/smarty3/request_notify_eml.tpl
@ -0,0 +1,17 @@
+
+Dragă $[myname],
+
+Aţi primit o cerere de conectare la  $[sitename] 
+
+de la '$[requestor]'.
+
+Puteţi vizita profilul lor la $[url].
+
+Vă rugăm să vă logaţi pe site-ul dvs. pentru a vedea introducerea completă 
+şi aprobaţi sau ignoraţi/ştergeţi cererea.
+
+$[siteurl]
+
+Cu respect,
+
+	$[sitename] administrator
--- a/view/ro/smarty3/update_fail_eml.tpl
+++ b/view/ro/smarty3/update_fail_eml.tpl
@ -0,0 +1,11 @@
+Bună, 
+Sunt $sitename;   
+Dezvoltatorii friendica au  lansat actualizarea $update recent, 
+dar când am incercat s-o instalez, ceva a mers teribil de prost.  
+Aceasta trebuie fixată curând . Nu o pot face singur. Vă rog contactaţi-mă la 
+friendica dezvoltator dacă nu mă pot ajuta pe cont propriu. Baza mea de date ar putea fi invalidă. 
+
+Mesajul de eraoare este '$error'.   
+
+Îmi pare rău. 
+serverul dvs. friendica la  $siteurl
--- a/view/ro/strings.php
+++ b/view/ro/strings.php
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@ -61,7 +61,7 @@

 <h3>{{$importh}}</h3>
 	<div id ="import-profile">
-		<a href="/uimport">{{$importt}}</a>
+		<a href="uimport">{{$importt}}</a>
 	</div>
 </form>

--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@ -118,6 +118,7 @@ $a->strings["font size"] = "字体尺寸";
 $a->strings["base font size for your interface"] = "您的界面基础字体尺寸";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "选择图片在文章和评论的重设尺寸（宽和高）";
 $a->strings["Set theme width"] = "选择主题宽";
+$a->strings["Set style"] = "选择款式";
 $a->strings["Delete this item?"] = "删除这个项目？";
 $a->strings["show fewer"] = "显示更小";
 $a->strings["Update %s failed. See error logs."] = "更新%s美通过。看错误记录。";
@ -415,6 +416,7 @@ $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] =
 $a->strings["Site settings updated."] = "网站设置更新了。";
 $a->strings["No special theme for mobile devices"] = "没专门适合手机的主题";
 $a->strings["Never"] = "从未";
+$a->strings["At post arrival"] = "收件的时候";
 $a->strings["Frequently"] = "时常";
 $a->strings["Hourly"] = "每小时";
 $a->strings["Twice daily"] = "每日两次";
@ -495,7 +497,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "用PHP UTF8正则表达式";
 $a->strings["Show Community Page"] = "表示社会页";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "表示社会页表明这网站所有最近公开的文章";
 $a->strings["Enable OStatus support"] = "使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."] = "提供内装的OStatus（identi.ca, status.net, 等）兼容。OStatus内，什么通知是公开的，所以偶尔隐私警告被表示。";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "提供OStatus（StatusNet，GNU Social，等）兼容性。所有OStatus的交通是公开的，所以私事警告偶尔来表示。";
 $a->strings["OStatus conversation completion interval"] = "OStatus对话完成间隔";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "喂器要多久查一次新文章在OStatus交流？这会花许多系统资源。";
 $a->strings["Enable Diaspora support"] = "使Diaspora支持能够";
@ -761,6 +763,9 @@ $a->strings["Currently ignored"] = "现在不理的";
 $a->strings["Currently archived"] = "现在存档着";
 $a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
+$a->strings["Notification for new posts"] = "新消息提示";
+$a->strings["Send a notification of every new post of this contact"] = "发提示在所有这个联络的新消息";
+$a->strings["Fetch further information for feeds"] = "拿文源别的消息";
 $a->strings["Suggestions"] = "建议";
 $a->strings["Suggest potential friends"] = "建议潜在朋友们";
 $a->strings["All Contacts"] = "所有的熟人";
@ -782,11 +787,10 @@ $a->strings["Edit contact"] = "编熟人";
 $a->strings["Search your contacts"] = "搜索您的熟人";
 $a->strings["Update"] = "更新";
 $a->strings["everybody"] = "每人";
-$a->strings["Account settings"] = "帐户配置";
 $a->strings["Additional features"] = "附加的特点";
-$a->strings["Display settings"] = "表示设置";
-$a->strings["Connector settings"] = "插销设置";
-$a->strings["Plugin settings"] = "插件设置";
+$a->strings["Display"] = "显示";
+$a->strings["Social Networks"] = "社会化网络";
+$a->strings["Delegations"] = "代表";
 $a->strings["Connected apps"] = "连接着应用";
 $a->strings["Export personal data"] = "出口私人信息";
 $a->strings["Remove account"] = "删除账户";
@ -828,7 +832,6 @@ $a->strings["enabled"] = "能够做的";
 $a->strings["disabled"] = "使不能用";
 $a->strings["StatusNet"] = "StatusNet";
 $a->strings["Email access is disabled on this site."] = "这个网站没有邮件使用权";
-$a->strings["Connector Settings"] = "连接器设置";
 $a->strings["Email/Mailbox Setup"] = "邮件收件箱设置";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "如果您想用这股服务(可选的)跟邮件熟人交流，请指定怎么连通您的收件箱。";
 $a->strings["Last successful email check:"] = "上个成功收件箱检查：";
@ -853,6 +856,7 @@ $a->strings["Number of items to display per page:"] = "每页表示多少项目
 $a->strings["Maximum of 100 items"] = "最多100项目";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "用手机看一页展示多少项目：";
 $a->strings["Don't show emoticons"] = "别表示请表符号";
+$a->strings["Don't show notices"] = "别表提示";
 $a->strings["Infinite scroll"] = "无限的滚动";
 $a->strings["Normal Account Page"] = "平常账户页";
 $a->strings["This account is a normal personal profile"] = "这个帐户是正常私人简介";
@ -1111,6 +1115,8 @@ $a->strings["Public photo"] = "公开照相";
 $a->strings["Share"] = "分享";
 $a->strings["View Album"] = "看照片册";
 $a->strings["Recent Photos"] = "最近的照片";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "不好意思，可能你上传的是PHP设置允许的大";
+$a->strings["Or - did you try to upload an empty file?"] = "或者，你是不是上传空的文件？";
 $a->strings["File exceeds size limit of %d"] = "文件数目超过最多%d";
 $a->strings["File upload failed."] = "文件上传失败。";
 $a->strings["No videos selected"] = "没选择的视频";
@ -1289,6 +1295,7 @@ $a->strings["This action exceeds the limits set by your subscription plan."] = "
 $a->strings["This action is not available under your subscription plan."] = "这个行动在您的订阅不可用的。";
 $a->strings["User not found."] = "找不到用户";
 $a->strings["There is no status with this id."] = "没有什么状态跟这个ID";
+$a->strings["There is no conversation with this id."] = "没有这个ID的对话";
 $a->strings["view full size"] = "看全尺寸";
 $a->strings["Starts:"] = "开始：";
 $a->strings["Finishes:"] = "结束：";
@ -1444,6 +1451,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s放在[url=%2\
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s标签您";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s把您在%2\$s标签";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s[url=%2\$s]把您标签[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notify] %s分享新的消息";
+$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s分享新的消息在%2\$s";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]分享一个消息[/url].";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify]您被%1\$s戳";
 $a->strings["%1\$s poked you at %2\$s"] = "您被%1\$s戳在%2\$s";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s[url=%2\$s]把您戳[/url]。";
@ -1493,6 +1503,8 @@ $a->strings["Search site content"] = "搜索网站内容";
 $a->strings["Conversations on this site"] = "这个网站的交谈";
 $a->strings["Directory"] = "名录";
 $a->strings["People directory"] = "人物名录";
+$a->strings["Information"] = "资料";
+$a->strings["Information about this friendica instance"] = "资料关于这个Friendica服务器";
 $a->strings["Conversations from your friends"] = "从你朋友们的交谈";
 $a->strings["Network Reset"] = "网络重设";
 $a->strings["Load Network page with no filters"] = "表示网络页无滤器";
@ -1504,7 +1516,7 @@ $a->strings["Inbox"] = "收件箱";
 $a->strings["Outbox"] = "发件箱";
 $a->strings["Manage"] = "代用户";
 $a->strings["Manage other pages"] = "管理别的页";
-$a->strings["Delegations"] = "代表";
+$a->strings["Account settings"] = "帐户配置";
 $a->strings["Manage/Edit Profiles"] = "管理／编辑简介";
 $a->strings["Manage/edit friends and contacts"] = "管理/编朋友们和熟人们";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
@ -1527,7 +1539,8 @@ $a->strings["Love/Romance:"] = "爱情／浪漫";
 $a->strings["Work/employment:"] = "工作";
 $a->strings["School/education:"] = "学院／教育";
 $a->strings["Image/photo"] = "图像／照片";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a>写了下面的<a href=\"%s\" target=\"_blank\">消息</a>";
+$a->strings["<span><b>"] = "<span><b>";
 $a->strings["$1 wrote:"] = "$1写：";
 $a->strings["Encrypted content"] = "加密的内容";
 $a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
@ -1547,6 +1560,8 @@ $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
+$a->strings["Diaspora Connector"] = "Diaspora连接";
+$a->strings["Statusnet"] = "Statusnet";
 $a->strings["Miscellaneous"] = "形形色色";
 $a->strings["year"] = "年";
 $a->strings["month"] = "月";
@ -1575,6 +1590,8 @@ $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["Auto-mention Forums"] = "自动提示论坛";
+$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "添加／删除提示论坛页选择／淘汰在ACL窗户的时候。";
 $a->strings["Network Sidebar Widgets"] = "网络工具栏小窗口";
 $a->strings["Search by Date"] = "按日期搜索";
 $a->strings["Ability to select posts by date ranges"] = "能按时期范围选择文章";