' . "\n";
- if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
- $res['target'] .= '' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '' . "\n";
+ $child = $rawobj[0]['child'];
+ if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+ $res['target'] .= '' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '' . "\n";
}
- if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
- $res['target'] .= '' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '' . "\n";
-
- if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
- $res['target'] .= '' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '' . "\n";
- if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
- $res['target'] .= '' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '' . "\n";
- if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
- $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+ if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+ $res['target'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '' . "\n";
+ if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+ $res['target'] .= '' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '' . "\n";
+ if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+ $res['target'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '' . "\n";
+ if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+ $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
if(! $body)
- $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+ $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
$res['target'] .= '' . xmlify($body) . '' . "\n";
if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -1475,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
if(! $item['deleted'])
logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
- if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+ if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item['object'],false);
$xt = parse_xml_string($item['target'],false);
if($xt->type === ACTIVITY_OBJ_NOTE) {
@@ -2091,7 +2092,7 @@ function local_delivery($importer,$data) {
logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
- if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+ if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item['object'],false);
$xt = parse_xml_string($item['target'],false);
@@ -2229,6 +2230,34 @@ function local_delivery($importer,$data) {
$datarray = get_atom_elements($feed,$item);
+ $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item_id),
+ intval($importer['importer_uid'])
+ );
+
+ // Update content if 'updated' changes
+
+ if(count($r)) {
+ $iid = $r[0]['id'];
+ if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
+ logger('received updated comment' , LOGGER_DEBUG);
+ $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($datarray['title']),
+ dbesc($datarray['body']),
+ dbesc($datarray['tag']),
+ dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+ dbesc($item_id),
+ intval($importer['importer_uid'])
+ );
+
+ proc_run('php',"include/notifier.php","comment-import",$iid);
+
+ }
+
+ continue;
+ }
+
+
// TODO: make this next part work against both delivery threads of a community post
// if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
@@ -2448,7 +2477,7 @@ function local_delivery($importer,$data) {
// find out if our user is involved in this conversation and wants to be notified.
- if($datarray['type'] != 'activity') {
+ if(!x($datarray['type']) || $datarray['type'] != 'activity') {
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
dbesc($parent_uri),
@@ -3020,7 +3049,7 @@ function item_expire($uid,$days) {
function drop_items($items) {
$uid = 0;
- if((! local_user()) && (! $remote_user()))
+ if(! local_user() && ! remote_user())
return;
if(count($items)) {
diff --git a/include/network.php b/include/network.php
index 8c678a443..4bec4a172 100644
--- a/include/network.php
+++ b/include/network.php
@@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
$url_parsed = @parse_url($newurl);
if (isset($url_parsed)) {
$redirects++;
- return fetch_url($newurl,$binary,$redirects,$timeout);
+ return fetch_url($newurl,false,$redirects,$timeout);
}
}
$a->set_curl_code($http_code);
@@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
if(! function_exists('http_status_exit')) {
function http_status_exit($val) {
+ $err = '';
if($val >= 400)
$err = 'Error';
if($val >= 200 && $val < 300)
@@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
logger('lrdd: parse error: ' . $e);
}
- if($dom) {
+ if(isset($dom) && $dom) {
$items = $dom->getElementsByTagName('link');
foreach($items as $item) {
$x = $item->getAttribute('rel');
diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d..a079a4687 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -49,6 +49,7 @@ function get_language() {
if(isset($preferred))
return $preferred;
+ $a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
}}
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 004a58524..bb9850cd0 100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -2,7 +2,7 @@
function advanced_profile(&$a) {
- $o .= '';
+ $o = '';
$o .= '' . t('Profile') . '
';
@@ -69,13 +69,12 @@ function advanced_profile(&$a) {
if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
- }
-
-
- return replace_macros($tpl, array(
- '$title' => t('Profile'),
- '$profile' => $profile,
- ));
+ return replace_macros($tpl, array(
+ '$title' => t('Profile'),
+ '$profile' => $profile,
+ ));
+ }
+ return '';
}
diff --git a/include/security.php b/include/security.php
index fc816e5d7..a92400b5c 100755
--- a/include/security.php
+++ b/include/security.php
@@ -339,6 +339,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
}
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
if (!check_form_security_token($typename, $formname)) {
+ $a = get_app();
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
header('HTTP/1.1 403 Forbidden');
diff --git a/js/main.js b/js/main.js
index 7a90fa910..ac238bf6a 100644
--- a/js/main.js
+++ b/js/main.js
@@ -17,6 +17,7 @@
}
+
var src = null;
var prev = null;
var livetime = null;
@@ -558,12 +559,36 @@ function notifyMarkAll() {
}
+// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
+function fcFileBrowser (field_name, url, type, win) {
+ /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
+ the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
+ These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
+
+
+ var cmsURL = baseurl+"/fbrowser/"+type+"/";
+
+ tinyMCE.activeEditor.windowManager.open({
+ file : cmsURL,
+ title : 'File Browser',
+ width : 420, // Your dimensions may differ - toy around with them!
+ height : 400,
+ resizable : "yes",
+ inline : "yes", // This parameter only has an effect if you use the inlinepopups plugin!
+ close_previous : "no"
+ }, {
+ window : win,
+ input : field_name
+ });
+ return false;
+ }
+
function setupFieldRichtext(){
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: "fieldRichtext",
- plugins : "bbcode,paste",
+ plugins : "bbcode,paste, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@@ -580,6 +605,7 @@ function setupFieldRichtext(){
convert_urls: false,
content_css: baseurl+"/view/custom_tinymce.css",
theme_advanced_path : false,
+ file_browser_callback : "fcFileBrowser",
});
}
diff --git a/mod/admin.php b/mod/admin.php
index 7386dc5a3..cdc45c8e3 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -4,7 +4,11 @@
* Friendica admin
*/
require_once("include/remoteupdate.php");
-
+
+
+/**
+ * @param App $a
+ */
function admin_post(&$a){
@@ -67,6 +71,10 @@ function admin_post(&$a){
return; // NOTREACHED
}
+/**
+ * @param App $a
+ * @return string
+ */
function admin_content(&$a) {
if(!is_site_admin()) {
@@ -74,7 +82,7 @@ function admin_content(&$a) {
}
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
- return;
+ return "";
/**
* Side bar links
@@ -147,6 +155,7 @@ function admin_content(&$a) {
if(is_ajax()) {
echo $o;
killme();
+ return '';
} else {
return $o;
}
@@ -155,6 +164,8 @@ function admin_content(&$a) {
/**
* Admin Summary Page
+ * @param App $a
+ * @return string
*/
function admin_page_summary(&$a) {
$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
@@ -188,12 +199,15 @@ function admin_page_summary(&$a) {
/**
* Admin Site Page
+ * @param App $a
*/
function admin_page_site_post(&$a){
if (!x($_POST,"page_site")){
return;
}
+ check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+
$sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : '');
$banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
$language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
@@ -298,7 +312,7 @@ function admin_page_site_post(&$a){
} else {
set_config('system','directory_submit_url', $global_directory);
}
- set_config('system','directory_search_url', $global_search_url);
+
set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid);
set_config('system','no_regfullname', $no_regfullname);
@@ -317,7 +331,11 @@ function admin_page_site_post(&$a){
return; // NOTREACHED
}
-
+
+/**
+ * @param App $a
+ * @return string
+ */
function admin_page_site(&$a) {
/* Installed langs */
@@ -408,6 +426,7 @@ function admin_page_site(&$a) {
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
+ '$form_security_token' => get_form_security_token("admin_site"),
));
@@ -416,11 +435,15 @@ function admin_page_site(&$a) {
/**
* Users admin page
+ *
+ * @param App $a
*/
function admin_page_users_post(&$a){
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
-
+
+ check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
+
if (x($_POST,'page_users_block')){
foreach($users as $uid){
q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
@@ -452,7 +475,11 @@ function admin_page_users_post(&$a){
goaway($a->get_baseurl(true) . '/admin/users' );
return; // NOTREACHED
}
-
+
+/**
+ * @param App $a
+ * @return string
+ */
function admin_page_users(&$a){
if ($a->argc>2) {
$uid = $a->argv[3];
@@ -460,10 +487,11 @@ function admin_page_users(&$a){
if (count($user)==0){
notice( 'User not found' . EOL);
goaway($a->get_baseurl(true) . '/admin/users' );
- return; // NOTREACHED
+ return ''; // NOTREACHED
}
switch($a->argv[2]){
case "delete":{
+ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
// delete user
require_once("include/Contact.php");
user_remove($uid);
@@ -471,6 +499,7 @@ function admin_page_users(&$a){
notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
}; break;
case "block":{
+ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s",
intval( 1-$user[0]['blocked'] ),
intval( $uid )
@@ -479,7 +508,7 @@ function admin_page_users(&$a){
}; break;
}
goaway($a->get_baseurl(true) . '/admin/users' );
- return; // NOTREACHED
+ return ''; // NOTREACHED
}
@@ -555,6 +584,7 @@ function admin_page_users(&$a){
'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
'$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
+ '$form_security_token' => get_form_security_token("admin_users"),
// values //
'$baseurl' => $a->get_baseurl(true),
@@ -567,10 +597,12 @@ function admin_page_users(&$a){
}
-/*
+/**
* Plugins admin page
+ *
+ * @param App $a
+ * @return string
*/
-
function admin_page_plugins(&$a){
/**
@@ -580,10 +612,12 @@ function admin_page_plugins(&$a){
$plugin = $a->argv[2];
if (!is_file("addon/$plugin/$plugin.php")){
notice( t("Item not found.") );
- return;
+ return '';
}
if (x($_GET,"a") && $_GET['a']=="t"){
+ check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
+
// Toggle plugin status
$idx = array_search($plugin, $a->plugins);
if ($idx !== false){
@@ -597,7 +631,7 @@ function admin_page_plugins(&$a){
}
set_config("system","addon", implode(", ",$a->plugins));
goaway($a->get_baseurl(true) . '/admin/plugins' );
- return; // NOTREACHED
+ return ''; // NOTREACHED
}
// display plugin details
require_once('library/markdown.php');
@@ -641,7 +675,9 @@ function admin_page_plugins(&$a){
'$admin_form' => $admin_form,
'$function' => 'plugins',
'$screenshot' => '',
- '$readme' => $readme
+ '$readme' => $readme,
+
+ '$form_security_token' => get_form_security_token("admin_themes"),
));
}
@@ -670,10 +706,16 @@ function admin_page_plugins(&$a){
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(true),
'$function' => 'plugins',
- '$plugins' => $plugins
+ '$plugins' => $plugins,
+ '$form_security_token' => get_form_security_token("admin_themes"),
));
}
+/**
+ * @param array $themes
+ * @param string $th
+ * @param int $result
+ */
function toggle_theme(&$themes,$th,&$result) {
for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) {
@@ -689,6 +731,11 @@ function toggle_theme(&$themes,$th,&$result) {
}
}
+/**
+ * @param array $themes
+ * @param string $th
+ * @return int
+ */
function theme_status($themes,$th) {
for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) {
@@ -702,9 +749,12 @@ function theme_status($themes,$th) {
}
return 0;
}
-
+/**
+ * @param array $themes
+ * @return string
+ */
function rebuild_theme_table($themes) {
$o = '';
if(count($themes)) {
@@ -720,10 +770,12 @@ function rebuild_theme_table($themes) {
}
-/*
+/**
* Themes admin page
+ *
+ * @param App $a
+ * @return string
*/
-
function admin_page_themes(&$a){
$allowed_themes_str = get_config('system','allowed_themes');
@@ -740,7 +792,7 @@ function admin_page_themes(&$a){
foreach($files as $file) {
$f = basename($file);
$is_experimental = intval(file_exists($file . '/experimental'));
- $is_unsupported = 1-(intval(file_exists($file . '/unsupported')));
+ $is_supported = 1-(intval(file_exists($file . '/unsupported'))); // Is not used yet
$is_allowed = intval(in_array($f,$allowed_themes));
$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
}
@@ -748,7 +800,7 @@ function admin_page_themes(&$a){
if(! count($themes)) {
notice( t('No themes found.'));
- return;
+ return '';
}
/**
@@ -759,10 +811,11 @@ function admin_page_themes(&$a){
$theme = $a->argv[2];
if(! is_dir("view/theme/$theme")){
notice( t("Item not found.") );
- return;
+ return '';
}
if (x($_GET,"a") && $_GET['a']=="t"){
+ check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
// Toggle theme status
@@ -775,7 +828,7 @@ function admin_page_themes(&$a){
set_config('system','allowed_themes',$s);
goaway($a->get_baseurl(true) . '/admin/themes' );
- return; // NOTREACHED
+ return ''; // NOTREACHED
}
// display theme details
@@ -826,7 +879,9 @@ function admin_page_themes(&$a){
'$str_author' => t('Author: '),
'$str_maintainer' => t('Maintainer: '),
'$screenshot' => $screenshot,
- '$readme' => $readme
+ '$readme' => $readme,
+
+ '$form_security_token' => get_form_security_token("admin_themes"),
));
}
@@ -852,17 +907,21 @@ function admin_page_themes(&$a){
'$function' => 'themes',
'$plugins' => $xthemes,
'$experimental' => t('[Experimental]'),
- '$unsupported' => t('[Unsupported]')
+ '$unsupported' => t('[Unsupported]'),
+ '$form_security_token' => get_form_security_token("admin_themes"),
));
}
/**
* Logs admin page
+ *
+ * @param App $a
*/
function admin_page_logs_post(&$a) {
if (x($_POST,"page_logs")) {
+ check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
$logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : '');
$debugging = ((x($_POST,'debugging')) ? true : false);
@@ -879,7 +938,11 @@ function admin_page_logs_post(&$a) {
goaway($a->get_baseurl(true) . '/admin/logs' );
return; // NOTREACHED
}
-
+
+/**
+ * @param App $a
+ * @return string
+ */
function admin_page_logs(&$a){
$log_choices = Array(
@@ -937,9 +1000,14 @@ readable.");
'$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""),
'$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
'$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
+
+ '$form_security_token' => get_form_security_token("admin_logs"),
));
}
+/**
+ * @param App $a
+ */
function admin_page_remoteupdate_post(&$a) {
// this function should be called via ajax post
if(!is_site_admin()) {
@@ -958,6 +1026,10 @@ function admin_page_remoteupdate_post(&$a) {
killme();
}
+/**
+ * @param App $a
+ * @return string
+ */
function admin_page_remoteupdate(&$a) {
if(!is_site_admin()) {
return login(false);
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
new file mode 100644
index 000000000..66ff9252e
--- /dev/null
+++ b/mod/fbrowser.php
@@ -0,0 +1,99 @@
+
+ */
+
+/**
+ * @param App $a
+ */
+function fbrowser_content($a){
+
+ if (!local_user())
+ killme();
+
+ if ($a->argc==1)
+ killme();
+
+ //echo ""; var_dump($a->argv); killme();
+
+ switch($a->argv[1]){
+ case "image":
+ $path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+ $albums = false;
+ $sql_extra = "";
+ $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+
+ if ($a->argc==2){
+ $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
+ intval(local_user())
+ );
+ // anon functions only from 5.3.0... meglio tardi che mai..
+ function folder1($el){return array(bin2hex($el['album']),$el['album']);}
+ $albums = array_map( "folder1" , $albums);
+
+ }
+
+ $album = "";
+ if ($a->argc==3){
+ $album = hex2bin($a->argv[2]);
+ $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+ $sql_extra2 = "";
+ $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+ }
+
+ $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
+ FROM `photo` WHERE `uid` = %d $sql_extra
+ GROUP BY `resource-id` $sql_extra2",
+ intval(local_user())
+ );
+
+
+ function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg'); }
+ $files = array_map("files1", $r);
+
+ $tpl = get_markup_template("filebrowser.tpl");
+ echo replace_macros($tpl, array(
+ '$type' => 'image',
+ '$baseurl' => $a->get_baseurl(),
+ '$path' => $path,
+ '$folders' => $albums,
+ '$files' =>$files,
+ ));
+
+
+ break;
+ case "file":
+ if ($a->argc==2){
+ $files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+ intval(local_user())
+ );
+
+ function files2($rr){ global $a;
+ list($m1,$m2) = explode("/",$rr['filetype']);
+ $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+ return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
+ }
+ $files = array_map("files2", $files);
+ //echo ""; var_dump($files); killme();
+
+
+ $tpl = get_markup_template("filebrowser.tpl");
+ echo replace_macros($tpl, array(
+ '$type' => 'file',
+ '$baseurl' => $a->get_baseurl(),
+ '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+ '$folders' => false,
+ '$files' =>$files,
+ ));
+
+ }
+
+ break;
+ }
+
+
+ killme();
+
+}
diff --git a/mod/install.php b/mod/install.php
index 2eb98ee91..6f5552076 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -380,9 +380,9 @@ function check_funcs(&$checks) {
if(function_exists('apache_get_modules')){
if (! in_array('mod_rewrite',apache_get_modules())) {
- check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+ check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
} else {
- check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+ check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
}
}
if(! function_exists('curl_init')){
@@ -464,3 +464,6 @@ function load_database($db) {
}
return $errors;
}
+
+
+
diff --git a/mod/photo.php b/mod/photo.php
index ec53af899..1d38fe8e4 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -170,7 +170,7 @@ function photo_init(&$a) {
}
// Writing in cachefile
- if ($cachefile != '')
+ if (isset($cachefile) && $cachefile != '')
file_put_contents($cachefile, $data);
if(function_exists('header_remove')) {
diff --git a/mod/photos.php b/mod/photos.php
index 2a808cb41..8da94841e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -330,7 +330,6 @@ function photos_post(&$a) {
// Create item container
$title = '';
- $basename = basename($filename);
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
$arr = array();
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index bee7c29dc..03d9f5105 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -98,8 +98,13 @@ function wall_attach_post(&$a) {
killme();
}
- echo '
[attachment]' . $r[0]['id'] . '[/attachment]' . '
';
+ $lf = '
';
+ if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+ $lf = "\n";
+
+ echo $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+
killme();
// NOTREACHED
}
diff --git a/util/messages.po b/util/messages.po
index 46011deed..d499f45dd 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1312\n"
+"Project-Id-Version: 2.3.1318\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-14 10:00-0700\n"
+"POT-Creation-Date: 2012-04-20 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
#: ../../mod/editpost.php:10 ../../mod/install.php:171
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
#: ../../mod/settings.php:99 ../../mod/settings.php:514
@@ -55,7 +55,7 @@ msgstr ""
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../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:461 ../../include/items.php:3142
+#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
#: ../../index.php:309
msgid "Permission denied."
msgstr ""
@@ -86,7 +86,7 @@ msgid "Return to contact editor"
msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:534
-#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553
+#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582
msgid "Name"
msgstr ""
@@ -123,17 +123,17 @@ msgid "New photo from this URL"
msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959
-#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
-#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
#: ../../mod/install.php:251 ../../mod/install.php:289
#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
#: ../../mod/settings.php:532 ../../mod/settings.php:678
#: ../../mod/settings.php:739 ../../mod/settings.php:930
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
-#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
-#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
+#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905
+#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/planets/planets.php:158
#: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -142,9 +142,10 @@ msgstr ""
#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/gravatar/gravatar.php:86
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:302
#: ../../addon/statusnet/statusnet.php:278
#: ../../addon/statusnet/statusnet.php:292
#: ../../addon/statusnet/statusnet.php:318
@@ -157,11 +158,15 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/diabook-red/config.php:64
-#: ../../view/theme/diabook-blue/config.php:64
-#: ../../view/theme/diabook/config.php:64
+#: ../../view/theme/diabook-red/config.php:76
+#: ../../view/theme/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-red/config.php:76
+#: ../../view/theme/diabook/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-aerith/config.php:76
+#: ../../view/theme/diabook/diabook-pink/config.php:76
+#: ../../view/theme/diabook/config.php:87
#: ../../view/theme/quattro/config.php:52
-#: ../../view/theme/diabook-aerith/config.php:64
+#: ../../view/theme/diabook-aerith/config.php:76
#: ../../include/conversation.php:555
msgid "Submit"
msgstr ""
@@ -220,11 +225,15 @@ msgstr ""
msgid "link to source"
msgstr ""
-#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
-#: ../../boot.php:1470
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231
+#: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
+#: ../../boot.php:1471
msgid "Events"
msgstr ""
@@ -274,7 +283,7 @@ msgid "Description:"
msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1082
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
msgid "Location:"
msgstr ""
@@ -353,17 +362,21 @@ msgstr ""
msgid "Photo Albums"
msgstr ""
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
-#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
-#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook-red/theme.php:113
-#: ../../view/theme/diabook-blue/theme.php:113
-#: ../../view/theme/diabook/theme.php:117
-#: ../../view/theme/diabook-aerith/theme.php:114
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
+#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook-red/theme.php:115
+#: ../../view/theme/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/diabook-red/theme.php:115
+#: ../../view/theme/diabook/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/theme.php:128
+#: ../../view/theme/diabook/diabook-aerith/theme.php:116
+#: ../../view/theme/diabook/diabook-pink/theme.php:116
+#: ../../view/theme/diabook-aerith/theme.php:116
msgid "Contact Photos"
msgstr ""
-#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
msgid "Upload New Photos"
msgstr ""
@@ -375,17 +388,21 @@ msgstr ""
msgid "Contact information unavailable"
msgstr ""
-#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:335
#: ../../mod/register.php:342 ../../mod/register.php:349
#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook-red/theme.php:114
-#: ../../view/theme/diabook-blue/theme.php:114
-#: ../../view/theme/diabook/theme.php:118
-#: ../../view/theme/diabook-aerith/theme.php:115
+#: ../../view/theme/diabook-red/theme.php:116
+#: ../../view/theme/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/diabook-red/theme.php:116
+#: ../../view/theme/diabook/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/diabook-aerith/theme.php:117
+#: ../../view/theme/diabook/diabook-pink/theme.php:117
+#: ../../view/theme/diabook-aerith/theme.php:117
msgid "Profile Photos"
msgstr ""
@@ -393,191 +410,195 @@ msgstr ""
msgid "Album not found."
msgstr ""
-#: ../../mod/photos.php:179 ../../mod/photos.php:960
+#: ../../mod/photos.php:179 ../../mod/photos.php:959
msgid "Delete Album"
msgstr ""
-#: ../../mod/photos.php:242 ../../mod/photos.php:1195
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194
msgid "Delete Photo"
msgstr ""
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
msgid "was tagged in a"
msgstr ""
-#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook-red/theme.php:85
-#: ../../view/theme/diabook-blue/theme.php:85
-#: ../../view/theme/diabook/theme.php:89
-#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
+#: ../../view/theme/diabook-red/theme.php:87
+#: ../../view/theme/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/diabook-red/theme.php:87
+#: ../../view/theme/diabook/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/theme.php:100
+#: ../../view/theme/diabook/diabook-aerith/theme.php:88
+#: ../../view/theme/diabook/diabook-pink/theme.php:88
+#: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
msgstr ""
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
msgid "by"
msgstr ""
-#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
msgid "Image exceeds size limit of "
msgstr ""
-#: ../../mod/photos.php:640
+#: ../../mod/photos.php:639
msgid "Image file is empty."
msgstr ""
-#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
#: ../../mod/wall_upload.php:69
msgid "Unable to process image."
msgstr ""
-#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
#: ../../mod/wall_upload.php:88
msgid "Image upload failed."
msgstr ""
-#: ../../mod/photos.php:760 ../../mod/community.php:16
+#: ../../mod/photos.php:759 ../../mod/community.php:16
#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied."
msgstr ""
-#: ../../mod/photos.php:770
+#: ../../mod/photos.php:769
msgid "No photos selected"
msgstr ""
-#: ../../mod/photos.php:847
+#: ../../mod/photos.php:846
msgid "Access to this item is restricted."
msgstr ""
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:907
msgid "Upload Photos"
msgstr ""
-#: ../../mod/photos.php:911 ../../mod/photos.php:955
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
msgid "New album name: "
msgstr ""
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:911
msgid "or existing album name: "
msgstr ""
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:912
msgid "Do not show a status post for this upload"
msgstr ""
-#: ../../mod/photos.php:915 ../../mod/photos.php:1190
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189
msgid "Permissions"
msgstr ""
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:969
msgid "Edit Album"
msgstr ""
-#: ../../mod/photos.php:985 ../../mod/photos.php:1408
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407
msgid "View Photo"
msgstr ""
-#: ../../mod/photos.php:1020
+#: ../../mod/photos.php:1019
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
-#: ../../mod/photos.php:1022
+#: ../../mod/photos.php:1021
msgid "Photo not available"
msgstr ""
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
msgid "View photo"
msgstr ""
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
msgid "Edit photo"
msgstr ""
-#: ../../mod/photos.php:1073
+#: ../../mod/photos.php:1072
msgid "Use as profile photo"
msgstr ""
-#: ../../mod/photos.php:1079 ../../include/conversation.php:480
+#: ../../mod/photos.php:1078 ../../include/conversation.php:480
msgid "Private Message"
msgstr ""
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1100
msgid "View Full Size"
msgstr ""
-#: ../../mod/photos.php:1169
+#: ../../mod/photos.php:1168
msgid "Tags: "
msgstr ""
-#: ../../mod/photos.php:1172
+#: ../../mod/photos.php:1171
msgid "[Remove any tag]"
msgstr ""
-#: ../../mod/photos.php:1183
+#: ../../mod/photos.php:1182
msgid "New album name"
msgstr ""
-#: ../../mod/photos.php:1186
+#: ../../mod/photos.php:1185
msgid "Caption"
msgstr ""
-#: ../../mod/photos.php:1188
+#: ../../mod/photos.php:1187
msgid "Add a Tag"
msgstr ""
-#: ../../mod/photos.php:1192
+#: ../../mod/photos.php:1191
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
-#: ../../mod/photos.php:1212 ../../include/conversation.php:529
+#: ../../mod/photos.php:1211 ../../include/conversation.php:529
msgid "I like this (toggle)"
msgstr ""
-#: ../../mod/photos.php:1213 ../../include/conversation.php:530
+#: ../../mod/photos.php:1212 ../../include/conversation.php:530
msgid "I don't like this (toggle)"
msgstr ""
-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1213 ../../include/conversation.php:956
msgid "Share"
msgstr ""
-#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
-#: ../../mod/message.php:357 ../../include/conversation.php:362
-#: ../../include/conversation.php:702 ../../include/conversation.php:979
+#: ../../mod/message.php:357 ../../include/conversation.php:361
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
msgid "Please wait"
msgstr ""
-#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
-#: ../../mod/photos.php:1302 ../../include/conversation.php:552
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:552
msgid "This is you"
msgstr ""
-#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
-#: ../../mod/photos.php:1304 ../../include/conversation.php:554
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:554
#: ../../boot.php:495
msgid "Comment"
msgstr ""
-#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:997
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
msgid "Preview"
msgstr ""
-#: ../../mod/photos.php:1332 ../../mod/settings.php:595
-#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
+#: ../../mod/photos.php:1331 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577
#: ../../include/conversation.php:318 ../../include/conversation.php:576
msgid "Delete"
msgstr ""
-#: ../../mod/photos.php:1414
+#: ../../mod/photos.php:1413
msgid "View Album"
msgstr ""
-#: ../../mod/photos.php:1423
+#: ../../mod/photos.php:1422
msgid "Recent Photos"
msgstr ""
@@ -585,10 +606,14 @@ msgstr ""
msgid "Not available."
msgstr ""
-#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
-#: ../../view/theme/diabook-blue/theme.php:245
-#: ../../view/theme/diabook/theme.php:253
-#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233
+#: ../../view/theme/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:233
+#: ../../view/theme/diabook/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-aerith/theme.php:235
+#: ../../view/theme/diabook/diabook-pink/theme.php:235
+#: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101
msgid "Community"
msgstr ""
@@ -636,7 +661,7 @@ msgstr ""
msgid "Edit post"
msgstr ""
-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
msgid "Post to Email"
msgstr ""
@@ -647,17 +672,17 @@ msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
#: ../../mod/message.php:186 ../../mod/message.php:355
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:957
msgid "Upload photo"
msgstr ""
-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
msgid "Attach file"
msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
#: ../../mod/message.php:187 ../../mod/message.php:356
-#: ../../include/conversation.php:965
+#: ../../include/conversation.php:961
msgid "Insert web link"
msgstr ""
@@ -673,35 +698,35 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
msgid "Set your location"
msgstr ""
-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
msgid "Clear browser location"
msgstr ""
-#: ../../mod/editpost.php:105 ../../include/conversation.php:980
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
msgid "Permission settings"
msgstr ""
-#: ../../mod/editpost.php:113 ../../include/conversation.php:989
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
msgid "CC: email addresses"
msgstr ""
-#: ../../mod/editpost.php:114 ../../include/conversation.php:990
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
msgid "Public post"
msgstr ""
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
msgid "Set title"
msgstr ""
-#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../mod/editpost.php:120 ../../include/conversation.php:992
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
@@ -818,7 +843,7 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691
msgid "[Name Withheld]"
msgstr ""
@@ -1066,7 +1091,7 @@ msgid "mb_string PHP module"
msgstr ""
#: ../../mod/install.php:383 ../../mod/install.php:385
-msgid "Apace mod_rewrite module"
+msgid "Apache mod_rewrite module"
msgstr ""
#: ../../mod/install.php:383
@@ -1181,7 +1206,7 @@ msgid "is interested in:"
msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1026
+#: ../../include/contact_widgets.php:9 ../../boot.php:1027
msgid "Connect"
msgstr ""
@@ -1229,10 +1254,14 @@ msgstr ""
msgid "Personal"
msgstr ""
-#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227
+#: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77
#: ../../include/nav.php:115
msgid "Home"
msgstr ""
@@ -1281,7 +1310,7 @@ msgid "if applicable"
msgstr ""
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:575
msgid "Approve"
msgstr ""
@@ -1478,12 +1507,12 @@ msgid "View all contacts"
msgstr ""
#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:579
msgid "Unblock"
msgstr ""
#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
-#: ../../mod/admin.php:549
+#: ../../mod/admin.php:578
msgid "Block"
msgstr ""
@@ -1552,7 +1581,7 @@ msgstr ""
msgid "Update public posts"
msgstr ""
-#: ../../mod/contacts.php:347 ../../mod/admin.php:979
+#: ../../mod/contacts.php:347 ../../mod/admin.php:1051
msgid "Update now"
msgstr ""
@@ -1609,10 +1638,14 @@ msgstr ""
msgid "Edit contact"
msgstr ""
-#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229
+#: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139
msgid "Contacts"
msgstr ""
@@ -1645,9 +1678,9 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:388 ../../mod/register.php:442
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:622
-#: ../../addon/facebook/facebook.php:1076
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
+#: ../../addon/facebook/facebook.php:650
+#: ../../addon/facebook/facebook.php:1136
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
msgid "Administrator"
msgstr ""
@@ -1725,8 +1758,8 @@ msgstr ""
msgid "Export personal data"
msgstr ""
-#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
-#: ../../include/nav.php:137
+#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
msgid "Settings"
msgstr ""
@@ -1735,7 +1768,7 @@ msgid "Missing some important data!"
msgstr ""
#: ../../mod/settings.php:129 ../../mod/settings.php:558
-#: ../../mod/admin.php:89
+#: ../../mod/admin.php:97
msgid "Update"
msgstr ""
@@ -1779,10 +1812,11 @@ msgstr ""
msgid " Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
#: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
msgid "Settings updated."
msgstr ""
@@ -1952,7 +1986,7 @@ msgstr ""
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522
+#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551
msgid "Normal Account"
msgstr ""
@@ -1960,7 +1994,7 @@ msgstr ""
msgid "This account is a normal personal profile"
msgstr ""
-#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523
+#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552
msgid "Soapbox Account"
msgstr ""
@@ -1968,7 +2002,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr ""
-#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524
+#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553
msgid "Community/Celebrity Account"
msgstr ""
@@ -1976,7 +2010,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr ""
-#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525
+#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554
msgid "Automatic Friend Account"
msgstr ""
@@ -2274,12 +2308,12 @@ msgstr ""
msgid "Invalid contact."
msgstr ""
-#: ../../mod/notes.php:44 ../../boot.php:1475
+#: ../../mod/notes.php:44 ../../boot.php:1476
msgid "Personal Notes"
msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652
msgid "Save"
msgstr ""
@@ -2313,7 +2347,7 @@ msgid "No recipient."
msgstr ""
#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
-#: ../../include/conversation.php:914
+#: ../../include/conversation.php:910
msgid "Please enter a link URL:"
msgstr ""
@@ -2521,12 +2555,16 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:241
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
-#: ../../include/nav.php:50 ../../boot.php:1457
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228
+#: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../view/theme/diabook-aerith/theme.php:230
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
+#: ../../include/nav.php:50 ../../boot.php:1458
msgid "Profile"
msgstr ""
@@ -2675,7 +2713,7 @@ msgstr ""
msgid "Your invitation ID: "
msgstr ""
-#: ../../mod/register.php:553 ../../mod/admin.php:375
+#: ../../mod/register.php:553 ../../mod/admin.php:393
msgid "Registration"
msgstr ""
@@ -2707,28 +2745,41 @@ msgid "People Search"
msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1549
+#: ../../addon/facebook/facebook.php:1655
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook-red/theme.php:80
-#: ../../view/theme/diabook-red/theme.php:89
-#: ../../view/theme/diabook-blue/theme.php:80
-#: ../../view/theme/diabook-blue/theme.php:89
-#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93
-#: ../../view/theme/diabook-aerith/theme.php:81
-#: ../../view/theme/diabook-aerith/theme.php:90
+#: ../../view/theme/diabook-red/theme.php:82
+#: ../../view/theme/diabook-red/theme.php:91
+#: ../../view/theme/diabook-blue/theme.php:82
+#: ../../view/theme/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/diabook-red/theme.php:82
+#: ../../view/theme/diabook/diabook-red/theme.php:91
+#: ../../view/theme/diabook/diabook-blue/theme.php:82
+#: ../../view/theme/diabook/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook/theme.php:104
+#: ../../view/theme/diabook/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook/diabook-aerith/theme.php:92
+#: ../../view/theme/diabook/diabook-pink/theme.php:83
+#: ../../view/theme/diabook/diabook-pink/theme.php:92
+#: ../../view/theme/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook-aerith/theme.php:92
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130
msgid "status"
msgstr ""
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook-red/theme.php:94
-#: ../../view/theme/diabook-blue/theme.php:94
-#: ../../view/theme/diabook/theme.php:98
-#: ../../view/theme/diabook-aerith/theme.php:95
+#: ../../view/theme/diabook-red/theme.php:96
+#: ../../view/theme/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/diabook-red/theme.php:96
+#: ../../view/theme/diabook/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/theme.php:109
+#: ../../view/theme/diabook/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook/diabook-pink/theme.php:97
+#: ../../view/theme/diabook-aerith/theme.php:97
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -2739,9 +2790,9 @@ msgstr ""
msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
-#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3054
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149
+#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3083
msgid "Item not found."
msgstr ""
@@ -2749,6 +2800,22 @@ msgstr ""
msgid "Access denied."
msgstr ""
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230
+#: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
+#: ../../boot.php:1463
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/fbrowser.php:86
+msgid "Files"
+msgstr ""
+
#: ../../mod/regmod.php:61
msgid "Account approved."
msgstr ""
@@ -2958,493 +3025,493 @@ msgstr ""
msgid "No friends to display."
msgstr ""
-#: ../../mod/admin.php:51
+#: ../../mod/admin.php:55
msgid "Theme settings updated."
msgstr ""
-#: ../../mod/admin.php:85 ../../mod/admin.php:373
+#: ../../mod/admin.php:93 ../../mod/admin.php:391
msgid "Site"
msgstr ""
-#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552
+#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669
+#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849
+#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904
msgid "Themes"
msgstr ""
-#: ../../mod/admin.php:103 ../../mod/admin.php:929
+#: ../../mod/admin.php:111 ../../mod/admin.php:992
msgid "Logs"
msgstr ""
-#: ../../mod/admin.php:108
+#: ../../mod/admin.php:116
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
-#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
-#: ../../mod/admin.php:848 ../../mod/admin.php:928
+#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568
+#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867
+#: ../../mod/admin.php:903 ../../mod/admin.php:991
msgid "Administration"
msgstr ""
-#: ../../mod/admin.php:178
+#: ../../mod/admin.php:189
msgid "Summary"
msgstr ""
-#: ../../mod/admin.php:179
+#: ../../mod/admin.php:190
msgid "Registered users"
msgstr ""
-#: ../../mod/admin.php:181
+#: ../../mod/admin.php:192
msgid "Pending registrations"
msgstr ""
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:193
msgid "Version"
msgstr ""
-#: ../../mod/admin.php:184
+#: ../../mod/admin.php:195
msgid "Active plugins"
msgstr ""
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:329
msgid "Site settings updated."
msgstr ""
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:377
msgid "Closed"
msgstr ""
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:378
msgid "Requires approval"
msgstr ""
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:379
msgid "Open"
msgstr ""
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:383
msgid "No SSL policy, links will track page SSL state"
msgstr ""
-#: ../../mod/admin.php:366
+#: ../../mod/admin.php:384
msgid "Force all links to use SSL"
msgstr ""
-#: ../../mod/admin.php:367
+#: ../../mod/admin.php:385
msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr ""
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:394
msgid "File upload"
msgstr ""
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:395
msgid "Policies"
msgstr ""
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:396
msgid "Advanced"
msgstr ""
-#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544
msgid "Site name"
msgstr ""
-#: ../../mod/admin.php:383
+#: ../../mod/admin.php:401
msgid "Banner/Logo"
msgstr ""
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:402
msgid "System language"
msgstr ""
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:403
msgid "System theme"
msgstr ""
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:403
msgid ""
"Default system theme - may be over-ridden by user profiles - change theme settings"
msgstr ""
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:404
msgid "SSL link policy"
msgstr ""
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:404
msgid "Determines whether generated links should be forced to use SSL"
msgstr ""
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:405
msgid "Maximum image size"
msgstr ""
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:405
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:407
msgid "Register policy"
msgstr ""
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:408
msgid "Register text"
msgstr ""
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:408
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:409
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:409
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:410
msgid "Allowed friend domains"
msgstr ""
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:410
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:393
+#: ../../mod/admin.php:411
msgid "Allowed email domains"
msgstr ""
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:411
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:394
+#: ../../mod/admin.php:412
msgid "Block public"
msgstr ""
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:412
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:395
+#: ../../mod/admin.php:413
msgid "Force publish"
msgstr ""
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:413
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:414
msgid "Global directory update URL"
msgstr ""
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:414
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:398
+#: ../../mod/admin.php:416
msgid "Block multiple registrations"
msgstr ""
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:416
msgid "Disallow users to register additional accounts for use as pages."
msgstr ""
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:417
msgid "OpenID support"
msgstr ""
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:417
msgid "OpenID support for registration and logins."
msgstr ""
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:418
msgid "Fullname check"
msgstr ""
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:418
msgid ""
"Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure"
msgstr ""
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:419
msgid "UTF-8 Regular expressions"
msgstr ""
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:419
msgid "Use PHP UTF8 regular expressions"
msgstr ""
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:420
msgid "Show Community Page"
msgstr ""
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:420
msgid ""
"Display a Community page showing all recent public postings on this site."
msgstr ""
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:421
msgid "Enable OStatus support"
msgstr ""
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:421
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:404
+#: ../../mod/admin.php:422
msgid "Enable Diaspora support"
msgstr ""
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:422
msgid "Provide built-in Diaspora network compatibility."
msgstr ""
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:423
msgid "Only allow Friendica contacts"
msgstr ""
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:423
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr ""
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:424
msgid "Verify SSL"
msgstr ""
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:424
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:407
+#: ../../mod/admin.php:425
msgid "Proxy user"
msgstr ""
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:426
msgid "Proxy URL"
msgstr ""
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:427
msgid "Network timeout"
msgstr ""
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:427
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:453
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:460
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:499
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:507
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:507
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:571
msgid "select all"
msgstr ""
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:572
msgid "User registrations waiting for confirm"
msgstr ""
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:573
msgid "Request date"
msgstr ""
-#: ../../mod/admin.php:544 ../../mod/admin.php:553
+#: ../../mod/admin.php:573 ../../mod/admin.php:582
#: ../../include/contact_selectors.php:79
msgid "Email"
msgstr ""
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:574
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:576
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
msgid "Register date"
msgstr ""
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
msgid "Last login"
msgstr ""
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
msgid "Last item"
msgstr ""
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
msgid "Account"
msgstr ""
-#: ../../mod/admin.php:555
+#: ../../mod/admin.php:584
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:556
+#: ../../mod/admin.php:585
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:592
+#: ../../mod/admin.php:626
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:596
+#: ../../mod/admin.php:630
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:606 ../../mod/admin.php:785
+#: ../../mod/admin.php:640 ../../mod/admin.php:838
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:608 ../../mod/admin.php:787
+#: ../../mod/admin.php:642 ../../mod/admin.php:840
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:630 ../../mod/admin.php:816
+#: ../../mod/admin.php:664 ../../mod/admin.php:869
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:638 ../../mod/admin.php:826
+#: ../../mod/admin.php:672 ../../mod/admin.php:879
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:639 ../../mod/admin.php:827
+#: ../../mod/admin.php:673 ../../mod/admin.php:880
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:802
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:861
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:909
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:910
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:878
+#: ../../mod/admin.php:937
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:931
+#: ../../mod/admin.php:994
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:937
+#: ../../mod/admin.php:1000
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:938
+#: ../../mod/admin.php:1001
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:938
+#: ../../mod/admin.php:1001
msgid ""
"Must be writable by web server. Relative to your Friendica top-level "
"directory."
msgstr ""
-#: ../../mod/admin.php:939
+#: ../../mod/admin.php:1002
msgid "Log level"
msgstr ""
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:1052
msgid "Close"
msgstr ""
-#: ../../mod/admin.php:986
+#: ../../mod/admin.php:1058
msgid "FTP Host"
msgstr ""
-#: ../../mod/admin.php:987
+#: ../../mod/admin.php:1059
msgid "FTP Path"
msgstr ""
-#: ../../mod/admin.php:988
+#: ../../mod/admin.php:1060
msgid "FTP User"
msgstr ""
-#: ../../mod/admin.php:989
+#: ../../mod/admin.php:1061
msgid "FTP Password"
msgstr ""
-#: ../../mod/profile.php:20 ../../boot.php:939
+#: ../../mod/profile.php:21 ../../boot.php:940
msgid "Requested profile is not available."
msgstr ""
-#: ../../mod/profile.php:123 ../../mod/display.php:75
+#: ../../mod/profile.php:124 ../../mod/display.php:75
msgid "Access to this profile has been restricted."
msgstr ""
-#: ../../mod/profile.php:144
+#: ../../mod/profile.php:145
msgid "Tips for New Members"
msgstr ""
@@ -3825,27 +3892,27 @@ msgstr ""
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:585 ../../boot.php:1048
+#: ../../mod/profiles.php:585 ../../boot.php:1049
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:586 ../../boot.php:1049
+#: ../../mod/profiles.php:586 ../../boot.php:1050
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:597 ../../boot.php:1059
+#: ../../mod/profiles.php:597 ../../boot.php:1060
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:599 ../../boot.php:1062
+#: ../../mod/profiles.php:599 ../../boot.php:1063
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:600 ../../boot.php:1063
+#: ../../mod/profiles.php:600 ../../boot.php:1064
msgid "Edit visibility"
msgstr ""
-#: ../../mod/filer.php:29 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
msgid "Save to Folder:"
msgstr ""
@@ -3893,10 +3960,14 @@ msgstr ""
msgid "No entries."
msgstr ""
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
-#: ../../view/theme/diabook-blue/theme.php:149
-#: ../../view/theme/diabook/theme.php:153
-#: ../../view/theme/diabook-aerith/theme.php:150
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143
+#: ../../view/theme/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/diabook-red/theme.php:143
+#: ../../view/theme/diabook/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/diabook-aerith/theme.php:145
+#: ../../view/theme/diabook/diabook-pink/theme.php:145
+#: ../../view/theme/diabook-aerith/theme.php:145
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@@ -3911,10 +3982,14 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
-#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
-#: ../../view/theme/diabook-blue/theme.php:147
-#: ../../view/theme/diabook/theme.php:151
-#: ../../view/theme/diabook-aerith/theme.php:148
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141
+#: ../../view/theme/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/diabook-red/theme.php:141
+#: ../../view/theme/diabook/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook/diabook-pink/theme.php:143
+#: ../../view/theme/diabook-aerith/theme.php:143
msgid "Global Directory"
msgstr ""
@@ -4100,71 +4175,71 @@ msgstr ""
msgid "Connection accepted at %s"
msgstr ""
-#: ../../addon/facebook/facebook.php:467
+#: ../../addon/facebook/facebook.php:490
msgid "Facebook disabled"
msgstr ""
-#: ../../addon/facebook/facebook.php:472
+#: ../../addon/facebook/facebook.php:495
msgid "Updating contacts"
msgstr ""
-#: ../../addon/facebook/facebook.php:493
+#: ../../addon/facebook/facebook.php:515
msgid "Facebook API key is missing."
msgstr ""
-#: ../../addon/facebook/facebook.php:500
+#: ../../addon/facebook/facebook.php:522
msgid "Facebook Connect"
msgstr ""
-#: ../../addon/facebook/facebook.php:506
+#: ../../addon/facebook/facebook.php:528
msgid "Install Facebook connector for this account."
msgstr ""
-#: ../../addon/facebook/facebook.php:513
+#: ../../addon/facebook/facebook.php:535
msgid "Remove Facebook connector"
msgstr ""
-#: ../../addon/facebook/facebook.php:518
+#: ../../addon/facebook/facebook.php:540
msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]"
msgstr ""
-#: ../../addon/facebook/facebook.php:525
+#: ../../addon/facebook/facebook.php:547
msgid "Post to Facebook by default"
msgstr ""
-#: ../../addon/facebook/facebook.php:529
+#: ../../addon/facebook/facebook.php:551
msgid "Link all your Facebook friends and conversations on this website"
msgstr ""
-#: ../../addon/facebook/facebook.php:531
+#: ../../addon/facebook/facebook.php:553
msgid ""
"Facebook conversations consist of your profile wall and your friend "
"stream."
msgstr ""
-#: ../../addon/facebook/facebook.php:532
+#: ../../addon/facebook/facebook.php:554
msgid "On this website, your Facebook friend stream is only visible to you."
msgstr ""
-#: ../../addon/facebook/facebook.php:533
+#: ../../addon/facebook/facebook.php:555
msgid ""
"The following settings determine the privacy of your Facebook profile wall "
"on this website."
msgstr ""
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:559
msgid ""
"On this website your Facebook profile wall conversations will only be "
"visible to you"
msgstr ""
-#: ../../addon/facebook/facebook.php:542
+#: ../../addon/facebook/facebook.php:564
msgid "Do not import your Facebook profile wall conversations"
msgstr ""
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:566
msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, "
"your Facebook profile wall will be merged with your profile wall on this "
@@ -4172,114 +4247,114 @@ msgid ""
"who may see the conversations."
msgstr ""
-#: ../../addon/facebook/facebook.php:549
+#: ../../addon/facebook/facebook.php:571
msgid "Comma separated applications to ignore"
msgstr ""
-#: ../../addon/facebook/facebook.php:620
+#: ../../addon/facebook/facebook.php:648
msgid "Problems with Facebook Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:644
+#: ../../addon/facebook/facebook.php:675
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:645
+#: ../../addon/facebook/facebook.php:676
msgid "Facebook Connector Settings"
msgstr ""
-#: ../../addon/facebook/facebook.php:656
+#: ../../addon/facebook/facebook.php:691
msgid "Facebook API Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:700
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ."
"htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.
"
msgstr ""
-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:705
msgid ""
"Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)."
msgstr ""
-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:707
msgid "The given API Key seems to work correctly."
msgstr ""
-#: ../../addon/facebook/facebook.php:674
+#: ../../addon/facebook/facebook.php:709
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr ""
-#: ../../addon/facebook/facebook.php:677
+#: ../../addon/facebook/facebook.php:712
msgid "App-ID / API-Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:678
+#: ../../addon/facebook/facebook.php:713
msgid "Application secret"
msgstr ""
-#: ../../addon/facebook/facebook.php:679
+#: ../../addon/facebook/facebook.php:714
#, php-format
msgid "Polling Interval (min. %1$s minutes)"
msgstr ""
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:718
msgid "Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:722
msgid "Real-Time Updates are activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:723
msgid "Deactivate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:725
msgid "Real-Time Updates not activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:725
msgid "Activate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:743
msgid "The new values have been saved."
msgstr ""
-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:767
msgid "Post to Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:815
+#: ../../addon/facebook/facebook.php:865
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-#: ../../addon/facebook/facebook.php:1033
+#: ../../addon/facebook/facebook.php:1085
msgid "View on Friendica"
msgstr ""
-#: ../../addon/facebook/facebook.php:1058
+#: ../../addon/facebook/facebook.php:1118
msgid "Facebook post failed. Queued for retry."
msgstr ""
-#: ../../addon/facebook/facebook.php:1094
+#: ../../addon/facebook/facebook.php:1158
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr ""
-#: ../../addon/facebook/facebook.php:1095
+#: ../../addon/facebook/facebook.php:1159
msgid "Facebook connection became invalid"
msgstr ""
-#: ../../addon/facebook/facebook.php:1096
+#: ../../addon/facebook/facebook.php:1160
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -4446,10 +4521,14 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook-red/theme.php:77
-#: ../../view/theme/diabook-blue/theme.php:77
-#: ../../view/theme/diabook/theme.php:81
-#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
+#: ../../view/theme/diabook-red/theme.php:79
+#: ../../view/theme/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/diabook-red/theme.php:79
+#: ../../view/theme/diabook/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/theme.php:92
+#: ../../view/theme/diabook/diabook-aerith/theme.php:80
+#: ../../view/theme/diabook/diabook-pink/theme.php:80
+#: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr ""
@@ -4801,6 +4880,27 @@ msgstr ""
msgid "The default zoom level. (1:world, 18:highest)"
msgstr ""
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
#: ../../addon/editplain/editplain.php:46
msgid "Editplain settings updated."
msgstr ""
@@ -5326,183 +5426,253 @@ msgstr ""
msgid "Post to Posterous by default"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:26
-#: ../../view/theme/diabook-blue/theme.php:26
-#: ../../view/theme/diabook/theme.php:30
-#: ../../view/theme/diabook-aerith/theme.php:27
+#: ../../view/theme/diabook-red/theme.php:28
+#: ../../view/theme/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/diabook-red/theme.php:28
+#: ../../view/theme/diabook/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/theme.php:41
+#: ../../view/theme/diabook/diabook-aerith/theme.php:29
+#: ../../view/theme/diabook/diabook-pink/theme.php:29
+#: ../../view/theme/diabook-aerith/theme.php:29
msgid "Last users"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:55
-#: ../../view/theme/diabook-blue/theme.php:55
-#: ../../view/theme/diabook/theme.php:59
-#: ../../view/theme/diabook-aerith/theme.php:56
+#: ../../view/theme/diabook-red/theme.php:57
+#: ../../view/theme/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/diabook-red/theme.php:57
+#: ../../view/theme/diabook/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/theme.php:70
+#: ../../view/theme/diabook/diabook-aerith/theme.php:58
+#: ../../view/theme/diabook/diabook-pink/theme.php:58
+#: ../../view/theme/diabook-aerith/theme.php:58
msgid "Last likes"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:100
-#: ../../view/theme/diabook-blue/theme.php:100
-#: ../../view/theme/diabook/theme.php:104
-#: ../../view/theme/diabook-aerith/theme.php:101
+#: ../../view/theme/diabook-red/theme.php:102
+#: ../../view/theme/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/diabook-red/theme.php:102
+#: ../../view/theme/diabook/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/theme.php:115
+#: ../../view/theme/diabook/diabook-aerith/theme.php:103
+#: ../../view/theme/diabook/diabook-pink/theme.php:103
+#: ../../view/theme/diabook-aerith/theme.php:103
msgid "Last photos"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:145
-#: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:149
-#: ../../view/theme/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook-red/theme.php:139
+#: ../../view/theme/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/diabook-red/theme.php:139
+#: ../../view/theme/diabook/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook/diabook-aerith/theme.php:141
+#: ../../view/theme/diabook/diabook-pink/theme.php:141
+#: ../../view/theme/diabook-aerith/theme.php:141
msgid "Find Friends"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:146
-#: ../../view/theme/diabook-blue/theme.php:146
-#: ../../view/theme/diabook/theme.php:150
-#: ../../view/theme/diabook-aerith/theme.php:147
+#: ../../view/theme/diabook-red/theme.php:140
+#: ../../view/theme/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/diabook-red/theme.php:140
+#: ../../view/theme/diabook/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook/diabook-pink/theme.php:142
+#: ../../view/theme/diabook-aerith/theme.php:142
msgid "Local Directory"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:148
-#: ../../view/theme/diabook-blue/theme.php:148
-#: ../../view/theme/diabook/theme.php:152
-#: ../../view/theme/diabook-aerith/theme.php:149
+#: ../../view/theme/diabook-red/theme.php:142
+#: ../../view/theme/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/diabook-red/theme.php:142
+#: ../../view/theme/diabook/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/diabook-aerith/theme.php:144
+#: ../../view/theme/diabook/diabook-pink/theme.php:144
+#: ../../view/theme/diabook-aerith/theme.php:144
#: ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:150
-#: ../../view/theme/diabook-blue/theme.php:150
-#: ../../view/theme/diabook/theme.php:154
-#: ../../view/theme/diabook-aerith/theme.php:151
+#: ../../view/theme/diabook-red/theme.php:144
+#: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/diabook-red/theme.php:144
+#: ../../view/theme/diabook/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook/diabook-pink/theme.php:146
+#: ../../view/theme/diabook-aerith/theme.php:146
#: ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:165
-#: ../../view/theme/diabook-red/theme.php:246
-#: ../../view/theme/diabook-blue/theme.php:165
-#: ../../view/theme/diabook-blue/theme.php:246
-#: ../../view/theme/diabook/theme.php:170
-#: ../../view/theme/diabook/theme.php:254
-#: ../../view/theme/diabook-aerith/theme.php:166
-#: ../../view/theme/diabook-aerith/theme.php:247
+#: ../../view/theme/diabook-red/theme.php:159
+#: ../../view/theme/diabook-red/theme.php:234
+#: ../../view/theme/diabook-blue/theme.php:159
+#: ../../view/theme/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:159
+#: ../../view/theme/diabook/diabook-red/theme.php:234
+#: ../../view/theme/diabook/diabook-blue/theme.php:159
+#: ../../view/theme/diabook/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/theme.php:174
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook/diabook-aerith/theme.php:236
+#: ../../view/theme/diabook/diabook-pink/theme.php:161
+#: ../../view/theme/diabook/diabook-pink/theme.php:236
+#: ../../view/theme/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook-aerith/theme.php:236
msgid "Community Pages"
msgstr ""
+#: ../../view/theme/diabook-red/theme.php:192
+#: ../../view/theme/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/diabook-red/theme.php:192
+#: ../../view/theme/diabook/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/theme.php:207
+#: ../../view/theme/diabook/diabook-aerith/theme.php:194
+#: ../../view/theme/diabook/diabook-pink/theme.php:194
+#: ../../view/theme/diabook-aerith/theme.php:194
+msgid "Help or @NewHere ?"
+msgstr ""
+
#: ../../view/theme/diabook-red/theme.php:198
#: ../../view/theme/diabook-blue/theme.php:198
-#: ../../view/theme/diabook/theme.php:203
-#: ../../view/theme/diabook-aerith/theme.php:199
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: ../../view/theme/diabook-red/theme.php:204
-#: ../../view/theme/diabook-blue/theme.php:204
-#: ../../view/theme/diabook/theme.php:209
-#: ../../view/theme/diabook-aerith/theme.php:205
+#: ../../view/theme/diabook/diabook-red/theme.php:198
+#: ../../view/theme/diabook/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:213
+#: ../../view/theme/diabook/diabook-aerith/theme.php:200
+#: ../../view/theme/diabook/diabook-pink/theme.php:200
+#: ../../view/theme/diabook-aerith/theme.php:200
msgid "Connect Services"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:210
-#: ../../view/theme/diabook-blue/theme.php:210
-#: ../../view/theme/diabook/theme.php:215
-#: ../../view/theme/diabook-aerith/theme.php:211
-msgid "PostIt to Friendica"
-msgstr ""
-
-#: ../../view/theme/diabook-red/theme.php:210
-#: ../../view/theme/diabook-blue/theme.php:210
-#: ../../view/theme/diabook/theme.php:215
-#: ../../view/theme/diabook-aerith/theme.php:211
-msgid "Post to Friendica"
-msgstr ""
-
-#: ../../view/theme/diabook-red/theme.php:211
-#: ../../view/theme/diabook-blue/theme.php:211
-#: ../../view/theme/diabook/theme.php:216
-#: ../../view/theme/diabook-aerith/theme.php:212
-msgid " from anywhere by bookmarking this Link."
-msgstr ""
-
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:247
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:227
+#: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:248
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:228
+#: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:242
+#: ../../view/theme/diabook-red/theme.php:229
+#: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../view/theme/diabook-aerith/theme.php:231
msgid "Your contacts"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
-#: ../../boot.php:1462
-msgid "Photos"
-msgstr ""
-
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+#: ../../view/theme/diabook-red/theme.php:230
+#: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../view/theme/diabook-red/theme.php:231
+#: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
msgid "Your events"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:244
-#: ../../view/theme/diabook-blue/theme.php:244
-#: ../../view/theme/diabook/theme.php:252
-#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:232
+#: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
msgid "Personal notes"
msgstr ""
-#: ../../view/theme/diabook-red/theme.php:244
-#: ../../view/theme/diabook-blue/theme.php:244
-#: ../../view/theme/diabook/theme.php:252
-#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:232
+#: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
msgid "Your personal photos"
msgstr ""
-#: ../../view/theme/diabook-red/config.php:66
-#: ../../view/theme/diabook-blue/config.php:66
-#: ../../view/theme/diabook/config.php:66
+#: ../../view/theme/diabook-red/config.php:78
+#: ../../view/theme/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-red/config.php:78
+#: ../../view/theme/diabook/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-aerith/config.php:78
+#: ../../view/theme/diabook/diabook-pink/config.php:78
+#: ../../view/theme/diabook/config.php:89
#: ../../view/theme/quattro/config.php:54
-#: ../../view/theme/diabook-aerith/config.php:66
+#: ../../view/theme/diabook-aerith/config.php:78
msgid "Theme settings"
msgstr ""
-#: ../../view/theme/diabook-red/config.php:67
-#: ../../view/theme/diabook-blue/config.php:67
-#: ../../view/theme/diabook/config.php:67
-#: ../../view/theme/diabook-aerith/config.php:67
+#: ../../view/theme/diabook-red/config.php:79
+#: ../../view/theme/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-red/config.php:79
+#: ../../view/theme/diabook/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-aerith/config.php:79
+#: ../../view/theme/diabook/diabook-pink/config.php:79
+#: ../../view/theme/diabook/config.php:90
+#: ../../view/theme/diabook-aerith/config.php:79
msgid "Set font-size for posts and comments"
msgstr ""
-#: ../../view/theme/diabook-red/config.php:68
-#: ../../view/theme/diabook-blue/config.php:68
-#: ../../view/theme/diabook/config.php:68
-#: ../../view/theme/diabook-aerith/config.php:68
+#: ../../view/theme/diabook-red/config.php:80
+#: ../../view/theme/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-red/config.php:80
+#: ../../view/theme/diabook/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-aerith/config.php:80
+#: ../../view/theme/diabook/diabook-pink/config.php:80
+#: ../../view/theme/diabook/config.php:91
+#: ../../view/theme/diabook-aerith/config.php:80
msgid "Set line-height for posts and comments"
msgstr ""
+#: ../../view/theme/diabook-red/config.php:81
+#: ../../view/theme/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-red/config.php:81
+#: ../../view/theme/diabook/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-aerith/config.php:81
+#: ../../view/theme/diabook/diabook-pink/config.php:81
+#: ../../view/theme/diabook/config.php:92
+#: ../../view/theme/diabook-aerith/config.php:81
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:93
+msgid "Set color scheme"
+msgstr ""
+
#: ../../view/theme/quattro/config.php:55
msgid "Alignment"
msgstr ""
@@ -5519,7 +5689,7 @@ msgstr ""
msgid "Color scheme"
msgstr ""
-#: ../../include/profile_advanced.php:17 ../../boot.php:1084
+#: ../../include/profile_advanced.php:17 ../../boot.php:1085
msgid "Gender:"
msgstr ""
@@ -5532,7 +5702,7 @@ msgid "j F"
msgstr ""
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
-#: ../../include/items.php:1402
+#: ../../include/items.php:1403
msgid "Birthday:"
msgstr ""
@@ -5540,11 +5710,11 @@ msgstr ""
msgid "Age:"
msgstr ""
-#: ../../include/profile_advanced.php:37 ../../boot.php:1087
+#: ../../include/profile_advanced.php:37 ../../boot.php:1088
msgid "Status:"
msgstr ""
-#: ../../include/profile_advanced.php:45 ../../boot.php:1089
+#: ../../include/profile_advanced.php:45 ../../boot.php:1090
msgid "Homepage:"
msgstr ""
@@ -6085,7 +6255,7 @@ msgstr ""
msgid "[Relayed] Comment authored by %s from network %s"
msgstr ""
-#: ../../include/network.php:823
+#: ../../include/network.php:824
msgid "view full size"
msgstr ""
@@ -6136,7 +6306,7 @@ msgstr ""
msgid "End this session"
msgstr ""
-#: ../../include/nav.php:49 ../../boot.php:1452
+#: ../../include/nav.php:49 ../../boot.php:1453
msgid "Status"
msgstr ""
@@ -6216,11 +6386,11 @@ msgstr ""
msgid "Manage other pages"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1042
+#: ../../include/nav.php:138 ../../boot.php:1043
msgid "Profiles"
msgstr ""
-#: ../../include/nav.php:138 ../../boot.php:1042
+#: ../../include/nav.php:138 ../../boot.php:1043
msgid "Manage/edit profiles"
msgstr ""
@@ -6607,11 +6777,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: ../../include/items.php:2669
+#: ../../include/items.php:2698
msgid "A new person is sharing with you at "
msgstr ""
-#: ../../include/items.php:2669
+#: ../../include/items.php:2698
msgid "You have a new follower at "
msgstr ""
@@ -6642,29 +6812,30 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
-#: ../../include/Contact.php:145 ../../include/conversation.php:813
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
msgid "View Status"
msgstr ""
-#: ../../include/Contact.php:146 ../../include/conversation.php:814
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
msgid "View Profile"
msgstr ""
-#: ../../include/Contact.php:147 ../../include/conversation.php:815
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
msgid "View Photos"
msgstr ""
#: ../../include/Contact.php:148 ../../include/Contact.php:161
-#: ../../include/conversation.php:816
+#: ../../include/conversation.php:812
msgid "Network Posts"
msgstr ""
-#: ../../include/Contact.php:149 ../../include/conversation.php:817
+#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/conversation.php:813
msgid "Edit Contact"
msgstr ""
#: ../../include/Contact.php:150 ../../include/Contact.php:161
-#: ../../include/conversation.php:818
+#: ../../include/conversation.php:814
msgid "Send PM"
msgstr ""
@@ -6681,18 +6852,18 @@ msgstr ""
msgid "Select"
msgstr ""
-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
#, php-format
msgid "%s from %s"
msgstr ""
-#: ../../include/conversation.php:360
+#: ../../include/conversation.php:359
msgid "View in context"
msgstr ""
@@ -6743,118 +6914,118 @@ msgstr ""
msgid "save to folder"
msgstr ""
-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
msgid "to"
msgstr ""
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
msgid "Wall-to-Wall"
msgstr ""
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
msgid "via Wall-To-Wall:"
msgstr ""
-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
#, php-format
msgid "%2$d people like this."
msgstr ""
-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
#, php-format
msgid "%2$d people don't like this."
msgstr ""
-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
msgid "and"
msgstr ""
-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
#, php-format
msgid ", and %d other people"
msgstr ""
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
msgid "Visible to everybody"
msgstr ""
-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:977
msgid "permissions"
msgstr ""
@@ -6886,42 +7057,42 @@ msgstr ""
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:974
+#: ../../boot.php:975
msgid "Edit profile"
msgstr ""
-#: ../../boot.php:1034
+#: ../../boot.php:1035
msgid "Message"
msgstr ""
-#: ../../boot.php:1150 ../../boot.php:1222
+#: ../../boot.php:1151 ../../boot.php:1223
msgid "g A l F d"
msgstr ""
-#: ../../boot.php:1151 ../../boot.php:1223
+#: ../../boot.php:1152 ../../boot.php:1224
msgid "F d"
msgstr ""
-#: ../../boot.php:1176
+#: ../../boot.php:1177
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:1177
+#: ../../boot.php:1178
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:1200 ../../boot.php:1265
+#: ../../boot.php:1201 ../../boot.php:1266
msgid "[today]"
msgstr ""
-#: ../../boot.php:1246
+#: ../../boot.php:1247
msgid "Event Reminders"
msgstr ""
-#: ../../boot.php:1247
+#: ../../boot.php:1248
msgid "Events this week:"
msgstr ""
-#: ../../boot.php:1259
+#: ../../boot.php:1260
msgid "[No description]"
msgstr ""
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
index 9d133b155..b777cf420 100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@@ -2,6 +2,7 @@
$title - $page
+
+
+
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index 6fab83afc..5f316bcdd 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -26,6 +26,7 @@
$nav.contacts.1
+
{{ endif }}
{{ if $nav.messages }}
@@ -35,8 +36,6 @@
@@ -45,7 +44,7 @@
{{ if $nav.notifications }}
{{ endif }}
+
+
+
{{ if $nav.directory }}
{{ endif }}
-
{{ if $nav.apps }}
{{ endif }}
- {{ if $nav.settings }}
+ {{ if $nav.home }}
+
{{ endif }}
{{ if $nav.messages }}
@@ -35,8 +36,6 @@
@@ -63,16 +62,18 @@
{{ endif }}
+
+
+
{{ if $nav.directory }}
{{ endif }}
-
{{ if $nav.apps }}
{{ endif }}
- {{ if $nav.settings }}
+ {{ if $nav.home }}
+
{{ endif }}
{{ if $nav.messages }}
@@ -35,8 +36,6 @@
@@ -63,16 +62,18 @@
{{ endif }}
+
+
+
{{ if $nav.directory }}
{{ endif }}
-
{{ if $nav.apps }}
{{ endif }}
- {{ if $nav.settings }}
+ {{ if $nav.home }}
@@ -64,12 +62,12 @@
{{ endif }}
+
+
{{ endif }}
- {{ if $nav.settings }}
+ {{ if $nav.home }}