Merge pull request #2119 from annando/1511-contact-evolution

Refurbished contact settings/contact posts

diff --git a/include/Contact.php b/include/Contact.php
index a30a3c6c7aaa2363c960e423263b7459358073d0..6673e6911d693c5f6ee793453881357c143ca9e7 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -286,7 +286,7 @@ function get_contact_details_by_url($url, $uid = -1) {
 }
 
 if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact) {
+function contact_photo_menu($contact, $uid = 0) {
 
        $a = get_app();
 
@@ -298,6 +298,33 @@ function contact_photo_menu($contact) {
        $contact_drop_link = "";
        $poke_link="";
 
+       if ($uid == 0)
+               $uid = local_user();
+
+       if ($contact["uid"] != $uid) {
+               if ($uid == 0) {
+                       $profile_link = zrl($contact['url']);
+                       $menu = Array('profile' => array(t("View Profile"), $profile_link, true));
+
+                       return $menu;
+               }
+
+               $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
+                       dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
+               if ($r)
+                       return contact_photo_menu($r[0], $uid);
+               else {
+                       $profile_link = zrl($contact['url']);
+                       $connlnk = 'follow/?url='.$contact['url'];
+                       $menu = Array(
+                               'profile' => array(t("View Profile"), $profile_link, true),
+                               'follow' => array(t("Connect/Follow"), $connlnk, true)
+                               );
+
+                       return $menu;
+               }
+       }
+
        $sparkle = false;
        if($contact['network'] === NETWORK_DFRN) {
                $sparkle = true;

diff --git a/include/bbcode.php b/include/bbcode.php
index 81536d37200fdd5083a38685c306282856f8d0cb..acf6979d84544788a5eb8a2292ad2f77912b64ef 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -99,10 +99,19 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
                                $image = "";
                        }
 
-                       if ($simplehtml == 7)
-                               $text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a>',
-                                               $url, $title, $title);
-                       elseif (($simplehtml != 4) AND ($simplehtml != 0))
+                       if ($simplehtml == 7) {
+                               $title2 = $title;
+
+                               $test1 = trim(html_entity_decode($match[1],ENT_QUOTES,'UTF-8'));
+                               $test2 = trim(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
+
+                               // If the link description is similar to the text above then don't add the link description
+                               if (($title != "") AND ((strpos($test1,$test2) !== false) OR
+                                       (similar_text($test1,$test2) / strlen($title)) > 0.9))
+                                       $title2 = $url;
+                               $text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />',
+                                               $url, $title, $title2);
+                       } elseif (($simplehtml != 4) AND ($simplehtml != 0))
                                $text = sprintf('<a href="%s" target="_blank">%s</a><br>', $url, $title);
                        else {
                                $text = sprintf('<span class="type-%s">', $type);
@@ -950,11 +959,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
 
        // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
-       if (!$forplaintext)
-               $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text);
-       else {
-               $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
-               $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+       if ($simplehtml != 7) {
+               if (!$forplaintext)
+                       $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text);
+               else {
+                       $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
+                       $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+               }
        }
 
        if ($tryoembed)

diff --git a/include/cron.php b/include/cron.php
index 7b2244b55eda9a4c370ec5104479a11b57d796e6..d95d8bc601bfa7b19d7a5d89eaaa977c0c9e780a 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -189,6 +189,27 @@ function cron_run(&$argv, &$argc){
                        q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
                }
 
+               // maximum table size in megabyte
+               $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000;
+               if ($max_tablesize == 0)
+                       $max_tablesize = 100 * 1000000; // Default are 100 MB
+
+               // Optimize some tables that need to be optimized
+               $r = q("SHOW TABLE STATUS");
+               foreach($r as $table) {
+
+                       // Don't optimize tables that needn't to be optimized
+                       if ($table["Data_free"] == 0)
+                               continue;
+
+                       // Don't optimize tables that are too large
+                       if ($table["Data_length"] > $max_tablesize)
+                               continue;
+
+                       // So optimize it
+                       q("OPTIMIZE TABLE `%s`", dbesc($table["Name"]));
+               }
+
                set_config('system','cache_last_cleared', time());
        }
 

diff --git a/include/items.php b/include/items.php
index 53f4784c2d053fe06661a979d4ffdca507d71937..65d66b77a17801e597fe54bdba71907d508716e4 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -4171,14 +4171,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                        );
                }
                // send email notification to owner?
-       }
-       else {
+       } else {
 
                // create contact record
 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
-                       `blocked`, `readonly`, `pending`, `writable` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
+               $r = q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
+                       `blocked`, `readonly`, `pending`, `writable`)
+                       VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
                        intval($importer['uid']),
                        dbesc(datetime_convert()),
                        dbesc($url),
@@ -4193,27 +4192,38 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                intval($importer['uid']),
                                dbesc($url)
                );
-               if(count($r))
+               if(count($r)) {
                                $contact_record = $r[0];
 
-               // create notification
-               $hash = random_string();
+                               $photos = import_profile_photo($photo,$importer["uid"],$contact_record["id"]);
 
-               if(is_array($contact_record)) {
-                       $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`)
-                               VALUES ( %d, %d, 0, 0, '%s', '%s' )",
-                               intval($importer['uid']),
-                               intval($contact_record['id']),
-                               dbesc($hash),
-                               dbesc(datetime_convert())
-                       );
+                               q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
+                                       dbesc($photos[0]),
+                                       dbesc($photos[1]),
+                                       dbesc($photos[2]),
+                                       intval($contact_record["id"])
+                               );
                }
 
+
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($importer['uid'])
                );
                $a = get_app();
-               if(count($r)) {
+               if(count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+
+                       // create notification
+                       $hash = random_string();
+
+                       if(is_array($contact_record)) {
+                               $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`)
+                                       VALUES ( %d, %d, 0, 0, '%s', '%s' )",
+                                       intval($importer['uid']),
+                                       intval($contact_record['id']),
+                                       dbesc($hash),
+                                       dbesc(datetime_convert())
+                               );
+                       }
 
                        if(intval($r[0]['def_gid'])) {
                                require_once('include/group.php');
@@ -4221,7 +4231,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                        }
 
                        if(($r[0]['notify-flags'] & NOTIFY_INTRO) &&
-                               in_array($r[0]['page-flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
+                               in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
 
                                notification(array(
                                        'type'         => NOTIFY_INTRO,
@@ -4239,7 +4249,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                ));
 
                        }
+               } elseif (count($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+                       $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
+                                       intval($importer['uid']),
+                                       dbesc($url)
+                       );
                }
+
        }
 }
 
@@ -4645,7 +4661,7 @@ function item_getfeedtags($item) {
        if($cnt) {
                for($x = 0; $x < $cnt; $x ++) {
                        if($matches[1][$x])
-                               $ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+                               $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]);
                }
        }
        $matches = false;

diff --git a/include/ostatus.php b/include/ostatus.php
index ce254ed61ad012328d362234882b6738c03c5cea..ebd5741e5157a44977a4f6452857c2f509199191 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -1201,6 +1201,14 @@ function ostatus_get_attachment($doc, $root, $item) {
                        break;
        }
 
+       if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
+               $photodata = get_photo_info($siteinfo["image"]);
+
+               $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]);
+               xml_add_element($doc, $root, "link", "", $attributes);
+       }
+
+
        $arr = explode('[/attach],',$item['attach']);
        if(count($arr)) {
                foreach($arr as $r) {
@@ -1229,7 +1237,7 @@ function ostatus_add_author($doc, $owner, $profile) {
        $author = $doc->createElement("author");
        xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
        xml_add_element($doc, $author, "uri", $owner["url"]);
-       xml_add_element($doc, $author, "name", $owner["nick"]);
+       xml_add_element($doc, $author, "name", $profile["name"]);
 
        $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
        xml_add_element($doc, $author, "link", "", $attributes);
@@ -1327,6 +1335,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
        if ($item['title'] != "")
                $body = "[b]".$item['title']."[/b]\n\n".$body;
 
+       //$body = bb_remove_share_information($body);
        $body = bbcode($body, false, false, 7);
 
        xml_add_element($doc, $entry, "content", $body, array("type" => "html"));
@@ -1440,7 +1449,7 @@ function ostatus_feed(&$a, $owner_nick, $last_update) {
                $root->appendChild($entry);
        }
 
-       return($doc->saveXML());
+       return(trim($doc->saveXML()));
 }
 
 function ostatus_salmon($item,$owner) {
@@ -1452,6 +1461,6 @@ function ostatus_salmon($item,$owner) {
 
        $doc->appendChild($entry);
 
-       return($doc->saveXML());
+       return(trim($doc->saveXML()));
 }
 ?>

diff --git a/include/text.php b/include/text.php
index f210bff72100c363ee4355fb0a07eed4a86d90f8..73c441e26aaaabd8c47d0c46a552214d9c2d07a4 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -943,6 +943,9 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
        if($class)
                $class = ' ' . $class;
 
+       if ($contact["addr"] == "")
+               $contact["addr"] = $contact["url"];
+
        $url = $contact['url'];
        $sparkle = '';
        $redir = false;
@@ -966,7 +969,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        . (($click) ? ' fakelink' : '') . '" '
                        . (($redir) ? ' target="redir" ' : '')
                        . (($url) ? ' href="' . $url . '"' : '') . $click
-                       . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+                       . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name']
                        . '" >'. $contact['name'] . '</a></div>' . "\r\n";
        }
        else {
@@ -974,7 +977,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        . (($click) ? ' fakelink' : '') . '" '
                        . (($redir) ? ' target="redir" ' : '')
                        . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
-                       . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+                       . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name']
                        . '" /></a></div>' . "\r\n";
        }
 }}

