Merge tag 'ui-improvements' into develop

setting page section fold/unfold
2024-12-24 18:00:15 +00:00 · 2014-09-06 17:02:47 +02:00 · 2014-09-06 17:02:47 +02:00 · e02b77c845
commit e02b77c845
parent 7dcf37f053 5205756898
39 changed files with 79719 additions and 80346 deletions
--- a/include/uimport.php
+++ b/include/uimport.php
@ -28,7 +28,7 @@ function last_error() {

 /**
 * Remove columns from array $arr that aren't in table $table
- * 
+ *
 * @param string $table Table name
 * @param array &$arr Column=>Value array from json (by ref)
 */
@ -51,7 +51,7 @@ function check_cols($table, &$arr) {

 /**
 * Import data into table $table
- * 
+ *
 * @param string $table Table name
 * @param array $arr Column=>Value array from json
 */
@ -162,7 +162,7 @@ function import_account(&$a, $file) {
 		foreach ($profile as $k => &$v) {
 			$v = str_replace($oldbaseurl, $newbaseurl, $v);
 			foreach (array("profile", "avatar") as $k)
-				$v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+				$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
 		}
 		$profile['uid'] = $newuid;
 		$r = db_import_assoc('profile', $profile);
@ -180,14 +180,14 @@ function import_account(&$a, $file) {
 			foreach ($contact as $k => &$v) {
 				$v = str_replace($oldbaseurl, $newbaseurl, $v);
 				foreach (array("profile", "avatar", "micro") as $k)
-					$v = str_replace($newbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+					$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
 			}
 		}
 		if ($contact['uid'] == $olduid && $contact['self'] == '0') {
 			// set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls
 			$contact["avatar-date"] = "0000-00-00 00:00:00" ;
-		
-		
+
+
 			switch ($contact['network']) {
 				case NETWORK_DFRN:
 					//  send relocate message (below)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@ -106,7 +106,7 @@ function editpost_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
-		'$share' => t('Edit'),
+		'$share' => t('Save'),
 		'$upload' => t('Upload photo'),
 		'$shortupload' => t('upload photo'),
 		'$attach' => t('Attach file'),
--- a/mod/photo.php
+++ b/mod/photo.php
@ -120,16 +120,16 @@ function photo_init(&$a) {
 			$public = ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');

 			if(count($r)) {
-                $resolution = $r[0]['scale'];
+				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
-			}
-			else {
-                // The picure exists. We already checked with the first query.
-                // obviously, this is not an authorized viev!
-                $data = file_get_contents('images/nosign.jpg');
-                $mimetype = 'image/jpeg';
-                $prvcachecontrol = true;
+			} else {
+				// The picure exists. We already checked with the first query.
+				// obviously, this is not an authorized viev!
+				$data = file_get_contents('images/nosign.jpg');
+				$mimetype = 'image/jpeg';
+				$prvcachecontrol = true;
+				$public = false;
 			}
 		}
 	}
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@ -77,13 +77,45 @@ function wall_upload_post(&$a) {
 		$filetype = $_FILES['userfile']['type'];
 	}
 	elseif(x($_FILES,'media')) {
-		$src = $_FILES['media']['tmp_name'];
-		$filename = basename($_FILES['media']['name']);
-		$filesize = intval($_FILES['media']['size']);
-		$filetype = $_FILES['media']['type'];
+		if (is_array($_FILES['media']['tmp_name']))
+			$src = $_FILES['media']['tmp_name'][0];
+		else
+			$src = $_FILES['media']['tmp_name'];
+
+		if (is_array($_FILES['media']['name']))
+			$filename = basename($_FILES['media']['name'][0]);
+		else
+			$filename = basename($_FILES['media']['name']);
+
+		if (is_array($_FILES['media']['size']))
+			$filesize = intval($_FILES['media']['size'][0]);
+		else
+			$filesize = intval($_FILES['media']['size']);
+
+		if (is_array($_FILES['media']['type']))
+			$filetype = $_FILES['media']['type'][0];
+		else
+			$filetype = $_FILES['media']['type'];
 	}
-	
-    if ($filetype=="") $filetype=guess_image_type($filename);
+
+	// This is a special treatment for picture upload from Twidere
+	if (($filename == "octet-stream") AND ($filetype != "")) {
+		$filename = $filetype;
+		$filetype = "";
+	}
+
+	if ($filetype=="")
+		$filetype=guess_image_type($filename);
+
+	// If there is a temp name, then do a manual check
+	// This is more reliable than the provided value
+	$imagedata = getimagesize($src);
+	if ($imagedata)
+		$filetype = $imagedata['mime'];
+
+	logger("File upload src: ".$src." - filename: ".$filename.
+		" - size: ".$filesize." - type: ".$filetype, LOGGER_DEBUG);
+
 	$maximagesize = get_config('system','maximagesize');

 	if(($maximagesize) && ($filesize > $maximagesize)) {
@ -120,14 +152,16 @@ function wall_upload_post(&$a) {
 	$max_length = get_config('system','max_image_length');
 	if(! $max_length)
 		$max_length = MAX_IMAGE_LENGTH;
-	if($max_length > 0)
+	if($max_length > 0) {
 		$ph->scaleImage($max_length);
+		logger("File upload: Scaling picture to new size ".$max_length, LOGGER_DEBUG);
+	}

 	$width = $ph->getWidth();
 	$height = $ph->getHeight();

 	$hash = photo_new_resource();
-	
+
 	$smallest = 0;

 	$defperm = '<' . $default_cid . '>';
@ -142,14 +176,14 @@ function wall_upload_post(&$a) {
 	if($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
 		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
-		if($r) 
+		if($r)
 			$smallest = 1;
 	}

 	if($width > 320 || $height > 320) {
 		$ph->scaleImage(320);
 		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
-		if($r)
+		if($r AND ($smallest == 0))
 			$smallest = 2;
 	}

@ -168,7 +202,7 @@ function wall_upload_post(&$a) {
 		}
 	}
 	else {
-		$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
+		$m = '[url='.$a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.$a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
 		return($m);
 	}
 /* mod Waitman Gobble NO WARRANTY */
--- a/view/bg/messages.po
+++ b/view/bg/messages.po
--- a/view/bg/strings.php
+++ b/view/bg/strings.php
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
--- a/view/es/messages.po
+++ b/view/es/messages.po
--- a/view/es/strings.php
+++ b/view/es/strings.php
@ -112,6 +112,8 @@ $a->strings["Posts font size"] = "";
 $a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "Configurar esquema de color";
 $a->strings["default"] = "predeterminado";
+$a->strings["dark"] = "";
+$a->strings["black"] = "";
 $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"] = "";
@ -120,6 +122,7 @@ $a->strings["font size"] = "";
 $a->strings["base font size for your interface"] = "";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Configurar el tamaño de las imágenes en las publicaciones";
 $a->strings["Set theme width"] = "Establecer el ancho para el tema";
+$a->strings["Set style"] = "";
 $a->strings["Delete this item?"] = "¿Eliminar este elemento?";
 $a->strings["show fewer"] = "ver menos";
 $a->strings["Update %s failed. See error logs."] = "Falló la actualización de %s. Mira los registros de errores.";
@ -388,7 +391,6 @@ $a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
 $a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
 $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."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
-$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
 $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
 $a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada.";
@ -418,6 +420,7 @@ $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] =
 $a->strings["Site settings updated."] = "Configuración de actualización.";
 $a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
 $a->strings["Never"] = "Nunca";
+$a->strings["At post arrival"] = "";
 $a->strings["Frequently"] = "Frequentemente";
 $a->strings["Hourly"] = "Cada hora";
 $a->strings["Twice daily"] = "Dos veces al día";
@ -498,7 +501,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "Usar expresiones regulares de
 $a->strings["Show Community Page"] = "Ver página de la Comunidad";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Mostrar una página de Comunidad que resuma todas las publicaciones públicas recientes de este sitio.";
 $a->strings["Enable OStatus support"] = "Permitir soporte OStatus";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provee una compatibilidad con OStatus (identi.ca, status.net, etc.) Todas las comunicaciones mediante OStatus son públicas, por lo que se mostrarán avisos sobre la privacidad con frecuencia.";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
 $a->strings["OStatus conversation completion interval"] = "";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "";
 $a->strings["Enable Diaspora support"] = "Habilitar el soporte para Diaspora*";
@ -523,11 +526,15 @@ $a->strings["Suppress Language"] = "";
 $a->strings["Suppress language information in meta information about a posting."] = "";
 $a->strings["Path to item cache"] = "Ruta a la caché del objeto";
 $a->strings["Cache duration in seconds"] = "Duración de la caché en segundos";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "¿Cuánto tiempo debería guardar la caché? Por defecto son 86400 segundos (un día).";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "Ruta al archivo protegido";
 $a->strings["Temp path"] = "Ruta a los temporales";
 $a->strings["Base path to installation"] = "Ruta base para la instalación";
 $a->strings["New base url"] = "";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "La actualización se ha completado con éxito";
 $a->strings["Executing %s failed. Check system logs."] = "%s ha fallado, comprueba los registros.";
 $a->strings["Update %s was successfully applied."] = "Actualización %s aplicada con éxito.";
@ -769,6 +776,9 @@ $a->strings["Currently ignored"] = "Ignorados";
 $a->strings["Currently archived"] = "Archivados";
 $a->strings["Hide this contact from others"] = "Ocultar este contacto a los demás.";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles.";
+$a->strings["Notification for new posts"] = "";
+$a->strings["Send a notification of every new post of this contact"] = "";
+$a->strings["Fetch further information for feeds"] = "";
 $a->strings["Suggestions"] = "Sugerencias";
 $a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
 $a->strings["All Contacts"] = "Todos los contactos";
@ -790,11 +800,10 @@ $a->strings["Edit contact"] = "Modificar contacto";
 $a->strings["Search your contacts"] = "Buscar en tus contactos";
 $a->strings["Update"] = "Actualizar";
 $a->strings["everybody"] = "todos";
-$a->strings["Account settings"] = "Configuración de tu cuenta";
 $a->strings["Additional features"] = "Características adicionales";
-$a->strings["Display settings"] = "Configuración Tema/Visualización";
-$a->strings["Connector settings"] = "Configuración del conector";
-$a->strings["Plugin settings"] = "Configuración de los módulos";
+$a->strings["Display"] = "";
+$a->strings["Social Networks"] = "";
+$a->strings["Delegations"] = "";
 $a->strings["Connected apps"] = "Aplicaciones conectadas";
 $a->strings["Export personal data"] = "Exportación de datos personales";
 $a->strings["Remove account"] = "Eliminar cuenta";
@ -836,7 +845,6 @@ $a->strings["enabled"] = "habilitado";
 $a->strings["disabled"] = "deshabilitado";
 $a->strings["StatusNet"] = "StatusNet";
 $a->strings["Email access is disabled on this site."] = "El acceso por correo está deshabilitado en esta web.";
-$a->strings["Connector Settings"] = "Configuración del conector";
 $a->strings["Email/Mailbox Setup"] = "Configuración del correo/buzón";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón.";
 $a->strings["Last successful email check:"] = "Última comprobación del correo con éxito:";
@ -861,7 +869,11 @@ $a->strings["Number of items to display per page:"] = "Número de elementos a mo
 $a->strings["Maximum of 100 items"] = "Máximo 100 elementos";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "";
 $a->strings["Don't show emoticons"] = "No mostrar emoticones";
+$a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "";
+$a->strings["Automatic updates only at the top of the network page"] = "";
+$a->strings["User Types"] = "";
+$a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "Página de cuenta normal";
 $a->strings["This account is a normal personal profile"] = "Esta cuenta es el perfil personal normal";
 $a->strings["Soapbox Page"] = "Página de tribuna";
@ -962,6 +974,7 @@ $a->strings["public profile"] = "perfil público";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió su %2\$s a &ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s tiene una actualización %2\$s, cambiando %3\$s.";
+$a->strings["Hide contacts and friends:"] = "";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar tu lista de contactos/amigos en este perfil?";
 $a->strings["Edit Profile Details"] = "Editar detalles de tu perfil";
 $a->strings["Change Profile Photo"] = "Cambiar imagen del Perfil";
@ -1120,6 +1133,8 @@ $a->strings["Public photo"] = "Foto pública";
 $a->strings["Share"] = "Compartir";
 $a->strings["View Album"] = "Ver Álbum";
 $a->strings["Recent Photos"] = "Fotos recientes";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "";
+$a->strings["Or - did you try to upload an empty file?"] = "";
 $a->strings["File exceeds size limit of %d"] = "El tamaño del archivo excede el límite de %d";
 $a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
 $a->strings["No videos selected"] = "";
@ -1300,9 +1315,11 @@ $a->strings["This action exceeds the limits set by your subscription plan."] = "
 $a->strings["This action is not available under your subscription plan."] = "Esta acción no está permitida para tu subscripción.";
 $a->strings["User not found."] = "";
 $a->strings["There is no status with this id."] = "";
+$a->strings["There is no conversation with this id."] = "";
 $a->strings["view full size"] = "Ver a tamaño completo";
 $a->strings["Starts:"] = "Inicio:";
 $a->strings["Finishes:"] = "Final:";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'";
 $a->strings["(no subject)"] = "(sin asunto)";
 $a->strings["noreply"] = "no responder";
 $a->strings["An invitation is required."] = "Se necesita invitación.";
@ -1353,6 +1370,7 @@ $a->strings["Tag term:"] = "Etiquetar:";
 $a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
 $a->strings["Delete item(s)?"] = "";
 $a->strings["Post to Email"] = "Publicar mediante correo electrónico";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "permisos";
 $a->strings["Post to Groups"] = "";
 $a->strings["Post to Contacts"] = "";
@ -1457,6 +1475,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s publicó en [
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificación] %s te ha nombrado";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s te ha nombrado en %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]te nombró[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "";
+$a->strings["%1\$s shared a new post at %2\$s"] = "";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s te dio un toque";
 $a->strings["%1\$s poked you at %2\$s"] = "%1\$s te dio un toque en %2\$s";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]te dio un toque[/url].";
@ -1496,6 +1517,8 @@ $a->strings["Unable to retrieve contact information."] = "No ha sido posible rec
 $a->strings["following"] = "siguiendo";
 $a->strings["[no subject]"] = "[sin asunto]";
 $a->strings["End this session"] = "Cerrar la sesión";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "Date de alta";
 $a->strings["Home Page"] = "Página de inicio";
 $a->strings["Create an account"] = "Crea una cuenta";
@ -1506,6 +1529,8 @@ $a->strings["Search site content"] = " Busca contenido en la página";
 $a->strings["Conversations on this site"] = "Conversaciones en este sitio";
 $a->strings["Directory"] = "Directorio";
 $a->strings["People directory"] = "Directorio de usuarios";
+$a->strings["Information"] = "";
+$a->strings["Information about this friendica instance"] = "";
 $a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
 $a->strings["Network Reset"] = "";
 $a->strings["Load Network page with no filters"] = "";
@ -1517,7 +1542,7 @@ $a->strings["Inbox"] = "Entrada";
 $a->strings["Outbox"] = "Enviados";
 $a->strings["Manage"] = "Administrar";
 $a->strings["Manage other pages"] = "Administrar otras páginas";
-$a->strings["Delegations"] = "";
+$a->strings["Account settings"] = "Configuración de tu cuenta";
 $a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
 $a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
@ -1540,7 +1565,8 @@ $a->strings["Love/Romance:"] = "Amor/Romance:";
 $a->strings["Work/employment:"] = "Trabajo/ocupación:";
 $a->strings["School/education:"] = "Escuela/estudios:";
 $a->strings["Image/photo"] = "Imagen/Foto";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
 $a->strings["$1 wrote:"] = "$1 escribió:";
 $a->strings["Encrypted content"] = "Contenido cifrado";
 $a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado";
@ -1560,6 +1586,9 @@ $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "";
 $a->strings["pump.io"] = "";
 $a->strings["Twitter"] = "";
+$a->strings["Diaspora Connector"] = "";
+$a->strings["Statusnet"] = "";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "Varios";
 $a->strings["year"] = "año";
 $a->strings["month"] = "mes";
@ -1588,6 +1617,8 @@ $a->strings["Richtext Editor"] = "";
 $a->strings["Enable richtext editor"] = "";
 $a->strings["Post Preview"] = "";
 $a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Auto-mention Forums"] = "";
+$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "";
 $a->strings["Network Sidebar Widgets"] = "";
 $a->strings["Search by Date"] = "";
 $a->strings["Ability to select posts by date ranges"] = "";
@ -1619,6 +1650,8 @@ $a->strings["Star Posts"] = "";
 $a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
 $a->strings["Attachments:"] = "Archivos adjuntos:";
+$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "Visible para cualquiera";
 $a->strings["A new person is sharing with you at "] = "Una nueva persona está compartiendo contigo en ";
 $a->strings["You have a new follower at "] = "Tienes un nuevo seguidor en ";
@ -1689,4 +1722,3 @@ $a->strings["Don't care"] = "No te importa";
 $a->strings["Ask me"] = "Pregúntame";
 $a->strings["stopped following"] = "dejó de seguir";
 $a->strings["Drop Contact"] = "";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'";
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@ -5,7 +5,7 @@ function string_plural_select_fr($n){
 	return ($n > 1);;
 }}
 ;
-$a->strings["This entry was edited"] = "";
+$a->strings["This entry was edited"] = "Cette entrée à été édité";
 $a->strings["Private Message"] = "Message privé";
 $a->strings["Edit"] = "Éditer";
 $a->strings["Select"] = "Sélectionner";
@ -15,7 +15,7 @@ $a->strings["add star"] = "mett en avant";
 $a->strings["remove star"] = "ne plus mettre en avant";
 $a->strings["toggle star status"] = "mettre en avant";
 $a->strings["starred"] = "mis en avant";
-$a->strings["add tag"] = "ajouter un tag";
+$a->strings["add tag"] = "ajouter une étiquette";
 $a->strings["I like this (toggle)"] = "J'aime (bascule)";
 $a->strings["like"] = "aime";
 $a->strings["I don't like this (toggle)"] = "Je n'aime pas (bascule)";
@ -52,14 +52,14 @@ $a->strings["Image"] = "Image";
 $a->strings["Link"] = "Lien";
 $a->strings["Video"] = "Vidéo";
 $a->strings["Preview"] = "Aperçu";
-$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les addons.";
+$a->strings["You must be logged in to use addons. "] = "Vous devez être connecté pour utiliser les greffons.";
 $a->strings["Not Found"] = "Non trouvé";
 $a->strings["Page not found."] = "Page introuvable.";
 $a->strings["Permission denied"] = "Permission refusée";
 $a->strings["Permission denied."] = "Permission refusée.";
 $a->strings["toggle mobile"] = "activ. mobile";
 $a->strings["Home"] = "Profil";
-$a->strings["Your posts and conversations"] = "Vos notices et conversations";
+$a->strings["Your posts and conversations"] = "Vos publications et conversations";
 $a->strings["Profile"] = "Profil";
 $a->strings["Your profile page"] = "Votre page de profil";
 $a->strings["Photos"] = "Photos";
@ -108,16 +108,18 @@ $a->strings["Alignment"] = "Alignement";
 $a->strings["Left"] = "Gauche";
 $a->strings["Center"] = "Centre";
 $a->strings["Color scheme"] = "Palette de couleurs";
-$a->strings["Posts font size"] = "Taille de texte des messages";
+$a->strings["Posts font size"] = "Taille de texte des publications";
 $a->strings["Textareas font size"] = "Taille de police des zones de texte";
 $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
 $a->strings["default"] = "défaut";
+$a->strings["dark"] = "sombre";
+$a->strings["black"] = "noir";
 $a->strings["Background Image"] = "Image de fond";
-$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "";
+$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "L'URL vers une image (de votre album de photo, p. ex.) qui devra être utilisée comme image de fond.";
 $a->strings["Background Color"] = "Couleur de fond";
-$a->strings["HEX value for the background color. Don't include the #"] = "";
-$a->strings["font size"] = "Taille de police";
-$a->strings["base font size for your interface"] = "";
+$a->strings["HEX value for the background color. Don't include the #"] = "Valeur hexadécimale de la couleur de fond (sans le #).";
+$a->strings["font size"] = "taille de la police";
+$a->strings["base font size for your interface"] = "taille de base de la police pour votre interface";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Choisir une taille pour les images dans les publications et commentaires (largeur et hauteur)";
 $a->strings["Set theme width"] = "Largeur du thème";
 $a->strings["Set style"] = "Définir le style";
@ -184,8 +186,8 @@ $a->strings["running at web location"] = "hébergé sur";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Merci de vous rendre sur <a href=\"http://friendica.com\">Friendica.com</a> si vous souhaitez en savoir plus sur le projet Friendica.";
 $a->strings["Bug reports and issues: please visit"] = "Pour les rapports de bugs: rendez vous sur";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggestions, remerciements, donations, etc. - écrivez à \"Info\" arob. Friendica - point com";
-$a->strings["Installed plugins/addons/apps:"] = "Extensions/applications installées:";
-$a->strings["No installed plugins/addons/apps"] = "Aucune extension/greffon/application installée";
+$a->strings["Installed plugins/addons/apps:"] = "Extensions/greffons/applications installées:";
+$a->strings["No installed plugins/addons/apps"] = "Extensions/greffons/applications non installées:";
 $a->strings["%1\$s welcomes %2\$s"] = "%1\$s accueille %2\$s";
 $a->strings["Registration details for %s"] = "Détails d'inscription pour %s";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Inscription réussie. Vérifiez vos emails pour la suite des instructions.";
@ -233,7 +235,7 @@ $a->strings["%1\$s has joined %2\$s"] = "%1\$s a rejoint %2\$s";
 $a->strings["Authorize application connection"] = "Autoriser l'application à se connecter";
 $a->strings["Return to your app and insert this Securty Code:"] = "Retournez à votre application et saisissez ce Code de Sécurité : ";
 $a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos billets et contacts, et/ou à créer des billets à votre place?";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à créer des billets à votre place?";
 $a->strings["No valid account found."] = "Impossible de trouver un compte valide.";
 $a->strings["Password reset request issued. Check your email."] = "Réinitialisation du mot de passe en cours. Vérifiez votre courriel.";
 $a->strings["Password reset requested at %s"] = "Requête de réinitialisation de mot de passe à %s";
@ -294,7 +296,7 @@ $a->strings["Groups"] = "Groupes";
 $a->strings["Group Your Contacts"] = "Grouper vos contacts";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Une fois que vous avez trouvé quelques amis, organisez-les en groupes de conversation privés depuis le panneau latéral de la page Contacts. Vous pourrez ensuite interagir avec chaque groupe de manière privée depuis la page Réseau.";
 $a->strings["Why Aren't My Posts Public?"] = "Pourquoi mes éléments ne sont pas publics?";
-$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respecte votre vie privée. Par défaut, tous vos éléments seront seulement montrés à vos amis. Pour plus d'information, consultez la section \"aide\" du lien ci-dessus.";
+$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respecte votre vie privée. Par défaut, toutes vos publications seront seulement montrés à vos amis. Pour plus d'information, consultez la section \"aide\" du lien ci-dessus.";
 $a->strings["Getting Help"] = "Obtenir de l'aide";
 $a->strings["Go to the Help Section"] = "Aller à la section Aide";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Nos pages d'<strong>aide</strong> peuvent être consultées pour davantage de détails sur les fonctionnalités ou les ressources.";
@ -308,7 +310,7 @@ $a->strings["Saved Searches"] = "Recherches";
 $a->strings["add"] = "ajouter";
 $a->strings["Commented Order"] = "Tri par commentaires";
 $a->strings["Sort by Comment Date"] = "Trier par date de commentaire";
-$a->strings["Posted Order"] = "Tri par publications";
+$a->strings["Posted Order"] = "Tri des publications";
 $a->strings["Sort by Post Date"] = "Trier par date de publication";
 $a->strings["Personal"] = "Personnel";
 $a->strings["Posts that mention or involve you"] = "Publications qui vous concernent";
@ -329,7 +331,7 @@ $a->strings["Group: "] = "Groupe: ";
 $a->strings["Contact: "] = "Contact: ";
 $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["Friendica Communications Server - Setup"] = "";
+$a->strings["Friendica Communications Server - Setup"] = "Serveur de communications Friendica - Configuration";
 $a->strings["Could not connect to database."] = "Impossible de se connecter à la base.";
 $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.";
@ -389,7 +391,6 @@ $a->strings["view/smarty3 is writable"] = "view/smarty3 est autorisé à l écri
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La réécriture d'URL dans le fichier .htaccess ne fonctionne pas. Vérifiez la configuration de votre serveur.";
 $a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne.";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Le fichier de configuration de la base (\".htconfig.php\") ne peut être créé. Merci d'utiliser le texte ci-joint pour créer ce fichier à la racine de votre hébergement.";
-$a->strings["Errors encountered creating database tables."] = "Des erreurs ont été signalées lors de la création des tables.";
 $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'.";
 $a->strings["Theme settings updated."] = "Réglages du thème sauvés.";
@ -415,7 +416,7 @@ $a->strings["Registered users"] = "Utilisateurs inscrits";
 $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>"] = "";
+$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["Site settings updated."] = "Réglages du site mis-à-jour.";
 $a->strings["No special theme for mobile devices"] = "Pas de thème particulier pour les terminaux mobiles";
 $a->strings["Never"] = "Jamais";
@ -436,11 +437,11 @@ $a->strings["File upload"] = "Téléversement de fichier";
 $a->strings["Policies"] = "Politiques";
 $a->strings["Advanced"] = "Avancé";
 $a->strings["Performance"] = "Performance";
-$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "";
+$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["Banner/Logo"] = "Bannière/Logo";
 $a->strings["Additional Info"] = "Informations supplémentaires";
-$a->strings["For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo."] = "";
+$a->strings["For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo."] = "Pour les serveurs publics vous pouvez ajouter ici des informations supplémentaires qui seront listées sur dir.friendica.com/siteinfo.";
 $a->strings["System language"] = "Langue du système";
 $a->strings["System theme"] = "Thème du système";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Thème par défaut sur ce site - peut être changé au niveau du profile utilisateur - <a href='#' id='cnftheme'>changer les réglages du thème</a>";
@ -448,8 +449,8 @@ $a->strings["Mobile system theme"] = "Thème mobile";
 $a->strings["Theme for mobile devices"] = "Thème pour les terminaux mobiles";
 $a->strings["SSL link policy"] = "Politique SSL pour les liens";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Détermine si les liens générés doivent forcer l'utilisation de SSL";
-$a->strings["Old style 'Share'"] = "";
-$a->strings["Deactivates the bbcode element 'share' for repeating items."] = "";
+$a->strings["Old style 'Share'"] = "Anciens style 'Partage'";
+$a->strings["Deactivates the bbcode element 'share' for repeating items."] = "Désactive l'élément 'partage' de bbcode pour répéter les articles.";
 $a->strings["Hide help entry from navigation menu"] = "Cacher l'aide du menu de navigation";
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Cacher du menu de navigation le l'entrée des vers les pages d'aide. Vous pouvez toujours y accéder en tapant directement /help.";
 $a->strings["Single user instance"] = "Instance mono-utilisateur";
@ -482,13 +483,13 @@ $a->strings["Allow infinite level threading for items on this site."] = "Permett
 $a->strings["Private posts by default for new users"] = "Publications privées par défaut pour les nouveaux utilisateurs";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Rendre les publications de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde.";
 $a->strings["Don't include post content in email notifications"] = "Ne pas inclure le contenu posté dans l'e-mail de notification";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Ne pas inclure le contenu d'un billet/commentaire/message privé/etc dans l'e-mail de notification qui est envoyé à partir du site, par mesure de confidentialité.";
-$a->strings["Disallow public access to addons listed in the apps menu."] = "Interdire l'acces public pour les extentions listées dans le menu apps.";
-$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "";
-$a->strings["Don't embed private images in posts"] = "";
-$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Ne pas inclure le contenu de publication/commentaire/message privé/etc dans l'e-mail de notification qui est envoyé à partir du site, par mesure de confidentialité.";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Interdire l’accès public pour les greffons listées dans le menu apps.";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Cocher cette case restreint la liste des greffons dans le menu des applications seulement aux membres.";
+$a->strings["Don't embed private images in posts"] = "Ne pas miniaturiser les images privées dans les publications";
+$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Ne remplacez pas les images privées hébergées localement dans les publications avec une image attaché en copie, car cela signifie que le contact qui reçoit les publications contenant ces photos privées devra s’authentifier pour charger chaque image, ce qui peut prendre du temps.";
 $a->strings["Allow Users to set remote_self"] = "Autoriser les utilisateurs à définir remote_self";
-$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "";
+$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Cocher cette case, permet à chaque utilisateur de marquer chaque contact comme un remote_self dans la boîte de dialogue de réparation des contacts. Activer cette fonction à un contact engendre la réplique de toutes les publications d'un contact dans le flux d'activités des utilisateurs.";
 $a->strings["Block multiple registrations"] = "Interdire les inscriptions multiples";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Ne pas permettre l'inscription de comptes multiples comme des pages.";
 $a->strings["OpenID support"] = "Support OpenID";
@ -522,14 +523,18 @@ $a->strings["Maximum system load before delivery and poll processes are deferred
 $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."] = "";
+$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["Path to item cache"] = "Chemin vers le cache des objets.";
 $a->strings["Cache duration in seconds"] = "Durée du cache en secondes";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Combien de temps faut-il garder les fichiers du cache? La valeur par défaut est de 86400 secondes (un jour).";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "Nombre maximum de commentaires par publication";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "Combien de commentaires doivent être affichés pour chaque publication? Valeur par défaut: 100.";
 $a->strings["Path for lock file"] = "Chemin vers le ficher de verrouillage";
 $a->strings["Temp path"] = "Chemin des fichiers temporaires";
 $a->strings["Base path to installation"] = "Chemin de base de l'installation";
-$a->strings["New base url"] = "";
+$a->strings["New base url"] = "Nouvelle URL de base";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "Mise-à-jour validée comme 'réussie'";
 $a->strings["Executing %s failed. Check system logs."] = "L'éxecution de %s a échoué. Vérifiez les journaux du système.";
 $a->strings["Update %s was successfully applied."] = "Mise-à-jour %s appliquée avec succès.";
@ -555,7 +560,7 @@ $a->strings["User '%s' blocked"] = "Utilisateur '%s' bloqué";
 $a->strings["Add User"] = "Ajouter l'utilisateur";
 $a->strings["select all"] = "tout sélectionner";
 $a->strings["User registrations waiting for confirm"] = "Inscriptions d'utilisateurs en attente de confirmation";
-$a->strings["User waiting for permanent deletion"] = "";
+$a->strings["User waiting for permanent deletion"] = "Utilisateur en attente de suppression définitive";
 $a->strings["Request date"] = "Date de la demande";
 $a->strings["Name"] = "Nom";
 $a->strings["Email"] = "Courriel";
@ -570,9 +575,9 @@ $a->strings["New User"] = "Nouvel utilisateur";
 $a->strings["Register date"] = "Date d'inscription";
 $a->strings["Last login"] = "Dernière connexion";
 $a->strings["Last item"] = "Dernier élément";
-$a->strings["Deleted since"] = "";
+$a->strings["Deleted since"] = "Supprimé depuis";
 $a->strings["Account"] = "Compte";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement effacé!\\n\\nÊtes-vous certain?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
 $a->strings["Name of the new user."] = "Nom du nouvel utilisateur.";
 $a->strings["Nickname"] = "Pseudo";
@ -605,9 +610,9 @@ $a->strings["Search"] = "Recherche";
 $a->strings["No results."] = "Aucun résultat.";
 $a->strings["Tips for New Members"] = "Conseils aux nouveaux venus";
 $a->strings["link"] = "lien";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a taggué %3\$s de %2\$s avec %4\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a étiqueté %3\$s de %2\$s avec %4\$s";
 $a->strings["Item not found"] = "Élément introuvable";
-$a->strings["Edit post"] = "Éditer le billet";
+$a->strings["Edit post"] = "Éditer la publication";
 $a->strings["upload photo"] = "envoi image";
 $a->strings["Attach file"] = "Joindre fichier";
 $a->strings["attach file"] = "ajout fichier";
@ -622,7 +627,7 @@ $a->strings["Clear browser location"] = "Effacer la localisation du navigateur";
 $a->strings["clear location"] = "supp. localisation";
 $a->strings["Permission settings"] = "Réglages des permissions";
 $a->strings["CC: email addresses"] = "CC: adresses de courriel";
-$a->strings["Public post"] = "Billet publique";
+$a->strings["Public post"] = "Publication publique";
 $a->strings["Set title"] = "Définir un titre";
 $a->strings["Categories (comma-separated list)"] = "Catégories (séparées par des virgules)";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@exemple.com, mary@exemple.com";
@ -641,12 +646,12 @@ $a->strings["About:"] = "À propos:";
 $a->strings["No entries (some entries may be hidden)."] = "Aucune entrée (certaines peuvent être cachées).";
 $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 du réparateur de contacts";
+$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["Account Nickname"] = "Pseudo du compte";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@NomDuTag - prend le pas sur Nom/Pseudo";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@NomEtiquette - prend le pas sur Nom/Pseudo";
 $a->strings["Account URL"] = "URL du compte";
 $a->strings["Friend Request URL"] = "Echec du téléversement de l'image.";
 $a->strings["Friend Confirm URL"] = "Accès public refusé.";
@ -761,16 +766,16 @@ $a->strings["Edit contact notes"] = "Éditer les notes des contacts";
 $a->strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
 $a->strings["Block/Unblock contact"] = "Bloquer/débloquer ce contact";
 $a->strings["Ignore contact"] = "Ignorer ce contact";
-$a->strings["Repair URL settings"] = "Réparer les réglages d'URL";
+$a->strings["Repair URL settings"] = "Réglages de réparation des URL";
 $a->strings["View conversations"] = "Voir les conversations";
 $a->strings["Delete contact"] = "Effacer ce contact";
 $a->strings["Last update:"] = "Dernière mise-à-jour :";
-$a->strings["Update public posts"] = "Met ses entrées publiques à jour: ";
+$a->strings["Update public posts"] = "Mettre à jour les publications publiques:";
 $a->strings["Currently blocked"] = "Actuellement bloqué";
 $a->strings["Currently ignored"] = "Actuellement ignoré";
 $a->strings["Currently archived"] = "Actuellement archivé";
 $a->strings["Hide this contact from others"] = "Cacher ce contact aux autres";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Les réponses et \"j'aime\" à vos contenus publics <strong>peuvent</strong> être toujours visibles";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Les réponses et \"j'aime\" à vos publications publiques <strong>peuvent</strong> être toujours visibles";
 $a->strings["Notification for new posts"] = "Notification des nouvelles publications";
 $a->strings["Send a notification of every new post of this contact"] = "";
 $a->strings["Fetch further information for feeds"] = "";
@ -850,7 +855,7 @@ $a->strings["None"] = "Aucun(e)";
 $a->strings["Email login name:"] = "Nom de connexion:";
 $a->strings["Email password:"] = "Mot de passe:";
 $a->strings["Reply-to address:"] = "Adresse de réponse:";
-$a->strings["Send public posts to all email contacts:"] = "Les notices publiques vont à tous les contacts courriel:";
+$a->strings["Send public posts to all email contacts:"] = "Envoyer les publications publiques à tous les contacts courriels:";
 $a->strings["Action after import:"] = "Action après import:";
 $a->strings["Mark as seen"] = "Marquer comme vu";
 $a->strings["Move to folder"] = "Déplacer vers";
@ -866,6 +871,7 @@ $a->strings["Number of items to display per page when viewed from mobile device:
 $a->strings["Don't show emoticons"] = "Ne pas afficher les émoticônes (smileys grahiques)";
 $a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "";
+$a->strings["Automatic updates only at the top of the network page"] = "";
 $a->strings["User Types"] = "";
 $a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "Compte normal";
@ -885,21 +891,21 @@ $a->strings["Publish your default profile in the global social directory?"] = "P
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Cacher votre liste de contacts/amis des visiteurs de votre profil par défaut?";
 $a->strings["Hide your profile details from unknown viewers?"] = "Cacher les détails du profil aux visiteurs inconnus?";
 $a->strings["Allow friends to post to your profile page?"] = "Autoriser vos amis à publier sur votre profil?";
-$a->strings["Allow friends to tag your posts?"] = "Autoriser vos amis à tagguer vos notices?";
+$a->strings["Allow friends to tag your posts?"] = "Autoriser vos amis à étiqueter vos publications?";
 $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["or"] = "ou";
 $a->strings["Your Identity Address is"] = "L'adresse de votre identité est";
 $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 notices n'expireront pas. Les notices expirées seront supprimées";
+$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";
 $a->strings["Advanced Expiration"] = "Expiration (avancé)";
-$a->strings["Expire posts:"] = "Faire expirer les contenus:";
+$a->strings["Expire posts:"] = "Faire expirer les publications:";
 $a->strings["Expire personal notes:"] = "Faire expirer les notes personnelles:";
-$a->strings["Expire starred posts:"] = "Faire expirer les contenus marqués:";
+$a->strings["Expire starred posts:"] = "Faire expirer les publications marqués:";
 $a->strings["Expire photos:"] = "Faire expirer les photos:";
-$a->strings["Only expire posts by others:"] = "Faire expirer seulement les messages des autres :";
+$a->strings["Only expire posts by others:"] = "Faire expirer seulement les publications des autres:";
 $a->strings["Account Settings"] = "Compte";
 $a->strings["Password Settings"] = "Réglages de mot de passe";
 $a->strings["New Password:"] = "Nouveau mot de passe:";
@ -912,18 +918,18 @@ $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["Default Post Location:"] = "Publication par défaut depuis :";
+$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";
 $a->strings["Maximum Friend Requests/Day:"] = "Nombre maximal de requêtes d'amitié/jour:";
 $a->strings["(to prevent spam abuse)"] = "(pour limiter l'impact du spam)";
-$a->strings["Default Post Permissions"] = "Permissions par défaut sur les articles";
+$a->strings["Default Post Permissions"] = "Permissions de publication par défaut";
 $a->strings["(click to open/close)"] = "(cliquer pour ouvrir/fermer)";
 $a->strings["Show to Groups"] = "Montrer aux groupes";
 $a->strings["Show to Contacts"] = "Montrer aux Contacts";
 $a->strings["Default Private Post"] = "Message privé par défaut";
 $a->strings["Default Public Post"] = "Message publique par défaut";
-$a->strings["Default Permissions for New Posts"] = "Permissions par défaut sur les nouveaux articles";
+$a->strings["Default Permissions for New Posts"] = "Permissions par défaut pour les nouvelles publications";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximum de messages privés d'inconnus par jour:";
 $a->strings["Notification Settings"] = "Réglages de notification";
 $a->strings["By default post a status message when:"] = "Par défaut, poster un statut quand:";
@ -937,7 +943,7 @@ $a->strings["Someone writes on your profile wall"] = "Quelqu'un écrit sur votre
 $a->strings["Someone writes a followup comment"] = "Quelqu'un vous commente";
 $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é repéré dans une publication";
+$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["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";
@ -968,6 +974,7 @@ $a->strings["public profile"] = "profil public";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s a changé %2\$s en &ldquo;%3\$s&rdquo;";
 $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:"] = "";
 $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["Edit Profile Details"] = "Éditer les détails du profil";
 $a->strings["Change Profile Photo"] = "Changer la photo du profil";
@ -1087,7 +1094,7 @@ $a->strings["Delete Album"] = "Effacer l'album";
 $a->strings["Do you really want to delete this photo album and all its photos?"] = "Voulez-vous vraiment supprimer cet album photo et toutes ses photos ?";
 $a->strings["Delete Photo"] = "Effacer la photo";
 $a->strings["Do you really want to delete this photo?"] = "Voulez-vous vraiment supprimer cette photo ?";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s a été identifié %2\$s par %3\$s";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s a été étiqueté dans %2\$s par %3\$s";
 $a->strings["a photo"] = "une photo";
 $a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de  ";
 $a->strings["Image file is empty."] = "Fichier image vide.";
@ -1113,7 +1120,7 @@ $a->strings["View photo"] = "Voir photo";
 $a->strings["Edit photo"] = "Éditer la photo";
 $a->strings["Use as profile photo"] = "Utiliser comme photo de profil";
 $a->strings["View Full Size"] = "Voir en taille réelle";
-$a->strings["Tags: "] = "Étiquettes: ";
+$a->strings["Tags: "] = "Étiquettes:";
 $a->strings["[Remove any tag]"] = "[Retirer toutes les étiquettes]";
 $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)";
@ -1168,9 +1175,9 @@ $a->strings["Clear notifications"] = "Effacer les notifications";
 $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["Tag removed"] = "Étiquette enlevée";
+$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: "] = "Choisir une étiquette à enlever: ";
+$a->strings["Select a tag to remove: "] = "Sélectionner une étiquette à supprimer: ";
 $a->strings["Remove"] = "Utiliser comme photo de profil";
 $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["l, F j"] = "l, F j";
@ -1206,8 +1213,8 @@ $a->strings["Please enter your password for verification:"] = "Merci de saisir v
 $a->strings["Friend suggestion sent."] = "Suggestion d'amitié/contact envoyée.";
 $a->strings["Suggest Friends"] = "Suggérer des amis/contacts";
 $a->strings["Suggest a friend for %s"] = "Suggérer un ami/contact pour %s";
-$a->strings["Unable to locate original post."] = "Impossible de localiser l'article original.";
-$a->strings["Empty post discarded."] = "Article vide défaussé.";
+$a->strings["Unable to locate original post."] = "Impossible de localiser la publication originale.";
+$a->strings["Empty post discarded."] = "Publication vide rejetée.";
 $a->strings["System error. Post not saved."] = "Erreur système. Publication non sauvée.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Ce message vous a été envoyé par %s, membre du réseau social Friendica.";
 $a->strings["You may visit them online at %s"] = "Vous pouvez leur rendre visite sur %s";
@ -1216,12 +1223,12 @@ $a->strings["%s posted an update."] = "%s a publié une mise à jour.";
 $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["{0} commented %s's post"] = "{0} a commenté une notice de %s";
-$a->strings["{0} liked %s's post"] = "{0} a aimé une notice de %s";
-$a->strings["{0} disliked %s's post"] = "{0} n'a pas aimé une notice de %s";
+$a->strings["{0} commented %s's post"] = "{0} a commenté la publication de %s";
+$a->strings["{0} liked %s's post"] = "{0} a aimé la publication de %s";
+$a->strings["{0} disliked %s's post"] = "{0} n'a pas aimé la publication de %s";
 $a->strings["{0} is now friends with %s"] = "{0} est désormais ami(e) avec %s";
-$a->strings["{0} posted"] = "{0} a posté";
-$a->strings["{0} tagged %s's post with #%s"] = "{0} a taggué la notice de %s avec #%s";
+$a->strings["{0} posted"] = "{0} a publié";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} a étiqueté la publication de %s avec #%s";
 $a->strings["{0} mentioned you in a post"] = "{0} vous a mentionné dans une publication";
 $a->strings["OpenID protocol error. No ID returned."] = "Erreur de protocole OpenID. Pas d'ID en retour.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Compte introuvable, et l'inscription OpenID n'est pas autorisée sur ce site.";
@ -1236,7 +1243,7 @@ $a->strings["Hide Ignored Requests"] = "Cacher les demandes ignorées";
 $a->strings["Notification type: "] = "Type de notification: ";
 $a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
 $a->strings["suggested by %s"] = "suggéré(e) par %s";
-$a->strings["Post a new friend activity"] = "Poster concernant les nouvelles amitiés";
+$a->strings["Post a new friend activity"] = "Poster une nouvelle avtivité d'ami";
 $a->strings["if applicable"] = "si possible";
 $a->strings["Claims to be known to you: "] = "Prétend que vous le connaissez: ";
 $a->strings["yes"] = "oui";
@ -1249,11 +1256,11 @@ $a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
 $a->strings["New Follower"] = "Nouvel abonné";
 $a->strings["No introductions."] = "Aucune demande d'introduction.";
 $a->strings["Notifications"] = "Notifications";
-$a->strings["%s liked %s's post"] = "%s a aimé le billet de %s";
-$a->strings["%s disliked %s's post"] = "%s n'a pas aimé le billet de %s";
+$a->strings["%s liked %s's post"] = "%s a aimé la publication de %s";
+$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la publication de %s";
 $a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
-$a->strings["%s created a new post"] = "%s a publié un billet";
-$a->strings["%s commented on %s's post"] = "%s a commenté le billet de %s";
+$a->strings["%s created a new post"] = "%s a créé une nouvelle publication";
+$a->strings["%s commented on %s's post"] = "%s a commenté la publication de %s";
 $a->strings["No more network notifications."] = "Aucune notification du réseau.";
 $a->strings["Network Notifications"] = "Notifications du réseau";
 $a->strings["No more personal notifications."] = "Aucun notification personnelle.";
@ -1344,7 +1351,7 @@ $a->strings["Follow Thread"] = "Suivre le fil";
 $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"] = "Posts du Réseau";
+$a->strings["Network Posts"] = "Publications du réseau";
 $a->strings["Edit Contact"] = "Éditer le contact";
 $a->strings["Send PM"] = "Message privé";
 $a->strings["Poke"] = "Sollicitations (pokes)";
@ -1359,18 +1366,18 @@ $a->strings["%s don't like this."] = "%s n'aiment pas ça.";
 $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 :";
-$a->strings["Tag term:"] = "Tag : ";
+$a->strings["Tag term:"] = "Terme d'étiquette:";
 $a->strings["Where are you right now?"] = "Où êtes-vous présentemment?";
 $a->strings["Delete item(s)?"] = "Supprimer les élément(s) ?";
-$a->strings["Post to Email"] = "Publier aussi par courriel";
+$a->strings["Post to Email"] = "Publier aux courriels";
 $a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "permissions";
-$a->strings["Post to Groups"] = "";
-$a->strings["Post to Contacts"] = "";
+$a->strings["Post to Groups"] = "Publier aux groupes";
+$a->strings["Post to Contacts"] = "Publier aux contacts";
 $a->strings["Private post"] = "Message privé";
 $a->strings["Logged out."] = "Déconnecté.";
-$a->strings["Error decoding account file"] = "";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
+$a->strings["Error decoding account file"] = "Une erreur a été détecté en décodant un fichier utilisateur";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Erreur ! Pas de ficher de version existant ! Êtes vous sur un compte Friendica ?";
 $a->strings["Error! Cannot check nickname"] = "Erreur! Pseudo invalide";
 $a->strings["User '%s' already exists on this server!"] = "L'utilisateur '%s' existe déjà sur ce serveur!";
 $a->strings["User creation error"] = "Erreur de création d'utilisateur";
@ -1465,18 +1472,18 @@ $a->strings["Please visit %s to view and/or reply to the conversation."] = "Merc
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notification] %s a posté sur votre mur de profil";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s a publié sur votre mur à %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s a posté sur [url=%2\$s]votre mur[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a repéré";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous parle sur %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a taggé[/url].";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a étiqueté";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous a étiqueté sur %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a étiqueté[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notification] %s partage une nouvelle publication";
 $a->strings["%1\$s shared a new post at %2\$s"] = "";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]partage une publication[/url].";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s vous a sollicité";
 $a->strings["%1\$s poked you at %2\$s"] = "%1\$s vous a sollicité via %2\$s";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s vous a [url=%2\$s]sollicité[/url].";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notification] %s a repéré votre publication";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s a tagué votre contenu sur %2\$s";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s a tagué [url=%2\$s]votre contenu[/url]";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notification] %s a étiqueté votre publication";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s a étiqueté votre publication sur %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s a étiqueté [url=%2\$s]votre publication[/url]";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notification] Introduction reçue";
 $a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Vous avez reçu une introduction de '%1\$s' sur %2\$s";
 $a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Vous avez reçu [url=%1\$s]une introduction[/url] de %2\$s.";
@ -1510,6 +1517,8 @@ $a->strings["Unable to retrieve contact information."] = "Impossible de récupé
 $a->strings["following"] = "following";
 $a->strings["[no subject]"] = "[pas de sujet]";
 $a->strings["End this session"] = "Mettre fin à cette session";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "Se connecter";
 $a->strings["Home Page"] = "Page d'accueil";
 $a->strings["Create an account"] = "Créer un compte";
@ -1523,7 +1532,7 @@ $a->strings["People directory"] = "Annuaire des utilisateurs";
 $a->strings["Information"] = "Information";
 $a->strings["Information about this friendica instance"] = "Information au sujet de cette instance de friendica";
 $a->strings["Conversations from your friends"] = "Conversations de vos amis";
-$a->strings["Network Reset"] = "";
+$a->strings["Network Reset"] = "Réinitialiser le réseau";
 $a->strings["Load Network page with no filters"] = "Chargement des pages du réseau sans filtre";
 $a->strings["Friend Requests"] = "Demande d'amitié";
 $a->strings["See all notifications"] = "Voir toute notification";
@ -1544,7 +1553,7 @@ $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "Anniversaire:";
 $a->strings["Age:"] = "Age:";
 $a->strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
-$a->strings["Tags:"] = "Tags :";
+$a->strings["Tags:"] = "Étiquette:";
 $a->strings["Religion:"] = "Religion:";
 $a->strings["Hobbies/Interests:"] = "Passe-temps/Centres d'intérêt:";
 $a->strings["Contact information and Social Networks:"] = "Coordonnées/Réseaux sociaux:";
@ -1556,8 +1565,8 @@ $a->strings["Love/Romance:"] = "Amour/Romance:";
 $a->strings["Work/employment:"] = "Activité professionnelle/Occupation:";
 $a->strings["School/education:"] = "Études/Formation:";
 $a->strings["Image/photo"] = "Image/photo";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
 $a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
-$a->strings["<span><b>"] = "";
 $a->strings["$1 wrote:"] = "$1 a écrit:";
 $a->strings["Encrypted content"] = "Contenu chiffré";
 $a->strings["Unknown | Not categorised"] = "Inconnu | Non-classé";
@ -1579,6 +1588,7 @@ $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Connecteur Diaspora";
 $a->strings["Statusnet"] = "Statusnet";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "Divers";
 $a->strings["year"] = "an";
 $a->strings["month"] = "mois";
@ -1605,41 +1615,43 @@ $a->strings["Ability to create multiple profiles"] = "Possibilité de créer plu
 $a->strings["Post Composition Features"] = "Caractéristiques de composition de publication";
 $a->strings["Richtext Editor"] = "Éditeur de texte enrichi";
 $a->strings["Enable richtext editor"] = "Activer l'éditeur de texte enrichi";
-$a->strings["Post Preview"] = "Aperçu du billet";
-$a->strings["Allow previewing posts and comments before publishing them"] = "Permet la prévisualisation des billets et commentaires avant de les publier";
+$a->strings["Post Preview"] = "Aperçu de la publication";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Permet la prévisualisation des publications et commentaires avant de les publier";
 $a->strings["Auto-mention Forums"] = "";
 $a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "";
 $a->strings["Network Sidebar Widgets"] = "Widgets réseau pour barre latérale";
 $a->strings["Search by Date"] = "Rechercher par Date";
-$a->strings["Ability to select posts by date ranges"] = "Capacité de sélectionner les billets par intervalles de dates";
+$a->strings["Ability to select posts by date ranges"] = "Capacité de sélectionner les publications par intervalles de dates";
 $a->strings["Group Filter"] = "Filtre de groupe";
-$a->strings["Enable widget to display Network posts only from selected group"] = "Activer le widget d’affichage des Posts du Réseau seulement pour le groupe sélectionné";
+$a->strings["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";
-$a->strings["Enable widget to display Network posts only from selected network"] = "Activer le widget d’affichage des Posts du Réseau seulement pour le réseau sélectionné";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Activer le widget d’affichage des publications du réseau seulement pour le réseau sélectionné";
 $a->strings["Save search terms for re-use"] = "Sauvegarder la recherche pour une utilisation ultérieure";
 $a->strings["Network Tabs"] = "Onglets Réseau";
 $a->strings["Network Personal Tab"] = "Onglet Réseau Personnel";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Activer l'onglet pour afficher seulement les Posts du Réseau où vous avez interagit";
-$a->strings["Network New Tab"] = "";
-$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "";
-$a->strings["Network Shared Links Tab"] = "";
-$a->strings["Enable tab to display only Network posts with links in them"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Activer l'onglet pour afficher seulement les publications du réseau où vous avez interagit";
+$a->strings["Network New Tab"] = "Nouvel onglet réseaux";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Activer l'onglet pour afficher seulement les publications du réseau (dans les 12 dernières heures)";
+$a->strings["Network Shared Links Tab"] = "Onglet réseau partagé";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Activer l'onglet pour afficher seulement les publications du réseau contenant des liens";
 $a->strings["Post/Comment Tools"] = "outils de publication/commentaire";
 $a->strings["Multiple Deletion"] = "Suppression multiple";
-$a->strings["Select and delete multiple posts/comments at once"] = "";
-$a->strings["Edit Sent Posts"] = "Edité les publications envoyées";
-$a->strings["Edit and correct posts and comments after sending"] = "";
-$a->strings["Tagging"] = "Tagger";
-$a->strings["Ability to tag existing posts"] = "Autorisé à tagger des publications existantes";
+$a->strings["Select and delete multiple posts/comments at once"] = "Sélectionner et supprimer plusieurs publications/commentaires à la fois";
+$a->strings["Edit Sent Posts"] = "Éditer les publications envoyées";
+$a->strings["Edit and correct posts and comments after sending"] = "Éditer et corriger les publications et commentaires après l'envoi";
+$a->strings["Tagging"] = "Étiquettage";
+$a->strings["Ability to tag existing posts"] = "Possibilité d'étiqueter les publications existantes";
 $a->strings["Post Categories"] = "Catégories des publications";
 $a->strings["Add categories to your posts"] = "Ajouter des catégories à vos publications";
-$a->strings["Ability to file posts under folders"] = "";
-$a->strings["Dislike Posts"] = "N'aime pas";
-$a->strings["Ability to dislike posts/comments"] = "Autorisé a ne pas aimer les publications/commentaires";
-$a->strings["Star Posts"] = "";
-$a->strings["Ability to mark special posts with a star indicator"] = "";
+$a->strings["Ability to file posts under folders"] = "Possibilité d'afficher les publications sous les répertoires";
+$a->strings["Dislike Posts"] = "Publications non aimées";
+$a->strings["Ability to dislike posts/comments"] = "Possibilité de ne pas aimer les publications/commentaires";
+$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["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
 $a->strings["Attachments:"] = "Pièces jointes : ";
+$a->strings["Errors encountered creating database tables."] = "Des erreurs ont été signalées lors de la création des tables.";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "Visible par tout le monde";
 $a->strings["A new person is sharing with you at "] = "Une nouvelle personne partage avec vous à ";
 $a->strings["You have a new follower at "] = "Vous avez un nouvel abonné à ";
--- a/view/is/messages.po
+++ b/view/is/messages.po
--- a/view/is/strings.php
+++ b/view/is/strings.php
--- a/view/it/messages.po
+++ b/view/it/messages.po
--- a/view/it/strings.php
+++ b/view/it/strings.php
@ -112,12 +112,14 @@ $a->strings["Posts font size"] = "Dimensione caratteri post";
 $a->strings["Textareas font size"] = "Dimensione caratteri nelle aree di testo";
 $a->strings["Set colour scheme"] = "Imposta schema colori";
 $a->strings["default"] = "default";
-$a->strings["Background Image"] = "Immagine di sfondo";
-$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "L'indirizzo di un'immagine (p.e. dal tuo album di foto) che deve essere usata come immagine di sfondo.";
-$a->strings["Background Color"] = "Colore di sfondo";
-$a->strings["HEX value for the background color. Don't include the #"] = "Valore esadecimale del colore di sfondo. Non includere il #";
-$a->strings["font size"] = "dimensione del font";
-$a->strings["base font size for your interface"] = "dimensione del font di base per la tua interfaccia";
+$a->strings["dark"] = "";
+$a->strings["black"] = "";
+$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["Set resize level for images in posts and comments (width and height)"] = "Dimensione immagini in messaggi e commenti (larghezza e altezza)";
 $a->strings["Set theme width"] = "Imposta la larghezza del tema";
 $a->strings["Set style"] = "Imposta stile";
@ -389,7 +391,6 @@ $a->strings["view/smarty3 is writable"] = "view/smarty3 è scrivibile";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La riscrittura degli url in .htaccess non funziona. Controlla la configurazione del tuo server.";
 $a->strings["Url rewrite is working"] = "La riscrittura degli url funziona";
 $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."] = "Il file di configurazione del database \".htconfig.php\" non può essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
-$a->strings["Errors encountered creating database tables."] = "La creazione delle tabelle del database ha generato errori.";
 $a->strings["<h1>What next</h1>"] = "<h1>Cosa fare ora</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del poller.";
 $a->strings["Theme settings updated."] = "Impostazioni del tema aggiornate.";
@ -525,11 +526,15 @@ $a->strings["Suppress Language"] = "Disattiva lingua";
 $a->strings["Suppress language information in meta information about a posting."] = "Disattiva le informazioni sulla lingua nei meta di un post.";
 $a->strings["Path to item cache"] = "Percorso cache elementi";
 $a->strings["Cache duration in seconds"] = "Durata della cache in secondi";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Quanto a lungo devono essere mantenuti i file di cache? Il valore predefinito è 86400 secondi (un giorno).";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "Percorso al file di lock";
 $a->strings["Temp path"] = "Percorso file temporanei";
 $a->strings["Base path to installation"] = "Percorso base all'installazione";
 $a->strings["New base url"] = "Nuovo url base";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "L'aggiornamento è stato segnato come  di successo";
 $a->strings["Executing %s failed. Check system logs."] = "Fallita l'esecuzione di %s. Controlla i log di sistema.";
 $a->strings["Update %s was successfully applied."] = "L'aggiornamento %s è stato applicato con successo";
@ -866,6 +871,7 @@ $a->strings["Number of items to display per page when viewed from mobile device:
 $a->strings["Don't show emoticons"] = "Non mostrare le emoticons";
 $a->strings["Don't show notices"] = "Non mostrare gli avvisi";
 $a->strings["Infinite scroll"] = "Scroll infinito";
+$a->strings["Automatic updates only at the top of the network page"] = "";
 $a->strings["User Types"] = "Tipi di Utenti";
 $a->strings["Community Types"] = "Tipi di Comunità";
 $a->strings["Normal Account Page"] = "Pagina Account Normale";
@ -968,6 +974,7 @@ $a->strings["public profile"] = "profilo pubblico";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiato %2\$s in &ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = "- Visita  %2\$s di %1\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha un %2\$s aggiornato. Ha cambiato %3\$s";
+$a->strings["Hide contacts and friends:"] = "";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?";
 $a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
 $a->strings["Change Profile Photo"] = "Cambia la foto del profilo";
@ -1510,6 +1517,8 @@ $a->strings["Unable to retrieve contact information."] = "Impossibile recuperare
 $a->strings["following"] = "segue";
 $a->strings["[no subject]"] = "[nessun oggetto]";
 $a->strings["End this session"] = "Finisci questa sessione";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "Entra";
 $a->strings["Home Page"] = "Home Page";
 $a->strings["Create an account"] = "Crea un account";
@ -1556,8 +1565,8 @@ $a->strings["Love/Romance:"] = "Amore:";
 $a->strings["Work/employment:"] = "Lavoro:";
 $a->strings["School/education:"] = "Scuola:";
 $a->strings["Image/photo"] = "Immagine/foto";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
 $a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a> ha scritto il seguente <a href=\"%s\" target=\"_blank\">messaggio</a>";
-$a->strings["<span><b>"] = "";
 $a->strings["$1 wrote:"] = "$1 ha scritto:";
 $a->strings["Encrypted content"] = "Contenuto criptato";
 $a->strings["Unknown | Not categorised"] = "Sconosciuto | non categorizzato";
@ -1579,6 +1588,7 @@ $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Connettore Diaspora";
 $a->strings["Statusnet"] = "Statusnet";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "Varie";
 $a->strings["year"] = "anno";
 $a->strings["month"] = "mese";
@ -1640,6 +1650,8 @@ $a->strings["Star Posts"] = "Post preferiti";
 $a->strings["Ability to mark special posts with a star indicator"] = "Permette di segnare i post preferiti con una stella";
 $a->strings["Sharing notification from Diaspora network"] = "Notifica di condivisione dal network Diaspora*";
 $a->strings["Attachments:"] = "Allegati:";
+$a->strings["Errors encountered creating database tables."] = "La creazione delle tabelle del database ha generato errori.";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "Visibile a tutti";
 $a->strings["A new person is sharing with you at "] = "Una nuova persona sta condividendo con te da ";
 $a->strings["You have a new follower at "] = "Una nuova persona ti segue su ";
--- a/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@ -114,6 +114,8 @@ $a->strings["Posts font size"] = "";
 $a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "Zestaw kolorów";
 $a->strings["default"] = "standardowe";
+$a->strings["dark"] = "";
+$a->strings["black"] = "";
 $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"] = "";
@ -122,6 +124,7 @@ $a->strings["font size"] = "";
 $a->strings["base font size for your interface"] = "";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "";
 $a->strings["Set theme width"] = "Ustaw szerokość motywu";
+$a->strings["Set style"] = "";
 $a->strings["Delete this item?"] = "Usunąć ten element?";
 $a->strings["show fewer"] = "Pokaż mniej";
 $a->strings["Update %s failed. See error logs."] = "";
@ -391,7 +394,6 @@ $a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
 $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."] = "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera.";
-$a->strings["Errors encountered creating database tables."] = "Zostały napotkane błędy przy tworzeniu tabeli bazy danych.";
 $a->strings["<h1>What next</h1>"] = "<h1>Co dalej</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WAŻNE: Musisz [ręcznie] skonfigurowć zaplanowane zadanie dla poller.";
 $a->strings["Theme settings updated."] = "Ustawienia szablonu zmienione.";
@ -421,6 +423,7 @@ $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] =
 $a->strings["Site settings updated."] = "Ustawienia strony zaktualizowane";
 $a->strings["No special theme for mobile devices"] = "Brak specialnego motywu dla urządzeń mobilnych";
 $a->strings["Never"] = "Nigdy";
+$a->strings["At post arrival"] = "";
 $a->strings["Frequently"] = "Jak najczęściej";
 $a->strings["Hourly"] = "Godzinowo";
 $a->strings["Twice daily"] = "Dwa razy dziennie";
@ -488,6 +491,8 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "Nie
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "";
 $a->strings["Don't embed private images in posts"] = "";
 $a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "";
+$a->strings["Allow Users to set remote_self"] = "";
+$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "";
 $a->strings["Block multiple registrations"] = "Zablokuj wielokrotną rejestrację";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Nie pozwalaj użytkownikom na zakładanie dodatkowych kont do używania jako strony. ";
 $a->strings["OpenID support"] = "Wsparcie OpenID";
@ -499,7 +504,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "Użyj regularnych wyrażeń P
 $a->strings["Show Community Page"] = "Pokaż stronę społeczności";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "";
 $a->strings["Enable OStatus support"] = "Włącz wsparcie OStatus";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
 $a->strings["OStatus conversation completion interval"] = "";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "";
 $a->strings["Enable Diaspora support"] = "Włączyć obsługę Diaspory";
@ -524,11 +529,15 @@ $a->strings["Suppress Language"] = "";
 $a->strings["Suppress language information in meta information about a posting."] = "";
 $a->strings["Path to item cache"] = "";
 $a->strings["Cache duration in seconds"] = "";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "";
 $a->strings["Temp path"] = "Ścieżka do Temp";
 $a->strings["Base path to installation"] = "";
 $a->strings["New base url"] = "";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Executing %s failed. Check system logs."] = "";
 $a->strings["Update %s was successfully applied."] = "";
@ -654,6 +663,9 @@ $a->strings["Friend Confirm URL"] = "URL potwierdzający znajomość";
 $a->strings["Notification Endpoint URL"] = "Zgłoszenie Punktu Końcowego URL";
 $a->strings["Poll/Feed URL"] = "Adres Ankiety / RSS";
 $a->strings["New photo from this URL"] = "Nowe zdjęcie z tej ścieżki";
+$a->strings["Remote Self"] = "";
+$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["Move account"] = "Przenieś konto";
 $a->strings["You can import an account from another Friendica server."] = "";
 $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."] = "";
@ -714,6 +726,11 @@ $a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
 $a->strings["Submit Request"] = "Wyślij zgłoszenie";
 $a->strings["[Embedded content - reload page to view]"] = "[Dodatkowa zawartość - odśwież stronę by zobaczyć]";
 $a->strings["View in context"] = "Zobacz w kontekście";
+$a->strings["%d contact edited."] = array(
+	0 => "",
+	1 => "",
+	2 => "",
+);
 $a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
 $a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
 $a->strings["Contact updated."] = "Kontakt zaktualizowany";
@ -767,6 +784,9 @@ $a->strings["Currently ignored"] = "Obecnie zignorowany";
 $a->strings["Currently archived"] = "Obecnie zarchiwizowany";
 $a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
+$a->strings["Notification for new posts"] = "";
+$a->strings["Send a notification of every new post of this contact"] = "";
+$a->strings["Fetch further information for feeds"] = "";
 $a->strings["Suggestions"] = "Sugestie";
 $a->strings["Suggest potential friends"] = "Sugerowani znajomi";
 $a->strings["All Contacts"] = "Wszystkie kontakty";
@ -786,17 +806,16 @@ $a->strings["is a fan of yours"] = "jest twoim fanem";
 $a->strings["you are a fan of"] = "jesteś fanem";
 $a->strings["Edit contact"] = "Edytuj kontakt";
 $a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
+$a->strings["Update"] = "Zaktualizuj";
 $a->strings["everybody"] = "wszyscy";
-$a->strings["Account settings"] = "Ustawienia konta";
 $a->strings["Additional features"] = "";
-$a->strings["Display settings"] = "Wyświetl ustawienia";
-$a->strings["Connector settings"] = "Ustawienia konektora";
-$a->strings["Plugin settings"] = "Ustawienia wtyczek";
+$a->strings["Display"] = "";
+$a->strings["Social Networks"] = "";
+$a->strings["Delegations"] = "";
 $a->strings["Connected apps"] = "Powiązane aplikacje";
 $a->strings["Export personal data"] = "Eksportuje dane personalne";
 $a->strings["Remove account"] = "Usuń konto";
 $a->strings["Missing some important data!"] = "Brakuje ważnych danych!";
-$a->strings["Update"] = "Zaktualizuj";
 $a->strings["Failed to connect with email account using the settings provided."] = "Połączenie z kontem email używając wybranych ustawień nie powiodło się.";
 $a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
 $a->strings["Features updated"] = "";
@ -834,7 +853,6 @@ $a->strings["enabled"] = "włączony";
 $a->strings["disabled"] = "wyłączony";
 $a->strings["StatusNet"] = "StatusNet";
 $a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
-$a->strings["Connector Settings"] = "Ustawienia konektora";
 $a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email.";
 $a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
@ -859,7 +877,11 @@ $a->strings["Number of items to display per page:"] = "";
 $a->strings["Maximum of 100 items"] = "Maksymalnie 100 elementów";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "";
 $a->strings["Don't show emoticons"] = "Nie pokazuj emotikonek";
+$a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "";
+$a->strings["Automatic updates only at the top of the network page"] = "";
+$a->strings["User Types"] = "";
+$a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "";
 $a->strings["This account is a normal personal profile"] = "To konto jest normalnym osobistym profilem";
 $a->strings["Soapbox Page"] = "";
@ -960,6 +982,7 @@ $a->strings["public profile"] = "profil publiczny";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
 $a->strings[" - Visit %1\$s's %2\$s"] = " - Odwiedźa %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
+$a->strings["Hide contacts and friends:"] = "";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Czy chcesz ukryć listę kontaktów dla przeglądających to konto?";
 $a->strings["Edit Profile Details"] = "Edytuj profil.";
 $a->strings["Change Profile Photo"] = "Zmień profilowe zdjęcie";
@ -1119,6 +1142,8 @@ $a->strings["Public photo"] = "Zdjęcie publiczne";
 $a->strings["Share"] = "Podziel się";
 $a->strings["View Album"] = "Zobacz album";
 $a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "";
+$a->strings["Or - did you try to upload an empty file?"] = "";
 $a->strings["File exceeds size limit of %d"] = "Plik przekracza dozwolony rozmiar %d";
 $a->strings["File upload failed."] = "Przesyłanie pliku nie powiodło się.";
 $a->strings["No videos selected"] = "Nie zaznaczono filmów";
@ -1299,9 +1324,13 @@ $a->strings["Categories"] = "Kategorie";
 $a->strings["Click here to upgrade."] = "Kliknij tu, aby zaktualizować.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
 $a->strings["This action is not available under your subscription plan."] = "";
+$a->strings["User not found."] = "";
+$a->strings["There is no status with this id."] = "";
+$a->strings["There is no conversation with this id."] = "";
 $a->strings["view full size"] = "Zobacz w pełnym wymiarze";
 $a->strings["Starts:"] = "Start:";
 $a->strings["Finishes:"] = "Wykończenia:";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'";
 $a->strings["(no subject)"] = "(bez tematu)";
 $a->strings["noreply"] = "brak odpowiedzi";
 $a->strings["An invitation is required."] = "Wymagane zaproszenie.";
@ -1352,6 +1381,7 @@ $a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
 $a->strings["Delete item(s)?"] = "Usunąć pozycję (pozycje)?";
 $a->strings["Post to Email"] = "Wyślij poprzez email";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "zezwolenia";
 $a->strings["Post to Groups"] = "Wstaw na strony grup";
 $a->strings["Post to Contacts"] = "Wstaw do kontaktów";
@ -1458,6 +1488,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "";
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notify] %s oznaczył cię";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s oznaczył/a cię w %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "";
+$a->strings["%1\$s shared a new post at %2\$s"] = "";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "";
 $a->strings["%1\$s poked you at %2\$s"] = "";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
@ -1497,6 +1530,8 @@ $a->strings["Unable to retrieve contact information."] = "Nie można otrzymać i
 $a->strings["following"] = "następujący";
 $a->strings["[no subject]"] = "[bez tematu]";
 $a->strings["End this session"] = "Zakończ sesję";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "Zaloguj się";
 $a->strings["Home Page"] = "Strona startowa";
 $a->strings["Create an account"] = "Załóż konto";
@ -1507,6 +1542,8 @@ $a->strings["Search site content"] = "Przeszukaj zawartość strony";
 $a->strings["Conversations on this site"] = "Rozmowy na tej stronie";
 $a->strings["Directory"] = "Katalog";
 $a->strings["People directory"] = "";
+$a->strings["Information"] = "";
+$a->strings["Information about this friendica instance"] = "";
 $a->strings["Conversations from your friends"] = "Rozmowy Twoich przyjaciół";
 $a->strings["Network Reset"] = "";
 $a->strings["Load Network page with no filters"] = "";
@ -1518,7 +1555,7 @@ $a->strings["Inbox"] = "Odebrane";
 $a->strings["Outbox"] = "Wysłane";
 $a->strings["Manage"] = "Zarządzaj";
 $a->strings["Manage other pages"] = "Zarządzaj innymi stronami";
-$a->strings["Delegations"] = "";
+$a->strings["Account settings"] = "Ustawienia konta";
 $a->strings["Manage/Edit Profiles"] = "Zarządzaj/Edytuj profile";
 $a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
 $a->strings["Site setup and configuration"] = "Konfiguracja i ustawienia instancji";
@ -1541,7 +1578,8 @@ $a->strings["Love/Romance:"] = "Miłość/Romans:";
 $a->strings["Work/employment:"] = "Praca/zatrudnienie:";
 $a->strings["School/education:"] = "Szkoła/edukacja:";
 $a->strings["Image/photo"] = "Obrazek/zdjęcie";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
 $a->strings["$1 wrote:"] = "$1 napisał:";
 $a->strings["Encrypted content"] = "Szyfrowana treść";
 $a->strings["Unknown | Not categorised"] = "Nieznany | Bez kategori";
@ -1561,6 +1599,9 @@ $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "";
 $a->strings["Twitter"] = "";
+$a->strings["Diaspora Connector"] = "";
+$a->strings["Statusnet"] = "";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "Różny";
 $a->strings["year"] = "rok";
 $a->strings["month"] = "miesiąc";
@ -1589,6 +1630,8 @@ $a->strings["Richtext Editor"] = "";
 $a->strings["Enable richtext editor"] = "";
 $a->strings["Post Preview"] = "Podgląd posta";
 $a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Auto-mention Forums"] = "";
+$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "";
 $a->strings["Network Sidebar Widgets"] = "";
 $a->strings["Search by Date"] = "Szukanie wg daty";
 $a->strings["Ability to select posts by date ranges"] = "";
@ -1620,6 +1663,8 @@ $a->strings["Star Posts"] = "Oznacz posty gwiazdką";
 $a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Sharing notification from Diaspora network"] = "Wspólne powiadomienie z sieci Diaspora";
 $a->strings["Attachments:"] = "Załączniki:";
+$a->strings["Errors encountered creating database tables."] = "Zostały napotkane błędy przy tworzeniu tabeli bazy danych.";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "Widoczny dla wszystkich";
 $a->strings["A new person is sharing with you at "] = "";
 $a->strings["You have a new follower at "] = "";
@ -1690,4 +1735,3 @@ $a->strings["Don't care"] = "Nie obchodzi mnie to";
 $a->strings["Ask me"] = "Zapytaj mnie ";
 $a->strings["stopped following"] = "przestań obserwować";
 $a->strings["Drop Contact"] = "";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'";
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
--- a/view/ro/messages.po
+++ b/view/ro/messages.po
--- a/view/ro/strings.php
+++ b/view/ro/strings.php
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@ -114,14 +114,17 @@ $a->strings["Posts font size"] = "Размер шрифта постов";
 $a->strings["Textareas font size"] = "Размер шрифта текстовых полей";
 $a->strings["Set colour scheme"] = "Установить цветовую схему";
 $a->strings["default"] = "значение по умолчанию";
-$a->strings["Background Image"] = "Фоновое изображение";
-$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "URL изображения (например, из вашего фотоальбома), которое должно быть использовано в качестве фонового изображения.";
-$a->strings["Background Color"] = "Цвет фона";
-$a->strings["HEX value for the background color. Don't include the #"] = "HEX код для фонового изображения. Не используйте #";
-$a->strings["font size"] = "размер шрифта";
-$a->strings["base font size for your interface"] = "основной размер шрифта для вашего интерфейса";
+$a->strings["dark"] = "";
+$a->strings["black"] = "";
+$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["Set resize level for images in posts and comments (width and height)"] = "Установить уровень изменения размера изображений в постах и комментариях (ширина и высота)";
 $a->strings["Set theme width"] = "Установить ширину темы";
+$a->strings["Set style"] = "";
 $a->strings["Delete this item?"] = "Удалить этот элемент?";
 $a->strings["show fewer"] = "показать меньше";
 $a->strings["Update %s failed. See error logs."] = "Обновление %s не удалось. Смотрите журнал ошибок.";
@ -391,7 +394,6 @@ $a->strings["view/smarty3 is writable"] = "view/smarty3 доступен для
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite в .htaccess не работает. Проверьте конфигурацию вашего сервера..";
 $a->strings["Url rewrite is working"] = "Url rewrite работает";
 $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."] = "Файл конфигурации базы данных \".htconfig.php\" не могла быть записан. Пожалуйста, используйте приложенный текст, чтобы создать конфигурационный файл в корневом каталоге веб-сервера.";
-$a->strings["Errors encountered creating database tables."] = "Обнаружены ошибки при создании таблиц базы данных.";
 $a->strings["<h1>What next</h1>"] = "<h1>Что далее</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "ВАЖНО: Вам нужно будет [вручную] установить запланированное задание для регистратора.";
 $a->strings["Theme settings updated."] = "Настройки темы обновлены.";
@ -421,6 +423,7 @@ $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] =
 $a->strings["Site settings updated."] = "Установки сайта обновлены.";
 $a->strings["No special theme for mobile devices"] = "Нет специальной темы для мобильных устройств";
 $a->strings["Never"] = "Никогда";
+$a->strings["At post arrival"] = "";
 $a->strings["Frequently"] = "Часто";
 $a->strings["Hourly"] = "Раз в час";
 $a->strings["Twice daily"] = "Два раза в день";
@ -501,7 +504,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "Используйте PHP UT
 $a->strings["Show Community Page"] = "Показать страницу сообщества";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Показывать страницу сообщества с указанием всех последних публичных сообщений на этом сайте.";
 $a->strings["Enable OStatus support"] = "Включить поддержку OStatus";
-$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Обеспечить встроенную совместимость с OStatus (identi.ca, status.net и т.д.). Все коммуникации в OStatus являются открытыми, поэтому предупреждения безопасности будут иногда отображаться.";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
 $a->strings["OStatus conversation completion interval"] = "";
 $a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Как часто процессы должны проверять наличие новых записей в OStatus разговорах? Это может быть очень ресурсоёмкой задачей.";
 $a->strings["Enable Diaspora support"] = "Включить поддержку Diaspora";
@ -526,11 +529,15 @@ $a->strings["Suppress Language"] = "";
 $a->strings["Suppress language information in meta information about a posting."] = "";
 $a->strings["Path to item cache"] = "Путь к элементам кэша";
 $a->strings["Cache duration in seconds"] = "Время жизни кэша в секундах";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Как долго необходимо хранить файлы кэша? Значение по умолчанию 86400 секунд (один день).";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "Путь к файлу блокировки";
 $a->strings["Temp path"] = "Временная папка";
 $a->strings["Base path to installation"] = "Путь для установки";
 $a->strings["New base url"] = "Новый базовый url";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "Обновление было успешно отмечено";
 $a->strings["Executing %s failed. Check system logs."] = "Не удалось выполнить %s. Проверьте логи системы.";
 $a->strings["Update %s was successfully applied."] = "Обновление %s успешно применено.";
@ -777,6 +784,9 @@ $a->strings["Currently ignored"] = "В настоящее время игнор
 $a->strings["Currently archived"] = "В данный момент архивирован";
 $a->strings["Hide this contact from others"] = "Скрыть этот контакт от других";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Ответы/лайки ваших публичных сообщений <strong>будут</strong> видимы.";
+$a->strings["Notification for new posts"] = "";
+$a->strings["Send a notification of every new post of this contact"] = "";
+$a->strings["Fetch further information for feeds"] = "";
 $a->strings["Suggestions"] = "Предложения";
 $a->strings["Suggest potential friends"] = "Предложить потенциального знакомого";
 $a->strings["All Contacts"] = "Все контакты";
@ -798,11 +808,10 @@ $a->strings["Edit contact"] = "Редактировать контакт";
 $a->strings["Search your contacts"] = "Поиск ваших контактов";
 $a->strings["Update"] = "Обновление";
 $a->strings["everybody"] = "каждый";
-$a->strings["Account settings"] = "Настройки аккаунта";
 $a->strings["Additional features"] = "Дополнительные возможности";
-$a->strings["Display settings"] = "Параметры дисплея";
-$a->strings["Connector settings"] = "Настройки соединителя";
-$a->strings["Plugin settings"] = "Настройки плагина";
+$a->strings["Display"] = "";
+$a->strings["Social Networks"] = "";
+$a->strings["Delegations"] = "";
 $a->strings["Connected apps"] = "Подключенные приложения";
 $a->strings["Export personal data"] = "Экспорт личных данных";
 $a->strings["Remove account"] = "Удалить аккаунт";
@ -844,7 +853,6 @@ $a->strings["enabled"] = "подключено";
 $a->strings["disabled"] = "отключено";
 $a->strings["StatusNet"] = "StatusNet";
 $a->strings["Email access is disabled on this site."] = "Доступ эл. почты отключен на этом сайте.";
-$a->strings["Connector Settings"] = "Настройки соединителя";
 $a->strings["Email/Mailbox Setup"] = "Настройка эл. почты / почтового ящика";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Если вы хотите общаться с Email контактами, используя этот сервис (по желанию), пожалуйста, уточните, как подключиться к вашему почтовому ящику.";
 $a->strings["Last successful email check:"] = "Последняя успешная проверка электронной почты:";
@ -869,7 +877,11 @@ $a->strings["Number of items to display per page:"] = "Количество эл
 $a->strings["Maximum of 100 items"] = "Максимум 100 элементов";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "Количество элементов на странице, когда просмотр осуществляется с мобильных устройств:";
 $a->strings["Don't show emoticons"] = "не показывать emoticons";
+$a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "Бесконечная прокрутка";
+$a->strings["Automatic updates only at the top of the network page"] = "";
+$a->strings["User Types"] = "";
+$a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "Стандартная страница аккаунта";
 $a->strings["This account is a normal personal profile"] = "Этот аккаунт является обычным персональным профилем";
 $a->strings["Soapbox Page"] = "";
@ -970,6 +982,7 @@ $a->strings["public profile"] = "публичный профиль";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s изменились с %2\$s на &ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = " - Посетить профиль %1\$s [%2\$s]";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
+$a->strings["Hide contacts and friends:"] = "";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Скрывать ваш список контактов / друзей от посетителей этого профиля?";
 $a->strings["Edit Profile Details"] = "Редактировать детали профиля";
 $a->strings["Change Profile Photo"] = "Изменить фото профиля";
@ -1129,6 +1142,8 @@ $a->strings["Public photo"] = "Публичное фото";
 $a->strings["Share"] = "Поделиться";
 $a->strings["View Album"] = "Просмотреть альбом";
 $a->strings["Recent Photos"] = "Последние фото";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "";
+$a->strings["Or - did you try to upload an empty file?"] = "";
 $a->strings["File exceeds size limit of %d"] = "Файл превышает предельный размер %d";
 $a->strings["File upload failed."] = "Загрузка файла не удалась.";
 $a->strings["No videos selected"] = "Видео не выбрано";
@ -1311,9 +1326,11 @@ $a->strings["This action exceeds the limits set by your subscription plan."] = "
 $a->strings["This action is not available under your subscription plan."] = "Это действие не доступно в соответствии с вашим планом подписки.";
 $a->strings["User not found."] = "Пользователь не найден.";
 $a->strings["There is no status with this id."] = "Нет статуса с таким id.";
+$a->strings["There is no conversation with this id."] = "";
 $a->strings["view full size"] = "посмотреть в полный размер";
 $a->strings["Starts:"] = "Начало:";
 $a->strings["Finishes:"] = "Окончание:";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Не могу найти информацию для DNS-сервера базы данных '%s'";
 $a->strings["(no subject)"] = "(без темы)";
 $a->strings["noreply"] = "без ответа";
 $a->strings["An invitation is required."] = "Требуется приглашение.";
@ -1364,6 +1381,7 @@ $a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "И где вы сейчас?";
 $a->strings["Delete item(s)?"] = "Удалить елемент(ты)?";
 $a->strings["Post to Email"] = "Отправить на Email";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "разрешения";
 $a->strings["Post to Groups"] = "Пост для групп";
 $a->strings["Post to Contacts"] = "Пост для контактов";
@ -1470,6 +1488,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "";
 $a->strings["[Friendica:Notify] %s tagged you"] = "";
 $a->strings["%1\$s tagged you at %2\$s"] = "";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "";
+$a->strings["%1\$s shared a new post at %2\$s"] = "";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "";
 $a->strings["[Friendica:Notify] %1\$s poked you"] = "";
 $a->strings["%1\$s poked you at %2\$s"] = "";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
@ -1509,6 +1530,8 @@ $a->strings["Unable to retrieve contact information."] = "Невозможно
 $a->strings["following"] = "следует";
 $a->strings["[no subject]"] = "[без темы]";
 $a->strings["End this session"] = "Конец этой сессии";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "Вход";
 $a->strings["Home Page"] = "Главная страница";
 $a->strings["Create an account"] = "Создать аккаунт";
@ -1519,6 +1542,8 @@ $a->strings["Search site content"] = "Поиск по сайту";
 $a->strings["Conversations on this site"] = "Беседы на этом сайте";
 $a->strings["Directory"] = "Каталог";
 $a->strings["People directory"] = "Каталог участников";
+$a->strings["Information"] = "";
+$a->strings["Information about this friendica instance"] = "";
 $a->strings["Conversations from your friends"] = "Беседы с друзьями";
 $a->strings["Network Reset"] = "Перезагрузка сети";
 $a->strings["Load Network page with no filters"] = "Загрузить страницу сети без фильтров";
@ -1530,7 +1555,7 @@ $a->strings["Inbox"] = "Входящие";
 $a->strings["Outbox"] = "Исходящие";
 $a->strings["Manage"] = "Управлять";
 $a->strings["Manage other pages"] = "Управление другими страницами";
-$a->strings["Delegations"] = "";
+$a->strings["Account settings"] = "Настройки аккаунта";
 $a->strings["Manage/Edit Profiles"] = "Управление/редактирование профилей";
 $a->strings["Manage/edit friends and contacts"] = "Управление / редактирование друзей и контактов";
 $a->strings["Site setup and configuration"] = "Установка и конфигурация сайта";
@ -1553,7 +1578,8 @@ $a->strings["Love/Romance:"] = "Любовь / Романтика:";
 $a->strings["Work/employment:"] = "Работа / Занятость:";
 $a->strings["School/education:"] = "Школа / Образование:";
 $a->strings["Image/photo"] = "Изображение / Фото";
-$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
 $a->strings["$1 wrote:"] = "$1 написал:";
 $a->strings["Encrypted content"] = "Зашифрованный контент";
 $a->strings["Unknown | Not categorised"] = "Неизвестно | Не определено";
@ -1573,6 +1599,9 @@ $a->strings["MySpace"] = "MySpace";
 $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
+$a->strings["Diaspora Connector"] = "";
+$a->strings["Statusnet"] = "";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "Разное";
 $a->strings["year"] = "год";
 $a->strings["month"] = "мес.";
@ -1601,6 +1630,8 @@ $a->strings["Richtext Editor"] = "Редактор RTF";
 $a->strings["Enable richtext editor"] = "Включить редактор RTF";
 $a->strings["Post Preview"] = "предварительный просмотр";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Разрешить предпросмотр сообщения и комментария перед их публикацией";
+$a->strings["Auto-mention Forums"] = "";
+$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "";
 $a->strings["Network Sidebar Widgets"] = "Виджет боковой панели \"Сеть\"";
 $a->strings["Search by Date"] = "Поиск по датам";
 $a->strings["Ability to select posts by date ranges"] = "Возможность выбора постов по диапазону дат";
@ -1632,6 +1663,8 @@ $a->strings["Star Posts"] = "Популярные посты";
 $a->strings["Ability to mark special posts with a star indicator"] = "Возможность отметить специальные сообщения индикатором популярности";
 $a->strings["Sharing notification from Diaspora network"] = "Делиться уведомлениями из сети Diaspora";
 $a->strings["Attachments:"] = "Вложения:";
+$a->strings["Errors encountered creating database tables."] = "Обнаружены ошибки при создании таблиц базы данных.";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "Видимо всем";
 $a->strings["A new person is sharing with you at "] = "Новый человек делится с вами";
 $a->strings["You have a new follower at "] = "У вас есть новый фолловер на ";
@ -1702,4 +1735,3 @@ $a->strings["Don't care"] = "Не беспокоить";
 $a->strings["Ask me"] = "Спросите меня";
 $a->strings["stopped following"] = "остановлено следование";
 $a->strings["Drop Contact"] = "Удалить контакт";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Не могу найти информацию для DNS-сервера базы данных '%s'";
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@ -143,7 +143,7 @@ blockquote {

 /* nav */
 nav {
-	height: 94px;
+	height: 60px;
 /*	width: 100%;*/
 	width: 320px;
 	display: block;
@ -239,7 +239,7 @@ nav #nav-link-wrapper .nav-link {
 }

 nav .nav-link {
-	margin-top: 24px;
+	margin-top: 16px;
 	margin-bottom: 0.2em;
 	margin-right: 1em;
 	margin-left: 1em;
@ -1202,11 +1202,11 @@ input#dfrn-url {
 	margin-left: 5px;
 	margin-right: 5px;

-	padding-top: 0px;
-/*	padding-left: 0.5em
-	padding-right: 0.5em;*/
+	padding-top: 5px;
+	padding-left: 5px;
+	padding-right: 5px;

-	border: 2px solid #AAAAAA;
+	border: 1px solid #AAAAAA;
 	border-radius: 10px;
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
@ -1510,10 +1510,9 @@ input#dfrn-url {
 	display: block;
 	margin-top: 15px;
 	background: #f3f3f3;
-	margin-left: 10px;
-	margin-right: 10px;
-
-	max-width: 90%;
+	margin-left: 5px;
+	margin-right: 5px;
+	border-radius: 10px;
 }

 .comment-wwedit-wrapper.comment {
--- a/view/theme/frost-mobile/templates/search_item.tpl
+++ b/view/theme/frost-mobile/templates/search_item.tpl
@ -7,7 +7,7 @@
 				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
 				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 48px; width: 48px;" alt="{{$item.name}}" /></a>
 				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
 				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
 					<ul>
--- a/view/theme/frost-mobile/templates/wall_thread.tpl
+++ b/view/theme/frost-mobile/templates/wall_thread.tpl
@ -13,7 +13,7 @@
 			{{if $item.owner_url}}
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
 				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 48px; width: 48px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
 				</a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
@ -23,7 +23,7 @@
                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
 			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 48px; width: 48px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
 				</a>
 				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@ -110,12 +110,14 @@ $a->strings["Posts font size"] = "文章";
 $a->strings["Textareas font size"] = "文本区字体大小";
 $a->strings["Set colour scheme"] = "选择色彩设计";
 $a->strings["default"] = "默认";
-$a->strings["Background Image"] = "背景图片";
-$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "图片的URL(比如在您的相册)要当背景图片用。";
-$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["dark"] = "";
+$a->strings["black"] = "";
+$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["Set resize level for images in posts and comments (width and height)"] = "选择图片在文章和评论的重设尺寸（宽和高）";
 $a->strings["Set theme width"] = "选择主题宽";
 $a->strings["Set style"] = "选择款式";
@ -386,7 +388,6 @@ $a->strings["view/smarty3 is writable"] = "能写view/smarty3";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = " URL改写在.htaccess不行。检查您服务器设置。";
 $a->strings["Url rewrite is working"] = "URL改写发挥机能";
 $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."] = "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
-$a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
 $a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "重要：您要[手工地]准备安排的任务给喂器。";
 $a->strings["Theme settings updated."] = "主题设置更新了。";
@ -522,11 +523,15 @@ $a->strings["Suppress Language"] = "封锁语言";
 $a->strings["Suppress language information in meta information about a posting."] = "遗漏语言消息从文章的描述";
 $a->strings["Path to item cache"] = "路线到项目缓存";
 $a->strings["Cache duration in seconds"] = "缓存时间秒";
-$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "缓存文件应该保存多久？默认是86400秒（一天）。";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "";
+$a->strings["Maximum numbers of comments per post"] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
 $a->strings["Path for lock file"] = "路线到锁文件";
 $a->strings["Temp path"] = "临时文件路线";
 $a->strings["Base path to installation"] = "基础安装路线";
 $a->strings["New base url"] = "新基础URL";
+$a->strings["Enable noscrape"] = "";
+$a->strings["The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping."] = "";
 $a->strings["Update has been marked successful"] = "更新当成功标签了";
 $a->strings["Executing %s failed. Check system logs."] = "把%s实行没通过了。看系统记录。";
 $a->strings["Update %s was successfully applied."] = "把%s更新成功地实行。";
@ -858,6 +863,9 @@ $a->strings["Number of items to display per page when viewed from mobile device:
 $a->strings["Don't show emoticons"] = "别表示请表符号";
 $a->strings["Don't show notices"] = "别表提示";
 $a->strings["Infinite scroll"] = "无限的滚动";
+$a->strings["Automatic updates only at the top of the network page"] = "";
+$a->strings["User Types"] = "";
+$a->strings["Community Types"] = "";
 $a->strings["Normal Account Page"] = "平常账户页";
 $a->strings["This account is a normal personal profile"] = "这个帐户是正常私人简介";
 $a->strings["Soapbox Page"] = "演讲台页";
@ -958,6 +966,7 @@ $a->strings["public profile"] = "公开简介";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s把%2\$s变化成&ldquo;%3\$s&rdquo;";
 $a->strings[" - Visit %1\$s's %2\$s"] = " - 看 %1\$s的%2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s有更新的%2\$s，修改%3\$s.";
+$a->strings["Hide contacts and friends:"] = "";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "藏起来发现您的熟人／朋友单不让这个简介看着看？";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
 $a->strings["Change Profile Photo"] = "改变简介照片";
@ -1299,6 +1308,7 @@ $a->strings["There is no conversation with this id."] = "没有这个ID的对话
 $a->strings["view full size"] = "看全尺寸";
 $a->strings["Starts:"] = "开始：";
 $a->strings["Finishes:"] = "结束：";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
 $a->strings["(no subject)"] = "沒有题目";
 $a->strings["noreply"] = "noreply";
 $a->strings["An invitation is required."] = "邀请必要的。";
@ -1349,6 +1359,7 @@ $a->strings["Tag term:"] = "标签:";
 $a->strings["Where are you right now?"] = "你在哪里?";
 $a->strings["Delete item(s)?"] = "把项目删除吗？";
 $a->strings["Post to Email"] = "电邮发布";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
 $a->strings["permissions"] = "权利";
 $a->strings["Post to Groups"] = "发到组";
 $a->strings["Post to Contacts"] = "发到熟人";
@ -1493,6 +1504,8 @@ $a->strings["Unable to retrieve contact information."] = "不能取回熟人消
 $a->strings["following"] = "关注";
 $a->strings["[no subject]"] = "[无题目]";
 $a->strings["End this session"] = "结束这段时间";
+$a->strings["Your videos"] = "";
+$a->strings["Your personal notes"] = "";
 $a->strings["Sign in"] = "登记";
 $a->strings["Home Page"] = "主页";
 $a->strings["Create an account"] = "注册";
@ -1539,8 +1552,8 @@ $a->strings["Love/Romance:"] = "爱情／浪漫";
 $a->strings["Work/employment:"] = "工作";
 $a->strings["School/education:"] = "学院／教育";
 $a->strings["Image/photo"] = "图像／照片";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
 $a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a>写了下面的<a href=\"%s\" target=\"_blank\">消息</a>";
-$a->strings["<span><b>"] = "<span><b>";
 $a->strings["$1 wrote:"] = "$1写：";
 $a->strings["Encrypted content"] = "加密的内容";
 $a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
@ -1562,6 +1575,7 @@ $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Diaspora连接";
 $a->strings["Statusnet"] = "Statusnet";
+$a->strings["App.net"] = "";
 $a->strings["Miscellaneous"] = "形形色色";
 $a->strings["year"] = "年";
 $a->strings["month"] = "月";
@ -1623,6 +1637,8 @@ $a->strings["Star Posts"] = "文章星";
 $a->strings["Ability to mark special posts with a star indicator"] = "能把优秀文章跟星标注";
 $a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
 $a->strings["Attachments:"] = "附件：";
+$a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
+$a->strings["Errors encountered performing database changes."] = "";
 $a->strings["Visible to everybody"] = "任何人可见的";
 $a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
 $a->strings["You have a new follower at "] = "你有新的关注者在";
@ -1693,4 +1709,3 @@ $a->strings["Don't care"] = "无所谓";
 $a->strings["Ask me"] = "问我";
 $a->strings["stopped following"] = "结束关注了";
 $a->strings["Drop Contact"] = "删除熟人";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";