diff --git a/boot.php b/boot.php index c50dbb582f..b47164f100 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1430' ); +define ( 'FRIENDICA_VERSION', '3.0.1431' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); @@ -364,6 +364,7 @@ if(! class_exists('App')) { public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; + public $force_max_items = 0; private $scheme; private $hostname; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 9ede42f6c7..b0e12027a8 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -196,6 +196,14 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { // The bbcode parser now handles youtube-links (and the other stuff) correctly. // Additionally the html code is now fixed so that lists are now working. + /** + * Transform #tags, strip off the [url] and replace spaces with underscore + */ + $Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match', + 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' + ), $Text); + + // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); diff --git a/include/conversation.php b/include/conversation.php index 7d9dfa1e74..06d06cb5a3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -307,6 +307,9 @@ function count_descendants($item) { if($total > 0) { foreach($item['children'] as $child) { + if($child['verb'] === ACTIVITY_LIKE || $child['verb'] === ACTIVITY_DISLIKE) { + $total --; + } $total += count_descendants($child); } } @@ -318,7 +321,7 @@ function count_descendants($item) { * Recursively prepare a thread for HTML */ -function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $thread_level=1) { +function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) { $result = array(); $wall_template = 'wall_thread.tpl'; @@ -329,17 +332,30 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $total_children = $nb_items; foreach($items as $item) { - // prevent private email reply to public conversation from leaking. if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { // Don't count it as a visible item $nb_items--; + $total_children --; + } + if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) { + $nb_items --; + $total_children --; + + } + } + + foreach($items as $item) { + // prevent private email reply to public conversation from leaking. + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } + + if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) { continue; } $items_seen++; - $alike = array(); - $dlike = array(); $comment = ''; $template = $wall_template; $commentww = ''; @@ -410,9 +426,6 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $tag = trim($tag); if ($tag!="") $tags[] = bbcode($tag); } - - like_puller($a,$item,$alike,'like'); - like_puller($a,$item,$dlike,'dislike'); $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); @@ -588,6 +601,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr 'comment' => $comment, 'previewing' => $previewing, 'wait' => t('Please wait'), + 'thread_level' => $thread_level, ); $arr = array('item' => $item, 'output' => $tmp_item); @@ -601,7 +615,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $item_result['children'] = array(); if(count($item['children'])) { - $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1)); + $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1)); } $item_result['private'] = $item['private']; $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : ''); @@ -818,6 +832,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))), 'previewing' => $previewing, 'wait' => t('Please wait'), + 'thread_level' => 1, ); $arr = array('item' => $item, 'output' => $tmp_item); @@ -845,15 +860,17 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $threads = array(); foreach($items as $item) { + + like_puller($a,$item,$alike,'like'); + like_puller($a,$item,$dlike,'dislike'); + if($item['id'] == $item['parent']) { - // $threads[] = $item; $item_object = new Item($item); $conv->add_thread($item_object); } } - //$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner); - $threads = $conv->get_template_data($cmnt_tpl); + $threads = $conv->get_template_data($cmnt_tpl, $alike, $dlike); if(!$threads) { logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG); $threads = array(); diff --git a/include/diaspora.php b/include/diaspora.php index 96b0b184e0..3e9f20a471 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -102,6 +102,37 @@ function diaspora_dispatch($importer,$msg) { return $ret; } +function diaspora_handle_from_contact($contact_id) { + $handle = False; + + logger("diaspora_handle_from_contact: contact id is " . $contact_id, LOGGER_DEBUG); + + $r = q("SELECT network, addr, self, url, nick FROM contact WHERE id = %d", + intval($contact_id) + ); + if($r) { + $contact = $r[0]; + + logger("diaspora_handle_from_contact: contact 'self' = " . $contact['self'] . " 'url' = " . $contact['url'], LOGGER_DEBUG); + + if($contact['network'] === NETWORK_DIASPORA) { + $handle = $contact['addr']; + +// logger("diaspora_handle_from_contact: contact id is a Diaspora person, handle = " . $handle, LOGGER_DEBUG); + } + elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) { + $baseurl_start = strpos($contact['url'],'://') + 3; + $baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle + $baseurl = substr($contact['url'], $baseurl_start, $baseurl_length); + $handle = $contact['nick'] . '@' . $baseurl; + +// logger("diaspora_handle_from_contact: contact id is a DFRN person, handle = " . $handle, LOGGER_DEBUG); + } + } + + return $handle; +} + function diaspora_get_contact_by_handle($uid,$handle) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1", dbesc(NETWORK_DIASPORA), @@ -1282,7 +1313,7 @@ function diaspora_comment($importer,$xml,$msg) { // the existence of parent_author_signature means the parent_author or owner // is already relaying. - proc_run('php','include/notifier.php','comment',$message_id); + proc_run('php','include/notifier.php','comment-import',$message_id); } $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ", @@ -1867,7 +1898,7 @@ EOT; // is already relaying. The parent_item['origin'] indicates the message was created on our system if(($parent_item['origin']) && (! $parent_author_signature)) - proc_run('php','include/notifier.php','comment',$message_id); + proc_run('php','include/notifier.php','comment-import',$message_id); return; } @@ -1993,7 +2024,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) { // is already relaying. logger('diaspora_signed_retraction: relaying relayable_retraction'); - proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']); + proc_run('php','include/notifier.php','drop',$r[0]['id']); } } } @@ -2153,12 +2184,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } } */ - /** - * Transform #tags, strip off the [url] and replace spaces with underscore - */ - $body = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match', - 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' - ), $body); //if(strlen($title)) // $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body; @@ -2344,8 +2369,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. $p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1", - intval($item['parent']), - intval($item['parent']) + intval($item['parent']), + intval($item['parent']) ); //} if(count($p)) @@ -2368,7 +2393,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $like = true; $target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment'); -// $target_type = (strpos($parent['type'], 'comment') ? 'Comment' : 'Post'); // $positive = (($item['deleted']) ? 'false' : 'true'); $positive = 'true'; @@ -2382,7 +2406,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // fetch the original signature if the relayable was created by a Diaspora // or DFRN user. Relayables for other networks are not supported. - $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", +/* $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", intval($item['id']) ); if(count($r)) { @@ -2398,7 +2422,25 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // function is called logger('diaspora_send_relay: original author signature not found, cannot send relayable'); return; - } + }*/ + + /* Since the author signature is only checked by the parent, not by the relay recipients, + * I think it may not be necessary for us to do so much work to preserve all the original + * signatures. The important thing that Diaspora DOES need is the original creator's handle. + * Let's just generate that and forget about all the original author signature stuff. + * + * Note: this might be more of an problem if we want to support likes on comments for older + * versions of Diaspora (diaspora-pistos), but since there are a number of problems with + * doing that, let's ignore it for now. + * + * Currently, only DFRN contacts are supported. StatusNet shouldn't be hard, but it hasn't + * been done yet + */ + + $handle = diaspora_handle_from_contact($item['contact-id']); + if(! $handle) + return; + if($relay_retract) $sender_signed_text = $item['guid'] . ';' . $target_type; diff --git a/include/items.php b/include/items.php index 93200cc4bf..0ba40e0fa9 100755 --- a/include/items.php +++ b/include/items.php @@ -2459,6 +2459,7 @@ function local_delivery($importer,$data) { $is_a_remote_delete = false; + // POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used? $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` @@ -2472,7 +2473,7 @@ function local_delivery($importer,$data) { intval($importer['importer_uid']) ); if($r && count($r)) - $is_a_remote_delete = true; + $is_a_remote_delete = true; // Does this have the characteristics of a community or private group comment? // If it's a reply to a wall post on a community/prvgroup page it's a @@ -2799,7 +2800,7 @@ function local_delivery($importer,$data) { } if($posted_id && $parent) { - + proc_run('php',"include/notifier.php","comment-import","$posted_id"); if((! $is_like) && (! $importer['self'])) { diff --git a/include/notifier.php b/include/notifier.php index f54efba31d..947818d597 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -18,6 +18,31 @@ require_once('include/html2plain.php'); * us by hosting providers. */ +/* + * The notifier is typically called with: + * + * proc_run('php', "include/notifier.php", COMMAND, ITEM_ID); + * + * where COMMAND is one of the following: + * + * activity (in diaspora.php, dfrn_confirm.php, profiles.php) + * comment-import (in diaspora.php, items.php) + * comment-new (in item.php) + * drop (in diaspora.php, items.php, photos.php) + * edit_post (in item.php) + * event (in events.php) + * expire (in items.php) + * like (in like.php, poke.php) + * mail (in message.php) + * suggest (in fsuggest.php) + * tag (in photos.php, poke.php, tagger.php) + * tgroup (in items.php) + * wall-new (in photos.php, item.php) + * + * and ITEM_ID is the id of the item in the database that needs to be sent to others. + */ + + function notifier_run($argv, $argc){ global $a, $db; diff --git a/include/template_processor.php b/include/template_processor.php index 46252c355f..4088ddab60 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -63,7 +63,7 @@ if ($b[0]=="$") $b = $this->_get_var($b); $val = ($a == $b); } else if (strpos($args[2],"!=")>0){ - list($a,$b) = explode("!=",$args[2]); + list($a,$b) = array_map("trim", explode("!=",$args[2])); $a = $this->_get_var($a); if ($b[0]=="$") $b = $this->_get_var($b); $val = ($a != $b); @@ -133,6 +133,26 @@ return $ret; } + + /** + * DEBUG node + * + * {{ debug $var [$var [$var [...]]] }}{{ enddebug }} + * + * replace node with 
var_dump($var, $var, ...);
+ */ + private function _replcb_debug($args){ + $vars = array_map('trim', explode(" ",$args[2])); + $vars[] = $args[1]; + + $ret = "
";
+			foreach ($vars as $var){
+				$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+				$ret .= "\n";
+			}
+			$ret .= "
"; + return $ret; + } private function _replcb_node($m) { $node = $this->nodes[$m[1]]; diff --git a/mod/network.php b/mod/network.php index 17368ab92d..97f00eeda9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -563,7 +563,7 @@ function network_content(&$a, $update = 0) { } else { - if(! get_pconfig(local_user(),'system','alt_pager')) { + if(! get_pconfig(local_user(),'system','alt_pager')) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 @@ -576,10 +576,15 @@ function network_content(&$a, $update = 0) { if(count($r)) { $a->set_pager_total($r[0]['total']); } - } - $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); - $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); - $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); + } + + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) + $itemspage_network = $a->force_max_items; + + $a->set_pager_itemspage($itemspage_network); + $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); } $simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); diff --git a/util/messages.po b/util/messages.po index c245fa152b..9feeaf3809 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1430\n" +"Project-Id-Version: 3.0.1431\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-09 10:00-0700\n" +"POT-Creation-Date: 2012-08-10 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,13 +45,13 @@ msgstr "" #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:125 -#: ../../mod/item.php:141 ../../mod/profile_photo.php:19 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 +#: ../../mod/item.php:142 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:153 #: ../../mod/profile_photo.php:166 ../../mod/message.php:38 #: ../../mod/message.php:168 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:9 ../../mod/display.php:130 ../../mod/profiles.php:7 +#: ../../mod/follow.php:9 ../../mod/display.php:131 ../../mod/profiles.php:7 #: ../../mod/profiles.php:408 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 @@ -86,7 +86,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:664 ../../mod/admin.php:673 +#: ../../mod/settings.php:565 ../../mod/admin.php:667 ../../mod/admin.php:676 msgid "Name" msgstr "" @@ -131,8 +131,8 @@ msgstr "" #: ../../mod/contacts.php:341 ../../mod/settings.php:537 #: ../../mod/settings.php:691 ../../mod/settings.php:752 #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294 -#: ../../mod/message.php:478 ../../mod/admin.php:422 ../../mod/admin.php:661 -#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083 +#: ../../mod/message.php:478 ../../mod/admin.php:424 ../../mod/admin.php:664 +#: ../../mod/admin.php:800 ../../mod/admin.php:999 ../../mod/admin.php:1086 #: ../../mod/profiles.php:578 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 @@ -172,7 +172,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:696 +#: ../../include/conversation.php:525 msgid "Submit" msgstr "" @@ -524,7 +524,7 @@ msgid "Use as profile photo" msgstr "" #: ../../mod/photos.php:1171 ../../mod/content.php:601 -#: ../../include/conversation.php:606 +#: ../../include/conversation.php:365 msgid "Private Message" msgstr "" @@ -565,49 +565,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" #: ../../mod/photos.php:1303 ../../mod/content.php:665 -#: ../../include/conversation.php:670 +#: ../../include/conversation.php:500 msgid "I like this (toggle)" msgstr "" #: ../../mod/photos.php:1304 ../../mod/content.php:666 -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:501 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1305 ../../include/conversation.php:1129 +#: ../../mod/photos.php:1305 ../../include/conversation.php:1121 msgid "Share" msgstr "" #: ../../mod/photos.php:1306 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:479 ../../include/conversation.php:487 -#: ../../include/conversation.php:848 ../../include/conversation.php:1148 +#: ../../mod/message.php:479 ../../include/conversation.php:590 +#: ../../include/conversation.php:821 ../../include/conversation.php:1140 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1322 ../../mod/photos.php:1363 #: ../../mod/photos.php:1395 ../../mod/content.php:688 -#: ../../include/conversation.php:693 +#: ../../include/conversation.php:522 msgid "This is you" msgstr "" #: ../../mod/photos.php:1324 ../../mod/photos.php:1365 #: ../../mod/photos.php:1397 ../../mod/content.php:690 -#: ../../include/conversation.php:695 ../../boot.php:580 +#: ../../include/conversation.php:524 ../../boot.php:580 msgid "Comment" msgstr "" #: ../../mod/photos.php:1326 ../../mod/editpost.php:133 -#: ../../mod/content.php:700 ../../include/conversation.php:705 -#: ../../include/conversation.php:1166 +#: ../../mod/content.php:700 ../../include/conversation.php:534 +#: ../../include/conversation.php:1158 msgid "Preview" msgstr "" #: ../../mod/photos.php:1426 ../../mod/content.php:439 #: ../../mod/content.php:721 ../../mod/settings.php:600 -#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668 -#: ../../include/conversation.php:444 ../../include/conversation.php:726 +#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:671 +#: ../../include/conversation.php:379 ../../include/conversation.php:778 msgid "Delete" msgstr "" @@ -673,28 +673,28 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1115 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1107 msgid "Post to Email" msgstr "" #: ../../mod/editpost.php:103 ../../mod/content.php:708 -#: ../../mod/settings.php:599 ../../include/conversation.php:713 +#: ../../mod/settings.php:599 ../../include/conversation.php:370 msgid "Edit" msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:476 -#: ../../include/conversation.php:1130 +#: ../../include/conversation.php:1122 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1132 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1124 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:477 -#: ../../include/conversation.php:1134 +#: ../../include/conversation.php:1126 msgid "Insert web link" msgstr "" @@ -710,35 +710,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1140 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1132 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1142 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1134 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1149 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1141 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1158 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1150 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1159 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1151 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1145 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1137 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1147 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1139 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1161 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1153 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1280,28 +1280,28 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:720 -#: ../../include/conversation.php:443 ../../include/conversation.php:725 +#: ../../include/conversation.php:378 ../../include/conversation.php:777 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:813 -#: ../../mod/content.php:814 ../../include/conversation.php:460 -#: ../../include/conversation.php:818 ../../include/conversation.php:819 +#: ../../mod/content.php:814 ../../include/conversation.php:560 +#: ../../include/conversation.php:561 ../../include/conversation.php:794 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:825 -#: ../../include/conversation.php:470 ../../include/conversation.php:830 +#: ../../include/conversation.php:572 ../../include/conversation.php:804 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:485 +#: ../../mod/content.php:480 ../../include/conversation.php:819 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:591 +#: ../../mod/content.php:586 ../../include/conversation.php:599 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1310,92 +1310,92 @@ msgstr[1] "" #: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:600 #: ../../boot.php:581 msgid "show more" msgstr "" -#: ../../mod/content.php:665 ../../include/conversation.php:670 +#: ../../mod/content.php:665 ../../include/conversation.php:500 msgid "like" msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:671 +#: ../../mod/content.php:666 ../../include/conversation.php:501 msgid "dislike" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:673 +#: ../../mod/content.php:668 ../../include/conversation.php:503 msgid "Share this" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:673 +#: ../../mod/content.php:668 ../../include/conversation.php:503 msgid "share" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:697 +#: ../../mod/content.php:692 ../../include/conversation.php:526 msgid "Bold" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:698 +#: ../../mod/content.php:693 ../../include/conversation.php:527 msgid "Italic" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:699 +#: ../../mod/content.php:694 ../../include/conversation.php:528 msgid "Underline" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:700 +#: ../../mod/content.php:695 ../../include/conversation.php:529 msgid "Quote" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:701 +#: ../../mod/content.php:696 ../../include/conversation.php:530 msgid "Code" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:702 +#: ../../mod/content.php:697 ../../include/conversation.php:531 msgid "Image" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:703 +#: ../../mod/content.php:698 ../../include/conversation.php:532 msgid "Link" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:704 +#: ../../mod/content.php:699 ../../include/conversation.php:533 msgid "Video" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:738 +#: ../../mod/content.php:733 ../../include/conversation.php:471 msgid "add star" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:739 +#: ../../mod/content.php:734 ../../include/conversation.php:472 msgid "remove star" msgstr "" -#: ../../mod/content.php:735 ../../include/conversation.php:740 +#: ../../mod/content.php:735 ../../include/conversation.php:473 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:743 +#: ../../mod/content.php:738 ../../include/conversation.php:476 msgid "starred" msgstr "" -#: ../../mod/content.php:739 ../../include/conversation.php:744 +#: ../../mod/content.php:739 ../../include/conversation.php:477 msgid "add tag" msgstr "" -#: ../../mod/content.php:743 ../../include/conversation.php:748 +#: ../../mod/content.php:743 ../../include/conversation.php:382 msgid "save to folder" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:820 +#: ../../mod/content.php:815 ../../include/conversation.php:562 msgid "to" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:821 +#: ../../mod/content.php:816 ../../include/conversation.php:563 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:817 ../../include/conversation.php:822 +#: ../../mod/content.php:817 ../../include/conversation.php:564 msgid "via Wall-To-Wall:" msgstr "" @@ -1480,7 +1480,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:666 +#: ../../mod/admin.php:669 msgid "Approve" msgstr "" @@ -1681,12 +1681,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:308 ../../mod/contacts.php:367 -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:308 ../../mod/contacts.php:367 -#: ../../mod/admin.php:669 +#: ../../mod/admin.php:672 msgid "Block" msgstr "" @@ -1783,7 +1783,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:364 ../../mod/admin.php:1141 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1144 msgid "Update now" msgstr "" @@ -1996,7 +1996,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:69 ../../mod/admin.php:756 ../../mod/admin.php:961 +#: ../../mod/settings.php:69 ../../mod/admin.php:759 ../../mod/admin.php:964 #: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36 #: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 @@ -2635,7 +2635,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1066 ../../include/conversation.php:1083 +#: ../../include/conversation.php:1058 ../../include/conversation.php:1075 msgid "Please enter a link URL:" msgstr "" @@ -2926,7 +2926,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:255 ../../mod/admin.php:423 +#: ../../mod/register.php:255 ../../mod/admin.php:425 msgid "Registration" msgstr "" @@ -2982,8 +2982,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:29 -#: ../../mod/display.php:134 ../../include/items.php:3692 +#: ../../mod/admin.php:708 ../../mod/admin.php:907 ../../mod/display.php:29 +#: ../../mod/display.php:135 ../../include/items.php:3692 msgid "Item not found." msgstr "" @@ -3013,42 +3013,42 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:90 +#: ../../mod/item.php:91 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:274 +#: ../../mod/item.php:275 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:395 ../../mod/wall_upload.php:122 +#: ../../mod/item.php:396 ../../mod/wall_upload.php:122 #: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:803 +#: ../../mod/item.php:808 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:828 +#: ../../mod/item.php:833 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:830 +#: ../../mod/item.php:835 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:831 +#: ../../mod/item.php:836 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:833 +#: ../../mod/item.php:838 #, php-format msgid "%s posted an update." msgstr "" @@ -3213,19 +3213,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:421 +#: ../../mod/admin.php:96 ../../mod/admin.php:423 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672 +#: ../../mod/admin.php:97 ../../mod/admin.php:663 ../../mod/admin.php:675 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796 +#: ../../mod/admin.php:98 ../../mod/admin.php:757 ../../mod/admin.php:799 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995 +#: ../../mod/admin.php:99 ../../mod/admin.php:962 ../../mod/admin.php:998 msgid "Themes" msgstr "" @@ -3233,7 +3233,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1085 msgid "Logs" msgstr "" @@ -3249,19 +3249,19 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:642 +#: ../../mod/admin.php:183 ../../mod/admin.php:645 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:184 ../../mod/admin.php:643 +#: ../../mod/admin.php:184 ../../mod/admin.php:646 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:185 ../../mod/admin.php:644 +#: ../../mod/admin.php:185 ../../mod/admin.php:647 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:186 ../../mod/admin.php:645 +#: ../../mod/admin.php:186 ../../mod/admin.php:648 msgid "Automatic Friend Account" msgstr "" @@ -3277,9 +3277,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659 -#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958 -#: ../../mod/admin.php:994 ../../mod/admin.php:1081 +#: ../../mod/admin.php:212 ../../mod/admin.php:422 ../../mod/admin.php:662 +#: ../../mod/admin.php:756 ../../mod/admin.php:798 ../../mod/admin.php:961 +#: ../../mod/admin.php:997 ../../mod/admin.php:1084 msgid "Administration" msgstr "" @@ -3303,503 +3303,511 @@ msgstr "" msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:359 +#: ../../mod/admin.php:361 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:409 msgid "Closed" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:410 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:411 msgid "Open" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:416 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:417 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "File upload" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "Policies" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:432 ../../addon/statusnet/statusnet.php:567 msgid "Site name" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "System language" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:435 msgid "System theme" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:435 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "Register text" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:444 msgid "Block public" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:444 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:445 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:445 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:446 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:446 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:447 +msgid "Allow threaded items" +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Allow infinite level threading for items on this site." +msgstr "" + +#: ../../mod/admin.php:449 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:453 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:453 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:454 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:454 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:458 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:459 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:460 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:460 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:461 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:461 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:462 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:462 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:463 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:463 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:480 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:487 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" - #: ../../mod/admin.php:490 #, php-format -msgid "Update %s was successfully applied." +msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:493 #, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." +msgid "Update %s was successfully applied." msgstr "" #: ../../mod/admin.php:497 #, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:500 +#, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:512 +#: ../../mod/admin.php:515 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:519 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:517 +#: ../../mod/admin.php:520 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:518 +#: ../../mod/admin.php:521 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:519 +#: ../../mod/admin.php:522 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:544 +#: ../../mod/admin.php:547 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:551 +#: ../../mod/admin.php:554 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:593 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:598 +#: ../../mod/admin.php:601 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:598 +#: ../../mod/admin.php:601 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:665 msgid "select all" msgstr "" -#: ../../mod/admin.php:663 +#: ../../mod/admin.php:666 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:664 +#: ../../mod/admin.php:667 msgid "Request date" msgstr "" -#: ../../mod/admin.php:664 ../../mod/admin.php:673 +#: ../../mod/admin.php:667 ../../mod/admin.php:676 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:667 +#: ../../mod/admin.php:670 msgid "Deny" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:676 msgid "Register date" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:676 msgid "Last login" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:676 msgid "Last item" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:676 msgid "Account" msgstr "" -#: ../../mod/admin.php:675 +#: ../../mod/admin.php:678 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:676 +#: ../../mod/admin.php:679 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:717 +#: ../../mod/admin.php:720 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:721 +#: ../../mod/admin.php:724 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:731 ../../mod/admin.php:929 +#: ../../mod/admin.php:734 ../../mod/admin.php:932 msgid "Disable" msgstr "" -#: ../../mod/admin.php:733 ../../mod/admin.php:931 +#: ../../mod/admin.php:736 ../../mod/admin.php:934 msgid "Enable" msgstr "" -#: ../../mod/admin.php:755 ../../mod/admin.php:960 +#: ../../mod/admin.php:758 ../../mod/admin.php:963 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:763 ../../mod/admin.php:970 +#: ../../mod/admin.php:766 ../../mod/admin.php:973 msgid "Author: " msgstr "" -#: ../../mod/admin.php:764 ../../mod/admin.php:971 +#: ../../mod/admin.php:767 ../../mod/admin.php:974 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:893 +#: ../../mod/admin.php:896 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:952 +#: ../../mod/admin.php:955 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1000 +#: ../../mod/admin.php:1003 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1004 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1028 +#: ../../mod/admin.php:1031 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1087 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1090 +#: ../../mod/admin.php:1093 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1091 +#: ../../mod/admin.php:1094 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1091 +#: ../../mod/admin.php:1094 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1092 +#: ../../mod/admin.php:1095 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1142 +#: ../../mod/admin.php:1145 msgid "Close" msgstr "" -#: ../../mod/admin.php:1148 +#: ../../mod/admin.php:1151 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1149 +#: ../../mod/admin.php:1152 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1150 +#: ../../mod/admin.php:1153 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1151 +#: ../../mod/admin.php:1154 msgid "FTP Password" msgstr "" @@ -3894,7 +3902,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:127 +#: ../../mod/display.php:128 msgid "Item has been removed." msgstr "" @@ -4218,8 +4226,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1070 -#: ../../include/conversation.php:1087 +#: ../../mod/filer.php:29 ../../include/conversation.php:1062 +#: ../../include/conversation.php:1079 msgid "Save to Folder:" msgstr "" @@ -8162,34 +8170,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:967 +#: ../../include/Contact.php:220 ../../include/conversation.php:959 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:961 +#: ../../include/Contact.php:221 ../../include/conversation.php:953 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:962 +#: ../../include/Contact.php:222 ../../include/conversation.php:954 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:963 +#: ../../include/Contact.php:223 ../../include/conversation.php:955 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:956 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:957 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:958 msgid "Send PM" msgstr "" @@ -8207,106 +8215,106 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:859 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:1017 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:1017 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1029 +#: ../../include/conversation.php:1021 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1031 +#: ../../include/conversation.php:1023 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1037 +#: ../../include/conversation.php:1029 msgid "and" msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1032 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1041 +#: ../../include/conversation.php:1033 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1041 +#: ../../include/conversation.php:1033 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1065 ../../include/conversation.php:1082 +#: ../../include/conversation.php:1057 ../../include/conversation.php:1074 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1067 ../../include/conversation.php:1084 +#: ../../include/conversation.php:1059 ../../include/conversation.php:1076 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1068 ../../include/conversation.php:1085 +#: ../../include/conversation.php:1060 ../../include/conversation.php:1077 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1069 ../../include/conversation.php:1086 +#: ../../include/conversation.php:1061 ../../include/conversation.php:1078 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1071 ../../include/conversation.php:1088 +#: ../../include/conversation.php:1063 ../../include/conversation.php:1080 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1131 +#: ../../include/conversation.php:1123 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1133 +#: ../../include/conversation.php:1125 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1135 +#: ../../include/conversation.php:1127 msgid "web link" msgstr "" -#: ../../include/conversation.php:1136 +#: ../../include/conversation.php:1128 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1129 msgid "video link" msgstr "" -#: ../../include/conversation.php:1138 +#: ../../include/conversation.php:1130 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1131 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1141 +#: ../../include/conversation.php:1133 msgid "set location" msgstr "" -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1135 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1150 +#: ../../include/conversation.php:1142 msgid "permissions" msgstr "" diff --git a/view/head.tpl b/view/head.tpl index e5495b329f..42bd92f4ce 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -39,7 +39,9 @@ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).show(); openMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } function commentClose(obj,id) { if(obj.value == '') { @@ -48,7 +50,9 @@ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).hide(); closeMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } diff --git a/view/theme/frost-mobile/TODO b/view/theme/frost-mobile/TODO index 940d9e588b..0ffd4f8c3b 100644 --- a/view/theme/frost-mobile/TODO +++ b/view/theme/frost-mobile/TODO @@ -12,11 +12,18 @@ Photo album display? - Admin: access to more pages than summary? -- Embedded video playback is way too big +- Find a way to show embedded videos at the normal size for tablets that can handle it + +- Need to find a way to deal with freakin annoying elements that don't respect screen width limits. + Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and + making the rest of the body text overflow the item's borders that is screen-width sensitive (it's + annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems: + - code blocks + - blockquote blocks + - #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags - Needs to be faster! - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items) - - Automatically set limit of 10 items for Network and Profile? diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl index 8496667e13..a849f44593 100644 --- a/view/theme/frost-mobile/head.tpl +++ b/view/theme/frost-mobile/head.tpl @@ -1,7 +1,10 @@ - + + + +