diff --git a/mod/admin.php b/mod/admin.php
index d9a17dcad7010939fdbd2208c778e60914f0613c..8d2a7688f8f500e2b7cbcb5905cb43dfdce6d080 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -409,6 +409,7 @@ function admin_page_site_post(&$a){
        $poll_interval          =       ((x($_POST,'poll_interval'))            ? intval(trim($_POST['poll_interval']))         : 0);
        $maxloadavg             =       ((x($_POST,'maxloadavg'))               ? intval(trim($_POST['maxloadavg']))            : 50);
        $maxloadavg_frontend    =       ((x($_POST,'maxloadavg_frontend'))      ? intval(trim($_POST['maxloadavg_frontend']))   : 50);
+       $optimize_max_tablesize =       ((x($_POST,'optimize_max_tablesize'))   ? intval(trim($_POST['optimize_max_tablesize'])): 100);
        $poco_completion        =       ((x($_POST,'poco_completion'))          ? intval(trim($_POST['poco_completion']))       : false);
        $poco_requery_days      =       ((x($_POST,'poco_requery_days'))        ? intval(trim($_POST['poco_requery_days']))     : 7);
        $poco_discovery         =       ((x($_POST,'poco_discovery'))           ? intval(trim($_POST['poco_discovery']))        : 0);
@@ -490,6 +491,7 @@ function admin_page_site_post(&$a){
        set_config('system','poll_interval',$poll_interval);
        set_config('system','maxloadavg',$maxloadavg);
        set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
+       set_config('system','optimize_max_tablesize',$optimize_max_tablesize);
        set_config('system','poco_completion',$poco_completion);
        set_config('system','poco_requery_days',$poco_requery_days);
        set_config('system','poco_discovery',$poco_discovery);
@@ -772,6 +774,7 @@ function admin_page_site(&$a) {
                '$poll_interval'        => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
                '$maxloadavg'           => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
                '$maxloadavg_frontend'  => array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
+               '$optimize_max_tablesize'=> array('optimize_max_tablesize', t("Maximum table size for optimization"), ((intval(get_config('system','optimize_max_tablesize')) > 0)?get_config('system','optimize_max_tablesize'):100), t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")),
 
                '$poco_completion'      => array('poco_completion', t("Periodical check of global contacts"), get_config('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
                '$poco_requery_days'    => array('poco_requery_days', t("Days between requery"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),

diff --git a/mod/manage.php b/mod/manage.php
index c0eedc2ba07ebcfecaa4b05cd44ab428c844ef5d..adcc3d787aac0d58563cbd5d38e82e50384498d2 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -114,6 +114,25 @@ function manage_content(&$a) {
                $identities[$key][thumb] = $thumb[0][thumb];
 
                $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
+
+               $notifications = 0;
+
+               $r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
+                       intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
+               if ($r)
+                       $notifications = sizeof($r);
+
+               $r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
+                       intval($id['uid']));
+               if ($r)
+                       $notifications = $notifications + sizeof($r);
+
+               $r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
+                       intval($id['uid']));
+               if ($r)
+                       $notifications = $notifications + $r[0]["introductions"];
+
+               $identities[$key]['notifications'] = $notifications;
        }
 
        $o = replace_macros(get_markup_template('manage.tpl'), array(

diff --git a/mod/network.php b/mod/network.php
index f18e3001d0dcab4548c31386c57309b04e7caaa1..8e7a2b8e1ea1174b9bd0069924d5fcd1881be0e8 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -154,14 +154,6 @@ function network_init(&$a) {
        $a->page['aside'] .= saved_searches($search);
        $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
-       if(x($_GET['cid']) && intval($_GET['cid']) != 0) {
-               $r = q("SELECT `url` FROM `contact` WHERE `id` = %d",
-                       intval($_GET['cid']));
-               if ($r) {
-                       $a->page['aside'] = "";
-                       profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"]));
-               }
-       }
 }
 
 function saved_searches($search) {
@@ -585,7 +577,7 @@ function network_content(&$a, $update = 0) {
        }
        elseif($cid) {
 
-               $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d
+               $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
                                AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($cid)
                );
@@ -596,8 +588,18 @@ function network_content(&$a, $update = 0) {
                                            ON $sql_table.$sql_parent = `temp1`.`parent` ";
                        $sql_extra = "";
 
-                       $o = replace_macros(get_markup_template("section_title.tpl"),array(
-                               '$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name']))
+                       $entries[0] = array(
+                               'id' => 'network',
+                               'name' => htmlentities($r[0]['name']),
+                               'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])),
+                               'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB),
+                               'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''),
+                               'details' => $r[0]['location'],
+                       );
+
+                       $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array(
+                               'contacts' => $entries,
+                               'id' => 'network',
                        )) . $o;
 
                        if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index c7f139e1e48aa9732773db0c98f586928a6c789d..d16a48e349190f447ac0d3cbf4087ea088f3e164 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -26,19 +26,30 @@ function viewcontacts_content(&$a) {
        }
 
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
-               intval($a->profile['uid'])
+       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+               WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                       AND `network` IN ('%s', '%s', '%s')",
+               intval($a->profile['uid']),
+               dbesc(NETWORK_DFRN),
+               dbesc(NETWORK_DIASPORA),
+               dbesc(NETWORK_OSTATUS)
        );
        if(count($r))
                $a->set_pager_total($r[0]['total']);
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY `name` ASC LIMIT %d , %d ",
+       $r = q("SELECT * FROM `contact`
+               WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                       AND `network` IN ('%s', '%s', '%s')
+               ORDER BY `name` ASC LIMIT %d, %d",
                intval($a->profile['uid']),
+               dbesc(NETWORK_DFRN),
+               dbesc(NETWORK_DIASPORA),
+               dbesc(NETWORK_OSTATUS),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
-       if(! count($r)) {
-               info( t('No contacts.') . EOL );
+       if(!count($r)) {
+               info(t('No contacts.').EOL);
                return $o;
        }
 
@@ -64,6 +75,7 @@ function viewcontacts_content(&$a) {
                $contacts[] = array(
                        'id' => $rr['id'],
                        'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
+                       'photo_menu' => contact_photo_menu($rr),
                        'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
                        'name' => htmlentities(substr($rr['name'],0,20)),
                        'username' => htmlentities($rr['name']),

diff --git a/util/credits.txt b/util/credits.txt
index d31c741d530ea0e0ba253f346b5cafa33f4914f0..a0890ef3d90d3ce2309d0499ce1665dbb9031eb7 100644 (file)
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -6,6 +6,7 @@ Alex
 Alexander Kampmann
 AlfredSK
 Andi Stadler
+Andreas H.
 André Lohan
 Anthronaut
 Arian - Cazare Muncitori
@@ -114,6 +115,7 @@ Rabuzarus
 Radek
 Rafael
 Rainulf Pineda
+Ralph
 rcmaniac
 rebeka-catalina
 repat

diff --git a/util/messages.po b/util/messages.po
index 5388b94dafef1efe10f6c6d650e620c5d3643d77..7dcd9719314c6961f3e94c2a8aedba7b02cb498b 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-08 21:46+0100\n"
+"POT-Creation-Date: 2015-11-30 13:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,13 +37,13 @@ msgstr ""
 msgid "Contact updated."
 msgstr ""
 
-#: mod/contacts.php:198 mod/dfrn_request.php:576
+#: mod/contacts.php:198 mod/dfrn_request.php:578
 msgid "Failed to update contact record."
 msgstr ""
 
 #: mod/contacts.php:354 mod/manage.php:96 mod/display.php:496
-#: mod/profile_photo.php:19 mod/profile_photo.php:169 mod/profile_photo.php:180
-#: mod/profile_photo.php:193 mod/ostatus_subscribe.php:9 mod/follow.php:10
+#: mod/profile_photo.php:19 mod/profile_photo.php:175 mod/profile_photo.php:186
+#: mod/profile_photo.php:199 mod/ostatus_subscribe.php:9 mod/follow.php:10
 #: mod/follow.php:72 mod/follow.php:137 mod/item.php:169 mod/item.php:185
 #: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78
 #: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/viewcontacts.php:24
@@ -58,7 +58,7 @@ msgstr ""
 #: mod/api.php:31 mod/notes.php:22 mod/poke.php:149 mod/repair_ostatus.php:9
 #: mod/invite.php:15 mod/invite.php:101 mod/photos.php:163 mod/photos.php:1097
 #: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33
-#: include/items.php:5103 index.php:382
+#: include/items.php:5041 index.php:382
 msgid "Permission denied."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: mod/contacts.php:443 mod/contacts.php:816
+#: mod/contacts.php:443 mod/contacts.php:817
 msgid "Do you really want to delete this contact?"
 msgstr ""
 
@@ -95,18 +95,18 @@ msgstr ""
 #: mod/settings.php:1109 mod/settings.php:1114 mod/settings.php:1120
 #: mod/settings.php:1126 mod/settings.php:1132 mod/settings.php:1158
 #: mod/settings.php:1159 mod/settings.php:1160 mod/settings.php:1161
-#: mod/settings.php:1162 mod/dfrn_request.php:848 mod/register.php:235
+#: mod/settings.php:1162 mod/dfrn_request.php:850 mod/register.php:238
 #: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661
-#: mod/profiles.php:687 mod/api.php:105 include/items.php:4935
+#: mod/profiles.php:687 mod/api.php:105 include/items.php:4873
 msgid "Yes"
 msgstr ""
 
 #: mod/contacts.php:448 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116
 #: mod/videos.php:123 mod/message.php:219 mod/fbrowser.php:93
 #: mod/fbrowser.php:128 mod/settings.php:649 mod/settings.php:675
-#: mod/dfrn_request.php:862 mod/suggest.php:32 mod/editpost.php:147
+#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:147
 #: mod/photos.php:239 mod/photos.php:328 include/conversation.php:1221
-#: include/items.php:4938
+#: include/items.php:4876
 msgid "Cancel"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgstr ""
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: mod/contacts.php:530 mod/admin.php:643
+#: mod/contacts.php:530 mod/admin.php:645
 msgid "Never"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Network type: %s"
 msgstr ""
 
-#: mod/contacts.php:543 include/contact_widgets.php:200
+#: mod/contacts.php:543 include/contact_widgets.php:237
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
@@ -165,13 +165,13 @@ msgstr[1] ""
 msgid "View all contacts"
 msgstr ""
 
-#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:820
-#: mod/admin.php:1114
+#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821
+#: mod/admin.php:1117
 msgid "Unblock"
 msgstr ""
 
-#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:820
-#: mod/admin.php:1113
+#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821
+#: mod/admin.php:1116
 msgid "Block"
 msgstr ""
 
@@ -179,11 +179,11 @@ msgstr ""
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:821
+#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822
 msgid "Unignore"
 msgstr ""
 
-#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:821
+#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822
 #: mod/notifications.php:54 mod/notifications.php:179 mod/notifications.php:259
 msgid "Ignore"
 msgstr ""
@@ -192,11 +192,11 @@ msgstr ""
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: mod/contacts.php:570 mod/contacts.php:822
+#: mod/contacts.php:570 mod/contacts.php:823
 msgid "Unarchive"
 msgstr ""
 
-#: mod/contacts.php:570 mod/contacts.php:822
+#: mod/contacts.php:570 mod/contacts.php:823
 msgid "Archive"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Fetch further information for feeds"
 msgstr ""
 
-#: mod/contacts.php:593 mod/admin.php:652
+#: mod/contacts.php:593 mod/admin.php:654
 msgid "Disabled"
 msgstr ""
 
@@ -236,17 +236,17 @@ msgstr ""
 msgid "Contact Editor"
 msgstr ""
 
-#: mod/contacts.php:608 mod/manage.php:124 mod/fsuggest.php:107
+#: mod/contacts.php:608 mod/manage.php:143 mod/fsuggest.php:107
 #: mod/message.php:342 mod/message.php:525 mod/crepair.php:195
-#: mod/events.php:574 mod/content.php:712 mod/install.php:253
-#: mod/install.php:291 mod/mood.php:137 mod/profiles.php:696
+#: mod/events.php:574 mod/content.php:712 mod/install.php:261
+#: mod/install.php:299 mod/mood.php:137 mod/profiles.php:696
 #: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140 mod/photos.php:1129
 #: mod/photos.php:1253 mod/photos.php:1571 mod/photos.php:1622
 #: mod/photos.php:1670 mod/photos.php:1758 object/Item.php:710
 #: view/theme/cleanzero/config.php:80 view/theme/dispy/config.php:70
 #: view/theme/quattro/config.php:64 view/theme/diabook/config.php:148
-#: view/theme/diabook/theme.php:633 view/theme/vier/config.php:107
-#: view/theme/duepuntozero/config.php:59
+#: view/theme/diabook/theme.php:633 view/theme/clean/config.php:83
+#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
 msgid "Submit"
 msgstr ""
 
@@ -269,7 +269,7 @@ msgstr ""
 msgid "Edit contact notes"
 msgstr ""
 
-#: mod/contacts.php:617 mod/contacts.php:860 mod/viewcontacts.php:66
+#: mod/contacts.php:617 mod/contacts.php:861 mod/viewcontacts.php:77
 #: mod/nogroup.php:41
 #, php-format
 msgid "Visit %s's profile [%s]"
@@ -303,13 +303,13 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: mod/contacts.php:631 mod/admin.php:1650
+#: mod/contacts.php:631 mod/admin.php:1653
 msgid "Update now"
 msgstr ""
 
 #: mod/contacts.php:633 mod/dirfind.php:190 mod/allfriends.php:67
 #: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32
-#: include/conversation.php:924
+#: include/Contact.php:321 include/conversation.php:924
 msgid "Connect/Follow"
 msgstr ""
 
@@ -412,46 +412,46 @@ msgstr ""
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: mod/contacts.php:807 include/text.php:1005 include/nav.php:123
+#: mod/contacts.php:808 include/text.php:1012 include/nav.php:123
 #: include/nav.php:187 view/theme/diabook/theme.php:125
 msgid "Contacts"
 msgstr ""
 
-#: mod/contacts.php:811
+#: mod/contacts.php:812
 msgid "Search your contacts"
 msgstr ""
 
-#: mod/contacts.php:812
+#: mod/contacts.php:813
 msgid "Finding: "
 msgstr ""
 
-#: mod/contacts.php:813 mod/directory.php:202 include/contact_widgets.php:34
+#: mod/contacts.php:814 mod/directory.php:202 include/contact_widgets.php:34
 msgid "Find"
 msgstr ""
 
-#: mod/contacts.php:819 mod/settings.php:146 mod/settings.php:674
+#: mod/contacts.php:820 mod/settings.php:146 mod/settings.php:674
 msgid "Update"
 msgstr ""
 
-#: mod/contacts.php:823 mod/group.php:171 mod/admin.php:1112
+#: mod/contacts.php:824 mod/group.php:171 mod/admin.php:1115
 #: mod/content.php:440 mod/content.php:743 mod/settings.php:711
 #: mod/photos.php:1715 object/Item.php:134 include/conversation.php:635
 msgid "Delete"
 msgstr ""
 
-#: mod/contacts.php:836
+#: mod/contacts.php:837
 msgid "Mutual Friendship"
 msgstr ""
 
-#: mod/contacts.php:840
+#: mod/contacts.php:841
 msgid "is a fan of yours"
 msgstr ""
 
-#: mod/contacts.php:844
+#: mod/contacts.php:845
 msgid "you are a fan of"
 msgstr ""
 
-#: mod/contacts.php:861 mod/nogroup.php:42
+#: mod/contacts.php:862 mod/nogroup.php:42
 msgid "Edit contact"
 msgstr ""
 
@@ -459,17 +459,17 @@ msgstr ""
 msgid "No profile"
 msgstr ""
 
-#: mod/manage.php:120
+#: mod/manage.php:139
 msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: mod/manage.php:121
+#: mod/manage.php:140
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: mod/manage.php:122
+#: mod/manage.php:141
 msgid "Select an identity to manage: "
 msgstr ""
 
@@ -489,8 +489,8 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:530
-#: include/identity.php:611 include/identity.php:641 include/nav.php:76
+#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:542
+#: include/identity.php:628 include/identity.php:658 include/nav.php:76
 #: view/theme/diabook/theme.php:124
 msgid "Profile"
 msgstr ""
@@ -508,13 +508,13 @@ msgid "All Contacts (with secure profile access)"
 msgstr ""
 
 #: mod/display.php:82 mod/display.php:283 mod/display.php:500
-#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1157 mod/admin.php:1378
-#: mod/notice.php:15 include/items.php:4894
+#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1160 mod/admin.php:1381
+#: mod/notice.php:15 include/items.php:4832
 msgid "Item not found."
 msgstr ""
 
 #: mod/display.php:211 mod/videos.php:189 mod/viewcontacts.php:19
-#: mod/community.php:18 mod/dfrn_request.php:777 mod/search.php:93
+#: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93
 #: mod/search.php:99 mod/directory.php:37 mod/photos.php:968
 msgid "Public access denied."
 msgstr ""
@@ -558,7 +558,7 @@ msgid ""
 "join."
 msgstr ""
 
-#: mod/newmember.php:22 mod/admin.php:1209 mod/admin.php:1454
+#: mod/newmember.php:22 mod/admin.php:1212 mod/admin.php:1457
 #: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544
 #: view/theme/diabook/theme.php:648
 msgid "Settings"
@@ -583,7 +583,7 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: mod/newmember.php:36 mod/profile_photo.php:244 mod/profiles.php:709
+#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:709
 msgid "Upload Profile Photo"
 msgstr ""
 
@@ -682,7 +682,7 @@ msgid ""
 "hours."
 msgstr ""
 
-#: mod/newmember.php:66 include/group.php:272
+#: mod/newmember.php:66 include/group.php:283
 msgid "Groups"
 msgstr ""
 
@@ -740,86 +740,86 @@ msgid "Image uploaded but image cropping failed."
 msgstr ""
 
 #: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:204 mod/profile_photo.php:296
-#: mod/profile_photo.php:305 mod/photos.php:70 mod/photos.php:184
+#: mod/profile_photo.php:210 mod/profile_photo.php:302
+#: mod/profile_photo.php:311 mod/photos.php:70 mod/photos.php:184
 #: mod/photos.php:767 mod/photos.php:1237 mod/photos.php:1260
-#: mod/photos.php:1854 include/user.php:343 include/user.php:350
-#: include/user.php:357 view/theme/diabook/theme.php:500
+#: mod/photos.php:1854 include/user.php:345 include/user.php:352
+#: include/user.php:359 view/theme/diabook/theme.php:500
 msgid "Profile Photos"
 msgstr ""
 
 #: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
-#: mod/profile_photo.php:308
+#: mod/profile_photo.php:314
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: mod/profile_photo.php:118
+#: mod/profile_photo.php:124
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: mod/profile_photo.php:128
+#: mod/profile_photo.php:134
 msgid "Unable to process image"
 msgstr ""
 
-#: mod/profile_photo.php:144 mod/wall_upload.php:151 mod/photos.php:803
+#: mod/profile_photo.php:150 mod/wall_upload.php:151 mod/photos.php:803
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: mod/profile_photo.php:153 mod/wall_upload.php:183 mod/photos.php:843
+#: mod/profile_photo.php:159 mod/wall_upload.php:183 mod/photos.php:843
 msgid "Unable to process image."
 msgstr ""
 
-#: mod/profile_photo.php:242
+#: mod/profile_photo.php:248
 msgid "Upload File:"
 msgstr ""
 
-#: mod/profile_photo.php:243
+#: mod/profile_photo.php:249
 msgid "Select a profile:"
 msgstr ""
 
-#: mod/profile_photo.php:245
+#: mod/profile_photo.php:251
 msgid "Upload"
 msgstr ""
 
-#: mod/profile_photo.php:248
+#: mod/profile_photo.php:254
 msgid "or"
 msgstr ""
 
-#: mod/profile_photo.php:248
+#: mod/profile_photo.php:254
 msgid "skip this step"
 msgstr ""
 
-#: mod/profile_photo.php:248
+#: mod/profile_photo.php:254
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: mod/profile_photo.php:262
+#: mod/profile_photo.php:268
 msgid "Crop Image"
 msgstr ""
 
-#: mod/profile_photo.php:263
+#: mod/profile_photo.php:269
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: mod/profile_photo.php:265
+#: mod/profile_photo.php:271
 msgid "Done Editing"
 msgstr ""
 
-#: mod/profile_photo.php:299
+#: mod/profile_photo.php:305
 msgid "Image uploaded successfully."
 msgstr ""
 
-#: mod/profile_photo.php:301 mod/wall_upload.php:216 mod/photos.php:870
+#: mod/profile_photo.php:307 mod/wall_upload.php:216 mod/photos.php:870
 msgid "Image upload failed."
 msgstr ""
 
 #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168
 #: include/conversation.php:130 include/conversation.php:266
-#: include/text.php:1988 include/diaspora.php:2140
+#: include/text.php:1995 include/diaspora.php:2140
 #: view/theme/diabook/theme.php:471
 msgid "photo"
 msgstr ""
@@ -897,11 +897,11 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: mod/filer.php:31 mod/editpost.php:108 mod/notes.php:61 include/text.php:997
+#: mod/filer.php:31 mod/editpost.php:108 mod/notes.php:61 include/text.php:1004
 msgid "Save"
 msgstr ""
 
-#: mod/follow.php:18 mod/dfrn_request.php:861
+#: mod/follow.php:18 mod/dfrn_request.php:863
 msgid "Submit Request"
 msgstr ""
 
@@ -921,11 +921,11 @@ msgstr ""
 msgid "The network type couldn't be detected. Contact can't be added."
 msgstr ""
 
-#: mod/follow.php:104 mod/dfrn_request.php:847
+#: mod/follow.php:104 mod/dfrn_request.php:849
 msgid "Please answer the following:"
 msgstr ""
 
-#: mod/follow.php:105 mod/dfrn_request.php:848
+#: mod/follow.php:105 mod/dfrn_request.php:850
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
@@ -934,32 +934,32 @@ msgstr ""
 #: mod/settings.php:1105 mod/settings.php:1109 mod/settings.php:1114
 #: mod/settings.php:1120 mod/settings.php:1126 mod/settings.php:1132
 #: mod/settings.php:1158 mod/settings.php:1159 mod/settings.php:1160
-#: mod/settings.php:1161 mod/settings.php:1162 mod/dfrn_request.php:848
-#: mod/register.php:236 mod/profiles.php:658 mod/profiles.php:662
+#: mod/settings.php:1161 mod/settings.php:1162 mod/dfrn_request.php:850
+#: mod/register.php:239 mod/profiles.php:658 mod/profiles.php:662
 #: mod/profiles.php:687 mod/api.php:106
 msgid "No"
 msgstr ""
 
-#: mod/follow.php:106 mod/dfrn_request.php:852
+#: mod/follow.php:106 mod/dfrn_request.php:854
 msgid "Add a personal note:"
 msgstr ""
 
-#: mod/follow.php:112 mod/dfrn_request.php:858
+#: mod/follow.php:112 mod/dfrn_request.php:860
 msgid "Your Identity Address:"
 msgstr ""
 
 #: mod/follow.php:125 mod/notifications.php:244 mod/events.php:566
-#: mod/directory.php:139 include/identity.php:268 include/bb2diaspora.php:170
+#: mod/directory.php:139 include/identity.php:278 include/bb2diaspora.php:170
 #: include/event.php:36 include/event.php:60
 msgid "Location:"
 msgstr ""
 
 #: mod/follow.php:127 mod/notifications.php:246 mod/directory.php:147
-#: include/identity.php:277 include/identity.php:582
+#: include/identity.php:287 include/identity.php:594
 msgid "About:"
 msgstr ""
 
-#: mod/follow.php:129 mod/notifications.php:248 include/identity.php:576
+#: mod/follow.php:129 mod/notifications.php:248 include/identity.php:588
 msgid "Tags:"
 msgstr ""
 
@@ -975,34 +975,34 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: mod/item.php:461 mod/wall_upload.php:213 mod/wall_upload.php:227
+#: mod/item.php:460 mod/wall_upload.php:213 mod/wall_upload.php:227
 #: mod/wall_upload.php:234 include/Photo.php:954 include/Photo.php:969
 #: include/Photo.php:976 include/Photo.php:998 include/message.php:145
 msgid "Wall Photos"
 msgstr ""
 
-#: mod/item.php:835
+#: mod/item.php:834
 msgid "System error. Post not saved."
 msgstr ""
 
-#: mod/item.php:964
+#: mod/item.php:963
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/item.php:966
+#: mod/item.php:965
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: mod/item.php:967
+#: mod/item.php:966
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: mod/item.php:971
+#: mod/item.php:970
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -1031,7 +1031,7 @@ msgstr ""
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: mod/group.php:94 mod/group.php:178 include/group.php:275
+#: mod/group.php:94 mod/group.php:178 include/group.php:289
 msgid "Group Name: "
 msgstr ""
 
@@ -1149,7 +1149,7 @@ msgstr ""
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:732 include/items.php:4313
+#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4244
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1158,7 +1158,7 @@ msgstr ""
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: mod/profile.php:21 include/identity.php:77
+#: mod/profile.php:21 include/identity.php:82
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr ""
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: mod/videos.php:375 include/text.php:1458
+#: mod/videos.php:375 include/text.php:1465
 msgid "View Video"
 msgstr ""
 
@@ -1218,7 +1218,7 @@ msgstr ""
 
 #: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
 #: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
-#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1702
+#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1711
 msgid "Invalid request."
 msgstr ""
 
@@ -1353,7 +1353,7 @@ msgid "Reset"
 msgstr ""
 
 #: mod/like.php:170 include/conversation.php:122 include/conversation.php:258
-#: include/text.php:1986 view/theme/diabook/theme.php:463
+#: include/text.php:1993 view/theme/diabook/theme.php:463
 msgid "event"
 msgstr ""
 
@@ -1383,23 +1383,28 @@ msgstr ""
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: mod/ping.php:257
+#: mod/ping.php:273
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/ping.php:272
+#: mod/ping.php:288
 msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/ping.php:287
+#: mod/ping.php:303
 msgid "{0} requested registration"
 msgstr ""
 
-#: mod/viewcontacts.php:41
+#: mod/viewcontacts.php:52
 msgid "No contacts."
 msgstr ""
 
-#: mod/viewcontacts.php:83 include/text.php:917
+#: mod/viewcontacts.php:85 mod/dirfind.php:208 mod/network.php:596
+#: mod/allfriends.php:79 mod/match.php:82 mod/common.php:122 mod/suggest.php:95
+msgid "Forum"
+msgstr ""
+
+#: mod/viewcontacts.php:96 include/text.php:921
 msgid "View Contacts"
 msgstr ""
 
@@ -1419,7 +1424,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: mod/notifications.php:93 mod/network.php:385
+#: mod/notifications.php:93 mod/network.php:381
 msgid "Personal"
 msgstr ""
 
@@ -1461,7 +1466,7 @@ msgstr ""
 msgid "if applicable"
 msgstr ""
 
-#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1110
+#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1113
 msgid "Approve"
 msgstr ""
 
@@ -1511,8 +1516,8 @@ msgstr ""
 msgid "New Follower"
 msgstr ""
 
-#: mod/notifications.php:250 mod/directory.php:141 include/identity.php:270
-#: include/identity.php:541
+#: mod/notifications.php:250 mod/directory.php:141 include/identity.php:280
+#: include/identity.php:553
 msgid "Gender:"
 msgstr ""
 
@@ -1822,8 +1827,8 @@ msgstr ""
 msgid "Refetch contact data"
 msgstr ""
 
-#: mod/crepair.php:169 mod/admin.php:1108 mod/admin.php:1120 mod/admin.php:1121
-#: mod/admin.php:1134 mod/settings.php:650 mod/settings.php:676
+#: mod/crepair.php:169 mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124
+#: mod/admin.php:1137 mod/settings.php:650 mod/settings.php:676
 msgid "Name"
 msgstr ""
 
@@ -1885,27 +1890,28 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: mod/dirfind.php:188 mod/allfriends.php:82 mod/match.php:84
-#: mod/suggest.php:97 include/contact_widgets.php:10 include/identity.php:188
+#: mod/dirfind.php:188 mod/allfriends.php:82 mod/match.php:85
+#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:193
 msgid "Connect"
 msgstr ""
 
 #: mod/dirfind.php:189 mod/allfriends.php:66 mod/match.php:70
-#: mod/directory.php:156 mod/suggest.php:81 include/Contact.php:335
-#: include/conversation.php:912 include/conversation.php:926
+#: mod/directory.php:156 mod/suggest.php:81 include/Contact.php:307
+#: include/Contact.php:320 include/Contact.php:362 include/conversation.php:912
+#: include/conversation.php:926
 msgid "View Profile"
 msgstr ""
 
-#: mod/dirfind.php:217
+#: mod/dirfind.php:218
 #, php-format
 msgid "People Search - %s"
 msgstr ""
 
-#: mod/dirfind.php:224 mod/match.php:104
+#: mod/dirfind.php:225 mod/match.php:105
 msgid "No matches"
 msgstr ""
 
-#: mod/fbrowser.php:32 include/identity.php:649 include/nav.php:77
+#: mod/fbrowser.php:32 include/identity.php:666 include/nav.php:77
 #: view/theme/diabook/theme.php:126
 msgid "Photos"
 msgstr ""
@@ -1928,19 +1934,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: mod/admin.php:127 mod/admin.php:709
+#: mod/admin.php:127 mod/admin.php:711
 msgid "Site"
 msgstr ""
 
-#: mod/admin.php:128 mod/admin.php:653 mod/admin.php:1103 mod/admin.php:1118
+#: mod/admin.php:128 mod/admin.php:655 mod/admin.php:1106 mod/admin.php:1121
 msgid "Users"
 msgstr ""
 
-#: mod/admin.php:129 mod/admin.php:1207 mod/admin.php:1267 mod/settings.php:66
+#: mod/admin.php:129 mod/admin.php:1210 mod/admin.php:1270 mod/settings.php:66
 msgid "Plugins"
 msgstr ""
 
-#: mod/admin.php:130 mod/admin.php:1452 mod/admin.php:1503
+#: mod/admin.php:130 mod/admin.php:1455 mod/admin.php:1506
 msgid "Themes"
 msgstr ""
 
@@ -1952,7 +1958,7 @@ msgstr ""
 msgid "Inspect Queue"
 msgstr ""
 
-#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1591
+#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1594
 msgid "Logs"
 msgstr ""
 
@@ -1980,9 +1986,9 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:708 mod/admin.php:1102
-#: mod/admin.php:1206 mod/admin.php:1266 mod/admin.php:1451 mod/admin.php:1502
-#: mod/admin.php:1590
+#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:710 mod/admin.php:1105
+#: mod/admin.php:1209 mod/admin.php:1269 mod/admin.php:1454 mod/admin.php:1505
+#: mod/admin.php:1593
 msgid "Administration"
 msgstr ""
 
@@ -2013,19 +2019,19 @@ msgid ""
 "eventually deleted if the delivery fails permanently."
 msgstr ""
 
-#: mod/admin.php:243 mod/admin.php:1056
+#: mod/admin.php:243 mod/admin.php:1059
 msgid "Normal Account"
 msgstr ""
 
-#: mod/admin.php:244 mod/admin.php:1057
+#: mod/admin.php:244 mod/admin.php:1060
 msgid "Soapbox Account"
 msgstr ""
 
-#: mod/admin.php:245 mod/admin.php:1058
+#: mod/admin.php:245 mod/admin.php:1061
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: mod/admin.php:246 mod/admin.php:1059
+#: mod/admin.php:246 mod/admin.php:1062
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -2065,615 +2071,625 @@ msgstr ""
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: mod/admin.php:585
+#: mod/admin.php:587
 msgid "RINO2 needs mcrypt php extension to work."
 msgstr ""
 
-#: mod/admin.php:593
+#: mod/admin.php:595
 msgid "Site settings updated."
 msgstr ""
 
-#: mod/admin.php:617 mod/settings.php:901
+#: mod/admin.php:619 mod/settings.php:901
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: mod/admin.php:636
+#: mod/admin.php:638
 msgid "No community page"
 msgstr ""
 
-#: mod/admin.php:637
+#: mod/admin.php:639
 msgid "Public postings from users of this site"
 msgstr ""
 
-#: mod/admin.php:638
+#: mod/admin.php:640
 msgid "Global community page"
 msgstr ""
 
-#: mod/admin.php:644
+#: mod/admin.php:646
 msgid "At post arrival"
 msgstr ""
 
-#: mod/admin.php:645 include/contact_selectors.php:56
+#: mod/admin.php:647 include/contact_selectors.php:56
 msgid "Frequently"
 msgstr ""
 
-#: mod/admin.php:646 include/contact_selectors.php:57
+#: mod/admin.php:648 include/contact_selectors.php:57
 msgid "Hourly"
 msgstr ""
 
-#: mod/admin.php:647 include/contact_selectors.php:58
+#: mod/admin.php:649 include/contact_selectors.php:58
 msgid "Twice daily"
 msgstr ""
 
-#: mod/admin.php:648 include/contact_selectors.php:59
+#: mod/admin.php:650 include/contact_selectors.php:59
 msgid "Daily"
 msgstr ""
 
-#: mod/admin.php:654
+#: mod/admin.php:656
 msgid "Users, Global Contacts"
 msgstr ""
 
-#: mod/admin.php:655
+#: mod/admin.php:657
 msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/admin.php:659
+#: mod/admin.php:661
 msgid "One month"
 msgstr ""
 
-#: mod/admin.php:660
+#: mod/admin.php:662
 msgid "Three months"
 msgstr ""
 
-#: mod/admin.php:661
+#: mod/admin.php:663
 msgid "Half a year"
 msgstr ""
 
-#: mod/admin.php:662
+#: mod/admin.php:664
 msgid "One year"
 msgstr ""
 
-#: mod/admin.php:667
+#: mod/admin.php:669
 msgid "Multi user instance"
 msgstr ""
 
-#: mod/admin.php:690
+#: mod/admin.php:692
 msgid "Closed"
 msgstr ""
 
-#: mod/admin.php:691
+#: mod/admin.php:693
 msgid "Requires approval"
 msgstr ""
 
-#: mod/admin.php:692
+#: mod/admin.php:694
 msgid "Open"
 msgstr ""
 
-#: mod/admin.php:696
+#: mod/admin.php:698
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: mod/admin.php:697
+#: mod/admin.php:699
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: mod/admin.php:698
+#: mod/admin.php:700
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: mod/admin.php:710 mod/admin.php:1268 mod/admin.php:1504 mod/admin.php:1592
+#: mod/admin.php:712 mod/admin.php:1271 mod/admin.php:1507 mod/admin.php:1595
 #: mod/settings.php:648 mod/settings.php:758 mod/settings.php:802
 #: mod/settings.php:871 mod/settings.php:957 mod/settings.php:1192
 msgid "Save Settings"
 msgstr ""
 
-#: mod/admin.php:711 mod/register.php:260
+#: mod/admin.php:713 mod/register.php:263
 msgid "Registration"
 msgstr ""
 
-#: mod/admin.php:712
+#: mod/admin.php:714
 msgid "File upload"
 msgstr ""
 
-#: mod/admin.php:713
+#: mod/admin.php:715
 msgid "Policies"
 msgstr ""
 
-#: mod/admin.php:714
+#: mod/admin.php:716
 msgid "Advanced"
 msgstr ""
 
-#: mod/admin.php:715
+#: mod/admin.php:717
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/admin.php:716
+#: mod/admin.php:718
 msgid "Performance"
 msgstr ""
 
-#: mod/admin.php:717
+#: mod/admin.php:719
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/admin.php:720
+#: mod/admin.php:722
 msgid "Site name"
 msgstr ""
 
-#: mod/admin.php:721
+#: mod/admin.php:723
 msgid "Host name"
 msgstr ""
 
-#: mod/admin.php:722
+#: mod/admin.php:724
 msgid "Sender Email"
 msgstr ""
 
-#: mod/admin.php:722
+#: mod/admin.php:724
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/admin.php:723
+#: mod/admin.php:725
 msgid "Banner/Logo"
 msgstr ""
 
-#: mod/admin.php:724
+#: mod/admin.php:726
 msgid "Shortcut icon"
 msgstr ""
 
-#: mod/admin.php:724
+#: mod/admin.php:726
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/admin.php:725
+#: mod/admin.php:727
 msgid "Touch icon"
 msgstr ""
 
-#: mod/admin.php:725
+#: mod/admin.php:727
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/admin.php:726
+#: mod/admin.php:728
 msgid "Additional Info"
 msgstr ""
 
-#: mod/admin.php:726
+#: mod/admin.php:728
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/siteinfo."
 msgstr ""
 
-#: mod/admin.php:727
+#: mod/admin.php:729
 msgid "System language"
 msgstr ""
 
-#: mod/admin.php:728
+#: mod/admin.php:730
 msgid "System theme"
 msgstr ""
 
-#: mod/admin.php:728
+#: mod/admin.php:730
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: mod/admin.php:729
+#: mod/admin.php:731
 msgid "Mobile system theme"
 msgstr ""
 
-#: mod/admin.php:729
+#: mod/admin.php:731
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: mod/admin.php:730
+#: mod/admin.php:732
 msgid "SSL link policy"
 msgstr ""
 
-#: mod/admin.php:730
+#: mod/admin.php:732
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: mod/admin.php:731
+#: mod/admin.php:733
 msgid "Force SSL"
 msgstr ""
 
-#: mod/admin.php:731
+#: mod/admin.php:733
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
 "to endless loops."
 msgstr ""
 
-#: mod/admin.php:732
+#: mod/admin.php:734
 msgid "Old style 'Share'"
 msgstr ""
 
-#: mod/admin.php:732
+#: mod/admin.php:734
 msgid "Deactivates the bbcode element 'share' for repeating items."
 msgstr ""
 
-#: mod/admin.php:733
+#: mod/admin.php:735
 msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: mod/admin.php:733
+#: mod/admin.php:735
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr ""
 
-#: mod/admin.php:734
+#: mod/admin.php:736
 msgid "Single user instance"
 msgstr ""
 
-#: mod/admin.php:734
+#: mod/admin.php:736
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: mod/admin.php:735
+#: mod/admin.php:737
 msgid "Maximum image size"
 msgstr ""
 
-#: mod/admin.php:735
+#: mod/admin.php:737
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: mod/admin.php:736
+#: mod/admin.php:738
 msgid "Maximum image length"
 msgstr ""
 
-#: mod/admin.php:736
+#: mod/admin.php:738
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: mod/admin.php:737
+#: mod/admin.php:739
 msgid "JPEG image quality"
 msgstr ""
 
-#: mod/admin.php:737
+#: mod/admin.php:739
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: mod/admin.php:739
+#: mod/admin.php:741
 msgid "Register policy"
 msgstr ""
 
-#: mod/admin.php:740
+#: mod/admin.php:742
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: mod/admin.php:740
+#: mod/admin.php:742
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user "
 "registrations to accept per day.  If register is set to closed, this setting "
 "has no effect."
 msgstr ""
 
-#: mod/admin.php:741
+#: mod/admin.php:743
 msgid "Register text"
 msgstr ""
 
-#: mod/admin.php:741
+#: mod/admin.php:743
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: mod/admin.php:742
+#: mod/admin.php:744
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: mod/admin.php:742
+#: mod/admin.php:744
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: mod/admin.php:743
+#: mod/admin.php:745
 msgid "Allowed friend domains"
 msgstr ""
 
-#: mod/admin.php:743
+#: mod/admin.php:745
 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:744
+#: mod/admin.php:746
 msgid "Allowed email domains"
 msgstr ""
 
-#: mod/admin.php:744
+#: mod/admin.php:746
 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:745
+#: mod/admin.php:747
 msgid "Block public"
 msgstr ""
 
-#: mod/admin.php:745
+#: mod/admin.php:747
 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:746
+#: mod/admin.php:748
 msgid "Force publish"
 msgstr ""
 
-#: mod/admin.php:746
+#: mod/admin.php:748
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: mod/admin.php:747
+#: mod/admin.php:749
 msgid "Global directory URL"
 msgstr ""
 
-#: mod/admin.php:747
+#: mod/admin.php:749
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: mod/admin.php:748
+#: mod/admin.php:750
 msgid "Allow threaded items"
 msgstr ""
 
-#: mod/admin.php:748
+#: mod/admin.php:750
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: mod/admin.php:749
+#: mod/admin.php:751
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: mod/admin.php:749
+#: mod/admin.php:751
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: mod/admin.php:750
+#: mod/admin.php:752
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: mod/admin.php:750
+#: mod/admin.php:752
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr ""
 
-#: mod/admin.php:751
+#: mod/admin.php:753
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: mod/admin.php:751
+#: mod/admin.php:753
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: mod/admin.php:752
+#: mod/admin.php:754
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: mod/admin.php:752
+#: mod/admin.php:754
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a while."
 msgstr ""
 
-#: mod/admin.php:753
+#: mod/admin.php:755
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: mod/admin.php:753
+#: mod/admin.php:755
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr ""
 
-#: mod/admin.php:754
+#: mod/admin.php:756
 msgid "Block multiple registrations"
 msgstr ""
 
-#: mod/admin.php:754
+#: mod/admin.php:756
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: mod/admin.php:755
+#: mod/admin.php:757
 msgid "OpenID support"
 msgstr ""
 
-#: mod/admin.php:755
+#: mod/admin.php:757
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: mod/admin.php:756
+#: mod/admin.php:758
 msgid "Fullname check"
 msgstr ""
 
-#: mod/admin.php:756
+#: mod/admin.php:758
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: mod/admin.php:757
+#: mod/admin.php:759
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: mod/admin.php:757
+#: mod/admin.php:759
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: mod/admin.php:758
+#: mod/admin.php:760
 msgid "Community Page Style"
 msgstr ""
 
-#: mod/admin.php:758
+#: mod/admin.php:760
 msgid ""
 "Type of community page to show. 'Global community' shows every public "
 "posting from an open distributed network that arrived on this server."
 msgstr ""
 
-#: mod/admin.php:759
+#: mod/admin.php:761
 msgid "Posts per user on community page"
 msgstr ""
 
-#: mod/admin.php:759
+#: mod/admin.php:761
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr ""
 
-#: mod/admin.php:760
+#: mod/admin.php:762
 msgid "Enable OStatus support"
 msgstr ""
 
-#: mod/admin.php:760
+#: mod/admin.php:762
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: mod/admin.php:761
+#: mod/admin.php:763
 msgid "OStatus conversation completion interval"
 msgstr ""
 
-#: mod/admin.php:761
+#: mod/admin.php:763
 msgid ""
 "How often shall the poller check for new entries in OStatus conversations? "
 "This can be a very ressource task."
 msgstr ""
 
-#: mod/admin.php:762
+#: mod/admin.php:764
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/admin.php:764
+#: mod/admin.php:766
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub "
 "directory."
 msgstr ""
 
-#: mod/admin.php:765
+#: mod/admin.php:767
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: mod/admin.php:765
+#: mod/admin.php:767
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: mod/admin.php:766
+#: mod/admin.php:768
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: mod/admin.php:766
+#: mod/admin.php:768
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: mod/admin.php:767
+#: mod/admin.php:769
 msgid "Verify SSL"
 msgstr ""
 
-#: mod/admin.php:767
+#: mod/admin.php:769
 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:768
+#: mod/admin.php:770
 msgid "Proxy user"
 msgstr ""
 
-#: mod/admin.php:769
+#: mod/admin.php:771
 msgid "Proxy URL"
 msgstr ""
 
-#: mod/admin.php:770
+#: mod/admin.php:772
 msgid "Network timeout"
 msgstr ""
 
-#: mod/admin.php:770
+#: mod/admin.php:772
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: mod/admin.php:771
+#: mod/admin.php:773
 msgid "Delivery interval"
 msgstr ""
 
-#: mod/admin.php:771
+#: mod/admin.php:773
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: mod/admin.php:772
+#: mod/admin.php:774
 msgid "Poll interval"
 msgstr ""
 
-#: mod/admin.php:772
+#: mod/admin.php:774
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: mod/admin.php:773
+#: mod/admin.php:775
 msgid "Maximum Load Average"
 msgstr ""
 
-#: mod/admin.php:773
+#: mod/admin.php:775
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: mod/admin.php:774
+#: mod/admin.php:776
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/admin.php:774
+#: mod/admin.php:776
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/admin.php:776
+#: mod/admin.php:777
+msgid "Maximum table size for optimization"
+msgstr ""
+
+#: mod/admin.php:777
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
+msgstr ""
+
+#: mod/admin.php:779
 msgid "Periodical check of global contacts"
 msgstr ""
 
-#: mod/admin.php:776
+#: mod/admin.php:779
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr ""
 
-#: mod/admin.php:777
+#: mod/admin.php:780
 msgid "Days between requery"
 msgstr ""
 
-#: mod/admin.php:777
+#: mod/admin.php:780
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:778
+#: mod/admin.php:781
 msgid "Discover contacts from other servers"
 msgstr ""
 
-#: mod/admin.php:778
+#: mod/admin.php:781
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
@@ -2683,32 +2699,32 @@ msgid ""
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:779
+#: mod/admin.php:782
 msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:779
+#: mod/admin.php:782
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
 msgstr ""
 
-#: mod/admin.php:780
+#: mod/admin.php:783
 msgid "Search the local directory"
 msgstr ""
 
-#: mod/admin.php:780
+#: mod/admin.php:783
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr ""
 
-#: mod/admin.php:782
+#: mod/admin.php:785
 msgid "Publish server information"
 msgstr ""
 
-#: mod/admin.php:782
+#: mod/admin.php:785
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -2716,204 +2732,204 @@ msgid ""
 "href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr ""
 
-#: mod/admin.php:784
+#: mod/admin.php:787
 msgid "Use MySQL full text engine"
 msgstr ""
 
-#: mod/admin.php:784
+#: mod/admin.php:787
 msgid ""
 "Activates the full text engine. Speeds up search - but can only search for "
 "four and more characters."
 msgstr ""
 
-#: mod/admin.php:785
+#: mod/admin.php:788
 msgid "Suppress Language"
 msgstr ""
 
-#: mod/admin.php:785
+#: mod/admin.php:788
 msgid "Suppress language information in meta information about a posting."
 msgstr ""
 
-#: mod/admin.php:786
+#: mod/admin.php:789
 msgid "Suppress Tags"
 msgstr ""
 
-#: mod/admin.php:786
+#: mod/admin.php:789
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: mod/admin.php:787
+#: mod/admin.php:790
 msgid "Path to item cache"
 msgstr ""
 
-#: mod/admin.php:787
+#: mod/admin.php:790
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:788
+#: mod/admin.php:791
 msgid "Cache duration in seconds"
 msgstr ""
 
-#: mod/admin.php:788
+#: mod/admin.php:791
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One "
 "day). To disable the item cache, set the value to -1."
 msgstr ""
 
-#: mod/admin.php:789
+#: mod/admin.php:792
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: mod/admin.php:789
+#: mod/admin.php:792
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:790
+#: mod/admin.php:793
 msgid "Path for lock file"
 msgstr ""
 
-#: mod/admin.php:790
+#: mod/admin.php:793
 msgid ""
 "The lock file is used to avoid multiple pollers at one time. Only define a "
 "folder here."
 msgstr ""
 
-#: mod/admin.php:791
+#: mod/admin.php:794
 msgid "Temp path"
 msgstr ""
 
-#: mod/admin.php:791
+#: mod/admin.php:794
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr ""
 
-#: mod/admin.php:792
+#: mod/admin.php:795
 msgid "Base path to installation"
 msgstr ""
 
-#: mod/admin.php:792
+#: mod/admin.php:795
 msgid ""
 "If the system cannot detect the correct path to your installation, enter the "
 "correct path here. This setting should only be set if you are using a "
 "restricted system and symbolic links to your webroot."
 msgstr ""
 
-#: mod/admin.php:793
+#: mod/admin.php:796
 msgid "Disable picture proxy"
 msgstr ""
 
-#: mod/admin.php:793
+#: mod/admin.php:796
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on "
 "systems with very low bandwith."
 msgstr ""
 
-#: mod/admin.php:794
+#: mod/admin.php:797
 msgid "Enable old style pager"
 msgstr ""
 
-#: mod/admin.php:794
+#: mod/admin.php:797
 msgid ""
 "The old style pager has page numbers but slows down massively the page speed."
 msgstr ""
 
-#: mod/admin.php:795
+#: mod/admin.php:798
 msgid "Only search in tags"
 msgstr ""
 
-#: mod/admin.php:795
+#: mod/admin.php:798
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: mod/admin.php:797
+#: mod/admin.php:800
 msgid "New base url"
 msgstr ""
 
-#: mod/admin.php:797
+#: mod/admin.php:800
 msgid ""
 "Change base url for this server. Sends relocate message to all DFRN contacts "
 "of all users."
 msgstr ""
 
-#: mod/admin.php:799
+#: mod/admin.php:802
 msgid "RINO Encryption"
 msgstr ""
 
-#: mod/admin.php:799
+#: mod/admin.php:802
 msgid "Encryption layer between nodes."
 msgstr ""
 
-#: mod/admin.php:800
+#: mod/admin.php:803
 msgid "Embedly API key"
 msgstr ""
 
-#: mod/admin.php:800
+#: mod/admin.php:803
 msgid ""
 "<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
 "web pages. This is an optional parameter."
 msgstr ""
 
-#: mod/admin.php:818
+#: mod/admin.php:821
 msgid "Update has been marked successful"
 msgstr ""
 
-#: mod/admin.php:826
+#: mod/admin.php:829
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:829
+#: mod/admin.php:832
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:841
+#: mod/admin.php:844
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:844
+#: mod/admin.php:847
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:848
+#: mod/admin.php:851
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: mod/admin.php:850
+#: mod/admin.php:853
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:869
+#: mod/admin.php:872
 msgid "No failed updates."
 msgstr ""
 
-#: mod/admin.php:870
+#: mod/admin.php:873
 msgid "Check database structure"
 msgstr ""
 
-#: mod/admin.php:875
+#: mod/admin.php:878
 msgid "Failed Updates"
 msgstr ""
 
-#: mod/admin.php:876
+#: mod/admin.php:879
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: mod/admin.php:877
+#: mod/admin.php:880
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: mod/admin.php:878
+#: mod/admin.php:881
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: mod/admin.php:910
+#: mod/admin.php:913
 #, php-format
 msgid ""
 "\n"
@@ -2921,7 +2937,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/admin.php:913
+#: mod/admin.php:916
 #, php-format
 msgid ""
 "\n"
@@ -2957,295 +2973,295 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:945 include/user.php:421
+#: mod/admin.php:948 include/user.php:423
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: mod/admin.php:957
+#: mod/admin.php:960
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:964
+#: mod/admin.php:967
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:1003
+#: mod/admin.php:1006
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: mod/admin.php:1011
+#: mod/admin.php:1014
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: mod/admin.php:1011
+#: mod/admin.php:1014
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: mod/admin.php:1104
+#: mod/admin.php:1107
 msgid "Add User"
 msgstr ""
 
-#: mod/admin.php:1105
+#: mod/admin.php:1108
 msgid "select all"
 msgstr ""
 
-#: mod/admin.php:1106
+#: mod/admin.php:1109
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/admin.php:1107
+#: mod/admin.php:1110
 msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1108
+#: mod/admin.php:1111
 msgid "Request date"
 msgstr ""
 
-#: mod/admin.php:1108 mod/admin.php:1120 mod/admin.php:1121 mod/admin.php:1136
+#: mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 mod/admin.php:1139
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
 msgid "Email"
 msgstr ""
 
-#: mod/admin.php:1109
+#: mod/admin.php:1112
 msgid "No registrations."
 msgstr ""
 
-#: mod/admin.php:1111
+#: mod/admin.php:1114
 msgid "Deny"
 msgstr ""
 
-#: mod/admin.php:1115
+#: mod/admin.php:1118
 msgid "Site admin"
 msgstr ""
 
-#: mod/admin.php:1116
+#: mod/admin.php:1119
 msgid "Account expired"
 msgstr ""
 
-#: mod/admin.php:1119
+#: mod/admin.php:1122
 msgid "New User"
 msgstr ""
 
-#: mod/admin.php:1120 mod/admin.php:1121
+#: mod/admin.php:1123 mod/admin.php:1124
 msgid "Register date"
 msgstr ""
 
-#: mod/admin.php:1120 mod/admin.php:1121
+#: mod/admin.php:1123 mod/admin.php:1124
 msgid "Last login"
 msgstr ""
 
-#: mod/admin.php:1120 mod/admin.php:1121
+#: mod/admin.php:1123 mod/admin.php:1124
 msgid "Last item"
 msgstr ""
 
-#: mod/admin.php:1120
+#: mod/admin.php:1123
 msgid "Deleted since"
 msgstr ""
 
-#: mod/admin.php:1121 mod/settings.php:41
+#: mod/admin.php:1124 mod/settings.php:41
 msgid "Account"
 msgstr ""
 
-#: mod/admin.php:1123
+#: mod/admin.php:1126
 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:1124
+#: mod/admin.php:1127
 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:1134
+#: mod/admin.php:1137
 msgid "Name of the new user."
 msgstr ""
 
-#: mod/admin.php:1135
+#: mod/admin.php:1138
 msgid "Nickname"
 msgstr ""
 
-#: mod/admin.php:1135
+#: mod/admin.php:1138
 msgid "Nickname of the new user."
 msgstr ""
 
-#: mod/admin.php:1136
+#: mod/admin.php:1139
 msgid "Email address of the new user."
 msgstr ""
 
-#: mod/admin.php:1169
+#: mod/admin.php:1172
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: mod/admin.php:1173
+#: mod/admin.php:1176
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: mod/admin.php:1183 mod/admin.php:1407
+#: mod/admin.php:1186 mod/admin.php:1410
 msgid "Disable"
 msgstr ""
 
-#: mod/admin.php:1185 mod/admin.php:1409
+#: mod/admin.php:1188 mod/admin.php:1412
 msgid "Enable"
 msgstr ""
 
-#: mod/admin.php:1208 mod/admin.php:1453
+#: mod/admin.php:1211 mod/admin.php:1456
 msgid "Toggle"
 msgstr ""
 
-#: mod/admin.php:1216 mod/admin.php:1463
+#: mod/admin.php:1219 mod/admin.php:1466
 msgid "Author: "
 msgstr ""
 
-#: mod/admin.php:1217 mod/admin.php:1464
+#: mod/admin.php:1220 mod/admin.php:1467
 msgid "Maintainer: "
 msgstr ""
 
-#: mod/admin.php:1269
+#: mod/admin.php:1272
 msgid "Reload active plugins"
 msgstr ""
 
-#: mod/admin.php:1367
+#: mod/admin.php:1370
 msgid "No themes found."
 msgstr ""
 
-#: mod/admin.php:1445
+#: mod/admin.php:1448
 msgid "Screenshot"
 msgstr ""
 
-#: mod/admin.php:1505
+#: mod/admin.php:1508
 msgid "Reload active themes"
 msgstr ""
 
-#: mod/admin.php:1509
+#: mod/admin.php:1512
 msgid "[Experimental]"
 msgstr ""
 
-#: mod/admin.php:1510
+#: mod/admin.php:1513
 msgid "[Unsupported]"
 msgstr ""
 
-#: mod/admin.php:1537
+#: mod/admin.php:1540
 msgid "Log settings updated."
 msgstr ""
 
-#: mod/admin.php:1593
+#: mod/admin.php:1596
 msgid "Clear"
 msgstr ""
 
-#: mod/admin.php:1599
+#: mod/admin.php:1602
 msgid "Enable Debugging"
 msgstr ""
 
-#: mod/admin.php:1600
+#: mod/admin.php:1603
 msgid "Log file"
 msgstr ""
 
-#: mod/admin.php:1600
+#: mod/admin.php:1603
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: mod/admin.php:1601
+#: mod/admin.php:1604
 msgid "Log level"
 msgstr ""
 
-#: mod/admin.php:1651 include/acl_selectors.php:347
+#: mod/admin.php:1654 include/acl_selectors.php:348
 msgid "Close"
 msgstr ""
 
-#: mod/admin.php:1657
+#: mod/admin.php:1660
 msgid "FTP Host"
 msgstr ""
 
-#: mod/admin.php:1658
+#: mod/admin.php:1661
 msgid "FTP Path"
 msgstr ""
 
-#: mod/admin.php:1659
+#: mod/admin.php:1662
 msgid "FTP User"
 msgstr ""
 
-#: mod/admin.php:1660
+#: mod/admin.php:1663
 msgid "FTP Password"
 msgstr ""
 
-#: mod/network.php:143
+#: mod/network.php:146
 #, php-format
 msgid "Search Results For: %s"
 msgstr ""
 
-#: mod/network.php:195 mod/search.php:25
+#: mod/network.php:191 mod/search.php:25
 msgid "Remove term"
 msgstr ""
 
-#: mod/network.php:204 mod/search.php:34 include/features.php:43
+#: mod/network.php:200 mod/search.php:34 include/features.php:79
 msgid "Saved Searches"
 msgstr ""
 
-#: mod/network.php:205 include/group.php:279
+#: mod/network.php:201 include/group.php:293
 msgid "add"
 msgstr ""
 
-#: mod/network.php:366
+#: mod/network.php:362
 msgid "Commented Order"
 msgstr ""
 
-#: mod/network.php:369
+#: mod/network.php:365
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: mod/network.php:374
+#: mod/network.php:370
 msgid "Posted Order"
 msgstr ""
 
-#: mod/network.php:377
+#: mod/network.php:373
 msgid "Sort by Post Date"
 msgstr ""
 
-#: mod/network.php:388
+#: mod/network.php:384
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: mod/network.php:396
+#: mod/network.php:392
 msgid "New"
 msgstr ""
 
-#: mod/network.php:399
+#: mod/network.php:395
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: mod/network.php:407
+#: mod/network.php:403
 msgid "Shared Links"
 msgstr ""
 
-#: mod/network.php:410
+#: mod/network.php:406
 msgid "Interesting Links"
 msgstr ""
 
-#: mod/network.php:418
+#: mod/network.php:414
 msgid "Starred"
 msgstr ""
 
-#: mod/network.php:421
+#: mod/network.php:417
 msgid "Favourite Posts"
 msgstr ""
 
-#: mod/network.php:480
+#: mod/network.php:476
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -3253,33 +3269,28 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/network.php:483
+#: mod/network.php:479
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: mod/network.php:550 mod/content.php:119
+#: mod/network.php:546 mod/content.php:119
 msgid "No such group"
 msgstr ""
 
-#: mod/network.php:567 mod/content.php:130
+#: mod/network.php:563 mod/content.php:130
 msgid "Group is empty"
 msgstr ""
 
-#: mod/network.php:578 mod/content.php:135
+#: mod/network.php:574 mod/content.php:135
 #, php-format
 msgid "Group: %s"
 msgstr ""
 
-#: mod/network.php:596
-#, php-format
-msgid "Contact: %s"
-msgstr ""
-
-#: mod/network.php:600
+#: mod/network.php:606
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: mod/network.php:605
+#: mod/network.php:611
 msgid "Invalid contact."
 msgstr ""
 
@@ -3287,10 +3298,6 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: mod/allfriends.php:79 mod/common.php:122
-msgid "Forum"
-msgstr ""
-
 #: mod/allfriends.php:92
 #, php-format
 msgid "Friends of %s"
@@ -3332,31 +3339,31 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: mod/events.php:208 mod/settings.php:936 include/text.php:1267
+#: mod/events.php:208 mod/settings.php:936 include/text.php:1274
 msgid "Sunday"
 msgstr ""
 
-#: mod/events.php:209 mod/settings.php:936 include/text.php:1267
+#: mod/events.php:209 mod/settings.php:936 include/text.php:1274
 msgid "Monday"
 msgstr ""
 
-#: mod/events.php:210 include/text.php:1267
+#: mod/events.php:210 include/text.php:1274
 msgid "Tuesday"
 msgstr ""
 
-#: mod/events.php:211 include/text.php:1267
+#: mod/events.php:211 include/text.php:1274
 msgid "Wednesday"
 msgstr ""
 
-#: mod/events.php:212 include/text.php:1267
+#: mod/events.php:212 include/text.php:1274
 msgid "Thursday"
 msgstr ""
 
-#: mod/events.php:213 include/text.php:1267
+#: mod/events.php:213 include/text.php:1274
 msgid "Friday"
 msgstr ""
 
-#: mod/events.php:214 include/text.php:1267
+#: mod/events.php:214 include/text.php:1274
 msgid "Saturday"
 msgstr ""
 
@@ -3376,7 +3383,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: mod/events.php:219 mod/events.php:231 include/text.php:1271
+#: mod/events.php:219 mod/events.php:231 include/text.php:1278
 msgid "May"
 msgstr ""
 
@@ -3408,47 +3415,47 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: mod/events.php:227 include/text.php:1271
+#: mod/events.php:227 include/text.php:1278
 msgid "January"
 msgstr ""
 
-#: mod/events.php:228 include/text.php:1271
+#: mod/events.php:228 include/text.php:1278
 msgid "February"
 msgstr ""
 
-#: mod/events.php:229 include/text.php:1271
+#: mod/events.php:229 include/text.php:1278
 msgid "March"
 msgstr ""
 
-#: mod/events.php:230 include/text.php:1271
+#: mod/events.php:230 include/text.php:1278
 msgid "April"
 msgstr ""
 
-#: mod/events.php:232 include/text.php:1271
+#: mod/events.php:232 include/text.php:1278
 msgid "June"
 msgstr ""
 
-#: mod/events.php:233 include/text.php:1271
+#: mod/events.php:233 include/text.php:1278
 msgid "July"
 msgstr ""
 
-#: mod/events.php:234 include/text.php:1271
+#: mod/events.php:234 include/text.php:1278
 msgid "August"
 msgstr ""
 
-#: mod/events.php:235 include/text.php:1271
+#: mod/events.php:235 include/text.php:1278
 msgid "September"
 msgstr ""
 
-#: mod/events.php:236 include/text.php:1271
+#: mod/events.php:236 include/text.php:1278
 msgid "October"
 msgstr ""
 
-#: mod/events.php:237 include/text.php:1271
+#: mod/events.php:237 include/text.php:1278
 msgid "November"
 msgstr ""
 
-#: mod/events.php:238 include/text.php:1271
+#: mod/events.php:238 include/text.php:1278
 msgid "December"
 msgstr ""
 
@@ -3476,11 +3483,11 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: mod/events.php:421 include/text.php:1714 include/text.php:1721
+#: mod/events.php:421 include/text.php:1721 include/text.php:1728
 msgid "link to source"
 msgstr ""
 
-#: mod/events.php:456 include/identity.php:669 include/nav.php:79
+#: mod/events.php:456 include/identity.php:686 include/nav.php:79
 #: include/nav.php:140 view/theme/diabook/theme.php:127
 msgid "Events"
 msgstr ""
@@ -3493,7 +3500,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: mod/events.php:459 mod/install.php:212
+#: mod/events.php:459 mod/install.php:220
 msgid "Next"
 msgstr ""
 
@@ -3583,14 +3590,15 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: mod/content.php:607 object/Item.php:421 object/Item.php:434
-#: include/text.php:1992
+#: include/text.php:1999
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: mod/content.php:608 boot.php:773 object/Item.php:422
-#: include/contact_widgets.php:205 include/items.php:5214
+#: include/contact_widgets.php:242 include/forums.php:110
+#: include/items.php:5152 view/theme/vier/theme.php:264
 msgid "show more"
 msgstr ""
 
@@ -3719,105 +3727,105 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: mod/install.php:120
+#: mod/install.php:128
 msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: mod/install.php:126
+#: mod/install.php:134
 msgid "Could not connect to database."
 msgstr ""
 
-#: mod/install.php:130
+#: mod/install.php:138
 msgid "Could not create table."
 msgstr ""
 
-#: mod/install.php:136
+#: mod/install.php:144
 msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: mod/install.php:141
+#: mod/install.php:149
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: mod/install.php:142 mod/install.php:211 mod/install.php:569
+#: mod/install.php:150 mod/install.php:219 mod/install.php:577
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: mod/install.php:154
+#: mod/install.php:162
 msgid "Database already in use."
 msgstr ""
 
-#: mod/install.php:208
+#: mod/install.php:216
 msgid "System check"
 msgstr ""
 
-#: mod/install.php:213
+#: mod/install.php:221
 msgid "Check again"
 msgstr ""
 
-#: mod/install.php:232
+#: mod/install.php:240
 msgid "Database connection"
 msgstr ""
 
-#: mod/install.php:233
+#: mod/install.php:241
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: mod/install.php:234
+#: mod/install.php:242
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: mod/install.php:235
+#: mod/install.php:243
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: mod/install.php:239
+#: mod/install.php:247
 msgid "Database Server Name"
 msgstr ""
 
-#: mod/install.php:240
+#: mod/install.php:248
 msgid "Database Login Name"
 msgstr ""
 
-#: mod/install.php:241
+#: mod/install.php:249
 msgid "Database Login Password"
 msgstr ""
 
-#: mod/install.php:242
+#: mod/install.php:250
 msgid "Database Name"
 msgstr ""
 
-#: mod/install.php:243 mod/install.php:282
+#: mod/install.php:251 mod/install.php:290
 msgid "Site administrator email address"
 msgstr ""
 
-#: mod/install.php:243 mod/install.php:282
+#: mod/install.php:251 mod/install.php:290
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: mod/install.php:247 mod/install.php:285
+#: mod/install.php:255 mod/install.php:293
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: mod/install.php:272
+#: mod/install.php:280
 msgid "Site settings"
 msgstr ""
 
-#: mod/install.php:326
+#: mod/install.php:334
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: mod/install.php:327
+#: mod/install.php:335
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a href='https://"
@@ -3825,216 +3833,216 @@ msgid ""
 "poller'>'Setup the poller'</a>"
 msgstr ""
 
-#: mod/install.php:331
+#: mod/install.php:339
 msgid "PHP executable path"
 msgstr ""
 
-#: mod/install.php:331
+#: mod/install.php:339
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: mod/install.php:336
+#: mod/install.php:344
 msgid "Command line PHP"
 msgstr ""
 
-#: mod/install.php:345
+#: mod/install.php:353
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: mod/install.php:346
+#: mod/install.php:354
 msgid "Found PHP version: "
 msgstr ""
 
-#: mod/install.php:348
+#: mod/install.php:356
 msgid "PHP cli binary"
 msgstr ""
 
-#: mod/install.php:359
+#: mod/install.php:367
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: mod/install.php:360
+#: mod/install.php:368
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: mod/install.php:362
+#: mod/install.php:370
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: mod/install.php:383
+#: mod/install.php:391
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: mod/install.php:384
+#: mod/install.php:392
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: mod/install.php:386
+#: mod/install.php:394
 msgid "Generate encryption keys"
 msgstr ""
 
-#: mod/install.php:393
+#: mod/install.php:401
 msgid "libCurl PHP module"
 msgstr ""
 
-#: mod/install.php:394
+#: mod/install.php:402
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: mod/install.php:395
+#: mod/install.php:403
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: mod/install.php:396
+#: mod/install.php:404
 msgid "mysqli PHP module"
 msgstr ""
 
-#: mod/install.php:397
+#: mod/install.php:405
 msgid "mb_string PHP module"
 msgstr ""
 
-#: mod/install.php:398
+#: mod/install.php:406
 msgid "mcrypt PHP module"
 msgstr ""
 
-#: mod/install.php:403 mod/install.php:405
+#: mod/install.php:411 mod/install.php:413
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: mod/install.php:403
+#: mod/install.php:411
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: mod/install.php:411
+#: mod/install.php:419
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: mod/install.php:415
+#: mod/install.php:423
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: mod/install.php:419
+#: mod/install.php:427
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: mod/install.php:423
+#: mod/install.php:431
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: mod/install.php:427
+#: mod/install.php:435
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: mod/install.php:431
+#: mod/install.php:439
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: mod/install.php:443
+#: mod/install.php:451
 msgid ""
 "Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
 "encryption layer."
 msgstr ""
 
-#: mod/install.php:445
+#: mod/install.php:453
 msgid "mcrypt_create_iv() function"
 msgstr ""
 
-#: mod/install.php:461
+#: mod/install.php:469
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: mod/install.php:462
+#: mod/install.php:470
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: mod/install.php:463
+#: mod/install.php:471
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: mod/install.php:464
+#: mod/install.php:472
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: mod/install.php:467
+#: mod/install.php:475
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: mod/install.php:477
+#: mod/install.php:485
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: mod/install.php:478
+#: mod/install.php:486
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
 msgstr ""
 
-#: mod/install.php:479
+#: mod/install.php:487
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: mod/install.php:480
+#: mod/install.php:488
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: mod/install.php:483
+#: mod/install.php:491
 msgid "view/smarty3 is writable"
 msgstr ""
 
-#: mod/install.php:499
+#: mod/install.php:507
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: mod/install.php:501
+#: mod/install.php:509
 msgid "Url rewrite is working"
 msgstr ""
 
-#: mod/install.php:518
+#: mod/install.php:526
 msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: mod/install.php:520
+#: mod/install.php:528
 msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: mod/install.php:528
+#: mod/install.php:536
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: mod/install.php:567
+#: mod/install.php:575
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: mod/install.php:568
+#: mod/install.php:576
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
@@ -4063,7 +4071,7 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: mod/help.php:36 include/nav.php:113 view/theme/vier/theme.php:273
+#: mod/help.php:36 include/nav.php:113 view/theme/vier/theme.php:302
 msgid "Help"
 msgstr ""
 
@@ -4106,11 +4114,11 @@ msgstr ""
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: mod/match.php:83
+#: mod/match.php:84
 msgid "is interested in:"
 msgstr ""
 
-#: mod/match.php:97
+#: mod/match.php:98
 msgid "Profile Match"
 msgstr ""
 
@@ -4341,7 +4349,7 @@ msgstr ""
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/settings.php:809 mod/dfrn_request.php:856
+#: mod/settings.php:809 mod/dfrn_request.php:858
 #: include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -4482,8 +4490,8 @@ msgstr ""
 
 #: mod/settings.php:973 view/theme/cleanzero/config.php:82
 #: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66
-#: view/theme/diabook/config.php:150 view/theme/vier/config.php:109
-#: view/theme/duepuntozero/config.php:61
+#: view/theme/diabook/config.php:150 view/theme/clean/config.php:85
+#: view/theme/vier/config.php:109 view/theme/duepuntozero/config.php:61
 msgid "Theme settings"
 msgstr ""
 
@@ -4555,7 +4563,7 @@ msgstr ""
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/settings.php:1109 include/acl_selectors.php:330
+#: mod/settings.php:1109 include/acl_selectors.php:331
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
@@ -4634,11 +4642,11 @@ msgstr ""
 msgid "Password Settings"
 msgstr ""
 
-#: mod/settings.php:1199 mod/register.php:271
+#: mod/settings.php:1199 mod/register.php:274
 msgid "New Password:"
 msgstr ""
 
-#: mod/settings.php:1200 mod/register.php:272
+#: mod/settings.php:1200 mod/register.php:275
 msgid "Confirm:"
 msgstr ""
 
@@ -4662,7 +4670,7 @@ msgstr ""
 msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:1207 include/identity.php:539
+#: mod/settings.php:1207 include/identity.php:551
 msgid "Full Name:"
 msgstr ""
 
@@ -4834,147 +4842,147 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: mod/dfrn_request.php:120 mod/dfrn_request.php:518
+#: mod/dfrn_request.php:120 mod/dfrn_request.php:519
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: mod/dfrn_request.php:125 mod/dfrn_request.php:523
+#: mod/dfrn_request.php:125 mod/dfrn_request.php:524
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: mod/dfrn_request.php:127 mod/dfrn_request.php:525
+#: mod/dfrn_request.php:127 mod/dfrn_request.php:526
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: mod/dfrn_request.php:130 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:130 mod/dfrn_request.php:529
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/dfrn_request.php:172
+#: mod/dfrn_request.php:173
 msgid "Introduction complete."
 msgstr ""
 
-#: mod/dfrn_request.php:214
+#: mod/dfrn_request.php:215
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: mod/dfrn_request.php:242
+#: mod/dfrn_request.php:243
 msgid "Profile unavailable."
 msgstr ""
 
-#: mod/dfrn_request.php:267
+#: mod/dfrn_request.php:268
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: mod/dfrn_request.php:268
+#: mod/dfrn_request.php:269
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: mod/dfrn_request.php:269
+#: mod/dfrn_request.php:270
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: mod/dfrn_request.php:331
+#: mod/dfrn_request.php:332
 msgid "Invalid locator"
 msgstr ""
 
-#: mod/dfrn_request.php:340
+#: mod/dfrn_request.php:341
 msgid "Invalid email address."
 msgstr ""
 
-#: mod/dfrn_request.php:367
+#: mod/dfrn_request.php:368
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: mod/dfrn_request.php:463
+#: mod/dfrn_request.php:464
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: mod/dfrn_request.php:476
+#: mod/dfrn_request.php:477
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: mod/dfrn_request.php:480
+#: mod/dfrn_request.php:481
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: mod/dfrn_request.php:501
+#: mod/dfrn_request.php:502
 msgid "Invalid profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:507 include/follow.php:72
+#: mod/dfrn_request.php:508 include/follow.php:72
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:597
+#: mod/dfrn_request.php:599
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: mod/dfrn_request.php:650
+#: mod/dfrn_request.php:652
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: mod/dfrn_request.php:660
+#: mod/dfrn_request.php:662
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: mod/dfrn_request.php:674 mod/dfrn_request.php:691
+#: mod/dfrn_request.php:676 mod/dfrn_request.php:693
 msgid "Confirm"
 msgstr ""
 
-#: mod/dfrn_request.php:686
+#: mod/dfrn_request.php:688
 msgid "Hide this contact"
 msgstr ""
 
-#: mod/dfrn_request.php:689
+#: mod/dfrn_request.php:691
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: mod/dfrn_request.php:690
+#: mod/dfrn_request.php:692
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: mod/dfrn_request.php:819
+#: mod/dfrn_request.php:821
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: mod/dfrn_request.php:840
+#: mod/dfrn_request.php:842
 #, php-format
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"%s/siteinfo"
 "\">follow this link to find a public Friendica site and join us today</a>."
 msgstr ""
 
-#: mod/dfrn_request.php:845
+#: mod/dfrn_request.php:847
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: mod/dfrn_request.php:846
+#: mod/dfrn_request.php:848
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: mod/dfrn_request.php:854 include/contact_selectors.php:76
+#: mod/dfrn_request.php:856 include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: mod/dfrn_request.php:855
+#: mod/dfrn_request.php:857
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: mod/dfrn_request.php:857
+#: mod/dfrn_request.php:859
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
@@ -4993,80 +5001,84 @@ msgid ""
 "password: %s<br><br>You can change your password after login."
 msgstr ""
 
-#: mod/register.php:107
+#: mod/register.php:104
+msgid "Registration successful."
+msgstr ""
+
+#: mod/register.php:110
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/register.php:150
+#: mod/register.php:153
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/register.php:188 mod/uimport.php:50
+#: mod/register.php:191 mod/uimport.php:50
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: mod/register.php:216
+#: mod/register.php:219
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: mod/register.php:217
+#: mod/register.php:220
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: mod/register.php:218
+#: mod/register.php:221
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/register.php:232
+#: mod/register.php:235
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/register.php:256
+#: mod/register.php:259
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/register.php:257
+#: mod/register.php:260
 msgid "Your invitation ID: "
 msgstr ""
 
-#: mod/register.php:268
+#: mod/register.php:271
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/register.php:269
+#: mod/register.php:272
 msgid "Your Email Address: "
 msgstr ""
 
-#: mod/register.php:271
+#: mod/register.php:274
 msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/register.php:273
+#: mod/register.php:276
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: mod/register.php:274
+#: mod/register.php:277
 msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/register.php:277 boot.php:1256 include/nav.php:108
+#: mod/register.php:280 boot.php:1256 include/nav.php:108
 msgid "Register"
 msgstr ""
 
-#: mod/register.php:283 mod/uimport.php:64
+#: mod/register.php:286 mod/uimport.php:64
 msgid "Import"
 msgstr ""
 
-#: mod/register.php:284
+#: mod/register.php:287
 msgid "Import your profile to this friendica instance"
 msgstr ""
 
@@ -5086,7 +5098,7 @@ msgstr ""
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
-#: mod/search.php:126 include/text.php:996 include/nav.php:118
+#: mod/search.php:126 include/text.php:1003 include/nav.php:118
 msgid "Search"
 msgstr ""
 
@@ -5108,16 +5120,16 @@ msgstr ""
 msgid "Gender: "
 msgstr ""
 
-#: mod/directory.php:143 include/identity.php:273 include/identity.php:561
+#: mod/directory.php:143 include/identity.php:283 include/identity.php:573
 msgid "Status:"
 msgstr ""
 
-#: mod/directory.php:145 include/identity.php:275 include/identity.php:572
+#: mod/directory.php:145 include/identity.php:285 include/identity.php:584
 msgid "Homepage:"
 msgstr ""
 
 #: mod/directory.php:195 view/theme/diabook/theme.php:525
-#: view/theme/vier/theme.php:191
+#: view/theme/vier/theme.php:205
 msgid "Global Directory"
 msgstr ""
 
@@ -5224,12 +5236,12 @@ msgid ""
 "hours."
 msgstr ""
 
-#: mod/suggest.php:83 mod/suggest.php:100
+#: mod/suggest.php:83 mod/suggest.php:101
 msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/suggest.php:110 include/contact_widgets.php:35
-#: view/theme/diabook/theme.php:527 view/theme/vier/theme.php:193
+#: mod/suggest.php:111 include/contact_widgets.php:35
+#: view/theme/diabook/theme.php:527 view/theme/vier/theme.php:207
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -5444,7 +5456,7 @@ msgstr ""
 msgid "Since [date]:"
 msgstr ""
 
-#: mod/profiles.php:724 include/identity.php:570
+#: mod/profiles.php:724 include/identity.php:582
 msgid "Sexual Preference:"
 msgstr ""
 
@@ -5452,11 +5464,11 @@ msgstr ""
 msgid "Homepage URL:"
 msgstr ""
 
-#: mod/profiles.php:726 include/identity.php:574
+#: mod/profiles.php:726 include/identity.php:586
 msgid "Hometown:"
 msgstr ""
 
-#: mod/profiles.php:727 include/identity.php:578
+#: mod/profiles.php:727 include/identity.php:590
 msgid "Political Views:"
 msgstr ""
 
@@ -5472,11 +5484,11 @@ msgstr ""
 msgid "Private Keywords:"
 msgstr ""
 
-#: mod/profiles.php:731 include/identity.php:586
+#: mod/profiles.php:731 include/identity.php:598
 msgid "Likes:"
 msgstr ""
 
-#: mod/profiles.php:732 include/identity.php:588
+#: mod/profiles.php:732 include/identity.php:600
 msgid "Dislikes:"
 msgstr ""
 
@@ -5542,23 +5554,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: mod/profiles.php:814 include/identity.php:231 include/identity.php:257
+#: mod/profiles.php:814 include/identity.php:241 include/identity.php:267
 msgid "Change profile photo"
 msgstr ""
 
-#: mod/profiles.php:815 include/identity.php:232
+#: mod/profiles.php:815 include/identity.php:242
 msgid "Create New Profile"
 msgstr ""
 
-#: mod/profiles.php:826 include/identity.php:242
+#: mod/profiles.php:826 include/identity.php:252
 msgid "Profile Image"
 msgstr ""
 
-#: mod/profiles.php:828 include/identity.php:245
+#: mod/profiles.php:828 include/identity.php:255
 msgid "visible to everybody"
 msgstr ""
 
-#: mod/profiles.php:829 include/identity.php:246
+#: mod/profiles.php:829 include/identity.php:256
 msgid "Edit visibility"
 msgstr ""
 
@@ -5622,7 +5634,7 @@ msgstr ""
 msgid "Permission settings"
 msgstr ""
 
-#: mod/editpost.php:132 include/acl_selectors.php:343
+#: mod/editpost.php:132 include/acl_selectors.php:344
 msgid "CC: email addresses"
 msgstr ""
 
@@ -5638,7 +5650,7 @@ msgstr ""
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: mod/editpost.php:139 include/acl_selectors.php:344
+#: mod/editpost.php:139 include/acl_selectors.php:345
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -5704,7 +5716,7 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
-#: mod/notes.php:46 include/identity.php:677
+#: mod/notes.php:46 include/identity.php:694
 msgid "Personal Notes"
 msgstr ""
 
@@ -5861,7 +5873,7 @@ msgid ""
 "important, please visit http://friendica.com"
 msgstr ""
 
-#: mod/photos.php:91 include/identity.php:652
+#: mod/photos.php:91 include/identity.php:669
 msgid "Photo Albums"
 msgstr ""
 
@@ -5935,7 +5947,7 @@ msgstr ""
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:1182 mod/photos.php:1567 include/acl_selectors.php:346
+#: mod/photos.php:1182 mod/photos.php:1567 include/acl_selectors.php:347
 msgid "Permissions"
 msgstr ""
 
@@ -6036,7 +6048,7 @@ msgid "Share"
 msgstr ""
 
 #: mod/photos.php:1640 include/conversation.php:509
-#: include/conversation.php:1405
+#: include/conversation.php:1414
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
@@ -6279,7 +6291,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: include/contact_widgets.php:36 view/theme/diabook/theme.php:526
-#: view/theme/vier/theme.php:192
+#: view/theme/vier/theme.php:206
 msgid "Similar Interests"
 msgstr ""
 
@@ -6288,205 +6300,221 @@ msgid "Random Profile"
 msgstr ""
 
 #: include/contact_widgets.php:38 view/theme/diabook/theme.php:528
-#: view/theme/vier/theme.php:194
+#: view/theme/vier/theme.php:208
 msgid "Invite Friends"
 msgstr ""
 
-#: include/contact_widgets.php:71
+#: include/contact_widgets.php:108
 msgid "Networks"
 msgstr ""
 
-#: include/contact_widgets.php:74
+#: include/contact_widgets.php:111
 msgid "All Networks"
 msgstr ""
 
-#: include/contact_widgets.php:104 include/features.php:61
+#: include/contact_widgets.php:141 include/features.php:97
 msgid "Saved Folders"
 msgstr ""
 
-#: include/contact_widgets.php:107 include/contact_widgets.php:139
+#: include/contact_widgets.php:144 include/contact_widgets.php:176
 msgid "Everything"
 msgstr ""
 
-#: include/contact_widgets.php:136
+#: include/contact_widgets.php:173
 msgid "Categories"
 msgstr ""
 
-#: include/features.php:23
+#: include/features.php:58
 msgid "General Features"
 msgstr ""
 
-#: include/features.php:25
+#: include/features.php:60
 msgid "Multiple Profiles"
 msgstr ""
 
-#: include/features.php:25
+#: include/features.php:60
 msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: include/features.php:26
+#: include/features.php:61
 msgid "Photo Location"
 msgstr ""
 
-#: include/features.php:26
+#: include/features.php:61
 msgid ""
 "Photo metadata is normally stripped. This extracts the location (if present) "
 "prior to stripping metadata and links it to a map."
 msgstr ""
 
-#: include/features.php:31
+#: include/features.php:66
 msgid "Post Composition Features"
 msgstr ""
 
-#: include/features.php:32
+#: include/features.php:67
 msgid "Richtext Editor"
 msgstr ""
 
-#: include/features.php:32
+#: include/features.php:67
 msgid "Enable richtext editor"
 msgstr ""
 
-#: include/features.php:33
+#: include/features.php:68
 msgid "Post Preview"
 msgstr ""
 
-#: include/features.php:33
+#: include/features.php:68
 msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: include/features.php:34
+#: include/features.php:69
 msgid "Auto-mention Forums"
 msgstr ""
 
-#: include/features.php:34
+#: include/features.php:69
 msgid ""
 "Add/remove mention when a fourm page is selected/deselected in ACL window."
 msgstr ""
 
-#: include/features.php:39
+#: include/features.php:74
 msgid "Network Sidebar Widgets"
 msgstr ""
 
-#: include/features.php:40
+#: include/features.php:75
 msgid "Search by Date"
 msgstr ""
 
-#: include/features.php:40
+#: include/features.php:75
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: include/features.php:41
+#: include/features.php:76 include/features.php:106
+msgid "List Forums"
+msgstr ""
+
+#: include/features.php:76
+msgid "Enable widget to display the forums your are connected with"
+msgstr ""
+
+#: include/features.php:77
 msgid "Group Filter"
 msgstr ""
 
-#: include/features.php:41
+#: include/features.php:77
 msgid "Enable widget to display Network posts only from selected group"
 msgstr ""
 
-#: include/features.php:42
+#: include/features.php:78
 msgid "Network Filter"
 msgstr ""
 
-#: include/features.php:42
+#: include/features.php:78
 msgid "Enable widget to display Network posts only from selected network"
 msgstr ""
 
-#: include/features.php:43
+#: include/features.php:79
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: include/features.php:48
+#: include/features.php:84
 msgid "Network Tabs"
 msgstr ""
 
-#: include/features.php:49
+#: include/features.php:85
 msgid "Network Personal Tab"
 msgstr ""
 
-#: include/features.php:49
+#: include/features.php:85
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: include/features.php:50
+#: include/features.php:86
 msgid "Network New Tab"
 msgstr ""
 
-#: include/features.php:50
+#: include/features.php:86
 msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: include/features.php:51
+#: include/features.php:87
 msgid "Network Shared Links Tab"
 msgstr ""
 
-#: include/features.php:51
+#: include/features.php:87
 msgid "Enable tab to display only Network posts with links in them"
 msgstr ""
 
-#: include/features.php:56
+#: include/features.php:92
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: include/features.php:57
+#: include/features.php:93
 msgid "Multiple Deletion"
 msgstr ""
 
-#: include/features.php:57
+#: include/features.php:93
 msgid "Select and delete multiple posts/comments at once"
 msgstr ""
 
-#: include/features.php:58
+#: include/features.php:94
 msgid "Edit Sent Posts"
 msgstr ""
 
-#: include/features.php:58
+#: include/features.php:94
 msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: include/features.php:59
+#: include/features.php:95
 msgid "Tagging"
 msgstr ""
 
-#: include/features.php:59
+#: include/features.php:95
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: include/features.php:60
+#: include/features.php:96
 msgid "Post Categories"
 msgstr ""
 
-#: include/features.php:60
+#: include/features.php:96
 msgid "Add categories to your posts"
 msgstr ""
 
-#: include/features.php:61
+#: include/features.php:97
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: include/features.php:62
+#: include/features.php:98
 msgid "Dislike Posts"
 msgstr ""
 
-#: include/features.php:62
+#: include/features.php:98
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: include/features.php:63
+#: include/features.php:99
 msgid "Star Posts"
 msgstr ""
 
-#: include/features.php:63
+#: include/features.php:99
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: include/features.php:64
+#: include/features.php:100
 msgid "Mute Post Notifications"
 msgstr ""
 
-#: include/features.php:64
+#: include/features.php:100
 msgid "Ability to mute notifications for a thread"
 msgstr ""
 
+#: include/features.php:105
+msgid "Advanced Profile Settings"
+msgstr ""
+
+#: include/features.php:106
+msgid "Show visitors public community forums at the Advanced Profile Page"
+msgstr ""
+
 #: include/follow.php:77
 msgid "Connect URL missing."
 msgstr ""
@@ -6553,23 +6581,27 @@ msgstr ""
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: include/group.php:228
+#: include/group.php:239
 msgid "Everybody"
 msgstr ""
 
-#: include/group.php:251
+#: include/group.php:262
 msgid "edit"
 msgstr ""
 
-#: include/group.php:273
+#: include/group.php:285
+msgid "Edit groups"
+msgstr ""
+
+#: include/group.php:287
 msgid "Edit group"
 msgstr ""
 
-#: include/group.php:274
+#: include/group.php:288
 msgid "Create a new group"
 msgstr ""
 
-#: include/group.php:277
+#: include/group.php:291
 msgid "Contacts not in any group"
 msgstr ""
 
@@ -6638,176 +6670,184 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: include/datetime.php:474 include/items.php:2484
+#: include/datetime.php:474 include/items.php:2444
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: include/datetime.php:475 include/items.php:2485
+#: include/datetime.php:475 include/items.php:2445
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: include/identity.php:38
+#: include/identity.php:43
 msgid "Requested account is not available."
 msgstr ""
 
-#: include/identity.php:121 include/identity.php:255 include/identity.php:608
+#: include/identity.php:126 include/identity.php:265 include/identity.php:625
 msgid "Edit profile"
 msgstr ""
 
-#: include/identity.php:220
+#: include/identity.php:225
+msgid "Atom feed"
+msgstr ""
+
+#: include/identity.php:230
 msgid "Message"
 msgstr ""
 
-#: include/identity.php:226 include/nav.php:185
+#: include/identity.php:236 include/nav.php:185
 msgid "Profiles"
 msgstr ""
 
-#: include/identity.php:226
+#: include/identity.php:236
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: include/identity.php:342
+#: include/identity.php:353
 msgid "Network:"
 msgstr ""
 
-#: include/identity.php:374 include/identity.php:460
+#: include/identity.php:385 include/identity.php:471
 msgid "g A l F d"
 msgstr ""
 
-#: include/identity.php:375 include/identity.php:461
+#: include/identity.php:386 include/identity.php:472
 msgid "F d"
 msgstr ""
 
-#: include/identity.php:420 include/identity.php:507
+#: include/identity.php:431 include/identity.php:518
 msgid "[today]"
 msgstr ""
 
-#: include/identity.php:432
+#: include/identity.php:443
 msgid "Birthday Reminders"
 msgstr ""
 
-#: include/identity.php:433
+#: include/identity.php:444
 msgid "Birthdays this week:"
 msgstr ""
 
-#: include/identity.php:494
+#: include/identity.php:505
 msgid "[No description]"
 msgstr ""
 
-#: include/identity.php:518
+#: include/identity.php:529
 msgid "Event Reminders"
 msgstr ""
 
-#: include/identity.php:519
+#: include/identity.php:530
 msgid "Events this week:"
 msgstr ""
 
-#: include/identity.php:546
+#: include/identity.php:558
 msgid "j F, Y"
 msgstr ""
 
-#: include/identity.php:547
+#: include/identity.php:559
 msgid "j F"
 msgstr ""
 
-#: include/identity.php:554
+#: include/identity.php:566
 msgid "Birthday:"
 msgstr ""
 
-#: include/identity.php:558
+#: include/identity.php:570
 msgid "Age:"
 msgstr ""
 
-#: include/identity.php:567
+#: include/identity.php:579
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: include/identity.php:580
+#: include/identity.php:592
 msgid "Religion:"
 msgstr ""
 
-#: include/identity.php:584
+#: include/identity.php:596
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: include/identity.php:591
+#: include/identity.php:603
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: include/identity.php:593
+#: include/identity.php:605
 msgid "Musical interests:"
 msgstr ""
 
-#: include/identity.php:595
+#: include/identity.php:607
 msgid "Books, literature:"
 msgstr ""
 
-#: include/identity.php:597
+#: include/identity.php:609
 msgid "Television:"
 msgstr ""
 
-#: include/identity.php:599
+#: include/identity.php:611
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: include/identity.php:601
+#: include/identity.php:613
 msgid "Love/Romance:"
 msgstr ""
 
-#: include/identity.php:603
+#: include/identity.php:615
 msgid "Work/employment:"
 msgstr ""
 
-#: include/identity.php:605
+#: include/identity.php:617
 msgid "School/education:"
 msgstr ""
 
-#: include/identity.php:633 include/nav.php:75
+#: include/identity.php:621
+msgid "Forums:"
+msgstr ""
+
+#: include/identity.php:650 include/nav.php:75
 msgid "Status"
 msgstr ""
 
-#: include/identity.php:636
+#: include/identity.php:653
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: include/identity.php:644
+#: include/identity.php:661
 msgid "Profile Details"
 msgstr ""
 
-#: include/identity.php:657 include/identity.php:660 include/nav.php:78
+#: include/identity.php:674 include/identity.php:677 include/nav.php:78
 msgid "Videos"
 msgstr ""
 
-#: include/identity.php:672 include/nav.php:140
+#: include/identity.php:689 include/nav.php:140
 msgid "Events and Calendar"
 msgstr ""
 
-#: include/identity.php:680
+#: include/identity.php:697
 msgid "Only You Can See This"
 msgstr ""
 
-#: include/acl_selectors.php:324
+#: include/acl_selectors.php:325
 msgid "Post to Email"
 msgstr ""
 
-#: include/acl_selectors.php:329
+#: include/acl_selectors.php:330
 #, php-format
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr ""
 
-#: include/acl_selectors.php:335
+#: include/acl_selectors.php:336
 msgid "Visible to everybody"
 msgstr ""
 
-#: include/acl_selectors.php:336 view/theme/diabook/config.php:142
+#: include/acl_selectors.php:337 view/theme/diabook/config.php:142
 #: view/theme/diabook/theme.php:621 view/theme/vier/config.php:103
 msgid "show"
 msgstr ""
 
-#: include/acl_selectors.php:337 view/theme/diabook/config.php:142
+#: include/acl_selectors.php:338 view/theme/diabook/config.php:142
 #: view/theme/diabook/theme.php:621 view/theme/vier/config.php:103
 msgid "don't show"
 msgstr ""
@@ -6820,31 +6860,31 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: include/Contact.php:334 include/conversation.php:911
+#: include/Contact.php:361 include/conversation.php:911
 msgid "View Status"
 msgstr ""
 
-#: include/Contact.php:336 include/conversation.php:913
+#: include/Contact.php:363 include/conversation.php:913
 msgid "View Photos"
 msgstr ""
 
-#: include/Contact.php:337 include/conversation.php:914
+#: include/Contact.php:364 include/conversation.php:914
 msgid "Network Posts"
 msgstr ""
 
-#: include/Contact.php:338 include/conversation.php:915
+#: include/Contact.php:365 include/conversation.php:915
 msgid "Edit Contact"
 msgstr ""
 
-#: include/Contact.php:339
+#: include/Contact.php:366
 msgid "Drop Contact"
 msgstr ""
 
-#: include/Contact.php:340 include/conversation.php:916
+#: include/Contact.php:367 include/conversation.php:916
 msgid "Send PM"
 msgstr ""
 
-#: include/Contact.php:341 include/conversation.php:920
+#: include/Contact.php:368 include/conversation.php:920
 msgid "Poke"
 msgstr ""
 
@@ -7031,278 +7071,283 @@ msgstr ""
 msgid "Private post"
 msgstr ""
 
-#: include/conversation.php:1377
+#: include/conversation.php:1386
 msgid "View all"
 msgstr ""
 
-#: include/conversation.php:1399
+#: include/conversation.php:1408
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1402
+#: include/conversation.php:1411
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1408
+#: include/conversation.php:1417
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1411 include/profile_selectors.php:6
+#: include/conversation.php:1420 include/profile_selectors.php:6
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/forums.php:105 include/text.php:1015 include/nav.php:126
+#: view/theme/vier/theme.php:259
+msgid "Forums"
+msgstr ""
+
+#: include/forums.php:107 view/theme/vier/theme.php:261
+msgid "External link to forum"
+msgstr ""
+
 #: include/network.php:967
 msgid "view full size"
 msgstr ""
 
-#: include/text.php:299
+#: include/text.php:303
 msgid "newer"
 msgstr ""
 
-#: include/text.php:301
+#: include/text.php:305
 msgid "older"
 msgstr ""
 
-#: include/text.php:306
+#: include/text.php:310
 msgid "prev"
 msgstr ""
 
-#: include/text.php:308
+#: include/text.php:312
 msgid "first"
 msgstr ""
 
-#: include/text.php:340
+#: include/text.php:344
 msgid "last"
 msgstr ""
 
-#: include/text.php:343
+#: include/text.php:347
 msgid "next"
 msgstr ""
 
-#: include/text.php:398
+#: include/text.php:402
 msgid "Loading more entries..."
 msgstr ""
 
-#: include/text.php:399
+#: include/text.php:403
 msgid "The end"
 msgstr ""
 
-#: include/text.php:890
+#: include/text.php:894
 msgid "No contacts"
 msgstr ""
 
-#: include/text.php:905
+#: include/text.php:909
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/text.php:1003 include/nav.php:121
+#: include/text.php:1010 include/nav.php:121
 msgid "Full Text"
 msgstr ""
 
-#: include/text.php:1004 include/nav.php:122
+#: include/text.php:1011 include/nav.php:122
 msgid "Tags"
 msgstr ""
 
-#: include/text.php:1008 include/nav.php:126
-msgid "Forums"
-msgstr ""
-
-#: include/text.php:1059
+#: include/text.php:1066
 msgid "poke"
 msgstr ""
 
-#: include/text.php:1059
+#: include/text.php:1066
 msgid "poked"
 msgstr ""
 
-#: include/text.php:1060
+#: include/text.php:1067
 msgid "ping"
 msgstr ""
 
-#: include/text.php:1060
+#: include/text.php:1067
 msgid "pinged"
 msgstr ""
 
-#: include/text.php:1061
+#: include/text.php:1068
 msgid "prod"
 msgstr ""
 
-#: include/text.php:1061
+#: include/text.php:1068
 msgid "prodded"
 msgstr ""
 
-#: include/text.php:1062
+#: include/text.php:1069
 msgid "slap"
 msgstr ""
 
-#: include/text.php:1062
+#: include/text.php:1069
 msgid "slapped"
 msgstr ""
 
-#: include/text.php:1063
+#: include/text.php:1070
 msgid "finger"
 msgstr ""
 
-#: include/text.php:1063
+#: include/text.php:1070
 msgid "fingered"
 msgstr ""
 
-#: include/text.php:1064
+#: include/text.php:1071
 msgid "rebuff"
 msgstr ""
 
-#: include/text.php:1064
+#: include/text.php:1071
 msgid "rebuffed"
 msgstr ""
 
-#: include/text.php:1078
+#: include/text.php:1085
 msgid "happy"
 msgstr ""
 
-#: include/text.php:1079
+#: include/text.php:1086
 msgid "sad"
 msgstr ""
 
-#: include/text.php:1080
+#: include/text.php:1087
 msgid "mellow"
 msgstr ""
 
-#: include/text.php:1081
+#: include/text.php:1088
 msgid "tired"
 msgstr ""
 
-#: include/text.php:1082
+#: include/text.php:1089
 msgid "perky"
 msgstr ""
 
-#: include/text.php:1083
+#: include/text.php:1090
 msgid "angry"
 msgstr ""
 
-#: include/text.php:1084
+#: include/text.php:1091
 msgid "stupified"
 msgstr ""
 
-#: include/text.php:1085
+#: include/text.php:1092
 msgid "puzzled"
 msgstr ""
 
-#: include/text.php:1086
+#: include/text.php:1093
 msgid "interested"
 msgstr ""
 
-#: include/text.php:1087
+#: include/text.php:1094
 msgid "bitter"
 msgstr ""
 
-#: include/text.php:1088
+#: include/text.php:1095
 msgid "cheerful"
 msgstr ""
 
-#: include/text.php:1089
+#: include/text.php:1096
 msgid "alive"
 msgstr ""
 
-#: include/text.php:1090
+#: include/text.php:1097
 msgid "annoyed"
 msgstr ""
 
-#: include/text.php:1091
+#: include/text.php:1098
 msgid "anxious"
 msgstr ""
 
-#: include/text.php:1092
+#: include/text.php:1099
 msgid "cranky"
 msgstr ""
 
-#: include/text.php:1093
+#: include/text.php:1100
 msgid "disturbed"
 msgstr ""
 
-#: include/text.php:1094
+#: include/text.php:1101
 msgid "frustrated"
 msgstr ""
 
-#: include/text.php:1095
+#: include/text.php:1102
 msgid "motivated"
 msgstr ""
 
-#: include/text.php:1096
+#: include/text.php:1103
 msgid "relaxed"
 msgstr ""
 
-#: include/text.php:1097
+#: include/text.php:1104
 msgid "surprised"
 msgstr ""
 
-#: include/text.php:1490
+#: include/text.php:1497
 msgid "bytes"
 msgstr ""
 
-#: include/text.php:1522 include/text.php:1534
+#: include/text.php:1529 include/text.php:1541
 msgid "Click to open/close"
 msgstr ""
 
-#: include/text.php:1708
+#: include/text.php:1715
 msgid "View on separate page"
 msgstr ""
 
-#: include/text.php:1709
+#: include/text.php:1716
 msgid "view on separate page"
 msgstr ""
 
-#: include/text.php:1990
+#: include/text.php:1997
 msgid "activity"
 msgstr ""
 
-#: include/text.php:1993
+#: include/text.php:2000
 msgid "post"
 msgstr ""
 
-#: include/text.php:2161
+#: include/text.php:2168
 msgid "Item filed"
 msgstr ""
 
-#: include/bbcode.php:474 include/bbcode.php:1132 include/bbcode.php:1133
+#: include/bbcode.php:483 include/bbcode.php:1143 include/bbcode.php:1144
 msgid "Image/photo"
 msgstr ""
 
-#: include/bbcode.php:572
+#: include/bbcode.php:581
 #, php-format
 msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: include/bbcode.php:606
+#: include/bbcode.php:615
 #, php-format
 msgid ""
 "<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href="
 "\"%s\" target=\"_blank\">post</a>"
 msgstr ""
 
-#: include/bbcode.php:1092 include/bbcode.php:1112
+#: include/bbcode.php:1103 include/bbcode.php:1123
 msgid "$1 wrote:"
 msgstr ""
 
-#: include/bbcode.php:1141 include/bbcode.php:1142
+#: include/bbcode.php:1152 include/bbcode.php:1153
 msgid "Encrypted content"
 msgstr ""
 
-#: include/notifier.php:840 include/delivery.php:456
+#: include/notifier.php:843 include/delivery.php:458
 msgid "(no subject)"
 msgstr ""
 
-#: include/notifier.php:850 include/delivery.php:467 include/enotify.php:37
+#: include/notifier.php:853 include/delivery.php:469 include/enotify.php:37
 msgid "noreply"
 msgstr ""
 
@@ -7395,7 +7440,7 @@ msgstr ""
 msgid "Redmatrix"
 msgstr ""
 
-#: include/Scrape.php:603
+#: include/Scrape.php:610
 msgid " on Last.fm"
 msgstr ""
 
@@ -7407,15 +7452,15 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: include/plugin.php:458 include/plugin.php:460
+#: include/plugin.php:522 include/plugin.php:524
 msgid "Click here to upgrade."
 msgstr ""
 
-#: include/plugin.php:466
+#: include/plugin.php:530
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: include/plugin.php:471
+#: include/plugin.php:535
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
@@ -7572,42 +7617,42 @@ msgid "Site map"
 msgstr ""
 
 #: include/api.php:321 include/api.php:332 include/api.php:441
-#: include/api.php:1151 include/api.php:1153
+#: include/api.php:1160 include/api.php:1162
 msgid "User not found."
 msgstr ""
 
-#: include/api.php:799
+#: include/api.php:808
 #, php-format
 msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:818
+#: include/api.php:827
 #, php-format
 msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:837
+#: include/api.php:846
 #, php-format
 msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:1360
+#: include/api.php:1369
 msgid "There is no status with this id."
 msgstr ""
 
-#: include/api.php:1434
+#: include/api.php:1443
 msgid "There is no conversation with this id."
 msgstr ""
 
-#: include/api.php:1713
+#: include/api.php:1722
 msgid "Invalid item."
 msgstr ""
 
-#: include/api.php:1723
+#: include/api.php:1732
 msgid "Invalid action. "
 msgstr ""
 
-#: include/api.php:1731
+#: include/api.php:1740
 msgid "DB error"
 msgstr ""
 
@@ -7655,37 +7700,38 @@ msgstr ""
 msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
 msgstr ""
 
-#: include/user.php:146 include/user.php:244
+#: include/user.php:147 include/user.php:245
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: include/user.php:156
+#: include/user.php:157
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: include/user.php:172
+#: include/user.php:173
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: include/user.php:230
+#: include/user.php:231
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: include/user.php:255 view/theme/duepuntozero/config.php:44
+#: include/user.php:256 view/theme/clean/config.php:56
+#: view/theme/duepuntozero/config.php:44
 msgid "default"
 msgstr ""
 
-#: include/user.php:265
+#: include/user.php:266
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: include/user.php:297 include/user.php:301 include/profile_selectors.php:42
+#: include/user.php:299 include/user.php:303 include/profile_selectors.php:42
 msgid "Friends"
 msgstr ""
 
-#: include/user.php:385
+#: include/user.php:387
 #, php-format
 msgid ""
 "\n"
@@ -7694,7 +7740,7 @@ msgid ""
 "\t"
 msgstr ""
 
-#: include/user.php:389
+#: include/user.php:391
 #, php-format
 msgid ""
 "\n"
@@ -7737,11 +7783,11 @@ msgstr ""
 msgid "Attachments:"
 msgstr ""
 
-#: include/items.php:4933
+#: include/items.php:4871
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/items.php:5208
+#: include/items.php:5146
 msgid "Archives"
 msgstr ""
 
@@ -8319,6 +8365,7 @@ msgid "Set theme width"
 msgstr ""
 
 #: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
+#: view/theme/clean/config.php:88
 msgid "Color scheme"
 msgstr ""
 
@@ -8372,7 +8419,7 @@ msgstr ""
 
 #: view/theme/diabook/config.php:158 view/theme/diabook/theme.php:130
 #: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
-#: view/theme/vier/config.php:111 view/theme/vier/theme.php:230
+#: view/theme/vier/config.php:111
 msgid "Community Pages"
 msgstr ""
 
@@ -8383,7 +8430,7 @@ msgstr ""
 
 #: view/theme/diabook/config.php:160 view/theme/diabook/theme.php:391
 #: view/theme/diabook/theme.php:626 view/theme/vier/config.php:112
-#: view/theme/vier/theme.php:142
+#: view/theme/vier/theme.php:156
 msgid "Community Profiles"
 msgstr ""
 
@@ -8394,19 +8441,19 @@ msgstr ""
 
 #: view/theme/diabook/config.php:162 view/theme/diabook/theme.php:606
 #: view/theme/diabook/theme.php:628 view/theme/vier/config.php:114
-#: view/theme/vier/theme.php:348
+#: view/theme/vier/theme.php:377
 msgid "Connect Services"
 msgstr ""
 
 #: view/theme/diabook/config.php:163 view/theme/diabook/theme.php:523
 #: view/theme/diabook/theme.php:629 view/theme/vier/config.php:115
-#: view/theme/vier/theme.php:189
+#: view/theme/vier/theme.php:203
 msgid "Find Friends"
 msgstr ""
 
 #: view/theme/diabook/config.php:164 view/theme/diabook/theme.php:412
 #: view/theme/diabook/theme.php:630 view/theme/vier/config.php:116
-#: view/theme/vier/theme.php:171
+#: view/theme/vier/theme.php:185
 msgid "Last users"
 msgstr ""
 
@@ -8428,7 +8475,7 @@ msgstr ""
 msgid "Your personal photos"
 msgstr ""
 
-#: view/theme/diabook/theme.php:524 view/theme/vier/theme.php:190
+#: view/theme/diabook/theme.php:524 view/theme/vier/theme.php:204
 msgid "Local Directory"
 msgstr ""
 
@@ -8440,6 +8487,56 @@ msgstr ""
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
+#: view/theme/clean/config.php:57
+msgid "Midnight"
+msgstr ""
+
+#: view/theme/clean/config.php:58
+msgid "Zenburn"
+msgstr ""
+
+#: view/theme/clean/config.php:59
+msgid "Bootstrap"
+msgstr ""
+
+#: view/theme/clean/config.php:60
+msgid "Shades of Pink"
+msgstr ""
+
+#: view/theme/clean/config.php:61
+msgid "Lime and Orange"
+msgstr ""
+
+#: view/theme/clean/config.php:62
+msgid "GeoCities Retro"
+msgstr ""
+
+#: view/theme/clean/config.php:86
+msgid "Background Image"
+msgstr ""
+
+#: view/theme/clean/config.php:86
+msgid ""
+"The URL to a picture (e.g. from your photo album) that should be used as "
+"background image."
+msgstr ""
+
+#: view/theme/clean/config.php:87
+msgid "Background Color"
+msgstr ""
+
+#: view/theme/clean/config.php:87
+msgid "HEX value for the background color. Don't include the #"
+msgstr ""
+
+#: view/theme/clean/config.php:89
+msgid "font size"
+msgstr ""
+
+#: view/theme/clean/config.php:89
+msgid "base font size for your interface"
+msgstr ""
+
 #: view/theme/vier/config.php:64
 msgid "Comma separated list of helper forums"
 msgstr ""
@@ -8448,11 +8545,7 @@ msgstr ""
 msgid "Set style"
 msgstr ""
 
-#: view/theme/vier/theme.php:234
-msgid "External link to forum"
-msgstr ""
-
-#: view/theme/vier/theme.php:266
+#: view/theme/vier/theme.php:295
 msgid "Quick Start"
 msgstr ""
 

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 13270e2ebae29607246f055f354cc939876b2e83..c1e70614ce65518a5ef2bf870c5ea9a87f82c17a 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -123,6 +123,7 @@
        {{include file="field_input.tpl" field=$poll_interval}}
        {{include file="field_input.tpl" field=$maxloadavg}}
        {{include file="field_input.tpl" field=$maxloadavg_frontend}}
+       {{include file="field_input.tpl" field=$optimize_max_tablesize}}
        {{include file="field_input.tpl" field=$abandon_days}}
        {{include file="field_input.tpl" field=$lockpath}}
        {{include file="field_input.tpl" field=$temppath}}

diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
index e23c4027548212284f74df45226598c331fcab98..dd27092e9badb689925bc4bc940c5be704a2237e 100644 (file)
--- a/view/templates/manage.tpl
+++ b/view/templates/manage.tpl
@@ -11,6 +11,7 @@
                        <div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}">
                                <button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
                                        <img src="{{$id.thumb}}" alt="{{$id.username}}" />
+                                       {{if $id.notifications}}<span class="manage-notify">{{$id.notifications}}</span>{{/if}}
                                </button>
                        </div>
 
@@ -22,7 +23,6 @@
                                </div>
                                <div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div>
                        </div>
-
                        <div class="identity-match-end"></div>
                </div>
        {{/foreach}}

diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
index 455551c680acff6b2de283e32f4b42cb276ce127..205ad736d5c5065568977c8a244d139bc8c6fd86 100644 (file)
--- a/view/templates/viewcontact_template.tpl
+++ b/view/templates/viewcontact_template.tpl
@@ -1,9 +1,11 @@
 
 {{include file="section_title.tpl"}}
 
+<div id="viewcontact_wrapper-{{$id}}">
 {{foreach $contacts as $contact}}
        {{include file="contact_template.tpl"}}
 {{/foreach}}
+</div>
 
 <div id="view-contact-end"></div>
 

diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css
index fe2ad73cf2e84f8dac86a197bf50bb7434a1012d..908574f7064565105179372217e93e3bce7dc3ee 100644 (file)
--- a/view/theme/duepuntozero/deriv/darkzero.css
+++ b/view/theme/duepuntozero/deriv/darkzero.css
@@ -20,6 +20,9 @@ div.wall-item-content-wrapper.shiny {  background-image: url('ingdarkzero/shiny.
 
 nav #banner #logo-text a { color: #ffffff; }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {background-image: url('imgdarkzero/head.jpg');}
+
 .wall-item-content-wrapper { 
        border: 1px solid #444444; 
        background: #444444;  

diff --git a/view/theme/duepuntozero/deriv/easterbunny.css b/view/theme/duepuntozero/deriv/easterbunny.css
index 0619644eaf0323c16152fb8e8d32baab8d284081..34bf58f46055d73cce868b300f82dd5337a97e33 100644 (file)
--- a/view/theme/duepuntozero/deriv/easterbunny.css
+++ b/view/theme/duepuntozero/deriv/easterbunny.css
@@ -25,8 +25,10 @@ section { background: #EEFFFF; }
 a, a:visited { color: #0000FF; text-decoration: none; }
 a:hover {text-decoration: underline; }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network { background: #FFDDFF; }
 
-aside(         background-image: url('imgeasterbunny/border.jpg'); }
+aside {        background-image: url('imgeasterbunny/border.jpg'); }
 .tabs {        background-image: url('imgeasterbunny/head.jpg'); }
 div.wall-item-content-wrapper.shiny {  background-image: url('imgeasterbunny/shiny.png'); }
 

diff --git a/view/theme/duepuntozero/deriv/greenzero.css b/view/theme/duepuntozero/deriv/greenzero.css
index 0f6f7881edc26265930b60addddd82d29dd3c250..d446a616111490c9c8633f22636db7206aaaffa4 100644 (file)
--- a/view/theme/duepuntozero/deriv/greenzero.css
+++ b/view/theme/duepuntozero/deriv/greenzero.css
@@ -21,6 +21,7 @@ body {        background-image: url('imggreenzero/head.jpg'); }
 aside { background-image: url('imggreenzero/border.jpg'); }
 section { background-image: url('imggreenzero/border.jpg'); }
 .tabs {        background-image: url('imggreenzero/head.jpg'); }
+#viewcontact_wrapper-network { background: #DBEAD7; }
 div.wall-item-content-wrapper.shiny {  background-image: url('imggreenzero/shiny.png'); }
 
 .fakelink, .fakelink:visited, .fakelink:hover, .fakelink:link {

diff --git a/view/theme/duepuntozero/deriv/purplezero.css b/view/theme/duepuntozero/deriv/purplezero.css
index d59cf5dcabc4d13cea70d79d1b2419ef4704868b..29718576830f88094a2aaebc5d6055192e4e090d 100644 (file)
--- a/view/theme/duepuntozero/deriv/purplezero.css
+++ b/view/theme/duepuntozero/deriv/purplezero.css
@@ -3,8 +3,9 @@ a:hover {text-decoration: underline; }
 
 
 body {         background-image: url('imgpurplezero/head.jpg'); }
-aside(         background-image: url('imgpurplezero/border.jpg'); }
+aside {        background-image: url('imgpurplezero/border.jpg'); }
 section {      background-image: url('imgpurplezero/border.jpg'); }
+#viewcontact_wrapper-network { background: #ECCAEB; }
 .tabs {        background-image: url('imgpurplezero/head.jpg'); }
 div.wall-item-content-wrapper.shiny {  background-image: url('imgpurplezero/shiny.png'); }
 

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index bffc8c05724e2326b4c0486bf878fb5f70c267b5..903846e694bed9c1ef75a973019c89ca4d7fff19 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -278,6 +278,31 @@ div.wall-item-content-wrapper.shiny {
        margin: 15px 0 15px 150px;
 }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+       width: 100%;
+       min-height: 100px;
+       background-color: #DBE6F1;
+       border-bottom: 1px solid #babdb6;
+}
+#contact-entry-wrapper-network {
+       float: none;
+       width: auto;
+       height: auto;
+       padding: 10px;
+       margin: 0px
+}
+#contact-entry-accounttype-network {
+       font-size: 20px;
+}
+#contact-entry-name-network {
+       font-size: 24.5px;
+}
+/*#contact-entry-name-network>.contact-entry-details, #contact-entry-url-network,
+#contact-entry-details-network, contact-entry-network-network {
+       color: #000;
+}*/
+
 /* from default */
 #jot-perms-icon,
 #profile-location,
@@ -3313,6 +3338,17 @@ div.jGrowl div.info {
 }
 
 /* notifications popup menu */
+.manage-notify {
+  font-size: 10px;
+  padding: 1px 3px;
+  top: 0px;
+  min-width: 15px;
+  text-align: center;
+  float: right;
+  margin-top: -14px;
+  margin-right: -20px;
+}
+
 .nav-notify {
        display: none;
        position: absolute;

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 9a0c50e1e7aeb56aa757dfa9ec0b21ba7a86daa1..a4af7f907536b2170bed1e8954b11c75a700248c 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -421,6 +421,27 @@ section {
        clear: both;\r
 }\r
 \r
+/* Contact-Header for the Network Stream */\r
+#viewcontact_wrapper-network {\r
+       width: 100%;\r
+       min-height: 100px;\r
+       background-color: #FAFAFA;\r
+       border: 1px solid #DDDDDD;\r
+       border-radius: 5px;\r
+}\r
+#contact-entry-wrapper-network {\r
+       float: none;\r
+       width: auto;\r
+       height: auto;\r
+       padding: 10px;\r
+       margin: 0;\r
+}\r
+#contact-entry-accounttype-network {\r
+       font-size: 0.9em;\r
+}\r
+#contact-entry-name-network {\r
+       font-size: 1.5em;\r
+}\r
 \r
 /* footer */\r
 footer {\r

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 1f0a90938e1ed388abbd1006b087f3a9385cb6b5..7b2b1358c04c2a8c14b69697a17e5519e99ac47c 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -384,6 +384,27 @@ section {
        padding-top: 3em;
 }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+       width: 100%;
+       min-height: 100px;
+       background-color: #FAFAFA;
+       border: 1px solid #DDDDDD;
+       border-radius: 5px;
+}
+#contact-entry-wrapper-network {
+       float: none;
+       width: auto;
+       height: auto;
+       padding: 10px;
+       margin: 0;
+}
+#contact-entry-accounttype-network {
+       font-size: 0.9em;
+}
+#contact-entry-name-network {
+       font-size: 1.5em;
+}
 
 /* footer */
 footer {
@@ -4041,6 +4062,22 @@ div.jGrowl-notification {
 }
 
 /* notifications popup menu */
+.manage-notify {
+       padding: 1px 3px;
+       top: 0px;
+       min-width: 15px;
+       text-align: center;
+       float: right;
+       margin-top: -14px;
+       margin-right: -20px;
+
+       font-size: 0.8em;
+       border-radius: 4px;
+       -moz-border-radius: 4px;
+       -webkit-border-radius: 4px;
+       background-color: gold !important;
+}
+
 .nav-notify {
        display: none;
        position: absolute;

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 7b20b4797a59abbb23aa388bb34013887f6a2dca..1ff2de70063cf0e336048c1b12ff64eaf627aa3b 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover {
   color: #9eabb0;
   display: block;
 }
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+  width: 100%;
+  min-height: 100px;
+  background-color: #eff0f1;
+  border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+  float: none;
+  width: auto;
+  height: auto;
+  padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+  font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+  font-size: 24.5px;
+  font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+  font-size: 12px;
+}
 /* aside 230px*/
 aside {
   display: table-cell;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index c29e9bfbc4453f96fd98ee8cb6b1a6d7a0085821..2b05335e0f0df55bbff63757d9b971e3865a8eca 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover {
   color: #9eabb0;
   display: block;
 }
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+  width: 100%;
+  min-height: 100px;
+  background-color: #eff0f1;
+  border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+  float: none;
+  width: auto;
+  height: auto;
+  padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+  font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+  font-size: 24.5px;
+  font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+  font-size: 12px;
+}
 /* aside 230px*/
 aside {
   display: table-cell;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index b672edaa97fe72819d840f19468e32f676911a04..ec0982a75e22e9f08055a6e4186b5dc709f7993b 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover {
   color: #9eabb0;
   display: block;
 }
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+  width: 100%;
+  min-height: 100px;
+  background-color: #eff0f1;
+  border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+  float: none;
+  width: auto;
+  height: auto;
+  padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+  font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+  font-size: 24.5px;
+  font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+  font-size: 12px;
+}
 /* aside 230px*/
 aside {
   display: table-cell;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c2410244f9977d78681b6e1f5e486e0c74649856..b6bed2c9cb6cf3560e3fd59fd2a3b5a3fa53f39c 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -301,7 +301,22 @@ ul.menu-popup {
        .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; }
 }
 
-
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+       width: 100%;
+       min-height: 100px;
+       background-color: #eff0f1;
+       border-bottom: 1px solid #cccccc;
+       #contact-entry-wrapper-network {
+               float: none;
+               width: auto;
+               height: auto;
+               padding: 10px;
+               #contact-entry-accounttype-network { font-size: 22px; }
+               #contact-entry-name-network { font-size: 24.5px; font-weight: normal; }
+               .contact-details { font-size: 12px; }
+       }
+}
 
 
 /* aside 230px*/

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 510b7d9c6d79018967cdbb2afc9d3f6fc18a0f8a..45d2629dae0a09c8a0941ee029f0d60073d9f6a0 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -149,6 +149,30 @@ section {
        padding-bottom: 2em;
 }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+       width: 100%;
+       min-height: 110px;
+       background-color: #FAFAFA;
+       box-shadow: 0 0 8px #BDBDBD;
+       border-bottom: 1px solid #dedede;
+       border: 1px solid #7C7D7B;
+       border-radius: 5px;
+}
+#contact-entry-wrapper-network {
+       float: none;
+       width: auto;
+       height: auto;
+       padding: 10px;
+       margin: 0;
+}
+#contact-entry-accounttype-network {
+       font-size: 20px;
+}
+#contact-entry-name-network {
+       font-size: 24.5px;
+}
+
 .lframe {
        border: 1px solid #7C7D7B;
        box-shadow: 3px 3px 6px #959494;
@@ -4219,6 +4243,17 @@ a.active {
 }
 
 /* notifications popup menu */
+.manage-notify {
+       font-size: 10px;
+       padding: 1px 3px;
+       top: 0px;
+       min-width: 15px;
+       text-align: center;
+       float: right;
+       margin-top: -14px;
+       margin-right: -20px;
+}
+
 .nav-notify {
        display: none;
        position: absolute;

diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css
index 049c1bf4b6189eddbc3c9fce7981bbff5b43e48c..5a36de03e02418526e8f374e8e7d1fdadd671fbd 100644 (file)
--- a/view/theme/vier/breathe.css
+++ b/view/theme/vier/breathe.css
@@ -122,3 +122,7 @@ div.pager, ul.tabs {
 .mail-list-wrapper {
   border-radius: 5px;
 }
+
+#viewcontact_wrapper-network {
+  border-radius: 5px;
+}

diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css
index 01045b6ff4a3cb519a8091c688b14babda91b7d3..8e128ae27fb5fd21288010266925824b135912a4 100644 (file)
--- a/view/theme/vier/dark.css
+++ b/view/theme/vier/dark.css
@@ -57,5 +57,9 @@ input#side-peoplefind-submit, input#side-follow-submit {
 }
 
 li :hover {
-       color: #767676 !important;      
+       color: #767676 !important;
+}
+
+#viewcontact_wrapper-network {
+       background-color: #343434;
 }

diff --git a/view/theme/vier/flat.css b/view/theme/vier/flat.css
index a00d19c39c767eb6ab6869885e5793206576b78b..03e18f1070f81c822860214f8a11b533192ddcf8 100644 (file)
--- a/view/theme/vier/flat.css
+++ b/view/theme/vier/flat.css
@@ -16,3 +16,8 @@ aside {
 right_aside {
   border-left: 1px solid #D2D2D2;
 }
+
+#viewcontact_wrapper-network {
+  background-color: #FFF;
+  border-bottom: 1px solid #D2D2D2;
+}
\ No newline at end of file

diff --git a/view/theme/vier/plus.css b/view/theme/vier/plus.css
index 5faf069c22ad94e1e2cbb3d19b3982c664838cac..8e1865a8692c93c38e57052c83c0f7352aa504d0 100644 (file)
--- a/view/theme/vier/plus.css
+++ b/view/theme/vier/plus.css
@@ -17,6 +17,12 @@ nav a:hover,
   color: #000;
 }
 
