bump version

Update hmessages.po

Zotlabs/Lib/Apps.php

@@ -785,6 +785,7 @@ class Apps {
 			dbesc($darray['app_plugin']),
 			intval($darray['app_deleted'])
 		);
+
 		if($r) {
 			$ret['success'] = true;
 			$ret['app_id'] = $darray['app_id'];
@@ -871,6 +872,12 @@ class Apps {
 			dbesc($darray['app_id']),
 			intval($darray['app_channel'])
 		);
+
+		// if updating an embed app, don't mess with any existing categories.
+
+		if(array_key_exists('embed',$arr) && intval($arr['embed']))
+			return $ret;
+
 		if($x) {
 			q("delete from term where otype = %d and oid = %d",
 				intval(TERM_OBJ_APP),

Zotlabs/Module/Admin/Site.php

@@ -38,7 +38,11 @@ class Site {
 		$site_sellpage		=	((x($_POST,'site_sellpage'))	? notags(trim($_POST['site_sellpage']))		: '');
 		$site_location		=	((x($_POST,'site_location'))	? notags(trim($_POST['site_location']))		: '');
 		$frontpage			=	((x($_POST,'frontpage'))	? notags(trim($_POST['frontpage']))		: '');
-		$firstpage		    =	((x(trim($_POST,'firstpage')))	? notags(trim($_POST['firstpage']))		: 'profiles');
+		$firstpage		    =	((x($_POST,'firstpage'))	? notags(trim($_POST['firstpage']))		: 'profiles');
+		// check value after trim
+		if(! $firstpage) {
+			$firstpage = 'profiles';
+		}
 		$mirror_frontpage	=	((x($_POST,'mirror_frontpage'))	? intval(trim($_POST['mirror_frontpage']))		: 0);
 		$directory_server	=	((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : '');
 		$allowed_sites		=	((x($_POST,'allowed_sites'))	? notags(trim($_POST['allowed_sites']))		: '');

Zotlabs/Module/Appman.php

@@ -25,6 +25,7 @@ class Appman extends \Zotlabs\Web\Controller {
 				'photo' => escape_tags($_REQUEST['photo']),
 				'version' => escape_tags($_REQUEST['version']),
 				'price' => escape_tags($_REQUEST['price']),
+				'page' => escape_tags($_REQUEST['page']),
 				'requires' => escape_tags($_REQUEST['requires']),
 				'system' => intval($_REQUEST['system']),
 				'plugin' => escape_tags($_REQUEST['plugin']),

Zotlabs/Module/Articles.php

@@ -127,21 +127,26 @@ class Articles extends \Zotlabs\Web\Controller {
 			$editor = '';
 		}
 		
+		$itemspage = get_pconfig(local_channel(),'system','itemspage');
+		\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
+
 		
 		$sql_extra = item_permissions_sql($owner);
+		$sql_item = '';
 
 		if($selected_card) {
 			$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1",
 				dbesc($selected_card)
 			);
 			if($r) {
-				$sql_extra .= "and item.id = " . intval($r[0]['iid']) . " ";
+				$sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
 			}
 		}
 				
 		$r = q("select * from item 
 			where item.uid = %d and item_type = %d 
-			$sql_extra order by item.created desc",
+			$sql_extra $sql_item order by item.created desc $pager_sql",
 			intval($owner),
 			intval(ITEM_TYPE_ARTICLE)
 		);
@@ -152,6 +157,8 @@ class Articles extends \Zotlabs\Web\Controller {
 
 		if($r) {
 
+			$pager_total = count($r);
+
 			$parents_str = ids_to_querystr($r,'id');
 
 			$items = q("SELECT item.*, item.id AS item_id
@@ -173,13 +180,18 @@ class Articles extends \Zotlabs\Web\Controller {
 
 		$mode = 'articles';
 			
-     	$content = conversation($items,$mode,false,'traditional');
+		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
+            $page_mode = 'pager_list';
+        else
+            $page_mode = 'traditional';
+
+     	$content = conversation($items,$mode,false,$page_mode);
 
 		$o = replace_macros(get_markup_template('cards.tpl'), [
 			'$title' => t('Articles'),
 			'$editor' => $editor,
 			'$content' => $content,
-			'$pager' => alt_pager($a,count($items))
+			'$pager' => alt_pager($a,$pager_total)
 		]);
 
         return $o;

Zotlabs/Module/Cards.php

@@ -131,20 +131,26 @@ class Cards extends \Zotlabs\Web\Controller {
 		}
 
 
+		$itemspage = get_pconfig(local_channel(),'system','itemspage');
+		\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
+
+
 		$sql_extra = item_permissions_sql($owner);
+		$sql_item = '';
 
 		if($selected_card) {
 			$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
 				dbesc($selected_card)
 			);
 			if($r) {
-				$sql_extra .= "and item.id = " . intval($r[0]['iid']) . " ";
+				$sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
 			}
 		}
 
 		$r = q("select * from item
 			where uid = %d and item_type = %d
-			$sql_extra order by item.created desc",
+			$sql_extra $sql_item order by item.created desc $pager_sql",
 			intval($owner),
 			intval(ITEM_TYPE_CARD)
 		);
@@ -156,6 +162,8 @@ class Cards extends \Zotlabs\Web\Controller {
 		$items_result = [];
 		if($r) {
 
+			$pager_total = count($r);
+
 			$parents_str = ids_to_querystr($r, 'id');
 
 			$items = q("SELECT item.*, item.id AS item_id
@@ -175,13 +183,18 @@ class Cards extends \Zotlabs\Web\Controller {
 
 		$mode = 'cards';
 
-		$content = conversation($items_result, $mode, false, 'traditional');
+		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
+			$page_mode = 'pager_list';
+		else
+			$page_mode = 'traditional';
+
+		$content = conversation($items_result, $mode, false, $page_mode);
 
 		$o = replace_macros(get_markup_template('cards.tpl'), [
 			'$title' => t('Cards'),
 			'$editor' => $editor,
 			'$content' => $content,
-			'$pager' => alt_pager($a, count($items_result))
+			'$pager' => alt_pager($a, $pager_total)
 		]);
 
 		return $o;

Zotlabs/Module/Display.php

@@ -134,6 +134,40 @@ class Display extends \Zotlabs\Web\Controller {
 			 	return '';
 			}
 		}
+		if($target_item['item_type']  == ITEM_TYPE_ARTICLE) {
+			$x = q("select * from channel where channel_id = %d limit 1",
+				intval($target_item['uid'])
+			);
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
+				intval($target_item['uid']),
+				intval($target_item['id'])
+			);
+			if($x && $y) {
+				goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+			}
+			else {
+				notice( t('Page not found.') . EOL);
+			 	return '';
+			}
+		}
+		if($target_item['item_type']  == ITEM_TYPE_CARD) {
+			$x = q("select * from channel where channel_id = %d limit 1",
+				intval($target_item['uid'])
+			);
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
+				intval($target_item['uid']),
+				intval($target_item['id'])
+			);
+			if($x && $y) {
+				goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+			}
+			else {
+				notice( t('Page not found.') . EOL);
+			 	return '';
+			}
+		}
 		
 		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
 	

Zotlabs/Module/Item.php

@@ -830,6 +830,12 @@ class Item extends \Zotlabs\Web\Controller {
 		$datarray['plink']               = $plink;
 		$datarray['route']               = $route;
 	
+
+		// A specific ACL over-rides public_policy completely
+ 
+		if(! empty_acl($datarray))
+			$datarray['public_policy'] = '';
+
 		if($iconfig)
 			$datarray['iconfig'] = $iconfig;
 	

Zotlabs/Module/Ochannel.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Zotlabs\Module;
+
+require_once('include/contact_widgets.php');
+require_once('include/items.php');
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+require_once('include/permissions.php');
+
+/**
+ * @brief Channel Controller for broken OStatus implementations
+ *
+ */
+class Ochannel extends \Zotlabs\Web\Controller {
+
+	function init() {
+
+		$which = null;
+		if(argc() > 1)
+			$which = argv(1);
+		if(! $which) {
+			if(local_channel()) {
+				$channel = \App::get_channel();
+				if($channel && $channel['channel_address'])
+				$which = $channel['channel_address'];
+			}
+		}
+		if(! $which) {
+			notice( t('You must be logged in to see this page.') . EOL );
+			return;
+		}
+
+		$profile = 0;
+		$channel = \App::get_channel();
+
+		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$which = $channel['channel_address'];
+			$profile = argv(1);
+		}
+
+		head_add_link( [ 
+			'rel'   => 'alternate', 
+			'type'  => 'application/atom+xml',
+			'href'  => z_root() . '/ofeed/' . $which
+		]);
+
+
+		// Run profile_load() here to make sure the theme is set before
+		// we start loading content
+
+		profile_load($which,$profile);
+	}
+
+	function get($update = 0, $load = false) {
+
+		if(argc() < 2)
+			return;
+
+		if($load)
+			$_SESSION['loadtime'] = datetime_convert();
+
+		return '<script>window.location.href = "' . z_root() . '/' . str_replace('ochannel/','channel/',\App::$query_string) . '";</script>';
+
+	}
+
+}

Zotlabs/Module/Rpost.php

@@ -45,7 +45,9 @@ class Rpost extends \Zotlabs\Web\Controller {
 				$url = get_rpost_path(\App::get_observer());
 				// make sure we're not looping to our own hub
 				if(($url) && (! stristr($url, \App::get_hostname()))) {
-					foreach($_REQUEST as $key => $arg) {
+					foreach($_GET as $key => $arg) {
+						if($key === 'q')
+							continue;
 						$url .= '&' . $key . '=' . $arg;
 					}
 					goaway($url);

Zotlabs/Module/Tagger.php

@@ -80,6 +80,8 @@ class Tagger extends \Zotlabs\Web\Controller {
 				break;
 		}
 	
+
+		$clean_term = trim($term,'"\' ');
 	
 		$links = array(array('rel' => 'alternate','type' => 'text/html', 
 			'href' => z_root() . '/display/' . gen_link_id($item['mid'])));
@@ -103,15 +105,15 @@ class Tagger extends \Zotlabs\Web\Controller {
 				),
 		));
 	
-		$tagid = z_root() . '/search?tag=' . $term;
+		$tagid = z_root() . '/search?tag=' . $clean_term;
 		$objtype = ACTIVITY_OBJ_TAGTERM;
 	
 		$obj = json_encode(array(
 			'type'    => $objtype,
 			'id'      => $tagid,
 			'link'    => array(array('rel' => 'alternate','type' => 'text/html', 'href' => $tagid)),
-			'title'   => $term,
-			'content' => $term
+			'title'   => $clean_term,
+			'content' => $clean_term
 		));
 	
 		$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
@@ -119,7 +121,7 @@ class Tagger extends \Zotlabs\Web\Controller {
 		// saving here for reference
 		// also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!!
 	
-		$termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($term) . ']'. $term . '[/zrl]';
+		$termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($clean_term) . ']'. $clean_term . '[/zrl]';
 	
 		$channel = \App::get_channel();
 	
@@ -143,8 +145,7 @@ class Tagger extends \Zotlabs\Web\Controller {
 		$arr['obj_type'] = $objtype;
 		$arr['obj'] = $obj;
 		$arr['parent_mid'] = $item['mid'];
-		
-		store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid);
+		store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$clean_term,$tagid);
 		$ret = post_activity_item($arr);
 
 		if($ret['success']) {

Zotlabs/Widget/Newmember.php

@@ -46,7 +46,7 @@ class Newmember {
 
 			t('Communicate'),
 			[
-				'channel/' . $channel['channel_address']       => t('View your channel homepage'),
+				'channel/' . $c['channel_address']       => t('View your channel homepage'),
 				'network'       => t('View your network stream'),
 			],
 

boot.php

@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.2' );
+define ( 'STD_VERSION',             '3.2.2' );
 define ( 'ZOT_REVISION',            '1.3' );
 define ( 'DB_UPDATE_VERSION',       1207 );
 

include/conversation.php

@@ -838,11 +838,11 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 					$item_object = new Zotlabs\Lib\ThreadItem($item);
 					$conv->add_thread($item_object);
-					if($page_mode === 'list') {
+					if(($page_mode === 'list') || ($page_mode === 'pager_list')) {
 						$item_object->set_template('conv_list.tpl');
 						$item_object->set_display_mode('list');
 					}
-					if($page_mode === 'cards') {
+					if($mode === 'cards' || $mode === 'articles') {
 						$item_object->set_reload($jsreload);
 					}
 
@@ -857,7 +857,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 		}
 	}
 
-	if($page_mode === 'traditional' || $page_mode === 'preview') {
+	if(in_array($page_mode, [ 'traditional', 'preview', 'pager_list'] )) {
 		$page_template = get_markup_template("threaded_conversation.tpl");
 	}
 	elseif($update) {

include/items.php

@@ -969,6 +969,10 @@ function import_author_unknown($x) {
 	return false;
 }
 
+function empty_acl($item) {
+	return (($item['allow_cid'] === EMPTY_STR && $item['allow_gid'] === EMPTY_STR && $item['deny_cid'] === EMPTY_STR && $item['deny_gid'] === EMPTY_STR) ? true : false);
+}
+
 function encode_item($item,$mirror = false) {
 	$x = array();
 	$x['type'] = 'activity';

include/markdown.php

@@ -207,7 +207,7 @@ function bb_to_markdown($Text, $options = []) {
 	$Text = bbcode($Text, [ 'tryoembed' => false ]);
 
 	// Markdownify does not preserve previously escaped html entities such as <> and &.
-	$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
+	//$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
 
 	// Now convert HTML to Markdown
 
@@ -215,7 +215,7 @@ function bb_to_markdown($Text, $options = []) {
 
 	// It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
 
-	$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
+	//$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
 
 	// If the text going into bbcode() has a plain URL in it, i.e.
 	// with no [url] tags around it, it will come out of parseString()

include/network.php

@@ -1873,7 +1873,7 @@ function probe_api_path($host) {
 		foreach($paths as $path) {
 			$curpath = $scheme . '://' . $host . $path;
 			$x = z_fetch_url($curpath);
-			if($x['success'] && ! strlen($x['body'], 'not implemented'))
+			if($x['success'] && ! strpos($x['body'], 'not implemented'))
 				return str_replace('version', '', $curpath);
 		}
 	}

include/taxonomy.php

@@ -182,11 +182,10 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
 		$sql_options .= " and owner_xchan  = '" . dbesc($owner) . "' ";
 	}	
 
-
 	// Fetch tags
 	$r = q("select term, count(term) as total from term left join item on term.oid = item.id
 		where term.uid = %d and term.ttype = %d 
-		and otype = %d and item_type = %d and item_private = 0
+		and otype = %d and item_type = %d 
 		$sql_options $item_normal
 		group by term order by total desc %s",
 		intval($uid),
@@ -196,6 +195,7 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
 		((intval($count)) ? "limit $count" : '')
 	);
 
+
 	if(! $r)
 		return array();
 

include/text.php

@@ -1491,7 +1491,7 @@ function format_hashtags(&$item) {
 			$term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ;
 			if(! trim($term))
 				continue;
-			if(strpos($item['body'], $t['url']))
+			if($t['url'] && strpos($item['body'], $t['url']))
 				continue;
 			if($s)
 				$s .= ' ';

install/schema_mysql.sql

@@ -659,13 +659,10 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `uid_item_retained` (`uid`, `item_retained`),
   KEY `uid_item_private` (`uid`, `item_private`),
   KEY `uid_resource_type` (`uid`, `resource_type`),
-  KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),
   KEY `resource_id` (`resource_id`),
   KEY `resource_type` (`resource_type`),
-  KEY `item_restrict` (`item_restrict`),
-  KEY `item_flags` (`item_flags`),
   KEY `commented` (`commented`),
   KEY `verb` (`verb`),
   KEY `obj_type` (`obj_type`),

view/ca/lostpass_eml.tpl

@@ -1,35 +1,32 @@
 
 Apreciat/da {{$username}},
-	
-	S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir
-la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
-verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+	Recentment hem rebut una petició en {{$sitename}} per canviar la contrasenya  
+del teu compte. Per tal de confirmar aquesta petició, si us plau sel·lecciona l'enllaç de verificació
+de sota o enganxa'l a la barra de direccions del teu navegador. 
 
-Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
-i/o elimina aquest missatge.
+Si NO has fet cap petició de canvi, si us plau, NO segueixis l'enllaç
+i ignora i/o esborra aquest missatge. 
 
-La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
-va emetre aquesta sol·licitud.
+La teva contrasenya no es modificara mentres no verifiquis que has
+enviat aquesta petició. 
 
 Segueix aquest enllaç per verificar la teva identitat:
 
 {{$reset_link}}
 
-A continuació rebràs un missatge amb la nova contrasenya.
+Rebràs un missatge amb la nova contrasenya.
 
-Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
-configuració.
+pots canviar aquesta contrasenya en el teu compte desprès de que hagis accedit.
 
-Les dades d'accés són els següents:
+Les dades d'identificació son les següents:
 
-
-Lloc:	{{$siteurl}}
-Nom:	{{$email}}
+Localització del Lloc Web:	{{$siteurl}}
+Nom Identificatiu:⇥{{$email}}
 
 
 
 
-Salutacions,
-	L'administració de {{$sitename}}
+Atentament,
+	{{$sitename}} Administrador
 
- 
+ 

view/ca/messages.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the Red package.
 # 
 # Translators:
-# Espart <ranker72@gmail.com>, 2015
+# fadelkon <fadelkon@posteo.net>, 2015
 # Rafael Garau, 2016
 # Rafael Garau, 2013-2015
 # Rafael Garau, 2015
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-20 00:01-0700\n"
-"PO-Revision-Date: 2016-02-19 11:17+0000\n"
+"POT-Creation-Date: 2016-07-08 00:01-0700\n"
+"PO-Revision-Date: 2017-09-23 19:03+0000\n"
 "Last-Translator: Rafael Garau\n"
 "Language-Team: Catalan (Spain) (http://www.transifex.com/Friendica/red-matrix/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -199,7 +199,7 @@ msgstr "Editar Perfils"
 msgid "Manage/Edit profiles"
 msgstr "Gestiona/Edita perfils"
 
-#: ../../include/nav.php:95 ../../include/identity.php:979
+#: ../../include/nav.php:95 ../../include/identity.php:987
 msgid "Edit Profile"
 msgstr "Edita Perfil"
 
@@ -844,7 +844,7 @@ msgstr "Editar Personal App"
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:956 ../../mod/match.php:64
+#: ../../include/identity.php:964 ../../mod/match.php:64
 #: ../../mod/directory.php:316 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Connecta "
@@ -1110,7 +1110,7 @@ msgid "View all"
 msgstr "Mostra-ho tot"
 
 #: ../../include/ItemObject.php:179 ../../include/conversation.php:1712
-#: ../../include/identity.php:1266 ../../include/taxonomy.php:396
+#: ../../include/identity.php:1274 ../../include/taxonomy.php:396
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -1470,7 +1470,7 @@ msgstr "Visita %1$s de %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s Ha actualitzat %2$s, canviant %3$s."
 
-#: ../../include/api.php:1178
+#: ../../include/api.php:1203
 msgid "Public Timeline"
 msgstr "Cronologia pública"
 
@@ -1482,8 +1482,8 @@ msgstr "Administració"
 msgid "Address Book"
 msgstr "Adreçes"
 
-#: ../../include/apps.php:138 ../../include/identity.php:1240
-#: ../../include/identity.php:1357 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1248
+#: ../../include/identity.php:1365 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1659,7 +1659,7 @@ msgstr "Adjuntat:"
 
 #: ../../include/bb2diaspora.php:459 ../../include/event.php:22
 msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
+msgstr "l d \\d\\e/\\d' F de Y \\@ H:i T"
 
 #: ../../include/bb2diaspora.php:461
 msgid "$Projectname event notification:"
@@ -1674,7 +1674,7 @@ msgid "Finishes:"
 msgstr "Acaba:"
 
 #: ../../include/bb2diaspora.php:481 ../../include/event.php:50
-#: ../../include/identity.php:1007 ../../mod/directory.php:302
+#: ../../include/identity.php:1015 ../../mod/directory.php:302
 #: ../../mod/events.php:684
 msgid "Location:"
 msgstr "Lloc:"
@@ -3061,11 +3061,11 @@ msgstr "No es pot recuperar la identitat creada"
 msgid "Default Profile"
 msgstr "Perfil per Defecte"
 
-#: ../../include/identity.php:759
+#: ../../include/identity.php:767
 msgid "Requested channel is not available."
 msgstr "El canal demanat no està disponible."
 
-#: ../../include/identity.php:806 ../../mod/achievements.php:11
+#: ../../include/identity.php:814 ../../mod/achievements.php:11
 #: ../../mod/blocks.php:29 ../../mod/profile.php:16 ../../mod/connect.php:13
 #: ../../mod/editblock.php:29 ../../mod/editlayout.php:27
 #: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
@@ -3073,188 +3073,188 @@ msgstr "El canal demanat no està disponible."
 msgid "Requested profile is not available."
 msgstr "El perfil demanat no està disponible."
 
-#: ../../include/identity.php:969 ../../mod/profiles.php:774
+#: ../../include/identity.php:977 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Canviar la foto del perfil"
 
-#: ../../include/identity.php:975
+#: ../../include/identity.php:983
 msgid "Profiles"
 msgstr "Perfils"
 
-#: ../../include/identity.php:975
+#: ../../include/identity.php:983
 msgid "Manage/edit profiles"
 msgstr "Gestiona/edita perfils"
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:775
+#: ../../include/identity.php:984 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Crear un Perfil Nou"
 
-#: ../../include/identity.php:991 ../../mod/profiles.php:786
+#: ../../include/identity.php:999 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Imatge del Perfil"
 
-#: ../../include/identity.php:994
+#: ../../include/identity.php:1002
 msgid "visible to everybody"
 msgstr "visible per tothom"
 
-#: ../../include/identity.php:995 ../../mod/profiles.php:669
+#: ../../include/identity.php:1003 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Editar visibilitat"
 
-#: ../../include/identity.php:1011 ../../include/identity.php:1250
+#: ../../include/identity.php:1019 ../../include/identity.php:1258
 msgid "Gender:"
 msgstr "Gènere:"
 
-#: ../../include/identity.php:1012 ../../include/identity.php:1294
+#: ../../include/identity.php:1020 ../../include/identity.php:1302
 msgid "Status:"
 msgstr "Estatus:"
 
-#: ../../include/identity.php:1013 ../../include/identity.php:1305
+#: ../../include/identity.php:1021 ../../include/identity.php:1313
 msgid "Homepage:"
 msgstr "Pàgina Personal:"
 
-#: ../../include/identity.php:1014
+#: ../../include/identity.php:1022
 msgid "Online Now"
 msgstr "Ara en Linia"
 
-#: ../../include/identity.php:1097 ../../include/identity.php:1175
+#: ../../include/identity.php:1105 ../../include/identity.php:1183
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../include/identity.php:1098 ../../include/identity.php:1176
+#: ../../include/identity.php:1106 ../../include/identity.php:1184
 msgid "F d"
 msgstr "F d"
 
-#: ../../include/identity.php:1143 ../../include/identity.php:1215
+#: ../../include/identity.php:1151 ../../include/identity.php:1223
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr "[avui]"
 
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1162
 msgid "Birthday Reminders"
 msgstr "Recordatori d'Aniversaris"
 
-#: ../../include/identity.php:1155
+#: ../../include/identity.php:1163
 msgid "Birthdays this week:"
 msgstr "Aniversari aquesta setmana:"
 
-#: ../../include/identity.php:1208
+#: ../../include/identity.php:1216
 msgid "[No description]"
 msgstr "[Sense descripció]"
 
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1234
 msgid "Event Reminders"
 msgstr "Recordatori d'Events"
 
-#: ../../include/identity.php:1227
+#: ../../include/identity.php:1235
 msgid "Events this week:"
 msgstr "Event aquesta setmana:"
 
-#: ../../include/identity.php:1248 ../../mod/settings.php:1056
+#: ../../include/identity.php:1256 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr "Nom Complet:"
 
-#: ../../include/identity.php:1255
+#: ../../include/identity.php:1263
 msgid "Like this channel"
 msgstr "M'agrada aquest canal"
 
-#: ../../include/identity.php:1279
+#: ../../include/identity.php:1287
 msgid "j F, Y"
 msgstr "j F, Y"
 
-#: ../../include/identity.php:1280
+#: ../../include/identity.php:1288
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1287
+#: ../../include/identity.php:1295
 msgid "Birthday:"
 msgstr "Aniversari:"
 
-#: ../../include/identity.php:1291 ../../mod/directory.php:297
+#: ../../include/identity.php:1299 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Edat:"
 
-#: ../../include/identity.php:1300
+#: ../../include/identity.php:1308
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per %1$d %2$s"
 
-#: ../../include/identity.php:1303 ../../mod/profiles.php:691
+#: ../../include/identity.php:1311 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Preferència Sexual:"
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:693
+#: ../../include/identity.php:1315 ../../mod/profiles.php:693
 #: ../../mod/directory.php:313
 msgid "Hometown:"
 msgstr "Ciutat Natal:"
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1317
 msgid "Tags:"
 msgstr "Etiquetes:"
 
-#: ../../include/identity.php:1311 ../../mod/profiles.php:694
+#: ../../include/identity.php:1319 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Idees Polítiques:"
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1321
 msgid "Religion:"
 msgstr "Religió:"
 
-#: ../../include/identity.php:1315 ../../mod/directory.php:315
+#: ../../include/identity.php:1323 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Sobre mi:"
 
-#: ../../include/identity.php:1317
+#: ../../include/identity.php:1325
 msgid "Hobbies/Interests:"
 msgstr "Aficions/Interessos:"
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:697
+#: ../../include/identity.php:1327 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "M'agrada:"
 
-#: ../../include/identity.php:1321 ../../mod/profiles.php:698
+#: ../../include/identity.php:1329 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "No li agrada:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1331
 msgid "Contact information and Social Networks:"
 msgstr "Informació de contacte i Xarxes Socials:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1333
 msgid "My other channels:"
 msgstr "Els meus altres canals:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1335
 msgid "Musical interests:"
 msgstr "Interessos Musicals:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1337
 msgid "Books, literature:"
 msgstr "Llibres, literatura:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1339
 msgid "Television:"
 msgstr "Televisió:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1341
 msgid "Film/dance/culture/entertainment:"
 msgstr "Películes/Dança/Cultura/Entreteniment:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1343
 msgid "Love/Romance:"
 msgstr "Amor/Romace:"
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1345
 msgid "Work/employment:"
 msgstr "Treball/feina:"
 
-#: ../../include/identity.php:1339
+#: ../../include/identity.php:1347
 msgid "School/education:"
 msgstr "Escola/educació:"
 
-#: ../../include/identity.php:1359
+#: ../../include/identity.php:1367
 msgid "Like this thing"
 msgstr "M'agrada això"
 
@@ -8845,7 +8845,7 @@ msgstr "Cerca a xchan"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Cerca a xchan començant per (o webbie)"
 
-#: ../../mod/zfinger.php:23
+#: ../../mod/zfinger.php:24
 msgid "invalid target signature"
 msgstr "Signatura objectiu invàlida"
 

view/ca/passchanged_eml.tpl

@@ -1,19 +1,20 @@
 
 Apreciat/da {{$username}},
-
-    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
-(o canvía immediatament la contrasenya amb quelcom que recordis).
+	La teva contrasenya ha estat canviada com has demanat. Si et plau, recorda 
+aquesta informació per a tu (o canvia-la immediatament a 
+quelcom que puguis recordar).
 
 
-Les teves dades d'accés son les següents:
+Les dades d'identificació son les següents:
 
-Lloc:	{{$siteurl}}
-Nom:	{{$email}}
+Localització del lloc Web:⇥{{$siteurl}}
+Nom Identificatiu:⇥{{$email}}
 Contrasenya:	{{$new_password}}
 
-Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+Pots canviar aquesta contrasenya en el teu compte desprès que hagis accedit.
 
 
-	{{$sitename}}
+Atentament,
+	{{$sitename}} Administrador
 
- 
+ 

view/ca/register_open_eml.tpl

@@ -1,22 +1,19 @@
 
-Apreciat/da {{$username}},
+S'ha creat un compte en {{$sitename}} per a aquesta adreça de correu. 
+Les dades d'identificació son les següents:
 
-	Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat.
+Localització del Lloc Web:⇥{{$siteurl}}
+Identificació:⇥{{$email}}
+Contrasenya: (la que has emprat durant el procés de registre)
 
+Si aquest compte s'ha creat sense el seu coneixement i no el desitja, pot 
+visitar aquest lloc web i canviar la contrasenya. Això li permetrà esborrar el 
+compte en els Ajustos de la pàgina, li demanem disculpes 
+per qualsevol inconvenient causat. 
 
-Les dades d'accés són les següents:
+Gràcies i benvingut a {{$sitename}}.
 
+Atentament,
+	{{$sitename}} Administrador
 
-Lloc:	{{$siteurl}}
-Nom:	{{$email}}
-Contrasenya:	{{$password}}
-
-
-Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
-
-Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
-
-
-Gràcies i benvingut/da {{$sitename}}.
-
- 
+ 

view/ca/register_verify_eml.tpl

@@ -1,23 +1,24 @@
 
-S'ha rebut la sol·licitud de registre d'un nou usuari en
-{{$sitename}} que requereix la teva aprovació.
-
-Les dades d'accés són els següents:
-
-Nom Complet: {{$username}}
-Lloc: {{$siteurl}}
-Nom: {{$email}}
+S'ha rebut una nova petició de registre en {{$sitename}} la qual cosa requereix 
+la seva aprovació. 
 
 
-Per aprovar aquesta sol·licitud, visita el següent enllaç:
+Les dades d'identificació son les següents:
 
-{{$siteurl}}/regmod/allow/{{$hash}}
+Localització del Lloc Web:	{{$siteurl}}
+Nom Identificatiu:⇥{{$email}}
+Adreça IP: {{$details}}
+
+Per tal d'aprovar aquesta petició, si us plau, visita el següent enllaç:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Per rebutjar la petició i esborrar el compte, si us plau visita:
 
-Per denegar la sol·licitud i eliminar el compte, per favor visita:
 
 {{$siteurl}}/regmod/deny/{{$hash}}
 
 
 Gràcies.
-
-

view/css/conversation.css

@@ -282,8 +282,9 @@ code.inline-code {
 }
 
 img.smiley.emoji:hover {
-	width: 32px;
-	height: 32px;
+	transform: scale(2);
+	transition: transform .1s ease-out;
+	filter: drop-shadow(0px 0px 1px rgba(0,0,0,.5));
 }
 
 .checklist input {

view/css/widgets.css

@@ -230,4 +230,5 @@ a.wikilist {
 	font-size: 20px;
 	margin-left: -25px;
 	margin-top: 25px;
+	opacity: 0.8;
 }

view/es-es/hmessages.po

@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-01 08:51+0100\n"
-"PO-Revision-Date: 2018-03-02 17:15+0000\n"
+"PO-Revision-Date: 2018-03-13 09:54+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -12672,19 +12672,19 @@ msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?"
 
 #: ../../include/js_strings.php:31
 msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+msgstr "hace "
 
 #: ../../include/js_strings.php:32
 msgid "timeago.prefixFromNow"
-msgstr "timeago.prefixFromNow"
+msgstr "en "
 
 #: ../../include/js_strings.php:33
 msgid "timeago.suffixAgo"
-msgstr "timeago.suffixAgo"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:34
 msgid "timeago.suffixFromNow"
-msgstr "timeago.suffixFromNow"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:37
 msgid "less than a minute"
@@ -13338,7 +13338,7 @@ msgstr "ficha"
 
 #: ../../include/bbcode.php:337
 msgid "article"
-msgstr "artículo"
+msgstr "el artículo"
 
 #: ../../include/bbcode.php:420 ../../include/bbcode.php:428
 msgid "Click to open/close"
@@ -13350,7 +13350,7 @@ msgstr "spoiler"
 
 #: ../../include/bbcode.php:441
 msgid "View article"
-msgstr "Ver artículo"
+msgstr "Ver el artículo"
 
 #: ../../include/bbcode.php:441
 msgid "View summary"

view/es-es/hstrings.php

@@ -2857,10 +2857,10 @@ App::$strings["Rate This Channel (this is public)"] = "Valorar este canal (esto
 App::$strings["Describe (optional)"] = "Describir (opcional)";
 App::$strings["Please enter a link URL"] = "Por favor, introduzca una dirección de enlace";
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Cambios no guardados. ¿Está seguro de que desea abandonar la página?";
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
-App::$strings["timeago.suffixAgo"] = "timeago.suffixAgo";
-App::$strings["timeago.suffixFromNow"] = "timeago.suffixFromNow";
+App::$strings["timeago.prefixAgo"] = "hace ";
+App::$strings["timeago.prefixFromNow"] = "en ";
+App::$strings["timeago.suffixAgo"] = "NONE";
+App::$strings["timeago.suffixFromNow"] = "NONE";
 App::$strings["less than a minute"] = "menos de un minuto";
 App::$strings["about a minute"] = "alrededor de un minuto";
 App::$strings["%d minutes"] = "%d minutos";
@@ -3014,10 +3014,10 @@ App::$strings["Encrypted content"] = "Contenido cifrado";
 App::$strings["Install %1\$s element %2\$s"] = "Instalar el elemento de%1\$s%2\$s";
 App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
 App::$strings["card"] = "ficha";
-App::$strings["article"] = "artículo";
+App::$strings["article"] = "el artículo";
 App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
 App::$strings["spoiler"] = "spoiler";
-App::$strings["View article"] = "Ver artículo";
+App::$strings["View article"] = "Ver el artículo";
 App::$strings["View summary"] = "Ver sumario";
 App::$strings["$1 wrote:"] = "$1 escribió:";
 App::$strings[" by "] = "por";

view/fr/hmessages.po

@@ -23,7 +23,7 @@ msgstr ""
 
 #: ../../Zotlabs/Access/Permissions.php:46
 msgid "Can view my channel stream and posts"
-msgstr "Peut voir mon canal et mes publicatiosn"
+msgstr "Peut voir mon canal et mes publications"
 
 #: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42
 msgid "Can send me their channel stream and posts"
@@ -75,7 +75,7 @@ msgstr "Peuvent m'envoyer des messages privés"
 
 #: ../../Zotlabs/Access/Permissions.php:59
 msgid "Can like/dislike profiles and profile things"
-msgstr "Peut aimer ou détester des profiles"
+msgstr "Peut aimer ou détester des profils"
 
 #: ../../Zotlabs/Access/Permissions.php:60
 msgid "Can forward to all my channel connections via @+ mentions in posts"
@@ -347,7 +347,7 @@ msgstr "Voir"
 
 #: ../../Zotlabs/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
-msgstr "Limite du nombre total d'invitation dépassée."
+msgstr "Limite du nombre total d'invitations dépassée."
 
 #: ../../Zotlabs/Module/Invite.php:53
 #, php-format
@@ -654,7 +654,7 @@ msgstr "Emplacement introuvable."
 
 #: ../../Zotlabs/Module/Locs.php:62
 msgid "Location lookup failed."
-msgstr "Echec de la recherche de l'emplacement."
+msgstr "Échec de la recherche de l'emplacement."
 
 #: ../../Zotlabs/Module/Locs.php:66
 msgid ""
@@ -868,7 +868,7 @@ msgstr "Les nombres les plus élevés seront au bas de la liste"
 
 #: ../../Zotlabs/Module/Mitem.php:165
 msgid "Submit and finish"
-msgstr "Vadiler et terminer"
+msgstr "Valider et terminer"
 
 #: ../../Zotlabs/Module/Mitem.php:166
 msgid "Submit and continue"
@@ -953,7 +953,7 @@ msgstr "Impossible de générer l'aperçu."
 
 #: ../../Zotlabs/Module/Events.php:119
 msgid "Event title and start time are required."
-msgstr "Un titre et une date de début sont requises pour l'événement."
+msgstr "Un titre et une date de début sont nécessaires pour l'événement."
 
 #: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
 msgid "Event not found."

view/tpl/navbar_default.tpl

@@ -91,7 +91,7 @@
 <div class="collapse navbar-collapse" id="navbar-collapse-1">
 	<ul class="navbar-nav mr-auto">
 		{{if $nav.login && !$userinfo}}
-		<li class="nav-item d-none d-xl-flex">
+		<li class="nav-item d-lg-flex">
 			{{if $nav.loginmenu.1.4}}
 			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">
 			{{$nav.loginmenu.1.1}}
@@ -104,12 +104,12 @@
 		</li>
 		{{/if}}
 		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.register.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
 		</li>
 		{{/if}}
 		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.alogout.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
 		</li>
 		{{/if}}

view/tpl/navbar_tucson.tpl

@@ -91,7 +91,7 @@
 <div class="collapse navbar-collapse" id="navbar-collapse-1">
 	<ul class="navbar-nav mr-auto">
 		{{if $nav.login && !$userinfo}}
-		<li class="nav-item d-none d-xl-flex">
+		<li class="nav-item d-lg-flex">
 			{{if $nav.loginmenu.1.4}}
 			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">
 			{{$nav.loginmenu.1.1}}
@@ -104,12 +104,12 @@
 		</li>
 		{{/if}}
 		{{if $nav.register}}
-		<li class="nav-item {{$nav.register.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.register.2}} d-lg-flex">
 			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
 		</li>
 		{{/if}}
 		{{if $nav.alogout}}
-		<li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex">
+		<li class="nav-item {{$nav.alogout.2}} d-none d-lg-flex">
 			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
 		</li>
 		{{/if}}