- module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
-
-
-
-
- Shiny Trinket
+ *Shiny trinkets are shiny.
+ * + * @endverbatim + */ + public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) { + + $a = get_app(); + + $siteinfo = array(); + + // Check if the URL does contain a scheme + $scheme = parse_url($url, PHP_URL_SCHEME); + + if ($scheme == "") { + $url = "http://".trim($url, "/"); + } + + if ($count > 10) { + logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG); + return($siteinfo); + } + + $url = trim($url, "'"); + $url = trim($url, '"'); + + $url = original_url($url); + + $siteinfo["url"] = $url; + $siteinfo["type"] = "link"; + + $check_cert = Config::get("system", "verifyssl"); + + $stamp1 = microtime(true); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_NOBODY, 1); + curl_setopt($ch, CURLOPT_TIMEOUT, 3); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent()); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false)); + + $header = curl_exec($ch); + $curl_info = @curl_getinfo($ch); + $http_code = $curl_info["http_code"]; + curl_close($ch); + + $a->save_timestamp($stamp1, "network"); + + if ((($curl_info["http_code"] == "301") || ($curl_info["http_code"] == "302") || ($curl_info["http_code"] == "303") || ($curl_info["http_code"] == "307")) + && (($curl_info["redirect_url"] != "") || ($curl_info["location"] != ""))) { + if ($curl_info["redirect_url"] != "") { + $siteinfo = self::getSiteinfo($curl_info["redirect_url"], $no_guessing, $do_oembed, ++$count); + } else { + $siteinfo = self::getSiteinfo($curl_info["location"], $no_guessing, $do_oembed, ++$count); + } + return($siteinfo); + } + + // If the file is too large then exit + if ($curl_info["download_content_length"] > 1000000) { + return($siteinfo); + } + + // If it isn't a HTML file then exit + if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]), "html")) { + return($siteinfo); + } + + if ($do_oembed) { + + $oembed_data = oembed_fetch_url($url); + + if (!in_array($oembed_data->type, array("error", "rich"))) { + $siteinfo["type"] = $oembed_data->type; + } + + if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) { + if (isset($oembed_data->title)) { + $siteinfo["title"] = $oembed_data->title; + } + if (isset($oembed_data->description)) { + $siteinfo["text"] = trim($oembed_data->description); + } + if (isset($oembed_data->thumbnail_url)) { + $siteinfo["image"] = $oembed_data->thumbnail_url; + } + } + } + + $stamp1 = microtime(true); + + // Now fetch the body as well + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_NOBODY, 0); + curl_setopt($ch, CURLOPT_TIMEOUT, 10); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent()); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false)); + + $header = curl_exec($ch); + $curl_info = @curl_getinfo($ch); + $http_code = $curl_info["http_code"]; + curl_close($ch); + + $a->save_timestamp($stamp1, "network"); + + // Fetch the first mentioned charset. Can be in body or header + $charset = ""; + if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) { + $charset = trim(trim(trim(array_pop($matches)), ';,')); + } + + if ($charset == "") { + $charset = "utf-8"; + } + + $pos = strpos($header, "\r\n\r\n"); + + if ($pos) { + $body = trim(substr($header, $pos)); + } else { + $body = $header; + } + + if (($charset != "") && (strtoupper($charset) != "UTF-8")) { + logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG); + //$body = mb_convert_encoding($body, "UTF-8", $charset); + $body = iconv($charset, "UTF-8//TRANSLIT", $body); + } + + $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); + + $doc = new \DOMDocument(); + @$doc->loadHTML($body); + + \xml::deleteNode($doc, "style"); + \xml::deleteNode($doc, "script"); + \xml::deleteNode($doc, "option"); + \xml::deleteNode($doc, "h1"); + \xml::deleteNode($doc, "h2"); + \xml::deleteNode($doc, "h3"); + \xml::deleteNode($doc, "h4"); + \xml::deleteNode($doc, "h5"); + \xml::deleteNode($doc, "h6"); + \xml::deleteNode($doc, "ol"); + \xml::deleteNode($doc, "ul"); + + $xpath = new \DomXPath($doc); + + $list = $xpath->query("//meta[@content]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + if (@$attr["http-equiv"] == "refresh") { + $path = $attr["content"]; + $pathinfo = explode(";", $path); + $content = ""; + foreach ($pathinfo as $value) { + if (substr(strtolower($value), 0, 4) == "url=") { + $content = substr($value, 4); + } + } + if ($content != "") { + $siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count); + return($siteinfo); + } + } + } + + $list = $xpath->query("//title"); + if ($list->length > 0) { + $siteinfo["title"] = $list->item(0)->nodeValue; + } + + //$list = $xpath->query("head/meta[@name]"); + $list = $xpath->query("//meta[@name]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); + + if ($attr["content"] != "") { + switch (strtolower($attr["name"])) { + case "fulltitle": + $siteinfo["title"] = $attr["content"]; + break; + case "description": + $siteinfo["text"] = $attr["content"]; + break; + case "thumbnail": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:image": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:image:src": + $siteinfo["image"] = $attr["content"]; + break; + case "twitter:card": + if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) { + $siteinfo["type"] = $attr["content"]; + } + break; + case "twitter:description": + $siteinfo["text"] = $attr["content"]; + break; + case "twitter:title": + $siteinfo["title"] = $attr["content"]; + break; + case "dc.title": + $siteinfo["title"] = $attr["content"]; + break; + case "dc.description": + $siteinfo["text"] = $attr["content"]; + break; + case "keywords": + $keywords = explode(",", $attr["content"]); + break; + case "news_keywords": + $keywords = explode(",", $attr["content"]); + break; + } + } + if ($siteinfo["type"] == "summary") { + $siteinfo["type"] = "link"; + } + } + + if (isset($keywords)) { + $siteinfo["keywords"] = array(); + foreach ($keywords as $keyword) { + if (!in_array(trim($keyword), $siteinfo["keywords"])) { + $siteinfo["keywords"][] = trim($keyword); + } + } + } + + //$list = $xpath->query("head/meta[@property]"); + $list = $xpath->query("//meta[@property]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); + + if ($attr["content"] != "") { + switch (strtolower($attr["property"])) { + case "og:image": + $siteinfo["image"] = $attr["content"]; + break; + case "og:title": + $siteinfo["title"] = $attr["content"]; + break; + case "og:description": + $siteinfo["text"] = $attr["content"]; + break; + } + } + } + + if ((@$siteinfo["image"] == "") && !$no_guessing) { + $list = $xpath->query("//img[@src]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) { + foreach ($node->attributes as $attribute) { + $attr[$attribute->name] = $attribute->value; + } + } + + $src = self::completeUrl($attr["src"], $url); + $photodata = get_photo_info($src); + + if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) { + if ($photodata[0] > 300) { + $photodata[1] = round($photodata[1] * (300 / $photodata[0])); + $photodata[0] = 300; + } + if ($photodata[1] > 300) { + $photodata[0] = round($photodata[0] * (300 / $photodata[1])); + $photodata[1] = 300; + } + $siteinfo["images"][] = array("src" => $src, + "width" => $photodata[0], + "height" => $photodata[1]); + } + + } + } elseif ($siteinfo["image"] != "") { + $src = self::completeUrl($siteinfo["image"], $url); + + unset($siteinfo["image"]); + + $photodata = get_photo_info($src); + + if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) { + $siteinfo["images"][] = array("src" => $src, + "width" => $photodata[0], + "height" => $photodata[1]); + } + } + + if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) { + $text = ""; + + $list = $xpath->query("//div[@class='article']"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " ".trim($node->nodeValue); + } + } + + if ($text == "") { + $list = $xpath->query("//div[@class='content']"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " ".trim($node->nodeValue); + } + } + } + + // If none text was found then take the paragraph content + if ($text == "") { + $list = $xpath->query("//p"); + foreach ($list as $node) { + if (strlen($node->nodeValue) > 40) { + $text .= " ".trim($node->nodeValue); + } + } + } + + if ($text != "") { + $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text)); + + while (strpos($text, " ")) { + $text = trim(str_replace(" ", " ", $text)); + } + + $siteinfo["text"] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8").'...'); + } + } + + logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG); + + call_hooks("getsiteinfo", $siteinfo); + + return($siteinfo); + } + + /** + * @brief Convert tags from CSV to an array + * + * @param string $string Tags + * @return array with formatted Hashtags + */ + public static function convertTagsToArray($string) { + $arr_tags = str_getcsv($string); + if (count($arr_tags)) { + // add the # sign to every tag + array_walk($arr_tags, array("self", "arrAddHashes")); + + return $arr_tags; + } + } + + /** + * @brief Add a hasht sign to a string + * + * This method is used as callback function + * + * @param string $tag The pure tag name + * @param int $k Counter for internal use + */ + private static function arrAddHashes(&$tag, $k) { + $tag = "#" . $tag; + } + + /** + * @brief Add a scheme to an url + * + * The src attribute of some html elements (e.g. images) + * can miss the scheme so we need to add the correct + * scheme + * + * @param string $url The url which possibly does have + * a missing scheme (a link to an image) + * @param string $scheme The url with a correct scheme + * (e.g. the url from the webpage which does contain the image) + * + * @return string The url with a scheme + */ + private static function completeUrl($url, $scheme) { + $urlarr = parse_url($url); + + // If the url does allready have an scheme + // we can stop the process here + if (isset($urlarr["scheme"])) { + return($url); + } + + $schemearr = parse_url($scheme); + + $complete = $schemearr["scheme"]."://".$schemearr["host"]; + + if (@$schemearr["port"] != "") { + $complete .= ":".$schemearr["port"]; + } + + if (strpos($urlarr["path"],"/") !== 0) { + $complete .= "/"; + } + + $complete .= $urlarr["path"]; + + if (@$urlarr["query"] != "") { + $complete .= "?".$urlarr["query"]; + } + + if (@$urlarr["fragment"] != "") { + $complete .= "#".$urlarr["fragment"]; + } + + return($complete); + } +} diff --git a/include/api.php b/include/api.php index 123a4b9cf..1f3c76298 100644 --- a/include/api.php +++ b/include/api.php @@ -623,7 +623,7 @@ // count friends $r = q("SELECT count(*) as `count` FROM `contact` WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0", + AND `self`=0 AND NOT `blocked` AND `hidden`=0", intval($uinfo[0]['uid']), intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND) @@ -632,7 +632,7 @@ $r = q("SELECT count(*) as `count` FROM `contact` WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0", + AND `self`=0 AND NOT `blocked` AND `hidden`=0", intval($uinfo[0]['uid']), intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND) @@ -1399,7 +1399,7 @@ `contact`.`id` AS `cid` FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`uid` = %d AND `verb` = '%s' AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` $sql_extra @@ -1476,7 +1476,7 @@ `user`.`nickname`, `user`.`hidewall` FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid` AND NOT `user`.`hidewall` WHERE `verb` = '%s' AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` @@ -1543,7 +1543,7 @@ `contact`.`id` AS `cid` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`verb` = '%s' $sql_extra", @@ -1619,7 +1619,7 @@ `contact`.`id` AS `cid` FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`parent` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`verb` = '%s' @@ -1673,7 +1673,7 @@ `contact`.`id` AS `cid` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` AND NOT `item`.`private` AND `item`.`allow_cid` = '' AND `item`.`allow`.`gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' @@ -1792,7 +1792,7 @@ `contact`.`id` AS `cid` FROM `item` FORCE INDEX (`uid_id`) STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`uid` = %d AND `verb` = '%s' AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s')) AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` @@ -1866,7 +1866,7 @@ `contact`.`id` AS `cid` FROM `item` FORCE INDEX (`uid_contactid_id`) STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid` - AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) WHERE `item`.`uid` = %d AND `verb` = '%s' AND `item`.`contact-id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` @@ -2002,7 +2002,7 @@ AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 AND `item`.`starred` = 1 AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND (NOT `contact`.`blocked` OR `contact`.`pending`) $sql_extra AND `item`.`id`>%d ORDER BY `item`.`id` DESC LIMIT %d ,%d ", @@ -2436,18 +2436,18 @@ 'religion' => $profile['religion'], 'public_keywords' => $profile['pub_keywords'], 'private_keywords' => $profile['prv_keywords'], - 'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, true), - 'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, true), - 'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, true), - 'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, true), - 'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, true), - 'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, true), - 'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, true), - 'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, true), - 'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, true), - 'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, true), - 'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, true), - 'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, true), + 'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, false), + 'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, false), + 'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, false), + 'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, false), + 'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, false), + 'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, false), + 'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, false), + 'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, false), + 'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, false), + 'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, false), + 'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, false), + 'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, false), 'homepage' => $profile['homepage'], 'users' => null); return $profile; @@ -2648,7 +2648,7 @@ if ($user_info['self'] == 0) $sql_extra = " AND false "; - $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra", + $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra", intval(api_user()) ); diff --git a/include/cache.php b/include/cache.php index b8016ac45..e8af8f9de 100644 --- a/include/cache.php +++ b/include/cache.php @@ -84,9 +84,14 @@ class Cache { $memcache = self::memcache(); if (is_object($memcache)) { // We fetch with the hostname as key to avoid problems with other applications - $value = $memcache->get(get_app()->get_hostname().":".$key); - if (!is_bool($value)) { - return unserialize($value); + $cached = $memcache->get(get_app()->get_hostname().":".$key); + $value = @unserialize($cached); + + // Only return a value if the serialized value is valid. + // We also check if the db entry is a serialized + // boolean 'false' value (which we want to return). + if ($cached === serialize(false) || $value !== false) { + return $value; } return null; @@ -100,7 +105,15 @@ class Cache { ); if (dbm::is_result($r)) { - return unserialize($r[0]['v']); + $cached = $r[0]['v']; + $value = @unserialize($cached); + + // Only return a value if the serialized value is valid. + // We also check if the db entry is a serialized + // boolean 'false' value (which we want to return). + if ($cached === serialize(false) || $value !== false) { + return $value; + } } return null; diff --git a/include/conversation.php b/include/conversation.php index eba2abdd4..63db42d93 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -439,7 +439,7 @@ These Fields are not added below (yet). They are here to for bug search. function item_joins() { return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND - NOT `contact`.`blocked` AND NOT `contact`.`pending` + (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`"; } @@ -1064,6 +1064,9 @@ function builtin_activity_puller($item, &$conv_responses) { else $conv_responses[$mode][$item['thr-parent']] ++; + if((local_user()) && (local_user() == $item['uid']) && ($item['self'])) + $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; + $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url; // there can only be one activity verb per item so if we found anything, we can stop looking @@ -1443,6 +1446,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) { $ret[$v] = array(); $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); if(count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], 'q("SELECT DATABASE() AS `db`"); + + return $r[0]['db']; + } + /** * @brief Returns the number of rows * diff --git a/include/dbstructure.php b/include/dbstructure.php index bd4a07eb5..94e8da4a4 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1280,6 +1280,7 @@ function db_definition($charset) { "uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), "password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""), + "note" => array("type" => "text"), ), "indexes" => array( "PRIMARY" => array("id"), diff --git a/include/delivery.php b/include/delivery.php index 7c0ba63a6..8fce98774 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -381,7 +381,14 @@ function delivery_run(&$argv, &$argc){ if ($deliver_status == (-1)) { logger('notifier: delivery failed: queuing message'); add_to_queue($contact['id'],NETWORK_DFRN,$atom); + + // The message could not be delivered. We mark the contact as "dead" + mark_for_death($contact); + } else { + // We successfully delivered a message, the contact is alive + unmark_for_death($contact); } + break; case NETWORK_OSTATUS: diff --git a/include/dfrn.php b/include/dfrn.php index e048e6608..272105128 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -3,7 +3,8 @@ * @file include/dfrn.php * @brief The implementation of the dfrn protocol * - * https://github.com/friendica/friendica/wiki/Protocol + * @see https://github.com/friendica/friendica/wiki/Protocol and + * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf */ require_once("include/Contact.php"); @@ -134,7 +135,7 @@ class dfrn { break; // NOTREACHED } - $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1", intval($owner_id) ); @@ -193,7 +194,7 @@ class dfrn { `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer` FROM `item` USE INDEX (`uid_wall_changed`, `uid_type_changed`) $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - AND NOT `contact`.`blocked` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0 AND `item`.`wall` AND `item`.`changed` > '%s' diff --git a/include/diaspora.php b/include/diaspora.php index 10f1be93d..f2d484867 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -999,17 +999,21 @@ class diaspora { */ private function author_contact_by_url($contact, $person, $uid) { - $r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", dbesc(normalise_link($person["url"])), intval($uid)); if ($r) { $cid = $r[0]["id"]; $network = $r[0]["network"]; + + // We are receiving content from a user that is about to be terminated + // This means the user is vital, so we remove a possible termination date. + unmark_for_death($contact); } else { $cid = $contact["id"]; $network = NETWORK_DIASPORA; } - return (array("cid" => $cid, "network" => $network)); + return array("cid" => $cid, "network" => $network); } /** @@ -2633,7 +2637,13 @@ class diaspora { } else { // queue message for redelivery add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch); + + // The message could not be delivered. We mark the contact as "dead" + mark_for_death($contact); } + } elseif (($return_code >= 200) AND ($return_code <= 299)) { + // We successfully delivered a message, the contact is alive + unmark_for_death($contact); } return(($return_code) ? $return_code : (-1)); diff --git a/include/features.php b/include/features.php index 4856f0f19..64ab932d0 100644 --- a/include/features.php +++ b/include/features.php @@ -7,20 +7,27 @@ /** * @brief check if feature is enabled - * + * * @return boolean */ -function feature_enabled($uid,$feature) { +function feature_enabled($uid, $feature) { - $x = get_config('feature_lock',$feature); - if($x === false) { - $x = get_pconfig($uid,'feature',$feature); - if($x === false) { - $x = get_config('feature',$feature); - if($x === false) + if (($feature == 'richtext') AND !get_app()->theme_richtext_editor) { + return false; + } + + $x = get_config('feature_lock', $feature); + + if ($x === false) { + $x = get_pconfig($uid, 'feature', $feature); + if ($x === false) { + $x = get_config('feature', $feature); + if ($x === false) { $x = get_feature_default($feature); + } } } + $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x); call_hooks('feature_enabled',$arr); return($arr['enabled']); @@ -135,6 +142,11 @@ function get_features($filtered = true) { } } + // Remove the richtext editor setting if the theme doesn't support it + if (!get_app()->theme_richtext_editor) { + unset($arr['composition'][1]); + } + call_hooks('get_features',$arr); return $arr; } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 28e251aee..189ba91f1 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -1,11 +1,14 @@ query("//".$node); - foreach ($list as $child) - $child->parentNode->removeChild($child); -}} - function _replace_code_cb($m){ return "".str_replace("\n","
\n",$m[1]). "";
}
@@ -117,12 +111,12 @@ function html2bbcode($message)
@$doc->loadHTML($message);
- deletenode($doc, 'style');
- deletenode($doc, 'head');
- deletenode($doc, 'title');
- deletenode($doc, 'meta');
- deletenode($doc, 'xml');
- deletenode($doc, 'removeme');
+ xml::deleteNode($doc, 'style');
+ xml::deleteNode($doc, 'head');
+ xml::deleteNode($doc, 'title');
+ xml::deleteNode($doc, 'meta');
+ xml::deleteNode($doc, 'xml');
+ xml::deleteNode($doc, 'removeme');
$xpath = new DomXPath($doc);
$list = $xpath->query("//pre");
@@ -239,7 +233,7 @@ function html2bbcode($message)
node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
node2bbcode($doc, 'code', array(), '[code]', '[/code]');
- node2bbcode($doc, 'key', array(), '[code]', '[/code]');
+ node2bbcode($doc, 'key', array(), '[code]', '[/code]');
$message = $doc->saveHTML();
diff --git a/include/identity.php b/include/identity.php
index a30d81cf3..288f93aaf 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -371,7 +371,7 @@ function profile_sidebar($profile, $block = 0) {
if(count($r))
$updated = date("c", strtotime($r[0]['updated']));
- $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+ $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s', '')",
intval($profile['uid']),
dbesc(NETWORK_DFRN),
diff --git a/include/items.php b/include/items.php
index 9b199aed3..0445c4490 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,5 +1,11 @@
type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
- require_once("mod/parse_url.php");
- $data = parseurl_getsiteinfo_cached($embedurl, true, false);
+ $data = ParseUrl::getSiteinfoCached($embedurl, true, false);
$j->type = $data["type"];
if ($j->type == "photo") {
@@ -143,12 +151,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
function oembed_format_object($j){
require_once("mod/proxy.php");
- $a = get_app();
$embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
$ret="";
switch ($j->type) {
- case "video": {
+ case "video":
if (isset($j->thumbnail_url)) {
$tw = (isset($j->thumbnail_width) && intval($j->thumbnail_width)) ? $j->thumbnail_width:200;
$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
@@ -158,7 +165,7 @@ function oembed_format_object($j){
$th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl');
$ret.=replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => App::get_baseurl(),
'$embedurl'=>$embedurl,
'$escapedhtml'=>base64_encode($jhtml),
'$tw'=>$tw,
@@ -170,43 +177,49 @@ function oembed_format_object($j){
$ret=$jhtml;
}
//$ret.=""; - }; break; - case "photo": { + break; + case "photo": $ret.= "
";
if (isset($j->title)) {
- if (isset($j->provider_name))
+ if (isset($j->provider_name)) {
$ret .= $j->provider_name.": ";
+ }
$embedlink = (isset($j->title))?$j->title:$embedurl;
$ret .= "$embedlink";
- if (isset($j->author_name))
+ if (isset($j->author_name)) {
$ret.=" (".$j->author_name.")";
+ }
} elseif (isset($j->provider_name) OR isset($j->author_name)) {
$embedlink = "";
- if (isset($j->provider_name))
+ if (isset($j->provider_name)) {
$embedlink .= $j->provider_name;
+ }
if (isset($j->author_name)) {
- if ($embedlink != "")
+ if ($embedlink != "") {
$embedlink .= ": ";
+ }
$embedlink .= $j->author_name;
}
- if (trim($embedlink) == "")
+ if (trim($embedlink) == "") {
$embedlink = $embedurl;
+ }
$ret .= "$embedlink";
}
@@ -247,15 +260,14 @@ function oembed_iframe($src, $width, $height) {
}
$width = '100%';
- $a = get_app();
- $s = $a->get_baseurl() . '/oembed/'.base64url_encode($src);
+ $s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
return '';
}
function oembed_bbcode2html($text){
- $stopoembed = get_config("system","no_oembed");
+ $stopoembed = Config::get("system","no_oembed");
if ($stopoembed == true){
return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "". t('Embedding disabled') ." : $1" ,$text);
}
@@ -268,13 +280,13 @@ function oe_build_xpath($attr, $value){
return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";
}
-function oe_get_inner_html( $node ) {
- $innerHTML= '';
- $children = $node->childNodes;
- foreach ($children as $child) {
- $innerHTML .= $child->ownerDocument->saveXML( $child );
- }
- return $innerHTML;
+function oe_get_inner_html($node) {
+ $innerHTML= '';
+ $children = $node->childNodes;
+ foreach ($children as $child) {
+ $innerHTML .= $child->ownerDocument->saveXML($child);
+ }
+ return $innerHTML;
}
/**
@@ -283,15 +295,16 @@ function oe_get_inner_html( $node ) {
*/
function oembed_html2bbcode($text) {
// start parser only if 'oembed' is in text
- if (strpos($text, "oembed")){
+ if (strpos($text, "oembed")) {
// convert non ascii chars to html entities
$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
// If it doesn't parse at all, just return the text.
$dom = @DOMDocument::loadHTML($html_text);
- if(! $dom)
+ if (! $dom) {
return $text;
+ }
$xpath = new DOMXPath($dom);
$attr = "oembed";
diff --git a/include/plaintext.php b/include/plaintext.php
index 539ef020d..d98d73655 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -1,6 +1,15 @@
start_process();
- $mypid = getmypid();
-
- if ($a->max_processes_reached())
+ if (poller_max_connections_reached()) {
return;
+ }
- if (poller_max_connections_reached())
+ if (App::maxload_reached()) {
return;
+ }
- if (App::maxload_reached())
+ if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+ poller_run_cron();
+ }
+
+ if ($a->max_processes_reached()) {
return;
+ }
// Checking the number of workers
if (poller_too_much_workers()) {
@@ -52,112 +57,18 @@ function poller_run(&$argv, &$argc){
return;
}
- if(($argc <= 1) OR ($argv[1] != "no_cron")) {
- // Run the cron job that calls all other jobs
- proc_run(PRIORITY_MEDIUM, "include/cron.php");
-
- // Run the cronhooks job separately from cron for being able to use a different timing
- proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
-
- // Cleaning dead processes
- poller_kill_stale_workers();
- } else
- // Sleep four seconds before checking for running processes again to avoid having too many workers
- sleep(4);
-
- // Checking number of workers
- if (poller_too_much_workers())
- return;
-
- $cooldown = Config::get("system", "worker_cooldown", 0);
-
$starttime = time();
while ($r = poller_worker_process()) {
- // Quit when in maintenance
- if (get_config('system', 'maintenance', true))
- return;
-
- // Constantly check the number of parallel database processes
- if ($a->max_processes_reached())
- return;
-
- // Constantly check the number of available database connections to let the frontend be accessible at any time
- if (poller_max_connections_reached())
- return;
-
// Count active workers and compare them with a maximum value that depends on the load
- if (poller_too_much_workers())
+ if (poller_too_much_workers()) {
return;
-
- $upd = q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `pid` = 0",
- dbesc(datetime_convert()),
- intval($mypid),
- intval($r[0]["id"]));
-
- if (!$upd) {
- logger("Couldn't update queue entry ".$r[0]["id"]." - skip this execution", LOGGER_DEBUG);
- q("COMMIT");
- continue;
}
- // Assure that there are no tasks executed twice
- $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
- if (!$id) {
- logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
- q("COMMIT");
- continue;
- } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
- logger("Entry for queue item ".$r[0]["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
- q("COMMIT");
- continue;
- } elseif ($id[0]["pid"] != $mypid) {
- logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
- q("COMMIT");
- continue;
+ if (!poller_execute($r[0])) {
+ return;
}
- q("COMMIT");
-
- $argv = json_decode($r[0]["parameter"]);
-
- $argc = count($argv);
-
- // Check for existance and validity of the include file
- $include = $argv[0];
-
- if (!validate_include($include)) {
- logger("Include file ".$argv[0]." is not valid!");
- q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
- continue;
- }
-
- require_once($include);
-
- $funcname = str_replace(".php", "", basename($argv[0]))."_run";
-
- if (function_exists($funcname)) {
- logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
-
- // For better logging create a new process id for every worker call
- // But preserve the old one for the worker
- $old_process_id = $a->process_id;
- $a->process_id = uniqid("wrk", true);
-
- $funcname($argv, $argc);
-
- $a->process_id = $old_process_id;
-
- if ($cooldown > 0) {
- logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
- sleep($cooldown);
- }
-
- logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
-
- q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
- } else
- logger("Function ".$funcname." does not exist");
// Quit the poller once every hour
if (time() > ($starttime + 3600))
@@ -166,6 +77,108 @@ function poller_run(&$argv, &$argc){
}
+/**
+ * @brief Execute a worker entry
+ *
+ * @param array $queue Workerqueue entry
+ *
+ * @return boolean "true" if further processing should be stopped
+ */
+function poller_execute($queue) {
+
+ $a = get_app();
+
+ $mypid = getmypid();
+
+ $cooldown = Config::get("system", "worker_cooldown", 0);
+
+ // Quit when in maintenance
+ if (get_config('system', 'maintenance', true)) {
+ return false;
+ }
+
+ // Constantly check the number of parallel database processes
+ if ($a->max_processes_reached()) {
+ return false;
+ }
+
+ // Constantly check the number of available database connections to let the frontend be accessible at any time
+ if (poller_max_connections_reached()) {
+ return false;
+ }
+
+ $upd = q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `pid` = 0",
+ dbesc(datetime_convert()),
+ intval($mypid),
+ intval($queue["id"]));
+
+ if (!$upd) {
+ logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG);
+ q("COMMIT");
+ return true;
+ }
+
+ // Assure that there are no tasks executed twice
+ $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+ if (!$id) {
+ logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG);
+ q("COMMIT");
+ return true;
+ } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+ logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
+ q("COMMIT");
+ return true;
+ } elseif ($id[0]["pid"] != $mypid) {
+ logger("Queue item ".$queue["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
+ q("COMMIT");
+ return true;
+ }
+ q("COMMIT");
+
+ $argv = json_decode($queue["parameter"]);
+
+ $argc = count($argv);
+
+ // Check for existance and validity of the include file
+ $include = $argv[0];
+
+ if (!validate_include($include)) {
+ logger("Include file ".$argv[0]." is not valid!");
+ q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+ return true;
+ }
+
+ require_once($include);
+
+ $funcname = str_replace(".php", "", basename($argv[0]))."_run";
+
+ if (function_exists($funcname)) {
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
+
+ // For better logging create a new process id for every worker call
+ // But preserve the old one for the worker
+ $old_process_id = $a->process_id;
+ $a->process_id = uniqid("wrk", true);
+
+ $funcname($argv, $argc);
+
+ $a->process_id = $old_process_id;
+
+ if ($cooldown > 0) {
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+ sleep($cooldown);
+ }
+
+ logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done");
+
+ q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+ } else {
+ logger("Function ".$funcname." does not exist");
+ }
+
+ return true;
+}
+
/**
* @brief Checks if the number of database connections has reached a critical limit.
*
@@ -177,9 +190,7 @@ function poller_max_connections_reached() {
$max = get_config("system", "max_connections");
// Fetch the percentage level where the poller will get active
- $maxlevel = get_config("system", "max_connections_level");
- if ($maxlevel == 0)
- $maxlevel = 75;
+ $maxlevel = Config::get("system", "max_connections_level", 75);
if ($max == 0) {
// the maximum number of possible user connections can be a system variable
@@ -295,13 +306,13 @@ function poller_kill_stale_workers() {
}
}
+/**
+ * @brief Checks if the number of active workers exceeds the given limits
+ *
+ * @return bool Are there too much workers running?
+ */
function poller_too_much_workers() {
-
-
- $queues = get_config("system", "worker_queues");
-
- if ($queues == 0)
- $queues = 4;
+ $queues = Config::get("system", "worker_queues", 4);
$maxqueues = $queues;
@@ -310,9 +321,7 @@ function poller_too_much_workers() {
// Decrease the number of workers at higher load
$load = current_load();
if($load) {
- $maxsysload = intval(get_config('system','maxloadavg'));
- if($maxsysload < 1)
- $maxsysload = 50;
+ $maxsysload = intval(Config::get("system", "maxloadavg", 50));
$maxworkers = $queues;
@@ -373,6 +382,11 @@ function poller_too_much_workers() {
return($active >= $queues);
}
+/**
+ * @brief Returns the number of active poller processes
+ *
+ * @return integer Number of active poller processes
+ */
function poller_active_workers() {
$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'");
@@ -394,8 +408,7 @@ function poller_passing_slow(&$highest_priority) {
$r = q("SELECT `priority`
FROM `process`
- INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
- WHERE `process`.`command` = 'poller.php'");
+ INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`");
// No active processes at all? Fine
if (!dbm::is_result($r))
@@ -435,7 +448,6 @@ function poller_passing_slow(&$highest_priority) {
*
* @return string SQL statement
*/
-
function poller_worker_process() {
q("START TRANSACTION;");
@@ -464,6 +476,99 @@ function poller_worker_process() {
return $r;
}
+/**
+ * @brief Call the front end worker
+ */
+function call_worker() {
+ if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+ return;
+ }
+
+ $url = get_app()->get_baseurl()."/worker";
+ fetch_url($url, false, $redirects, 1);
+}
+
+/**
+ * @brief Call the front end worker if there aren't any active
+ */
+function call_worker_if_idle() {
+ if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+ return;
+ }
+
+ // Do we have "proc_open"? Then we can fork the poller
+ if (function_exists("proc_open")) {
+ // When was the last time that we called the worker?
+ // Less than one minute? Then we quit
+ if ((time() - get_config("system", "worker_started")) < 60) {
+ return;
+ }
+
+ set_config("system", "worker_started", time());
+
+ // Do we have enough running workers? Then we quit here.
+ if (poller_too_much_workers()) {
+ // Cleaning dead processes
+ poller_kill_stale_workers();
+ get_app()->remove_inactive_processes();
+
+ return;
+ }
+
+ poller_run_cron();
+
+ logger('Call poller', LOGGER_DEBUG);
+
+ $args = array("php", "include/poller.php", "no_cron");
+ $a = get_app();
+ $a->proc_run($args);
+ return;
+ }
+
+ // We cannot execute background processes.
+ // We now run the processes from the frontend.
+ // This won't work with long running processes.
+ poller_run_cron();
+
+ clear_worker_processes();
+
+ $workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
+
+ if ($workers[0]["processes"] == 0) {
+ call_worker();
+ }
+}
+
+/**
+ * @brief Removes long running worker processes
+ */
+function clear_worker_processes() {
+ $timeout = Config::get("system", "frontend_worker_timeout", 10);
+
+ /// @todo We should clean up the corresponding workerqueue entries as well
+ q("DELETE FROM `process` WHERE `created` < '%s' AND `command` = 'worker.php'",
+ dbesc(datetime_convert('UTC','UTC',"now - ".$timeout." minutes")));
+}
+
+/**
+ * @brief Runs the cron processes
+ */
+function poller_run_cron() {
+ logger('Add cron entries', LOGGER_DEBUG);
+
+ // Check for spooled items
+ proc_run(PRIORITY_HIGH, "include/spool_post.php");
+
+ // Run the cron job that calls all other jobs
+ proc_run(PRIORITY_MEDIUM, "include/cron.php");
+
+ // Run the cronhooks job separately from cron for being able to use a different timing
+ proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
+
+ // Cleaning dead processes
+ poller_kill_stale_workers();
+}
+
if (array_search(__file__,get_included_files())===0){
poller_run($_SERVER["argv"],$_SERVER["argc"]);
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 5214131b2..a68aa8918 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -15,22 +15,35 @@ function remove_queue_item($id) {
);
}
+/**
+ * @brief Checks if the communication with a given contact had problems recently
+ *
+ * @param int $cid Contact id
+ *
+ * @return bool The communication with this contact has currently problems
+ */
function was_recently_delayed($cid) {
- $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
- and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
+ $was_delayed = false;
+
+ // Are there queue entries that were recently added?
+ $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
+ AND `last` > UTC_TIMESTAMP() - interval 15 minute LIMIT 1",
intval($cid)
);
- if(count($r))
- return true;
- $r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
- intval($cid)
- );
- if(count($r))
- return true;
+ $was_delayed = dbm::is_result($r);
- return false;
+ // We set "term-date" to a current date if the communication has problems.
+ // If the communication works again we reset this value.
+ if ($was_delayed) {
+ $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+ intval($cid)
+ );
+ $was_delayed = !dbm::is_result($r);
+ }
+
+ return $was_delayed;
}
diff --git a/include/remove_contact.php b/include/remove_contact.php
new file mode 100644
index 000000000..ec8b83eab
--- /dev/null
+++ b/include/remove_contact.php
@@ -0,0 +1,52 @@
+
diff --git a/include/socgraph.php b/include/socgraph.php
index 349869c40..421a68cc9 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1079,10 +1079,12 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
return array();
}
- $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
- if (!is_null($list)) {
- return $list;
- }
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+// $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+// if (!is_null($list)) {
+// return $list;
+// }
$network = array(NETWORK_DFRN);
@@ -1116,7 +1118,10 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
);
if (count($r) && count($r) >= ($limit -1)) {
- Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+
return $r;
}
@@ -1147,7 +1152,9 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
while (sizeof($list) > ($limit))
array_pop($list);
- Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
return $list;
}
diff --git a/include/spool_post.php b/include/spool_post.php
new file mode 100644
index 000000000..c42928a67
--- /dev/null
+++ b/include/spool_post.php
@@ -0,0 +1,49 @@
+
diff --git a/include/text.php b/include/text.php
index e0b301ce3..89ab7254b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -12,7 +12,7 @@ if(! function_exists('replace_macros')) {
* This is our template processor
*
* @param string|FriendicaSmarty $s the string requiring macro substitution,
- * or an instance of FriendicaSmarty
+ * or an instance of FriendicaSmarty
* @param array $r key value pairs (search => replace)
* @return string substituted string
*/
@@ -874,8 +874,8 @@ function contact_block() {
if((! is_array($a->profile)) || ($a->profile['hide-friends']))
return $o;
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
- WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
- AND `hidden` = 0 AND `archive` = 0
+ WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
+ AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s')",
intval($a->profile['uid']),
dbesc(NETWORK_DFRN),
@@ -892,7 +892,7 @@ function contact_block() {
} else {
// Splitting the query in two parts makes it much faster
$r = q("SELECT `id` FROM `contact`
- WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
+ WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
AND NOT `hidden` AND NOT `archive`
AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
intval($a->profile['uid']),
diff --git a/include/user.php b/include/user.php
index 3997a8a61..5e8014abf 100644
--- a/include/user.php
+++ b/include/user.php
@@ -378,6 +378,29 @@ function create_user($arr) {
}
+/**
+ * @brief send registration confiŕmation with the intormation that reg is pending
+ *
+ * @param string $email
+ * @param string $sitename
+ * @param string $username
+ * @return NULL|boolean from notification() and email() inherited
+ */
+function send_register_pending_eml($email, $sitename, $username) {
+ $body = deindent(t('
+ Dear %1$s,
+ Thank you for registering at %2$s. Your account is pending for approval by the administrator.
+ '));
+
+ $body = sprintf($body, $username, $sitename);
+
+ return notification(array(
+ 'type' => "SYSTEM_EMAIL",
+ 'to_email' => $email,
+ 'subject'=> sprintf( t('Registration at %s'), $sitename),
+ 'body' => $body));
+}
+
/*
* send registration confirmation.
* It's here as a function because the mail is sent
diff --git a/include/xml.php b/include/xml.php
index 3bb376aba..9f7de8f33 100644
--- a/include/xml.php
+++ b/include/xml.php
@@ -1,11 +1,12 @@
$value) {
- foreach ($namespaces AS $nskey => $nsvalue)
+ foreach ($array as $key => $value) {
+ foreach ($namespaces AS $nskey => $nsvalue) {
$key .= " xmlns".($nskey == "" ? "":":").$nskey.'="'.$nsvalue.'"';
+ }
if (is_array($value)) {
$root = new SimpleXMLElement("<".$key."/>");
self::from_array($value, $root, $remove_header, $namespaces, false);
- } else
+ } else {
$root = new SimpleXMLElement("<".$key.">".xmlify($value)."");
+ }
$dom = dom_import_simplexml($root)->ownerDocument;
$dom->formatOutput = true;
@@ -39,16 +42,18 @@ class xml {
$xml_text = $dom->saveXML();
- if ($remove_header)
+ if ($remove_header) {
$xml_text = trim(substr($xml_text, 21));
+ }
return $xml_text;
}
}
foreach($array as $key => $value) {
- if (!isset($element) AND isset($xml))
+ if (!isset($element) AND isset($xml)) {
$element = $xml;
+ }
if (is_integer($key)) {
if (isset($element)) {
@@ -62,27 +67,31 @@ class xml {
}
$element_parts = explode(":", $key);
- if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
+ if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
$namespace = $namespaces[$element_parts[0]];
- elseif (isset($namespaces[""])) {
+ } elseif (isset($namespaces[""])) {
$namespace = $namespaces[""];
- } else
+ } else {
$namespace = NULL;
+ }
// Remove undefined namespaces from the key
- if ((count($element_parts) > 1) AND is_null($namespace))
+ if ((count($element_parts) > 1) AND is_null($namespace)) {
$key = $element_parts[1];
+ }
if (substr($key, 0, 11) == "@attributes") {
- if (!isset($element) OR !is_array($value))
+ if (!isset($element) OR !is_array($value)) {
continue;
+ }
foreach ($value as $attr_key => $attr_value) {
$element_parts = explode(":", $attr_key);
- if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
+ if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
$namespace = $namespaces[$element_parts[0]];
- else
+ } else {
$namespace = NULL;
+ }
$element->addAttribute($attr_key, $attr_value, $namespace);
}
@@ -90,9 +99,9 @@ class xml {
continue;
}
- if (!is_array($value))
+ if (!is_array($value)) {
$element = $xml->addChild($key, xmlify($value), $namespace);
- elseif (is_array($value)) {
+ } elseif (is_array($value)) {
$element = $xml->addChild($key, NULL, $namespace);
self::from_array($value, $element, $remove_header, $namespaces, false);
}
@@ -111,8 +120,9 @@ class xml {
$target->addChild($elementname, xmlify($source));
else {
$child = $target->addChild($elementname);
- foreach ($source->children() AS $childfield => $childentry)
+ foreach ($source->children() AS $childfield => $childentry) {
self::copy($childentry, $child, $childfield);
+ }
}
}
@@ -168,11 +178,11 @@ class xml {
return(null);
}
- if (!is_string($xml_element) &&
- !is_array($xml_element) &&
- (get_class($xml_element) == 'SimpleXMLElement')) {
- $xml_element_copy = $xml_element;
- $xml_element = get_object_vars($xml_element);
+ if (!is_string($xml_element)
+ && !is_array($xml_element)
+ && (get_class($xml_element) == 'SimpleXMLElement')) {
+ $xml_element_copy = $xml_element;
+ $xml_element = get_object_vars($xml_element);
}
if (is_array($xml_element)) {
@@ -181,7 +191,7 @@ class xml {
return (trim(strval($xml_element_copy)));
}
- foreach($xml_element as $key=>$value) {
+ foreach ($xml_element as $key => $value) {
$recursion_depth++;
$result_array[strtolower($key)] =
@@ -223,10 +233,12 @@ class xml {
*
* @return array The parsed XML in an array form. Use print_r() to see the resulting array structure.
*/
- public static function to_array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {
- if(!$contents) return array();
+ public static function to_array($contents, $namespaces = true, $get_attributes = 1, $priority = 'attribute') {
+ if (!$contents) {
+ return array();
+ }
- if(!function_exists('xml_parser_create')) {
+ if (!function_exists('xml_parser_create')) {
logger('xml::to_array: parser function missing');
return array();
}
@@ -235,12 +247,13 @@ class xml {
libxml_use_internal_errors(true);
libxml_clear_errors();
- if($namespaces)
+ if ($namespaces) {
$parser = @xml_parser_create_ns("UTF-8",':');
- else
+ } else {
$parser = @xml_parser_create();
+ }
- if(! $parser) {
+ if (! $parser) {
logger('xml::to_array: xml_parser_create: no resource');
return array();
}
@@ -252,10 +265,11 @@ class xml {
@xml_parse_into_struct($parser, trim($contents), $xml_values);
@xml_parser_free($parser);
- if(! $xml_values) {
+ if (! $xml_values) {
logger('xml::to_array: libxml: parse error: ' . $contents, LOGGER_DATA);
- foreach(libxml_get_errors() as $err)
+ foreach (libxml_get_errors() as $err) {
logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA);
+ }
libxml_clear_errors();
return;
}
@@ -270,8 +284,8 @@ class xml {
// Go through the tags.
$repeated_tag_index = array(); // Multiple tags with same name will be turned into an array
- foreach($xml_values as $data) {
- unset($attributes,$value); // Remove existing values, or there will be trouble
+ foreach ($xml_values as $data) {
+ unset($attributes, $value); // Remove existing values, or there will be trouble
// This command will extract these variables into the foreach scope
// tag(string), type(string), level(int), attributes(array).
@@ -280,46 +294,54 @@ class xml {
$result = array();
$attributes_data = array();
- if(isset($value)) {
- if($priority == 'tag') $result = $value;
- else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
+ if (isset($value)) {
+ if ($priority == 'tag') {
+ $result = $value;
+ } else {
+ $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
+ }
}
//Set the attributes too.
- if(isset($attributes) and $get_attributes) {
- foreach($attributes as $attr => $val) {
- if($priority == 'tag') $attributes_data[$attr] = $val;
- else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr'
+ if (isset($attributes) and $get_attributes) {
+ foreach ($attributes as $attr => $val) {
+ if($priority == 'tag') {
+ $attributes_data[$attr] = $val;
+ } else {
+ $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr'
+ }
}
}
// See tag status and do the needed.
- if($namespaces && strpos($tag,':')) {
- $namespc = substr($tag,0,strrpos($tag,':'));
- $tag = strtolower(substr($tag,strlen($namespc)+1));
+ if ($namespaces && strpos($tag, ':')) {
+ $namespc = substr($tag, 0, strrpos($tag, ':'));
+ $tag = strtolower(substr($tag, strlen($namespc)+1));
$result['@namespace'] = $namespc;
}
$tag = strtolower($tag);
- if($type == "open") { // The starting of the tag ''
+ if ($type == "open") { // The starting of the tag ''
$parent[$level-1] = &$current;
- if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
+ if (!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
$current[$tag] = $result;
- if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
+ if ($attributes_data) {
+ $current[$tag. '_attr'] = $attributes_data;
+ }
$repeated_tag_index[$tag.'_'.$level] = 1;
$current = &$current[$tag];
} else { // There was another element with the same tag name
- if(isset($current[$tag][0])) { // If there is a 0th element it is already an array
+ if (isset($current[$tag][0])) { // If there is a 0th element it is already an array
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
$repeated_tag_index[$tag.'_'.$level]++;
} else { // This section will make the value an array if multiple tags with the same name appear together
- $current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array
+ $current[$tag] = array($current[$tag], $result); // This will combine the existing item and the new item together to make an array
$repeated_tag_index[$tag.'_'.$level] = 2;
- if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
+ if (isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
unset($current[$tag.'_attr']);
}
@@ -329,35 +351,37 @@ class xml {
$current = &$current[$tag][$last_item_index];
}
- } elseif($type == "complete") { // Tags that ends in 1 line ' '
+ } elseif ($type == 'close') { // End of tag ' '
$current = &$parent[$level-1];
}
}
return($xml_array);
}
+
+ /**
+ * @brief Delete a node in a XML object
+ *
+ * @param object $doc XML document
+ * @param string $node Node name
+ */
+ public static function deleteNode(&$doc, $node) {
+ $xpath = new DomXPath($doc);
+ $list = $xpath->query("//".$node);
+ foreach ($list as $child) {
+ $child->parentNode->removeChild($child);
+ }
+ }
}
-?>
diff --git a/index.php b/index.php
index 13c3f6318..08f24af60 100644
--- a/index.php
+++ b/index.php
@@ -99,6 +99,10 @@ if (!$a->is_backend()) {
$stamp1 = microtime(true);
session_start();
$a->save_timestamp($stamp1, "parser");
+} else {
+ require_once "include/poller.php";
+
+ call_worker_if_idle();
}
/**
diff --git a/js/autocomplete.js b/js/autocomplete.js
index d0c770cc4..601544eaa 100644
--- a/js/autocomplete.js
+++ b/js/autocomplete.js
@@ -296,7 +296,7 @@ function string2bb(element) {
$.fn.bbco_autocomplete = function(type) {
if(type=='bbcode') {
- var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
+ var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
var open_elements = ['*', 'hr'];
var elements = open_close_elements.concat(open_elements);
diff --git a/js/country.js b/js/country.js
index a29eca816..9d386d50f 100644
--- a/js/country.js
+++ b/js/country.js
@@ -44,7 +44,7 @@ aStates[20]="|Brestskaya (Brest)|Homyel'skaya (Homyel')|Horad Minsk|Hrodzyenskay
aStates[21]="|Antwerpen|Brabant Wallon|Brussels Capitol Region|Hainaut|Liege|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams Brabant|West-Vlaanderen";
aStates[22]="|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo";
aStates[23]="|Alibori|Atakora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Oueme|Plateau|Zou";
-aStates[24]="|Devonshire|Hamilton|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
+aStates[24]="|Devonshire|Hamilton (City)|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
aStates[25]="|Bumthang|Chhukha|Chirang|Daga|Geylegphug|Ha|Lhuntshi|Mongar|Paro|Pemagatsel|Punakha|Samchi|Samdrup Jongkhar|Shemgang|Tashigang|Thimphu|Tongsa|Wangdi Phodrang";
aStates[26]="|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosi|Santa Cruz|Tarija";
aStates[27]="|Federation of Bosnia and Herzegovina|Republika Srpska";
@@ -125,7 +125,7 @@ aStates[99]="|Holy See (Vatican City)"
aStates[100]="|Atlantida|Choluteca|Colon|Comayagua|Copan|Cortes|El Paraiso|Francisco Morazan|Gracias a Dios|Intibuca|Islas de la Bahia|La Paz|Lempira|Ocotepeque|Olancho|Santa Barbara|Valle|Yoro";
aStates[101]="|Hong Kong";
aStates[102]="|Howland Island";
-aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem|Zala|Zalaegerszeg";
+aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem (City)|Zala|Zalaegerszeg";
aStates[104]="|Akranes|Akureyri|Arnessysla|Austur-Bardhastrandarsysla|Austur-Hunavatnssysla|Austur-Skaftafellssysla|Borgarfjardharsysla|Dalasysla|Eyjafjardharsysla|Gullbringusysla|Hafnarfjordhur|Husavik|Isafjordhur|Keflavik|Kjosarsysla|Kopavogur|Myrasysla|Neskaupstadhur|Nordhur-Isafjardharsysla|Nordhur-Mulasys-la|Nordhur-Thingeyjarsysla|Olafsfjordhur|Rangarvallasysla|Reykjavik|Saudharkrokur|Seydhisfjordhur|Siglufjordhur|Skagafjardharsysla|Snaefellsnes-og Hnappadalssysla|Strandasysla|Sudhur-Mulasysla|Sudhur-Thingeyjarsysla|Vesttmannaeyjar|Vestur-Bardhastrandarsysla|Vestur-Hunavatnssysla|Vestur-Isafjardharsysla|Vestur-Skaftafellssysla";
aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli|Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Orissa|Pondicherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Tripura|Uttar Pradesh|Uttaranchal|West Bengal";
aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
@@ -145,12 +145,12 @@ aStates[119]="|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|A
aStates[120]="|Juan de Nova Island";
aStates[121]="|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Mangghystau|Ongtustik Qazaqstan|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Zhambyl";
aStates[122]="|Central|Coast|Eastern|Nairobi Area|North Eastern|Nyanza|Rift Valley|Western";
-aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba|Banaba|Beru|Butaritari|Central Gilberts|Gilbert Islands|Kanton|Kiritimati|Kuria|Line Islands|Line Islands|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts|Onotoa|Phoenix Islands|Southern Gilberts|Tabiteuea|Tabuaeran|Tamana|Tarawa|Tarawa|Teraina";
+aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba (District)|Banaba|Beru|Butaritari|Central Gilberts (District)|Gilbert Islands (Unit)|Kanton|Kiritimati|Kuria|Line Islands (District)|Line Islands (Unit)|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts (District)|Onotoa|Phoenix Islands (Unit)|Southern Gilberts (District)|Tabiteuea|Tabuaeran|Tamana|Tarawa (District)|Tarawa|Teraina";
aStates[124]="|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Yanggang-do (Yanggang Province)"
aStates[125]="|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi";
aStates[126]="|Al 'Asimah|Al Ahmadi|Al Farwaniyah|Al Jahra'|Hawalli";
aStates[127]="|Batken Oblasty|Bishkek Shaary|Chuy Oblasty (Bishkek)|Jalal-Abad Oblasty|Naryn Oblasty|Osh Oblasty|Talas Oblasty|Ysyk-Kol Oblasty (Karakol)"
-aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
+aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan City|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
aStates[129]="|Aizkraukles Rajons|Aluksnes Rajons|Balvu Rajons|Bauskas Rajons|Cesu Rajons|Daugavpils|Daugavpils Rajons|Dobeles Rajons|Gulbenes Rajons|Jekabpils Rajons|Jelgava|Jelgavas Rajons|Jurmala|Kraslavas Rajons|Kuldigas Rajons|Leipaja|Liepajas Rajons|Limbazu Rajons|Ludzas Rajons|Madonas Rajons|Ogres Rajons|Preilu Rajons|Rezekne|Rezeknes Rajons|Riga|Rigas Rajons|Saldus Rajons|Talsu Rajons|Tukuma Rajons|Valkas Rajons|Valmieras Rajons|Ventspils|Ventspils Rajons";
aStates[130]="|Beyrouth|Ech Chimal|Ej Jnoub|El Bekaa|Jabal Loubnane";
aStates[131]="|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohales Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka";
@@ -176,7 +176,7 @@ aStates[150]="|Mayotte";
aStates[151]="|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila de Zaragoza|Colima|Distrito Federal|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|Mexico|Michoacan de Ocampo|Morelos|Nayarit|Nuevo Leon|Oaxaca|Puebla|Queretaro de Arteaga|Quintana Roo|San Luis Potosi|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz-Llave|Yucatan|Zacatecas";
aStates[152]="|Chuuk (Truk)|Kosrae|Pohnpei|Yap";
aStates[153]="|Midway Islands";
-aStates[154]="|Balti|Cahul|Chisinau|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
+aStates[154]="|Balti|Cahul|Chisinau (City)|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
aStates[155]="|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo";
aStates[156]="|Arhangay|Bayan-Olgiy|Bayanhongor|Bulgan|Darhan|Dornod|Dornogovi|Dundgovi|Dzavhan|Erdenet|Govi-Altay|Hentiy|Hovd|Hovsgol|Omnogovi|Ovorhangay|Selenge|Suhbaatar|Tov|Ulaanbaatar|Uvs";
aStates[157]="|Saint Anthony|Saint Georges|Saint Peter's";
@@ -243,7 +243,7 @@ aStates[217]="|Hhohho|Lubombo|Manzini|Shiselweni";
aStates[218]="|Blekinge|Dalarnas|Gavleborgs|Gotlands|Hallands|Jamtlands|Jonkopings|Kalmar|Kronobergs|Norrbottens|Orebro|Ostergotlands|Skane|Sodermanlands|Stockholms|Uppsala|Varmlands|Vasterbottens|Vasternorrlands|Vastmanlands|Vastra Gotalands";
aStates[219]="|Aargau|Ausser-Rhoden|Basel-Landschaft|Basel-Stadt|Bern|Fribourg|Geneve|Glarus|Graubunden|Inner-Rhoden|Jura|Luzern|Neuchatel|Nidwalden|Obwalden|Sankt Gallen|Schaffhausen|Schwyz|Solothurn|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zurich";
aStates[220]="|Al Hasakah|Al Ladhiqiyah|Al Qunaytirah|Ar Raqqah|As Suwayda'|Dar'a|Dayr az Zawr|Dimashq|Halab|Hamah|Hims|Idlib|Rif Dimashq|Tartus";
-aStates[221]="|Chang-hua|Chi-lung|Chia-i|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu|Hsin-chu|Hua-lien|I-lan|Kao-hsiung|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung|T'ai-chung|T'ai-nan|T'ai-nan|T'ai-pei|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
+aStates[221]="|Chang-hua|Chi-lung|Chia-i (City)|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu (City)|Hsin-chu|Hua-lien|I-lan|Kao-hsiung (City)|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung (City)|T'ai-chung|T'ai-nan (City)|T'ai-nan|T'ai-pei (City)|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
aStates[222]="|Viloyati Khatlon|Viloyati Leninobod|Viloyati Mukhtori Kuhistoni Badakhshon";
aStates[223]="|Arusha|Dar es Salaam|Dodoma|Iringa|Kagera|Kigoma|Kilimanjaro|Lindi|Mara|Mbeya|Morogoro|Mtwara|Mwanza|Pemba North|Pemba South|Pwani|Rukwa|Ruvuma|Shinyanga|Singida|Tabora|Tanga|Zanzibar Central/South|Zanzibar North|Zanzibar Urban/West";
aStates[224]="|Amnat Charoen|Ang Thong|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chon Buri|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Mahanakhon (Bangkok)|Lampang|Lamphun|Loei|Lop Buri|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phangnga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phra Nakhon Si Ayutthaya|Phrae|Phuket|Prachin Buri|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon";
diff --git a/js/main.js b/js/main.js
index 008d84b0b..b2a4dfe35 100644
--- a/js/main.js
+++ b/js/main.js
@@ -92,7 +92,6 @@
/* event from comment textarea button popups */
/* insert returned bbcode at cursor position or replace selected text */
$("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
- console.log("on", id);
$.colorbox.close();
var textarea = document.getElementById("comment-edit-text-" +id);
var start = textarea.selectionStart;
@@ -117,7 +116,6 @@
$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
input.val(val);
- //console.log(id);
});
/* setup field_richtext */
@@ -179,110 +177,77 @@
$('#nav-notifications-menu, aside').perfectScrollbar();
/* nav update event */
- $('nav').bind('nav-update', function(e,data){
- var invalid = $(data).find('invalid').text();
+ $('nav').bind('nav-update', function(e, data){
+ var invalid = data.invalid || 0;
if(invalid == 1) { window.location.href=window.location.href }
- var net = $(data).find('net').text();
- if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
- $('#net-update').html(net);
+ ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
+ var number = data[type];
+ if (number == 0) {
+ number = '';
+ $('#' + type + '-update').removeClass('show');
+ } else {
+ $('#' + type + '-update').addClass('show');
+ }
+ $('#' + type + '-update').text(number);
+ });
- var home = $(data).find('home').text();
- if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
- $('#home-update').html(home);
-
- var intro = $(data).find('intro').text();
- if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
- $('#intro-update').html(intro);
-
- var mail = $(data).find('mail').text();
- if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
- $('#mail-update').html(mail);
-
- var intro = $(data).find('intro').text();
- if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+ var intro = data['intro'];
+ if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
$('#intro-update-li').html(intro);
- var mail = $(data).find('mail').text();
- if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+ var mail = data['mail'];
+ if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$('#mail-update-li').html(mail);
-
- var allevents = $(data).find('all-events').text();
- if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') }
- $('#allevents-update').html(allevents);
-
- var alleventstoday = $(data).find('all-events-today').text();
- if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') }
-
- var events = $(data).find('events').text();
- if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
- $('#events-update').html(events);
-
- var eventstoday = $(data).find('events-today').text();
- if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') }
-
- var birthdays = $(data).find('birthdays').text();
- if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
- $('#birthdays-update').html(birthdays);
-
- var birthdaystoday = $(data).find('birthdays-today').text();
- if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
-
$(".sidebar-group-li .notify").removeClass("show");
- $(data).find("group").each(function() {
- var gid = this.id;
- var gcount = this.innerHTML;
+ $(data.groups).each(function(key, group) {
+ var gid = group.id;
+ var gcount = group.count;
$(".group-"+gid+" .notify").addClass("show").text(gcount);
});
$(".forum-widget-entry .notify").removeClass("show");
- $(data).find("forum").each(function() {
- var fid = this.id;
- var fcount = this.innerHTML;
+ $(data.forums).each(function(key, forum) {
+ var fid = forum.id;
+ var fcount = forum.count;
$(".forum-"+fid+" .notify").addClass("show").text(fcount);
});
-
- var eNotif = $(data).find('notif')
-
- if (eNotif.children("note").length==0){
+ if (data.notifications.length == 0) {
$("#nav-notifications-menu").html(notifications_empty);
} else {
- nnm = $("#nav-notifications-menu");
+ var nnm = $("#nav-notifications-menu");
nnm.html(notifications_all + notifications_mark);
- //nnm.attr('popup','true');
var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem"));
var notification_id = 0;
- eNotif.children("note").each(function(){
- e = $(this);
- var text = e.text().format(""+e.attr('name')+"");
- var contact = (""+e.attr('name')+"");
- var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
+ $(data.notifications).each(function(key, notif){
+ var text = notif.message.format('' + notif.name + '');
+ var contact = ('' + notif.name + '');
+ var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen";
var html = notifications_tpl.format(
- e.attr('href'), // {0} // link to the source
- e.attr('photo'), // {1} // photo of the contact
- text, // {2} // preformatted text (autor + text)
- e.attr('date'), // {3} // date of notification (time ago)
- seenclass, // {4} // visited status of the notification
- new Date(e.attr('timestamp')*1000), // {5} // date of notification
- e.attr('url'), // {6} // profile url of the contact
- e.text().format(contact), // {7} // preformatted html (text including author profile url)
- '' // {8} // Deprecated
+ notif.href, // {0} // link to the source
+ notif.photo, // {1} // photo of the contact
+ text, // {2} // preformatted text (autor + text)
+ notif.date, // {3} // date of notification (time ago)
+ seenclass, // {4} // visited status of the notification
+ new Date(notif.timestamp*1000), // {5} // date of notification
+ notif.url, // {6} // profile url of the contact
+ notif.message.format(contact), // {7} // preformatted html (text including author profile url)
+ '' // {8} // Deprecated
);
nnm.append(html);
});
- $(eNotif.children("note").get().reverse()).each(function(){
- e = $(this);
- notification_id = parseInt(e.attr('timestamp'));
- if (notification_lastitem!== null && notification_id > notification_lastitem) {
- if (getNotificationPermission()==="granted") {
+ $(data.notifications.reverse()).each(function(key, e){
+ notification_id = parseInt(e.timestamp);
+ if (notification_lastitem !== null && notification_id > notification_lastitem) {
+ if (getNotificationPermission() === "granted") {
var notification = new Notification(document.title, {
- body: decodeHtml(e.text().replace('→ ','').format(e.attr('name'))),
- icon: e.attr('photo'),
+ body: decodeHtml(e.message.replace('→ ', '').format(e.name)),
+ icon: e.photo,
});
- notification['url'] = e.attr('href');
+ notification['url'] = e.href;
notification.addEventListener("click", function(ev){
window.location = ev.target.url;
});
@@ -303,23 +268,18 @@
});
}
- notif = eNotif.attr('count');
- if (notif>0){
+ var notif = data['notify'];
+ if (notif > 0){
$("#nav-notifications-linkmenu").addClass("on");
} else {
$("#nav-notifications-linkmenu").removeClass("on");
}
- if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
- $('#notify-update').html(notif);
- var eSysmsg = $(data).find('sysmsgs');
- eSysmsg.children("notice").each(function(){
- text = $(this).text();
- $.jGrowl(text, { sticky: true, theme: 'notice' });
+ $(data.sysmsgs.notice).each(function(key, message){
+ $.jGrowl(message, {sticky: true, theme: 'notice'});
});
- eSysmsg.children("info").each(function(){
- text = $(this).text();
- $.jGrowl(text, { sticky: false, theme: 'info', life: 5000 });
+ $(data.sysmsgs.info).each(function(key, message){
+ $.jGrowl(message, {sticky: false, theme: 'info', life: 5000});
});
/* update the js scrollbars */
@@ -374,50 +334,38 @@
function NavUpdate() {
- if(! stopped) {
- var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
- $.get(pingCmd,function(data) {
- $(data).find('result').each(function() {
+ if (!stopped) {
+ var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');
+ $.get(pingCmd, function(data) {
+ if (data.result) {
// send nav-update event
- $('nav').trigger('nav-update', this);
-
+ $('nav').trigger('nav-update', data.result);
// start live update
-
- if($('#live-network').length) { src = 'network'; liveUpdate(); }
- if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
- if($('#live-community').length) { src = 'community'; liveUpdate(); }
- if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
- if($('#live-display').length) { src = 'display'; liveUpdate(); }
-/* if($('#live-display').length) {
- if(liking) {
- liking = 0;
- window.location.href=window.location.href
+ ['network', 'profile', 'community', 'notes', 'display'].forEach(function (src) {
+ if ($('#live-' + src).length) {
+ liveUpdate(src);
}
- }*/
- if($('#live-photos').length) {
- if(liking) {
+ });
+ if ($('#live-photos').length) {
+ if (liking) {
liking = 0;
- window.location.href=window.location.href
+ window.location.href = window.location.href;
}
}
-
-
-
-
- });
+ }
}) ;
}
- timer = setTimeout(NavUpdate,updateInterval);
+ timer = setTimeout(NavUpdate, updateInterval);
}
- function liveUpdate() {
+ function liveUpdate(src) {
if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($('.comment-edit-text-full').length) || (in_progress)) {
if(livetime) {
clearTimeout(livetime);
}
- livetime = setTimeout(liveUpdate, 5000);
+ livetime = setTimeout(function() {liveUpdate(src)}, 5000);
return;
}
if(livetime != null)
@@ -740,8 +688,6 @@
// page number
infinite_scroll.pageno+=1;
- console.log('Loading page ' + infinite_scroll.pageno);
-
// get the raw content from the next page and insert this content
// right before "#conversation-end"
$.get('network?mode=raw' + infinite_scroll.reload_uri + '&page=' + infinite_scroll.pageno, function(data) {
diff --git a/mod/admin.php b/mod/admin.php
index 9eb86720d..f4cc0cf6f 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -428,6 +428,21 @@ function admin_page_queue(&$a) {
* @return string
*/
function admin_page_summary(&$a) {
+ global $db;
+ // are there MyISAM tables in the DB? If so, trigger a warning message
+ $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
+ dbesc($db->database_name()));
+ $showwarning = false;
+ $warningtext = array();
+ if (dbm::is_result($r)) {
+ $showwarning = true;
+ $warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
+ }
+ // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
+ if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+ !(strpos($db->server_info(), 'MariaDB') !== false)) {
+ $warningtext[] = t('You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB.');
+ }
$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
$accounts = array(
array(t('Normal Account'), 0),
@@ -478,7 +493,9 @@ function admin_page_summary(&$a) {
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'),
- '$plugins' => array(t('Active plugins'), $a->plugins)
+ '$plugins' => array(t('Active plugins'), $a->plugins),
+ '$showwarning' => $showwarning,
+ '$warningtext' => $warningtext
));
}
@@ -1388,6 +1405,7 @@ function admin_page_users(&$a){
'$h_deleted' => t('User waiting for permanent deletion'),
'$th_pending' => array(t('Request date'), t('Name'), t('Email')),
'$no_pending' => t('No registrations.'),
+ '$pendingnotetext' => t('Note from the user'),
'$approve' => t('Approve'),
'$deny' => t('Deny'),
'$delete' => t('Delete'),
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 51cd59c62..5aea4eede 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -1,17 +1,21 @@
argv[1];
}
- /**
+ /*
*
* Main entry point. Scenario 1. Our user received a friend request notification (perhaps
* from another site) and clicked 'Approve'.
@@ -87,7 +91,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$activity = ((x($_POST,'activity')) ? intval($_POST['activity']) : 0 );
}
- /**
+ /*
*
* Ensure that dfrn_id has precedence when we go to find the contact record.
* We only want to search based on contact id if there is no dfrn_id,
@@ -103,7 +107,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
logger('Confirming follower with contact_id: ' . $cid);
- /**
+ /*
*
* The other person will have been issued an ID when they first requested friendship.
* Locate their record. At this time, their record will have both pending and blocked set to 1.
@@ -139,7 +143,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if($network === NETWORK_DFRN) {
- /**
+ /*
*
* Generate a key pair for all further communications with this person.
* We have a keypair for every contact, and a site key for unknown people.
@@ -166,7 +170,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$params = array();
- /**
+ /*
*
* Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
* site private key (person on the other end can decrypt it with our site public key).
@@ -212,7 +216,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
- /**
+ /*
*
* POST all this stuff to the other site.
* Temporarily raise the network timeout to 120 seconds because the default 60
@@ -506,7 +510,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
//NOTREACHED
}
- /**
+ /*
*
*
* End of Scenario 1. [Local confirmation of remote friend request].
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 780fb456f..6f6fc41c1 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,5 +1,10 @@
argc > 1)
@@ -22,7 +24,7 @@ function dfrn_request_init(&$a) {
profile_load($a,$which);
return;
-}}
+}
/**
@@ -40,8 +42,6 @@ function dfrn_request_init(&$a) {
* After logging in, we click 'submit' to approve the linkage.
*
*/
-
-if(! function_exists('dfrn_request_post')) {
function dfrn_request_post(&$a) {
if(($a->argc != 2) || (! count($a->profile))) {
@@ -55,7 +55,7 @@ function dfrn_request_post(&$a) {
}
- /**
+ /*
*
* Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
* to confirm the request, and then we've clicked submit (perhaps after logging in).
@@ -65,7 +65,7 @@ function dfrn_request_post(&$a) {
if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
- /**
+ /*
* Ensure this is a valid request
*/
@@ -77,23 +77,24 @@ function dfrn_request_post(&$a) {
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
$contact_record = null;
+ $blocked = 1;
+ $pending = 1;
if(x($dfrn_url)) {
- /**
+ /*
* Lookup the contact based on their URL (which is the only unique thing we have at the moment)
*/
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
intval(local_user()),
- dbesc($dfrn_url),
dbesc(normalise_link($dfrn_url))
);
if(count($r)) {
if(strlen($r[0]['dfrn-id'])) {
- /**
+ /*
* We don't need to be here. It has already happened.
*/
@@ -113,7 +114,7 @@ function dfrn_request_post(&$a) {
}
else {
- /**
+ /*
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
@@ -141,19 +142,18 @@ function dfrn_request_post(&$a) {
$photo = $parms["photo"];
- /********* Escape the entire array ********/
+ // Escape the entire array
dbesc_array($parms);
- /******************************************/
- /**
+ /*
* Create a contact record on our site for the other person
*/
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+ `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
intval(local_user()),
datetime_convert(),
dbesc($dfrn_url),
@@ -170,7 +170,9 @@ function dfrn_request_post(&$a) {
$parms['dfrn-poco'],
dbesc(NETWORK_DFRN),
intval($aes_allow),
- intval($hidden)
+ intval($hidden),
+ intval($blocked),
+ intval($pending)
);
}
@@ -195,7 +197,7 @@ function dfrn_request_post(&$a) {
} else
$forwardurl = $a->get_baseurl()."/contacts";
- /**
+ /*
* Allow the blocked remote notification to complete
*/
@@ -222,7 +224,7 @@ function dfrn_request_post(&$a) {
return; // NOTREACHED
}
- /**
+ /*
* Otherwise:
*
* Scenario 1:
@@ -256,11 +258,13 @@ function dfrn_request_post(&$a) {
$contact_record = null;
$failed = false;
$parms = null;
+ $blocked = 1;
+ $pending = 1;
if( x($_POST,'dfrn_url')) {
- /**
+ /*
* Block friend request spam
*/
@@ -277,7 +281,7 @@ function dfrn_request_post(&$a) {
}
}
- /**
+ /*
*
* Cleanup old introductions that remain blocked.
* Also remove the contact record, but only if there is no existing relationship
@@ -304,7 +308,7 @@ function dfrn_request_post(&$a) {
}
}
- /**
+ /*
*
* Cleanup any old email intros - which will have a greater lifetime
*/
@@ -354,8 +358,6 @@ function dfrn_request_post(&$a) {
$nurl = normalise_url($host);
$poll = 'email ' . random_string();
$notify = 'smtp ' . random_string();
- $blocked = 1;
- $pending = 1;
$network = NETWORK_MAIL2;
$rel = CONTACT_IS_FOLLOWER;
@@ -540,8 +542,8 @@ function dfrn_request_post(&$a) {
dbesc_array($parms);
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+ `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
intval($uid),
dbesc(datetime_convert()),
$parms['url'],
@@ -557,7 +559,9 @@ function dfrn_request_post(&$a) {
$parms['dfrn-notify'],
$parms['dfrn-poll'],
$parms['dfrn-poco'],
- dbesc(NETWORK_DFRN)
+ dbesc(NETWORK_DFRN),
+ intval($blocked),
+ intval($pending)
);
// find the contact record we just created
@@ -613,7 +617,7 @@ function dfrn_request_post(&$a) {
// END $network === NETWORK_DFRN
} elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
- /**
+ /*
*
* Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe
@@ -642,12 +646,9 @@ function dfrn_request_post(&$a) {
}
} return;
-}}
+}
-
-
-if(! function_exists('dfrn_request_content')) {
function dfrn_request_content(&$a) {
if(($a->argc != 2) || (! count($a->profile)))
@@ -781,7 +782,7 @@ function dfrn_request_content(&$a) {
}
else {
- /**
+ /*
* Normal web request. Display our user's introduction form.
*/
@@ -793,7 +794,7 @@ function dfrn_request_content(&$a) {
}
- /**
+ /*
* Try to auto-fill the profile address
*/
@@ -816,7 +817,7 @@ function dfrn_request_content(&$a) {
$target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
- /**
+ /*
*
* The auto_request form only has the profile address
* because nobody is going to read the comments and
@@ -881,4 +882,4 @@ function dfrn_request_content(&$a) {
}
return; // Somebody is fishing.
-}}
+}
diff --git a/mod/item.php b/mod/item.php
index 29a210135..0deade418 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -744,6 +744,9 @@ function item_post(&$a) {
if($preview) {
require_once('include/conversation.php');
+ // We set the datarray ID to -1 because in preview mode the dataray
+ // doesn't have an ID.
+ $datarray["id"] = -1;
$o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true);
logger('preview: ' . $o);
echo json_encode(array('preview' => $o));
diff --git a/mod/network.php b/mod/network.php
index 559bad0a3..94a6e81b8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -395,10 +395,10 @@ function network_content(&$a, $update = 0) {
if($group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
- notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
- 'Warning: This group contains %s members from an insecure network.',
- $t), $t ) . EOL);
- notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+ notice(sprintf(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
+ "Warning: This group contains %s members from a network that doesn't allow non public messages.",
+ $t), $t).EOL);
+ notice(t("Messages in this group won't be send to these receivers.").EOL);
}
}
@@ -453,6 +453,7 @@ function network_content(&$a, $update = 0) {
if ($nouveau OR strlen($file) OR $update) {
$sql_table = "`item`";
$sql_parent = "`parent`";
+ $sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
}
$sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
@@ -487,9 +488,9 @@ function network_content(&$a, $update = 0) {
$gcontact_str_self = $self[0]["gid"];
}
- $sql_post_table = " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
- $sql_extra3 .= " AND ($sql_table.`contact-id` IN ($contact_str) ";
- $sql_extra3 .= " OR ($sql_table.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
+ $sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
+ $sql_extra3 .= " AND (`thread`.`contact-id` IN ($contact_str) ";
+ $sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
} else {
$sql_extra3 .= " AND false ";
info( t('Group is empty'));
@@ -503,7 +504,7 @@ function network_content(&$a, $update = 0) {
elseif($cid) {
$r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
- AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+ AND (NOT `blocked` OR `pending`) LIMIT 1",
intval($cid)
);
if(count($r)) {
@@ -569,7 +570,7 @@ function network_content(&$a, $update = 0) {
if($tag) {
$sql_extra = "";
- $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+ $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
$sql_order = "`item`.`id`";
$order_mode = "id";
@@ -583,7 +584,7 @@ function network_content(&$a, $update = 0) {
}
}
if(strlen($file)) {
- $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+ $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
$sql_order = "`item`.`id`";
$order_mode = "id";
@@ -602,7 +603,7 @@ function network_content(&$a, $update = 0) {
if(get_config('system', 'old_pager')) {
$r = qu("SELECT COUNT(*) AS `total`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
$sql_extra2 $sql_extra3
$sql_extra $sql_nets ",
@@ -680,7 +681,7 @@ function network_content(&$a, $update = 0) {
$r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
AND NOT `item`.`moderated` AND `item`.`unseen`
$sql_extra3 $sql_extra $sql_nets
@@ -690,7 +691,7 @@ function network_content(&$a, $update = 0) {
} else {
$r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
$sql_extra2 $sql_extra3 $sql_extra $sql_nets
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 23075ad77..410e08773 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -1,516 +1,176 @@
- *
- *
- *
- *
- * Shiny Trinket
- * 
- *
Shiny trinkets are shiny.
- * - * @endverbatim + * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content */ -if(!function_exists('deletenode')) { - function deletenode(&$doc, $node) - { - $xpath = new DomXPath($doc); - $list = $xpath->query("//".$node); - foreach ($list as $child) - $child->parentNode->removeChild($child); - } -} +use \Friendica\ParseUrl; -function completeurl($url, $scheme) { - $urlarr = parse_url($url); - - if (isset($urlarr["scheme"])) - return($url); - - $schemearr = parse_url($scheme); - - $complete = $schemearr["scheme"]."://".$schemearr["host"]; - - if (@$schemearr["port"] != "") - $complete .= ":".$schemearr["port"]; - - if(strpos($urlarr['path'],'/') !== 0) - $complete .= '/'; - - $complete .= $urlarr["path"]; - - if (@$urlarr["query"] != "") - $complete .= "?".$urlarr["query"]; - - if (@$urlarr["fragment"] != "") - $complete .= "#".$urlarr["fragment"]; - - return($complete); -} - -function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) { - - if ($url == "") - return false; - - $r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d", - dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed)); - - if ($r) - $data = $r[0]["content"]; - - if (!is_null($data)) { - $data = unserialize($data); - return $data; - } - - $data = parseurl_getsiteinfo($url, $no_guessing, $do_oembed); - - q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s') - ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'", - dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed), - dbesc(serialize($data)), dbesc(datetime_convert()), - dbesc(serialize($data)), dbesc(datetime_convert())); - - return $data; -} - -function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) { - require_once("include/network.php"); - require_once("include/Photo.php"); - - $a = get_app(); - - $siteinfo = array(); - - // Check if the URL does contain a scheme - $scheme = parse_url($url, PHP_URL_SCHEME); - - if ($scheme == "") { - $url = "http://".trim($url, "/"); - } - - if ($count > 10) { - logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG); - return($siteinfo); - } - - $url = trim($url, "'"); - $url = trim($url, '"'); - - $url = original_url($url); - - $siteinfo["url"] = $url; - $siteinfo["type"] = "link"; - - $check_cert = get_config('system','verifyssl'); - - $stamp1 = microtime(true); - - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_HEADER, 1); - curl_setopt($ch, CURLOPT_NOBODY, 1); - curl_setopt($ch, CURLOPT_TIMEOUT, 3); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent()); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false)); - - $header = curl_exec($ch); - $curl_info = @curl_getinfo($ch); - $http_code = $curl_info['http_code']; - curl_close($ch); - - $a->save_timestamp($stamp1, "network"); - - if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302") OR ($curl_info['http_code'] == "303") OR ($curl_info['http_code'] == "307")) - AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) { - if ($curl_info['redirect_url'] != "") - $siteinfo = parseurl_getsiteinfo($curl_info['redirect_url'], $no_guessing, $do_oembed, ++$count); - else - $siteinfo = parseurl_getsiteinfo($curl_info['location'], $no_guessing, $do_oembed, ++$count); - return($siteinfo); - } - - // if the file is too large then exit - if ($curl_info["download_content_length"] > 1000000) - return($siteinfo); - - // if it isn't a HTML file then exit - if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html")) - return($siteinfo); - - if ($do_oembed) { - require_once("include/oembed.php"); - - $oembed_data = oembed_fetch_url($url); - - if (!in_array($oembed_data->type, array("error", "rich"))) { - $siteinfo["type"] = $oembed_data->type; - } - - if (($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) { - if (isset($oembed_data->title)) - $siteinfo["title"] = $oembed_data->title; - if (isset($oembed_data->description)) - $siteinfo["text"] = trim($oembed_data->description); - if (isset($oembed_data->thumbnail_url)) - $siteinfo["image"] = $oembed_data->thumbnail_url; - } - } - - $stamp1 = microtime(true); - - // Now fetch the body as well - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_HEADER, 1); - curl_setopt($ch, CURLOPT_NOBODY, 0); - curl_setopt($ch, CURLOPT_TIMEOUT, 10); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent()); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false)); - - $header = curl_exec($ch); - $curl_info = @curl_getinfo($ch); - $http_code = $curl_info['http_code']; - curl_close($ch); - - $a->save_timestamp($stamp1, "network"); - - // Fetch the first mentioned charset. Can be in body or header - $charset = ""; - if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) - $charset = trim(trim(trim(array_pop($matches)), ';,')); - - if ($charset == "") - $charset = "utf-8"; - - $pos = strpos($header, "\r\n\r\n"); - - if ($pos) - $body = trim(substr($header, $pos)); - else - $body = $header; - - if (($charset != '') AND (strtoupper($charset) != "UTF-8")) { - logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG); - //$body = mb_convert_encoding($body, "UTF-8", $charset); - $body = iconv($charset, "UTF-8//TRANSLIT", $body); - } - - $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); - - $doc = new DOMDocument(); - @$doc->loadHTML($body); - - deletenode($doc, 'style'); - deletenode($doc, 'script'); - deletenode($doc, 'option'); - deletenode($doc, 'h1'); - deletenode($doc, 'h2'); - deletenode($doc, 'h3'); - deletenode($doc, 'h4'); - deletenode($doc, 'h5'); - deletenode($doc, 'h6'); - deletenode($doc, 'ol'); - deletenode($doc, 'ul'); - - $xpath = new DomXPath($doc); - - $list = $xpath->query("//meta[@content]"); - foreach ($list as $node) { - $attr = array(); - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - if (@$attr["http-equiv"] == 'refresh') { - $path = $attr["content"]; - $pathinfo = explode(";", $path); - $content = ""; - foreach ($pathinfo AS $value) { - if (substr(strtolower($value), 0, 4) == "url=") - $content = substr($value, 4); - } - if ($content != "") { - $siteinfo = parseurl_getsiteinfo($content, $no_guessing, $do_oembed, ++$count); - return($siteinfo); - } - } - } - - $list = $xpath->query("//title"); - if ($list->length > 0) - $siteinfo["title"] = $list->item(0)->nodeValue; - - //$list = $xpath->query("head/meta[@name]"); - $list = $xpath->query("//meta[@name]"); - foreach ($list as $node) { - $attr = array(); - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); - - if ($attr["content"] != "") - switch (strtolower($attr["name"])) { - case "fulltitle": - $siteinfo["title"] = $attr["content"]; - break; - case "description": - $siteinfo["text"] = $attr["content"]; - break; - case "thumbnail": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:image": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:image:src": - $siteinfo["image"] = $attr["content"]; - break; - case "twitter:card": - if (($siteinfo["type"] == "") OR ($attr["content"] == "photo")) - $siteinfo["type"] = $attr["content"]; - break; - case "twitter:description": - $siteinfo["text"] = $attr["content"]; - break; - case "twitter:title": - $siteinfo["title"] = $attr["content"]; - break; - case "dc.title": - $siteinfo["title"] = $attr["content"]; - break; - case "dc.description": - $siteinfo["text"] = $attr["content"]; - break; - case "keywords": - $keywords = explode(",", $attr["content"]); - break; - case "news_keywords": - $keywords = explode(",", $attr["content"]); - break; - } - if ($siteinfo["type"] == "summary") - $siteinfo["type"] = "link"; - } - - if (isset($keywords)) { - $siteinfo["keywords"] = array(); - foreach ($keywords as $keyword) - if (!in_array(trim($keyword), $siteinfo["keywords"])) - $siteinfo["keywords"][] = trim($keyword); - } - - //$list = $xpath->query("head/meta[@property]"); - $list = $xpath->query("//meta[@property]"); - foreach ($list as $node) { - $attr = array(); - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8")); - - if ($attr["content"] != "") - switch (strtolower($attr["property"])) { - case "og:image": - $siteinfo["image"] = $attr["content"]; - break; - case "og:title": - $siteinfo["title"] = $attr["content"]; - break; - case "og:description": - $siteinfo["text"] = $attr["content"]; - break; - } - } - - if ((@$siteinfo["image"] == "") AND !$no_guessing) { - $list = $xpath->query("//img[@src]"); - foreach ($list as $node) { - $attr = array(); - if ($node->attributes->length) - foreach ($node->attributes as $attribute) - $attr[$attribute->name] = $attribute->value; - - $src = completeurl($attr["src"], $url); - $photodata = get_photo_info($src); - - if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) { - if ($photodata[0] > 300) { - $photodata[1] = round($photodata[1] * (300 / $photodata[0])); - $photodata[0] = 300; - } - if ($photodata[1] > 300) { - $photodata[0] = round($photodata[0] * (300 / $photodata[1])); - $photodata[1] = 300; - } - $siteinfo["images"][] = array("src"=>$src, - "width"=>$photodata[0], - "height"=>$photodata[1]); - } - - } - } elseif ($siteinfo["image"] != "") { - $src = completeurl($siteinfo["image"], $url); - - unset($siteinfo["image"]); - - $photodata = get_photo_info($src); - - if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) - $siteinfo["images"][] = array("src"=>$src, - "width"=>$photodata[0], - "height"=>$photodata[1]); - } - - if ((@$siteinfo["text"] == "") AND (@$siteinfo["title"] != "") AND !$no_guessing) { - $text = ""; - - $list = $xpath->query("//div[@class='article']"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - - if ($text == "") { - $list = $xpath->query("//div[@class='content']"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - } - - // If none text was found then take the paragraph content - if ($text == "") { - $list = $xpath->query("//p"); - foreach ($list as $node) - if (strlen($node->nodeValue) > 40) - $text .= " ".trim($node->nodeValue); - } - - if ($text != "") { - $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text)); - - while (strpos($text, " ")) - $text = trim(str_replace(" ", " ", $text)); - - $siteinfo["text"] = trim(html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...'); - } - } - - logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG); - - call_hooks('getsiteinfo', $siteinfo); - - return($siteinfo); -} - -function arr_add_hashes(&$item,$k) { - $item = '#' . $item; -} +require_once("include/items.php"); function parse_url_content(&$a) { - require_once("include/items.php"); - $text = null; - $str_tags = ''; + $str_tags = ""; $textmode = false; - if(local_user() && (! feature_enabled(local_user(),'richtext'))) + if (local_user() && (!feature_enabled(local_user(), "richtext"))) { $textmode = true; + } - //if($textmode) - $br = (($textmode) ? "\n" : ''); + $br = (($textmode) ? "\n" : "
"); - if(x($_GET,'binurl')) - $url = trim(hex2bin($_GET['binurl'])); - else - $url = trim($_GET['url']); + if (x($_GET,"binurl")) { + $url = trim(hex2bin($_GET["binurl"])); + } else { + $url = trim($_GET["url"]); + } - if($_GET['title']) - $title = strip_tags(trim($_GET['title'])); + if ($_GET["title"]) { + $title = strip_tags(trim($_GET["title"])); + } - if($_GET['description']) - $text = strip_tags(trim($_GET['description'])); + if ($_GET["description"]) { + $text = strip_tags(trim($_GET["description"])); + } - if($_GET['tags']) { - $arr_tags = str_getcsv($_GET['tags']); - if(count($arr_tags)) { - array_walk($arr_tags,'arr_add_hashes'); - $str_tags = $br . implode(' ',$arr_tags) . $br; + if ($_GET["tags"]) { + $arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]); + if (count($arr_tags)) { + $str_tags = $br . implode(" ", $arr_tags) . $br; } } - // add url scheme if missing + // Add url scheme if it is missing $arrurl = parse_url($url); - if (!x($arrurl, 'scheme')) { - if (x($arrurl, 'host')) + if (!x($arrurl, "scheme")) { + if (x($arrurl, "host")) { $url = "http:".$url; - else + } else { $url = "http://".$url; + } } - logger('parse_url: ' . $url); + logger("prse_url: " . $url); - if($textmode) - $template = '[bookmark=%s]%s[/bookmark]%s'; - else + // Check if the URL is an image, video or audio file. If so format + // the URL with the corresponding BBCode media tag + $redirects = 0; + // Fetch the header of the URL + $result = z_fetch_url($url, false, $redirects, array("novalidate" => true, "nobody" => true)); + if($result["success"]) { + // Convert the header fields into an array + $hdrs = array(); + $h = explode("\n", $result["header"]); + foreach ($h as $l) { + list($k,$v) = array_map("trim", explode(":", trim($l), 2)); + $hdrs[$k] = $v; + } + if (array_key_exists("Content-Type", $hdrs)) { + $type = $hdrs["Content-Type"]; + } + if ($type) { + if(stripos($type, "image/") !== false) { + echo $br . "[img]" . $url . "[/img]" . $br; + killme(); + } + if (stripos($type, "video/") !== false) { + echo $br . "[video]" . $url . "[/video]" . $br; + killme(); + } + if (stripos($type, "audio/") !== false) { + echo $br . "[audio]" . $url . "[/audio]" . $br; + killme(); + } + } + } + + if ($textmode) { + $template = "[bookmark=%s]%s[/bookmark]%s"; + } else { $template = "%s%s"; + } - $arr = array('url' => $url, 'text' => ''); + $arr = array("url" => $url, "text" => ""); - call_hooks('parse_link', $arr); + call_hooks("parse_link", $arr); - if(strlen($arr['text'])) { - echo $arr['text']; + if (strlen($arr["text"])) { + echo $arr["text"]; killme(); } + // If there is allready some content information submitted we don't + // need to parse the url for content. + if ($url && $title && $text) { - if($url && $title && $text) { + $title = str_replace(array("\r","\n"),array("",""),$title); - $title = str_replace(array("\r","\n"),array('',''),$title); - - if($textmode) - $text = '[quote]' . trim($text) . '[/quote]' . $br; - else { - $text = '
' . htmlspecialchars(trim($text)) . '
'; + if ($textmode) { + $text = "[quote]" . trim($text) . "[/quote]" . $br; + } else { + $text = "
" . htmlspecialchars(trim($text)) . "
"; $title = htmlspecialchars($title); } - $result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags; + $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags; - logger('parse_url (unparsed): returns: ' . $result); + logger("parse_url (unparsed): returns: " . $result); echo $result; killme(); } - $siteinfo = parseurl_getsiteinfo($url); + // Fetch the information directly from the webpage + $siteinfo = ParseUrl::getSiteinfo($url); unset($siteinfo["keywords"]); + // Format it as BBCode attachment $info = add_page_info_data($siteinfo); - if (!$textmode) + if (!$textmode) { // Replace ' with ’ - not perfect - but the richtext editor has problems otherwise $info = str_replace(array("'"), array("’"), $info); + } echo $info; killme(); } -?> + +/** + * @brief Legacy function to call ParseUrl::getSiteinfoCached + * + * Note: We have moved the function to ParseUrl.php. This function is only for + * legacy support and will be remove in the future + * + * @param type $url The url of the page which should be scraped + * @param type $no_guessing If true the parse doens't search for + * preview pictures + * @param type $do_oembed The false option is used by the function fetch_oembed() + * to avoid endless loops + * + * @return array which contains needed data for embedding + * + * @see ParseUrl::getSiteinfoCached() + * + * @todo Remove this function after all Addons has been changed to use + * ParseUrl::getSiteinfoCached + */ +function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) { + $siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed); + return $siteinfo; +} diff --git a/mod/ping.php b/mod/ping.php index 0ed7eb3fe..7e20b9383 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -3,43 +3,119 @@ require_once("include/datetime.php"); require_once('include/bbcode.php'); require_once('include/ForumManager.php'); require_once('include/group.php'); -require_once("mod/proxy.php"); +require_once('mod/proxy.php'); require_once('include/xml.php'); -function ping_init(&$a) { +/** + * @brief Outputs the counts and the lists of various notifications + * + * The output format can be controlled via the GET parameter 'format'. It can be + * - xml (deprecated legacy default) + * - json (outputs JSONP with the 'callback' GET parameter) + * + * Expected JSON structure: + * { + * "result": { + * "intro": 0, + * "mail": 0, + * "net": 0, + * "home": 0, + * "register": 0, + * "all-events": 0, + * "all-events-today": 0, + * "events": 0, + * "events-today": 0, + * "birthdays": 0, + * "birthdays-today": 0, + * "groups": [ ], + * "forums": [ ], + * "notify": 0, + * "notifications": [ ], + * "sysmsgs": { + * "notice": [ ], + * "info": [ ] + * } + * } + * } + * + * @param App $a The Friendica App instance + */ +function ping_init(App $a) +{ + $format = 'xml'; - $xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">"; + if (isset($_GET['format']) && $_GET['format'] == 'json') { + $format = 'json'; + } + + $tags = array(); + $comments = array(); + $likes = array(); + $dislikes = array(); + $friends = array(); + $posts = array(); + $regs = array(); + $mails = array(); + $notifications = array(); + + $intro_count = 0; + $mail_count = 0; + $home_count = 0; + $network_count = 0; + $register_count = 0; + $sysnotify_count = 0; + $groups_unseen = array(); + $forums_unseen = array(); + + $all_events = 0; + $all_events_today = 0; + $events = 0; + $events_today = 0; + $birthdays = 0; + $birthdays_today = 0; + + $data = array(); + $data['intro'] = $intro_count; + $data['mail'] = $mail_count; + $data['net'] = $network_count; + $data['home'] = $home_count; + $data['register'] = $register_count; + + $data['all-events'] = $all_events; + $data['all-events-today'] = $all_events_today; + $data['events'] = $events; + $data['events-today'] = $events_today; + $data['birthdays'] = $birthdays; + $data['birthdays-today'] = $birthdays_today; if (local_user()){ // Different login session than the page that is calling us. if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { - $data = array("invalid" => 1); - header("Content-type: text/xml"); - echo xml::from_array(array("result" => $data), $xml); + + $data = array('result' => array('invalid' => 1)); + + if ($format == 'json') { + if (isset($_GET['callback'])) { + // JSONP support + header("Content-type: application/javascript"); + echo $_GET['callback'] . '(' . json_encode($data) . ')'; + } else { + header("Content-type: application/json"); + echo json_encode($data); + } + } else { + header("Content-type: text/xml"); + echo xml::from_array($data, $xml); + } killme(); } $notifs = ping_get_notifications(local_user()); - $sysnotify = 0; // we will update this in a moment - $tags = array(); - $comments = array(); - $likes = array(); - $dislikes = array(); - $friends = array(); - $posts = array(); - $regs = array(); - $mails = array(); - - $home = 0; - $network = 0; - $groups_unseen = array(); - $forums_unseen = array(); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, + $items_unseen = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`, `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink` + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id` = `item`.`parent` WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0 AND `item`.`contact-id` != %d @@ -47,110 +123,90 @@ function ping_init(&$a) { intval(local_user()), intval(local_user()) ); - if (dbm::is_result($r)) { - - $arr = array('items' => $r); + if (dbm::is_result($items_unseen)) { + $arr = array('items' => $items_unseen); call_hooks('network_ping', $arr); - foreach ($r as $it) { - - if ($it['wall']) - $home ++; - else - $network ++; - - switch($it['verb']){ - case ACTIVITY_TAG: - $obj = parse_xml_string($xmlhead.$it['object']); - $it['tname'] = $obj->content; - $tags[] = $it; - break; - case ACTIVITY_LIKE: - $likes[] = $it; - break; - case ACTIVITY_DISLIKE: - $dislikes[] = $it; - break; - case ACTIVITY_FRIEND: - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - $friends[] = $it; - break; - default: - if ($it['parent']!=$it['id']) { - $comments[] = $it; - } else { - if (!$it['wall']) - $posts[] = $it; - } + foreach ($items_unseen as $item) { + if ($item['wall']) { + $home_count++; + } else { + $network_count++; } } } - if ($network) { - if (intval(feature_enabled(local_user(),'groups'))) { + if ($network_count) { + if (intval(feature_enabled(local_user(), 'groups'))) { // Find out how unseen network posts are spread across groups - $groups_unseen = groups_count_unseen(); + $group_counts = groups_count_unseen(); + if (dbm::is_result($group_counts)) { + foreach ($group_counts as $group_count) { + if ($group_count['count'] > 0) { + $groups_unseen[] = $group_count; + } + } + } } - if (intval(feature_enabled(local_user(),'forumlist_widget'))) { - $forums_unseen = ForumManager::count_unseen_items(); + if (intval(feature_enabled(local_user(), 'forumlist_widget'))) { + $forum_counts = ForumManager::count_unseen_items(); + if (dbm::is_result($forums_counts)) { + foreach ($forums_counts as $forum_count) { + if ($forum_count['count'] > 0) { + $forums_unseen[] = $forum_count; + } + } + } } } - $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`, + $intros1 = qu("SELECT `intro`.`id`, `intro`.`datetime`, `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0", intval(local_user()) ); - $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, + $intros2 = qu("SELECT `intro`.`id`, `intro`.`datetime`, `contact`.`name`, `contact`.`url`, `contact`.`photo` FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` - WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", + WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0", intval(local_user()) ); - $intro = count($intros1) + count($intros2); + $intro_count = count($intros1) + count($intros2); $intros = $intros1+$intros2; $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; - $mails = q("SELECT * FROM `mail` + $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail` WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", intval(local_user()), dbesc($myurl) ); - $mail = count($mails); + $mail_count = count($mails); if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){ - $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1"); - if ($regs) - $register = $regs[0]['total']; - } else { - $register = "0"; + $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total` + FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid` + WHERE `contact`.`self` = 1"); + if ($regs) { + $register_count = $regs[0]['total']; + } } - $all_events = 0; - $all_events_today = 0; - $events = 0; - $events_today = 0; - $birthdays = 0; - $birthdays_today = 0; - - - $ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event` + $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 ORDER BY `start` ASC ", intval(local_user()), - dbesc(datetime_convert('UTC','UTC','now + 7 days')), - dbesc(datetime_convert('UTC','UTC','now')) + dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')), + dbesc(datetime_convert('UTC', 'UTC', 'now')) ); if (dbm::is_result($ev)) { $all_events = intval($ev[0]['total']); if ($all_events) { - $str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d'); + $str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d'); foreach($ev as $x) { $bd = false; if ($x['type'] === 'birthday') { @@ -160,7 +216,7 @@ function ping_init(&$a) { else { $events ++; } - if (datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) { + if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) { $all_events_today ++; if ($bd) $birthdays_today ++; @@ -171,99 +227,70 @@ function ping_init(&$a) { } } - $data = array(); - $data["intro"] = $intro; - $data["mail"] = $mail; - $data["net"] = $network; - $data["home"] = $home; + $data['intro'] = $intro_count; + $data['mail'] = $mail_count; + $data['net'] = $network_count; + $data['home'] = $home_count; + $data['register'] = $register_count; - if ($register!=0) - $data["register"] = $register; + $data['all-events'] = $all_events; + $data['all-events-today'] = $all_events_today; + $data['events'] = $events; + $data['events-today'] = $events_today; + $data['birthdays'] = $birthdays; + $data['birthdays-today'] = $birthdays_today; - $groups = array(); - - if (dbm::is_result($groups_unseen)) { - $count = 0; - foreach ($groups_unseen as $it) - if ($it['count'] > 0) { - $count++; - $groups[$count.":group"] = $it['count']; - $groups[$count.":@attributes"] = array("id" => $it['id']); + if (dbm::is_result($notifs)) { + foreach ($notifs as $notif) { + if ($notif['seen'] == 0) { + $sysnotify_count ++; } - $data["groups"] = $groups; - } - - $forums = array(); - - if (dbm::is_result($forums_unseen)) { - $count = 0; - foreach ($forums_unseen as $it) - if ($it['count'] > 0) { - $count++; - $forums[$count.":forum"] = $it['count']; - $forums[$count.":@attributes"] = array("id" => $it['id']); - } - $data["forums"] = $forums; - } - - $data["all-events"] = $all_events; - $data["all-events-today"] = $all_events_today; - $data["events"] = $events; - $data["events-today"] = $events_today; - $data["birthdays"] = $birthdays; - $data["birthdays-today"] = $birthdays_today; - - - if (dbm::is_result($notifs) && !$sysnotify) { - foreach ($notifs as $zz) { - if ($zz['seen'] == 0) - $sysnotify ++; } } // merge all notification types in one array if (dbm::is_result($intros)) { - foreach ($intros as $i) { - $n = array( - 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], - 'name' => $i['name'], - 'url' => $i['url'], - 'photo' => $i['photo'], - 'date' => $i['datetime'], - 'seen' => false, - 'message' => t("{0} wants to be your friend"), + foreach ($intros as $intro) { + $notif = array( + 'href' => $a->get_baseurl() . '/notifications/intros/' . $intro['id'], + 'name' => $intro['name'], + 'url' => $intro['url'], + 'photo' => $intro['photo'], + 'date' => $intro['datetime'], + 'seen' => false, + 'message' => t('{0} wants to be your friend'), ); - $notifs[] = $n; + $notifs[] = $notif; } } if (dbm::is_result($mails)) { - foreach ($mails as $i) { - $n = array( - 'href' => $a->get_baseurl().'/message/'.$i['id'], - 'name' => $i['from-name'], - 'url' => $i['from-url'], - 'photo' => $i['from-photo'], - 'date' => $i['created'], - 'seen' => false, - 'message' => t("{0} sent you a message"), + foreach ($mails as $mail) { + $notif = array( + 'href' => $a->get_baseurl() . '/message/' . $mail['id'], + 'name' => $mail['from-name'], + 'url' => $mail['from-url'], + 'photo' => $mail['from-photo'], + 'date' => $mail['created'], + 'seen' => false, + 'message' => t('{0} sent you a message'), ); - $notifs[] = $n; + $notifs[] = $notif; } } if (dbm::is_result($regs)) { - foreach ($regs as $i) { - $n = array( - 'href' => $a->get_baseurl().'/admin/users/', - 'name' => $i['name'], - 'url' => $i['url'], - 'photo' => $i['micro'], - 'date' => $i['created'], - 'seen' => false, - 'message' => t("{0} requested registration"), + foreach ($regs as $reg) { + $notif = array( + 'href' => $a->get_baseurl() . '/admin/users/', + 'name' => $reg['name'], + 'url' => $reg['url'], + 'photo' => $reg['micro'], + 'date' => $reg['created'], + 'seen' => false, + 'message' => t('{0} requested registration'), ); - $notifs[] = $n; + $notifs[] = $notif; } } @@ -279,68 +306,79 @@ function ping_init(&$a) { usort($notifs, $sort_function); if (dbm::is_result($notifs)) { - - // Are the nofications calles from the regular process or via the friendica app? + // Are the nofications called from the regular process or via the friendica app? $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_'])); - $count = 0; - foreach($notifs as $n) { - $count++; - if ($a->is_friendica_app() OR !$regularnotifications) - $n['message'] = str_replace("{0}", $n['name'], $n['message']); + foreach ($notifs as $notif) { + if ($a->is_friendica_app() OR !$regularnotifications) { + $notif['message'] = str_replace("{0}", $notif['name'], $notif['message']); + } - $notifications[$count.":note"] = $n['message']; + $contact = get_contact_details_by_url($notif['url']); + if (isset($contact['micro'])) { + $notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO); + } else { + $notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO); + } - $contact = get_contact_details_by_url($n['url']); - if (isset($contact["micro"])) - $n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO); - else - $n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO); - - $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); - - call_hooks('ping_xmlize', $n); - - $notifications[$count.":@attributes"] = array("id" => $n["id"], - "href" => $n['href'], - "name" => $n['name'], - "url" => $n['url'], - "photo" => $n['photo'], - "date" => relative_date($n['date']), - "seen" => $n['seen'], - "timestamp" => strtotime($local_time)); + $local_time = datetime_convert('UTC', date_default_timezone_get(), $notif['date']); + $notifications[] = array( + 'id' => $notif['id'], + 'href' => $notif['href'], + 'name' => $notif['name'], + 'url' => $notif['url'], + 'photo' => $notif['photo'], + 'date' => relative_date($notif['date']), + 'message' => $notif['message'], + 'seen' => $notif['seen'], + 'timestamp' => strtotime($local_time) + ); } } - - $data["notif"] = $notifications; - $data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register); } - $sysmsg = array(); + $sysmsgs = array(); + $sysmsgs_info = array(); - if (x($_SESSION,'sysmsg')){ - $count = 0; - foreach ($_SESSION['sysmsg'] as $m){ - $count++; - $sysmsg[$count.":notice"] = $m; - } + if (x($_SESSION, 'sysmsg')) { + $sysmsgs = $_SESSION['sysmsg']; unset($_SESSION['sysmsg']); } - if (x($_SESSION,'sysmsg_info')){ - $count = 0; - foreach ($_SESSION['sysmsg_info'] as $m){ - $count++; - $sysmsg[$count.":info"] = $m; - } + if (x($_SESSION, 'sysmsg_info')) { + $sysmsgs_info = $_SESSION['sysmsg_info']; unset($_SESSION['sysmsg_info']); } - $data["sysmsgs"] = $sysmsg; + if ($format == 'json') { + $data['groups'] = $groups_unseen; + $data['forums'] = $forums_unseen; + $data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count; + $data['notifications'] = $notifications; + $data['sysmsgs'] = array( + 'notice' => $sysmsgs, + 'info' => $sysmsgs_info + ); + + $json_payload = json_encode(array("result" => $data)); + + if (isset($_GET['callback'])) { + // JSONP support + header("Content-type: application/javascript"); + echo $_GET['callback'] . '(' . $json_payload . ')'; + } else { + header("Content-type: application/json"); + echo $json_payload; + } + } else { + // Legacy slower XML format output + $data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen); + + header("Content-type: text/xml"); + echo xml::from_array(array("result" => $data), $xml); + } - header("Content-type: text/xml"); - echo xml::from_array(array("result" => $data), $xml); killme(); } @@ -350,19 +388,19 @@ function ping_init(&$a) { * @param int $uid User id * @return array Associative array of notifications */ -function ping_get_notifications($uid) { - - $result = array(); - $offset = 0; - $seen = false; +function ping_get_notifications($uid) +{ + $result = array(); + $offset = 0; + $seen = false; $seensql = "NOT"; - $order = "DESC"; - $quit = false; + $order = "DESC"; + $quit = false; $a = get_app(); do { - $r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted` + $r = qu("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted` FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid` WHERE `notify`.`uid` = %d AND `notify`.`msg` != '' AND NOT (`notify`.`type` IN (%d, %d)) @@ -422,3 +460,71 @@ function ping_get_notifications($uid) { return($result); } + +/** + * @brief Backward-compatible XML formatting for ping.php output + * @deprecated + * + * @param array $data The initial ping data array + * @param int $sysnotify_count Number of unseen system notifications + * @param array $notifs Complete list of notification + * @param array $sysmsgs List of system notice messages + * @param array $sysmsgs_info List of system info messages + * @param int $groups_unseen Number of unseen group items + * @param int $forums_unseen Number of unseen forum items + * @return array XML-transform ready data array + */ +function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) +{ + $notifications = array(); + foreach($notifs as $key => $notif) { + $notifications[$key . ':note'] = $notif['message']; + + $notifications[$key . ':@attributes'] = array( + 'id' => $notif['id'], + 'href' => $notif['href'], + 'name' => $notif['name'], + 'url' => $notif['url'], + 'photo' => $notif['photo'], + 'date' => $notif['date'], + 'seen' => $notif['seen'], + 'timestamp' => $notif['timestamp'] + ); + } + + $sysmsg = array(); + foreach ($sysmsgs as $key => $m){ + $sysmsg[$key . ':notice'] = $m; + } + foreach ($sysmsgs_info as $key => $m){ + $sysmsg[$key . ':info'] = $m; + } + + $data['notif'] = $notifications; + $data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']); + $data['sysmsgs'] = $sysmsg; + + if ($data['register'] == 0) { + unset($data['register']); + } + + $groups = array(); + if (count($groups_unseen)) { + foreach ($groups_unseen as $key => $item) { + $groups[$key . ':group'] = $item['count']; + $groups[$key . ':@attributes'] = array('id' => $item['id']); + } + $data['groups'] = $groups; + } + + $forums = array(); + if (count($forums_unseen)) { + foreach ($forums_unseen as $key => $item) { + $forums[$count . ':forum'] = $item['count']; + $forums[$count . ':@attributes'] = array('id' => $item['id']); + } + $data['forums'] = $forums; + } + + return $data; +} diff --git a/mod/proxy.php b/mod/proxy.php index a4fbdd244..de2810dd7 100644 --- a/mod/proxy.php +++ b/mod/proxy.php @@ -233,66 +233,87 @@ function proxy_init() { killme(); } -function proxy_url($url, $writemode = false, $size = "") { - global $_SERVER; - +/** + * @brief Transform a remote URL into a local one + * + * This function only performs the URL replacement on http URL and if the + * provided URL isn't local, "the isn't deactivated" (sic) and if the config + * system.proxy_disabled is set to false. + * + * @param string $url The URL to proxyfy + * @param bool $writemode Returns a local path the remote URL should be saved to + * @param string $size One of the PROXY_SIZE_* constants + * + * @return string The proxyfied URL or relative path + */ +function proxy_url($url, $writemode = false, $size = '') { $a = get_app(); if (substr($url, 0, strlen('http')) !== 'http') { - return($url); + return $url; } // Only continue if it isn't a local image and the isn't deactivated if (proxy_is_local_image($url)) { - $url = str_replace(normalise_link($a->get_baseurl())."/", $a->get_baseurl()."/", $url); - return($url); + $url = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $url); + return $url; } - if (get_config("system", "proxy_disabled")) - return($url); + if (get_config('system', 'proxy_disabled')) { + return $url; + } + + // Image URL may have encoded ampersands for display which aren't desirable for proxy + $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8'); // Creating a sub directory to reduce the amount of files in the cache directory - $basepath = $a->get_basepath()."/proxy"; + $basepath = $a->get_basepath() . '/proxy'; - $path = substr(hash("md5", $url), 0, 2); + $shortpath = hash('md5', $url); + $longpath = substr($shortpath, 0, 2); - if (is_dir($basepath) and $writemode) - if (!is_dir($basepath."/".$path)) { - mkdir($basepath."/".$path); - chmod($basepath."/".$path, 0777); + if (is_dir($basepath) and $writemode) { + if (!is_dir($basepath . '/' . $longpath)) { + mkdir($basepath . '/' . $longpath); + chmod($basepath . '/' . $longpath, 0777); } - - $path .= "/".strtr(base64_encode($url), '+/', '-_'); - - // Checking for valid extensions. Only add them if they are safe - $pos = strrpos($url, "."); - if ($pos) { - $extension = strtolower(substr($url, $pos+1)); - $pos = strpos($extension, "?"); - if ($pos) - $extension = substr($extension, 0, $pos); } - $extensions = array("jpg", "jpeg", "gif", "png"); + $longpath .= '/' . strtr(base64_encode($url), '+/', '-_'); - if (in_array($extension, $extensions)) - $path .= ".".$extension; + // Checking for valid extensions. Only add them if they are safe + $pos = strrpos($url, '.'); + if ($pos) { + $extension = strtolower(substr($url, $pos + 1)); + $pos = strpos($extension, '?'); + if ($pos) { + $extension = substr($extension, 0, $pos); + } + } - $proxypath = $a->get_baseurl()."/proxy/".$path; + $extensions = array('jpg', 'jpeg', 'gif', 'png'); + if (in_array($extension, $extensions)) { + $shortpath .= '.' . $extension; + $longpath .= '.' . $extension; + } - if ($size != "") - $size = ":".$size; + $proxypath = $a->get_baseurl() . '/proxy/' . $longpath; + + if ($size != '') { + $size = ':' . $size; + } // Too long files aren't supported by Apache // Writemode in combination with long files shouldn't be possible - if ((strlen($proxypath) > 250) AND $writemode) - return (hash("md5", $url)); - elseif (strlen($proxypath) > 250) - return ($a->get_baseurl()."/proxy/".hash("md5", $url)."?url=".urlencode($url)); - elseif ($writemode) - return ($path); - else - return ($proxypath.$size); + if ((strlen($proxypath) > 250) AND $writemode) { + return $shortpath; + } elseif (strlen($proxypath) > 250) { + return $a->get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url); + } elseif ($writemode) { + return $longpath; + } else { + return $proxypath . $size; + } } /** diff --git a/mod/register.php b/mod/register.php index 3e124bd5b..f0348ef4e 100644 --- a/mod/register.php +++ b/mod/register.php @@ -113,12 +113,13 @@ function register_post(&$a) { } $hash = random_string(); - $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ", + $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ", dbesc($hash), dbesc(datetime_convert()), intval($user['uid']), dbesc($result['password']), - dbesc($lang) + dbesc($lang), + dbesc($_POST['permonlybox']) ); // invite system @@ -133,6 +134,7 @@ function register_post(&$a) { $admin_mail_list ); + // send notification to admins foreach ($adminlist as $admin) { notification(array( 'type' => NOTIFY_SYSTEM, @@ -149,6 +151,11 @@ function register_post(&$a) { 'show_in_notification_page' => false )); } + // send notification to the user, that the registration is pending + send_register_pending_eml( + $user['email'], + $a->config['sitename'], + $user['username']); info( t('Your registration is pending approval by the site owner.') . EOL ) ; goaway(z_root()); @@ -256,6 +263,8 @@ function register_content(&$a) { $o = replace_macros($o, array( '$oidhtml' => $oidhtml, '$invitations' => get_config('system','invitation_only'), + '$permonly' => $a->config['register_policy'] == REGISTER_APPROVE, + '$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')), '$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_label' => t('Your invitation ID: '), '$invite_id' => $invite_id, diff --git a/mod/settings.php b/mod/settings.php index a20b999ed..663acd69f 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -301,6 +301,7 @@ function settings_post(&$a) { $infinite_scroll = x($_POST, 'infinite_scroll') ? intval($_POST['infinite_scroll']) : 0; $no_auto_update = x($_POST, 'no_auto_update') ? intval($_POST['no_auto_update']) : 0; $bandwidth_saver = x($_POST, 'bandwidth_saver') ? intval($_POST['bandwidth_saver']) : 0; + $nowarn_insecure = x($_POST, 'nowarn_insecure') ? intval($_POST['nowarn_insecure']) : 0; $browser_update = x($_POST, 'browser_update') ? intval($_POST['browser_update']) : 0; if ($browser_update != -1) { $browser_update = $browser_update * 1000; @@ -321,6 +322,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','mobile_theme',$mobile_theme); } + set_pconfig(local_user(), 'system', 'nowarn_insecure' , $nowarn_insecure); set_pconfig(local_user(), 'system', 'update_interval' , $browser_update); set_pconfig(local_user(), 'system', 'itemspage_network' , $itemspage_network); set_pconfig(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network); @@ -951,6 +953,8 @@ function settings_content(&$a) { $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $mobile_theme_selected = (!x($_SESSION,'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']); + $nowarn_insecure = intval(get_pconfig(local_user(), 'system', 'nowarn_insecure')); + $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); if (intval($browser_update) != -1) $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds @@ -995,6 +999,7 @@ function settings_content(&$a) { '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true), '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false), + '$nowarn_insecure' => array('nowarn_insecure', t('Suppress warning of insecure networks'), $nowarn_insecure, t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')), '$itemspage_network' => array('itemspage_network', t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')), '$itemspage_mobile_network' => array('itemspage_mobile_network', t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')), diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 19dd8b7f9..6be1f16de 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -47,7 +47,7 @@ function viewcontacts_content(&$a) { } $r = q("SELECT COUNT(*) AS `total` FROM `contact` - WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 + WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s')", intval($a->profile['uid']), dbesc(NETWORK_DFRN), @@ -58,7 +58,7 @@ function viewcontacts_content(&$a) { $a->set_pager_total($r[0]['total']); $r = q("SELECT * FROM `contact` - WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 + WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s') ORDER BY `name` ASC LIMIT %d, %d", intval($a->profile['uid']), diff --git a/mod/worker.php b/mod/worker.php new file mode 100644 index 000000000..c202a28d6 --- /dev/null +++ b/mod/worker.php @@ -0,0 +1,54 @@ + Config::get("system", "worker_queues", 4)) { + return; + } + + $a->start_process(); + + logger("Front end worker started: ".getmypid()); + + call_worker(); + + if ($r = poller_worker_process()) { + + // On most configurations this parameter wouldn't have any effect. + // But since it doesn't destroy anything, we just try to get more execution time in any way. + set_time_limit(0); + + poller_execute($r[0]); + } + + call_worker(); + + $a->end_process(); + + logger("Front end worker ended: ".getmypid()); + + killme(); +} diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt index 390fc4bb8..b95f6cc2f 100644 Binary files a/spec/dfrn2.odt and b/spec/dfrn2.odt differ diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf index e46225f7e..f524c457a 100644 Binary files a/spec/dfrn2.pdf and b/spec/dfrn2.pdf differ diff --git a/spec/dfrn2_contact_confirmation.png b/spec/dfrn2_contact_confirmation.png new file mode 100644 index 000000000..843e7c707 Binary files /dev/null and b/spec/dfrn2_contact_confirmation.png differ diff --git a/spec/dfrn2_contact_confirmation.svg b/spec/dfrn2_contact_confirmation.svg new file mode 100644 index 000000000..bb506a232 --- /dev/null +++ b/spec/dfrn2_contact_confirmation.svg @@ -0,0 +1,162 @@ + + + diff --git a/spec/dfrn2_contact_request.png b/spec/dfrn2_contact_request.png new file mode 100644 index 000000000..cf60094ae Binary files /dev/null and b/spec/dfrn2_contact_request.png differ diff --git a/spec/dfrn2_contact_request.svg b/spec/dfrn2_contact_request.svg new file mode 100644 index 000000000..d81323457 --- /dev/null +++ b/spec/dfrn2_contact_request.svg @@ -0,0 +1,218 @@ + + + diff --git a/update.php b/update.php index fa03ddd1a..76007ad3a 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ config['php_path'])) { + $php = $a->config['php_path']; +} else { + $php = "php"; +} + +// Switch over to daemon mode. +if ($pid = pcntl_fork()) + return; // Parent + +fclose(STDIN); // Close all of the standard +fclose(STDOUT); // file descriptors as we +fclose(STDERR); // are running as a daemon. + +register_shutdown_function('shutdown'); + +if (posix_setsid() < 0) + return; + +if ($pid = pcntl_fork()) + return; // Parent + +$pid = getmypid(); +file_put_contents($pidfile, $pid); + +// Now running as a daemon. +while (true) { + // Just to be sure that this script really runs endlessly + set_time_limit(0); + + // Call the poller + $cmdline = $php.' include/poller.php'; + + exec($cmdline); + + // Now sleep for 5 minutes + sleep(300); +} +?> diff --git a/util/messages.po b/util/messages.po index 3eab98882..e053781a1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-10 15:43+0100\n" +"POT-Creation-Date: 2016-11-20 21:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
" +msgstr "" + +#: mod/admin.php:443 +msgid "" +"You are using a MySQL version which does not support all features that " +"Friendica uses. You should consider switching to MariaDB." +msgstr "" + +#: mod/admin.php:447 mod/admin.php:1348 +msgid "Normal Account" +msgstr "" + +#: mod/admin.php:448 mod/admin.php:1349 +msgid "Soapbox Account" +msgstr "" + +#: mod/admin.php:449 mod/admin.php:1350 +msgid "Community/Celebrity Account" +msgstr "" + +#: mod/admin.php:450 mod/admin.php:1351 +msgid "Automatic Friend Account" +msgstr "" + +#: mod/admin.php:451 +msgid "Blog Account" +msgstr "" + +#: mod/admin.php:452 +msgid "Private Forum" +msgstr "" + +#: mod/admin.php:478 +msgid "Message queues" +msgstr "" + +#: mod/admin.php:484 +msgid "Summary" +msgstr "" + +#: mod/admin.php:487 +msgid "Registered users" +msgstr "" + +#: mod/admin.php:489 +msgid "Pending registrations" +msgstr "" + +#: mod/admin.php:490 +msgid "Version" +msgstr "" + +#: mod/admin.php:495 +msgid "Active plugins" +msgstr "" + +#: mod/admin.php:520 +msgid "Can not parse base url. Must have at least
" +msgstr "Deine DB enthält einige Tabellen die noch auf MyISAM laufen. Du solltest den Engine-Type auf InnoDB umstellen, da Friendica in Zukunft einige InnoDB Features nutzen wird. Eine Anleitung zur Umstellung kannst du hier finden. Außerdem kannst du das convert_innodb.sql Skript verwenden, das du im /util Verzeichnis deiner Friendica Installation findest." + +#: mod/admin.php:443 +msgid "" +"You are using a MySQL version which does not support all features that " +"Friendica uses. You should consider switching to MariaDB." +msgstr "Du verwendets eine MySQL Version die nicht alle Features unterstützt die Friendica verwendet. Wir empfehlen dir einen Wechsel auf MariaDB, falls dies möglich ist." + +#: mod/admin.php:447 mod/admin.php:1348 +msgid "Normal Account" +msgstr "Normales Konto" + +#: mod/admin.php:448 mod/admin.php:1349 +msgid "Soapbox Account" +msgstr "Marktschreier-Konto" + +#: mod/admin.php:449 mod/admin.php:1350 +msgid "Community/Celebrity Account" +msgstr "Forum/Promi-Konto" + +#: mod/admin.php:450 mod/admin.php:1351 +msgid "Automatic Friend Account" +msgstr "Automatisches Freundekonto" + +#: mod/admin.php:451 +msgid "Blog Account" +msgstr "Blog-Konto" + +#: mod/admin.php:452 +msgid "Private Forum" +msgstr "Privates Forum" + +#: mod/admin.php:478 +msgid "Message queues" +msgstr "Nachrichten-Warteschlangen" + +#: mod/admin.php:484 +msgid "Summary" +msgstr "Zusammenfassung" + +#: mod/admin.php:487 +msgid "Registered users" +msgstr "Registrierte Nutzer" + +#: mod/admin.php:489 +msgid "Pending registrations" +msgstr "Anstehende Anmeldungen" + +#: mod/admin.php:490 +msgid "Version" +msgstr "Version" + +#: mod/admin.php:495 +msgid "Active plugins" +msgstr "Aktive Plugins" + +#: mod/admin.php:520 +msgid "Can not parse base url. Must have at least
What next
"] = "Wie geht es weiter?
"; +$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; +$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; +$a->strings["is interested in:"] = "ist interessiert an:"; +$a->strings["Profile Match"] = "Profilübereinstimmungen"; +$a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; +$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; +$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; +$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert."; $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; @@ -1227,6 +1425,7 @@ $a->strings["check webfinger"] = "Webfinger überprüfen"; $a->strings["Plugin Features"] = "Plugin Features"; $a->strings["diagnostics"] = "Diagnose"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; +$a->strings["unknown"] = "Unbekannt"; $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."; $a->strings["The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here."] = "Die Funktion um Automatisch ein Kontaktverzeichnis erstellen ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."; $a->strings["Administration"] = "Administration"; @@ -1237,6 +1436,8 @@ $a->strings["Recipient Profile"] = "Empfänger Profil"; $a->strings["Created"] = "Erstellt"; $a->strings["Last Tried"] = "Zuletzt versucht"; $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."; +$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation."] = "Deine DB enthält einige Tabellen die noch auf MyISAM laufen. Du solltest den Engine-Type auf InnoDB umstellen, da Friendica in Zukunft einige InnoDB Features nutzen wird. Eine Anleitung zur Umstellung kannst du hier finden. Außerdem kannst du das convert_innodb.sql Skript verwenden, das du im /util Verzeichnis deiner Friendica Installation findest."; +$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Du verwendets eine MySQL Version die nicht alle Features unterstützt die Friendica verwendet. Wir empfehlen dir einen Wechsel auf MariaDB, falls dies möglich ist."; $a->strings["Normal Account"] = "Normales Konto"; $a->strings["Soapbox Account"] = "Marktschreier-Konto"; $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto"; @@ -1256,9 +1457,7 @@ $a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für $a->strings["No community page"] = "Keine Gemeinschaftsseite"; $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von Nutzer_innen dieser Seite"; $a->strings["Global community page"] = "Globale Gemeinschaftsseite"; -$a->strings["Never"] = "Niemals"; $a->strings["At post arrival"] = "Beim Empfang von Nachrichten"; -$a->strings["Disabled"] = "Deaktiviert"; $a->strings["Users, Global Contacts"] = "Nutzer, globale Kontakte"; $a->strings["Users, Global Contacts/fallback"] = "Nutzer, globale Kontakte / Fallback"; $a->strings["One month"] = "ein Monat"; @@ -1469,9 +1668,8 @@ $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf $a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanente Löschung"; $a->strings["Request date"] = "Anfragedatum"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; +$a->strings["Note from the user"] = "Hinweis vom Nutzer"; $a->strings["Deny"] = "Verwehren"; -$a->strings["Block"] = "Sperren"; -$a->strings["Unblock"] = "Entsperren"; $a->strings["Site admin"] = "Seitenadministrator"; $a->strings["Account expired"] = "Account ist abgelaufen"; $a->strings["New User"] = "Neuer Nutzer"; @@ -1511,194 +1709,6 @@ $a->strings["Off"] = "Aus"; $a->strings["On"] = "An"; $a->strings["Lock feature %s"] = "Feature festlegen: %s"; $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten"; -$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; -$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt."; -$a->strings["View"] = "Ansehen"; -$a->strings["Previous"] = "Vorherige"; -$a->strings["Next"] = "Nächste"; -$a->strings["list"] = "Liste"; -$a->strings["User not found"] = "Nutzer nicht gefunden"; -$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt."; -$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden"; -$a->strings["calendar"] = "Kalender"; -$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; -$a->strings["Common Friends"] = "Gemeinsame Kontakte"; -$a->strings["Not available."] = "Nicht verfügbar."; -$a->strings["%d contact edited."] = array( - 0 => "%d Kontakt bearbeitet.", - 1 => "%d Kontakte bearbeitet.", -); -$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; -$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; -$a->strings["Contact updated."] = "Kontakt aktualisiert."; -$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; -$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; -$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; -$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; -$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; -$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; -$a->strings["Drop contact"] = "Kontakt löschen"; -$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; -$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; -$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; -$a->strings["You are sharing with %s"] = "Du teilst mit %s"; -$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; -$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; -$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; -$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; -$a->strings["Suggest friends"] = "Kontakte vorschlagen"; -$a->strings["Network type: %s"] = "Netzwerktyp: %s"; -$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; -$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; -$a->strings["Fetch information"] = "Beziehe Information"; -$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; -$a->strings["Contact"] = "Kontakt: "; -$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; -$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; -$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; -$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; -$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; -$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; -$a->strings["View conversations"] = "Unterhaltungen anzeigen"; -$a->strings["Last update:"] = "Letzte Aktualisierung: "; -$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; -$a->strings["Update now"] = "Jetzt aktualisieren"; -$a->strings["Unignore"] = "Ignorieren aufheben"; -$a->strings["Currently blocked"] = "Derzeit geblockt"; -$a->strings["Currently ignored"] = "Derzeit ignoriert"; -$a->strings["Currently archived"] = "Momentan archiviert"; -$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; -$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; -$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; -$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; -$a->strings["Actions"] = "Aktionen"; -$a->strings["Contact Settings"] = "Kontakteinstellungen"; -$a->strings["Suggestions"] = "Kontaktvorschläge"; -$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; -$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["Unblocked"] = "Ungeblockt"; -$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; -$a->strings["Blocked"] = "Geblockt"; -$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; -$a->strings["Ignored"] = "Ignoriert"; -$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; -$a->strings["Archived"] = "Archiviert"; -$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; -$a->strings["Hidden"] = "Verborgen"; -$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; -$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; -$a->strings["Update"] = "Aktualisierungen"; -$a->strings["Archive"] = "Archivieren"; -$a->strings["Unarchive"] = "Aus Archiv zurückholen"; -$a->strings["Batch Actions"] = "Stapelverarbeitung"; -$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; -$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; -$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; -$a->strings["is a fan of yours"] = "ist ein Fan von dir"; -$a->strings["you are a fan of"] = "Du bist Fan von"; -$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; -$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; -$a->strings["Delete contact"] = "Lösche den Kontakt"; -$a->strings["Global Directory"] = "Weltweites Verzeichnis"; -$a->strings["Find on this site"] = "Auf diesem Server suchen"; -$a->strings["Results for:"] = "Ergebnisse für:"; -$a->strings["Site Directory"] = "Verzeichnis"; -$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; -$a->strings["People Search - %s"] = "Personensuche - %s"; -$a->strings["Forum Search - %s"] = "Forensuche - %s"; -$a->strings["No matches"] = "Keine Übereinstimmungen"; -$a->strings["Item has been removed."] = "Eintrag wurde entfernt."; -$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt."; -$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; -$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; -$a->strings["Event details"] = "Veranstaltungsdetails"; -$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; -$a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; -$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; -$a->strings["Event Finishes:"] = "Veranstaltungsende:"; -$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; -$a->strings["Description:"] = "Beschreibung"; -$a->strings["Title:"] = "Titel:"; -$a->strings["Share this event"] = "Veranstaltung teilen"; -$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; -$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert."; -$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden."; -$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert."; -$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."; -$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\"."; -$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet."; -$a->strings["System check"] = "Systemtest"; -$a->strings["Check again"] = "Noch einmal testen"; -$a->strings["Database connection"] = "Datenbankverbindung"; -$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."; -$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."; -$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."; -$a->strings["Database Server Name"] = "Datenbank-Server"; -$a->strings["Database Login Name"] = "Datenbank-Nutzer"; -$a->strings["Database Login Password"] = "Datenbank-Passwort"; -$a->strings["Database Name"] = "Datenbank-Name"; -$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators"; -$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."; -$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite"; -$a->strings["Site settings"] = "Server-Einstellungen"; -$a->strings["System Language:"] = "Systemsprache:"; -$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"; -$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."; -$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe 'Setup the poller'"; -$a->strings["PHP executable path"] = "Pfad zu PHP"; -$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."; -$a->strings["Command line PHP"] = "Kommandozeilen-PHP"; -$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"; -$a->strings["Found PHP version: "] = "Gefundene PHP Version:"; -$a->strings["PHP cli binary"] = "PHP CLI Binary"; -$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."; -$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; -$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"; -$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."; -$a->strings["Generate encryption keys"] = "Schlüssel erzeugen"; -$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul"; -$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul"; -$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul"; -$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul"; -$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul"; -$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul"; -$a->strings["XML PHP module"] = "XML PHP Modul"; -$a->strings["iconv module"] = "iconv module"; -$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; -$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."; -$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."; -$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."; -$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert."; -$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert."; -$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."; -$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert"; -$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert."; -$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. "; -$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren."; -$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function"; -$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert."; -$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."; -$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."; -$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."; -$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."; -$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php"; -$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."; -$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."; -$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."; -$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."; -$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar"; -$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."; -$a->strings["Url rewrite is working"] = "URL rewrite funktioniert"; -$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert"; -$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF"; -$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."; -$a->strings["
What next
"] = "Wie geht es weiter?
"; -$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; $a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden."; @@ -1706,15 +1716,11 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia $a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; $a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; -$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet"; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; -$a->strings["is interested in:"] = "ist interessiert an:"; -$a->strings["Profile Match"] = "Profilübereinstimmungen"; -$a->strings["Warning: This group contains %s member from an insecure network."] = array( - 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", - 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", +$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( + 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.", + 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.", ); -$a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."; +$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."; $a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; $a->strings["Invalid contact."] = "Ungültiger Kontakt."; $a->strings["Commented Order"] = "Neueste Kommentare"; @@ -1777,7 +1783,6 @@ $a->strings["View Album"] = "Album betrachten"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; -$a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; $a->strings["Failed to send email message. Here your accout details:login: %s
password: %s
You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; $a->strings["Registration successful."] = "Registrierung erfolgreich."; @@ -1787,6 +1792,8 @@ $a->strings["You may (optionally) fill in this form via OpenID by supplying your $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."; $a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): "; $a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"; +$a->strings["Note for the admin"] = "Hinweis für den Admin"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."; $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; $a->strings["Your invitation ID: "] = "ID Deiner Einladung: "; $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"; @@ -1797,16 +1804,6 @@ $a->strings["Confirm:"] = "Bestätigen:"; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird 'spitzname@\$sitename' sein."; $a->strings["Choose a nickname: "] = "Spitznamen wählen: "; $a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; -$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; -$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; -$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; -$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; -$a->strings["Delete Video"] = "Video Löschen"; -$a->strings["No videos selected"] = "Keine Videos ausgewählt"; -$a->strings["Recent Videos"] = "Neueste Videos"; -$a->strings["Upload New Videos"] = "Neues Video hochladen"; -$a->strings["No contacts."] = "Keine Kontakte."; $a->strings["Display"] = "Anzeige"; $a->strings["Social Networks"] = "Soziale Netzwerke"; $a->strings["Connected apps"] = "Verbundene Programme"; @@ -1872,6 +1869,8 @@ $a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; $a->strings["Display Settings"] = "Anzeige-Einstellungen"; $a->strings["Display Theme:"] = "Theme:"; $a->strings["Mobile Theme:"] = "Mobiles Theme"; +$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken"; +$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."; $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten."; $a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "; @@ -1976,6 +1975,17 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ve $a->strings["Relocate"] = "Umziehen"; $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."; $a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden"; +$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; +$a->strings["Delete Video"] = "Video Löschen"; +$a->strings["No videos selected"] = "Keine Videos ausgewählt"; +$a->strings["Recent Videos"] = "Neueste Videos"; +$a->strings["Upload New Videos"] = "Neues Video hochladen"; +$a->strings["No contacts."] = "Keine Kontakte."; +$a->strings["Invalid request."] = "Ungültige Anfrage"; +$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."; +$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?"; +$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s"; +$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; $a->strings["via"] = "via"; $a->strings["Repeat the image"] = "Bild wiederholen"; $a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; @@ -1997,17 +2007,12 @@ $a->strings["Content background transparency"] = "Transparanz des Hintergrunds v $a->strings["Set the background image"] = "Hintergrundbild festlegen"; $a->strings["Guest"] = "Gast"; $a->strings["Visitor"] = "Besucher"; -$a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"; -$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; -$a->strings["Set theme width"] = "Theme Breite festlegen"; -$a->strings["Color scheme"] = "Farbschema"; $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; +$a->strings["Color scheme"] = "Farbschema"; $a->strings["Posts font size"] = "Schriftgröße in Beiträgen"; $a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern"; -$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; -$a->strings["Set colour scheme"] = "Farbschema wählen"; $a->strings["Community Profiles"] = "Community-Profile"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Find Friends"] = "Kontakte finden"; @@ -2018,18 +2023,6 @@ $a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste d $a->strings["Set style"] = "Stil auswählen"; $a->strings["Community Pages"] = "Foren"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; -$a->strings["Your contacts"] = "Deine Kontakte"; -$a->strings["Your personal photos"] = "Deine privaten Fotos"; -$a->strings["Last likes"] = "Zuletzt gemocht"; -$a->strings["Last photos"] = "Letzte Fotos"; -$a->strings["Earth Layers"] = "Earth Layers"; -$a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer"; -$a->strings["Set longitude (X) for Earth Layers"] = "Longitude (X) der Earth Layer"; -$a->strings["Set latitude (Y) for Earth Layers"] = "Latitude (Y) der Earth Layer"; -$a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen"; -$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen"; -$a->strings["Set color scheme"] = "Wähle Farbschema"; -$a->strings["Set zoomfactor for Earth Layer"] = "Zoomfaktor der Earth Layer"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; $a->strings["easterbunny"] = "easterbunny"; diff --git a/view/lang/es/messages.po b/view/lang/es/messages.po index ebbee4173..0f7d5df6e 100644 --- a/view/lang/es/messages.po +++ b/view/lang/es/messages.po @@ -35,8 +35,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-10 15:43+0100\n" -"PO-Revision-Date: 2016-11-16 16:33+0000\n" +"POT-Creation-Date: 2016-11-20 21:45+0100\n" +"PO-Revision-Date: 2016-11-21 13:20+0000\n" "Last-Translator: Albert\n" "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" "MIME-Version: 1.0\n" @@ -78,8 +78,8 @@ msgstr "Buscar personas" msgid "Enter name or interest" msgstr "Introduzce nombre o intereses" -#: include/contact_widgets.php:32 include/conversation.php:981 -#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66 +#: include/contact_widgets.php:32 include/Contact.php:375 +#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66 #: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72 #: mod/suggest.php:83 msgid "Connect/Follow" @@ -94,12 +94,11 @@ msgid "Find" msgstr "Buscar" #: include/contact_widgets.php:35 mod/suggest.php:114 -#: view/theme/vier/theme.php:203 view/theme/diabook/theme.php:527 +#: view/theme/vier/theme.php:203 msgid "Friend Suggestions" msgstr "Sugerencias de amigos" #: include/contact_widgets.php:36 view/theme/vier/theme.php:202 -#: view/theme/diabook/theme.php:526 msgid "Similar Interests" msgstr "Intereses similares" @@ -108,7 +107,6 @@ msgid "Random Profile" msgstr "Perfil aleatorio" #: include/contact_widgets.php:38 view/theme/vier/theme.php:204 -#: view/theme/diabook/theme.php:528 msgid "Invite Friends" msgstr "Invitar amigos" @@ -140,8 +138,8 @@ msgstr[0] "%d contacto en común" msgstr[1] "%d contactos en común" #: include/contact_widgets.php:242 include/ForumManager.php:119 -#: include/items.php:2188 mod/content.php:624 object/Item.php:432 -#: view/theme/vier/theme.php:260 boot.php:970 +#: include/items.php:2223 mod/content.php:624 object/Item.php:432 +#: view/theme/vier/theme.php:260 boot.php:971 msgid "show more" msgstr "ver más" @@ -478,133 +476,6 @@ msgstr "Contactos sin grupo" msgid "add" msgstr "añadir" -#: include/user.php:39 mod/settings.php:371 -msgid "Passwords do not match. Password unchanged." -msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada." - -#: include/user.php:48 -msgid "An invitation is required." -msgstr "Se necesita invitación." - -#: include/user.php:53 -msgid "Invitation could not be verified." -msgstr "No se puede verificar la invitación." - -#: include/user.php:61 -msgid "Invalid OpenID url" -msgstr "Dirección OpenID no válida" - -#: include/user.php:82 -msgid "Please enter the required information." -msgstr "Por favor, introduce la información necesaria." - -#: include/user.php:96 -msgid "Please use a shorter name." -msgstr "Por favor, usa un nombre más corto." - -#: include/user.php:98 -msgid "Name too short." -msgstr "El nombre es demasiado corto." - -#: include/user.php:113 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "No parece que ese sea tu nombre completo." - -#: include/user.php:118 -msgid "Your email domain is not among those allowed on this site." -msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio." - -#: include/user.php:121 -msgid "Not a valid email address." -msgstr "No es una dirección de correo electrónico válida." - -#: include/user.php:134 -msgid "Cannot use that email." -msgstr "No se puede utilizar este correo electrónico." - -#: include/user.php:140 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"." - -#: include/user.php:147 include/user.php:245 -msgid "Nickname is already registered. Please choose another." -msgstr "Apodo ya registrado. Por favor, elije otro." - -#: include/user.php:157 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro." - -#: include/user.php:173 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado." - -#: include/user.php:231 -msgid "An error occurred during registration. Please try again." -msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo." - -#: include/user.php:256 view/theme/duepuntozero/config.php:44 -msgid "default" -msgstr "predeterminado" - -#: include/user.php:266 -msgid "An error occurred creating your default profile. Please try again." -msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo." - -#: include/user.php:345 include/user.php:352 include/user.php:359 -#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 -#: mod/profile_photo.php:210 mod/profile_photo.php:302 -#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180 -#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232 -#: mod/photos.php:1819 view/theme/diabook/theme.php:500 -msgid "Profile Photos" -msgstr "Foto del perfil" - -#: include/user.php:387 -#, php-format -msgid "" -"\n" -"\t\tDear %1$s,\n" -"\t\t\tThank you for registering at %2$s. Your account has been created.\n" -"\t" -msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t" - -#: include/user.php:391 -#, php-format -msgid "" -"\n" -"\t\tThe login details are as follows:\n" -"\t\t\tSite Location:\t%3$s\n" -"\t\t\tLogin Name:\t%1$s\n" -"\t\t\tPassword:\t%5$s\n" -"\n" -"\t\tYou may change your password from your account \"Settings\" page after logging\n" -"\t\tin.\n" -"\n" -"\t\tPlease take a few moments to review the other account settings on that page.\n" -"\n" -"\t\tYou may also wish to add some basic information to your default profile\n" -"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" -"\n" -"\t\tWe recommend setting your full name, adding a profile photo,\n" -"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n" -"\t\tperhaps what country you live in; if you do not wish to be more specific\n" -"\t\tthan that.\n" -"\n" -"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n" -"\t\tIf you are new and do not know anybody here, they may help\n" -"\t\tyou to make some new and interesting friends.\n" -"\n" -"\n" -"\t\tThank you and welcome to %2$s." -msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2$s." - -#: include/user.php:423 mod/admin.php:1184 -#, php-format -msgid "Registration details for %s" -msgstr "Detalles de registro para %s" - #: include/contact_selectors.php:32 msgid "Unknown | Not categorised" msgstr "Desconocido | No clasificado" @@ -629,19 +500,19 @@ msgstr "OK, probablemente inofensivo" msgid "Reputable, has my trust" msgstr "Buena reputación, tiene mi confianza" -#: include/contact_selectors.php:56 mod/admin.php:862 +#: include/contact_selectors.php:56 mod/admin.php:887 msgid "Frequently" msgstr "Frequentemente" -#: include/contact_selectors.php:57 mod/admin.php:863 +#: include/contact_selectors.php:57 mod/admin.php:888 msgid "Hourly" msgstr "Cada hora" -#: include/contact_selectors.php:58 mod/admin.php:864 +#: include/contact_selectors.php:58 mod/admin.php:889 msgid "Twice daily" msgstr "Dos veces al día" -#: include/contact_selectors.php:59 mod/admin.php:865 +#: include/contact_selectors.php:59 mod/admin.php:890 msgid "Daily" msgstr "Diariamente" @@ -666,12 +537,12 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1367 mod/admin.php:1380 mod/admin.php:1392 mod/admin.php:1410 +#: mod/admin.php:1392 mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1436 msgid "Email" msgstr "Correo electrónico" #: include/contact_selectors.php:80 mod/dfrn_request.php:869 -#: mod/settings.php:840 +#: mod/settings.php:842 msgid "Diaspora" msgstr "Diaspora*" @@ -723,10 +594,6 @@ msgstr "App.net" msgid "Hubzilla/Redmatrix" msgstr "Hubzilla/Redmatrix" -#: include/network.php:595 -msgid "view full size" -msgstr "Ver a tamaño completo" - #: include/acl_selectors.php:327 msgid "Post to Email" msgstr "Publicar mediante correo electrónico" @@ -736,7 +603,7 @@ msgstr "Publicar mediante correo electrónico" msgid "Connectors disabled, since \"%s\" is enabled." msgstr "Conectores deshabilitados, ya que \"%s\" es habilitado." -#: include/acl_selectors.php:333 mod/settings.php:1176 +#: include/acl_selectors.php:333 mod/settings.php:1181 msgid "Hide your profile details from unknown viewers?" msgstr "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?" @@ -745,12 +612,10 @@ msgid "Visible to everybody" msgstr "Visible para cualquiera" #: include/acl_selectors.php:339 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 msgid "show" msgstr "mostrar" #: include/acl_selectors.php:340 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 msgid "don't show" msgstr "no mostrar" @@ -773,25 +638,23 @@ msgstr "Cerrado" #: include/like.php:163 include/conversation.php:130 #: include/conversation.php:266 include/text.php:1808 mod/subthread.php:87 -#: mod/tagger.php:62 view/theme/diabook/theme.php:471 +#: mod/tagger.php:62 msgid "photo" msgstr "foto" -#: include/like.php:163 include/diaspora.php:1402 include/conversation.php:125 +#: include/like.php:163 include/conversation.php:125 #: include/conversation.php:134 include/conversation.php:261 -#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62 -#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475 +#: include/conversation.php:270 include/diaspora.php:1406 mod/subthread.php:87 +#: mod/tagger.php:62 msgid "status" msgstr "estado" #: include/like.php:165 include/conversation.php:122 #: include/conversation.php:258 include/text.php:1806 -#: view/theme/diabook/theme.php:463 msgid "event" msgstr "evento" -#: include/like.php:182 include/diaspora.php:1398 include/conversation.php:141 -#: view/theme/diabook/theme.php:480 +#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1402 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" @@ -820,9 +683,9 @@ msgstr "%1$s puede que atienda %2$s's %3$s" msgid "[no subject]" msgstr "[sin asunto]" -#: include/message.php:145 include/Photo.php:1045 include/Photo.php:1061 -#: include/Photo.php:1069 include/Photo.php:1094 mod/wall_upload.php:218 -#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:477 +#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056 +#: include/Photo.php:1064 include/Photo.php:1089 mod/item.php:477 +#: mod/wall_upload.php:218 mod/wall_upload.php:232 mod/wall_upload.php:239 msgid "Wall Photos" msgstr "Foto del Muro" @@ -874,89 +737,6 @@ msgstr[1] "%d contactos no importado" msgid "Done. You can now login with your username and password" msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña." -#: include/NotificationsManager.php:153 -msgid "System" -msgstr "Sistema" - -#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:402 -#: view/theme/frio/theme.php:253 -msgid "Network" -msgstr "Red" - -#: include/NotificationsManager.php:167 mod/profiles.php:703 -#: mod/network.php:845 -msgid "Personal" -msgstr "Personal" - -#: include/NotificationsManager.php:174 include/nav.php:105 -#: include/nav.php:161 view/theme/diabook/theme.php:123 -msgid "Home" -msgstr "Inicio" - -#: include/NotificationsManager.php:181 include/nav.php:166 -msgid "Introductions" -msgstr "Presentaciones" - -#: include/NotificationsManager.php:234 include/NotificationsManager.php:245 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s comentó la publicación de %s" - -#: include/NotificationsManager.php:244 -#, php-format -msgid "%s created a new post" -msgstr "%s creó una nueva publicación" - -#: include/NotificationsManager.php:258 -#, php-format -msgid "%s liked %s's post" -msgstr "A %s le gusta la publicación de %s" - -#: include/NotificationsManager.php:269 -#, php-format -msgid "%s disliked %s's post" -msgstr "A %s no le gusta la publicación de %s" - -#: include/NotificationsManager.php:280 -#, php-format -msgid "%s is attending %s's event" -msgstr "%s está asistiendo al evento %s's" - -#: include/NotificationsManager.php:291 -#, php-format -msgid "%s is not attending %s's event" -msgstr "%s no está asistiendo al evento %s's" - -#: include/NotificationsManager.php:302 -#, php-format -msgid "%s may attend %s's event" -msgstr "%s podría asistir al evento %s's" - -#: include/NotificationsManager.php:317 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s es ahora es amigo de %s" - -#: include/NotificationsManager.php:750 -msgid "Friend Suggestion" -msgstr "Propuestas de amistad" - -#: include/NotificationsManager.php:783 -msgid "Friend/Connect Request" -msgstr "Solicitud de Amistad/Conexión" - -#: include/NotificationsManager.php:783 -msgid "New Follower" -msgstr "Nuevo seguidor" - -#: include/diaspora.php:1954 -msgid "Sharing notification from Diaspora network" -msgstr "Compartir notificaciones con la red Diaspora*" - -#: include/diaspora.php:2854 -msgid "Attachments:" -msgstr "Archivos adjuntos:" - #: include/features.php:63 msgid "General Features" msgstr "Opciones generales" @@ -1160,29 +940,6 @@ msgstr "Ajustes avanzados del perfil" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles." -#: include/delivery.php:439 -msgid "(no subject)" -msgstr "(sin asunto)" - -#: include/delivery.php:450 include/enotify.php:43 -msgid "noreply" -msgstr "no responder" - -#: include/api.php:1019 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada." - -#: include/api.php:1039 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada." - -#: include/api.php:1060 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada." - #: include/bbcode.php:348 include/bbcode.php:1055 include/bbcode.php:1056 msgid "Image/photo" msgstr "Imagen/Foto" @@ -1200,419 +957,6 @@ msgstr "$1 escribió:" msgid "Encrypted content" msgstr "Contenido cifrado" -#: include/conversation.php:147 -#, php-format -msgid "%1$s attends %2$s's %3$s" -msgstr "%1$s atenderá %2$s's %3$s" - -#: include/conversation.php:150 -#, php-format -msgid "%1$s doesn't attend %2$s's %3$s" -msgstr "%1$s no atenderá %2$s's %3$s" - -#: include/conversation.php:153 -#, php-format -msgid "%1$s attends maybe %2$s's %3$s" -msgstr "%1$s atenderá quizás %2$s's %3$s" - -#: include/conversation.php:185 mod/dfrn_confirm.php:473 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "%1$s ahora es amigo de %2$s" - -#: include/conversation.php:219 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s le dio un toque a %2$s" - -#: include/conversation.php:239 mod/mood.php:62 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "%1$s está actualmente %2$s" - -#: include/conversation.php:278 mod/tagger.php:95 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s" - -#: include/conversation.php:303 -msgid "post/item" -msgstr "publicación/tema" - -#: include/conversation.php:304 -#, php-format -msgid "%1$s marked %2$s's %3$s as favorite" -msgstr "%1$s ha marcado %3$s de %2$s como Favorito" - -#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346 -#: mod/photos.php:1607 -msgid "Likes" -msgstr "Me gusta" - -#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350 -#: mod/photos.php:1607 -msgid "Dislikes" -msgstr "No me gusta" - -#: include/conversation.php:586 include/conversation.php:1477 -#: mod/content.php:373 mod/photos.php:1608 -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "Atendiendo" -msgstr[1] "Atendiendo" - -#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608 -msgid "Not attending" -msgstr "No atendiendo" - -#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608 -msgid "Might attend" -msgstr "Puede que atienda" - -#: include/conversation.php:708 mod/content.php:453 mod/content.php:758 -#: mod/photos.php:1681 object/Item.php:133 -msgid "Select" -msgstr "Seleccionar" - -#: include/conversation.php:709 mod/group.php:171 mod/content.php:454 -#: mod/content.php:759 mod/admin.php:1384 mod/contacts.php:808 -#: mod/contacts.php:1016 mod/photos.php:1682 mod/settings.php:739 -#: object/Item.php:134 -msgid "Delete" -msgstr "Eliminar" - -#: include/conversation.php:753 mod/content.php:487 mod/content.php:910 -#: mod/content.php:911 object/Item.php:367 object/Item.php:368 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Ver perfil de %s @ %s" - -#: include/conversation.php:765 object/Item.php:355 -msgid "Categories:" -msgstr "Categorías:" - -#: include/conversation.php:766 object/Item.php:356 -msgid "Filed under:" -msgstr "Archivado en:" - -#: include/conversation.php:773 mod/content.php:497 mod/content.php:923 -#: object/Item.php:381 -#, php-format -msgid "%s from %s" -msgstr "%s de %s" - -#: include/conversation.php:789 mod/content.php:513 -msgid "View in context" -msgstr "Verlo en contexto" - -#: include/conversation.php:791 include/conversation.php:1261 -#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 -#: mod/message.php:548 mod/content.php:515 mod/content.php:948 -#: mod/photos.php:1570 object/Item.php:406 -msgid "Please wait" -msgstr "Por favor, espera" - -#: include/conversation.php:870 -msgid "remove" -msgstr "eliminar" - -#: include/conversation.php:874 -msgid "Delete Selected Items" -msgstr "Eliminar el elemento seleccionado" - -#: include/conversation.php:966 -msgid "Follow Thread" -msgstr "Seguir publicacion" - -#: include/conversation.php:967 include/Contact.php:390 -msgid "View Status" -msgstr "Ver estado" - -#: include/conversation.php:968 include/conversation.php:984 -#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391 -#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203 -#: mod/match.php:71 mod/suggest.php:82 -msgid "View Profile" -msgstr "Ver perfil" - -#: include/conversation.php:969 include/Contact.php:392 -msgid "View Photos" -msgstr "Ver fotos" - -#: include/conversation.php:970 include/Contact.php:393 -msgid "Network Posts" -msgstr "Publicaciones en la red" - -#: include/conversation.php:971 include/Contact.php:394 -msgid "View Contact" -msgstr "Ver contacto" - -#: include/conversation.php:972 include/Contact.php:396 -msgid "Send PM" -msgstr "Enviar mensaje privado" - -#: include/conversation.php:976 include/Contact.php:397 -msgid "Poke" -msgstr "Toque" - -#: include/conversation.php:1094 -#, php-format -msgid "%s likes this." -msgstr "A %s le gusta esto." - -#: include/conversation.php:1097 -#, php-format -msgid "%s doesn't like this." -msgstr "A %s no le gusta esto." - -#: include/conversation.php:1100 -#, php-format -msgid "%s attends." -msgstr "%s atiende." - -#: include/conversation.php:1103 -#, php-format -msgid "%s doesn't attend." -msgstr "%s no atenderá." - -#: include/conversation.php:1106 -#, php-format -msgid "%s attends maybe." -msgstr "%s quizás atenderá" - -#: include/conversation.php:1116 -msgid "and" -msgstr "y" - -#: include/conversation.php:1122 -#, php-format -msgid ", and %d other people" -msgstr " y a otras %d personas" - -#: include/conversation.php:1131 -#, php-format -msgid "%2$d people like this" -msgstr "%2$d personas les gusta esto" - -#: include/conversation.php:1132 -#, php-format -msgid "%s like this." -msgstr "A %s le gusta esto." - -#: include/conversation.php:1135 -#, php-format -msgid "%2$d people don't like this" -msgstr "%2$d personas no les gusta esto" - -#: include/conversation.php:1136 -#, php-format -msgid "%s don't like this." -msgstr "A %s no le gusta esto." - -#: include/conversation.php:1139 -#, php-format -msgid "%2$d people attend" -msgstr "%2$d personas atienden" - -#: include/conversation.php:1140 -#, php-format -msgid "%s attend." -msgstr "%s atiende." - -#: include/conversation.php:1143 -#, php-format -msgid "%2$d people don't attend" -msgstr "%2$d personasno atienden" - -#: include/conversation.php:1144 -#, php-format -msgid "%s don't attend." -msgstr "%s no atiende." - -#: include/conversation.php:1147 -#, php-format -msgid "%2$d people attend maybe" -msgstr "%2$d people quizá asistan" - -#: include/conversation.php:1148 -#, php-format -msgid "%s anttend maybe." -msgstr "%s atiende quizás." - -#: include/conversation.php:1187 include/conversation.php:1205 -msgid "Visible to everybody" -msgstr "Visible para cualquiera" - -#: include/conversation.php:1188 include/conversation.php:1206 -#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 -#: mod/message.php:299 mod/message.php:442 mod/message.php:450 -msgid "Please enter a link URL:" -msgstr "Introduce la dirección del enlace:" - -#: include/conversation.php:1189 include/conversation.php:1207 -msgid "Please enter a video link/URL:" -msgstr "Por favor, introduce la URL/enlace del vídeo:" - -#: include/conversation.php:1190 include/conversation.php:1208 -msgid "Please enter an audio link/URL:" -msgstr "Por favor, introduce la URL/enlace del audio:" - -#: include/conversation.php:1191 include/conversation.php:1209 -msgid "Tag term:" -msgstr "Etiquetar:" - -#: include/conversation.php:1192 include/conversation.php:1210 -#: mod/filer.php:30 -msgid "Save to Folder:" -msgstr "Guardar en directorio:" - -#: include/conversation.php:1193 include/conversation.php:1211 -msgid "Where are you right now?" -msgstr "¿Dónde estás ahora?" - -#: include/conversation.php:1194 -msgid "Delete item(s)?" -msgstr "¿Borrar objeto(s)?" - -#: include/conversation.php:1242 mod/photos.php:1569 -msgid "Share" -msgstr "Compartir" - -#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154 -#: mod/message.php:354 mod/message.php:545 -msgid "Upload photo" -msgstr "Subir foto" - -#: include/conversation.php:1244 mod/editpost.php:111 -msgid "upload photo" -msgstr "subir imagen" - -#: include/conversation.php:1245 mod/editpost.php:112 -msgid "Attach file" -msgstr "Adjuntar archivo" - -#: include/conversation.php:1246 mod/editpost.php:113 -msgid "attach file" -msgstr "adjuntar archivo" - -#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155 -#: mod/message.php:355 mod/message.php:546 -msgid "Insert web link" -msgstr "Insertar enlace" - -#: include/conversation.php:1248 mod/editpost.php:115 -msgid "web link" -msgstr "enlace web" - -#: include/conversation.php:1249 mod/editpost.php:116 -msgid "Insert video link" -msgstr "Insertar enlace del vídeo" - -#: include/conversation.php:1250 mod/editpost.php:117 -msgid "video link" -msgstr "enlace de video" - -#: include/conversation.php:1251 mod/editpost.php:118 -msgid "Insert audio link" -msgstr "Insertar vínculo del audio" - -#: include/conversation.php:1252 mod/editpost.php:119 -msgid "audio link" -msgstr "enlace de audio" - -#: include/conversation.php:1253 mod/editpost.php:120 -msgid "Set your location" -msgstr "Configurar tu localización" - -#: include/conversation.php:1254 mod/editpost.php:121 -msgid "set location" -msgstr "establecer tu ubicación" - -#: include/conversation.php:1255 mod/editpost.php:122 -msgid "Clear browser location" -msgstr "Borrar la localización del navegador" - -#: include/conversation.php:1256 mod/editpost.php:123 -msgid "clear location" -msgstr "limpiar la localización" - -#: include/conversation.php:1258 mod/editpost.php:137 -msgid "Set title" -msgstr "Establecer el título" - -#: include/conversation.php:1260 mod/editpost.php:139 -msgid "Categories (comma-separated list)" -msgstr "Categorías (lista separada por comas)" - -#: include/conversation.php:1262 mod/editpost.php:125 -msgid "Permission settings" -msgstr "Configuración de permisos" - -#: include/conversation.php:1263 mod/editpost.php:154 -msgid "permissions" -msgstr "permisos" - -#: include/conversation.php:1271 mod/editpost.php:134 -msgid "Public post" -msgstr "Publicación pública" - -#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737 -#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639 -#: mod/photos.php:1725 object/Item.php:729 -msgid "Preview" -msgstr "Vista previa" - -#: include/conversation.php:1280 include/items.php:1917 mod/fbrowser.php:101 -#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121 -#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875 -#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322 -#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677 -#: mod/settings.php:703 -msgid "Cancel" -msgstr "Cancelar" - -#: include/conversation.php:1286 -msgid "Post to Groups" -msgstr "Publicar hacia grupos" - -#: include/conversation.php:1287 -msgid "Post to Contacts" -msgstr "Publicar hacia contactos" - -#: include/conversation.php:1288 -msgid "Private post" -msgstr "Publicación privada" - -#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152 -msgid "Message" -msgstr "Mensaje" - -#: include/conversation.php:1294 mod/editpost.php:153 -msgid "Browser" -msgstr "Navegador" - -#: include/conversation.php:1449 -msgid "View all" -msgstr "Ver todos los contactos" - -#: include/conversation.php:1471 -msgid "Like" -msgid_plural "Likes" -msgstr[0] "Me gusta" -msgstr[1] "Me gusta" - -#: include/conversation.php:1474 -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "No me gusta" -msgstr[1] "No me gusta" - -#: include/conversation.php:1480 -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "No atendiendo" -msgstr[1] "No atendiendo" - #: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705 msgid "Miscellaneous" msgstr "Varios" @@ -1711,36 +1055,6 @@ msgstr "Cumpleaños de %s" msgid "Happy Birthday %s" msgstr "Feliz cumpleaños %s" -#: include/dbstructure.php:26 -#, php-format -msgid "" -"\n" -"\t\t\tThe friendica developers released update %s recently,\n" -"\t\t\tbut when I tried to install it, something went terribly wrong.\n" -"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" -"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." -msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido." - -#: include/dbstructure.php:31 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" -msgstr "El mensaje de error es\n[pre]%s[/pre]" - -#: include/dbstructure.php:183 -msgid "Errors encountered creating database tables." -msgstr "Se han encontrados errores creando las tablas de la base de datos." - -#: include/dbstructure.php:260 -msgid "Errors encountered performing database changes." -msgstr "Errores encontrados al ejecutar cambios en la base de datos." - -#: include/dfrn.php:1107 -#, php-format -msgid "%s\\'s birthday" -msgstr "%s\\'s cumpleaños" - #: include/enotify.php:24 msgid "Friendica Notification" msgstr "Notificación de Friendica" @@ -1759,6 +1073,10 @@ msgstr "%s Administrador" msgid "%1$s, %2$s Administrator" msgstr "%1$s, %2$s Administrador" +#: include/enotify.php:43 include/delivery.php:457 +msgid "noreply" +msgstr "no responder" + #: include/enotify.php:70 #, php-format msgid "%s " @@ -2062,11 +1380,11 @@ msgstr "Vie" msgid "Sat" msgstr "Sab" -#: include/event.php:448 include/text.php:1130 mod/settings.php:968 +#: include/event.php:448 include/text.php:1130 mod/settings.php:972 msgid "Sunday" msgstr "Domingo" -#: include/event.php:449 include/text.php:1130 mod/settings.php:968 +#: include/event.php:449 include/text.php:1130 mod/settings.php:972 msgid "Monday" msgstr "Lunes" @@ -2277,6 +1595,874 @@ msgstr "No ha sido posible recibir la información del contacto." msgid "following" msgstr "siguiendo" +#: include/nav.php:35 mod/navigation.php:19 +msgid "Nothing new here" +msgstr "Nada nuevo por aquí" + +#: include/nav.php:39 mod/navigation.php:23 +msgid "Clear notifications" +msgstr "Limpiar notificaciones" + +#: include/nav.php:40 include/text.php:1015 +msgid "@name, !forum, #tags, content" +msgstr "@name, !forum, #tags, contenido" + +#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1787 +msgid "Logout" +msgstr "Salir" + +#: include/nav.php:78 view/theme/frio/theme.php:243 +msgid "End this session" +msgstr "Cerrar la sesión" + +#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637 +#: mod/contacts.php:833 view/theme/frio/theme.php:246 +msgid "Status" +msgstr "Estado" + +#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246 +msgid "Your posts and conversations" +msgstr "Tus publicaciones y conversaciones" + +#: include/nav.php:82 include/identity.php:605 include/identity.php:691 +#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32 +#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247 +msgid "Profile" +msgstr "Perfil" + +#: include/nav.php:82 view/theme/frio/theme.php:247 +msgid "Your profile page" +msgstr "Tu página de perfil" + +#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32 +#: view/theme/frio/theme.php:248 +msgid "Photos" +msgstr "Fotografías" + +#: include/nav.php:83 view/theme/frio/theme.php:248 +msgid "Your photos" +msgstr "Tus fotos" + +#: include/nav.php:84 include/identity.php:738 include/identity.php:741 +#: view/theme/frio/theme.php:249 +msgid "Videos" +msgstr "Videos" + +#: include/nav.php:84 view/theme/frio/theme.php:249 +msgid "Your videos" +msgstr "Tus videos" + +#: include/nav.php:85 include/nav.php:149 include/identity.php:750 +#: include/identity.php:761 mod/cal.php:275 mod/events.php:379 +#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 +msgid "Events" +msgstr "Eventos" + +#: include/nav.php:85 view/theme/frio/theme.php:250 +msgid "Your events" +msgstr "Tus eventos" + +#: include/nav.php:86 +msgid "Personal notes" +msgstr "Notas personales" + +#: include/nav.php:86 +msgid "Your personal notes" +msgstr "Tus notas personales" + +#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1788 +msgid "Login" +msgstr "Acceder" + +#: include/nav.php:95 +msgid "Sign in" +msgstr "Date de alta" + +#: include/nav.php:105 include/nav.php:161 +#: include/NotificationsManager.php:174 +msgid "Home" +msgstr "Inicio" + +#: include/nav.php:105 +msgid "Home Page" +msgstr "Página de inicio" + +#: include/nav.php:109 mod/register.php:289 boot.php:1763 +msgid "Register" +msgstr "Registrarse" + +#: include/nav.php:109 +msgid "Create an account" +msgstr "Crea una cuenta" + +#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298 +msgid "Help" +msgstr "Ayuda" + +#: include/nav.php:115 +msgid "Help and documentation" +msgstr "Ayuda y documentación" + +#: include/nav.php:119 +msgid "Apps" +msgstr "Aplicaciones" + +#: include/nav.php:119 +msgid "Addon applications, utilities, games" +msgstr "Aplicaciones, utilidades, juegos" + +#: include/nav.php:123 include/text.php:1012 mod/search.php:149 +msgid "Search" +msgstr "Buscar" + +#: include/nav.php:123 +msgid "Search site content" +msgstr " Busca contenido en la página" + +#: include/nav.php:126 include/text.php:1020 +msgid "Full Text" +msgstr "Texto completo" + +#: include/nav.php:127 include/text.php:1021 +msgid "Tags" +msgstr "Tags" + +#: include/nav.php:128 include/nav.php:192 include/identity.php:783 +#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792 +#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257 +msgid "Contacts" +msgstr "Contactos" + +#: include/nav.php:143 include/nav.php:145 mod/community.php:36 +msgid "Community" +msgstr "Comunidad" + +#: include/nav.php:143 +msgid "Conversations on this site" +msgstr "Conversaciones en este sitio" + +#: include/nav.php:145 +msgid "Conversations on the network" +msgstr "Conversaciones en la red" + +#: include/nav.php:149 include/identity.php:753 include/identity.php:764 +#: view/theme/frio/theme.php:254 +msgid "Events and Calendar" +msgstr "Eventos y Calendario" + +#: include/nav.php:152 +msgid "Directory" +msgstr "Directorio" + +#: include/nav.php:152 +msgid "People directory" +msgstr "Directorio de usuarios" + +#: include/nav.php:154 +msgid "Information" +msgstr "Información" + +#: include/nav.php:154 +msgid "Information about this friendica instance" +msgstr "Información sobre esta instancia de friendica" + +#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411 +#: view/theme/frio/theme.php:253 +msgid "Network" +msgstr "Red" + +#: include/nav.php:158 view/theme/frio/theme.php:253 +msgid "Conversations from your friends" +msgstr "Conversaciones de tus amigos" + +#: include/nav.php:159 +msgid "Network Reset" +msgstr "Reseteo de la red" + +#: include/nav.php:159 +msgid "Load Network page with no filters" +msgstr "Cargar pagina de redes sin filtros" + +#: include/nav.php:166 include/NotificationsManager.php:181 +msgid "Introductions" +msgstr "Presentaciones" + +#: include/nav.php:166 +msgid "Friend Requests" +msgstr "Solicitudes de amistad" + +#: include/nav.php:169 mod/notifications.php:96 +msgid "Notifications" +msgstr "Notificaciones" + +#: include/nav.php:170 +msgid "See all notifications" +msgstr "Ver todas las notificaciones" + +#: include/nav.php:171 mod/settings.php:902 +msgid "Mark as seen" +msgstr "Marcar como leído" + +#: include/nav.php:171 +msgid "Mark all system notifications seen" +msgstr "Marcar todas las notificaciones del sistema como leídas" + +#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255 +msgid "Messages" +msgstr "Mensajes" + +#: include/nav.php:175 view/theme/frio/theme.php:255 +msgid "Private mail" +msgstr "Correo privado" + +#: include/nav.php:176 +msgid "Inbox" +msgstr "Entrada" + +#: include/nav.php:177 +msgid "Outbox" +msgstr "Enviados" + +#: include/nav.php:178 mod/message.php:16 +msgid "New Message" +msgstr "Nuevo mensaje" + +#: include/nav.php:181 +msgid "Manage" +msgstr "Administrar" + +#: include/nav.php:181 +msgid "Manage other pages" +msgstr "Administrar otras páginas" + +#: include/nav.php:184 mod/settings.php:81 +msgid "Delegations" +msgstr "Delegaciones" + +#: include/nav.php:184 mod/delegate.php:130 +msgid "Delegate Page Management" +msgstr "Delegar la administración de la página" + +#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1520 +#: mod/admin.php:1778 mod/settings.php:111 view/theme/frio/theme.php:256 +msgid "Settings" +msgstr "Configuración" + +#: include/nav.php:186 view/theme/frio/theme.php:256 +msgid "Account settings" +msgstr "Configuración de tu cuenta" + +#: include/nav.php:189 include/identity.php:282 +msgid "Profiles" +msgstr "Perfiles" + +#: include/nav.php:189 +msgid "Manage/Edit Profiles" +msgstr "Manejar/editar Perfiles" + +#: include/nav.php:192 view/theme/frio/theme.php:257 +msgid "Manage/edit friends and contacts" +msgstr "Administrar/editar amigos y contactos" + +#: include/nav.php:197 mod/admin.php:186 +msgid "Admin" +msgstr "Admin" + +#: include/nav.php:197 +msgid "Site setup and configuration" +msgstr "Opciones y configuración del sitio" + +#: include/nav.php:200 +msgid "Navigation" +msgstr "Navegación" + +#: include/nav.php:200 +msgid "Site map" +msgstr "Mapa del sitio" + +#: include/oembed.php:252 +msgid "Embedded content" +msgstr "Contenido integrado" + +#: include/oembed.php:260 +msgid "Embedding disabled" +msgstr "Contenido incrustrado desabilitado" + +#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62 +#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211 +#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807 +msgid "Contact Photos" +msgstr "Foto del contacto" + +#: include/security.php:22 +msgid "Welcome " +msgstr "Bienvenido " + +#: include/security.php:23 +msgid "Please upload a profile photo." +msgstr "Por favor sube una foto para tu perfil." + +#: include/security.php:26 +msgid "Welcome back " +msgstr "Bienvenido de nuevo " + +#: include/security.php:373 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo." + +#: include/Contact.php:119 +msgid "stopped following" +msgstr "dejó de seguir" + +#: include/Contact.php:361 include/Contact.php:374 include/Contact.php:419 +#: include/conversation.php:968 include/conversation.php:984 +#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203 +#: mod/match.php:71 mod/suggest.php:82 +msgid "View Profile" +msgstr "Ver perfil" + +#: include/Contact.php:418 include/conversation.php:967 +msgid "View Status" +msgstr "Ver estado" + +#: include/Contact.php:420 include/conversation.php:969 +msgid "View Photos" +msgstr "Ver fotos" + +#: include/Contact.php:421 include/conversation.php:970 +msgid "Network Posts" +msgstr "Publicaciones en la red" + +#: include/Contact.php:422 include/conversation.php:971 +msgid "View Contact" +msgstr "Ver contacto" + +#: include/Contact.php:423 +msgid "Drop Contact" +msgstr "Eliminar contacto" + +#: include/Contact.php:424 include/conversation.php:972 +msgid "Send PM" +msgstr "Enviar mensaje privado" + +#: include/Contact.php:425 include/conversation.php:976 +msgid "Poke" +msgstr "Toque" + +#: include/Contact.php:798 +msgid "Organisation" +msgstr "Organización" + +#: include/Contact.php:801 +msgid "News" +msgstr "Noticias" + +#: include/Contact.php:804 +msgid "Forum" +msgstr "Foro" + +#: include/NotificationsManager.php:153 +msgid "System" +msgstr "Sistema" + +#: include/NotificationsManager.php:167 mod/profiles.php:703 +#: mod/network.php:846 +msgid "Personal" +msgstr "Personal" + +#: include/NotificationsManager.php:234 include/NotificationsManager.php:244 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s comentó la publicación de %s" + +#: include/NotificationsManager.php:243 +#, php-format +msgid "%s created a new post" +msgstr "%s creó una nueva publicación" + +#: include/NotificationsManager.php:256 +#, php-format +msgid "%s liked %s's post" +msgstr "A %s le gusta la publicación de %s" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s disliked %s's post" +msgstr "A %s no le gusta la publicación de %s" + +#: include/NotificationsManager.php:278 +#, php-format +msgid "%s is attending %s's event" +msgstr "%s está asistiendo al evento %s's" + +#: include/NotificationsManager.php:289 +#, php-format +msgid "%s is not attending %s's event" +msgstr "%s no está asistiendo al evento %s's" + +#: include/NotificationsManager.php:300 +#, php-format +msgid "%s may attend %s's event" +msgstr "%s podría asistir al evento %s's" + +#: include/NotificationsManager.php:315 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s es ahora es amigo de %s" + +#: include/NotificationsManager.php:748 +msgid "Friend Suggestion" +msgstr "Propuestas de amistad" + +#: include/NotificationsManager.php:781 +msgid "Friend/Connect Request" +msgstr "Solicitud de Amistad/Conexión" + +#: include/NotificationsManager.php:781 +msgid "New Follower" +msgstr "Nuevo seguidor" + +#: include/api.php:1018 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada." + +#: include/api.php:1038 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada." + +#: include/api.php:1059 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada." + +#: include/conversation.php:147 +#, php-format +msgid "%1$s attends %2$s's %3$s" +msgstr "%1$s atenderá %2$s's %3$s" + +#: include/conversation.php:150 +#, php-format +msgid "%1$s doesn't attend %2$s's %3$s" +msgstr "%1$s no atenderá %2$s's %3$s" + +#: include/conversation.php:153 +#, php-format +msgid "%1$s attends maybe %2$s's %3$s" +msgstr "%1$s atenderá quizás %2$s's %3$s" + +#: include/conversation.php:185 mod/dfrn_confirm.php:473 +#, php-format +msgid "%1$s is now friends with %2$s" +msgstr "%1$s ahora es amigo de %2$s" + +#: include/conversation.php:219 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s le dio un toque a %2$s" + +#: include/conversation.php:239 mod/mood.php:62 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "%1$s está actualmente %2$s" + +#: include/conversation.php:278 mod/tagger.php:95 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s" + +#: include/conversation.php:303 +msgid "post/item" +msgstr "publicación/tema" + +#: include/conversation.php:304 +#, php-format +msgid "%1$s marked %2$s's %3$s as favorite" +msgstr "%1$s ha marcado %3$s de %2$s como Favorito" + +#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346 +#: mod/photos.php:1607 +msgid "Likes" +msgstr "Me gusta" + +#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350 +#: mod/photos.php:1607 +msgid "Dislikes" +msgstr "No me gusta" + +#: include/conversation.php:586 include/conversation.php:1477 +#: mod/content.php:373 mod/photos.php:1608 +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "Atendiendo" +msgstr[1] "Atendiendo" + +#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608 +msgid "Not attending" +msgstr "No atendiendo" + +#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608 +msgid "Might attend" +msgstr "Puede que atienda" + +#: include/conversation.php:708 mod/content.php:453 mod/content.php:758 +#: mod/photos.php:1681 object/Item.php:133 +msgid "Select" +msgstr "Seleccionar" + +#: include/conversation.php:709 mod/group.php:171 mod/content.php:454 +#: mod/content.php:759 mod/contacts.php:808 mod/contacts.php:1016 +#: mod/admin.php:1410 mod/photos.php:1682 mod/settings.php:741 +#: object/Item.php:134 +msgid "Delete" +msgstr "Eliminar" + +#: include/conversation.php:753 mod/content.php:487 mod/content.php:910 +#: mod/content.php:911 object/Item.php:367 object/Item.php:368 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Ver perfil de %s @ %s" + +#: include/conversation.php:765 object/Item.php:355 +msgid "Categories:" +msgstr "Categorías:" + +#: include/conversation.php:766 object/Item.php:356 +msgid "Filed under:" +msgstr "Archivado en:" + +#: include/conversation.php:773 mod/content.php:497 mod/content.php:923 +#: object/Item.php:381 +#, php-format +msgid "%s from %s" +msgstr "%s de %s" + +#: include/conversation.php:789 mod/content.php:513 +msgid "View in context" +msgstr "Verlo en contexto" + +#: include/conversation.php:791 include/conversation.php:1261 +#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 +#: mod/message.php:548 mod/content.php:515 mod/content.php:948 +#: mod/photos.php:1570 object/Item.php:406 +msgid "Please wait" +msgstr "Por favor, espera" + +#: include/conversation.php:870 +msgid "remove" +msgstr "eliminar" + +#: include/conversation.php:874 +msgid "Delete Selected Items" +msgstr "Eliminar el elemento seleccionado" + +#: include/conversation.php:966 +msgid "Follow Thread" +msgstr "Seguir publicacion" + +#: include/conversation.php:1094 +#, php-format +msgid "%s likes this." +msgstr "A %s le gusta esto." + +#: include/conversation.php:1097 +#, php-format +msgid "%s doesn't like this." +msgstr "A %s no le gusta esto." + +#: include/conversation.php:1100 +#, php-format +msgid "%s attends." +msgstr "%s atiende." + +#: include/conversation.php:1103 +#, php-format +msgid "%s doesn't attend." +msgstr "%s no atenderá." + +#: include/conversation.php:1106 +#, php-format +msgid "%s attends maybe." +msgstr "%s quizás atenderá" + +#: include/conversation.php:1116 +msgid "and" +msgstr "y" + +#: include/conversation.php:1122 +#, php-format +msgid ", and %d other people" +msgstr " y a otras %d personas" + +#: include/conversation.php:1131 +#, php-format +msgid "%2$d people like this" +msgstr "%2$d personas les gusta esto" + +#: include/conversation.php:1132 +#, php-format +msgid "%s like this." +msgstr "A %s le gusta esto." + +#: include/conversation.php:1135 +#, php-format +msgid "%2$d people don't like this" +msgstr "%2$d personas no les gusta esto" + +#: include/conversation.php:1136 +#, php-format +msgid "%s don't like this." +msgstr "A %s no le gusta esto." + +#: include/conversation.php:1139 +#, php-format +msgid "%2$d people attend" +msgstr "%2$d personas atienden" + +#: include/conversation.php:1140 +#, php-format +msgid "%s attend." +msgstr "%s atiende." + +#: include/conversation.php:1143 +#, php-format +msgid "%2$d people don't attend" +msgstr "%2$d personasno atienden" + +#: include/conversation.php:1144 +#, php-format +msgid "%s don't attend." +msgstr "%s no atiende." + +#: include/conversation.php:1147 +#, php-format +msgid "%2$d people attend maybe" +msgstr "%2$d people quizá asistan" + +#: include/conversation.php:1148 +#, php-format +msgid "%s anttend maybe." +msgstr "%s atiende quizás." + +#: include/conversation.php:1187 include/conversation.php:1205 +msgid "Visible to everybody" +msgstr "Visible para cualquiera" + +#: include/conversation.php:1188 include/conversation.php:1206 +#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 +#: mod/message.php:299 mod/message.php:442 mod/message.php:450 +msgid "Please enter a link URL:" +msgstr "Introduce la dirección del enlace:" + +#: include/conversation.php:1189 include/conversation.php:1207 +msgid "Please enter a video link/URL:" +msgstr "Por favor, introduce la URL/enlace del vídeo:" + +#: include/conversation.php:1190 include/conversation.php:1208 +msgid "Please enter an audio link/URL:" +msgstr "Por favor, introduce la URL/enlace del audio:" + +#: include/conversation.php:1191 include/conversation.php:1209 +msgid "Tag term:" +msgstr "Etiquetar:" + +#: include/conversation.php:1192 include/conversation.php:1210 +#: mod/filer.php:30 +msgid "Save to Folder:" +msgstr "Guardar en directorio:" + +#: include/conversation.php:1193 include/conversation.php:1211 +msgid "Where are you right now?" +msgstr "¿Dónde estás ahora?" + +#: include/conversation.php:1194 +msgid "Delete item(s)?" +msgstr "¿Borrar objeto(s)?" + +#: include/conversation.php:1242 mod/photos.php:1569 +msgid "Share" +msgstr "Compartir" + +#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154 +#: mod/message.php:354 mod/message.php:545 +msgid "Upload photo" +msgstr "Subir foto" + +#: include/conversation.php:1244 mod/editpost.php:111 +msgid "upload photo" +msgstr "subir imagen" + +#: include/conversation.php:1245 mod/editpost.php:112 +msgid "Attach file" +msgstr "Adjuntar archivo" + +#: include/conversation.php:1246 mod/editpost.php:113 +msgid "attach file" +msgstr "adjuntar archivo" + +#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155 +#: mod/message.php:355 mod/message.php:546 +msgid "Insert web link" +msgstr "Insertar enlace" + +#: include/conversation.php:1248 mod/editpost.php:115 +msgid "web link" +msgstr "enlace web" + +#: include/conversation.php:1249 mod/editpost.php:116 +msgid "Insert video link" +msgstr "Insertar enlace del vídeo" + +#: include/conversation.php:1250 mod/editpost.php:117 +msgid "video link" +msgstr "enlace de video" + +#: include/conversation.php:1251 mod/editpost.php:118 +msgid "Insert audio link" +msgstr "Insertar vínculo del audio" + +#: include/conversation.php:1252 mod/editpost.php:119 +msgid "audio link" +msgstr "enlace de audio" + +#: include/conversation.php:1253 mod/editpost.php:120 +msgid "Set your location" +msgstr "Configurar tu localización" + +#: include/conversation.php:1254 mod/editpost.php:121 +msgid "set location" +msgstr "establecer tu ubicación" + +#: include/conversation.php:1255 mod/editpost.php:122 +msgid "Clear browser location" +msgstr "Borrar la localización del navegador" + +#: include/conversation.php:1256 mod/editpost.php:123 +msgid "clear location" +msgstr "limpiar la localización" + +#: include/conversation.php:1258 mod/editpost.php:137 +msgid "Set title" +msgstr "Establecer el título" + +#: include/conversation.php:1260 mod/editpost.php:139 +msgid "Categories (comma-separated list)" +msgstr "Categorías (lista separada por comas)" + +#: include/conversation.php:1262 mod/editpost.php:125 +msgid "Permission settings" +msgstr "Configuración de permisos" + +#: include/conversation.php:1263 mod/editpost.php:154 +msgid "permissions" +msgstr "permisos" + +#: include/conversation.php:1271 mod/editpost.php:134 +msgid "Public post" +msgstr "Publicación pública" + +#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737 +#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639 +#: mod/photos.php:1725 object/Item.php:729 +msgid "Preview" +msgstr "Vista previa" + +#: include/conversation.php:1280 include/items.php:1952 mod/fbrowser.php:101 +#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121 +#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875 +#: mod/contacts.php:445 mod/suggest.php:32 mod/photos.php:235 +#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705 +#: mod/videos.php:128 +msgid "Cancel" +msgstr "Cancelar" + +#: include/conversation.php:1286 +msgid "Post to Groups" +msgstr "Publicar hacia grupos" + +#: include/conversation.php:1287 +msgid "Post to Contacts" +msgstr "Publicar hacia contactos" + +#: include/conversation.php:1288 +msgid "Private post" +msgstr "Publicación privada" + +#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152 +msgid "Message" +msgstr "Mensaje" + +#: include/conversation.php:1294 mod/editpost.php:153 +msgid "Browser" +msgstr "Navegador" + +#: include/conversation.php:1449 +msgid "View all" +msgstr "Ver todos los contactos" + +#: include/conversation.php:1471 +msgid "Like" +msgid_plural "Likes" +msgstr[0] "Me gusta" +msgstr[1] "Me gusta" + +#: include/conversation.php:1474 +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "No me gusta" +msgstr[1] "No me gusta" + +#: include/conversation.php:1480 +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "No atendiendo" +msgstr[1] "No atendiendo" + +#: include/dbstructure.php:26 +#, php-format +msgid "" +"\n" +"\t\t\tThe friendica developers released update %s recently,\n" +"\t\t\tbut when I tried to install it, something went terribly wrong.\n" +"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" +"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." +msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido." + +#: include/dbstructure.php:31 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "El mensaje de error es\n[pre]%s[/pre]" + +#: include/dbstructure.php:183 +msgid "Errors encountered creating database tables." +msgstr "Se han encontrados errores creando las tablas de la base de datos." + +#: include/dbstructure.php:260 +msgid "Errors encountered performing database changes." +msgstr "Errores encontrados al ejecutar cambios en la base de datos." + +#: include/delivery.php:446 +msgid "(no subject)" +msgstr "(sin asunto)" + +#: include/dfrn.php:1107 +#, php-format +msgid "%s\\'s birthday" +msgstr "%s\\'s cumpleaños" + +#: include/diaspora.php:1958 +msgid "Sharing notification from Diaspora network" +msgstr "Compartir notificaciones con la red Diaspora*" + +#: include/diaspora.php:2864 +msgid "Attachments:" +msgstr "Archivos adjuntos:" + #: include/identity.php:42 msgid "Requested account is not available." msgstr "La cuenta solicitada no está disponible." @@ -2293,10 +2479,6 @@ msgstr "Editar perfil" msgid "Atom feed" msgstr "Atom feed" -#: include/identity.php:282 include/nav.php:189 -msgid "Profiles" -msgstr "Perfiles" - #: include/identity.php:282 msgid "Manage/edit profiles" msgstr "Administrar/editar perfiles" @@ -2379,14 +2561,7 @@ msgstr "Recordatorios de eventos" msgid "Events this week:" msgstr "Eventos de esta semana:" -#: include/identity.php:605 include/identity.php:691 include/identity.php:722 -#: include/nav.php:82 mod/profperm.php:104 mod/newmember.php:32 -#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247 -#: view/theme/diabook/theme.php:124 -msgid "Profile" -msgstr "Perfil" - -#: include/identity.php:614 mod/settings.php:1274 +#: include/identity.php:614 mod/settings.php:1279 msgid "Full Name:" msgstr "Nombre completo:" @@ -2480,16 +2655,11 @@ msgstr "Foros:" msgid "Basic" msgstr "Basic" -#: include/identity.php:693 mod/admin.php:931 mod/contacts.php:870 -#: mod/events.php:508 +#: include/identity.php:693 mod/contacts.php:870 mod/events.php:508 +#: mod/admin.php:956 msgid "Advanced" msgstr "Avanzado" -#: include/identity.php:714 include/nav.php:81 mod/contacts.php:637 -#: mod/contacts.php:833 view/theme/frio/theme.php:246 -msgid "Status" -msgstr "Estado" - #: include/identity.php:717 mod/follow.php:143 mod/contacts.php:836 msgid "Status Messages and Posts" msgstr "Mensajes de Estado y Publicaciones" @@ -2498,32 +2668,10 @@ msgstr "Mensajes de Estado y Publicaciones" msgid "Profile Details" msgstr "Detalles del Perfil" -#: include/identity.php:730 include/nav.php:83 mod/fbrowser.php:32 -#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126 -msgid "Photos" -msgstr "Fotografías" - #: include/identity.php:733 mod/photos.php:87 msgid "Photo Albums" msgstr "Álbum de Fotos" -#: include/identity.php:738 include/identity.php:741 include/nav.php:84 -#: view/theme/frio/theme.php:249 -msgid "Videos" -msgstr "Videos" - -#: include/identity.php:750 include/identity.php:761 include/nav.php:85 -#: include/nav.php:149 mod/cal.php:275 mod/events.php:379 -#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 -#: view/theme/diabook/theme.php:127 -msgid "Events" -msgstr "Eventos" - -#: include/identity.php:753 include/identity.php:764 include/nav.php:149 -#: view/theme/frio/theme.php:254 -msgid "Events and Calendar" -msgstr "Eventos y Calendario" - #: include/identity.php:772 mod/notes.php:46 msgid "Personal Notes" msgstr "Notas personales" @@ -2532,41 +2680,33 @@ msgstr "Notas personales" msgid "Only You Can See This" msgstr "Únicamente tú puedes ver esto" -#: include/identity.php:783 include/identity.php:786 include/nav.php:128 -#: include/nav.php:192 include/text.php:1022 mod/contacts.php:792 -#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257 -#: view/theme/diabook/theme.php:125 -msgid "Contacts" -msgstr "Contactos" - -#: include/items.php:1518 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726 +#: include/items.php:1553 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726 msgid "[Name Withheld]" msgstr "[Nombre oculto]" -#: include/items.php:1873 mod/viewsrc.php:15 mod/notice.php:15 -#: mod/admin.php:234 mod/admin.php:1441 mod/admin.php:1675 mod/display.php:103 -#: mod/display.php:279 mod/display.php:478 +#: include/items.php:1908 mod/viewsrc.php:15 mod/notice.php:15 +#: mod/display.php:103 mod/display.php:279 mod/display.php:478 +#: mod/admin.php:234 mod/admin.php:1467 mod/admin.php:1701 msgid "Item not found." msgstr "Elemento no encontrado." -#: include/items.php:1912 +#: include/items.php:1947 msgid "Do you really want to delete this item?" msgstr "¿Realmente quieres borrar este objeto?" -#: include/items.php:1914 mod/follow.php:110 mod/api.php:105 +#: include/items.php:1949 mod/follow.php:110 mod/api.php:105 #: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648 #: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442 -#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158 -#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176 -#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193 -#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226 -#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229 +#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163 +#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181 +#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198 +#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231 +#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234 msgid "Yes" msgstr "Sí" -#: include/items.php:2077 mod/wall_upload.php:77 mod/wall_upload.php:80 -#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15 -#: mod/invite.php:101 mod/wall_attach.php:67 mod/wall_attach.php:70 +#: include/items.php:2112 mod/notes.php:22 mod/uimport.php:23 +#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101 #: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33 #: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/editpost.php:10 #: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33 @@ -2579,284 +2719,22 @@ msgstr "Sí" #: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605 #: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18 #: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475 -#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4 -#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42 -#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22 -#: mod/settings.php:128 mod/settings.php:663 index.php:397 +#: mod/events.php:190 mod/suggest.php:58 mod/item.php:198 mod/item.php:210 +#: mod/network.php:4 mod/photos.php:159 mod/photos.php:1072 +#: mod/register.php:42 mod/settings.php:22 mod/settings.php:128 +#: mod/settings.php:665 mod/viewcontacts.php:45 mod/wall_attach.php:67 +#: mod/wall_attach.php:70 mod/wall_upload.php:77 mod/wall_upload.php:80 +#: index.php:397 msgid "Permission denied." msgstr "Permiso denegado." -#: include/items.php:2182 +#: include/items.php:2217 msgid "Archives" msgstr "Archivos" -#: include/nav.php:35 mod/navigation.php:19 -msgid "Nothing new here" -msgstr "Nada nuevo por aquí" - -#: include/nav.php:39 mod/navigation.php:23 -msgid "Clear notifications" -msgstr "Limpiar notificaciones" - -#: include/nav.php:40 include/text.php:1015 -msgid "@name, !forum, #tags, content" -msgstr "@name, !forum, #tags, contenido" - -#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1778 -msgid "Logout" -msgstr "Salir" - -#: include/nav.php:78 view/theme/frio/theme.php:243 -msgid "End this session" -msgstr "Cerrar la sesión" - -#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246 -#: view/theme/diabook/theme.php:123 -msgid "Your posts and conversations" -msgstr "Tus publicaciones y conversaciones" - -#: include/nav.php:82 view/theme/frio/theme.php:247 -#: view/theme/diabook/theme.php:124 -msgid "Your profile page" -msgstr "Tu página de perfil" - -#: include/nav.php:83 view/theme/frio/theme.php:248 -#: view/theme/diabook/theme.php:126 -msgid "Your photos" -msgstr "Tus fotos" - -#: include/nav.php:84 view/theme/frio/theme.php:249 -msgid "Your videos" -msgstr "Tus videos" - -#: include/nav.php:85 view/theme/frio/theme.php:250 -#: view/theme/diabook/theme.php:127 -msgid "Your events" -msgstr "Tus eventos" - -#: include/nav.php:86 view/theme/diabook/theme.php:128 -msgid "Personal notes" -msgstr "Notas personales" - -#: include/nav.php:86 -msgid "Your personal notes" -msgstr "Tus notas personales" - -#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1779 -msgid "Login" -msgstr "Acceder" - -#: include/nav.php:95 -msgid "Sign in" -msgstr "Date de alta" - -#: include/nav.php:105 -msgid "Home Page" -msgstr "Página de inicio" - -#: include/nav.php:109 mod/register.php:280 boot.php:1754 -msgid "Register" -msgstr "Registrarse" - -#: include/nav.php:109 -msgid "Create an account" -msgstr "Crea una cuenta" - -#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298 -msgid "Help" -msgstr "Ayuda" - -#: include/nav.php:115 -msgid "Help and documentation" -msgstr "Ayuda y documentación" - -#: include/nav.php:119 -msgid "Apps" -msgstr "Aplicaciones" - -#: include/nav.php:119 -msgid "Addon applications, utilities, games" -msgstr "Aplicaciones, utilidades, juegos" - -#: include/nav.php:123 include/text.php:1012 mod/search.php:149 -msgid "Search" -msgstr "Buscar" - -#: include/nav.php:123 -msgid "Search site content" -msgstr " Busca contenido en la página" - -#: include/nav.php:126 include/text.php:1020 -msgid "Full Text" -msgstr "Texto completo" - -#: include/nav.php:127 include/text.php:1021 -msgid "Tags" -msgstr "Tags" - -#: include/nav.php:143 include/nav.php:145 mod/community.php:36 -#: view/theme/diabook/theme.php:129 -msgid "Community" -msgstr "Comunidad" - -#: include/nav.php:143 -msgid "Conversations on this site" -msgstr "Conversaciones en este sitio" - -#: include/nav.php:145 -msgid "Conversations on the network" -msgstr "Conversaciones en la red" - -#: include/nav.php:152 -msgid "Directory" -msgstr "Directorio" - -#: include/nav.php:152 -msgid "People directory" -msgstr "Directorio de usuarios" - -#: include/nav.php:154 -msgid "Information" -msgstr "Información" - -#: include/nav.php:154 -msgid "Information about this friendica instance" -msgstr "Información sobre esta instancia de friendica" - -#: include/nav.php:158 view/theme/frio/theme.php:253 -msgid "Conversations from your friends" -msgstr "Conversaciones de tus amigos" - -#: include/nav.php:159 -msgid "Network Reset" -msgstr "Reseteo de la red" - -#: include/nav.php:159 -msgid "Load Network page with no filters" -msgstr "Cargar pagina de redes sin filtros" - -#: include/nav.php:166 -msgid "Friend Requests" -msgstr "Solicitudes de amistad" - -#: include/nav.php:169 mod/notifications.php:96 -msgid "Notifications" -msgstr "Notificaciones" - -#: include/nav.php:170 -msgid "See all notifications" -msgstr "Ver todas las notificaciones" - -#: include/nav.php:171 mod/settings.php:900 -msgid "Mark as seen" -msgstr "Marcar como leído" - -#: include/nav.php:171 -msgid "Mark all system notifications seen" -msgstr "Marcar todas las notificaciones del sistema como leídas" - -#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255 -msgid "Messages" -msgstr "Mensajes" - -#: include/nav.php:175 view/theme/frio/theme.php:255 -msgid "Private mail" -msgstr "Correo privado" - -#: include/nav.php:176 -msgid "Inbox" -msgstr "Entrada" - -#: include/nav.php:177 -msgid "Outbox" -msgstr "Enviados" - -#: include/nav.php:178 mod/message.php:16 -msgid "New Message" -msgstr "Nuevo mensaje" - -#: include/nav.php:181 -msgid "Manage" -msgstr "Administrar" - -#: include/nav.php:181 -msgid "Manage other pages" -msgstr "Administrar otras páginas" - -#: include/nav.php:184 mod/settings.php:81 -msgid "Delegations" -msgstr "Delegaciones" - -#: include/nav.php:184 mod/delegate.php:130 -msgid "Delegate Page Management" -msgstr "Delegar la administración de la página" - -#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1494 -#: mod/admin.php:1752 mod/settings.php:111 view/theme/frio/theme.php:256 -#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648 -msgid "Settings" -msgstr "Configuración" - -#: include/nav.php:186 view/theme/frio/theme.php:256 -msgid "Account settings" -msgstr "Configuración de tu cuenta" - -#: include/nav.php:189 -msgid "Manage/Edit Profiles" -msgstr "Manejar/editar Perfiles" - -#: include/nav.php:192 view/theme/frio/theme.php:257 -msgid "Manage/edit friends and contacts" -msgstr "Administrar/editar amigos y contactos" - -#: include/nav.php:197 mod/admin.php:186 -msgid "Admin" -msgstr "Admin" - -#: include/nav.php:197 -msgid "Site setup and configuration" -msgstr "Opciones y configuración del sitio" - -#: include/nav.php:200 -msgid "Navigation" -msgstr "Navegación" - -#: include/nav.php:200 -msgid "Site map" -msgstr "Mapa del sitio" - -#: include/oembed.php:252 -msgid "Embedded content" -msgstr "Contenido integrado" - -#: include/oembed.php:260 -msgid "Embedding disabled" -msgstr "Contenido incrustrado desabilitado" - -#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62 -#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211 -#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807 -#: view/theme/diabook/theme.php:499 -msgid "Contact Photos" -msgstr "Foto del contacto" - -#: include/security.php:22 -msgid "Welcome " -msgstr "Bienvenido " - -#: include/security.php:23 -msgid "Please upload a profile photo." -msgstr "Por favor sube una foto para tu perfil." - -#: include/security.php:26 -msgid "Welcome back " -msgstr "Bienvenido de nuevo " - -#: include/security.php:373 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo." +#: include/network.php:595 +msgid "view full size" +msgstr "Ver a tamaño completo" #: include/text.php:304 msgid "newer" @@ -3077,25 +2955,146 @@ msgstr "Publicación" msgid "Item filed" msgstr "Elemento archivado" -#: include/Contact.php:119 -msgid "stopped following" -msgstr "dejó de seguir" +#: include/user.php:39 mod/settings.php:373 +msgid "Passwords do not match. Password unchanged." +msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada." -#: include/Contact.php:395 -msgid "Drop Contact" -msgstr "Eliminar contacto" +#: include/user.php:48 +msgid "An invitation is required." +msgstr "Se necesita invitación." -#: include/Contact.php:770 -msgid "Organisation" -msgstr "Organización" +#: include/user.php:53 +msgid "Invitation could not be verified." +msgstr "No se puede verificar la invitación." -#: include/Contact.php:773 -msgid "News" -msgstr "Noticias" +#: include/user.php:61 +msgid "Invalid OpenID url" +msgstr "Dirección OpenID no válida" -#: include/Contact.php:776 -msgid "Forum" -msgstr "Foro" +#: include/user.php:82 +msgid "Please enter the required information." +msgstr "Por favor, introduce la información necesaria." + +#: include/user.php:96 +msgid "Please use a shorter name." +msgstr "Por favor, usa un nombre más corto." + +#: include/user.php:98 +msgid "Name too short." +msgstr "El nombre es demasiado corto." + +#: include/user.php:113 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "No parece que ese sea tu nombre completo." + +#: include/user.php:118 +msgid "Your email domain is not among those allowed on this site." +msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio." + +#: include/user.php:121 +msgid "Not a valid email address." +msgstr "No es una dirección de correo electrónico válida." + +#: include/user.php:134 +msgid "Cannot use that email." +msgstr "No se puede utilizar este correo electrónico." + +#: include/user.php:140 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"." + +#: include/user.php:147 include/user.php:245 +msgid "Nickname is already registered. Please choose another." +msgstr "Apodo ya registrado. Por favor, elije otro." + +#: include/user.php:157 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro." + +#: include/user.php:173 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado." + +#: include/user.php:231 +msgid "An error occurred during registration. Please try again." +msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo." + +#: include/user.php:256 view/theme/duepuntozero/config.php:44 +msgid "default" +msgstr "predeterminado" + +#: include/user.php:266 +msgid "An error occurred creating your default profile. Please try again." +msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo." + +#: include/user.php:345 include/user.php:352 include/user.php:359 +#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 +#: mod/profile_photo.php:210 mod/profile_photo.php:302 +#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180 +#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232 +#: mod/photos.php:1819 +msgid "Profile Photos" +msgstr "Foto del perfil" + +#: include/user.php:390 +#, php-format +msgid "" +"\n" +"\t\tDear %1$s,\n" +"\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n" +"\t" +msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrarse en %2$s. Su cuenta está pendiente de aprobación por el administrador.\n\t" + +#: include/user.php:400 +#, php-format +msgid "Registration at %s" +msgstr "Registro en %s" + +#: include/user.php:410 +#, php-format +msgid "" +"\n" +"\t\tDear %1$s,\n" +"\t\t\tThank you for registering at %2$s. Your account has been created.\n" +"\t" +msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t" + +#: include/user.php:414 +#, php-format +msgid "" +"\n" +"\t\tThe login details are as follows:\n" +"\t\t\tSite Location:\t%3$s\n" +"\t\t\tLogin Name:\t%1$s\n" +"\t\t\tPassword:\t%5$s\n" +"\n" +"\t\tYou may change your password from your account \"Settings\" page after logging\n" +"\t\tin.\n" +"\n" +"\t\tPlease take a few moments to review the other account settings on that page.\n" +"\n" +"\t\tYou may also wish to add some basic information to your default profile\n" +"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" +"\n" +"\t\tWe recommend setting your full name, adding a profile photo,\n" +"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n" +"\t\tperhaps what country you live in; if you do not wish to be more specific\n" +"\t\tthan that.\n" +"\n" +"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n" +"\t\tIf you are new and do not know anybody here, they may help\n" +"\t\tyou to make some new and interesting friends.\n" +"\n" +"\n" +"\t\tThank you and welcome to %2$s." +msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2$s." + +#: include/user.php:446 mod/admin.php:1209 +#, php-format +msgid "Registration details for %s" +msgstr "Detalles de registro para %s" #: mod/oexchange.php:25 msgid "Post successful." @@ -3242,7 +3241,7 @@ msgid "" "Password reset failed." msgstr "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña." -#: mod/lostpass.php:109 boot.php:1793 +#: mod/lostpass.php:109 boot.php:1802 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -3308,7 +3307,7 @@ msgid "" "your email for further instructions." msgstr "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales." -#: mod/lostpass.php:161 boot.php:1781 +#: mod/lostpass.php:161 boot.php:1790 msgid "Nickname or Email: " msgstr "Apodo o Correo electrónico: " @@ -3333,25 +3332,6 @@ msgstr "No se ha encontrado" msgid "Page not found." msgstr "Página no encontrada." -#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86 -#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17 -#: mod/wall_attach.php:25 mod/wall_attach.php:76 -msgid "Invalid request." -msgstr "Consulta invalida" - -#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:786 -#, php-format -msgid "Image exceeds size limit of %s" -msgstr "La imagen excede el limite de %s" - -#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:826 -msgid "Unable to process image." -msgstr "Imposible procesar la imagen." - -#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:853 -msgid "Image upload failed." -msgstr "Error al subir la imagen." - #: mod/lockview.php:31 mod/lockview.php:39 msgid "Remote privacy information not available." msgstr "Privacidad de la información remota no disponible." @@ -3369,13 +3349,13 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio." -#: mod/uimport.php:50 mod/register.php:191 +#: mod/uimport.php:50 mod/register.php:198 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor." -#: mod/uimport.php:64 mod/register.php:286 +#: mod/uimport.php:64 mod/register.php:295 msgid "Import" msgstr "Importar" @@ -3553,10 +3533,8 @@ msgstr "Para más información sobre el Proyecto Friendica y sobre por qué pens #: mod/install.php:272 mod/install.php:312 mod/photos.php:1104 #: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590 #: mod/photos.php:1638 mod/photos.php:1724 object/Item.php:720 -#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80 -#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70 -#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633 -#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59 +#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64 +#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "Envíar" @@ -3604,23 +3582,6 @@ msgstr "Selecciona una etiqueta para eliminar: " msgid "Remove" msgstr "Eliminar" -#: mod/wall_attach.php:94 -msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" -msgstr "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite." - -#: mod/wall_attach.php:94 -msgid "Or - did you try to upload an empty file?" -msgstr "Si no - intento de subir un archivo vacío?" - -#: mod/wall_attach.php:105 -#, php-format -msgid "File exceeds size limit of %s" -msgstr "El archivo excede el limite de tamaño de %s" - -#: mod/wall_attach.php:156 mod/wall_attach.php:172 -msgid "File upload failed." -msgstr "Ha fallado la subida del archivo." - #: mod/repair_ostatus.php:14 msgid "Resubscribing to OStatus contacts" msgstr "Resubscribir a contactos de OStatus" @@ -3727,11 +3688,11 @@ msgstr "¿%s te conoce?" #: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861 #: mod/profiles.php:648 mod/profiles.php:652 mod/profiles.php:677 -#: mod/register.php:239 mod/settings.php:1158 mod/settings.php:1164 -#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181 -#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199 -#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227 -#: mod/settings.php:1228 mod/settings.php:1229 +#: mod/register.php:246 mod/settings.php:1163 mod/settings.php:1169 +#: mod/settings.php:1177 mod/settings.php:1181 mod/settings.php:1186 +#: mod/settings.php:1192 mod/settings.php:1198 mod/settings.php:1204 +#: mod/settings.php:1230 mod/settings.php:1231 mod/settings.php:1232 +#: mod/settings.php:1233 mod/settings.php:1234 msgid "No" msgstr "No" @@ -4035,7 +3996,7 @@ msgstr "Miembros" msgid "All Contacts" msgstr "Todos los contactos" -#: mod/group.php:193 mod/content.php:130 mod/network.php:495 +#: mod/group.php:193 mod/content.php:130 mod/network.php:496 msgid "Group is empty" msgstr "El grupo está vacío" @@ -4331,9 +4292,9 @@ msgid "" "entries from this contact." msgstr "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta." -#: mod/crepair.php:165 mod/admin.php:1367 mod/admin.php:1380 -#: mod/admin.php:1392 mod/admin.php:1408 mod/settings.php:678 -#: mod/settings.php:704 +#: mod/crepair.php:165 mod/admin.php:1392 mod/admin.php:1405 +#: mod/admin.php:1418 mod/admin.php:1434 mod/settings.php:680 +#: mod/settings.php:706 msgid "Name" msgstr "Nombre" @@ -4519,11 +4480,11 @@ msgid "" " bar." msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora." -#: mod/content.php:119 mod/network.php:468 +#: mod/content.php:119 mod/network.php:469 msgid "No such group" msgstr "Ningún grupo" -#: mod/content.php:135 mod/network.php:499 +#: mod/content.php:135 mod/network.php:500 #, php-format msgid "Group: %s" msgstr "Grupo: %s" @@ -4574,7 +4535,7 @@ msgstr "Este eres tú" #: mod/content.php:727 mod/content.php:945 mod/photos.php:1589 #: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403 -#: object/Item.php:719 boot.php:969 +#: object/Item.php:719 boot.php:970 msgid "Comment" msgstr "Comentar" @@ -4610,7 +4571,7 @@ msgstr "Enlace" msgid "Video" msgstr "Vídeo" -#: mod/content.php:746 mod/settings.php:738 object/Item.php:122 +#: mod/content.php:746 mod/settings.php:740 object/Item.php:122 #: object/Item.php:124 msgid "Edit" msgstr "Editar" @@ -4816,6 +4777,15 @@ msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no msgid "Unable to process image" msgstr "Imposible procesar la imagen" +#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151 +#, php-format +msgid "Image exceeds size limit of %s" +msgstr "La imagen excede el limite de %s" + +#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188 +msgid "Unable to process image." +msgstr "Imposible procesar la imagen." + #: mod/profile_photo.php:248 msgid "Upload File:" msgstr "Subir archivo:" @@ -4856,6 +4826,10 @@ msgstr "Editado" msgid "Image uploaded successfully." msgstr "Imagen subida con éxito." +#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221 +msgid "Image upload failed." +msgstr "Error al subir la imagen." + #: mod/regmod.php:55 msgid "Account approved." msgstr "Cuenta aprobada." @@ -4925,7 +4899,7 @@ msgstr "Publica tu nueva amistad" msgid "if applicable" msgstr "Si corresponde" -#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1382 +#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1408 msgid "Approve" msgstr "Aprobar" @@ -5287,1384 +5261,6 @@ msgstr "Informacioń de contacto y Redes sociales" msgid "Edit/Manage Profiles" msgstr "Editar/Administrar perfiles" -#: mod/admin.php:92 -msgid "Theme settings updated." -msgstr "Configuración de la apariencia actualizada." - -#: mod/admin.php:156 mod/admin.php:926 -msgid "Site" -msgstr "Sitio" - -#: mod/admin.php:157 mod/admin.php:870 mod/admin.php:1375 mod/admin.php:1390 -msgid "Users" -msgstr "Usuarios" - -#: mod/admin.php:158 mod/admin.php:1492 mod/admin.php:1552 mod/settings.php:74 -msgid "Plugins" -msgstr "Módulos" - -#: mod/admin.php:159 mod/admin.php:1750 mod/admin.php:1800 -msgid "Themes" -msgstr "Temas" - -#: mod/admin.php:160 mod/settings.php:52 -msgid "Additional features" -msgstr "Características adicionales" - -#: mod/admin.php:161 -msgid "DB updates" -msgstr "Actualizaciones de la Base de Datos" - -#: mod/admin.php:162 mod/admin.php:397 -msgid "Inspect Queue" -msgstr "Inspeccionar cola" - -#: mod/admin.php:163 mod/admin.php:363 -msgid "Federation Statistics" -msgstr "Estadísticas de federación" - -#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1874 -msgid "Logs" -msgstr "Registros" - -#: mod/admin.php:178 mod/admin.php:1942 -msgid "View Logs" -msgstr "Ver registro de depuración" - -#: mod/admin.php:179 -msgid "probe address" -msgstr "probar direccion" - -#: mod/admin.php:180 -msgid "check webfinger" -msgstr "Verificar webfinger" - -#: mod/admin.php:187 -msgid "Plugin Features" -msgstr "Características del módulo" - -#: mod/admin.php:189 -msgid "diagnostics" -msgstr "diagnosticos" - -#: mod/admin.php:190 -msgid "User registrations waiting for confirmation" -msgstr "Registro de usuarios esperando la confirmación" - -#: mod/admin.php:356 -msgid "" -"This page offers you some numbers to the known part of the federated social " -"network your Friendica node is part of. These numbers are not complete but " -"only reflect the part of the network your node is aware of." -msgstr "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. " - -#: mod/admin.php:357 -msgid "" -"The Auto Discovered Contact Directory feature is not enabled, it " -"will improve the data displayed here." -msgstr "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí." - -#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:925 -#: mod/admin.php:1374 mod/admin.php:1491 mod/admin.php:1551 mod/admin.php:1749 -#: mod/admin.php:1799 mod/admin.php:1873 mod/admin.php:1941 -msgid "Administration" -msgstr "Administración" - -#: mod/admin.php:369 -#, php-format -msgid "Currently this node is aware of %d nodes from the following platforms:" -msgstr "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:" - -#: mod/admin.php:399 -msgid "ID" -msgstr "ID" - -#: mod/admin.php:400 -msgid "Recipient Name" -msgstr "Nombre del recipiente" - -#: mod/admin.php:401 -msgid "Recipient Profile" -msgstr "Perfil del recipiente" - -#: mod/admin.php:403 -msgid "Created" -msgstr "Creado" - -#: mod/admin.php:404 -msgid "Last Tried" -msgstr "Ultimo intento" - -#: mod/admin.php:405 -msgid "" -"This page lists the content of the queue for outgoing postings. These are " -"postings the initial delivery failed for. They will be resend later and " -"eventually deleted if the delivery fails permanently." -msgstr "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. " - -#: mod/admin.php:424 mod/admin.php:1323 -msgid "Normal Account" -msgstr "Cuenta normal" - -#: mod/admin.php:425 mod/admin.php:1324 -msgid "Soapbox Account" -msgstr "Cuenta tribuna" - -#: mod/admin.php:426 mod/admin.php:1325 -msgid "Community/Celebrity Account" -msgstr "Cuenta de Comunidad/Celebridad" - -#: mod/admin.php:427 mod/admin.php:1326 -msgid "Automatic Friend Account" -msgstr "Cuenta de amistad automática" - -#: mod/admin.php:428 -msgid "Blog Account" -msgstr "Cuenta de blog" - -#: mod/admin.php:429 -msgid "Private Forum" -msgstr "Foro privado" - -#: mod/admin.php:455 -msgid "Message queues" -msgstr "Cola de mensajes" - -#: mod/admin.php:461 -msgid "Summary" -msgstr "Resumen" - -#: mod/admin.php:464 -msgid "Registered users" -msgstr "Usuarios registrados" - -#: mod/admin.php:466 -msgid "Pending registrations" -msgstr "Pendientes de registro" - -#: mod/admin.php:467 -msgid "Version" -msgstr "Versión" - -#: mod/admin.php:472 -msgid "Active plugins" -msgstr "Módulos activos" - -#: mod/admin.php:495 -msgid "Can not parse base url. Must have at least
" +msgstr "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
" + +#: mod/admin.php:443 +msgid "" +"You are using a MySQL version which does not support all features that " +"Friendica uses. You should consider switching to MariaDB." +msgstr "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB." + +#: mod/admin.php:447 mod/admin.php:1348 +msgid "Normal Account" +msgstr "Cuenta normal" + +#: mod/admin.php:448 mod/admin.php:1349 +msgid "Soapbox Account" +msgstr "Cuenta tribuna" + +#: mod/admin.php:449 mod/admin.php:1350 +msgid "Community/Celebrity Account" +msgstr "Cuenta de Comunidad/Celebridad" + +#: mod/admin.php:450 mod/admin.php:1351 +msgid "Automatic Friend Account" +msgstr "Cuenta de amistad automática" + +#: mod/admin.php:451 +msgid "Blog Account" +msgstr "Cuenta de blog" + +#: mod/admin.php:452 +msgid "Private Forum" +msgstr "Foro privado" + +#: mod/admin.php:478 +msgid "Message queues" +msgstr "Cola de mensajes" + +#: mod/admin.php:484 +msgid "Summary" +msgstr "Resumen" + +#: mod/admin.php:487 +msgid "Registered users" +msgstr "Usuarios registrados" + +#: mod/admin.php:489 +msgid "Pending registrations" +msgstr "Pendientes de registro" + +#: mod/admin.php:490 +msgid "Version" +msgstr "Versión" + +#: mod/admin.php:495 +msgid "Active plugins" +msgstr "Módulos activos" + +#: mod/admin.php:520 +msgid "Can not parse base url. Must have at least
What next
"] = "¿Ahora qué?
"; +$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["System down for maintenance"] = "Servicio suspendido por mantenimiento"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."; +$a->strings["is interested in:"] = "estás interesado en:"; +$a->strings["Profile Match"] = "Coincidencias de Perfil"; +$a->strings["Tips for New Members"] = "Consejos para nuevos miembros"; +$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."; +$a->strings["Ignore/Hide"] = "Ignorar/Ocultar"; +$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]"; $a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada."; $a->strings["Site"] = "Sitio"; $a->strings["Users"] = "Usuarios"; @@ -1227,6 +1425,7 @@ $a->strings["check webfinger"] = "Verificar webfinger"; $a->strings["Plugin Features"] = "Características del módulo"; $a->strings["diagnostics"] = "diagnosticos"; $a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación"; +$a->strings["unknown"] = "desconocido"; $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. "; $a->strings["The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here."] = "El modulo directorio de contactos encontrados no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí."; $a->strings["Administration"] = "Administración"; @@ -1237,6 +1436,8 @@ $a->strings["Recipient Profile"] = "Perfil del recipiente"; $a->strings["Created"] = "Creado"; $a->strings["Last Tried"] = "Ultimo intento"; $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. "; +$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation."] = "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea aquí para una guía que puede ayudar a convertir las tablas de motor. También puede usar convert_innodb.sql en el directorio /util de su instalación de Friendica.
"; +$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB."; $a->strings["Normal Account"] = "Cuenta normal"; $a->strings["Soapbox Account"] = "Cuenta tribuna"; $a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad"; @@ -1256,9 +1457,7 @@ $a->strings["No special theme for mobile devices"] = "No hay tema especial para $a->strings["No community page"] = "No hay pagina de comunidad"; $a->strings["Public postings from users of this site"] = "Temas públicos de perfiles de este sitio."; $a->strings["Global community page"] = "Pagina global de comunidad"; -$a->strings["Never"] = "Nunca"; $a->strings["At post arrival"] = "A la llegada de una publicación"; -$a->strings["Disabled"] = "Deshabilitado"; $a->strings["Users, Global Contacts"] = "Perfiles, contactos globales"; $a->strings["Users, Global Contacts/fallback"] = "Perfiles, contactos globales/fallback"; $a->strings["One month"] = "Un mes"; @@ -1469,9 +1668,8 @@ $a->strings["User registrations waiting for confirm"] = "Registro de usuarios es $a->strings["User waiting for permanent deletion"] = "Usuario esperando anulación permanente."; $a->strings["Request date"] = "Solicitud de fecha"; $a->strings["No registrations."] = "Sin registros."; +$a->strings["Note from the user"] = "Nota para el usuario"; $a->strings["Deny"] = "Denegado"; -$a->strings["Block"] = "Bloquear"; -$a->strings["Unblock"] = "Desbloquear"; $a->strings["Site admin"] = "Administrador de la web"; $a->strings["Account expired"] = "Cuenta caducada"; $a->strings["New User"] = "Nuevo usuario"; @@ -1511,194 +1709,6 @@ $a->strings["Off"] = "Apagado"; $a->strings["On"] = "Encendido"; $a->strings["Lock feature %s"] = "Trancar opción %s "; $a->strings["Manage Additional Features"] = "Administrar opciones adicionales"; -$a->strings["No friends to display."] = "No hay amigos para mostrar."; -$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido."; -$a->strings["View"] = "Vista"; -$a->strings["Previous"] = "Previo"; -$a->strings["Next"] = "Siguiente"; -$a->strings["list"] = "lista"; -$a->strings["User not found"] = "Usuario no encontrado"; -$a->strings["This calendar format is not supported"] = "Este formato de calendario no se soporta"; -$a->strings["No exportable data found"] = "No se ha encontrado información exportable"; -$a->strings["calendar"] = "calendario"; -$a->strings["No contacts in common."] = "Sin contactos en común."; -$a->strings["Common Friends"] = "Amigos comunes"; -$a->strings["Not available."] = "No disponible"; -$a->strings["%d contact edited."] = array( - 0 => "%d contacto editado.", - 1 => "%d contacts edited.", -); -$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto."; -$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado."; -$a->strings["Contact updated."] = "Contacto actualizado."; -$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado"; -$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado"; -$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado"; -$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado"; -$a->strings["Contact has been archived"] = "El contacto ha sido archivado"; -$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado"; -$a->strings["Drop contact"] = "Eliminar contacto"; -$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?"; -$a->strings["Contact has been removed."] = "El contacto ha sido eliminado"; -$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s"; -$a->strings["You are sharing with %s"] = "Estás compartiendo con %s"; -$a->strings["%s is sharing with you"] = "%s está compartiendo contigo"; -$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto."; -$a->strings["(Update was successful)"] = "(La actualización se ha completado)"; -$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)"; -$a->strings["Suggest friends"] = "Sugerir amigos"; -$a->strings["Network type: %s"] = "Tipo de red: %s"; -$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!"; -$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds"; -$a->strings["Fetch information"] = "Recaudar informacion"; -$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves"; -$a->strings["Contact"] = "Contacto"; -$a->strings["Profile Visibility"] = "Visibilidad del Perfil"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."; -$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas"; -$a->strings["Edit contact notes"] = "Editar notas del contacto"; -$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto"; -$a->strings["Ignore contact"] = "Ignorar contacto"; -$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección"; -$a->strings["View conversations"] = "Ver conversaciones"; -$a->strings["Last update:"] = "Última actualización:"; -$a->strings["Update public posts"] = "Actualizar publicaciones públicas"; -$a->strings["Update now"] = "Actualizar ahora"; -$a->strings["Unignore"] = "Quitar de Ignorados"; -$a->strings["Currently blocked"] = "Bloqueados"; -$a->strings["Currently ignored"] = "Ignorados"; -$a->strings["Currently archived"] = "Archivados"; -$a->strings["Replies/likes to your public posts may still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía pueden ser visibles."; -$a->strings["Notification for new posts"] = "Notificacion de nuevos temas."; -$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto."; -$a->strings["Blacklisted keywords"] = "Lista negra de palabras"; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado"; -$a->strings["Actions"] = "Acciones"; -$a->strings["Contact Settings"] = "Ajustes del contacto"; -$a->strings["Suggestions"] = "Sugerencias"; -$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas"; -$a->strings["Show all contacts"] = "Mostrar todos los contactos"; -$a->strings["Unblocked"] = "Desbloqueados"; -$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear"; -$a->strings["Blocked"] = "Bloqueados"; -$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados"; -$a->strings["Ignored"] = "Ignorados"; -$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados"; -$a->strings["Archived"] = "Archivados"; -$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados"; -$a->strings["Hidden"] = "Ocultos"; -$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos"; -$a->strings["Search your contacts"] = "Buscar en tus contactos"; -$a->strings["Update"] = "Actualizar"; -$a->strings["Archive"] = "Archivo"; -$a->strings["Unarchive"] = "Sin archivar"; -$a->strings["Batch Actions"] = "Accones en lote"; -$a->strings["View all contacts"] = "Ver todos los contactos"; -$a->strings["View all common friends"] = "Ver todos los conocidos en común "; -$a->strings["Advanced Contact Settings"] = "Configuración avanzada"; -$a->strings["Mutual Friendship"] = "Amistad recíproca"; -$a->strings["is a fan of yours"] = "es tu fan"; -$a->strings["you are a fan of"] = "eres fan de"; -$a->strings["Toggle Blocked status"] = "Cambiar bloqueados"; -$a->strings["Toggle Ignored status"] = "Cambiar ignorados"; -$a->strings["Toggle Archive status"] = "Cambiar archivados"; -$a->strings["Delete contact"] = "Eliminar contacto"; -$a->strings["Global Directory"] = "Directorio global"; -$a->strings["Find on this site"] = "Buscar en este sitio"; -$a->strings["Results for:"] = "Resultados para:"; -$a->strings["Site Directory"] = "Directorio del sitio"; -$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas)."; -$a->strings["People Search - %s"] = "Buscar perfiles - %s"; -$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s"; -$a->strings["No matches"] = "Sin conincidencias"; -$a->strings["Item has been removed."] = "El elemento ha sido eliminado."; -$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo."; -$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas."; -$a->strings["Create New Event"] = "Crea un evento nuevo"; -$a->strings["Event details"] = "Detalles del evento"; -$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo"; -$a->strings["Event Starts:"] = "Inicio del evento:"; -$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante."; -$a->strings["Event Finishes:"] = "Finalización del evento:"; -$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria"; -$a->strings["Description:"] = "Descripción:"; -$a->strings["Title:"] = "Título:"; -$a->strings["Share this event"] = "Comparte este evento"; -$a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración"; -$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos."; -$a->strings["Could not create table."] = "No se puede crear la tabla."; -$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada."; -$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql."; -$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\"."; -$a->strings["Database already in use."] = "Base de datos ya se encuentra en uso"; -$a->strings["System check"] = "Verificación del sistema"; -$a->strings["Check again"] = "Compruebalo de nuevo"; -$a->strings["Database connection"] = "Conexión con la base de datos"; -$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos."; -$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones."; -$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar."; -$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos"; -$a->strings["Database Login Name"] = "Usuario de la base de datos"; -$a->strings["Database Login Password"] = "Contraseña de la base de datos"; -$a->strings["Database Name"] = "Nombre de la base de datos"; -$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web"; -$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web."; -$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web"; -$a->strings["Site settings"] = "Configuración de la página web"; -$a->strings["System Language:"] = "Sistema de idioma:"; -$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails."; -$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web."; -$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea 'Setup the poller'"; -$a->strings["PHP executable path"] = "Dirección al ejecutable PHP"; -$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación."; -$a->strings["Command line PHP"] = "Línea de comandos PHP"; -$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)"; -$a->strings["Found PHP version: "] = "Versión PHP encontrada:"; -$a->strings["PHP cli binary"] = "PHP cli binario"; -$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado."; -$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes."; -$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado"; -$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\"."; -$a->strings["Generate encryption keys"] = "Generar claves de encriptación"; -$a->strings["libCurl PHP module"] = "Módulo PHP libCurl"; -$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD"; -$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL"; -$a->strings["mysqli PHP module"] = "Módulo PHP mysqli"; -$a->strings["mb_string PHP module"] = "Módulo PHP mb_string"; -$a->strings["mcrypt PHP module"] = "modulo mycrypt PHP"; -$a->strings["XML PHP module"] = "Módulo XML PHP"; -$a->strings["iconv module"] = "Módulo iconv"; -$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache"; -$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado."; -$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado."; -$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado."; -$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero no está instalado."; -$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado."; -$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado."; -$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: modulo mycrypt PHP requerido pero no instalado."; -$a->strings["Error: iconv PHP module required but not installed."] = "Error: módulo iconv PHP requerido pero no instalado."; -$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración"; -$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer."; -$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() función"; -$a->strings["Error, XML PHP module required but not installed."] = "Error, módulo XML PHP requerido pero no instalado."; -$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo."; -$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas."; -$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica."; -$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones."; -$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura"; -$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar."; -$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica."; -$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta."; -$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene."; -$a->strings["view/smarty3 is writable"] = "Se puede escribir en /view/smarty3"; -$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["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed"; -$a->strings["ImageMagick supports GIF"] = "ImageMagick supporta GIF"; -$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "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["
What next
"] = "¿Ahora qué?
"; -$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["Unable to locate original post."] = "No se puede encontrar la publicación original."; $a->strings["Empty post discarded."] = "Publicación vacía descartada."; $a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado."; @@ -1706,15 +1716,11 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia $a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."; $a->strings["%s posted an update."] = "%s ha publicado una actualización."; -$a->strings["System down for maintenance"] = "Servicio suspendido por mantenimiento"; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."; -$a->strings["is interested in:"] = "estás interesado en:"; -$a->strings["Profile Match"] = "Coincidencias de Perfil"; -$a->strings["Warning: This group contains %s member from an insecure network."] = array( - 0 => "Aviso: este grupo contiene %s contacto con conexión no segura.", - 1 => "Aviso: este grupo contiene %s contactos con conexiones no seguras.", +$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( + 0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.", + 1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.", ); -$a->strings["Private messages to this group are at risk of public disclosure."] = "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente."; +$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores."; $a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."; $a->strings["Invalid contact."] = "Contacto erróneo."; $a->strings["Commented Order"] = "Orden de comentarios"; @@ -1777,7 +1783,6 @@ $a->strings["View Album"] = "Ver Álbum"; $a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo"; $a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje"; $a->strings["{0} requested registration"] = "{0} solicitudes de registro"; -$a->strings["Tips for New Members"] = "Consejos para nuevos miembros"; $a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información."; $a->strings["Failed to send email message. Here your accout details:login: %s
password: %s
You can change your password after login."] = "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta:
login: %s
contraseña: %s
Puede cambiar su contraseña después de ingresar al sitio."; $a->strings["Registration successful."] = "Registro exitoso."; @@ -1787,6 +1792,8 @@ $a->strings["You may (optionally) fill in this form via OpenID by supplying your $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos."; $a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):"; $a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?"; +$a->strings["Note for the admin"] = "Nota para el administrador"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo"; $a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación."; $a->strings["Your invitation ID: "] = "ID de tu invitación: "; $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Nombre completo (ej. Joe Smith, real o real aparente):"; @@ -1797,16 +1804,6 @@ $a->strings["Confirm:"] = "Confirmar:"; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"apodo@\$nombredelsitio\"."; $a->strings["Choose a nickname: "] = "Escoge un apodo: "; $a->strings["Import your profile to this friendica instance"] = "Importar tu perfil a esta instancia de friendica"; -$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?"; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."; -$a->strings["Ignore/Hide"] = "Ignorar/Ocultar"; -$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]"; -$a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?"; -$a->strings["Delete Video"] = "Borrar vídeo"; -$a->strings["No videos selected"] = "Ningún vídeo seleccionado"; -$a->strings["Recent Videos"] = "Vídeos recientes"; -$a->strings["Upload New Videos"] = "Subir nuevos vídeos"; -$a->strings["No contacts."] = "Ningún contacto."; $a->strings["Display"] = "Interfaz del usuario"; $a->strings["Social Networks"] = "Redes sociales"; $a->strings["Connected apps"] = "Aplicaciones conectadas"; @@ -1872,6 +1869,8 @@ $a->strings["Move to folder:"] = "Mover al directorio:"; $a->strings["Display Settings"] = "Configuración Tema/Visualización"; $a->strings["Display Theme:"] = "Utilizar tema:"; $a->strings["Mobile Theme:"] = "Tema móvil:"; +$a->strings["Suppress warning of insecure networks"] = "Suprimir el aviso de redes inseguras"; +$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas."; $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimo 10 segundos. Ingrese -1 para deshabilitar."; $a->strings["Number of items to display per page:"] = "Número de elementos a mostrar por página:"; @@ -1976,6 +1975,17 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ca $a->strings["Relocate"] = "Relocalizar"; $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)"; $a->strings["Resend relocate message to contacts"] = "Reenviar mensaje de relocalización a los contactos"; +$a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?"; +$a->strings["Delete Video"] = "Borrar vídeo"; +$a->strings["No videos selected"] = "Ningún vídeo seleccionado"; +$a->strings["Recent Videos"] = "Vídeos recientes"; +$a->strings["Upload New Videos"] = "Subir nuevos vídeos"; +$a->strings["No contacts."] = "Ningún contacto."; +$a->strings["Invalid request."] = "Consulta invalida"; +$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite."; +$a->strings["Or - did you try to upload an empty file?"] = "Si no - intento de subir un archivo vacío?"; +$a->strings["File exceeds size limit of %s"] = "El archivo excede el limite de tamaño de %s"; +$a->strings["File upload failed."] = "Ha fallado la subida del archivo."; $a->strings["via"] = "vía"; $a->strings["Repeat the image"] = "Repetir la imagen"; $a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo"; @@ -1997,17 +2007,12 @@ $a->strings["Content background transparency"] = "Transparencia de contenido de $a->strings["Set the background image"] = "Seleccionar la imagen de fondo"; $a->strings["Guest"] = "Invitado"; $a->strings["Visitor"] = "Visitante"; -$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 font-size for posts and comments"] = "Tamaño del texto para publicaciones y comentarios"; -$a->strings["Set theme width"] = "Establecer el ancho para el tema"; -$a->strings["Color scheme"] = "Esquema de color"; $a->strings["Alignment"] = "Alineación"; $a->strings["Left"] = "Izquierda"; $a->strings["Center"] = "Centrado"; +$a->strings["Color scheme"] = "Esquema de color"; $a->strings["Posts font size"] = "Tamaño de letra del titulo de las publicaciones"; $a->strings["Textareas font size"] = "Tamaño de letra del área de texto"; -$a->strings["Set line-height for posts and comments"] = "Altura para las publicaciones y comentarios"; -$a->strings["Set colour scheme"] = "Configurar esquema de color"; $a->strings["Community Profiles"] = "Perfiles de la Comunidad"; $a->strings["Last users"] = "Últimos usuarios"; $a->strings["Find Friends"] = "Buscar amigos"; @@ -2018,18 +2023,6 @@ $a->strings["Comma separated list of helper forums"] = "Lista separada por comas $a->strings["Set style"] = "Definir estilo"; $a->strings["Community Pages"] = "Páginas de Comunidad"; $a->strings["Help or @NewHere ?"] = "¿Ayuda o @NuevoAquí?"; -$a->strings["Your contacts"] = "Tus contactos"; -$a->strings["Your personal photos"] = "Tus fotos personales"; -$a->strings["Last likes"] = "Últimos \"me gusta\""; -$a->strings["Last photos"] = "Últimas fotos"; -$a->strings["Earth Layers"] = "Minimapa"; -$a->strings["Set zoomfactor for Earth Layers"] = "Configurar zoom en Minimapa"; -$a->strings["Set longitude (X) for Earth Layers"] = "Configurar longitud (X) en Minimapa"; -$a->strings["Set latitude (Y) for Earth Layers"] = "Configurar latitud (Y) en Minimapa"; -$a->strings["Show/hide boxes at right-hand column:"] = "Mostrar/Ocultar casillas en la columna derecha:"; -$a->strings["Set resolution for middle column"] = "Resolución para la columna central"; -$a->strings["Set color scheme"] = "Configurar esquema de color"; -$a->strings["Set zoomfactor for Earth Layer"] = "Establecer zoom para Minimapa"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; $a->strings["easterbunny"] = "easterbunny"; diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index 08e84b008..c8e8af229 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -1,6 +1,13 @@
{{$title}} - {{$page}}
+{{if $showwarning}} +
+ {{foreach $warningtext as $wt}}
+
+ {{/foreach}}
+
+{{/if}}