+.manage-notify {
+  background-color: #CB4437;
+  border-radius: 10px;
+  font: bold 11px/16px Arial;
+}
+
 nav .nav-notify {
 /*  background-color: #427FED; */
   background-color: #CB4437;

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 868d4a50713025dc8fd82bc442cb89ba534bb304..2892862daf6b331e0dd81ad64c2fcf6e9b7810c5 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -667,6 +667,7 @@ nav .nav-menu img {
   margin-top: -3px;
   margin-right: 4px;
 }
+
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
@@ -701,6 +702,23 @@ nav .nav-menu:hover {
 /*    background: #4c619c; */
     text-decoration: none;
 }
+
+.manage-notify {
+   background-color: #F80;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  top: 0px;
+  min-width: 15px;
+  text-align: center;
+  color: white;
+  float: right;
+  margin-top: -14px;
+  margin-right: -20px;
+}
+
 nav .nav-notify {
   display: none;
   position: absolute;
@@ -720,6 +738,7 @@ nav .nav-notify {
   text-align: center;
   color: white;
 }
+
 nav .nav-notify.show {
   display: block;
 }
@@ -1202,6 +1221,31 @@ section.minimal {
   height: 100%;
 }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+  width: 100%;
+  min-height: 100px;
+  background-color: #FAFAFA;
+  box-shadow: 1px 2px 0px 0px #D8D8D8;
+  border-bottom: 1px solid #D2D2D2;
+}
+#contact-entry-wrapper-network {
+  float: none;
+  width: auto;
+  height: auto;
+  padding: 10px;
+  margin: 0;
+}
+#contact-entry-accounttype-network {
+  font-size: 20px;
+}
+#contact-entry-name-network {
+  font-size: 24.5px;
+}
+.contact-entry-photo img {
+  border-radius: 4px;
+}
+
 /* wall item */
 .tread-wrapper {
 /*    border-bottom: 1px solid #BDCDD4; */