Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment

Conflicts:
	include/ostatus.php

CHANGELOG

@@ -1,6 +1,85 @@
+Version 3.4.3
+  What's new for the users:
+	Updates to the documentation (silke, tobiasd, annando, rebeka-catalina)
+	Updated translations (tobiasd & translation teams)
+	New "Credits" page (tobiasd)
+	New custom font icon set (tobiasd, Andi Stadler)
+	Support to events attendance. Users can mark their participation to an event (rabuzarus, tobiasd, fabrixxm, annando)
+	Revised templates and used interaction in contacts lists (rabuzarus)
+	Mobile support for Vier theme (annando, fabrixxm)
+	Events editing and deletion from stream (annando)
+	Private forums are mentioned automatically like community forums (rabuzarus)
+	Show profile pictures and pending notifications on manage page (rabuzarus, annando)
+	Show Profile photo album only to owner and authenticated contacts (rabuzarus)
+	User language setting is now between settings in user settings page (fabrixxm)
+	Search for remote users in form of "@user@domain.tld" is supported (issue #1595) (annando)
+	Optionally show geo informations of uploaded photos, backport from Red (rabuzarus)
+	Setting for the first day of the week for events calendar (annando)
+	Reduced profile view with "show more" link (annando)
+	Show more informations to users when following a new contact (annando)
+	Renamed "Statusnet" to "GNU Social" (annando)
+	Image dialog insert link to image page instead of direct image (fabrixxm)
+	In registration page make clear that we only need a 'real-looking' name (issue #1898) (tobiasd, n4rky)
+	Unseen items per groups are shown (issue #1718) (strk, rabuzarus, fabrixxm)
+	Unseen items in forumlist widget (rabuzarus)
+	Preview the last five conversations in private message's sidebar (FlxAlbroscheit, fabrixxm)
+	Don't get notifications about own posts (strk)
+	Profile page shows a "Subscribe to atom feed" link (annando)
+	Contact list shows only contacts from supported networks (ananndo)
+	username@hostname is used instead of full urls (issue #1925) (annando)
+	Various small OStatus improvements (annando)
+	Contact's posts are shown in a dedicated page (annando)
+	Module name is shown in page title to ease browser history navigation (issue #2079) (tobiasd)
+  What's new for admins:
+	Forumlist functionality moved from plugin to core (rabuzarus, annando)
+	Changes on poller/workers limits management (annando)
+	Diaspora and OStatus can be enabled only if requirements are satisfied (annando)
+	Support for additional passwords for ejabberd (annando)
+	Use proxy for profile photos (annando)
+	'Reload active themes' in theme admin page (fabrixxm)	
+	Install routine checks for ImageMagick and GIF support (fabrixxm)
+	Install routine checks for availability of "mcrypt_create_iv()" function, needed for RINO2 (fabrixxm)
+	Only suported themes are shown in admin page (annando)
+	Optimized SQL queries (annando)
+	System perform an optimize pass on tables in cron, with maximum table size and minimum fragmentation level settings (annando)
+	New access keys in profile and contact pages (rabuzarus, annando)
+	Support for a new Diaspora command for post retraction (annando)
+	Show an info message if an empty contact group is shown (issue #1871) (annando)
+	User setting to disable network page autoupdate (issue #1921) (annando)
+	Settings to limit or permit access to crawler to search page (annando)
+  What's new for developers:	
+	Themes can show Events entry in navbar (annando)
+	Themes can now override colorbox (fabrixxm)
+	Updated Vagrant development VM (silke, hauke)
+	New hook 'template_vars' (fabrixxm)
+	$baseurl variable is passed to all templates by default (fabrixxm)
+	OStatus delivery code is moved in new function (annando)
+	Doxygen config file and initial documetation of code (rabuzarus)
+	Full rewrite of util/php2po.php (fabrixxm)
+  Bugfixs:
+	Remote self works again (annando)
+	Fix feeds mistakenly recognized as OStatus (issue #1914) (annando)
+	Report invalid feeds to user (issue #1913) (annando)
+	Fix Update contact data functionality (annando)
+	Fix proxy function with embedded images (annando)
+	Fix Diaspora unidirectional connect request (annando)
+	Fix empty poco response (annando)
+	Fix API for andStatus (issue#1427, AndStatus issue #241) (annando)
+	Fix expiration of items (fabrixxm)
+	Fix javascript contact deletion confirmation dialog (issue #1986) (fabrixxm)
+	Admin wasn't able to change settings of not currently in use themes. Fixed (issue #2022) (fabrixxm)
+	Fix rapid repeated requests to GNUSocial instance (issue #2038) (annando)
+	Fix install routine css when mod_rewrite doesn't works (issue #2071) (fabrixxm)
+	Fix code to be compliant with minimum required PHP version (issue #2066) (fabrixxm, rabuzarus)
+	Fix feedback after succesfull registration (issue #2060) (annando)
+	Fix mention completition popup with TinyMCE (issue #1920) (fabrixxm)
+	Fix photo cache and proxy when installed in subfolder (ddorian1)
+	Fix bbcode conversion of the about text for the profile (issue #1607) (annando)
+	
+
 Version 3.4.2
 
-	Updates to the documentation (tobias, silke, annando)
+	Updates to the documentation (tobiasd, silke, annando)
 	Updates to the translations (tobiasd & translation teams)
 	Updates to themes frost-mobile, vier, duepuntozero, quattro (annando, tobiasd)
 	Enancements of the communications via OStatus and Diaspora protocols (annando)

boot.php

@@ -17,7 +17,7 @@ require_once('include/dbstructure.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
-define ( 'FRIENDICA_VERSION',      '3.4.3-dev' );
+define ( 'FRIENDICA_VERSION',      '3.5-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1191      );
 define ( 'EOL',                    "<br />\r\n"     );
@@ -634,6 +634,9 @@ if(! class_exists('App')) {
 
 			$basepath = get_config("system", "basepath");
 
+			if ($basepath == "")
+				$basepath = dirname(__FILE__);
+
 			if ($basepath == "")
 				$basepath = $_SERVER["DOCUMENT_ROOT"];
 
@@ -1945,3 +1948,15 @@ function validate_include(&$file) {
 
 	return true;
 }
+
+function current_load() {
+	if (!function_exists('sys_getloadavg'))
+		return false;
+
+	$load_arr = sys_getloadavg();
+
+	if (!is_array($load_arr))
+		return false;
+
+	return max($load_arr);
+}

doc/api.md

@@ -346,6 +346,79 @@ Friendica doesn't allow showing followers of other users.
 
 Friendica doesn't allow showing friends of other users.
 
+
+## Implemented API calls (not compatible with other APIs)
+
+### friendica/group_show
+Return all or a specified group of the user with the containing contacts as array.
+
+#### Parameters
+* gid: optional, if not given, API returns all groups of the user
+
+#### Return values
+Array of:
+* name: name of the group
+* gid: id of the group
+* user: array of group members (return from api_get_user() function for each member)
+
+
+### friendica/group_delete
+delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted.
+
+### Parameters
+* gid: id of the group to be deleted
+* name: name of the group to be deleted 
+
+#### Return values
+Array of:
+* success: true if successfully deleted
+* gid: gid of the deleted group
+* name: name of the deleted group
+* status: „deleted“ if successfully deleted
+* wrong users: empty array
+
+
+### friendica/group_create
+Create the group with the posted array of contacts as members. 
+#### Parameters
+* name: name of the group to be created
+
+#### POST data
+JSON data as Array like the result of „users/group_show“:
+* gid
+* name
+* array of users
+
+#### Return values
+Array of:
+* success: true if successfully created or reactivated
+* gid: gid of the created group
+* name: name of the created group
+* status: „missing user“ | „reactivated“ | „ok“
+* wrong users: array of users, which were not available in the contact table 
+
+
+### friendica/group_update
+Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted). 
+#### Parameters
+* gid: id of the group to be changed
+* name: name of the group to be changed
+
+#### POST data
+JSON data as array like the result of „users/group_show“:
+* gid
+* name
+* array of users
+
+#### Return values
+Array of:
+* success: true if successfully updated
+* gid: gid of the changed group
+* name: name of the changed group
+* status: „missing user“ | „ok“
+* wrong users: array of users, which were not available in the contact table 
+
+
 ## Not Implemented API calls
 The following API calls are implemented in GNU Social but not in Friendica: (incomplete)
 

include/Contact.php

@@ -192,9 +192,6 @@ function unmark_for_death($contact) {
 }}
 
 function get_contact_details_by_url($url, $uid = -1) {
-	require_once("mod/proxy.php");
-	require_once("include/bbcode.php");
-
 	if ($uid == -1)
 		$uid = local_user();
 
@@ -268,15 +265,6 @@ function get_contact_details_by_url($url, $uid = -1) {
 	} else
 		$profile["cid"] = 0;
 
-	if (isset($profile["photo"]))
-		$profile["photo"] = proxy_url($profile["photo"], false, PROXY_SIZE_SMALL);
-
-	if (isset($profile["location"]))
-		$profile["location"] = bbcode($profile["location"]);
-
-	if (isset($profile["about"]))
-		$profile["about"] = bbcode($profile["about"]);
-
 	if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
 		$profile["location"] = "";
 		$profile["about"] = "";

include/api.php

@@ -2,6 +2,27 @@
 /* To-Do:
  - Automatically detect if incoming data is HTML or BBCode
 */
+
+/* Contact details:
+	Gerhard Seeber		Mail: gerhard@seeber.at		Friendica: http://mozartweg.dyndns.org/friendica/gerhard
+
+ */
+
+
+/*
+ * Change history:
+	Gerhard Seeber		2015-NOV-25	Add API call /friendica/group_show to return all or a single group
+ 						with the containing contacts (necessary for Windows 10 Universal app)
+	Gerhard Seeber 		2015-NOV-27	Add API call /friendica/group_delete to delete the specified group id
+						(necessary for Windows 10 Universal app)
+	Gerhard Seeber		2015-DEC-01	Add API call /friendica/group_create to create a group with the specified 
+						name and the given list of contacts (necessary for Windows 10 Universal
+						app)
+	Gerhard Seeber		2015-DEC-07	Add API call /friendica/group_update to update a group with the given 
+						list of contacts (necessary for Windows 10 Universal app)
+ *
+ */
+
 	require_once("include/bbcode.php");
 	require_once("include/datetime.php");
 	require_once("include/conversation.php");
@@ -16,6 +37,7 @@
 	require_once('mod/wall_upload.php');
 	require_once("mod/proxy.php");
 	require_once("include/message.php");
+	require_once("include/group.php");
 
 
 	/*
@@ -3012,6 +3034,205 @@ function api_best_nickname(&$contacts) {
 		$contacts = array($contacts[0]);
 }
 
+	// return all or a specified group of the user with the containing contacts
+	function api_friendica_group_show(&$a, $type) {
+		if (api_user()===false) return false;		
+
+		// params
+		$user_info = api_get_user($a);
+		$gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0);
+		$uid = $user_info['uid'];
+	
+		// get data of the specified group id or all groups if not specified
+		if ($gid != 0) {
+			$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d AND `id` = %d",
+				intval($uid), 
+				intval($gid));
+			// error message if specified gid is not in database
+			if (count($r) == 0) 
+				die(api_error($a, $type, 'gid not available'));
+		}
+		else 
+			$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
+				intval($uid));
+		
+		// loop through all groups and retrieve all members for adding data in the user array
+		foreach ($r as $rr) {
+			$members = group_get_members($rr['id']);
+			$users = array();
+			foreach ($members as $member) {
+				$user = api_get_user($a, $member['nurl']);
+				$users[] = $user;
+			}
+			$grps[] = array('name' => $rr['name'], 'gid' => $rr['id'], 'user' => $users);
+		}
+		return api_apply_template("group_show", $type, array('$groups' => $grps));
+	}
+	api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
+
+
+	// delete the specified group of the user
+	function api_friendica_group_delete(&$a, $type) {
+		if (api_user()===false) return false;		
+
+		// params
+		$user_info = api_get_user($a);
+		$gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$uid = $user_info['uid'];
+	
+		// error if no gid specified
+		if ($gid == 0 || $name == "")
+			die(api_error($a, $type, 'gid or name not specified'));
+
+		// get data of the specified group id
+		$r = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d",
+			intval($uid), 
+			intval($gid));
+		// error message if specified gid is not in database
+		if (count($r) == 0) 
+			die(api_error($a, $type, 'gid not available'));
+
+		// get data of the specified group id and group name
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'",
+			intval($uid), 
+			intval($gid),
+			dbesc($name));
+		// error message if specified gid is not in database
+		if (count($rname) == 0) 
+			die(api_error($a, $type, 'wrong group name'));
+
+		// delete group
+		$ret = group_rmv($uid, $name);
+		if ($ret) {
+			// return success
+			$success = array('success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => array());
+			return api_apply_template("group_delete", $type, array('$result' => $success));
+		}
+		else
+			die(api_error($a, $type, 'other API error'));
+	}
+	api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', true);
+
+
+	// create the specified group with the posted array of contacts 
+	function api_friendica_group_create(&$a, $type) {
+		if (api_user()===false) return false;		
+
+		// params
+		$user_info = api_get_user($a);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$uid = $user_info['uid'];
+		$json = json_decode($_POST['json'], true);
+		$users = $json['user'];
+
+		// error if no name specified
+		if ($name == "")
+			die(api_error($a, $type, 'group name not specified'));
+
+		// get data of the specified group name
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0",
+			intval($uid), 
+			dbesc($name));
+		// error message if specified group name already exists
+		if (count($rname) != 0) 
+			die(api_error($a, $type, 'group name already exists'));
+
+		// check if specified group name is a deleted group
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1",
+			intval($uid), 
+			dbesc($name));
+		// error message if specified group name already exists
+		if (count($rname) != 0) 
+			$reactivate_group = true;
+
+		// create group
+		$ret = group_add($uid, $name);
+		if ($ret) 
+			$gid = group_byname($uid, $name);
+		else
+			die(api_error($a, $type, 'other API error'));
+		
+		// add members
+		$erroraddinguser = false;
+		$errorusers = array();
+		foreach ($users as $user) {
+			$cid = $user['cid'];
+			// check if user really exists as contact
+			$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", 
+				intval($cid),
+				intval($uid));
+			if (count($contact))
+				$result = group_add_member($uid, $name, $cid, $gid);
+			else {
+				$erroraddinguser = true;
+				$errorusers[] = $cid;
+			}
+		}
+
+		// return success message incl. missing users in array
+		$status = ($erroraddinguser ? "missing user" : ($reactivate_group ? "reactivated" : "ok"));
+		$success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers);
+		return api_apply_template("group_create", $type, array('result' => $success));		
+	}
+	api_register_func('api/friendica/group_create', 'api_friendica_group_create', true);
+
+
+	// update the specified group with the posted array of contacts 
+	function api_friendica_group_update(&$a, $type) {
+		if (api_user()===false) return false;		
+
+		// params
+		$user_info = api_get_user($a);
+		$uid = $user_info['uid'];
+		$gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$json = json_decode($_POST['json'], true);
+		$users = $json['user'];
+
+		// error if no name specified
+		if ($name == "")
+			die(api_error($a, $type, 'group name not specified'));
+
+		// error if no gid specified
+		if ($gid == "")
+			die(api_error($a, $type, 'gid not specified'));
+
+		// remove members
+		$members = group_get_members($gid);
+		foreach ($members as $member) {
+			$cid = $member['id'];
+			foreach ($users as $user) {
+				$found = ($user['cid'] == $cid ? true : false);
+			}
+			if (!$found) {
+				$ret = group_rmv_member($uid, $name, $cid);
+			}
+		}
+
+		// add members
+		$erroraddinguser = false;
+		$errorusers = array();
+		foreach ($users as $user) {
+			$cid = $user['cid'];
+			// check if user really exists as contact
+			$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", 
+				intval($cid),
+				intval($uid));
+			if (count($contact))
+				$result = group_add_member($uid, $name, $cid, $gid);
+			else {
+				$erroraddinguser = true;
+				$errorusers[] = $cid;
+			}
+		}
+		
+		// return success message incl. missing users in array
+		$status = ($erroraddinguser ? "missing user" : "ok");
+		$success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers);
+		return api_apply_template("group_update", $type, array('result' => $success));		
+	}
+	api_register_func('api/friendica/group_update', 'api_friendica_group_update', true);
 
 /*
 To.Do:

include/auth.php

@@ -5,6 +5,8 @@ require_once('include/security.php');
 require_once('include/datetime.php');
 
 function nuke_session() {
+	session_unset();
+/*
 	new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
 
 	unset($_SESSION['authenticated']);
@@ -20,10 +22,11 @@ function nuke_session() {
 	unset($_SESSION['my_address']);
 	unset($_SESSION['addr']);
 	unset($_SESSION['return_url']);
+*/
 }
 
 
-// login/logout 
+// login/logout
 
 
 
@@ -31,7 +34,7 @@ function nuke_session() {
 if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
 
 	if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
-	
+
 		// process logout request
 		call_hooks("logging_out");
 		nuke_session();
@@ -203,9 +206,14 @@ else {
 }
 
 function new_cookie($time) {
+	$a = get_app();
+
 	$old_sid = session_id();
-	session_set_cookie_params("$time");
+	session_set_cookie_params($time);
+	//session_set_cookie_params($time, "/", $a->get_hostname());
 	session_regenerate_id(false);
 
 	q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+
+	logger("Session parameter lifetime: ".$time." - got: ".print_r(session_get_cookie_params(), true), LOGGER_DEBUG);
 }

include/conversation.php

@@ -951,7 +951,7 @@ function item_photo_menu($item){
  * @param array &$conv_responses (already created with builtin activity structure)
  * @return void
  */
-if(! function_exists(builtin_activity_puller)) {
+if(! function_exists('builtin_activity_puller')) {
 function builtin_activity_puller($item, &$conv_responses) {
 	foreach($conv_responses as $mode => $v) {
 		$url = '';

include/cron.php

@@ -44,10 +44,11 @@ function cron_run(&$argv, &$argc){
 	$maxsysload = intval(get_config('system','maxloadavg'));
 	if($maxsysload < 1)
 		$maxsysload = 50;
-	if(function_exists('sys_getloadavg')) {
+
-		$load = sys_getloadavg();
+	$load = current_load();
-		if(intval($load[0]) > $maxsysload) {
+	if($load) {
-			logger('system: load ' . $load[0] . ' too high. cron deferred to next scheduled run.');
+		if(intval($load) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. cron deferred to next scheduled run.');
 			return;
 		}
 	}
@@ -189,24 +190,39 @@ function cron_run(&$argv, &$argc){
 			q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
 		}
 
-		// maximum table size in megabyte
+		// Maximum table size in megabyte
 		$max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000;
 		if ($max_tablesize == 0)
 			$max_tablesize = 100 * 1000000; // Default are 100 MB
 
+		// Minimum fragmentation level in percent
+		$fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100;
+		if ($fragmentation_level == 0)
+			$fragmentation_level = 0.3; // Default value is 30%
+
 		// Optimize some tables that need to be optimized
 		$r = q("SHOW TABLE STATUS");
 		foreach($r as $table) {
 
-			// Don't optimize tables that needn't to be optimized
-			if ($table["Data_free"] == 0)
-				continue;
-
 			// Don't optimize tables that are too large
 			if ($table["Data_length"] > $max_tablesize)
 				continue;
 
+			// Don't optimize empty tables
+			if ($table["Data_length"] == 0)
+				continue;
+
+			// Calculate fragmentation
+			$fragmentation = $table["Data_free"] / $table["Data_length"];
+
+			logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG);
+
+			// Don't optimize tables that needn't to be optimized
+			if ($fragmentation < $fragmentation_level)
+				continue;
+
 			// So optimize it
+			logger("Optimize Table ".$table["Name"], LOGGER_DEBUG);
 			q("OPTIMIZE TABLE `%s`", dbesc($table["Name"]));
 		}
 

include/cronhooks.php

@@ -27,10 +27,11 @@ function cronhooks_run(&$argv, &$argc){
 	$maxsysload = intval(get_config('system','maxloadavg'));
 	if($maxsysload < 1)
 		$maxsysload = 50;
-	if(function_exists('sys_getloadavg')) {
+
-		$load = sys_getloadavg();
+	$load = current_load();
-		if(intval($load[0]) > $maxsysload) {
+	if($load) {
-			logger('system: load ' . $load[0] . ' too high. Cronhooks deferred to next scheduled run.');
+		if(intval($load) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.');
 			return;
 		}
 	}

include/delivery.php

@@ -59,10 +59,11 @@ function delivery_run(&$argv, &$argc){
 		$maxsysload = intval(get_config('system','maxloadavg'));
 		if($maxsysload < 1)
 			$maxsysload = 50;
-		if(function_exists('sys_getloadavg')) {
+
-			$load = sys_getloadavg();
+		$load = current_load();
-			if(intval($load[0]) > $maxsysload) {
+		if($load) {
-				logger('system: load ' . $load[0] . ' too high. Delivery deferred to next queue run.');
+			if(intval($load) > $maxsysload) {
+				logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
 				return;
 			}
 		}

include/discover_poco.php

@@ -28,10 +28,11 @@ function discover_poco_run(&$argv, &$argc){
 	$maxsysload = intval(get_config('system','maxloadavg'));
 	if($maxsysload < 1)
 		$maxsysload = 50;
-	if(function_exists('sys_getloadavg')) {
+
-		$load = sys_getloadavg();
+	$load = current_load();
-		if(intval($load[0]) > $maxsysload) {
+	if($load) {
-			logger('system: load ' . $load[0] . ' too high. discover_poco deferred to next scheduled run.');
+		if(intval($load) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. discover_poco deferred to next scheduled run.');
 			return;
 		}
 	}

include/identity.php

@@ -4,7 +4,8 @@
  */
 
 require_once('include/forums.php');
-
+require_once('include/bbcode.php');
+require_once("mod/proxy.php");
 
 /**
  *
@@ -108,7 +109,6 @@ if(! function_exists('profile_load')) {
 		else
 			$a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-
 		/*if(! $block)
 		 $a->page['aside'] .= contact_block();*/
 
@@ -199,7 +199,7 @@ if(! function_exists('profile_sidebar')) {
 
 		if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
 			$profile['network_name'] = format_network_name($profile['network'],$profile['url']);
-		} else 
+		} else
 			$profile['network_name'] = "";
 
 		call_hooks('profile_sidebar_enter', $profile);
@@ -287,11 +287,11 @@ if(! function_exists('profile_sidebar')) {
 		}
 
 		// check if profile is a forum
-		if((x($profile['page-flags']) == 2)
+		if((intval($profile['page-flags']) == PAGE_COMMUNITY)
-				|| (x($profile['page-flags']) == 5)
+				|| (intval($profile['page-flags']) == PAGE_PRVGROUP)
-				|| (x($profile['forum']))
+				|| (intval($profile['forum']))
-				|| (x($profile['prv']))
+				|| (intval($profile['prv']))
-				|| (x($profile['community'])))
+				|| (intval($profile['community'])))
 			$account_type = t('Forum');
 		else
 			$account_type = "";
@@ -360,6 +360,15 @@ if(! function_exists('profile_sidebar')) {
 			$p[$k] = $v;
 		}
 
+		if (isset($p["about"]))
+			$p["about"] = bbcode($p["about"]);
+
+		if (isset($p["location"]))
+			$p["location"] = bbcode($p["location"]);
+
+		if (isset($p["photo"]))
+			$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
+
 		if($a->theme['template_engine'] === 'internal')
 			$location = template_escape($location);
 

include/items.php

@@ -4402,7 +4402,7 @@ function atom_author($tag,$name,$uri,$h,$w,$photo,$geo) {
 
 			$o .= "\t<poco:preferredUsername>".xmlify($r[0]["nick"])."</poco:preferredUsername>\r\n";
 			$o .= "\t<poco:displayName>".xmlify($r[0]["name"])."</poco:displayName>\r\n";
-			$o .= "\t<poco:note>".xmlify($r[0]["about"])."</poco:note>\r\n";
+			$o .= "\t<poco:note>".xmlify(bbcode($r[0]["about"]))."</poco:note>\r\n";
 			$o .= "\t<poco:address>\r\n";
 			$o .= "\t\t<poco:formatted>".xmlify($location)."</poco:formatted>\r\n";
 			$o .= "\t</poco:address>\r\n";

include/ostatus.php

@@ -2,6 +2,7 @@
 require_once("include/Contact.php");
 require_once("include/threads.php");
 require_once("include/html2bbcode.php");
+require_once("include/bbcode.php");
 require_once("include/items.php");
 require_once("mod/share.php");
 require_once("include/enotify.php");
@@ -142,7 +143,7 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 
 			$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
 			if ($value != "")
-				$contact["about"] = $value;
+				$contact["about"] = html2bbcode($value);
 
 			$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
 			if ($value != "")

include/poller.php

@@ -26,18 +26,22 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-	if(function_exists('sys_getloadavg')) {
+	$load = current_load();
+	if($load) {
 		$maxsysload = intval(get_config('system','maxloadavg'));
 		if($maxsysload < 1)
 			$maxsysload = 50;
 
-		$load = sys_getloadavg();
+		if(intval($load) > $maxsysload) {
-		if(intval($load[0]) > $maxsysload) {
+			logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
-			logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
 			return;
 		}
 	}
 
+	// Checking the number of workers
+	if (poller_too_much_workers(1))
+		return;
+
 	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
 		// Run the cron job that calls all other jobs
 		proc_run("php","include/cron.php");
@@ -57,17 +61,21 @@ function poller_run(&$argv, &$argc){
 			}
 
 	} else
-		// Sleep two seconds before checking for running processes to avoid having too many workers
+		// Sleep four seconds before checking for running processes again to avoid having too many workers
 		sleep(4);
 
 	// Checking number of workers
-	if (poller_too_much_workers())
+	if (poller_too_much_workers(2))
 		return;
 
 	$starttime = time();
 
 	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+		// Count active workers and compare them with a maximum value that depends on the load
+		if (poller_too_much_workers(3))
+			return;
+
 		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
 			dbesc(datetime_convert()),
 			intval(getmypid()),
@@ -100,10 +108,10 @@ function poller_run(&$argv, &$argc){
 		$funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
 		if (function_exists($funcname)) {
-			logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
+			logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
 			$funcname($argv, $argc);
 
-			logger("Process ".getmypid().": ".$funcname." - done");
+			logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done");
 
 			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
 		} else
@@ -112,15 +120,11 @@ function poller_run(&$argv, &$argc){
 		// Quit the poller once every hour
 		if (time() > ($starttime + 3600))
 			return;
-
-		// Count active workers and compare them with a maximum value that depends on the load
-		if (poller_too_much_workers())
-			return;
 	}
 
 }
 
-function poller_too_much_workers() {
+function poller_too_much_workers($stage) {
 
 	$queues = get_config("system", "worker_queues");
 
@@ -130,9 +134,8 @@ function poller_too_much_workers() {
 	$active = poller_active_workers();
 
 	// Decrease the number of workers at higher load
-	if(function_exists('sys_getloadavg')) {
+	$load = current_load();
-		$load = max(sys_getloadavg());
+	if($load) {
-
 		$maxsysload = intval(get_config('system','maxloadavg'));
 		if($maxsysload < 1)
 			$maxsysload = 50;
@@ -144,7 +147,7 @@ function poller_too_much_workers() {
 		$slope = $maxworkers / pow($maxsysload, $exponent);
 		$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
-		logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
+		logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
 
 	}
 

include/session.php

@@ -79,7 +79,7 @@ ini_set('session.gc_probability', $gc_probability);
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_httponly', 1);
 
-
+if (!get_config('system', 'disable_database_session'))
-session_set_save_handler ('ref_session_open', 'ref_session_close',
+	session_set_save_handler('ref_session_open', 'ref_session_close',
-			'ref_session_read', 'ref_session_write',
+				'ref_session_read', 'ref_session_write',
-			'ref_session_destroy', 'ref_session_gc');
+				'ref_session_destroy', 'ref_session_gc');

index.php

@@ -56,10 +56,11 @@ if(!$install) {
 	$maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
 	if($maxsysload_frontend < 1)
 		$maxsysload_frontend = 50;
-	if(function_exists('sys_getloadavg')) {
+
-		$load = sys_getloadavg();
+	$load = current_load();
-		if(intval($load[0]) > $maxsysload_frontend) {
+	if($load) {
-			logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.');
+		if($load > $maxsysload_frontend) {
+			logger('system: load ' . $load . ' too high. Service Temporarily Unavailable.');
 			header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
 			header('Retry-After: 300');
 			die("System is currently unavailable. Please try again later");

js/main.js

@@ -1,6 +1,21 @@
   function resizeIframe(obj) {
     obj.style.height = 0;
-    obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';
+	_resizeIframe(obj, 0);
+  }
+  
+  function _resizeIframe(obj, desth) {
+	var h = obj.style.height;
+	var ch = obj.contentWindow.document.body.scrollHeight + 'px';
+	if (h==ch) {
+		return;
+	}
+	console.log("_resizeIframe", obj, desth, ch);
+	if (desth!=ch) {
+		setTimeout(_resizeIframe, 500, obj, ch);
+	} else {
+		obj.style.height  = ch;
+		setTimeout(_resizeIframe, 1000, obj, ch);
+	}
   }
 
   function openClose(theID) {

mod/admin.php

@@ -410,6 +410,7 @@ function admin_page_site_post(&$a){
 	$maxloadavg		=	((x($_POST,'maxloadavg'))		? intval(trim($_POST['maxloadavg']))		: 50);
 	$maxloadavg_frontend	=	((x($_POST,'maxloadavg_frontend'))	? intval(trim($_POST['maxloadavg_frontend']))	: 50);
 	$optimize_max_tablesize	=	((x($_POST,'optimize_max_tablesize'))	? intval(trim($_POST['optimize_max_tablesize'])): 100);
+	$optimize_fragmentation	=	((x($_POST,'optimize_fragmentation'))	? intval(trim($_POST['optimize_fragmentation'])): 30);
 	$poco_completion	=	((x($_POST,'poco_completion'))		? intval(trim($_POST['poco_completion']))	: false);
 	$poco_requery_days	=	((x($_POST,'poco_requery_days'))	? intval(trim($_POST['poco_requery_days']))	: 7);
 	$poco_discovery		=	((x($_POST,'poco_discovery'))		? intval(trim($_POST['poco_discovery']))	: 0);
@@ -492,6 +493,7 @@ function admin_page_site_post(&$a){
 	set_config('system','maxloadavg',$maxloadavg);
 	set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
 	set_config('system','optimize_max_tablesize',$optimize_max_tablesize);
+	set_config('system','optimize_fragmentation',$optimize_fragmentation);
 	set_config('system','poco_completion',$poco_completion);
 	set_config('system','poco_requery_days',$poco_requery_days);
 	set_config('system','poco_discovery',$poco_discovery);
@@ -775,6 +777,7 @@ function admin_page_site(&$a) {
 		'$maxloadavg'		=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
 		'$maxloadavg_frontend'	=> array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
 		'$optimize_max_tablesize'=> array('optimize_max_tablesize', t("Maximum table size for optimization"), ((intval(get_config('system','optimize_max_tablesize')) > 0)?get_config('system','optimize_max_tablesize'):100), t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")),
+		'$optimize_fragmentation'=> array('optimize_fragmentation', t("Minimum level of fragmentation"), ((intval(get_config('system','optimize_fragmentation')) > 0)?get_config('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")),
 
 		'$poco_completion'	=> array('poco_completion', t("Periodical check of global contacts"), get_config('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
 		'$poco_requery_days'	=> array('poco_requery_days', t("Days between requery"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),

mod/allfriends.php

@@ -32,7 +32,12 @@ function allfriends_content(&$a) {
 	$a->page['aside'] = "";
 	profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
 
-	$r = all_friends(local_user(),$cid);
+	$total = count_all_friends(local_user(), $cid);
+
+	if(count($total))
+		$a->set_pager_total($total);
+
+	$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
 
 	if(! count($r)) {
 		$o .= t('No friends to display.');
@@ -87,8 +92,8 @@ function allfriends_content(&$a) {
 		//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
 		'$tab_str' => $tab_str,
 		'$contacts' => $entries,
+		'$paginate' => paginate($a),
 	));
 
-//	$o .= paginate($a);
 	return $o;
 }

mod/common.php

@@ -76,23 +76,22 @@ function common_content(&$a) {
 
 
 	if($cid)
-		$t = count_common_friends($uid,$cid);
+		$t = count_common_friends($uid, $cid);
 	else
-		$t = count_common_friends_zcid($uid,$zcid);
+		$t = count_common_friends_zcid($uid, $zcid);
 
-
+	if(count($t))
-	$a->set_pager_total($t);
+		$a->set_pager_total($t);
-
+	else {
-	if(! $t) {
 		notice( t('No contacts in common.') . EOL);
 		return $o;
 	}
 
 
 	if($cid)
-		$r = common_friends($uid,$cid);
+		$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
 	else
-		$r = common_friends_zcid($uid,$zcid);
+		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 
 
 	if(! count($r)) {
@@ -140,8 +139,8 @@ function common_content(&$a) {
 		'$title' => $title,
 		'$tab_str' => $tab_str,
 		'$contacts' => $entries,
+		'$paginate' => paginate($a),
 	));
 
-//	$o .= paginate($a);
 	return $o;
 }

mod/contacts.php

@@ -903,7 +903,7 @@ function contact_posts($a, $contact_id) {
 		$r = q("SELECT COUNT(*) AS `total` FROM `item`
 			WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
 			intval(local_user()),
-			dbesc(normalise_link($contact["url"])),
+			dbesc(str_replace("https://", "http://", $contact["url"])),
 			dbesc(str_replace("http://", "https://", $contact["url"])));
 
 		$a->set_pager_total($r[0]['total']);
@@ -918,7 +918,7 @@ function contact_posts($a, $contact_id) {
 		ORDER BY `item`.`created` DESC LIMIT %d, %d",
 		intval(local_user()),
 		intval($contact_id),
-		dbesc(normalise_link($contact["url"])),
+		dbesc(str_replace("https://", "http://", $contact["url"])),
 		dbesc(str_replace("http://", "https://", $contact["url"])),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])

mod/directory.php

@@ -57,19 +57,19 @@ function directory_content(&$a) {
 
 		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
 				(`user`.`nickname` LIKE '%$search%') OR
-				(`pdesc` LIKE '%$search%') OR
+				(`profile`.`pdesc` LIKE '%$search%') OR
-				(`locality` LIKE '%$search%') OR
+				(`profile`.`locality` LIKE '%$search%') OR
-				(`region` LIKE '%$search%') OR
+				(`profile`.`region` LIKE '%$search%') OR
-				(`country-name` LIKE '%$search%') OR
+				(`profile`.`country-name` LIKE '%$search%') OR
-				(`gender` LIKE '%$search%') OR
+				(`profile`.`gender` LIKE '%$search%') OR
-				(`marital` LIKE '%$search%') OR
+				(`profile`.`marital` LIKE '%$search%') OR
-				(`sexual` LIKE '%$search%') OR
+				(`profile`.`sexual` LIKE '%$search%') OR
-				(`about` LIKE '%$search%') OR
+				(`profile`.`about` LIKE '%$search%') OR
-				(`romance` LIKE '%$search%') OR
+				(`profile`.`romance` LIKE '%$search%') OR
-				(`work` LIKE '%$search%') OR
+				(`profile`.`work` LIKE '%$search%') OR
-				(`education` LIKE '%$search%') OR
+				(`profile`.`education` LIKE '%$search%') OR
-				(`pub_keywords` LIKE '%$search%') OR
+				(`profile`.`pub_keywords` LIKE '%$search%') OR
-				(`prv_keywords` LIKE '%$search%'))";
+				(`profile`.`prv_keywords` LIKE '%$search%'))";
 	}
 
 	$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );

mod/display.php

@@ -89,15 +89,13 @@ function display_init(&$a) {
 }
 
 function display_fetchauthor($a, $item) {
-	require_once("mod/proxy.php");
-	require_once("include/bbcode.php");
 
 	$profiledata = array();
 	$profiledata["uid"] = -1;
 	$profiledata["nickname"] = $item["author-name"];
 	$profiledata["name"] = $item["author-name"];
 	$profiledata["picdate"] = "";
-	$profiledata["photo"] = proxy_url($item["author-avatar"], false, PROXY_SIZE_SMALL);
+	$profiledata["photo"] = $item["author-avatar"];
 	$profiledata["url"] = $item["author-link"];
 	$profiledata["network"] = $item["network"];
 
@@ -174,9 +172,9 @@ function display_fetchauthor($a, $item) {
 			$r[0]["about"] = "";
 		}
 
-		$profiledata["photo"] = proxy_url($r[0]["photo"], false, PROXY_SIZE_SMALL);
+		$profiledata["photo"] = $r[0]["photo"];
-		$profiledata["address"] = bbcode($r[0]["location"]);
+		$profiledata["address"] = $r[0]["location"];
-		$profiledata["about"] = bbcode($r[0]["about"]);
+		$profiledata["about"] = $r[0]["about"];
 		if ($r[0]["nick"] != "")
 			$profiledata["nickname"] = $r[0]["nick"];
 	}
@@ -185,11 +183,11 @@ function display_fetchauthor($a, $item) {
 	$r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", dbesc(normalise_link($profiledata["url"])));
 	if (count($r)) {
 		if ($profiledata["photo"] == "")
-			$profiledata["photo"] = proxy_url($r[0]["avatar"], false, PROXY_SIZE_SMALL);
+			$profiledata["photo"] = $r[0]["avatar"];
 		if (($profiledata["address"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
-			$profiledata["address"] = bbcode($r[0]["location"]);
+			$profiledata["address"] = $r[0]["location"];
 		if (($profiledata["about"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
-			$profiledata["about"] = bbcode($r[0]["about"]);
+			$profiledata["about"] = $r[0]["about"];
 		if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != ""))
 			$profiledata["nickname"] = $r[0]["nick"];
 	}
@@ -212,7 +210,6 @@ function display_content(&$a, $update = 0) {
 		return;
 	}
 
-	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 	require_once('include/acl_selectors.php');

mod/photo.php

@@ -197,12 +197,13 @@ function photo_init(&$a) {
 	// If the photo is public and there is an existing photo directory store the photo there
 	if ($public and ($file != "")) {
 		// If the photo path isn't there, try to create it
-		if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+		$basepath = $a->get_basepath();
-			if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+		if (!is_dir($basepath."/photo"))
-				mkdir($_SERVER["DOCUMENT_ROOT"]."/photo");
+			if (is_writable($basepath))
+				mkdir($basepath."/photo");
 
-		if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+		if (is_dir($basepath."/photo"))
-			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+			file_put_contents($basepath."/photo/".$file, $data);
 	}
 
 	killme();

mod/photos.php

@@ -37,7 +37,7 @@ function photos_init(&$a) {
 
 		$profile = get_profiledata_by_nick($nick, $a->profile_uid);
 
-		if((x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 5))
+		if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP))
 			$account_type = t('Forum');
 		else
 			$account_type = "";

mod/proxy.php

@@ -44,14 +44,15 @@ function proxy_init() {
 	$thumb = false;
 	$size = 1024;
 	$sizetype = "";
+	$basepath = $a->get_basepath();
 
 	// If the cache path isn't there, try to create it
-	if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/proxy"))
+	if (!is_dir($basepath."/proxy"))
-		if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+		if (is_writable($basepath))
-			mkdir($_SERVER["DOCUMENT_ROOT"]."/proxy");
+			mkdir($basepath."/proxy");
 
 	// Checking if caching into a folder in the webroot is activated and working
-	$direct_cache = (is_dir($_SERVER["DOCUMENT_ROOT"]."/proxy") AND is_writable($_SERVER["DOCUMENT_ROOT"]."/proxy"));
+	$direct_cache = (is_dir($basepath."/proxy") AND is_writable($basepath."/proxy"));
 
 	// Look for filename in the arguments
 	if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST["url"])) {
@@ -211,9 +212,9 @@ function proxy_init() {
 	// advantage: real file access is really fast
 	// Otherwise write in cachefile
 	if ($valid AND $direct_cache) {
-		file_put_contents($_SERVER["DOCUMENT_ROOT"]."/proxy/".proxy_url($_REQUEST['url'], true), $img_str_orig);
+		file_put_contents($basepath."/proxy/".proxy_url($_REQUEST['url'], true), $img_str_orig);
 		if ($sizetype <> '')
-			file_put_contents($_SERVER["DOCUMENT_ROOT"]."/proxy/".proxy_url($_REQUEST['url'], true).$sizetype, $img_str);
+			file_put_contents($basepath."/proxy/".proxy_url($_REQUEST['url'], true).$sizetype, $img_str);
 	} elseif ($cachefile != '')
 		file_put_contents($cachefile, $img_str_orig);
 
@@ -247,7 +248,7 @@ function proxy_url($url, $writemode = false, $size = "") {
 		return($url);
 
 	// Creating a sub directory to reduce the amount of files in the cache directory
-	$basepath = $_SERVER["DOCUMENT_ROOT"]."/proxy";
+	$basepath = $a->get_basepath()."/proxy";
 
 	$path = substr(hash("md5", $url), 0, 2);
 

mod/pubsubhubbub.php

@@ -39,7 +39,7 @@ function pubsubhubbub_init(&$a) {
 			http_status_exit(404);
 		}
 
-		logger("pubsubhubbub: $hub_mode request from " . 
+		logger("pubsubhubbub: $hub_mode request from " .
 			   $_SERVER['REMOTE_ADDR']);
 
 		// get the nick name from the topic, a bit hacky but needed
@@ -52,9 +52,9 @@ function pubsubhubbub_init(&$a) {
 
 		// fetch user from database given the nickname
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s'" .
-			   " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1", 
+			   " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			   dbesc($nick));
-		
+
 		if(!count($r)) {
 			logger('pubsubhubbub: local account not found: ' . $nick);
 			http_status_exit(404);
@@ -70,8 +70,8 @@ function pubsubhubbub_init(&$a) {
 		}
 
 		// get corresponding row from contact table
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0" .
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`".
-			   " AND `pending` = 0 LIMIT 1",
+			   " AND NOT `pending` AND `self` LIMIT 1",
 			   intval($owner['uid']));
 		if(!count($r)) {
 			logger('pubsubhubbub: contact not found.');
@@ -82,20 +82,20 @@ function pubsubhubbub_init(&$a) {
 
 		// sanity check that topic URLs are the same
 		if(!link_compare($hub_topic, $contact['poll'])) {
-			logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' . 
+			logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' .
 				   $contact['poll']);
 			http_status_exit(404);
 		}
 
 		// do subscriber verification according to the PuSH protocol
 		$hub_challenge = random_string(40);
-		$params = 'hub.mode=' . 
+		$params = 'hub.mode=' .
 			($subscribe == 1 ? 'subscribe' : 'unsubscribe') .
 			'&hub.topic=' . urlencode($hub_topic) .
 			'&hub.challenge=' . $hub_challenge .
 			'&hub.lease_seconds=604800' .
 			'&hub.verify_token=' . $hub_verify_token;
-		
+
 		// lease time is hard coded to one week (in seconds)
 		// we don't actually enforce the lease time because GNU
 		// Social/StatusNet doesn't honour it (yet)

mod/videos.php

@@ -33,7 +33,7 @@ function videos_init(&$a) {
 
 		$profile = get_profiledata_by_nick($nick, $a->profile_uid);
 
-		if((x($profile['page-flags']) == 2) || (x($profile['page-flags']) == 5))
+		if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP))
 			$account_type = t('Forum');
 		else
 			$account_type = "";

util/credits.txt

@@ -108,6 +108,7 @@ Oliver
 Olivier
 Olivier Migeot
 Pavel Morozov
+Perig Gouanvic
 peturisfeld
 Piotr Blonkowski
 pokerazor

util/run_xgettext.sh

@@ -48,7 +48,7 @@ case "$MODE" in
 		OUTFILE="$FULLPATH/messages.po"
 		FINDSTARTDIR="."
 		# skip addon folder
-		FINDOPTS="( -wholename */addon -or -wholename */smarty3 ) -prune -o"
+		FINDOPTS="( -wholename */addon -or -wholename */addons-extra -or -wholename */smarty3 ) -prune -o"
 		
 		F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ./boot.php);
 		echo "Friendica version $F9KVERSION"

view/de/strings.php

@@ -5,6 +5,8 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 ;
+$a->strings["Network:"] = "Netzwerk";
+$a->strings["Forum"] = "Forum";
 $a->strings["%d contact edited."] = array(
 	0 => "%d Kontakt bearbeitet.",
 	1 => "%d Kontakte bearbeitet",
@@ -33,28 +35,11 @@ $a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
 $a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
 $a->strings["Suggest friends"] = "Kontakte vorschlagen";
 $a->strings["Network type: %s"] = "Netzwerktyp: %s";
-$a->strings["%d contact in common"] = array(
-	0 => "%d gemeinsamer Kontakt",
-	1 => "%d gemeinsame Kontakte",
-);
-$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblock"] = "Entsperren";
-$a->strings["Block"] = "Sperren";
-$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
-$a->strings["Unignore"] = "Ignorieren aufheben";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
-$a->strings["Repair"] = "Reparieren";
-$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
 $a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
 $a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
 $a->strings["Disabled"] = "Deaktiviert";
 $a->strings["Fetch information"] = "Beziehe Information";
 $a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
-$a->strings["Contact Editor"] = "Kontakt Editor";
 $a->strings["Submit"] = "Senden";
 $a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
@@ -70,6 +55,10 @@ $a->strings["Last update:"] = "Letzte Aktualisierung: ";
 $a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
 $a->strings["Update now"] = "Jetzt aktualisieren";
 $a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Unblock"] = "Entsperren";
+$a->strings["Block"] = "Sperren";
+$a->strings["Unignore"] = "Ignorieren aufheben";
+$a->strings["Ignore"] = "Ignorieren";
 $a->strings["Currently blocked"] = "Derzeit geblockt";
 $a->strings["Currently ignored"] = "Derzeit ignoriert";
 $a->strings["Currently archived"] = "Momentan archiviert";
@@ -80,6 +69,9 @@ $a->strings["Send a notification of every new post of this contact"] = "Sende ei
 $a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
 $a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
 $a->strings["Profile URL"] = "Profil URL";
+$a->strings["Location:"] = "Ort:";
+$a->strings["About:"] = "Über:";
+$a->strings["Tags:"] = "Tags";
 $a->strings["Suggestions"] = "Kontaktvorschläge";
 $a->strings["Suggest potential friends"] = "Freunde vorschlagen";
 $a->strings["All Contacts"] = "Alle Kontakte";
@@ -99,7 +91,21 @@ $a->strings["Search your contacts"] = "Suche in deinen Kontakten";
 $a->strings["Finding: "] = "Funde: ";
 $a->strings["Find"] = "Finde";
 $a->strings["Update"] = "Aktualisierungen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
 $a->strings["Delete"] = "Löschen";
+$a->strings["Status"] = "Status";
+$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
+$a->strings["Profile"] = "Profil";
+$a->strings["Profile Details"] = "Profildetails";
+$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Common Friends"] = "Gemeinsame Freunde";
+$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
+$a->strings["Repair"] = "Reparieren";
+$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
+$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
 $a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
 $a->strings["is a fan of yours"] = "ist ein Fan von dir";
 $a->strings["you are a fan of"] = "Du bist Fan von";
@@ -112,7 +118,6 @@ $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["Permission denied"] = "Zugriff verweigert";
 $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner.";
 $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
-$a->strings["Profile"] = "Profil";
 $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
 $a->strings["Visible To"] = "Sichtbar für";
 $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
@@ -206,9 +211,6 @@ $a->strings["Does %s know you?"] = "Kennt %s Dich?";
 $a->strings["No"] = "Nein";
 $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Your Identity Address:"] = "Adresse Deines Profils:";
-$a->strings["Location:"] = "Ort:";
-$a->strings["About:"] = "Über:";
-$a->strings["Tags:"] = "Tags";
 $a->strings["Contact added"] = "Kontakt hinzugefügt";
 $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
 $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
@@ -229,6 +231,7 @@ $a->strings["Group removed."] = "Gruppe entfernt.";
 $a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
 $a->strings["Group Editor"] = "Gruppeneditor";
 $a->strings["Members"] = "Mitglieder";
+$a->strings["Group is empty"] = "Gruppe ist leer";
 $a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
@@ -297,8 +300,6 @@ $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt tre
 $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht";
 $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
 $a->strings["No contacts."] = "Keine Kontakte.";
-$a->strings["Forum"] = "Forum";
-$a->strings["View Contacts"] = "Kontakte anzeigen";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["System"] = "System";
@@ -394,7 +395,6 @@ $a->strings["Please use your browser 'Back' button <strong>now</strong> if you a
 $a->strings["No mirroring"] = "Kein Spiegeln";
 $a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge";
 $a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge";
-$a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren";
 $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
 $a->strings["Refetch contact data"] = "Kontaktdaten neu laden";
 $a->strings["Name"] = "Name";
@@ -721,12 +721,10 @@ $a->strings["Warning: This group contains %s member from an insecure network."]
 );
 $a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten.";
 $a->strings["No such group"] = "Es gibt keine solche Gruppe";
-$a->strings["Group is empty"] = "Gruppe ist leer";
 $a->strings["Group: %s"] = "Gruppe: %s";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen.";
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
-$a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt.";
 $a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
 $a->strings["Sun"] = "So";
@@ -996,7 +994,7 @@ $a->strings["Display Settings"] = "Anzeige-Einstellungen";
 $a->strings["Display Theme:"] = "Theme:";
 $a->strings["Mobile Theme:"] = "Mobiles Theme";
 $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten.";
 $a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
 $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:";
@@ -1154,8 +1152,6 @@ $a->strings["Only one search per minute is permitted for not logged in users."]
 $a->strings["Search"] = "Suche";
 $a->strings["Items tagged with: %s"] = "Beiträge markiert mit: %s";
 $a->strings["Search results for: %s"] = "Suchergebnisse für: %s";
-$a->strings["Age: "] = "Alter: ";
-$a->strings["Gender: "] = "Geschlecht:";
 $a->strings["Status:"] = "Status:";
 $a->strings["Homepage:"] = "Homepage:";
 $a->strings["Global Directory"] = "Weltweites Verzeichnis";
@@ -1172,7 +1168,6 @@ $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Add"] = "Hinzufügen";
 $a->strings["No entries."] = "Keine Einträge.";
 $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
-$a->strings["Common Friends"] = "Gemeinsame Freunde";
 $a->strings["Export account"] = "Account exportieren";
 $a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
 $a->strings["Export all"] = "Alles exportieren";
@@ -1259,6 +1254,7 @@ $a->strings["Love/romance"] = "Liebe/Romantik";
 $a->strings["Work/employment"] = "Arbeit/Anstellung";
 $a->strings["School/education"] = "Schule/Ausbildung";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
+$a->strings["Age: "] = "Alter: ";
 $a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
 $a->strings["Change profile photo"] = "Profilbild ändern";
 $a->strings["Create New Profile"] = "Neues Profil anlegen";
@@ -1445,6 +1441,10 @@ $a->strings["All Networks"] = "Alle Netzwerke";
 $a->strings["Saved Folders"] = "Gespeicherte Ordner";
 $a->strings["Everything"] = "Alles";
 $a->strings["Categories"] = "Kategorien";
+$a->strings["%d contact in common"] = array(
+	0 => "%d gemeinsamer Kontakt",
+	1 => "%d gemeinsame Kontakte",
+);
 $a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
 $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
@@ -1536,7 +1536,6 @@ $a->strings["Atom feed"] = "Atom-Feed";
 $a->strings["Message"] = "Nachricht";
 $a->strings["Profiles"] = "Profile";
 $a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
-$a->strings["Network:"] = "Netzwerk";
 $a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["[today]"] = "[heute]";
@@ -1561,9 +1560,6 @@ $a->strings["Love/Romance:"] = "Liebesleben:";
 $a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
 $a->strings["School/education:"] = "Schule/Ausbildung:";
 $a->strings["Forums:"] = "Foren:";
-$a->strings["Status"] = "Status";
-$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-$a->strings["Profile Details"] = "Profildetails";
 $a->strings["Videos"] = "Videos";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
@@ -1654,6 +1650,7 @@ $a->strings["%d Contact"] = array(
 	0 => "%d Kontakt",
 	1 => "%d Kontakte",
 );
+$a->strings["View Contacts"] = "Kontakte anzeigen";
 $a->strings["Full Text"] = "Volltext";
 $a->strings["Tags"] = "Tags";
 $a->strings["poke"] = "anstupsen";

view/fr/strings.php

@@ -5,14 +5,16 @@ function string_plural_select_fr($n){
 	return ($n > 1);;
 }}
 ;
+$a->strings["Network:"] = "Réseau";
+$a->strings["Forum"] = "Forum";
 $a->strings["%d contact edited."] = array(
 	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é.";
-$a->strings["Contact updated."] = "Contact mis-à-jour.";
+$a->strings["Contact updated."] = "Contact mis à jour.";
-$a->strings["Failed to update contact record."] = "Échec de mise-à-jour du contact.";
+$a->strings["Failed to update contact record."] = "Échec de mise à jour du contact.";
 $a->strings["Permission denied."] = "Permission refusée.";
 $a->strings["Contact has been blocked"] = "Le contact a été bloqué";
 $a->strings["Contact has been unblocked"] = "Le contact n'est plus bloqué";
@@ -30,31 +32,14 @@ $a->strings["%s is sharing with you"] = "%s partage avec vous";
 $a->strings["Private communications are not available for this contact."] = "Les communications privées ne sont pas disponibles pour ce contact.";
 $a->strings["Never"] = "Jamais";
 $a->strings["(Update was successful)"] = "(Mise à jour effectuée avec succès)";
-$a->strings["(Update was not successful)"] = "(Mise à jour échouée)";
+$a->strings["(Update was not successful)"] = "(Échec de la mise à jour)";
 $a->strings["Suggest friends"] = "Suggérer amitié/contact";
 $a->strings["Network type: %s"] = "Type de réseau %s";
-$a->strings["%d contact in common"] = array(
-	0 => "%d contact en commun",
-	1 => "%d contacts en commun",
-);
-$a->strings["View all contacts"] = "Voir tous les contacts";
-$a->strings["Unblock"] = "Débloquer";
-$a->strings["Block"] = "Bloquer";
-$a->strings["Toggle Blocked status"] = "(dés)activer l'état \"bloqué\"";
-$a->strings["Unignore"] = "Ne plus ignorer";
-$a->strings["Ignore"] = "Ignorer";
-$a->strings["Toggle Ignored status"] = "(dés)activer l'état \"ignoré\"";
-$a->strings["Unarchive"] = "Désarchiver";
-$a->strings["Archive"] = "Archiver";
-$a->strings["Toggle Archive status"] = "(dés)activer l'état \"archivé\"";
-$a->strings["Repair"] = "Réparer";
-$a->strings["Advanced Contact Settings"] = "Réglages avancés du contact";
 $a->strings["Communications lost with this contact!"] = "Communications perdues avec ce contact !";
 $a->strings["Fetch further information for feeds"] = "Chercher plus d'informations pour les flux";
 $a->strings["Disabled"] = "Désactivé";
 $a->strings["Fetch information"] = "Récupérer informations";
 $a->strings["Fetch information and keywords"] = "Récupérer informations";
-$a->strings["Contact Editor"] = "Éditeur de contact";
 $a->strings["Submit"] = "Envoyer";
 $a->strings["Profile Visibility"] = "Visibilité du profil";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée.";
@@ -69,6 +54,11 @@ $a->strings["Delete contact"] = "Effacer ce contact";
 $a->strings["Last update:"] = "Dernière mise-à-jour :";
 $a->strings["Update public posts"] = "Mettre à jour les publications publiques:";
 $a->strings["Update now"] = "Mettre à jour";
+$a->strings["Connect/Follow"] = "Connecter/Suivre";
+$a->strings["Unblock"] = "Débloquer";
+$a->strings["Block"] = "Bloquer";
+$a->strings["Unignore"] = "Ne plus ignorer";
+$a->strings["Ignore"] = "Ignorer";
 $a->strings["Currently blocked"] = "Actuellement bloqué";
 $a->strings["Currently ignored"] = "Actuellement ignoré";
 $a->strings["Currently archived"] = "Actuellement archivé";
@@ -79,6 +69,9 @@ $a->strings["Send a notification of every new post of this contact"] = "Envoyer
 $a->strings["Blacklisted keywords"] = "Mots-clés sur la liste noire";
 $a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Liste de mots-clés separés par des virgules qui ne doivent pas être converti en mots-dièse quand  « Récupérer informations et mots-clés » est sélectionné.";
 $a->strings["Profile URL"] = "URL du Profil";
+$a->strings["Location:"] = "Localisation:";
+$a->strings["About:"] = "À propos:";
+$a->strings["Tags:"] = "Étiquette:";
 $a->strings["Suggestions"] = "Suggestions";
 $a->strings["Suggest potential friends"] = "Suggérer des amis potentiels";
 $a->strings["All Contacts"] = "Tous les contacts";
@@ -98,7 +91,21 @@ $a->strings["Search your contacts"] = "Rechercher dans vos contacts";
 $a->strings["Finding: "] = "Trouvé: ";
 $a->strings["Find"] = "Trouver";
 $a->strings["Update"] = "Mises-à-jour";
+$a->strings["Archive"] = "Archiver";
+$a->strings["Unarchive"] = "Désarchiver";
 $a->strings["Delete"] = "Supprimer";
+$a->strings["Status"] = "Statut";
+$a->strings["Status Messages and Posts"] = "Messages d'état et publications";
+$a->strings["Profile"] = "Profil";
+$a->strings["Profile Details"] = "Détails du profil";
+$a->strings["View all contacts"] = "Voir tous les contacts";
+$a->strings["Common Friends"] = "Amis communs";
+$a->strings["View all common friends"] = "Voir tous les amis communs";
+$a->strings["Repair"] = "Réparer";
+$a->strings["Advanced Contact Settings"] = "Réglages avancés du contact";
+$a->strings["Toggle Blocked status"] = "(dés)activer l'état \"bloqué\"";
+$a->strings["Toggle Ignored status"] = "(dés)activer l'état \"ignoré\"";
+$a->strings["Toggle Archive status"] = "(dés)activer l'état \"archivé\"";
 $a->strings["Mutual Friendship"] = "Relation réciproque";
 $a->strings["is a fan of yours"] = "Vous suit";
 $a->strings["you are a fan of"] = "Vous le/la suivez";
@@ -111,7 +118,6 @@ $a->strings["Post successful."] = "Publication réussie.";
 $a->strings["Permission denied"] = "Permission refusée";
 $a->strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
 $a->strings["Profile Visibility Editor"] = "Éditer la visibilité du profil";
-$a->strings["Profile"] = "Profil";
 $a->strings["Click on a contact to add or remove."] = "Cliquez sur un contact pour l'ajouter ou le supprimer.";
 $a->strings["Visible To"] = "Visible par";
 $a->strings["All Contacts (with secure profile access)"] = "Tous les contacts (ayant un accès sécurisé)";
@@ -183,16 +189,28 @@ $a->strings["Tag removed"] = "Étiquette supprimée";
 $a->strings["Remove Item Tag"] = "Enlever l'étiquette de l'élément";
 $a->strings["Select a tag to remove: "] = "Sélectionner une étiquette à supprimer: ";
 $a->strings["Remove"] = "Utiliser comme photo de profil";
+$a->strings["Subsribing to OStatus contacts"] = "Inscription aux contacts OStatus";
+$a->strings["No contact provided."] = "Pas de contact fourni.";
+$a->strings["Couldn't fetch information for contact."] = "Impossible de récupérer les informations pour ce contact.";
+$a->strings["Couldn't fetch friends for contact."] = "Impossible de récupérer les amis de ce contact.";
+$a->strings["Done"] = "Terminé";
+$a->strings["success"] = "réussite";
+$a->strings["failed"] = "échec";
+$a->strings["ignored"] = "ignoré";
+$a->strings["Keep this window open until done."] = "Veuillez garder cette fenêtre ouverte jusqu'à la fin.";
 $a->strings["Save to Folder:"] = "Sauver dans le Dossier:";
 $a->strings["- select -"] = "- choisir -";
 $a->strings["Save"] = "Sauver";
+$a->strings["Submit Request"] = "Envoyer la requête";
 $a->strings["You already added this contact."] = "Vous avez déjà ajouté ce contact.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Le support de Diaspora est désactivé. Le contact ne peut pas être ajouté.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "Le support d'OStatus est désactivé. Le contact ne peut pas être ajouté.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Impossible de détecter le type de réseau. Le contact ne peut pas être ajouté.";
 $a->strings["Please answer the following:"] = "Merci de répondre à ce qui suit:";
 $a->strings["Does %s know you?"] = "Est-ce que %s vous connaît?";
 $a->strings["No"] = "Non";
 $a->strings["Add a personal note:"] = "Ajouter une note personnelle:";
 $a->strings["Your Identity Address:"] = "Votre adresse d'identité:";
-$a->strings["Submit Request"] = "Envoyer la requête";
 $a->strings["Contact added"] = "Contact ajouté";
 $a->strings["Unable to locate original post."] = "Impossible de localiser la publication originale.";
 $a->strings["Empty post discarded."] = "Publication vide rejetée.";
@@ -213,6 +231,7 @@ $a->strings["Group removed."] = "Groupe enlevé.";
 $a->strings["Unable to remove group."] = "Impossible d'enlever le groupe.";
 $a->strings["Group Editor"] = "Éditeur de groupe";
 $a->strings["Members"] = "Membres";
+$a->strings["Group is empty"] = "Groupe vide";
 $a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
 $a->strings["Applications"] = "Applications";
 $a->strings["No installed applications."] = "Pas d'application installée.";
@@ -271,13 +290,16 @@ $a->strings["Forgot your Password?"] = "Mot de passe oublié ?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel.";
 $a->strings["Nickname or Email: "] = "Pseudo ou eMail : ";
 $a->strings["Reset"] = "Réinitialiser";
+$a->strings["event"] = "évènement";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s aime %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s n'aime pas %3\$s de %2\$s";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s participe à %3\$s de %2\$s";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s ne participe pas à %3\$s de %2\$s";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s participera peut-être à %3\$s de %2\$s";
 $a->strings["{0} wants to be your friend"] = "{0} souhaite être votre ami(e)";
 $a->strings["{0} sent you a message"] = "{0} vous a envoyé un message";
 $a->strings["{0} requested registration"] = "{0} a demandé à s'inscrire";
 $a->strings["No contacts."] = "Aucun contact.";
-$a->strings["View Contacts"] = "Voir les contacts";
 $a->strings["Invalid request identifier."] = "Identifiant de demande invalide.";
 $a->strings["Discard"] = "Rejeter";
 $a->strings["System"] = "Système";
@@ -303,9 +325,6 @@ $a->strings["Sharer"] = "Initiateur du partage";
 $a->strings["Fan/Admirer"] = "Fan/Admirateur";
 $a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
 $a->strings["New Follower"] = "Nouvel abonné";
-$a->strings["Location:"] = "Localisation:";
-$a->strings["About:"] = "À propos:";
-$a->strings["Tags:"] = "Étiquette:";
 $a->strings["Gender:"] = "Genre:";
 $a->strings["No introductions."] = "Aucune demande d'introduction.";
 $a->strings["Notifications"] = "Notifications";
@@ -355,30 +374,29 @@ $a->strings["Upload photo"] = "Joindre photo";
 $a->strings["Insert web link"] = "Insérer lien web";
 $a->strings["Please wait"] = "Patientez";
 $a->strings["No messages."] = "Aucun message.";
+$a->strings["Message not available."] = "Message indisponible.";
+$a->strings["Delete message"] = "Effacer message";
+$a->strings["Delete conversation"] = "Effacer conversation";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Pas de communications sécurisées possibles. Vous serez <strong>peut-être</strong> en mesure de répondre depuis la page de profil de l'émetteur.";
+$a->strings["Send Reply"] = "Répondre";
 $a->strings["Unknown sender - %s"] = "Émetteur inconnu - %s";
 $a->strings["You and %s"] = "Vous et %s";
 $a->strings["%s and You"] = "%s et vous";
-$a->strings["Delete conversation"] = "Effacer conversation";
 $a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
 $a->strings["%d message"] = array(
 	0 => "%d message",
 	1 => "%d messages",
 );
-$a->strings["Message not available."] = "Message indisponible.";
-$a->strings["Delete message"] = "Effacer message";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Pas de communications sécurisées possibles. Vous serez <strong>peut-être</strong> en mesure de répondre depuis la page de profil de l'émetteur.";
-$a->strings["Send Reply"] = "Répondre";
 $a->strings["[Embedded content - reload page to view]"] = "[contenu incorporé - rechargez la page pour le voir]";
 $a->strings["Contact settings applied."] = "Réglages du contact appliqués.";
 $a->strings["Contact update failed."] = "Impossible d'appliquer les réglages.";
-$a->strings["Repair Contact Settings"] = "Réglages de réparation des contacts";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ATTENTION: Manipulation réservée aux experts</strong>, toute information incorrecte pourrait empêcher la communication avec ce contact.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "une photo";
-$a->strings["Return to contact editor"] = "Retour à l'éditeur de contact";
 $a->strings["No mirroring"] = "Pas de miroir";
 $a->strings["Mirror as forwarded posting"] = "";
 $a->strings["Mirror as my own posting"] = "";
-$a->strings["Refetch contact data"] = "";
+$a->strings["Return to contact editor"] = "Retour à l'éditeur de contact";
+$a->strings["Refetch contact data"] = "Récupérer à nouveau les données de contact";
 $a->strings["Name"] = "Nom";
 $a->strings["Account Nickname"] = "Pseudo du compte";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@NomEtiquette - prend le pas sur Nom/Pseudo";
@@ -388,16 +406,18 @@ $a->strings["Friend Confirm URL"] = "Accès public refusé.";
 $a->strings["Notification Endpoint URL"] = "Aucune photo sélectionnée";
 $a->strings["Poll/Feed URL"] = "Téléverser des photos";
 $a->strings["New photo from this URL"] = "Nouvelle photo depuis cette URL";
-$a->strings["Remote Self"] = "";
+$a->strings["Remote Self"] = "Identité à distance";
 $a->strings["Mirror postings from this contact"] = "";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Marquer ce contact comme étant remote_self, friendica republiera alors les nouvelles entrées de ce contact.";
 $a->strings["Login"] = "Connexion";
-$a->strings["The post was created"] = "";
+$a->strings["The post was created"] = "La publication a été créée";
 $a->strings["Access denied."] = "Accès refusé.";
-$a->strings["People Search - %s"] = "";
 $a->strings["Connect"] = "Relier";
+$a->strings["View Profile"] = "Voir le profil";
+$a->strings["People Search - %s"] = "Recherche de personne - %s";
 $a->strings["No matches"] = "Aucune correspondance";
 $a->strings["Photos"] = "Photos";
+$a->strings["Contact Photos"] = "Photos du contact";
 $a->strings["Files"] = "Fichiers";
 $a->strings["Contacts who are not members of a group"] = "Contacts qui n’appartiennent à aucun groupe";
 $a->strings["Theme settings updated."] = "Réglages du thème sauvés.";
@@ -406,21 +426,21 @@ $a->strings["Users"] = "Utilisateurs";
 $a->strings["Plugins"] = "Extensions";
 $a->strings["Themes"] = "Thèmes";
 $a->strings["DB updates"] = "Mise-à-jour de la base";
-$a->strings["Inspect Queue"] = "";
+$a->strings["Inspect Queue"] = "Inspecter la file d'attente";
 $a->strings["Logs"] = "Journaux";
-$a->strings["probe address"] = "";
+$a->strings["probe address"] = "Tester une adresse";
-$a->strings["check webfinger"] = "";
+$a->strings["check webfinger"] = "vérification de webfinger";
 $a->strings["Admin"] = "Admin";
 $a->strings["Plugin Features"] = "Propriétés des extensions";
-$a->strings["diagnostics"] = "";
+$a->strings["diagnostics"] = "diagnostic";
 $a->strings["User registrations waiting for confirmation"] = "Inscriptions en attente de confirmation";
 $a->strings["Administration"] = "Administration";
-$a->strings["ID"] = "";
+$a->strings["ID"] = "ID";
-$a->strings["Recipient Name"] = "";
+$a->strings["Recipient Name"] = "Nom du destinataire";
-$a->strings["Recipient Profile"] = "";
+$a->strings["Recipient Profile"] = "Profil du destinataire";
-$a->strings["Created"] = "";
+$a->strings["Created"] = "Créé";
-$a->strings["Last Tried"] = "";
+$a->strings["Last Tried"] = "Dernier essai";
-$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "";
+$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Cette page présente le contenu de la file d'attente pour les publications sortantes. Ce sont des messages dont la première livraison a échoué. Ils seront réenvoyés plus tard et éventuellement supprimés si l'envoi échoue de façon permanente.";
 $a->strings["Normal Account"] = "Compte normal";
 $a->strings["Soapbox Account"] = "Compte \"boîte à savon\"";
 $a->strings["Community/Celebrity Account"] = "Compte de communauté/célébrité";
@@ -434,11 +454,12 @@ $a->strings["Pending registrations"] = "Inscriptions en attente";
 $a->strings["Version"] = "Versio";
 $a->strings["Active plugins"] = "Extensions activés";
 $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Impossible d'analyser l'URL de base. Doit contenir au moins <scheme>://<domain>";
+$a->strings["RINO2 needs mcrypt php extension to work."] = "RINO2 a besoin du module php mcrypt pour fonctionner.";
 $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["No community page"] = "";
+$a->strings["No community page"] = "Aucune page de communauté";
-$a->strings["Public postings from users of this site"] = "";
+$a->strings["Public postings from users of this site"] = "Publications publiques des utilisateurs de ce site";
-$a->strings["Global community page"] = "";
+$a->strings["Global community page"] = "Page de la communauté globale";
 $a->strings["At post arrival"] = "A l'arrivé d'une publication";
 $a->strings["Frequently"] = "Fréquemment";
 $a->strings["Hourly"] = "Toutes les heures";
@@ -448,7 +469,7 @@ $a->strings["Users, Global Contacts"] = "";
 $a->strings["Users, Global Contacts/fallback"] = "";
 $a->strings["One month"] = "Un mois";
 $a->strings["Three months"] = "Trois mois";
-$a->strings["Half a year"] = "";
+$a->strings["Half a year"] = "Six mois";
 $a->strings["One year"] = "Un an";
 $a->strings["Multi user instance"] = "Instance multi-utilisateurs";
 $a->strings["Closed"] = "Fermé";
@@ -467,12 +488,15 @@ $a->strings["Performance"] = "Performance";
 $a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Relocalisation - ATTENTION: fonction avancée. Peut rendre ce serveur inaccessible.";
 $a->strings["Site name"] = "Nom du site";
 $a->strings["Host name"] = "Nom de la machine hôte";
-$a->strings["Sender Email"] = "";
+$a->strings["Sender Email"] = "Courriel de l'émetteur";
+$a->strings["The email address your server shall use to send notification emails from."] = "L'adresse courriel à partir de laquelle votre serveur enverra des courriels.";
 $a->strings["Banner/Logo"] = "Bannière/Logo";
-$a->strings["Shortcut icon"] = "";
+$a->strings["Shortcut icon"] = "Icône de raccourci";
-$a->strings["Touch icon"] = "";
+$a->strings["Link to an icon that will be used for browsers."] = "Lien vers une icône qui sera utilisée pour les navigateurs.";
+$a->strings["Touch icon"] = "Icône pour systèmes tactiles";
+$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Lien vers une icône qui sera utilisée pour les tablettes et les mobiles.";
 $a->strings["Additional Info"] = "Informations supplémentaires";
-$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "Pour les serveurs publics : vous pouvez ajouter des informations supplémentaires ici, qui figureront dans %s/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é au niveau du profile utilisateur - <a href='#' id='cnftheme'>changer les réglages du thème</a>";
@@ -509,8 +533,8 @@ $a->strings["Block public"] = "Interdire la publication globale";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Cocher pour bloquer les accès anonymes (non-connectés) à tout sauf aux pages personnelles publiques.";
 $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["Global directory URL"] = "URL 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["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL de l'annuaire global. Si ce champ n'est pas défini, l'annuaire global sera complètement indisponible pour l'application.";
 $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";
@@ -531,14 +555,16 @@ $a->strings["Fullname check"] = "Vérification du \"Prénom Nom\"";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Imposer l'utilisation d'un espace entre le prénom et le nom (dans le Nom complet), pour limiter les abus";
 $a->strings["UTF-8 Regular expressions"] = "Regex UTF-8";
 $a->strings["Use PHP UTF8 regular expressions"] = "Utiliser les expressions rationnelles de PHP en UTF8";
-$a->strings["Community Page Style"] = "";
+$a->strings["Community Page Style"] = "Style de la page de communauté";
-$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "";
+$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Type de page de la communauté à afficher. « Communauté globale » montre toutes les publications publiques des réseaux distribués ouverts qui arrivent sur ce serveur.";
-$a->strings["Posts per user on community page"] = "";
+$a->strings["Posts per user on community page"] = "Nombre de publications par utilisateur sur la page de la communauté (n'est pas valide pour ";
-$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "";
+$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Nombre maximal de publications par utilisateurs sur la page de la communauté (ne s'applique pas pour « Communauté globale »).";
 $a->strings["Enable OStatus support"] = "Activer le support d'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."] = "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"] = "Achèvement de l'intervalle de conversation OStatus ";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Combien de fois le poller devra vérifier les nouvelles entrées dans les conversations OStatus? Cela peut utilisé beaucoup de ressources.";
+$a->strings["OStatus support can only be enabled if threading is enabled."] = "Le support OStatus ne peut être activé que si l'imbrication des commentaires est activée.";
+$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Le support de Diaspora ne peut pas être activé parce que Friendica a été installé dans un sous-répertoire.";
 $a->strings["Enable Diaspora support"] = "Activer le support de Diaspora";
 $a->strings["Provide built-in Diaspora network compatibility."] = "Fournir une compatibilité Diaspora intégrée.";
 $a->strings["Only allow Friendica contacts"] = "N'autoriser que les contacts Friendica";
@@ -555,24 +581,28 @@ $a->strings["Poll interval"] = "Intervalle de réception";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Rajouter un délai - en secondes - au processus de 'polling', afin de réduire la charge système. Mettre à 0 pour utiliser l'intervalle d'émission.";
 $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["Maximum Load Average (Frontend)"] = "";
+$a->strings["Maximum Load Average (Frontend)"] = "Plafond de la charge moyenne (frontale)";
 $a->strings["Maximum system load before the frontend quits service - default 50."] = "";
-$a->strings["Periodical check of global contacts"] = "";
+$a->strings["Maximum table size for optimization"] = "";
-$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "";
+$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "";
-$a->strings["Discover contacts from other servers"] = "";
+$a->strings["Periodical check of global contacts"] = "Vérification périodique des contacts globaux";
+$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Si activé, les données manquantes et obsolètes et la vitalité des contacts et des serveurs seront vérifiées périodiquement dans les contacts globaux.";
+$a->strings["Days between requery"] = "Nombre de jours entre les requêtes";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Nombre de jours avant qu'une requête de contacts soient envoyée à nouveau à un serveur.";
+$a->strings["Discover contacts from other servers"] = "Découvrir des contacts des autres serveurs";
 $a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "";
 $a->strings["Timeframe for fetching global contacts"] = "";
 $a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "";
 $a->strings["Search the local directory"] = "";
 $a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "";
-$a->strings["Publish server information"] = "";
+$a->strings["Publish server information"] = "Publier les informations du serveur";
-$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "";
+$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "Si cette option est activée, des informations sur le serveur et son utilisation seront publiées. Ces informations incluent le nom et la version du serveur, le nombre d’utilisateurs avec des profils publics, le nombre de messages, les protocoles supportés et les connecteurs disponibles. Plus de détails sur <a href='http://the-federation.info/'>the-federation.info</a>.";
 $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"] = "Supprimer un langage";
 $a->strings["Suppress language information in meta information about a posting."] = "Supprimer les informations de langue dans les métadonnées des publications.";
-$a->strings["Suppress Tags"] = "";
+$a->strings["Suppress Tags"] = "Masquer les tags";
-$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "";
+$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Ne pas afficher la liste des hashtags à la fin d’un message.";
 $a->strings["Path to item cache"] = "Chemin vers le cache des objets.";
 $a->strings["The item caches buffers generated bbcode and external images."] = "";
 $a->strings["Cache duration in seconds"] = "Durée du cache en secondes";
@@ -589,13 +619,13 @@ $a->strings["Disable picture proxy"] = "Désactiver le proxy image ";
 $a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Le proxy d'image augmente les performances et l'intimité. Il ne devrait pas être utilisé sur des systèmes avec une très faible bande passante.";
 $a->strings["Enable old style pager"] = "";
 $a->strings["The old style pager has page numbers but slows down massively the page speed."] = "";
-$a->strings["Only search in tags"] = "";
+$a->strings["Only search in tags"] = "Rechercher seulement dans les étiquettes";
-$a->strings["On large systems the text search can slow down the system extremely."] = "";
+$a->strings["On large systems the text search can slow down the system extremely."] = "La recherche textuelle peut ralentir considérablement les systèmes de grande taille.";
 $a->strings["New base url"] = "Nouvelle URL de base";
-$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "";
+$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "Changer d'URL de base pour ce serveur. Envoie un message de relocalisation à tous les contacts des réseaux distribués d'amis et de relations (DFRN) de tous les utilisateurs.";
-$a->strings["RINO Encryption"] = "";
+$a->strings["RINO Encryption"] = "Chiffrement RINO";
-$a->strings["Encryption layer between nodes."] = "";
+$a->strings["Encryption layer between nodes."] = "Couche de chiffrement entre les nœuds du réseau.";
-$a->strings["Embedly API key"] = "";
+$a->strings["Embedly API key"] = "Clé API d'Embedly";
 $a->strings["<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter."] = "";
 $a->strings["Update has been marked successful"] = "Mise-à-jour validée comme 'réussie'";
 $a->strings["Database structure update %s was successfully applied."] = "La structure de base de données pour la mise à jour %s a été appliquée avec succès.";
@@ -653,8 +683,10 @@ $a->strings["Enable"] = "Activer";
 $a->strings["Toggle"] = "Activer/Désactiver";
 $a->strings["Author: "] = "Auteur: ";
 $a->strings["Maintainer: "] = "Mainteneur: ";
+$a->strings["Reload active plugins"] = "Recharger les extensions actives";
 $a->strings["No themes found."] = "Aucun thème trouvé.";
 $a->strings["Screenshot"] = "Capture d'écran";
+$a->strings["Reload active themes"] = "Recharger les thèmes actifs";
 $a->strings["[Experimental]"] = "[Expérimental]";
 $a->strings["[Unsupported]"] = "[Non supporté]";
 $a->strings["Log settings updated."] = "Réglages des journaux mis-à-jour.";
@@ -668,7 +700,7 @@ $a->strings["FTP Host"] = "Hôte FTP";
 $a->strings["FTP Path"] = "Chemin FTP";
 $a->strings["FTP User"] = "Utilisateur FTP";
 $a->strings["FTP Password"] = "Mot de passe FTP";
-$a->strings["Search Results For: %s"] = "";
+$a->strings["Search Results For: %s"] = "Résultats de la recherche pour %s";
 $a->strings["Remove term"] = "Retirer le terme";
 $a->strings["Saved Searches"] = "Recherches";
 $a->strings["add"] = "ajouter";
@@ -689,15 +721,53 @@ $a->strings["Warning: This group contains %s member from an insecure network."]
 );
 $a->strings["Private messages to this group are at risk of public disclosure."] = "Les messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée.";
 $a->strings["No such group"] = "Groupe inexistant";
-$a->strings["Group is empty"] = "Groupe vide";
+$a->strings["Group: %s"] = "Group : %s";
-$a->strings["Group: %s"] = "";
-$a->strings["Contact: %s"] = "";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Les messages privés envoyés à ce contact s'exposent à une diffusion incontrôlée.";
 $a->strings["Invalid contact."] = "Contact invalide.";
-$a->strings["Friends of %s"] = "Amis de %s";
 $a->strings["No friends to display."] = "Pas d'amis à afficher.";
-$a->strings["Event can not end before it has started."] = "";
+$a->strings["Event can not end before it has started."] = "L'événement ne peut pas se terminer avant d'avoir commencé.";
 $a->strings["Event title and start time are required."] = "Vous devez donner un nom et un horaire de début à l'événement.";
+$a->strings["Sun"] = "Dim";
+$a->strings["Mon"] = "Lun";
+$a->strings["Tue"] = "Mar";
+$a->strings["Wed"] = "Mer";
+$a->strings["Thu"] = "Jeu";
+$a->strings["Fri"] = "Ven";
+$a->strings["Sat"] = "Sam";
+$a->strings["Sunday"] = "Dimanche";
+$a->strings["Monday"] = "Lundi";
+$a->strings["Tuesday"] = "Mardi";
+$a->strings["Wednesday"] = "Mercredi";
+$a->strings["Thursday"] = "Jeudi";
+$a->strings["Friday"] = "Vendredi";
+$a->strings["Saturday"] = "Samedi";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Fév";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Avr";
+$a->strings["May"] = "Mai";
+$a->strings["Jun"] = "Jun";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Aoû";
+$a->strings["Sept"] = "Sep";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Déc";
+$a->strings["January"] = "Janvier";
+$a->strings["February"] = "Février";
+$a->strings["March"] = "Mars";
+$a->strings["April"] = "Avril";
+$a->strings["June"] = "Juin";
+$a->strings["July"] = "Juillet";
+$a->strings["August"] = "Août";
+$a->strings["September"] = "Septembre";
+$a->strings["October"] = "Octobre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Décembre";
+$a->strings["today"] = "aujourd'hui";
+$a->strings["month"] = "mois";
+$a->strings["week"] = "semaine";
+$a->strings["day"] = "jour";
 $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "Editer l'événement";
 $a->strings["link to source"] = "lien original";
@@ -706,7 +776,7 @@ $a->strings["Create New Event"] = "Créer un nouvel événement";
 $a->strings["Previous"] = "Précédent";
 $a->strings["Next"] = "Suivant";
 $a->strings["Event details"] = "Détails de l'événement";
-$a->strings["Starting date and Title are required."] = "";
+$a->strings["Starting date and Title are required."] = "La date de début et le titre sont requis.";
 $a->strings["Event Starts:"] = "Début de l'événement :";
 $a->strings["Required"] = "Requis";
 $a->strings["Finish date/time is not known or not relevant"] = "Date / heure de fin inconnue ou sans objet";
@@ -716,6 +786,8 @@ $a->strings["Description:"] = "Description:";
 $a->strings["Title:"] = "Titre :";
 $a->strings["Share this event"] = "Partager cet événement";
 $a->strings["Preview"] = "Aperçu";
+$a->strings["Credits"] = "Remerciements";
+$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica est un projet communautaire, qui ne serait pas possible sans l'aide de beaucoup de gens. Voici une liste de ceux qui ont contribué au code ou à la traduction de Friendica. Merci à tous!";
 $a->strings["Select"] = "Sélectionner";
 $a->strings["View %s's profile @ %s"] = "Voir le profil de %s @ %s";
 $a->strings["%s from %s"] = "%s de %s";
@@ -765,7 +837,7 @@ $a->strings["Could not create table."] = "Impossible de créer une table.";
 $a->strings["Your Friendica site database has been installed."] = "La base de données de votre site Friendica a bien été installée.";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "";
+$a->strings["Database already in use."] = "Base de données déjà en cours d'utilisation.";
 $a->strings["System check"] = "Vérifications système";
 $a->strings["Check again"] = "Vérifier à nouveau";
 $a->strings["Database connection"] = "Connexion à la base de données";
@@ -781,7 +853,7 @@ $a->strings["Your account email address must match this in order to use the web
 $a->strings["Please select a default timezone for your website"] = "Sélectionner un fuseau horaire par défaut pour votre site";
 $a->strings["Site settings"] = "Réglages du site";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Si vous n'avez pas de version \"ligne de commande\" de PHP sur votre serveur, vous ne pourrez pas utiliser le 'poller' en tâche de fond via cron. Voir <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Si vous n'avez pas une version en ligne de commande de PHP sur votre serveur, vous ne pourrez pas exécuter l'attente active ou « polling » en arrière-plan via cron. Voir <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>.";
 $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";
@@ -799,6 +871,7 @@ $a->strings["GD graphics PHP module"] = "Module GD (graphiques) de PHP";
 $a->strings["OpenSSL PHP module"] = "Module OpenSSL de PHP";
 $a->strings["mysqli PHP module"] = "Module Mysqli de PHP";
 $a->strings["mb_string PHP module"] = "Module mb_string de PHP";
+$a->strings["mcrypt PHP module"] = "Module PHP mcrypt";
 $a->strings["Apache mod_rewrite module"] = "Module mod_rewrite Apache";
 $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
 $a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : Le module PHP \"libCURL\" est requis mais pas installé.";
@@ -806,6 +879,9 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
 $a->strings["Error: openssl PHP module required but not installed."] = "Erreur : Le module PHP \"openssl\" est requis mais pas installé.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Erreur : Le module PHP \"mysqli\" est requis mais pas installé.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module PHP mb_string est requis mais pas installé.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Erreur : le module PHP mcrypt est nécessaire, mais n'es pas installé.";
+$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "";
+$a->strings["mcrypt_create_iv() function"] = "";
 $a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais il en est incapable.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "A la fin de cette étape, nous vous fournirons un texte à sauvegarder dans un fichier nommé .htconfig.php à la racine de votre répertoire Friendica.";
@@ -818,6 +894,8 @@ $a->strings["Note: as a security measure, you should give the web server write a
 $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["ImageMagick PHP extension is installed"] = "L’extension PHP ImageMagick est installée";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supporte le format GIF";
 $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.";
 $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le \"poller\".";
@@ -833,11 +911,11 @@ $a->strings["%1\$s welcomes %2\$s"] = "%1\$s accueille %2\$s";
 $a->strings["Welcome to %s"] = "Bienvenue sur %s";
 $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?"] = "Ou — auriez-vous essayé de télécharger un fichier vide ?";
-$a->strings["File exceeds size limit of %s"] = "";
+$a->strings["File exceeds size limit of %s"] = "La taille du fichier dépasse la limite de %s";
 $a->strings["File upload failed."] = "Le téléversement a échoué.";
-$a->strings["Profile Match"] = "Correpondance de profils";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clé en correspondance. Merci d'ajouter des mots-clés à votre profil par défaut.";
 $a->strings["is interested in:"] = "s'intéresse à :";
+$a->strings["Profile Match"] = "Correpondance de profils";
 $a->strings["link"] = "lien";
 $a->strings["Not available."] = "Indisponible.";
 $a->strings["Community"] = "Communauté";
@@ -883,18 +961,19 @@ $a->strings["Plugin Settings"] = "Extensions";
 $a->strings["Off"] = "Éteint";
 $a->strings["On"] = "Allumé";
 $a->strings["Additional Features"] = "Fonctions supplémentaires";
-$a->strings["General Social Media Settings"] = "";
+$a->strings["General Social Media Settings"] = "Paramètres généraux des réseaux sociaux";
-$a->strings["Disable intelligent shortening"] = "";
+$a->strings["Disable intelligent shortening"] = "Désactiver la réduction d'URL";
-$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "";
+$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalement, le système tente de trouver le meilleur lien à ajouter aux publications raccourcies. Si cette option est activée, les publications raccourcies dirigeront toujours vers leur publication d'origine sur Friendica.";
-$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Suivre automatiquement ceux qui me suivent ou me mentionnent sur GNU Social (OStatus)";
-$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "";
+$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Si vous recevez un message d'un utilisateur OStatus inconnu, cette option détermine ce qui sera fait. Si elle est cochée, un nouveau contact sera créé pour chaque utilisateur inconnu.";
-$a->strings["Your legacy GNU Social account"] = "";
+$a->strings["Your legacy GNU Social account"] = "Le compte GNU Social que vous avez déjà";
-$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "";
+$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Si vous entrez votre le nom de votre ancien compte GNU Social / StatusNet ici (utiliser le format utilisateur@domaine.tld), vos contacts seront ajoutés automatiquement. Le champ sera vidé lorsque ce sera terminé.";
+$a->strings["Repair OStatus subscriptions"] = "Réparer les abonnements OStatus";
 $a->strings["Built-in support for %s connectivity is %s"] = "Le support natif pour la connectivité %s est %s";
 $a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "activé";
 $a->strings["disabled"] = "désactivé";
-$a->strings["GNU Social (OStatus)"] = "";
+$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
 $a->strings["Email access is disabled on this site."] = "L'accès courriel est désactivé sur ce site.";
 $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.";
@@ -915,14 +994,16 @@ $a->strings["Display Settings"] = "Affichage";
 $a->strings["Display Theme:"] = "Thème d'affichage:";
 $a->strings["Mobile Theme:"] = "Thème mobile:";
 $a->strings["Update browser every xx seconds"] = "Mettre-à-jour l'affichage toutes les xx secondes";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Délai minimum de 10 secondes, pas de maximum";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum de 10 secondes. Saisir -1 pour désactiver.";
 $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:"] = "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["Calendar"] = "Calendrier";
+$a->strings["Beginning of week:"] = "Début de la semaine :";
 $a->strings["Don't show notices"] = "Ne plus afficher les avis";
 $a->strings["Infinite scroll"] = "Défilement infini";
-$a->strings["Automatic updates only at the top of the network page"] = "";
+$a->strings["Automatic updates only at the top of the network page"] = "Mises à jour automatiques seulement en haut de la page du réseau.";
 $a->strings["Theme settings"] = "Réglages du thème graphique";
 $a->strings["User Types"] = "Types d'utilisateurs";
 $a->strings["Community Types"] = "Genre de communautés";
@@ -948,7 +1029,7 @@ $a->strings["Allow friends to tag your posts?"] = "Autoriser vos amis à étique
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Autoriser les suggestions d'amis potentiels aux nouveaux arrivants?";
 $a->strings["Permit unknown people to send you private mail?"] = "Autoriser les messages privés d'inconnus?";
 $a->strings["Profile is <strong>not published</strong>."] = "Ce profil n'est <strong>pas publié</strong>.";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "L’adresse de votre identité est <strong>'%s'</strong> or '%s'.";
 $a->strings["Automatically expire posts after this many days:"] = "Les publications expirent automatiquement après (en jours) :";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si ce champ est vide, les publications n'expireront pas. Les publications expirées seront supprimées";
 $a->strings["Advanced expiration settings"] = "Réglages avancés de l'expiration";
@@ -970,6 +1051,8 @@ $a->strings["Basic Settings"] = "Réglages basiques";
 $a->strings["Full Name:"] = "Nom complet:";
 $a->strings["Email Address:"] = "Adresse courriel:";
 $a->strings["Your Timezone:"] = "Votre fuseau horaire:";
+$a->strings["Your Language:"] = "Votre langue :";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Détermine la langue que nous utilisons pour afficher votre interface Friendica et pour vous envoyer des courriels";
 $a->strings["Default Post Location:"] = "Emplacement de publication par défaut:";
 $a->strings["Use Browser Location:"] = "Utiliser la localisation géographique du navigateur:";
 $a->strings["Security and Privacy Settings"] = "Réglages de sécurité et vie privée";
@@ -997,10 +1080,10 @@ $a->strings["You receive a private message"] = "Vous recevez un message privé";
 $a->strings["You receive a friend suggestion"] = "Vous avez reçu une suggestion d'ami";
 $a->strings["You are tagged in a post"] = "Vous avez été étiquetté dans une publication";
 $a->strings["You are poked/prodded/etc. in a post"] = "Vous avez été sollicité dans une publication";
-$a->strings["Activate desktop notifications"] = "";
+$a->strings["Activate desktop notifications"] = "Activer les notifications de bureau";
-$a->strings["Show desktop popup on new notifications"] = "";
+$a->strings["Show desktop popup on new notifications"] = "Afficher dans des pops-ups les nouvelles notifications";
-$a->strings["Text-only notification emails"] = "";
+$a->strings["Text-only notification emails"] = "Courriels de notification en format texte";
-$a->strings["Send text only notification emails, without the html part"] = "";
+$a->strings["Send text only notification emails, without the html part"] = "Envoyer le texte des courriels de notification, sans la composante html";
 $a->strings["Advanced Account/Page Type Settings"] = "Paramètres avancés de compte/page";
 $a->strings["Change the behaviour of this account for special situations"] = "Modifier le comportement de ce compte dans certaines situations";
 $a->strings["Relocate"] = "Relocaliser";
@@ -1036,7 +1119,7 @@ $a->strings["Hide this contact"] = "Cacher ce contact";
 $a->strings["Welcome home %s."] = "Bienvenue chez vous, %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Merci de confirmer votre demande d'introduction auprès de %s.";
 $a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Merci d'entrer votre \"adresse d'identité\" de l'un des réseaux de communication suivant:";
-$a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
+$a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Si vous n’êtes pas encore membre du web social libre, <a href=\"%s/siteinfo\">suivez ce lien pour trouver un site Friendica ouvert au public et nous rejoindre dès aujourd’hui</a>.";
 $a->strings["Friend/Connection Request"] = "Requête de relation/amitié";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples : jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
 $a->strings["Friendica"] = "Friendica";
@@ -1044,6 +1127,7 @@ $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - merci de ne pas utiliser ce formulaire.   Entrez plutôt %s dans votre barre de recherche Diaspora.";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Inscription réussie. Vérifiez vos emails pour la suite des instructions.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Impossible d’envoyer le courriel de confirmation. Voici vos informations de connexion:<br> identifiant : %s<br> mot de passe : %s<br><br>Vous pourrez changer votre mot de passe une fois connecté.";
+$a->strings["Registration successful."] = "Inscription réussie.";
 $a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traitée.";
 $a->strings["Your registration is pending approval by the site owner."] = "Votre inscription attend une validation du propriétaire du site.";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain.";
@@ -1053,25 +1137,27 @@ $a->strings["Your OpenID (optional): "] = "Votre OpenID (facultatif): ";
 $a->strings["Include your profile in member directory?"] = "Inclure votre profil dans l'annuaire des membres?";
 $a->strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
 $a->strings["Your invitation ID: "] = "Votre ID d'invitation: ";
-$a->strings["Your Full Name (e.g. Joe Smith): "] = "Votre nom complet (p.ex. Michel Dupont): ";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Votre nom complet (p. ex. Michel Dupont):";
 $a->strings["Your Email Address: "] = "Votre adresse courriel: ";
-$a->strings["Leave empty for an auto generated password."] = "";
+$a->strings["Leave empty for an auto generated password."] = "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement.";
 $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["Register"] = "S'inscrire";
 $a->strings["Import"] = "Importer";
 $a->strings["Import your profile to this friendica instance"] = "Importer votre profile dans cette instance de friendica";
 $a->strings["System down for maintenance"] = "Système indisponible pour cause de maintenance";
+$a->strings["Only logged in users are permitted to perform a search."] = "Seuls les utilisateurs inscrits sont autorisés à lancer une recherche.";
+$a->strings["Too Many Requests"] = "Trop de requêtes";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Une seule recherche par minute pour les utilisateurs qui ne sont pas connectés.";
 $a->strings["Search"] = "Recherche";
 $a->strings["Items tagged with: %s"] = "";
 $a->strings["Search results for: %s"] = "";
-$a->strings["Global Directory"] = "Annuaire global";
-$a->strings["Find on this site"] = "Trouver sur ce site";
-$a->strings["Site Directory"] = "Annuaire local";
-$a->strings["Age: "] = "Age : ";
-$a->strings["Gender: "] = "Genre : ";
 $a->strings["Status:"] = "Statut:";
 $a->strings["Homepage:"] = "Page personnelle:";
+$a->strings["Global Directory"] = "Annuaire global";
+$a->strings["Find on this site"] = "Trouver sur ce site";
+$a->strings["Finding:"] = "";
+$a->strings["Site Directory"] = "Annuaire local";
 $a->strings["No entries (some entries may be hidden)."] = "Aucune entrée (certaines peuvent être cachées).";
 $a->strings["No potential page delegates located."] = "Pas de délégataire potentiel.";
 $a->strings["Delegate Page Management"] = "Déléguer la gestion de la page";
@@ -1081,7 +1167,6 @@ $a->strings["Existing Page Delegates"] = "Délégataires existants";
 $a->strings["Potential Delegates"] = "Délégataires potentiels";
 $a->strings["Add"] = "Ajouter";
 $a->strings["No entries."] = "Aucune entrée.";
-$a->strings["Common Friends"] = "Amis communs";
 $a->strings["No contacts in common."] = "Pas de contacts en commun.";
 $a->strings["Export account"] = "Exporter le compte";
 $a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportez votre compte, vos infos et vos contacts. Vous pourrez utiliser le résultat comme sauvegarde et/ou pour le ré-importer sur un autre serveur.";
@@ -1091,9 +1176,9 @@ $a->strings["%1\$s is currently %2\$s"] = "%1\$s est d'humeur %2\$s";
 $a->strings["Mood"] = "Humeur";
 $a->strings["Set your current mood and tell your friends"] = "Spécifiez votre humeur du moment, et informez vos amis";
 $a->strings["Do you really want to delete this suggestion?"] = "Voulez-vous vraiment supprimer cette suggestion ?";
-$a->strings["Friend Suggestions"] = "Suggestions d'amitiés/contacts";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h.";
 $a->strings["Ignore/Hide"] = "Ignorer/cacher";
+$a->strings["Friend Suggestions"] = "Suggestions d'amitiés/contacts";
 $a->strings["Profile deleted."] = "Profil supprimé.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Nouveau profil créé.";
@@ -1120,6 +1205,7 @@ $a->strings[" - Visit %1\$s's %2\$s"] = "Visiter le %2\$s de %1\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s a mis à jour son %2\$s, en modifiant %3\$s.";
 $a->strings["Hide contacts and friends:"] = "Cacher mes contacts et amis :";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Cacher ma liste d'amis / contacts des visiteurs de ce profil ?";
+$a->strings["Show more profile fields:"] = "";
 $a->strings["Edit Profile Details"] = "Éditer les détails du profil";
 $a->strings["Change Profile Photo"] = "Changer la photo du profil";
 $a->strings["View this profile"] = "Voir ce profil";
@@ -1135,7 +1221,7 @@ $a->strings["Profile Name:"] = "Nom du profil :";
 $a->strings["Your Full Name:"] = "Votre nom complet :";
 $a->strings["Title/Description:"] = "Titre / Description :";
 $a->strings["Your Gender:"] = "Votre genre :";
-$a->strings["Birthday :"] = "";
+$a->strings["Birthday :"] = "Anniversaire :";
 $a->strings["Street Address:"] = "Adresse postale :";
 $a->strings["Locality/City:"] = "Ville / Localité :";
 $a->strings["Postal/Zip Code:"] = "Code postal :";
@@ -1168,6 +1254,7 @@ $a->strings["Love/romance"] = "Amour / Romance";
 $a->strings["Work/employment"] = "Activité professionnelle / Occupation";
 $a->strings["School/education"] = "Études / Formation";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Ceci est votre profil <strong>public</strong>.<br />Il <strong>peut</strong> être visible par n'importe quel utilisateur d'Internet.";
+$a->strings["Age: "] = "Age : ";
 $a->strings["Edit/Manage Profiles"] = "Editer / gérer les profils";
 $a->strings["Change profile photo"] = "Changer de photo de profil";
 $a->strings["Create New Profile"] = "Créer un nouveau profil";
@@ -1221,6 +1308,8 @@ $a->strings["poke, prod or do other things to somebody"] = "solliciter (poke/...
 $a->strings["Recipient"] = "Destinataire";
 $a->strings["Choose what you wish to do to recipient"] = "Choisissez ce que vous voulez faire au destinataire";
 $a->strings["Make this post private"] = "Rendez ce message privé";
+$a->strings["Resubsribing to OStatus contacts"] = "";
+$a->strings["Error"] = "Erreur";
 $a->strings["Total invitation limit exceeded."] = "La limite d'invitation totale est éxédée.";
 $a->strings["%s : Not a valid email address."] = "%s : Adresse de courriel invalide.";
 $a->strings["Please join us on Friendica"] = "Rejoignez-nous sur Friendica";
@@ -1241,7 +1330,6 @@ $a->strings["You are cordially invited to join me and other close friends on Fri
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Vous devrez fournir ce code d'invitation : \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Une fois inscrit, connectez-vous à la page de mon profil sur :";
 $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Pour plus d'information sur le projet Friendica, et pourquoi nous croyons qu'il est important, merci de visiter http://friendica.com";
-$a->strings["Contact Photos"] = "Photos du contact";
 $a->strings["Photo Albums"] = "Albums photo";
 $a->strings["Recent Photos"] = "Photos récentes";
 $a->strings["Upload New Photos"] = "Téléverser de nouvelles photos";
@@ -1279,12 +1367,19 @@ $a->strings["New album name"] = "Nom du nouvel album";
 $a->strings["Caption"] = "Titre";
 $a->strings["Add a Tag"] = "Ajouter une étiquette";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances";
-$a->strings["Do not rotate"] = "";
+$a->strings["Do not rotate"] = "Pas de rotation";
 $a->strings["Rotate CW (right)"] = "Tourner dans le sens des aiguilles d'une montre (vers la droite)";
 $a->strings["Rotate CCW (left)"] = "Tourner dans le sens contraire des aiguilles d'une montre (vers la gauche)";
 $a->strings["Private photo"] = "Photo privée";
 $a->strings["Public photo"] = "Photo publique";
 $a->strings["Share"] = "Partager";
+$a->strings["Attending"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Not attending"] = "Ne participe pas";
+$a->strings["Might attend"] = "Participera peut-être";
+$a->strings["Map"] = "Carte";
 $a->strings["Not Extended"] = "";
 $a->strings["Account approved."] = "Inscription validée.";
 $a->strings["Registration revoked for %s"] = "Inscription révoquée pour %s";
@@ -1292,7 +1387,7 @@ $a->strings["Please login."] = "Merci de vous connecter.";
 $a->strings["Move account"] = "Migrer le compte";
 $a->strings["You can import an account from another Friendica server."] = "Vous pouvez importer un compte d'un autre serveur Friendica.";
 $a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Vous devez exporter votre compte à partir de l'ancien serveur et le téléverser ici. Nous recréerons votre ancien compte ici avec tous vos contacts. Nous tenterons également d'informer vos amis que vous avez déménagé ici.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Cette fonctionnalité est expérimentale. Nous ne pouvons importer les contacts des réseaux OStatus (statusnet/identi.ca) ou Diaspora";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "";
 $a->strings["Account file"] = "Fichier du compte";
 $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Pour exporter votre compte, allez dans \"Paramètres> Exporter vos données personnelles\" et sélectionnez \"exportation de compte\"";
 $a->strings["Item not available."] = "Elément non disponible.";
@@ -1312,10 +1407,12 @@ $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["This entry was edited"] = "Cette entrée à été édité";
+$a->strings["I will attend"] = "Je vais participer";
+$a->strings["I will not attend"] = "Je ne vais pas participer";
+$a->strings["I might attend"] = "Je vais peut-être participer";
 $a->strings["ignore thread"] = "ignorer le fil";
 $a->strings["unignore thread"] = "Ne plus ignorer le fil";
 $a->strings["toggle ignore status"] = "Ignorer le statut";
-$a->strings["ignored"] = "ignoré";
 $a->strings["Categories:"] = "Catégories:";
 $a->strings["Filed under:"] = "Rangé sous:";
 $a->strings["via"] = "via";
@@ -1335,7 +1432,6 @@ $a->strings["%d invitation available"] = array(
 );
 $a->strings["Find People"] = "Trouver des personnes";
 $a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
-$a->strings["Connect/Follow"] = "Connecter/Suivre";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pêche";
 $a->strings["Similar Interests"] = "Intérêts similaires";
 $a->strings["Random Profile"] = "Profil au hasard";
@@ -1345,9 +1441,15 @@ $a->strings["All Networks"] = "Tous réseaux";
 $a->strings["Saved Folders"] = "Dossiers sauvegardés";
 $a->strings["Everything"] = "Tout";
 $a->strings["Categories"] = "Catégories";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contact en commun",
+	1 => "%d contacts en commun",
+);
 $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["Photo Location"] = "Lieu de prise de la photo";
+$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "";
 $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";
@@ -1358,6 +1460,8 @@ $a->strings["Add/remove mention when a fourm page is selected/deselected in ACL
 $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"] = "Capacité de sélectionner les publications par intervalles de dates";
+$a->strings["List Forums"] = "";
+$a->strings["Enable widget to display the forums your are connected with"] = "";
 $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 publications du réseau seulement pour le groupe sélectionné";
 $a->strings["Network Filter"] = "Filtre de réseau";
@@ -1386,6 +1490,8 @@ $a->strings["Star Posts"] = "Publications spéciales";
 $a->strings["Ability to mark special posts with a star indicator"] = "Possibilité de marquer les publications spéciales d'une étoile";
 $a->strings["Mute Post Notifications"] = "";
 $a->strings["Ability to mute notifications for a thread"] = "";
+$a->strings["Advanced Profile Settings"] = "";
+$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "";
 $a->strings["Connect URL missing."] = "URL de connexion manquante.";
 $a->strings["This site is not configured to allow communications with other networks."] = "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Aucun protocole de communication ni aucun flux n'a pu être découvert.";
@@ -1402,20 +1508,18 @@ $a->strings["A deleted group with this name was revived. Existing item permissio
 $a->strings["Default privacy group for new contacts"] = "Paramètres de confidentialité par défaut pour les nouveaux contacts";
 $a->strings["Everybody"] = "Tout le monde";
 $a->strings["edit"] = "éditer";
+$a->strings["Edit groups"] = "Modifier les groupes";
 $a->strings["Edit group"] = "Editer groupe";
 $a->strings["Create a new group"] = "Créer un nouveau groupe";
 $a->strings["Contacts not in any group"] = "Contacts n'appartenant à aucun groupe";
 $a->strings["Miscellaneous"] = "Divers";
-$a->strings["YYYY-MM-DD or MM-DD"] = "";
+$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
 $a->strings["never"] = "jamais";
 $a->strings["less than a second ago"] = "il y a moins d'une seconde";
 $a->strings["year"] = "an";
 $a->strings["years"] = "ans";
-$a->strings["month"] = "mois";
 $a->strings["months"] = "mois";
-$a->strings["week"] = "semaine";
 $a->strings["weeks"] = "semaines";
-$a->strings["day"] = "jour";
 $a->strings["days"] = "jours";
 $a->strings["hour"] = "heure";
 $a->strings["hours"] = "heures";
@@ -1428,10 +1532,10 @@ $a->strings["%s's birthday"] = "Anniversaire de %s's";
 $a->strings["Happy Birthday %s"] = "Joyeux anniversaire, %s !";
 $a->strings["Requested account is not available."] = "Le compte demandé n'est pas disponible.";
 $a->strings["Edit profile"] = "Editer le profil";
+$a->strings["Atom feed"] = "Flux Atom";
 $a->strings["Message"] = "Message";
 $a->strings["Profiles"] = "Profils";
 $a->strings["Manage/edit profiles"] = "Gérer/éditer les profils";
-$a->strings["Network:"] = "Réseau";
 $a->strings["g A l F d"] = "g A | F d";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[aujourd'hui]";
@@ -1455,32 +1559,31 @@ $a->strings["Film/dance/culture/entertainment:"] = "Cinéma/Danse/Culture/Divert
 $a->strings["Love/Romance:"] = "Amour/Romance:";
 $a->strings["Work/employment:"] = "Activité professionnelle/Occupation:";
 $a->strings["School/education:"] = "Études/Formation:";
-$a->strings["Status"] = "Statut";
+$a->strings["Forums:"] = "Forums :";
-$a->strings["Status Messages and Posts"] = "Messages d'état et publications";
-$a->strings["Profile Details"] = "Détails du profil";
 $a->strings["Videos"] = "Vidéos";
 $a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça";
 $a->strings["Post to Email"] = "Publier aux courriels";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Les connecteurs sont désactivés parce que \"%s\" est activé.";
 $a->strings["Visible to everybody"] = "Visible par tout le monde";
 $a->strings["show"] = "montrer";
 $a->strings["don't show"] = "cacher";
 $a->strings["[no subject]"] = "[pas de sujet]";
 $a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["Poke"] = "Sollicitations (pokes)";
 $a->strings["View Status"] = "Voir les statuts";
-$a->strings["View Profile"] = "Voir le profil";
 $a->strings["View Photos"] = "Voir les photos";
 $a->strings["Network Posts"] = "Publications du réseau";
 $a->strings["Edit Contact"] = "Éditer le contact";
 $a->strings["Drop Contact"] = "Supprimer le contact";
 $a->strings["Send PM"] = "Message privé";
+$a->strings["Poke"] = "Sollicitations (pokes)";
 $a->strings["Welcome "] = "Bienvenue ";
 $a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
 $a->strings["Welcome back "] = "Bienvenue à nouveau, ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
-$a->strings["event"] = "évènement";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s participe à %3\$s de %2\$s";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s ne participe pas à %3\$s de %2\$s";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s participe peut-être à %3\$s de %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s a sollicité %2\$s";
 $a->strings["post/item"] = "publication/élément";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s a marqué le %3\$s de %2\$s comme favori";
@@ -1489,12 +1592,21 @@ $a->strings["Delete Selected Items"] = "Supprimer les éléments sélectionnés"
 $a->strings["Follow Thread"] = "Suivre le fil";
 $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"] = "<span  %1\$s>%2\$d personnes</span> aiment ça";
+$a->strings["%s attends."] = "%s participe";
-$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["%s doesn't attend."] = "%s ne participe pas";
+$a->strings["%s attends maybe."] = "%s participe peut-être";
 $a->strings["and"] = "et";
 $a->strings[", and %d other people"] = ", et %d autres personnes";
-$a->strings["%s like this."] = "%s aiment ça.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d personnes</span> aiment ça";
+$a->strings["%s like this."] = "%s aime ç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["%s don't like this."] = "%s n'aiment pas ça.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "";
+$a->strings["%s attend."] = "%s participent.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "";
+$a->strings["%s don't attend."] = "%s ne participent pas.";
+$a->strings["<span  %1\$s>%2\$d people</span> anttend maybe"] = "";
+$a->strings["%s anttend maybe."] = "%s participent peut-être.";
 $a->strings["Visible to <strong>everybody</strong>"] = "Visible par <strong>tout le monde</strong>";
 $a->strings["Please enter a video link/URL:"] = "Entrez un lien/URL video :";
 $a->strings["Please enter an audio link/URL:"] = "Entrez un lien/URL audio :";
@@ -1505,6 +1617,25 @@ $a->strings["permissions"] = "permissions";
 $a->strings["Post to Groups"] = "Publier aux groupes";
 $a->strings["Post to Contacts"] = "Publier aux contacts";
 $a->strings["Private post"] = "Message privé";
+$a->strings["View all"] = "Voir tout";
+$a->strings["Like"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Dislike"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Not Attending"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Undecided"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Forums"] = "Forums";
+$a->strings["External link to forum"] = "";
 $a->strings["view full size"] = "voir en pleine taille";
 $a->strings["newer"] = "Plus récent";
 $a->strings["older"] = "Plus ancien";
@@ -1519,9 +1650,9 @@ $a->strings["%d Contact"] = array(
 	0 => "%d contact",
 	1 => "%d contacts",
 );
+$a->strings["View Contacts"] = "Voir les contacts";
 $a->strings["Full Text"] = "";
 $a->strings["Tags"] = "";
-$a->strings["Forums"] = "";
 $a->strings["poke"] = "titiller";
 $a->strings["poked"] = "a titillé";
 $a->strings["ping"] = "attirer l'attention";
@@ -1554,31 +1685,10 @@ $a->strings["frustrated"] = "frustrée";
 $a->strings["motivated"] = "motivée";
 $a->strings["relaxed"] = "détendue";
 $a->strings["surprised"] = "surprise";
-$a->strings["Monday"] = "Lundi";
-$a->strings["Tuesday"] = "Mardi";
-$a->strings["Wednesday"] = "Mercredi";
-$a->strings["Thursday"] = "Jeudi";
-$a->strings["Friday"] = "Vendredi";
-$a->strings["Saturday"] = "Samedi";
-$a->strings["Sunday"] = "Dimanche";
-$a->strings["January"] = "Janvier";
-$a->strings["February"] = "Février";
-$a->strings["March"] = "Mars";
-$a->strings["April"] = "Avril";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juin";
-$a->strings["July"] = "Juillet";
-$a->strings["August"] = "Août";
-$a->strings["September"] = "Septembre";
-$a->strings["October"] = "Octobre";
-$a->strings["November"] = "Novembre";
-$a->strings["December"] = "Décembre";
 $a->strings["bytes"] = "octets";
 $a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
 $a->strings["View on separate page"] = "";
 $a->strings["view on separate page"] = "";
-$a->strings["default"] = "défaut";
-$a->strings["Select an alternate language"] = "Choisir une langue alternative";
 $a->strings["activity"] = "activité";
 $a->strings["post"] = "publication";
 $a->strings["Item filed"] = "Élément classé";
@@ -1608,7 +1718,7 @@ $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Connecteur Diaspora";
-$a->strings["Statusnet"] = "Statusnet";
+$a->strings["GNU Social"] = "";
 $a->strings["App.net"] = "App.net";
 $a->strings["Redmatrix"] = "";
 $a->strings[" on Last.fm"] = "sur Last.fm";
@@ -1679,6 +1789,7 @@ $a->strings["Nickname is already registered. Please choose another."] = "Pseudo
 $a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Ce surnom a déjà été utilisé ici, et ne peut re-servir. Merci d'en choisir un autre.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERREUR SÉRIEUSE: La génération des clés de sécurité a échoué.";
 $a->strings["An error occurred during registration. Please try again."] = "Une erreur est survenue lors de l'inscription. Merci de recommencer.";
+$a->strings["default"] = "défaut";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer.";
 $a->strings["Friends"] = "Amis";
 $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tChère/Cher %1\$s,\n\t\t\tMerci de vous être inscrit sur %2\$s. Votre compte a bien été créé.\n\t";
@@ -1700,7 +1811,6 @@ $a->strings["Hermaphrodite"] = "Hermaphrodite";
 $a->strings["Neuter"] = "Neutre";
 $a->strings["Non-specific"] = "Non-spécifique";
 $a->strings["Other"] = "Autre";
-$a->strings["Undecided"] = "Indécis";
 $a->strings["Males"] = "Hommes";
 $a->strings["Females"] = "Femmes";
 $a->strings["Gay"] = "Gay";
@@ -1747,6 +1857,7 @@ $a->strings["Ask me"] = "Me demander";
 $a->strings["Friendica Notification"] = "Notification Friendica";
 $a->strings["Thank You,"] = "Merci, ";
 $a->strings["%s Administrator"] = "L'administrateur de %s";
+$a->strings["%1\$s, %2\$s Administrator"] = "";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notification] Nouveau courriel reçu sur %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s vous a envoyé un nouveau message privé sur %2\$s.";
@@ -1845,7 +1956,21 @@ $a->strings["Your personal photos"] = "Vos photos personnelles";
 $a->strings["Local Directory"] = "Annuaire local";
 $a->strings["Set zoomfactor for Earth Layers"] = "Régler le niveau de zoom pour la géolocalisation";
 $a->strings["Show/hide boxes at right-hand column:"] = "Montrer/cacher les boîtes dans la colonne de droite :";
+$a->strings["Midnight"] = "";
+$a->strings["Zenburn"] = "";
+$a->strings["Bootstrap"] = "";
+$a->strings["Shades of Pink"] = "";
+$a->strings["Lime and Orange"] = "";
+$a->strings["GeoCities Retro"] = "";
+$a->strings["Background Image"] = "";
+$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["HEX value for the background color. Don't include the #"] = "";
+$a->strings["font size"] = "";
+$a->strings["base font size for your interface"] = "";
+$a->strings["Comma separated list of helper forums"] = "";
 $a->strings["Set style"] = "Définir le style";
+$a->strings["Quick Start"] = "";
 $a->strings["greenzero"] = "";
 $a->strings["purplezero"] = "";
 $a->strings["easterbunny"] = "";

view/global.css

@@ -313,3 +313,11 @@ ul.credits li {
         float: left;
         width: 200px;
 }
+
+.renderinfo {
+	clear: both;
+}
+
+.p-addr {
+	clear: both;	
+}

view/templates/admin_site.tpl

@@ -124,6 +124,7 @@
 	{{include file="field_input.tpl" field=$maxloadavg}}
 	{{include file="field_input.tpl" field=$maxloadavg_frontend}}
 	{{include file="field_input.tpl" field=$optimize_max_tablesize}}
+	{{include file="field_input.tpl" field=$optimize_fragmentation}}
 	{{include file="field_input.tpl" field=$abandon_days}}
 	{{include file="field_input.tpl" field=$lockpath}}
 	{{include file="field_input.tpl" field=$temppath}}

view/theme/quattro/dark/style.css

@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -544,6 +544,7 @@ header {
   margin: 0;
   padding: 0;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -921,6 +922,7 @@ aside .posted-date-selector-months {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1002,6 +1004,7 @@ aside .posted-date-selector-months {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
+
 }
 .widget h3 {
   padding: 0;
@@ -1305,6 +1308,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -2109,6 +2113,22 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* manage page */
+.identity-match-photo {
+  position: relative;
+}
+.identity-match-photo .manage-notify {
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  position: absolute;
+  right: 10px;
+  top: -5px;
+  color: #ffffff;
+}
 /* videos page */
 .videos .video-top-wrapper {
   width: 200px;
@@ -2221,6 +2241,7 @@ ul.tabs li .active {
   min-height: 22px;
   padding-top: 6px;
   /* a { display: block;}*/
+
 }
 #photo-caption {
   display: block;
@@ -2344,6 +2365,53 @@ ul.tabs li .active {
 .mail-list-wrapper .mail-delete {
   float: right;
 }
+#message-preview {
+  margin-top: 1em;
+  box-sizing: border-box;
+}
+#message-preview * {
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+  font-size: 0.8em;
+  width: 25%;
+  text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+  font-size: 0.8em;
+  width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+  font-size: 0.8em;
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+  display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
 #mail-display-subject {
   background-color: #f6f7f8;
   color: #2d2d2d;

view/theme/quattro/green/style.css

@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -544,6 +544,7 @@ header {
   margin: 0;
   padding: 0;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -921,6 +922,7 @@ aside .posted-date-selector-months {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1002,6 +1004,7 @@ aside .posted-date-selector-months {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
+
 }
 .widget h3 {
   padding: 0;
@@ -1305,6 +1308,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -2109,6 +2113,22 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* manage page */
+.identity-match-photo {
+  position: relative;
+}
+.identity-match-photo .manage-notify {
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  position: absolute;
+  right: 10px;
+  top: -5px;
+  color: #ffffff;
+}
 /* videos page */
 .videos .video-top-wrapper {
   width: 200px;
@@ -2221,6 +2241,7 @@ ul.tabs li .active {
   min-height: 22px;
   padding-top: 6px;
   /* a { display: block;}*/
+
 }
 #photo-caption {
   display: block;
@@ -2344,6 +2365,53 @@ ul.tabs li .active {
 .mail-list-wrapper .mail-delete {
   float: right;
 }
+#message-preview {
+  margin-top: 1em;
+  box-sizing: border-box;
+}
+#message-preview * {
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+  font-size: 0.8em;
+  width: 25%;
+  text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+  font-size: 0.8em;
+  width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+  font-size: 0.8em;
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+  display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
 #mail-display-subject {
   background-color: #f6f7f8;
   color: #2d2d2d;

view/theme/quattro/lilac/style.css

@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #F6ECF9;
+  background-color: #f6ecf9;
   color: #2d2d2d;
   margin: 50px 0 0 0;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -544,6 +544,7 @@ header {
   margin: 0;
   padding: 0;
   /*width: 100%; height: 12px; */
+
   z-index: 110;
   color: #ffffff;
 }
@@ -921,6 +922,7 @@ aside .posted-date-selector-months {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1002,6 +1004,7 @@ aside .posted-date-selector-months {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
+
 }
 .widget h3 {
   padding: 0;
@@ -1305,6 +1308,7 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1749,7 +1753,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1776,7 +1780,7 @@ span[id^="showmore-wrap"] {
   margin: 0;
   height: 20px;
   width: 200px;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;
@@ -2109,6 +2113,22 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* manage page */
+.identity-match-photo {
+  position: relative;
+}
+.identity-match-photo .manage-notify {
+  background-color: #19AEFF;
+  border-radius: 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  min-width: 15px;
+  text-align: right;
+  position: absolute;
+  right: 10px;
+  top: -5px;
+  color: #ffffff;
+}
 /* videos page */
 .videos .video-top-wrapper {
   width: 200px;
@@ -2221,6 +2241,7 @@ ul.tabs li .active {
   min-height: 22px;
   padding-top: 6px;
   /* a { display: block;}*/
+
 }
 #photo-caption {
   display: block;
@@ -2344,6 +2365,53 @@ ul.tabs li .active {
 .mail-list-wrapper .mail-delete {
   float: right;
 }
+#message-preview {
+  margin-top: 1em;
+  box-sizing: border-box;
+}
+#message-preview * {
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+  font-size: 0.8em;
+  width: 25%;
+  text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+  font-size: 0.8em;
+  width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+  font-size: 0.8em;
+  width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+  display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
 #mail-display-subject {
   background-color: #f6f7f8;
   color: #2d2d2d;

view/theme/quattro/quattro.less

@@ -1404,6 +1404,24 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
+/* manage page */
+.identity-match-photo {
+	position: relative;
+	.manage-notify {
+		background-color: #19AEFF;
+		border-radius: 5px;
+		font-size: 10px;
+		padding: 1px 3px;
+		min-width: 15px;
+		text-align: right;
+		position: absolute;
+		right: 10px;
+		top: -5px;
+		color: rgb(255, 255, 255);
+	}
+}
+
+
 /* videos page */
 .videos {
 	.video-top-wrapper {
@@ -1599,6 +1617,25 @@ ul.tabs {
 	.mail-delete { float: right; }
 }
 
+#message-preview {
+	margin-top: 1em;
+	box-sizing: border-box;
+	* {  box-sizing: border-box; 	white-space: nowrap;}
+	.mail-list-wrapper {
+		.mail-subject {
+			width: 100%;
+		}
+		.mail-date  { font-size: 0.8em; width: 25%; text-align: right}
+		.mail-from  { font-size: 0.8em; width: 75%;}
+		.mail-count { font-size: 0.8em; width: 100%;}
+		.mail-delete { display: none;}
+
+		& .mail-date, & .mail-from, & .mail-count { .opaque(0.5); }
+		&:hover .mail-date, &:hover .mail-from, &:hover .mail-count { .opaque(1); }
+	}
+}
+
+
 #mail-display-subject {
 	background-color: @MailDisplaySubjectBackgroundColor;
 	color: @MailDisplaySubjectColor;
@@ -1816,4 +1853,3 @@ footer { height: 100px; display: table-row; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
 
 .fbrowser .upload { clear: both; padding-top: 1em;}
-

view/theme/quattro/templates/message_side.tpl

@@ -1,10 +1,10 @@
 <div id="message-sidebar" class="widget">
 	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}" accesskey="m">{{$new.label}}</a> </div>
-	
+
-	<ul role="menu" class="message-ul">
+ {{if $tabs}}
-		{{foreach $tabs as $t}}
+	<div id="message-preview">
-			<li role="menuitem" class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" {{if $t.accesskey}}accesskey="$t.accesskey"{{/if}} class="message-link">{{$t.label}}</a></li>
+		{{$tabs}}
-		{{/foreach}}
+	</div>
-	</ul>
+  {{/if}}
-	
+
 </div>

view/theme/vier/style.css

@@ -958,7 +958,7 @@ right_aside {
   font-size: 13px;
   overflow-y: auto;
   z-index: 2;
-  line-height: 17px;
+  /* line-height: 17px; */
   color: #737373;
   box-shadow: 1px 2px 0px 0px #D8D8D8;
   top: 32px;
@@ -983,7 +983,7 @@ aside {
   top: 32px;
   overflow-y: auto;
   z-index: 2;
-  line-height: 17px;
+  /* line-height: 17px; */
   position: fixed;
   /* overflow: auto; */
   height: 100%;

view/theme/vier/templates/widget_forumlist_right.tpl

@@ -30,7 +30,7 @@ function showHideForumlist() {
 	
 		{{if $forum.id > $visible_forums}}
 		<li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
-			<span class="notify padge pull-right"></span>
+			<span class="notify badge pull-right"></span>
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
@@ -40,8 +40,7 @@ function showHideForumlist() {
 		{{/foreach}}
 
 		{{if $total > $visible_forums }}
-		<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link tool fakelink">{{$showmore}}</li>
+		<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link fakelink tool">{{$showmore}}</li>
 		{{/if}}
 	</ul>
-
 </div>

view/theme/vier/theme.php

@@ -364,10 +364,10 @@ function vier_community_info() {
 			$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
 
 		if (plugin_enabled("wppost"))
-			$r[] = array("photo" => "images/wordpress", "name" => "Wordpress");
+			$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
 
 		if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))
-			$r[] = array("photo" => "images/mail", "name" => "E-Mail");
+			$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
 
 		$tpl = get_markup_template('ch_connectors.tpl');