Merge branch 'master' into notify

diff --git a/boot.php b/boot.php
index 522eee2e174971f3c721e159cf97d5b477ac7048..2c12ed508569d94e767ad206e21483aa82dbd5ed 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1193' );
+define ( 'FRIENDICA_VERSION',      '2.3.1203' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1111      );
+define ( 'DB_UPDATE_VERSION',      1112      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -1036,6 +1036,8 @@ function get_birthdays() {
        if($r && count($r)) {
                $total = 0;
                $now = strtotime('now');
+               $cids = array();
+
                $istoday = false;
                foreach($r as $rr) {
                        if(strlen($rr['name']))
@@ -1052,6 +1054,13 @@ function get_birthdays() {
                        foreach($r as $rr) {
                                if(! strlen($rr['name']))
                                        continue;
+
+                               // avoid duplicates
+
+                               if(in_array($rr['cid'],$cids))
+                                       continue;
+                               $cids[] = $rr['cid'];
+
                                $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
                                $sparkle = '';
                                $url = $rr['url'];

diff --git a/database.sql b/database.sql
index 894ea42d98e2d92a3465cd75e240367cdd577835..e96aff4b7715bd1afba4c3dbf9d42feccf39c5ff 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -694,6 +694,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 `url` CHAR( 255 ) NOT NULL ,
 `nurl` CHAR( 255 ) NOT NULL ,
 `photo` CHAR( 255 ) NOT NULL,
+`connect` CHAR( 255 ) NOT NULL,
 INDEX ( `nurl` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index eb709e01dc834c242e597e468d4309f0133fe093..0e001df3508a5682d4fafbb643fe0bb2b488d08f 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -173,9 +173,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
        // html5 video and audio
 
-//     $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
+       $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text);
 
-//     $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
+       $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text);
 
 //     $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
          

diff --git a/include/bbcode.php b/include/bbcode.php
index 15b2ebb0a55c185e698476b2a07845cd8a91e634..5218a06e85a39e948f0261326d5fe613d44ffa5b 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -11,6 +11,7 @@ function stripcode_br_cb($s) {
 
 function tryoembed($match){
        $url = ((count($match)==2)?$match[1]:$match[2]);
+       logger("tryoembed: $url");
        
        $o = oembed_fetch_url($url);
 
@@ -180,22 +181,18 @@ function bbcode($Text,$preserve_nl = false) {
        $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
          
 
-       /*if (get_pconfig(local_user(), 'oembed', 'use_for_youtube' )==1){
-               // use oembed for youtube links
-               $Text = preg_replace("/\[youtube\]/",'[embed]',$Text); 
-               $Text = preg_replace("/\[\/youtube\]/",'[/embed]',$Text); 
-       } else {*/
-               // Youtube extensions
-        $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);        
-        $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
+       // Youtube extensions
+       $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);        
+       $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);        
+       $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
         
-        $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-        $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-        $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+       $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+       $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
                
         
-               $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
-       //}
+       $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
+
 
        $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
        $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 

diff --git a/include/conversation.php b/include/conversation.php
index deced3cb8c834ec1cc05dde58dd65467818ae363..fae57c5655a76352c0835204ca95961508ba6400 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -294,7 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
                                $arr = array('item' => $item, 'output' => $tmp_item);
                                call_hooks('display_item', $arr);
 
-                               $threads[$threadsid]['id'] = $arr[$item['item_id']];
+                               $threads[$threadsid]['id'] = $item['item_id'];
                                $threads[$threadsid]['html'] .= $arr['output'];
 
                        }

diff --git a/include/diaspora.php b/include/diaspora.php
index 7f1e4a8e33ab16f0d8bdc62407fb9275b33af358..d1e975a89f9987dc12982a5eba7c0f262db7bebf 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -69,7 +69,7 @@ function diaspora_dispatch($importer,$msg) {
                $ret = diaspora_retraction($importer,$xmlbase->retraction,$msg);
        }
        elseif($xmlbase->signed_retraction) {
-               $ret = diaspora_signed_retraction($importer,$xmlbase->retraction,$msg);
+               $ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
        }
        elseif($xmlbase->photo) {
                $ret = diaspora_photo($importer,$xmlbase->photo,$msg);
@@ -188,6 +188,13 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false)
 
        logger('diaspora_msg_build: ' . $msg, LOGGER_DATA);
 
+       // without a public key nothing will work
+
+       if(! $pubkey) {
+               logger('diaspora_msg_build: pubkey missing: contact id: ' . $contact['id']);
+               return '';
+       }
+
        $inner_aes_key = random_string(32);
        $b_inner_aes_key = base64_encode($inner_aes_key);
        $inner_iv = random_string(16);
@@ -1562,6 +1569,7 @@ EOT;
 
 function diaspora_retraction($importer,$xml) {
 
+
        $guid = notags(unxmlify($xml->guid));
        $diaspora_handle = notags(unxmlify($xml->diaspora_handle));
        $type = notags(unxmlify($xml->type));
@@ -1593,7 +1601,8 @@ function diaspora_retraction($importer,$xml) {
        // NOTREACHED
 }
 
-function diaspora_signed_retraction($importer,$xml) {
+function diaspora_signed_retraction($importer,$xml,$msg) {
+
 
        $guid = notags(unxmlify($xml->target_guid));
        $diaspora_handle = notags(unxmlify($xml->sender_handle));
@@ -1601,8 +1610,10 @@ function diaspora_signed_retraction($importer,$xml) {
        $sig = notags(unxmlify($xml->target_author_signature));
 
        $contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
-       if(! $contact)
+       if(! $contact) {
+               logger('diaspora_signed_retraction: no contact');
                return;
+       }
 
        // this may not yet work for comments. Need to see how the relaying works
        // and figure out who signs it.
@@ -1621,7 +1632,7 @@ function diaspora_signed_retraction($importer,$xml) {
 
        if($type === 'StatusMessage') {
                $r = q("select * from item where guid = '%s' and uid = %d limit 1",
-                       dbesc('guid'),
+                       dbesc($guid),
                        intval($importer['uid'])
                );
                if(count($r)) {
@@ -1633,6 +1644,8 @@ function diaspora_signed_retraction($importer,$xml) {
                        }
                }
        }
+       else
+               logger('diaspora_signed_retraction: unknown type: ' . $type);
 
        return 202;
        // NOTREACHED
@@ -1672,6 +1685,12 @@ function diaspora_profile($importer,$xml) {
 
        $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
 
+       // this is to prevent multiple birthday notifications in a single year
+       // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
+
+       if(substr($birthday,5) === substr($contact['bd'],5))
+               $birthday = $contact['bd'];
+
        $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
                dbesc($name),
                dbesc(datetime_convert()),

diff --git a/include/socgraph.php b/include/socgraph.php
index 07dafe7f886abc7d13efb9a860af9f0f61f9be00..79d7340a4ecdf8e0da97d1acec0d21e77cb71060 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -40,17 +40,34 @@ function poco_load($cid,$uid = 0,$url = null) {
        if(! $url)
                return;
 
-       logger('poco_load: ' . $url, LOGGER_DATA);
+       $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos' : '?fields=displayName,urls,photos') ;
 
-       $s = fetch_url($url . '/@me/@all?fields=displayName,urls,photos');
+       logger('poco_load: ' . $url, LOGGER_DEBUG);
+
+       $s = fetch_url($url);
+
+       logger('poco_load: returns ' . $s, LOGGER_DATA);
+
+       logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG);
 
        if(($a->get_curl_code() > 299) || (! $s))
                return;
+
+
        $j = json_decode($s);
+
+       logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
+
+       if(! isset($j->entry))
+               return;
+
+       $total = 0;
        foreach($j->entry as $entry) {
 
+               $total ++;
                $profile_url = '';
                $profile_photo = '';
+               $connect_url = '';
                $name = '';
 
                $name = $entry->displayName;
@@ -58,13 +75,18 @@ function poco_load($cid,$uid = 0,$url = null) {
                foreach($entry->urls as $url) {
                        if($url->type == 'profile') {
                                $profile_url = $url->value;
-                               break;
+                               continue;
+                       }
+                       if($url->type == 'webfinger') {
+                               $connect_url = str_replace('acct:' , '', $url->value);
+                               continue;
                        }
+
                } 
                foreach($entry->photos as $photo) {
                        if($photo->type == 'profile') {
                                $profile_photo = $photo->value;
-                               break;
+                               continue;
                        }
                }
 
@@ -79,21 +101,23 @@ function poco_load($cid,$uid = 0,$url = null) {
                        $gcid = $x[0]['id'];
 
                        if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) {
-                               q("update gcontact set `name` = '%s', `photo` = '%s' where
-                                       `nurl` = '%s' limit 1",
+                               q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s' 
+                                       where `nurl` = '%s' limit 1",
                                        dbesc($name),
                                        dbesc($profile_photo),
+                                       dbesc($connect_url),
                                        dbesc(normalise_link($profile_url))
                                );
                        }
                }
                else {
-                       q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
-                               values ( '%s', '%s', '%s', '%s') ",
+                       q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`,`connect`)
+                               values ( '%s', '%s', '%s', '%s','%s') ",
                                dbesc($name),
                                dbesc($profile_url),
                                dbesc(normalise_link($profile_url)),
-                               dbesc($profile_photo)
+                               dbesc($profile_photo),
+                               dbesc($connect_url)
                        );
                        $x = q("select * from `gcontact` where `nurl` = '%s' limit 1",
                                dbesc(normalise_link($profile_url))
@@ -127,6 +151,7 @@ function poco_load($cid,$uid = 0,$url = null) {
                }
 
        }
+       logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
        q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
                intval($cid),
@@ -222,20 +247,22 @@ function suggestion_query($uid, $start = 0, $limit = 40) {
                intval($limit)
        );
 
-       if(count($r))
+       if(count($r) && count($r) >= ($limit -1))
                return $r;
 
-       $r = q("SELECT gcontact.* from gcontact 
+       $r2 = q("SELECT gcontact.* from gcontact 
                left join glink on glink.gcid = gcontact.id 
-               where uid = 0 and cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
+               where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
                and not gcontact.id in ( select gcid from gcign where uid = %d )
-               order by rand limit %d, %d ",
+               order by rand() limit %d, %d ",
+               intval($uid),
                intval($uid),
                intval($start),
                intval($limit)
        );
 
-       return $r;
+
+       return array_merge($r,$r2);
 
 }
 

diff --git a/include/text.php b/include/text.php
index 04d5dfcedfb100382cbcee9a05d6af2002da6c31..d6b3ceeab40600ac1c7f54b452c7856c694eeebb 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -635,7 +635,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 
 if(! function_exists('valid_email')) {
 function valid_email($x){
-       if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
+       if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
                return true;
        return false;
 }}

diff --git a/js/acl.js b/js/acl.js
index b270adb6e3123640885718920e1cc6c2110ad2e9..e383224ca8aba067bd952b59e0f04e089b67a314 100644 (file)
--- a/js/acl.js
+++ b/js/acl.js
@@ -171,6 +171,9 @@ ACL.prototype.update_view = function(){
                                $('.profile-jot-net input').attr('disabled', 'disabled');                       
                                $('#profile-jot-desc').html(' ');
        }
+       $("#acl-list-content .acl-list-item").each(function(){
+               $(this).removeClass("groupshow grouphide");
+       });
        
        $("#acl-list-content .acl-list-item").each(function(){
                itemid = $(this).attr('id');
@@ -194,8 +197,17 @@ ACL.prototype.update_view = function(){
                                        uclass="grouphide";
                                }
                                
-                               $(that.group_uids[id]).each(function(i,v){
-                                       $("#c"+v).removeClass("groupshow grouphide").addClass(uclass);
+                               $(that.group_uids[id]).each(function(i,v) {
+                                       if(uclass == "grouphide")
+                                               $("#c"+v).removeClass("groupshow");
+                                       if(uclass != "") {
+                                               var cls = $("#c"+v).attr('class');
+                                               if( cls == undefined)
+                                                       return true;
+                                               var hiding = cls.indexOf('grouphide');
+                                               if(hiding == -1)
+                                                       $("#c"+v).addClass(uclass);
+                                       }
                                });
                                
                                break;

diff --git a/js/main.js b/js/main.js
index 3f84ae6c483b4b8be3f43eb9d15112ba88057f2e..96c7fa642b3d29779d7e7036ae2a6896bd80ac06 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -241,26 +241,34 @@
 
                        $('.tread-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
+
                                if($('#' + ident).length == 0 && profile_page == 1) {
                                        $('img',this).each(function() {
                                                $(this).attr('src',$(this).attr('dst'));
                                        });
                                        $('#' + prev).after($(this));
                                }
+                               else {
+                                       $('img',this).each(function() {
+                                               $(this).attr('src',$(this).attr('dst'));
+                                       });
+                                       $('#' + ident).replaceWith($(this));
+                               }
                                prev = ident;
                        });
 
                        // reset vars for inserting individual items
 
-                       prev = 'live-' + src;
+                       /*                      prev = 'live-' + src;
 
                        $('.wall-item-outside-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
-                               if($('#' + ident).length == 0) {
-                                       $('img',this).each(function() {
-                                               $(this).attr('src',$(this).attr('dst'));
-                                       });
-                                       $('#' + prev).after($(this));
+
+                               if($('#' + ident).length == 0 && prev != 'live-' + src) {
+                                               $('img',this).each(function() {
+                                                       $(this).attr('src',$(this).attr('dst'));
+                                               });
+                                               $('#' + prev).after($(this));
                                }
                                else { 
                                        $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
@@ -275,7 +283,7 @@
                                }
                                prev = ident; 
                        });
-
+                       */
                        $('.like-rotator').hide();
                        if(commentBusy) {
                                commentBusy = false;

diff --git a/mod/acl.php b/mod/acl.php
index 735c2c0b00653370e1b6f0d61cf33086d21dd781..0fea6f7fc20d06ca3da216ba209409fd4f7e4aeb 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -60,8 +60,8 @@ function acl_init(&$a){
                        intval($count)
                );
 
-               
                foreach($r as $g){
+//             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);                
                        $groups[] = array(
                                "type"  => "g",
                                "photo" => "images/default-group-mm.png",

diff --git a/mod/admin.php b/mod/admin.php
index 8ca89900c0796740c8a9937612b6f86cf80cef3e..e444040973a996812daa8e65d8de834b043b5285 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1,7 +1,7 @@
 <?php
 
  /**
-  * Friendika admin
+  * Friendica admin
   */
 require_once("include/remoteupdate.php");
  
@@ -277,7 +277,7 @@ function admin_page_site(&$a) {
        /* Banner */
        $banner = get_config('system','banner');
        if($banner == false) 
-               $banner = '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
+               $banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
        $banner = htmlspecialchars($banner);
        
        //echo "<pre>"; var_dump($lang_choices); die("</pre>");
@@ -325,7 +325,7 @@ function admin_page_site(&$a) {
                '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
                '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),    
                '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."),    
-               '$dfrn_only'        => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."),
+               '$dfrn_only'        => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."),
                '$verifyssl'            => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
                '$proxyuser'            => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
                '$proxy'                        => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
@@ -657,7 +657,7 @@ function admin_page_logs(&$a){
                
                                                                        // name, label, value, help string, extra data...
                '$debugging'            => array('debugging', t("Debugging"),get_config('system','debugging'), ""),
-               '$logfile'                      => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendika index.php.")),
+               '$logfile'                      => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
                '$loglevel'             => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
        ));
 }

diff --git a/mod/follow.php b/mod/follow.php
index 2d643400a7c6748c09cf71ab461c6463a1331235..f8964885e187050b34f4a59cf9477eaea20ea238 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,7 +2,7 @@
 
 require_once('Scrape.php');
 
-function follow_post(&$a) {
+function follow_init(&$a) {
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -10,7 +10,7 @@ function follow_post(&$a) {
                // NOTREACHED
        }
 
-       $url = $orig_url = notags(trim($_POST['url']));
+       $url = $orig_url = notags(trim($_REQUEST['url']));
 
        // remove ajax junk, e.g. Twitter
 
@@ -22,6 +22,14 @@ function follow_post(&$a) {
                // NOTREACHED
        }
 
+
+       if(! $url) {
+               notice( t('Connect URL missing.') . EOL);
+               goaway($_SESSION['return_url']);
+               // NOTREACHED
+       }
+
+
        $ret = probe_url($url);
 
        if($ret['network'] === NETWORK_DFRN) {
@@ -202,7 +210,9 @@ function follow_post(&$a) {
                }
        }
 
-       goaway($a->get_baseurl() . '/contacts/' . $contact_id);
-//     goaway($_SESSION['return_url']);
+       if(strstr($_SESSION['return_url'],'contacts'))
+               goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
+       goaway($_SESSION['return_url']);
        // NOTREACHED
 }

diff --git a/mod/friendica.php b/mod/friendica.php
index 9dd6b7383a941d564b2a53c847e19568bc644aa7..ab92e31ed9aab668fe07f3925c180e63720037e7 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -43,9 +43,9 @@ function friendica_content(&$a) {
        $o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
        $o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
-       $o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendica project.') . '</p><p>';        
+       $o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';        
 
-       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';
+       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendica.com">Bugs.Friendica.com</a></p><p>';
        $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
 
        $o .= '<p></p>';

diff --git a/mod/home.php b/mod/home.php
index 225bd294d2fbcecce3a716060b6c8708e3f04031..0320c1b3988a5b20bd2cda7fc02bf443de78a120 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -3,6 +3,9 @@
 if(! function_exists('home_init')) {
 function home_init(&$a) {
 
+       $ret = array();
+       call_hooks('home_init',$ret);
+
        if(local_user() && ($a->user['nickname']))
                goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
 

diff --git a/mod/item.php b/mod/item.php
index 95a27eb8eaf3b232a9916ea405160e18fe1deda1..f72b17fc12fdd62773ae803ed0739f8fef5cb0c5 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -398,9 +398,13 @@ function item_post(&$a) {
                                        continue;
                                $basetag = str_replace('_',' ',substr($tag,1));
                                $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
-                               if(strlen($str_tags))
-                                       $str_tags .= ',';
-                               $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+
+                               $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                               if(! stristr($str_tags,$newtag)) {
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= $newtag;
+                               } 
                                continue;
                        }
                        if(strpos($tag,'@') === 0) {

diff --git a/mod/match.php b/mod/match.php
index c33bbd5c2de7b5d9deaec1463df9fdb95252bf63..3645a419da2a6f8a9f48ae9059fdf25dd921b816 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -7,6 +7,8 @@ function match_content(&$a) {
        if(! local_user())
                return;
 
+       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
        $o .= '<h2>' . t('Profile Match') . '</h2>';
 
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
@@ -41,14 +43,20 @@ function match_content(&$a) {
                }
 
                if(count($j->results)) {
+
+
                        
                        $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
                                
+                               $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
                                $o .= replace_macros($tpl,array(
                                        '$url' => $jj->url,
                                        '$name' => $jj->name,
                                        '$photo' => $jj->photo,
+                                       '$inttxt' => ' ' . t('is interested in:'),
+                                       '$conntxt' => t('Connect'),
+                                       '$connlnk' => $connlnk,
                                        '$tags' => $jj->tags
                                ));
                        }

diff --git a/mod/network.php b/mod/network.php
index e9e761c3ffd5eb5ab5c42649a735916bbddaee9b..57e120e86634160d3d581529bcddce95d1200500 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -301,7 +301,8 @@ function network_content(&$a, $update = 0) {
                }
 
 
-               $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+//             $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+               $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
                $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
        }
        elseif($cid) {
@@ -398,10 +399,9 @@ function network_content(&$a, $update = 0) {
        $simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
 
        if($nouveau) {
-
                // "New Item View" - show all items unthreaded in reverse created date order
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+               $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -414,7 +414,7 @@ function network_content(&$a, $update = 0) {
                        ORDER BY `item`.`received` DESC $pager_sql ",
                        intval($_SESSION['uid'])
                );
-               
+
        }
        else {
 

diff --git a/mod/newmember.php b/mod/newmember.php
index fc53e7112c70607485b71262435e5b68731440cc..60ca49757d9fb6041ca900bbe2eaef2b4cf17c45 100644 (file)
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -3,7 +3,7 @@
 function newmember_content(&$a) {
 
 
-       $o = '<h3>' . t('Welcome to Friendika') . '</h3>';
+       $o = '<h3>' . t('Welcome to Friendica') . '</h3>';
 
        $o .= '<h3>' . t('New Member Checklist') . '</h3>';
 
@@ -25,13 +25,13 @@ function newmember_content(&$a) {
     $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
        
        if(! $mail_disabled)
-               $o .= '<li>' . '<a href="settings">' .  t('Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</a></li>' . EOL;
+               $o .= '<li>' . '<a href="settings/connectors">' .  t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</a></li>' . EOL;
 
        $o .= '<li>' . '<a href="profiles">' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</a></li>' . EOL;
 
        $o .= '<li>' . '<a href="profiles">' . t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.') . '</a></li>' . EOL;
 
-       $o .= '<li>' . '<a href="contacts">' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Connect</em> dialog.') . '</a></li>' . EOL;
+       $o .= '<li>' . '<a href="contacts">' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</a></li>' . EOL;
 
        $o .= '<li>' . '<a href="directory">' . t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</a></li>' . EOL;
 

diff --git a/mod/poco.php b/mod/poco.php
index dd8df600839373ed4cb3a16e2891e7c34c0fc8bf..79cf820bcd9b15c1d040d46e3a90406ed2c01530 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -125,8 +125,11 @@ function poco_init(&$a) {
                                        $entry['id'] = $rr['id'];
                                if($fields_ret['displayName'])
                                        $entry['displayName'] = $rr['name'];
-                               if($fields_ret['urls'])
+                               if($fields_ret['urls']) {
                                        $entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
+                                       if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL))
+                                               $entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');  
+                               }
                                if($fields_ret['preferredUsername'])
                                        $entry['preferredUsername'] = $rr['nick'];
                                if($fields_ret['photos'])

diff --git a/mod/profile.php b/mod/profile.php
index a619703c608863efcf4afa4621c38bd68af41381..946499895bf4ab207b1ce1470523acbb2847a171 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -38,7 +38,7 @@ function profile_init(&$a) {
 
        if(! $blocked) {
                $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-               $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+               $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
                if(strlen($keywords))
                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
        }

diff --git a/mod/register.php b/mod/register.php
index 0115ec0d58e12ddac23fa42382ba1c4563ba588c..89f561642af36a329c8908372fafafaec72d163c 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -8,6 +8,15 @@ function register_post(&$a) {
        $verified = 0;
        $blocked  = 1;
 
+
+       $max_dailies = intval(get_config('system','max_daily_registrations'));
+       if($max_dailes) {
+               $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
+               if($r && $r[0]['total'] >= $max_dailies) {
+                       return;
+               }
+       }
+
        switch($a->config['register_policy']) {
 
        
@@ -462,6 +471,16 @@ function register_content(&$a) {
                return;
        }
 
+       $max_dailies = intval(get_config('system','max_daily_registrations'));
+       if($max_dailes) {
+               $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
+               if($r && $r[0]['total'] >= $max_dailies) {
+                       logger('max daily registrations exceeded.');
+                       notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
+                       return;
+               }
+       }
+
        if(x($_SESSION,'theme'))
                unset($_SESSION['theme']);
 

diff --git a/mod/suggest.php b/mod/suggest.php
index aedf3fd46af94386716f432692f600688323c2a6..b8ca423c5ae2a0a0a5acbad99351bfce946e6689 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -29,6 +29,8 @@ function suggest_content(&$a) {
                return;
        }
 
+       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
        $a->page['aside'] .= follow_widget();
        $a->page['aside'] .= findpeople_widget();
 
@@ -39,19 +41,23 @@ function suggest_content(&$a) {
        $r = suggestion_query(local_user());
 
        if(! count($r)) {
-               $o .= t('No suggestions. This works best when you have more than one contact/friend.');
+               $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
                return $o;
        }
 
        $tpl = get_markup_template('suggest_friends.tpl');
 
        foreach($r as $rr) {
-                       
+
+               $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);                      
+
                $o .= replace_macros($tpl,array(
                        '$url' => $rr['url'],
                        '$name' => $rr['name'],
                        '$photo' => $rr['photo'],
                        '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+                       '$conntxt' => t('Connect'),
+                       '$connlnk' => $connlnk,
                        '$ignore' => t('Ignore/Hide')
                ));
        }

diff --git a/update.php b/update.php
index 61a9a80edf9d41ec5f019cc4f3b0ffdb5619db30..9b5772af1c705d1e1d084d412a4ca7842a09c6ad 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1111 );
+define( 'UPDATE_VERSION' , 1112 );
 
 /**
  *
@@ -944,3 +944,7 @@ function update_1110() {
 
 }
 
+function update_1111() {
+       q("ALTER TABLE `gcontact` ADD `connect` CHAR( 255 ) NOT NULL ");
+}
+

diff --git a/util/messages.po b/util/messages.po
index cd05029765695a935e79ae0bdb46a5329c7ba28d..47f20e30e9f727066fa68b4530106da66f72b80e 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,3369 +6,3417 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1174\n"
+"Project-Id-Version: 2.3.1194\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-23 16:07-0800\n"
+"POT-Creation-Date: 2011-12-14 16:10+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
+#: ../../index.php:221 ../../mod/help.php:38
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
-#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
-msgid "[Embedded content - reload page to view]"
+#: ../../index.php:224 ../../mod/help.php:41
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/crepair.php:100
-msgid "Contact settings applied."
+#: ../../index.php:287 ../../mod/profperm.php:19 ../../mod/group.php:67
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/crepair.php:102
-msgid "Contact update failed."
+#: ../../index.php:288 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:137 ../../mod/profile_photo.php:148
+#: ../../mod/profile_photo.php:159 ../../mod/wall_attach.php:43
+#: ../../mod/suggest.php:28 ../../mod/regmod.php:111 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:229 ../../mod/settings.php:43
+#: ../../mod/settings.php:48 ../../mod/settings.php:399
+#: ../../mod/photos.php:125 ../../mod/photos.php:860 ../../mod/display.php:111
+#: ../../mod/editpost.php:10 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/contacts.php:117 ../../mod/register.php:27
+#: ../../mod/allfriends.php:9 ../../mod/install.php:102
+#: ../../mod/network.php:6 ../../mod/events.php:109
+#: ../../mod/notifications.php:62 ../../mod/crepair.php:113
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/notes.php:20
+#: ../../mod/fsuggest.php:78 ../../mod/item.php:113 ../../mod/message.php:9
+#: ../../mod/message.php:46 ../../mod/dfrn_confirm.php:53
+#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19
+#: ../../mod/attach.php:33 ../../mod/common.php:9
+#: ../../addon/facebook/facebook.php:333 ../../include/items.php:2986
+msgid "Permission denied."
 msgstr ""
 
-#: ../../mod/crepair.php:113 ../../mod/wall_attach.php:43
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:123 ../../mod/photos.php:858
-#: ../../mod/editpost.php:10 ../../mod/install.php:96
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:115
-#: ../../mod/settings.php:41 ../../mod/settings.php:46
-#: ../../mod/settings.php:388 ../../mod/manage.php:75 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:21 ../../mod/register.php:27
-#: ../../mod/regmod.php:111 ../../mod/item.php:113
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
-#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
-#: ../../mod/message.php:9 ../../mod/message.php:42 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:111 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/suggest.php:28 ../../mod/invite.php:13
-#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:331 ../../include/items.php:2986
-#: ../../index.php:284
-msgid "Permission denied."
+#: ../../boot.php:434
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
+#: ../../boot.php:435 ../../mod/photos.php:1204 ../../mod/photos.php:1243
+#: ../../mod/photos.php:1274 ../../include/conversation.php:484
+msgid "Comment"
 msgstr ""
 
-#: ../../mod/crepair.php:133
-msgid "Repair Contact Settings"
+#: ../../boot.php:436 ../../include/conversation.php:407
+msgid "show more"
 msgstr ""
 
-#: ../../mod/crepair.php:135
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
+#: ../../boot.php:437
+msgid "show fewer"
 msgstr ""
 
-#: ../../mod/crepair.php:136
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
+#: ../../boot.php:680
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../mod/crepair.php:144 ../../mod/settings.php:434
-#: ../../mod/settings.php:460 ../../mod/admin.php:464 ../../mod/admin.php:473
-msgid "Name"
+#: ../../boot.php:681 ../../mod/register.php:535 ../../include/nav.php:77
+msgid "Register"
 msgstr ""
 
-#: ../../mod/crepair.php:145
-msgid "Account Nickname"
+#: ../../boot.php:697 ../../include/nav.php:44
+msgid "Logout"
 msgstr ""
 
-#: ../../mod/crepair.php:146
-msgid "@Tagname - overrides Name/Nickname"
+#: ../../boot.php:698 ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
+msgid "Login"
 msgstr ""
 
-#: ../../mod/crepair.php:147
-msgid "Account URL"
+#: ../../boot.php:700
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../mod/crepair.php:148
-msgid "Friend Request URL"
+#: ../../boot.php:701
+msgid "Password: "
 msgstr ""
 
-#: ../../mod/crepair.php:149
-msgid "Friend Confirm URL"
+#: ../../boot.php:704
+msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/crepair.php:150
-msgid "Notification Endpoint URL"
+#: ../../boot.php:710
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../mod/crepair.php:151
-msgid "Poll/Feed URL"
+#: ../../boot.php:711 ../../mod/lostpass.php:82
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/crepair.php:152
-msgid "New photo from this URL"
+#: ../../boot.php:833 ../../mod/profile.php:10 ../../mod/hcard.php:10
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:330 ../../mod/photos.php:886 ../../mod/photos.php:944
-#: ../../mod/photos.php:1163 ../../mod/photos.php:1203
-#: ../../mod/photos.php:1242 ../../mod/photos.php:1273
-#: ../../mod/install.php:137 ../../mod/localtime.php:45
-#: ../../mod/contacts.php:306 ../../mod/settings.php:432
-#: ../../mod/settings.php:571 ../../mod/settings.php:739
-#: ../../mod/manage.php:106 ../../mod/group.php:84 ../../mod/group.php:167
-#: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587
-#: ../../mod/admin.php:652 ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:404 ../../addon/nsfw/nsfw.php:53
-#: ../../addon/randplace/randplace.php:178
-#: ../../addon/impressum/impressum.php:69 ../../addon/oembed/oembed.php:41
-#: ../../addon/statusnet/statusnet.php:282
-#: ../../addon/statusnet/statusnet.php:296
-#: ../../addon/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:329
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon/statusnet/statusnet.php:486 ../../addon/tumblr/tumblr.php:89
-#: ../../addon/wppost/wppost.php:101 ../../addon/piwik/piwik.php:81
-#: ../../addon/twitter/twitter.php:179 ../../addon/twitter/twitter.php:202
-#: ../../addon/twitter/twitter.php:299 ../../addon/posterous/posterous.php:89
-#: ../../include/conversation.php:479
-msgid "Submit"
+#: ../../boot.php:857
+msgid "Edit profile"
 msgstr ""
 
-#: ../../mod/help.php:30
-msgid "Help:"
+#: ../../boot.php:908 ../../include/contact_widgets.php:9
+msgid "Connect"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
-msgid "Help"
+#: ../../boot.php:918 ../../include/nav.php:129
+msgid "Profiles"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:217
-msgid "Not Found"
+#: ../../boot.php:918 ../../include/nav.php:129
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:220
-msgid "Page not found."
+#: ../../boot.php:924 ../../mod/profiles.php:462
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/wall_attach.php:57
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../boot.php:925 ../../mod/profiles.php:463
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
-msgid "File upload failed."
+#: ../../boot.php:935 ../../mod/profiles.php:473
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
+#: ../../boot.php:938 ../../mod/profiles.php:475
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
+#: ../../boot.php:939 ../../mod/profiles.php:476
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
+#: ../../boot.php:958 ../../mod/events.php:328 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:251
+msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:61
-msgid "Event description and start time are required."
+#: ../../boot.php:960 ../../include/profile_advanced.php:17
+msgid "Gender:"
 msgstr ""
 
-#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1302
-msgid "Events"
+#: ../../boot.php:963 ../../include/profile_advanced.php:37
+msgid "Status:"
 msgstr ""
 
-#: ../../mod/events.php:207
-msgid "Create New Event"
+#: ../../boot.php:965 ../../include/profile_advanced.php:45
+msgid "Homepage:"
 msgstr ""
 
-#: ../../mod/events.php:210
-msgid "Previous"
+#: ../../boot.php:1024 ../../boot.php:1086
+msgid "g A l F d"
 msgstr ""
 
-#: ../../mod/events.php:213
-msgid "Next"
+#: ../../boot.php:1025 ../../boot.php:1087
+msgid "F d"
 msgstr ""
 
-#: ../../mod/events.php:220
-msgid "l, F j"
+#: ../../boot.php:1048
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../mod/events.php:232
-msgid "Edit event"
+#: ../../boot.php:1049
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../mod/events.php:234 ../../include/text.php:857
-msgid "link to source"
+#: ../../boot.php:1065 ../../boot.php:1129
+msgid "[today]"
 msgstr ""
 
-#: ../../mod/events.php:302
-msgid "hour:minute"
+#: ../../boot.php:1110
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../mod/events.php:311
-msgid "Event details"
+#: ../../boot.php:1111
+msgid "Events this week:"
 msgstr ""
 
-#: ../../mod/events.php:312
-#, php-format
-msgid "Format is %s %s. Starting date and Description are required."
+#: ../../boot.php:1123
+msgid "[No description]"
 msgstr ""
 
-#: ../../mod/events.php:313
-msgid "Event Starts:"
+#: ../../boot.php:1300 ../../include/nav.php:47
+msgid "Status"
 msgstr ""
 
-#: ../../mod/events.php:316
-msgid "Finish date/time is not known or not relevant"
+#: ../../boot.php:1305 ../../mod/profperm.php:103
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
+#: ../../include/nav.php:48
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/events.php:318
-msgid "Event Finishes:"
+#: ../../boot.php:1310 ../../include/nav.php:49
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/events.php:321
-msgid "Adjust for viewer timezone"
+#: ../../boot.php:1318 ../../mod/events.php:117 ../../include/nav.php:50
+msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:323
-msgid "Description:"
+#: ../../boot.php:1323 ../../mod/notes.php:44
+msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/events.php:325 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:249 ../../boot.php:942
-msgid "Location:"
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/events.php:327
-msgid "Share this event"
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:655 ../../mod/settings.php:433
-#: ../../mod/settings.php:459 ../../addon/js_upload/js_upload.php:45
-msgid "Cancel"
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/manage.php:106 ../../mod/profiles.php:375
+#: ../../mod/settings.php:443 ../../mod/settings.php:582
+#: ../../mod/settings.php:763 ../../mod/photos.php:888
+#: ../../mod/photos.php:946 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1205 ../../mod/photos.php:1244
+#: ../../mod/photos.php:1275 ../../mod/localtime.php:45
+#: ../../mod/invite.php:106 ../../mod/contacts.php:308
+#: ../../mod/install.php:143 ../../mod/events.php:333
+#: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107
+#: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587
+#: ../../mod/admin.php:652 ../../mod/group.php:84 ../../mod/group.php:167
+#: ../../addon/tumblr/tumblr.php:89 ../../addon/twitter/twitter.php:179
+#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299
+#: ../../addon/statusnet/statusnet.php:282
+#: ../../addon/statusnet/statusnet.php:296
+#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:329
+#: ../../addon/statusnet/statusnet.php:351
+#: ../../addon/statusnet/statusnet.php:486 ../../addon/oembed/oembed.php:41
+#: ../../addon/uhremotestorage/uhremotestorage.php:58
+#: ../../addon/impressum/impressum.php:69
+#: ../../addon/facebook/facebook.php:412 ../../addon/nsfw/nsfw.php:53
+#: ../../addon/posterous/posterous.php:89
+#: ../../addon/randplace/randplace.php:178
+#: ../../addon/jabberchat/jabberchat.php:85 ../../addon/piwik/piwik.php:81
+#: ../../addon/wppost/wppost.php:101 ../../include/conversation.php:485
+msgid "Submit"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../mod/dirfind.php:23
+msgid "People Search"
 msgstr ""
 
-#: ../../mod/tagrm.php:93
-msgid "Remove"
+#: ../../mod/dirfind.php:57 ../../mod/match.php:57
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
+#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113
 #, php-format
-msgid "%s welcomes %s"
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122
+#: ../../mod/photos.php:649
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
+#: ../../mod/wall_upload.php:97 ../../mod/item.php:311
+#: ../../include/message.php:143
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251
+#: ../../mod/photos.php:669
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../mod/profile.php:105 ../../mod/display.php:66
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:645
-#: ../../mod/settings.php:653 ../../mod/settings.php:659
-#: ../../mod/settings.php:667 ../../mod/settings.php:671
-#: ../../mod/settings.php:676 ../../mod/settings.php:682
-#: ../../mod/settings.php:729 ../../mod/settings.php:730
-#: ../../mod/settings.php:731 ../../mod/settings.php:732
-#: ../../mod/register.php:500 ../../mod/profiles.php:357
-msgid "Yes"
+#: ../../mod/profile.php:125
+msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:646
-#: ../../mod/settings.php:653 ../../mod/settings.php:659
-#: ../../mod/settings.php:667 ../../mod/settings.php:671
-#: ../../mod/settings.php:676 ../../mod/settings.php:682
-#: ../../mod/settings.php:729 ../../mod/settings.php:730
-#: ../../mod/settings.php:731 ../../mod/settings.php:732
-#: ../../mod/register.php:501 ../../mod/profiles.php:358
-msgid "No"
+#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:370
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/photos.php:42
-msgid "Photo Albums"
+#: ../../mod/follow.php:39
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:144 ../../mod/photos.php:866
-#: ../../mod/photos.php:936 ../../mod/photos.php:951 ../../mod/photos.php:1351
-#: ../../mod/photos.php:1363 ../../addon/communityhome/communityhome.php:110
-msgid "Contact Photos"
+#: ../../mod/follow.php:40 ../../mod/follow.php:50
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../mod/photos.php:62 ../../mod/settings.php:9
-msgid "everybody"
+#: ../../mod/follow.php:48
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/photos.php:133
-msgid "Contact information unavailable"
+#: ../../mod/follow.php:52
+msgid "An author or name was not found."
 msgstr ""
 
-#: ../../mod/photos.php:144 ../../mod/photos.php:591 ../../mod/photos.php:936
-#: ../../mod/photos.php:951 ../../mod/register.php:318
-#: ../../mod/register.php:325 ../../mod/register.php:332
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
-#: ../../addon/communityhome/communityhome.php:111
-msgid "Profile Photos"
+#: ../../mod/follow.php:54
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../mod/photos.php:154
-msgid "Album not found."
+#: ../../mod/follow.php:61
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: ../../mod/photos.php:172 ../../mod/photos.php:945
-msgid "Delete Album"
+#: ../../mod/follow.php:66
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/photos.php:235 ../../mod/photos.php:1164
-msgid "Delete Photo"
+#: ../../mod/follow.php:136
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/photos.php:522
-msgid "was tagged in a"
+#: ../../mod/follow.php:182
+msgid "following"
 msgstr ""
 
-#: ../../mod/photos.php:522 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../include/diaspora.php:1213 ../../include/conversation.php:31
-#: ../../include/conversation.php:104
-msgid "photo"
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/photos.php:522
-msgid "by"
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
+#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../mod/photos.php:146 ../../mod/photos.php:593 ../../mod/photos.php:938
+#: ../../mod/photos.php:953 ../../mod/register.php:318
+#: ../../mod/register.php:325 ../../mod/register.php:332
+#: ../../addon/communityhome/communityhome.php:111
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:625 ../../addon/js_upload/js_upload.php:312
-msgid "Image exceeds size limit of "
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/photos.php:633
-msgid "Image file is empty."
+#: ../../mod/profile_photo.php:89
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../mod/photos.php:647 ../../mod/profile_photo.php:122
-#: ../../mod/wall_upload.php:65
-msgid "Unable to process image."
+#: ../../mod/profile_photo.php:99
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/photos.php:667 ../../mod/profile_photo.php:251
-#: ../../mod/wall_upload.php:84
-msgid "Image upload failed."
+#: ../../mod/profile_photo.php:203
+msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/photos.php:752 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:594 ../../mod/viewcontacts.php:16
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31
-msgid "Public access denied."
-msgstr ""
-
-#: ../../mod/photos.php:762
-msgid "No photos selected"
+#: ../../mod/profile_photo.php:204
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/photos.php:839
-msgid "Access to this item is restricted."
+#: ../../mod/profile_photo.php:205
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/photos.php:893
-msgid "Upload Photos"
+#: ../../mod/profile_photo.php:206 ../../mod/settings.php:734
+msgid "or"
 msgstr ""
 
-#: ../../mod/photos.php:896 ../../mod/photos.php:940
-msgid "New album name: "
+#: ../../mod/profile_photo.php:206
+msgid "skip this step"
 msgstr ""
 
-#: ../../mod/photos.php:897
-msgid "or existing album name: "
+#: ../../mod/profile_photo.php:206
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/photos.php:898
-msgid "Do not show a status post for this upload"
+#: ../../mod/profile_photo.php:219
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/photos.php:900 ../../mod/photos.php:1159
-msgid "Permissions"
+#: ../../mod/profile_photo.php:220
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/photos.php:955
-msgid "Edit Album"
+#: ../../mod/profile_photo.php:221
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/photos.php:965 ../../mod/photos.php:1381
-msgid "View Photo"
+#: ../../mod/profile_photo.php:249
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/photos.php:1000
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/photos.php:1002
-msgid "Photo not available"
+#: ../../mod/update_community.php:18 ../../mod/update_network.php:22
+#: ../../mod/update_profile.php:41 ../../mod/update_notes.php:41
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/photos.php:1052
-msgid "View photo"
+#: ../../mod/wall_attach.php:57
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/photos.php:1052
-msgid "Edit photo"
+#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
+msgid "File upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:1053
-msgid "Use as profile photo"
+#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35
+msgid "Friend Suggestions"
 msgstr ""
 
-#: ../../mod/photos.php:1059 ../../include/conversation.php:414
-msgid "Private Message"
+#: ../../mod/suggest.php:42
+msgid ""
+"No suggestions. This works best when you have more than one contact/friend."
 msgstr ""
 
-#: ../../mod/photos.php:1070
-msgid "View Full Size"
+#: ../../mod/suggest.php:55
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/photos.php:1138
-msgid "Tags: "
+#: ../../mod/regmod.php:52 ../../mod/register.php:369
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/photos.php:1141
-msgid "[Remove any tag]"
+#: ../../mod/regmod.php:54 ../../mod/register.php:371
+#: ../../mod/register.php:425 ../../mod/dfrn_request.php:583
+#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
+#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1833
+#: ../../include/items.php:2208 ../../include/items.php:2534
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/photos.php:1152
-msgid "New album name"
+#: ../../mod/regmod.php:61
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/photos.php:1155
-msgid "Caption"
+#: ../../mod/regmod.php:93
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/photos.php:1157
-msgid "Add a Tag"
+#: ../../mod/regmod.php:105
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/photos.php:1161
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
+#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/photos.php:1181 ../../include/conversation.php:461
-msgid "I like this (toggle)"
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/photos.php:1182 ../../include/conversation.php:462
-msgid "I don't like this (toggle)"
+#: ../../mod/profiles.php:198
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/photos.php:1183 ../../include/conversation.php:852
-msgid "Share"
+#: ../../mod/profiles.php:256
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/photos.php:1184 ../../mod/editpost.php:99
-#: ../../mod/message.php:137 ../../mod/message.php:270
-#: ../../include/conversation.php:288 ../../include/conversation.php:616
-#: ../../include/conversation.php:861
-msgid "Please wait"
+#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/photos.php:1200 ../../mod/photos.php:1239
-#: ../../mod/photos.php:1270 ../../include/conversation.php:476
-msgid "This is you"
+#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../mod/photos.php:1241
-#: ../../mod/photos.php:1272 ../../include/conversation.php:478
-#: ../../boot.php:420
-msgid "Comment"
+#: ../../mod/profiles.php:309
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/photos.php:1300 ../../mod/settings.php:492
-#: ../../mod/group.php:154 ../../mod/admin.php:468
-#: ../../include/conversation.php:248 ../../include/conversation.php:499
-msgid "Delete"
+#: ../../mod/profiles.php:356
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/photos.php:1368
-msgid "Recent Photos"
+#: ../../mod/profiles.php:357 ../../mod/settings.php:671
+#: ../../mod/settings.php:677 ../../mod/settings.php:685
+#: ../../mod/settings.php:689 ../../mod/settings.php:694
+#: ../../mod/settings.php:700 ../../mod/settings.php:706
+#: ../../mod/settings.php:753 ../../mod/settings.php:754
+#: ../../mod/settings.php:755 ../../mod/settings.php:756
+#: ../../mod/register.php:505 ../../mod/dfrn_request.php:675
+#: ../../mod/api.php:105
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/photos.php:1372
-msgid "Upload New Photos"
+#: ../../mod/profiles.php:358 ../../mod/settings.php:671
+#: ../../mod/settings.php:677 ../../mod/settings.php:685
+#: ../../mod/settings.php:689 ../../mod/settings.php:694
+#: ../../mod/settings.php:700 ../../mod/settings.php:706
+#: ../../mod/settings.php:753 ../../mod/settings.php:754
+#: ../../mod/settings.php:755 ../../mod/settings.php:756
+#: ../../mod/register.php:506 ../../mod/dfrn_request.php:676
+#: ../../mod/api.php:106
+msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:1385
-msgid "View Album"
+#: ../../mod/profiles.php:374
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/community.php:21
-msgid "Not available."
+#: ../../mod/profiles.php:376
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
-msgid "Community"
+#: ../../mod/profiles.php:377
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/community.php:60 ../../mod/search.php:125
-msgid "No results."
+#: ../../mod/profiles.php:378
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/community.php:87
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/profiles.php:379
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/friendica.php:43
-msgid "This is Friendica, version"
+#: ../../mod/profiles.php:380
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/friendica.php:44
-msgid "running at web location"
+#: ../../mod/profiles.php:381
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/friendica.php:46
-msgid ""
-"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
-"a> to learn more about the Friendica project."
+#: ../../mod/profiles.php:382
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/friendica.php:48
-msgid "Bug reports and issues: please visit"
+#: ../../mod/profiles.php:383
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/friendica.php:49
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
+#: ../../mod/profiles.php:384
+#, php-format
+msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../mod/profiles.php:385
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/friendica.php:62
-msgid "No installed plugins/addons/apps"
+#: ../../mod/profiles.php:386
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../mod/profiles.php:387
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
+#: ../../mod/profiles.php:388
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:838
-msgid "Post to Email"
+#: ../../mod/profiles.php:389
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/editpost.php:90 ../../mod/settings.php:491
-#: ../../include/conversation.php:486
-msgid "Edit"
+#: ../../mod/profiles.php:390
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../mod/message.php:135
-#: ../../mod/message.php:268 ../../include/conversation.php:853
-msgid "Upload photo"
+#: ../../mod/profiles.php:391
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:854
-msgid "Attach file"
+#: ../../mod/profiles.php:392
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/editpost.php:93 ../../mod/message.php:136
-#: ../../mod/message.php:269 ../../include/conversation.php:855
-msgid "Insert web link"
+#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/editpost.php:94
-msgid "Insert YouTube video"
+#: ../../mod/profiles.php:394
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/editpost.php:95
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/editpost.php:96
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/profiles.php:396
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:858
-msgid "Set your location"
+#: ../../mod/profiles.php:397
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:859
-msgid "Clear browser location"
+#: ../../mod/profiles.php:398
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:862
-msgid "Permission settings"
+#: ../../mod/profiles.php:399
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:870
-msgid "CC: email addresses"
+#: ../../mod/profiles.php:400
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:871
-msgid "Public post"
+#: ../../mod/profiles.php:401
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:873
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/profiles.php:402
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
+#: ../../mod/profiles.php:403
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:351
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../mod/profiles.php:404
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:356
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../mod/profiles.php:405
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:358
-msgid "Warning: profile location has no profile photo."
+#: ../../mod/profiles.php:406
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:361
-#, 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:167
-msgid "Introduction complete."
+#: ../../mod/profiles.php:407
+msgid "Television"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:191
-msgid "Unrecoverable protocol error."
+#: ../../mod/profiles.php:408
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:219
-msgid "Profile unavailable."
+#: ../../mod/profiles.php:409
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:244
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/profiles.php:410
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
-msgid "Spam protection measures have been invoked."
+#: ../../mod/profiles.php:411
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../mod/profiles.php:416
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:276
-msgid "Invalid locator"
+#: ../../mod/profiles.php:426 ../../mod/directory.php:122
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:296
-msgid "Unable to resolve your name at the provided location."
+#: ../../mod/profiles.php:461
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
-msgid "You have already introduced yourself here."
+#: ../../mod/notice.php:15 ../../mod/display.php:28 ../../mod/display.php:115
+#: ../../mod/viewsrc.php:15 ../../mod/admin.php:111 ../../mod/admin.php:502
+#: ../../include/items.php:2898
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:313
-#, php-format
-msgid "Apparently you are already friends with %s."
+#: ../../mod/settings.php:11 ../../mod/photos.php:64
+msgid "everybody"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:334
-msgid "Invalid profile URL."
+#: ../../mod/settings.php:69
+msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:20
-msgid "Disallowed profile URL."
+#: ../../mod/settings.php:72 ../../mod/settings.php:469 ../../mod/admin.php:62
+msgid "Update"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:409 ../../mod/contacts.php:99
-msgid "Failed to update contact record."
+#: ../../mod/settings.php:167
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:430
-msgid "Your introduction has been sent."
+#: ../../mod/settings.php:172
+msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:483
-msgid "Please login to confirm introduction."
+#: ../../mod/settings.php:190
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:497
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: ../../mod/settings.php:195
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:509
-#, php-format
-msgid "Welcome home %s."
+#: ../../mod/settings.php:206
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:510
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
+#: ../../mod/settings.php:208
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:511
-msgid "Confirm"
+#: ../../mod/settings.php:268
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:544 ../../include/items.php:2525
-msgid "[Name Withheld]"
+#: ../../mod/settings.php:270
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:551
-msgid "Introduction received at "
+#: ../../mod/settings.php:276
+msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:553 ../../mod/lostpass.php:44
-#: ../../mod/lostpass.php:106 ../../mod/register.php:371
-#: ../../mod/register.php:425 ../../mod/regmod.php:54
-#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1833
-#: ../../include/items.php:2208 ../../include/items.php:2534
-msgid "Administrator"
+#: ../../mod/settings.php:278
+msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:635
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
+#: ../../mod/settings.php:346 ../../addon/twitter/twitter.php:294
+#: ../../addon/impressum/impressum.php:64
+#: ../../addon/facebook/facebook.php:322 ../../addon/piwik/piwik.php:94
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:638
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+#: ../../mod/settings.php:405 ../../include/nav.php:128
+msgid "Account settings"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:641
-msgid "Friend/Connection Request"
+#: ../../mod/settings.php:410
+msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:642
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+#: ../../mod/settings.php:415
+msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:643
-msgid "Please answer the following:"
+#: ../../mod/settings.php:420
+msgid "Connections"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:644
-#, php-format
-msgid "Does %s know you?"
+#: ../../mod/settings.php:425
+msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:647
-msgid "Add a personal note:"
+#: ../../mod/settings.php:442 ../../mod/settings.php:468
+#: ../../mod/settings.php:501
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:649 ../../include/contact_selectors.php:78
-msgid "Friendica"
+#: ../../mod/settings.php:444 ../../mod/settings.php:470
+#: ../../mod/dfrn_request.php:685 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45
+msgid "Cancel"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:650
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/settings.php:445 ../../mod/settings.php:471
+#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473
+msgid "Name"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:651 ../../mod/settings.php:527
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
+#: ../../mod/settings.php:446 ../../mod/settings.php:472
+#: ../../addon/statusnet/statusnet.php:480
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:652
-msgid "- please share from your own site as noted above"
+#: ../../mod/settings.php:447 ../../mod/settings.php:473
+#: ../../addon/statusnet/statusnet.php:479
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:653
-msgid "Your Identity Address:"
+#: ../../mod/settings.php:448 ../../mod/settings.php:474
+msgid "Redirect"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:654
-msgid "Submit Request"
+#: ../../mod/settings.php:449 ../../mod/settings.php:475
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/install.php:34
-msgid "Could not create/connect to database."
+#: ../../mod/settings.php:460
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/install.php:39
-msgid "Connected to database."
+#: ../../mod/settings.php:500
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/install.php:75
-msgid "Proceed with Installation"
+#: ../../mod/settings.php:502 ../../mod/editpost.php:90
+#: ../../include/conversation.php:492
+msgid "Edit"
 msgstr ""
 
-#: ../../mod/install.php:77
-msgid "Your Friendika site database has been installed."
+#: ../../mod/settings.php:503 ../../mod/photos.php:1302
+#: ../../mod/admin.php:468 ../../mod/group.php:154
+#: ../../include/conversation.php:251 ../../include/conversation.php:505
+msgid "Delete"
 msgstr ""
 
-#: ../../mod/install.php:78
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/settings.php:504
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/install.php:79 ../../mod/install.php:89 ../../mod/install.php:207
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/settings.php:505
+msgid "No name"
 msgstr ""
 
-#: ../../mod/install.php:81
-msgid "Proceed to registration"
+#: ../../mod/settings.php:506
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/install.php:87
-msgid "Database import failed."
+#: ../../mod/settings.php:518
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/install.php:88
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/settings.php:525 ../../addon/widgets/widgets.php:122
+msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/install.php:101
-msgid "Welcome to Friendika."
+#: ../../mod/settings.php:538 ../../mod/settings.php:539
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/install.php:124
-msgid "Friendika Social Network"
+#: ../../mod/settings.php:538 ../../mod/dfrn_request.php:681
+#: ../../include/contact_selectors.php:78
+msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/install.php:125
-msgid "Installation"
+#: ../../mod/settings.php:538 ../../mod/settings.php:539
+msgid "enabled"
 msgstr ""
 
-#: ../../mod/install.php:126
-msgid ""
-"In order to install Friendika we need to know how to connect to your "
-"database."
+#: ../../mod/settings.php:538 ../../mod/settings.php:539
+msgid "disabled"
 msgstr ""
 
-#: ../../mod/install.php:127
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/settings.php:539
+msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/install.php:128
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/settings.php:565
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/install.php:129
-msgid "Database Server Name"
+#: ../../mod/settings.php:571
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/install.php:130
-msgid "Database Login Name"
+#: ../../mod/settings.php:572
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/install.php:131
-msgid "Database Login Password"
+#: ../../mod/settings.php:573
+msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/install.php:132
-msgid "Database Name"
+#: ../../mod/settings.php:574
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "Please select a default timezone for your website"
+#: ../../mod/settings.php:575
+msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/install.php:134
-msgid ""
-"Site administrator email address. Your account email address must match this "
-"in order to use the web admin panel."
+#: ../../mod/settings.php:576
+msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/install.php:153
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/settings.php:577
+msgid "Security:"
 msgstr ""
 
-#: ../../mod/install.php:154
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+#: ../../mod/settings.php:577
+msgid "None"
 msgstr ""
 
-#: ../../mod/install.php:161
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/settings.php:578
+msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/install.php:162
-msgid "This is required for message delivery to work."
+#: ../../mod/settings.php:579
+msgid "Email password:"
 msgstr ""
 
-#: ../../mod/install.php:184
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/settings.php:580
+msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/install.php:185
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/settings.php:581
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/install.php:194
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/settings.php:638 ../../mod/admin.php:126 ../../mod/admin.php:443
+msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/install.php:196
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/settings.php:639
+msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/install.php:198
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/settings.php:642 ../../mod/admin.php:127 ../../mod/admin.php:444
+msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/install.php:200
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/settings.php:643
+msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/install.php:202
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/settings.php:646 ../../mod/admin.php:128 ../../mod/admin.php:445
+msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/install.php:204
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/settings.php:647
+msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/install.php:216
-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."
+#: ../../mod/settings.php:650 ../../mod/admin.php:129 ../../mod/admin.php:446
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/install.php:217
-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."
+#: ../../mod/settings.php:651
+msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/install.php:218
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+#: ../../mod/settings.php:661
+msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/install.php:219
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+#: ../../mod/settings.php:661
+msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/install.php:228
-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."
+#: ../../mod/settings.php:671
+msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/install.php:243
-msgid "Errors encountered creating database tables."
+#: ../../mod/settings.php:677
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:227
-msgid "l F d, Y \\@ g:i A"
+#: ../../mod/settings.php:685
+msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
+#: ../../mod/settings.php:689
+msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendika provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+#: ../../mod/settings.php:694
+msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
+#: ../../mod/settings.php:700
+msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
+#: ../../mod/settings.php:706
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
+#: ../../mod/settings.php:715
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
+#: ../../mod/settings.php:739
+msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
+#: ../../mod/settings.php:750
+msgid "Automatically expire posts after days:"
 msgstr ""
 
-#: ../../mod/match.php:18
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/settings.php:750
+msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/match.php:57 ../../mod/dirfind.php:57
-msgid "No matches"
+#: ../../mod/settings.php:751
+msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/settings.php:752
+msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/settings.php:753
+msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/settings.php:754
+msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
+#: ../../mod/settings.php:755
+msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:144
-#: ../../mod/notifications.php:188
-msgid "Discard"
+#: ../../mod/settings.php:756
+msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:143
-#: ../../mod/notifications.php:187 ../../mod/contacts.php:289
-#: ../../mod/contacts.php:332
-msgid "Ignore"
+#: ../../mod/settings.php:761
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:71 ../../include/nav.php:109
-msgid "Network"
+#: ../../mod/settings.php:769
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:73
-#: ../../include/nav.php:111
-msgid "Home"
+#: ../../mod/settings.php:770
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../include/nav.php:117
-msgid "Introductions"
+#: ../../mod/settings.php:771
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../mod/message.php:72
-#: ../../include/nav.php:122
-msgid "Messages"
+#: ../../mod/settings.php:771
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "Show Ignored Requests"
+#: ../../mod/settings.php:775
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "Hide Ignored Requests"
+#: ../../mod/settings.php:776 ../../include/profile_advanced.php:15
+msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/notifications.php:131 ../../mod/notifications.php:174
-msgid "Notification type: "
+#: ../../mod/settings.php:777
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/notifications.php:132
-msgid "Friend Suggestion"
+#: ../../mod/settings.php:778
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/notifications.php:134
-#, php-format
-msgid "suggested by %s"
+#: ../../mod/settings.php:779
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/notifications.php:140 ../../mod/notifications.php:185
-#: ../../mod/admin.php:466
-msgid "Approve"
+#: ../../mod/settings.php:780
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/notifications.php:160
-msgid "Claims to be known to you: "
+#: ../../mod/settings.php:781
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/notifications.php:160
-msgid "yes"
+#: ../../mod/settings.php:782
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/notifications.php:160
-msgid "no"
+#: ../../mod/settings.php:782
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/notifications.php:167
-msgid "Approve as: "
+#: ../../mod/settings.php:784
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:168
-msgid "Friend"
+#: ../../mod/settings.php:786
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/notifications.php:169
-msgid "Sharer"
+#: ../../mod/settings.php:786
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/notifications.php:169
-msgid "Fan/Admirer"
+#: ../../mod/settings.php:787
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/notifications.php:175
-msgid "Friend/Connect Request"
+#: ../../mod/settings.php:788
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/notifications.php:175
-msgid "New Follower"
+#: ../../mod/settings.php:803
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:194
-msgid "No notifications."
+#: ../../mod/settings.php:804
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/notifications.php:197 ../../mod/notifications.php:283
-#: ../../mod/notifications.php:359 ../../include/nav.php:118
-msgid "Notifications"
+#: ../../mod/settings.php:805
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/notifications.php:234 ../../mod/notifications.php:316
-#, php-format
-msgid "%s liked %s's post"
+#: ../../mod/settings.php:806
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/notifications.php:243 ../../mod/notifications.php:325
-#, php-format
-msgid "%s disliked %s's post"
+#: ../../mod/settings.php:807
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:339
-#, php-format
-msgid "%s is now friends with %s"
+#: ../../mod/settings.php:808
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/notifications.php:264
-#, php-format
-msgid "%s created a new post"
+#: ../../mod/settings.php:809
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:348
-#, php-format
-msgid "%s commented on %s's post"
+#: ../../mod/settings.php:813
+msgid "Advanced Page Settings"
 msgstr ""
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:355
-msgid "Nothing new!"
+#: ../../mod/search.php:13 ../../mod/network.php:92
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/contacts.php:62 ../../mod/contacts.php:133
-msgid "Could not access contact record."
+#: ../../mod/search.php:16 ../../mod/network.php:83
+msgid "Remove term"
 msgstr ""
 
-#: ../../mod/contacts.php:76
-msgid "Could not locate selected profile."
+#: ../../mod/search.php:71 ../../mod/photos.php:754 ../../mod/display.php:7
+#: ../../mod/dfrn_request.php:624 ../../mod/directory.php:31
+#: ../../mod/viewcontacts.php:16 ../../mod/community.php:16
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/contacts.php:97
-msgid "Contact updated."
+#: ../../mod/search.php:83
+msgid "Search This Site"
 msgstr ""
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been blocked"
+#: ../../mod/search.php:118 ../../mod/community.php:60
+msgid "No results."
 msgstr ""
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been unblocked"
+#: ../../mod/photos.php:42
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/contacts.php:169
-msgid "Contact has been ignored"
+#: ../../mod/photos.php:50 ../../mod/photos.php:146 ../../mod/photos.php:868
+#: ../../mod/photos.php:938 ../../mod/photos.php:953 ../../mod/photos.php:1353
+#: ../../mod/photos.php:1365 ../../addon/communityhome/communityhome.php:110
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:169
-msgid "Contact has been unignored"
+#: ../../mod/photos.php:135
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/contacts.php:190
-msgid "stopped following"
+#: ../../mod/photos.php:156
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/contacts.php:211
-msgid "Contact has been removed."
+#: ../../mod/photos.php:174 ../../mod/photos.php:947
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/contacts.php:232
-#, php-format
-msgid "You are mutual friends with %s"
+#: ../../mod/photos.php:237 ../../mod/photos.php:1166
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:236
-#, php-format
-msgid "You are sharing with %s"
+#: ../../mod/photos.php:524
+msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/contacts.php:241
-#, php-format
-msgid "%s is sharing with you"
+#: ../../mod/photos.php:524 ../../mod/tagger.php:70 ../../mod/like.php:127
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../include/conversation.php:31 ../../include/conversation.php:104
+#: ../../include/diaspora.php:1481
+msgid "photo"
 msgstr ""
 
-#: ../../mod/contacts.php:258
-msgid "Private communications are not available for this contact."
+#: ../../mod/photos.php:524
+msgid "by"
 msgstr ""
 
-#: ../../mod/contacts.php:261
-msgid "Never"
+#: ../../mod/photos.php:627 ../../addon/js_upload/js_upload.php:312
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/contacts.php:265
-msgid "(Update was successful)"
+#: ../../mod/photos.php:635
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/contacts.php:265
-msgid "(Update was not successful)"
+#: ../../mod/photos.php:764
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Suggest friends"
+#: ../../mod/photos.php:841
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/contacts.php:271
-#, php-format
-msgid "Network type: %s"
+#: ../../mod/photos.php:895
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:274
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:279
-msgid "View all contacts"
+#: ../../mod/photos.php:898 ../../mod/photos.php:942
+msgid "New album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:470
-msgid "Unblock"
+#: ../../mod/photos.php:899
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:469
-msgid "Block"
+#: ../../mod/photos.php:900
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
-msgid "Unignore"
+#: ../../mod/photos.php:902 ../../mod/photos.php:1161
+msgid "Permissions"
 msgstr ""
 
-#: ../../mod/contacts.php:294
-msgid "Repair"
+#: ../../mod/photos.php:957
+msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/contacts.php:304
-msgid "Contact Editor"
+#: ../../mod/photos.php:967 ../../mod/photos.php:1383
+msgid "View Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:307
-msgid "Profile Visibility"
+#: ../../mod/photos.php:1002
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/contacts.php:308
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../mod/photos.php:1004
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/contacts.php:309
-msgid "Contact Information / Notes"
+#: ../../mod/photos.php:1054
+msgid "View photo"
 msgstr ""
 
-#: ../../mod/contacts.php:310
-msgid "Edit contact notes"
+#: ../../mod/photos.php:1054
+msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:430
-#: ../../mod/viewcontacts.php:61
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../mod/photos.php:1055
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/contacts.php:316
-msgid "Block/Unblock contact"
+#: ../../mod/photos.php:1061 ../../include/conversation.php:420
+msgid "Private Message"
 msgstr ""
 
-#: ../../mod/contacts.php:317
-msgid "Ignore contact"
+#: ../../mod/photos.php:1072
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/contacts.php:318
-msgid "Repair URL settings"
+#: ../../mod/photos.php:1140
+msgid "Tags: "
 msgstr ""
 
-#: ../../mod/contacts.php:319
-msgid "View conversations"
+#: ../../mod/photos.php:1143
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/contacts.php:321
-msgid "Delete contact"
+#: ../../mod/photos.php:1154
+msgid "New album name"
 msgstr ""
 
-#: ../../mod/contacts.php:325
-msgid "Last update:"
+#: ../../mod/photos.php:1157
+msgid "Caption"
 msgstr ""
 
-#: ../../mod/contacts.php:326
-msgid "Update public posts"
+#: ../../mod/photos.php:1159
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/contacts.php:328 ../../mod/admin.php:701
-msgid "Update now"
+#: ../../mod/photos.php:1163
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/contacts.php:335
-msgid "Currently blocked"
+#: ../../mod/photos.php:1183 ../../include/conversation.php:467
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/contacts.php:336
-msgid "Currently ignored"
+#: ../../mod/photos.php:1184 ../../include/conversation.php:468
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/contacts.php:364 ../../include/nav.php:130
-msgid "Contacts"
+#: ../../mod/photos.php:1185 ../../include/conversation.php:857
+msgid "Share"
 msgstr ""
 
-#: ../../mod/contacts.php:366
-msgid "Show Blocked Connections"
+#: ../../mod/photos.php:1186 ../../mod/editpost.php:99
+#: ../../mod/message.php:155 ../../mod/message.php:296
+#: ../../include/conversation.php:291 ../../include/conversation.php:626
+#: ../../include/conversation.php:866
+msgid "Please wait"
 msgstr ""
 
-#: ../../mod/contacts.php:366
-msgid "Hide Blocked Connections"
+#: ../../mod/photos.php:1202 ../../mod/photos.php:1241
+#: ../../mod/photos.php:1272 ../../include/conversation.php:482
+msgid "This is you"
 msgstr ""
 
-#: ../../mod/contacts.php:368
-msgid "Search your contacts"
+#: ../../mod/photos.php:1370
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:369 ../../mod/directory.php:65
-msgid "Finding: "
+#: ../../mod/photos.php:1374
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:370 ../../mod/directory.php:67
-#: ../../include/contact_widgets.php:34
-msgid "Find"
+#: ../../mod/photos.php:1387
+msgid "View Album"
 msgstr ""
 
-#: ../../mod/contacts.php:406
-msgid "Mutual Friendship"
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendika"
 msgstr ""
 
-#: ../../mod/contacts.php:410
-msgid "is a fan of yours"
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
 msgstr ""
 
-#: ../../mod/contacts.php:414
-msgid "you are a fan of"
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page."
 msgstr ""
 
-#: ../../mod/contacts.php:431 ../../include/Contact.php:129
-#: ../../include/conversation.php:717
-msgid "Edit contact"
+#: ../../mod/newmember.php:16
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This will be useful in making friends."
 msgstr ""
 
-#: ../../mod/lostpass.php:16
-msgid "No valid account found."
+#: ../../mod/newmember.php:18
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/lostpass.php:31
-msgid "Password reset request issued. Check your email."
+#: ../../mod/newmember.php:20
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: ../../mod/lostpass.php:42
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/newmember.php:23
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/newmember.php:28
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+"Enter your email access information on your Settings page if you wish to "
+"import and interact with friends or mailing lists from your email INBOX"
 msgstr ""
 
-#: ../../mod/lostpass.php:82 ../../boot.php:695
-msgid "Password Reset"
+#: ../../mod/newmember.php:30
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: ../../mod/lostpass.php:83
-msgid "Your password has been reset as requested."
+#: ../../mod/newmember.php:32
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: ../../mod/lostpass.php:84
-msgid "Your new password is"
+#: ../../mod/newmember.php:34
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Connect</em> dialog."
 msgstr ""
 
-#: ../../mod/lostpass.php:85
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../mod/lostpass.php:86
-msgid "click here to login"
-msgstr ""
-
-#: ../../mod/lostpass.php:87
+#: ../../mod/newmember.php:36
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../mod/lostpass.php:118
-msgid "Forgot your Password?"
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/newmember.php:38
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with "
+"each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/lostpass.php:120
-msgid "Nickname or Email: "
+#: ../../mod/newmember.php:40
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: ../../mod/lostpass.php:121
-msgid "Reset"
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:229
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../mod/settings.php:67
-msgid "Missing some important data!"
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: ../../mod/settings.php:70 ../../mod/settings.php:458 ../../mod/admin.php:62
-msgid "Update"
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: ../../mod/settings.php:165
-msgid "Failed to connect with email account using the settings provided."
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
 msgstr ""
 
-#: ../../mod/settings.php:170
-msgid "Email settings updated."
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
 msgstr ""
 
-#: ../../mod/settings.php:188
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: ../../mod/settings.php:193
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:204
-msgid "Password changed."
+#: ../../mod/display.php:108
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/settings.php:206
-msgid "Password update failed. Please try again."
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/settings.php:260
-msgid " Please use a shorter name."
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/settings.php:262
-msgid " Name too short."
+#: ../../mod/editpost.php:75 ../../include/conversation.php:843
+msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/settings.php:268
-msgid " Not valid email."
+#: ../../mod/editpost.php:91 ../../mod/message.php:153
+#: ../../mod/message.php:294 ../../include/conversation.php:858
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/settings.php:270
-msgid " Cannot change to that email."
+#: ../../mod/editpost.php:92 ../../include/conversation.php:859
+msgid "Attach file"
 msgstr ""
 
-#: ../../mod/settings.php:335 ../../addon/facebook/facebook.php:320
-#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94
-#: ../../addon/twitter/twitter.php:294
-msgid "Settings updated."
+#: ../../mod/editpost.php:93 ../../mod/message.php:154
+#: ../../mod/message.php:295 ../../include/conversation.php:860
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/settings.php:394 ../../include/nav.php:128
-msgid "Account settings"
+#: ../../mod/editpost.php:94
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/settings.php:399
-msgid "Connector settings"
+#: ../../mod/editpost.php:95
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/settings.php:404
-msgid "Plugin settings"
+#: ../../mod/editpost.php:96
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/settings.php:409
-msgid "Connections"
+#: ../../mod/editpost.php:97 ../../include/conversation.php:863
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/settings.php:414
-msgid "Export personal data"
+#: ../../mod/editpost.php:98 ../../include/conversation.php:864
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/settings.php:431 ../../mod/settings.php:457
-#: ../../mod/settings.php:490
-msgid "Add application"
+#: ../../mod/editpost.php:100 ../../include/conversation.php:867
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/settings.php:435 ../../mod/settings.php:461
-#: ../../addon/statusnet/statusnet.php:480
-msgid "Consumer Key"
+#: ../../mod/editpost.php:108 ../../include/conversation.php:875
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/settings.php:436 ../../mod/settings.php:462
-#: ../../addon/statusnet/statusnet.php:479
-msgid "Consumer Secret"
+#: ../../mod/editpost.php:109 ../../include/conversation.php:876
+msgid "Public post"
 msgstr ""
 
-#: ../../mod/settings.php:437 ../../mod/settings.php:463
-msgid "Redirect"
+#: ../../mod/editpost.php:111 ../../include/conversation.php:878
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/settings.php:438 ../../mod/settings.php:464
-msgid "Icon url"
+#: ../../mod/invite.php:35
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/settings.php:449
-msgid "You can't edit this application."
+#: ../../mod/invite.php:59
+#, php-format
+msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/settings.php:489
-msgid "Connected Apps"
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/settings.php:493
-msgid "Client key starts with"
-msgstr ""
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/settings.php:494
-msgid "No name"
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/settings.php:495
-msgid "Remove authorization"
+#: ../../mod/invite.php:99
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/settings.php:507
-msgid "No Plugin settings configured"
+#: ../../mod/invite.php:100
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/settings.php:514 ../../addon/widgets/widgets.php:122
-msgid "Plugin Settings"
+#: ../../mod/invite.php:101 ../../mod/message.php:150
+#: ../../mod/message.php:291
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
+#: ../../mod/invite.php:102
 #, php-format
-msgid "Built-in support for %s connectivity is %s"
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
-msgid "enabled"
+#: ../../mod/invite.php:103
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
-msgid "disabled"
+#: ../../mod/invite.php:104
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/settings.php:528
-msgid "StatusNet"
+#: ../../mod/invite.php:104
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/settings.php:554
-msgid "Connector Settings"
+#: ../../mod/ping.php:158
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/settings.php:560
-msgid "Email/Mailbox Setup"
+#: ../../mod/ping.php:163
+msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/settings.php:561
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+#: ../../mod/ping.php:168
+msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/settings.php:562
-msgid "Last successful email check:"
+#: ../../mod/ping.php:174
+#, php-format
+msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/settings.php:563
-msgid "Email access is disabled on this site."
+#: ../../mod/ping.php:179
+#, php-format
+msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/settings.php:564
-msgid "IMAP server name:"
+#: ../../mod/ping.php:184
+#, php-format
+msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/settings.php:565
-msgid "IMAP port:"
+#: ../../mod/ping.php:189
+#, php-format
+msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/settings.php:566
-msgid "Security:"
+#: ../../mod/ping.php:194
+msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/settings.php:566
-msgid "None"
+#: ../../mod/ping.php:199
+#, php-format
+msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/settings.php:567
-msgid "Email login name:"
+#: ../../mod/ping.php:204
+msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/settings.php:568
-msgid "Email password:"
+#: ../../mod/contacts.php:62 ../../mod/contacts.php:135
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/settings.php:569
-msgid "Reply-to address:"
+#: ../../mod/contacts.php:76
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/settings.php:570
-msgid "Send public posts to all email contacts:"
+#: ../../mod/contacts.php:99
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/settings.php:620 ../../mod/admin.php:126 ../../mod/admin.php:443
-msgid "Normal Account"
+#: ../../mod/contacts.php:101 ../../mod/dfrn_request.php:439
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/settings.php:621
-msgid "This account is a normal personal profile"
+#: ../../mod/contacts.php:157
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/settings.php:624 ../../mod/admin.php:127 ../../mod/admin.php:444
-msgid "Soapbox Account"
+#: ../../mod/contacts.php:157
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/settings.php:625
-msgid "Automatically approve all connection/friend requests as read-only fans"
+#: ../../mod/contacts.php:171
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/settings.php:628 ../../mod/admin.php:128 ../../mod/admin.php:445
-msgid "Community/Celebrity Account"
+#: ../../mod/contacts.php:171
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/settings.php:629
-msgid "Automatically approve all connection/friend requests as read-write fans"
+#: ../../mod/contacts.php:192
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/settings.php:632 ../../mod/admin.php:129 ../../mod/admin.php:446
-msgid "Automatic Friend Account"
+#: ../../mod/contacts.php:213
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/settings.php:633
-msgid "Automatically approve all connection/friend requests as friends"
+#: ../../mod/contacts.php:234
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/settings.php:643
-msgid "OpenID:"
+#: ../../mod/contacts.php:238
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/settings.php:643
-msgid "(Optional) Allow this OpenID to login to this account."
+#: ../../mod/contacts.php:243
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/settings.php:653
-msgid "Publish your default profile in your local site directory?"
+#: ../../mod/contacts.php:260
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/settings.php:659
-msgid "Publish your default profile in the global social directory?"
+#: ../../mod/contacts.php:263
+msgid "Never"
 msgstr ""
 
-#: ../../mod/settings.php:667
-msgid "Hide your contact/friend list from viewers of your default profile?"
+#: ../../mod/contacts.php:267
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/settings.php:671
-msgid "Hide your profile details from unknown viewers?"
+#: ../../mod/contacts.php:267
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/settings.php:676
-msgid "Allow friends to post to your profile page?"
+#: ../../mod/contacts.php:269
+msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/settings.php:682
-msgid "Allow friends to tag your posts?"
+#: ../../mod/contacts.php:273
+#, php-format
+msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/settings.php:691
-msgid "Profile is <strong>not published</strong>."
-msgstr ""
+#: ../../mod/contacts.php:276
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/settings.php:710 ../../mod/profile_photo.php:206
-msgid "or"
+#: ../../mod/contacts.php:281
+msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/settings.php:715
-msgid "Your Identity Address is"
+#: ../../mod/contacts.php:286 ../../mod/contacts.php:333
+#: ../../mod/admin.php:470
+msgid "Unblock"
 msgstr ""
 
-#: ../../mod/settings.php:726
-msgid "Automatically expire posts after days:"
+#: ../../mod/contacts.php:286 ../../mod/contacts.php:333
+#: ../../mod/admin.php:469
+msgid "Block"
 msgstr ""
 
-#: ../../mod/settings.php:726
-msgid "If empty, posts will not expire. Expired posts will be deleted"
+#: ../../mod/contacts.php:291 ../../mod/contacts.php:334
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/settings.php:727
-msgid "Advanced expiration settings"
+#: ../../mod/contacts.php:291 ../../mod/contacts.php:334
+#: ../../mod/notifications.php:47 ../../mod/notifications.php:148
+#: ../../mod/notifications.php:192
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/settings.php:728
-msgid "Advanced Expiration"
+#: ../../mod/contacts.php:296
+msgid "Repair"
 msgstr ""
 
-#: ../../mod/settings.php:729
-msgid "Expire posts:"
+#: ../../mod/contacts.php:306
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/settings.php:730
-msgid "Expire personal notes:"
+#: ../../mod/contacts.php:309
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/settings.php:731
-msgid "Expire starred posts:"
+#: ../../mod/contacts.php:310
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/settings.php:732
-msgid "Expire photos:"
+#: ../../mod/contacts.php:311
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/settings.php:737
-msgid "Account Settings"
+#: ../../mod/contacts.php:312
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/settings.php:745
-msgid "Password Settings"
+#: ../../mod/contacts.php:317 ../../mod/contacts.php:433
+#: ../../mod/viewcontacts.php:61
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/settings.php:746
-msgid "New Password:"
+#: ../../mod/contacts.php:318
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/settings.php:747
-msgid "Confirm:"
+#: ../../mod/contacts.php:319
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/settings.php:747
-msgid "Leave password fields blank unless changing"
+#: ../../mod/contacts.php:320
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/settings.php:751
-msgid "Basic Settings"
+#: ../../mod/contacts.php:321
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/settings.php:752 ../../include/profile_advanced.php:15
-msgid "Full Name:"
+#: ../../mod/contacts.php:323
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/settings.php:753
-msgid "Email Address:"
+#: ../../mod/contacts.php:327
+msgid "Last update:"
 msgstr ""
 
-#: ../../mod/settings.php:754
-msgid "Your Timezone:"
+#: ../../mod/contacts.php:328
+msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/settings.php:755
-msgid "Default Post Location:"
+#: ../../mod/contacts.php:330 ../../mod/admin.php:701
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/settings.php:756
-msgid "Use Browser Location:"
+#: ../../mod/contacts.php:337
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/settings.php:757
-msgid "Display Theme:"
+#: ../../mod/contacts.php:338
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/settings.php:761
-msgid "Security and Privacy Settings"
+#: ../../mod/contacts.php:339
+msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/settings.php:763
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/contacts.php:339
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/settings.php:763
-msgid "(to prevent spam abuse)"
+#: ../../mod/contacts.php:367 ../../include/nav.php:130
+msgid "Contacts"
 msgstr ""
 
-#: ../../mod/settings.php:764
-msgid "Default Post Permissions"
+#: ../../mod/contacts.php:369
+msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/settings.php:765
-msgid "(click to open/close)"
+#: ../../mod/contacts.php:369
+msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/settings.php:780
-msgid "Notification Settings"
+#: ../../mod/contacts.php:371
+msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/settings.php:781
-msgid "Send a notification email when:"
+#: ../../mod/contacts.php:372 ../../mod/directory.php:65
+msgid "Finding: "
 msgstr ""
 
-#: ../../mod/settings.php:782
-msgid "You receive an introduction"
+#: ../../mod/contacts.php:373 ../../mod/directory.php:67
+#: ../../include/contact_widgets.php:34
+msgid "Find"
 msgstr ""
 
-#: ../../mod/settings.php:783
-msgid "Your introductions are confirmed"
+#: ../../mod/contacts.php:409
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/settings.php:784
-msgid "Someone writes on your profile wall"
+#: ../../mod/contacts.php:413
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/settings.php:785
-msgid "Someone writes a followup comment"
+#: ../../mod/contacts.php:417
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/settings.php:786
-msgid "You receive a private message"
+#: ../../mod/contacts.php:434 ../../include/Contact.php:129
+#: ../../include/conversation.php:722
+msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/settings.php:790
-msgid "Advanced Page Settings"
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/register.php:53
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/register.php:58
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/register.php:66
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/network.php:83 ../../mod/search.php:16
-msgid "Remove term"
+#: ../../mod/register.php:81
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/network.php:92 ../../mod/search.php:13
-msgid "Saved Searches"
+#: ../../mod/register.php:95
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/network.php:93 ../../include/group.php:214
-msgid "add"
+#: ../../mod/register.php:97
+msgid "Name too short."
 msgstr ""
 
-#: ../../mod/network.php:157
-msgid "Commented Order"
+#: ../../mod/register.php:112
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/network.php:162
-msgid "Posted Order"
+#: ../../mod/register.php:117
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/network.php:168
-msgid "New"
+#: ../../mod/register.php:120
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/network.php:173
-msgid "Starred"
+#: ../../mod/register.php:130
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/network.php:178
-msgid "Bookmarks"
+#: ../../mod/register.php:136
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/network.php:225
-#, php-format
-msgid "Warning: This group contains %s member from an insecure network."
-msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/register.php:142 ../../mod/register.php:243
+msgid "Nickname is already registered. Please choose another."
+msgstr ""
 
-#: ../../mod/network.php:228
-msgid "Private messages to this group are at risk of public disclosure."
+#: ../../mod/register.php:161
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/network.php:301
-msgid "No such group"
+#: ../../mod/register.php:229
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/network.php:312
-msgid "Group is empty"
+#: ../../mod/register.php:265
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/network.php:317
-msgid "Group: "
+#: ../../mod/register.php:377
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/network.php:327
-msgid "Contact: "
+#: ../../mod/register.php:381
+msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/network.php:329
-msgid "Private messages to this person are at risk of public disclosure."
+#: ../../mod/register.php:386
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/network.php:334
-msgid "Invalid contact."
+#: ../../mod/register.php:423
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1307
-msgid "Personal Notes"
+#: ../../mod/register.php:432
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:628
-msgid "Save"
+#: ../../mod/register.php:486
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendika"
+#: ../../mod/register.php:487
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
+#: ../../mod/register.php:488
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/newmember.php:12
-msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
+#: ../../mod/register.php:502
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/newmember.php:16
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
+#: ../../mod/register.php:517
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/newmember.php:18
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
+#: ../../mod/register.php:518
+msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/newmember.php:20
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
+#: ../../mod/register.php:521 ../../mod/admin.php:297
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/newmember.php:23
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
+#: ../../mod/register.php:529
+msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/newmember.php:28
-msgid ""
-"Enter your email access information on your Settings page if you wish to "
-"import and interact with friends or mailing lists from your email INBOX"
+#: ../../mod/register.php:530
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/newmember.php:30
+#: ../../mod/register.php:531
 msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
+"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/newmember.php:32
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
+#: ../../mod/register.php:532
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/newmember.php:34
-msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Connect</em> dialog."
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
 msgstr ""
 
-#: ../../mod/newmember.php:36
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
-"their profile page. Provide your own Identity Address if requested."
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
 msgstr ""
 
-#: ../../mod/newmember.php:38
-msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with "
-"each group privately on your Network page."
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/newmember.php:40
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
+#: ../../mod/help.php:30
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/attach.php:8
-msgid "Item not available."
+#: ../../mod/help.php:34 ../../include/nav.php:82
+msgid "Help"
 msgstr ""
 
-#: ../../mod/attach.php:20
-msgid "Item was not found."
+#: ../../mod/install.php:34
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../mod/install.php:39
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../mod/install.php:81
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../mod/install.php:83
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../mod/install.php:84
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:283
-msgid "Permission denied"
+#: ../../mod/install.php:85 ../../mod/install.php:95 ../../mod/install.php:213
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/group.php:82
-msgid "Create a group of contacts/friends."
+#: ../../mod/install.php:87
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
-msgid "Group Name: "
+#: ../../mod/install.php:93
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/group.php:98
-msgid "Group removed."
+#: ../../mod/install.php:94
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/group.php:100
-msgid "Unable to remove group."
+#: ../../mod/install.php:107
+msgid "Welcome to Friendica."
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
+#: ../../mod/install.php:130
+msgid "Friendica Social Communications Server"
 msgstr ""
 
-#: ../../mod/group.php:165
-msgid "Group Editor"
+#: ../../mod/install.php:131
+msgid "Installation"
 msgstr ""
 
-#: ../../mod/group.php:179
-msgid "Members"
+#: ../../mod/install.php:132
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/group.php:194
-msgid "All Contacts"
+#: ../../mod/install.php:133
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
+#: ../../mod/install.php:134
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
+#: ../../mod/install.php:135
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:74 ../../include/nav.php:48
-#: ../../boot.php:1289
-msgid "Profile"
+#: ../../mod/install.php:136
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/profperm.php:114
-msgid "Visible To"
+#: ../../mod/install.php:137
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
+#: ../../mod/install.php:138
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:567
-msgid "View Contacts"
+#: ../../mod/install.php:139
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
+#: ../../mod/install.php:140
+msgid ""
+"Site administrator email address. Your account email address must match this "
+"in order to use the web admin panel."
 msgstr ""
 
-#: ../../mod/register.php:53
-msgid "An invitation is required."
+#: ../../mod/install.php:159
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/register.php:58
-msgid "Invitation could not be verified."
+#: ../../mod/install.php:160
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/register.php:66
-msgid "Invalid OpenID url"
+#: ../../mod/install.php:167
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/register.php:81
-msgid "Please enter the required information."
+#: ../../mod/install.php:168
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/register.php:95
-msgid "Please use a shorter name."
+#: ../../mod/install.php:190
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/register.php:97
-msgid "Name too short."
+#: ../../mod/install.php:191
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/register.php:112
-msgid "That doesn't appear to be your full (First Last) name."
+#: ../../mod/install.php:200
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:117
-msgid "Your email domain is not among those allowed on this site."
+#: ../../mod/install.php:202
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:120
-msgid "Not a valid email address."
+#: ../../mod/install.php:204
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:130
-msgid "Cannot use that email."
+#: ../../mod/install.php:206
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:136
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../mod/install.php:208
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:142 ../../mod/register.php:243
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/install.php:210
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/register.php:161
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/install.php:222
+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/register.php:229
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/install.php:223
+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/register.php:265
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/install.php:224
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/register.php:369 ../../mod/regmod.php:52
-#, php-format
-msgid "Registration details for %s"
+#: ../../mod/install.php:225
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/register.php:377
+#: ../../mod/install.php:234
 msgid ""
-"Registration successful. Please check your email for further instructions."
+"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/register.php:381
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/install.php:249
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/register.php:386
-msgid "Your registration can not be processed."
+#: ../../mod/network.php:93 ../../include/group.php:216
+msgid "add"
 msgstr ""
 
-#: ../../mod/register.php:423
-#, php-format
-msgid "Registration request at %s"
+#: ../../mod/network.php:166
+msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/register.php:432
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/network.php:171
+msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/register.php:481
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: ../../mod/network.php:177 ../../mod/notifications.php:76
+msgid "Personal"
 msgstr ""
 
-#: ../../mod/register.php:482
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: ../../mod/network.php:182
+msgid "New"
 msgstr ""
 
-#: ../../mod/register.php:483
-msgid "Your OpenID (optional): "
+#: ../../mod/network.php:187
+msgid "Starred"
 msgstr ""
 
-#: ../../mod/register.php:497
-msgid "Include your profile in member directory?"
+#: ../../mod/network.php:192
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../mod/register.php:512
-msgid "Membership on this site is by invitation only."
-msgstr ""
+#: ../../mod/network.php:240
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/register.php:513
-msgid "Your invitation ID: "
+#: ../../mod/network.php:243
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/register.php:516 ../../mod/admin.php:297
-msgid "Registration"
+#: ../../mod/network.php:289
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/register.php:524
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/network.php:300
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/register.php:525
-msgid "Your Email Address: "
+#: ../../mod/network.php:305
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/register.php:526
-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>'."
+#: ../../mod/network.php:315
+msgid "Contact: "
 msgstr ""
 
-#: ../../mod/register.php:527
-msgid "Choose a nickname: "
+#: ../../mod/network.php:317
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/register.php:530 ../../include/nav.php:77 ../../boot.php:665
-msgid "Register"
+#: ../../mod/network.php:322
+msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/dirfind.php:23
-msgid "People Search"
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1024
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../include/diaspora.php:1213 ../../include/conversation.php:26
-#: ../../include/conversation.php:35 ../../include/conversation.php:99
-#: ../../include/conversation.php:108
-msgid "status"
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1028
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../include/diaspora.php:1229 ../../include/conversation.php:43
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/profperm.php:105 ../../mod/group.php:164
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:46
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/profperm.php:114
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111
-#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:115
-#: ../../include/items.php:2898
-msgid "Item not found."
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
+#: ../../mod/events.php:61
+msgid "Event description and start time are required."
 msgstr ""
 
-#: ../../mod/regmod.php:61
-msgid "Account approved."
+#: ../../mod/events.php:207
+msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/events.php:210
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/regmod.php:105
-msgid "Please login."
+#: ../../mod/events.php:213
+msgid "Next"
 msgstr ""
 
-#: ../../mod/item.php:84
-msgid "Unable to locate original post."
+#: ../../mod/events.php:220
+msgid "l, F j"
 msgstr ""
 
-#: ../../mod/item.php:199
-msgid "Empty post discarded."
+#: ../../mod/events.php:235
+msgid "Edit event"
 msgstr ""
 
-#: ../../mod/item.php:299 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:82
-msgid "Wall Photos"
+#: ../../mod/events.php:237 ../../include/text.php:861
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/item.php:675 ../../mod/item.php:720 ../../mod/item.php:764
-#: ../../mod/item.php:807 ../../include/items.php:1835
-#: ../../include/items.php:2162 ../../include/items.php:2209
-#: ../../include/items.php:2321 ../../include/items.php:2367
-msgid "noreply"
+#: ../../mod/events.php:305
+msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/item.php:719 ../../mod/item.php:806 ../../include/items.php:2366
-msgid "Administrator@"
+#: ../../mod/events.php:314
+msgid "Event details"
 msgstr ""
 
-#: ../../mod/item.php:722 ../../include/items.php:2211
-#: ../../include/items.php:2369
+#: ../../mod/events.php:315
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 
-#: ../../mod/item.php:809
-#, php-format
-msgid "%s posted to your profile wall at %s"
+#: ../../mod/events.php:316
+msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/item.php:843
-msgid "System error. Post not saved."
+#: ../../mod/events.php:319
+msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/item.php:868
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+#: ../../mod/events.php:321
+msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/item.php:870
-#, php-format
-msgid "You may visit them online at %s"
+#: ../../mod/events.php:324
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/item.php:871
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: ../../mod/events.php:326
+msgid "Description:"
 msgstr ""
 
-#: ../../mod/item.php:873
-#, php-format
-msgid "%s posted an update."
+#: ../../mod/events.php:330
+msgid "Share this event"
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:149
+#: ../../mod/notifications.php:193
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/profile_photo.php:89
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../mod/notifications.php:71 ../../include/nav.php:109
+msgid "Network"
 msgstr ""
 
-#: ../../mod/profile_photo.php:99
-msgid "Unable to process image"
+#: ../../mod/notifications.php:81 ../../include/nav.php:73
+#: ../../include/nav.php:111
+msgid "Home"
 msgstr ""
 
-#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/notifications.php:86 ../../include/nav.php:117
+msgid "Introductions"
 msgstr ""
 
-#: ../../mod/profile_photo.php:203
-msgid "Upload File:"
+#: ../../mod/notifications.php:91 ../../mod/message.php:76
+#: ../../include/nav.php:122
+msgid "Messages"
 msgstr ""
 
-#: ../../mod/profile_photo.php:204
-msgid "Upload Profile Photo"
+#: ../../mod/notifications.php:110
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/profile_photo.php:205
-msgid "Upload"
+#: ../../mod/notifications.php:110
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
-msgid "skip this step"
+#: ../../mod/notifications.php:136 ../../mod/notifications.php:179
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
-msgid "select a photo from your photo albums"
+#: ../../mod/notifications.php:137
+msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/profile_photo.php:219
-msgid "Crop Image"
+#: ../../mod/notifications.php:139
+#, php-format
+msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/profile_photo.php:220
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:190
+#: ../../mod/admin.php:466
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/profile_photo.php:221
-msgid "Done Editing"
+#: ../../mod/notifications.php:165
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/profile_photo.php:249
-msgid "Image uploaded successfully."
+#: ../../mod/notifications.php:165
+msgid "yes"
 msgstr ""
 
-#: ../../mod/hcard.php:10 ../../mod/profile.php:10 ../../boot.php:817
-msgid "No profile"
+#: ../../mod/notifications.php:165
+msgid "no"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/notifications.php:172
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/notifications.php:173
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/notifications.php:174
+msgid "Sharer"
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
+#: ../../mod/notifications.php:174
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/message.php:26
-msgid "Unable to locate contact information."
+#: ../../mod/notifications.php:180
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
+#: ../../mod/notifications.php:180
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/message.php:31
-msgid "Message sent."
+#: ../../mod/notifications.php:199
+msgid "No introductions."
 msgstr ""
 
-#: ../../mod/message.php:51
-msgid "Inbox"
+#: ../../mod/notifications.php:202 ../../mod/notifications.php:288
+#: ../../mod/notifications.php:383 ../../mod/notifications.php:464
+#: ../../include/nav.php:118
+msgid "Notifications"
 msgstr ""
 
-#: ../../mod/message.php:56
-msgid "Outbox"
+#: ../../mod/notifications.php:239 ../../mod/notifications.php:334
+#: ../../mod/notifications.php:421
+#, php-format
+msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/message.php:61
-msgid "New Message"
+#: ../../mod/notifications.php:248 ../../mod/notifications.php:343
+#: ../../mod/notifications.php:430
+#, php-format
+msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/message.php:87
-msgid "Message deleted."
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:357
+#: ../../mod/notifications.php:444
+#, php-format
+msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/message.php:103
-msgid "Conversation removed."
+#: ../../mod/notifications.php:269 ../../mod/notifications.php:364
+#, php-format
+msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/message.php:119 ../../include/conversation.php:805
-msgid "Please enter a link URL:"
+#: ../../mod/notifications.php:270 ../../mod/notifications.php:365
+#: ../../mod/notifications.php:453
+#, php-format
+msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/message.php:127
-msgid "Send Private Message"
+#: ../../mod/notifications.php:284
+msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/message.php:128 ../../mod/message.php:261
-msgid "To:"
+#: ../../mod/notifications.php:379
+msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/message.php:129 ../../mod/message.php:262
-msgid "Subject:"
+#: ../../mod/notifications.php:460
+msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/message.php:132 ../../mod/message.php:265
-#: ../../mod/invite.php:101
-msgid "Your message:"
+#: ../../mod/crepair.php:100
+msgid "Contact settings applied."
 msgstr ""
 
-#: ../../mod/message.php:170
-msgid "No messages."
+#: ../../mod/crepair.php:102
+msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/message.php:183
-msgid "Delete conversation"
+#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/message.php:186
-msgid "D, d M Y - g:i A"
+#: ../../mod/crepair.php:133
+msgid "Repair Contact Settings"
 msgstr ""
 
-#: ../../mod/message.php:213
-msgid "Message not available."
+#: ../../mod/crepair.php:135
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: ../../mod/message.php:250
-msgid "Delete message"
+#: ../../mod/crepair.php:136
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: ../../mod/message.php:260
-msgid "Send Reply"
+#: ../../mod/crepair.php:145
+msgid "Account Nickname"
 msgstr ""
 
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
+#: ../../mod/crepair.php:146
+msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
+#: ../../mod/crepair.php:147
+msgid "Account URL"
 msgstr ""
 
-#: ../../mod/admin.php:59 ../../mod/admin.php:295
-msgid "Site"
+#: ../../mod/crepair.php:148
+msgid "Friend Request URL"
 msgstr ""
 
-#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
-msgid "Users"
+#: ../../mod/crepair.php:149
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
-msgid "Plugins"
+#: ../../mod/crepair.php:150
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../mod/admin.php:76 ../../mod/admin.php:651
-msgid "Logs"
+#: ../../mod/crepair.php:151
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../mod/admin.php:81
-msgid "User registrations waiting for confirmation"
+#: ../../mod/crepair.php:152
+msgid "New photo from this URL"
 msgstr ""
 
-#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
-#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
-msgid "Administration"
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/admin.php:145
-msgid "Summary"
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/admin.php:146
-msgid "Registered users"
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/admin.php:148
-msgid "Pending registrations"
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/admin.php:149
-msgid "Version"
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#, 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:167
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/admin.php:151
-msgid "Active plugins"
+#: ../../mod/dfrn_request.php:191
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/admin.php:243
-msgid "Site settings updated."
+#: ../../mod/dfrn_request.php:219
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/admin.php:287
-msgid "Closed"
+#: ../../mod/dfrn_request.php:244
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/admin.php:288
-msgid "Requires approval"
+#: ../../mod/dfrn_request.php:245
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/admin.php:289
-msgid "Open"
+#: ../../mod/dfrn_request.php:246
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/admin.php:298
-msgid "File upload"
+#: ../../mod/dfrn_request.php:306
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/admin.php:299
-msgid "Policies"
+#: ../../mod/dfrn_request.php:326
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/admin.php:300
-msgid "Advanced"
+#: ../../mod/dfrn_request.php:339
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
-msgid "Site name"
+#: ../../mod/dfrn_request.php:343
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/admin.php:305
-msgid "Banner/Logo"
+#: ../../mod/dfrn_request.php:364
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/admin.php:306
-msgid "System language"
+#: ../../mod/dfrn_request.php:460
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/admin.php:307
-msgid "System theme"
+#: ../../mod/dfrn_request.php:513
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/admin.php:309
-msgid "Maximum image size"
+#: ../../mod/dfrn_request.php:527
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/admin.php:311
-msgid "Register policy"
+#: ../../mod/dfrn_request.php:539
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/admin.php:312
-msgid "Register text"
+#: ../../mod/dfrn_request.php:540
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/admin.php:313
-msgid "Accounts abandoned after x days"
+#: ../../mod/dfrn_request.php:541
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/admin.php:313
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../mod/dfrn_request.php:574 ../../include/items.php:2525
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/admin.php:314
-msgid "Allowed friend domains"
+#: ../../mod/dfrn_request.php:581
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/admin.php:315
-msgid "Allowed email domains"
+#: ../../mod/dfrn_request.php:665
+#, php-format
+msgid ""
+"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
+"your Diaspora search bar."
 msgstr ""
 
-#: ../../mod/admin.php:316
-msgid "Block public"
+#: ../../mod/dfrn_request.php:668
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
 msgstr ""
 
-#: ../../mod/admin.php:317
-msgid "Force publish"
+#: ../../mod/dfrn_request.php:671
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/admin.php:318
-msgid "Global directory update URL"
+#: ../../mod/dfrn_request.php:672
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/admin.php:320
-msgid "Block multiple registrations"
+#: ../../mod/dfrn_request.php:673
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/admin.php:321
-msgid "OpenID support"
+#: ../../mod/dfrn_request.php:674
+#, php-format
+msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/admin.php:322
-msgid "Gravatar support"
+#: ../../mod/dfrn_request.php:677
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/admin.php:323
-msgid "Fullname check"
+#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:78
+msgid "Friendica"
 msgstr ""
 
-#: ../../mod/admin.php:324
-msgid "UTF-8 Regular expressions"
+#: ../../mod/dfrn_request.php:680
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/admin.php:325
-msgid "Show Community Page"
+#: ../../mod/dfrn_request.php:682
+msgid "- please share from your own site as noted above"
 msgstr ""
 
-#: ../../mod/admin.php:326
-msgid "Enable OStatus support"
+#: ../../mod/dfrn_request.php:683
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/admin.php:327
-msgid "Enable Diaspora support"
+#: ../../mod/dfrn_request.php:684
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/admin.php:328
-msgid "Only allow Friendika contacts"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/admin.php:329
-msgid "Verify SSL"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/admin.php:330
-msgid "Proxy user"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/admin.php:331
-msgid "Proxy URL"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/admin.php:332
-msgid "Network timeout"
+#: ../../mod/tagger.php:70 ../../mod/like.php:127
+#: ../../addon/facebook/facebook.php:1056
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../include/conversation.php:26 ../../include/conversation.php:35
+#: ../../include/conversation.php:99 ../../include/conversation.php:108
+#: ../../include/diaspora.php:1481
+msgid "status"
 msgstr ""
 
-#: ../../mod/admin.php:353
-#, php-format
-msgid "%s user blocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:360
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:394
+#: ../../mod/tagger.php:103 ../../include/conversation.php:116
 #, php-format
-msgid "User '%s' deleted"
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1060
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../include/conversation.php:43 ../../include/diaspora.php:1497
 #, php-format
-msgid "User '%s' unblocked"
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/like.php:146 ../../include/conversation.php:46
 #, php-format
-msgid "User '%s' blocked"
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/admin.php:462
-msgid "select all"
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/admin.php:463
-msgid "User registrations waiting for confirm"
+#: ../../mod/lostpass.php:31
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid "Request date"
+#: ../../mod/lostpass.php:42
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/admin.php:464 ../../mod/admin.php:473
-#: ../../include/contact_selectors.php:78
-msgid "Email"
+#: ../../mod/lostpass.php:64
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/admin.php:465
-msgid "No registrations."
+#: ../../mod/lostpass.php:83
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/admin.php:467
-msgid "Deny"
+#: ../../mod/lostpass.php:84
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/admin.php:473
-msgid "Register date"
+#: ../../mod/lostpass.php:85
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/admin.php:473
-msgid "Last login"
+#: ../../mod/lostpass.php:86
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/admin.php:473
-msgid "Last item"
+#: ../../mod/lostpass.php:87
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/admin.php:473
-msgid "Account"
+#: ../../mod/lostpass.php:118
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/lostpass.php:119
 msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/admin.php:476
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../mod/lostpass.php:120
+msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/admin.php:512
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../mod/lostpass.php:121
+msgid "Reset"
 msgstr ""
 
-#: ../../mod/admin.php:516
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../mod/friendica.php:43
+msgid "This is Friendica, version"
 msgstr ""
 
-#: ../../mod/admin.php:526
-msgid "Disable"
+#: ../../mod/friendica.php:44
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/admin.php:528
-msgid "Enable"
+#: ../../mod/friendica.php:46
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
 msgstr ""
 
-#: ../../mod/admin.php:550
-msgid "Toggle"
+#: ../../mod/friendica.php:48
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../include/nav.php:128
-msgid "Settings"
+#: ../../mod/friendica.php:49
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
 msgstr ""
 
-#: ../../mod/admin.php:613
-msgid "Log settings updated."
+#: ../../mod/friendica.php:54
+msgid "Installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/admin.php:653
-msgid "Clear"
+#: ../../mod/friendica.php:62
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/admin.php:659
-msgid "Debugging"
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/admin.php:660
-msgid "Log file"
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/admin.php:660
-msgid "Must be writable by web server. Relative to your Friendika index.php."
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/admin.php:661
-msgid "Log level"
+#: ../../mod/apps.php:4
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/admin.php:702
-msgid "Close"
+#: ../../mod/apps.php:7
+msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/admin.php:708
-msgid "FTP Host"
+#: ../../mod/notes.php:63 ../../include/text.php:631
+msgid "Save"
 msgstr ""
 
-#: ../../mod/admin.php:709
-msgid "FTP Path"
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
 msgstr ""
 
-#: ../../mod/admin.php:710
-msgid "FTP User"
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
 msgstr ""
 
-#: ../../mod/admin.php:711
-msgid "FTP Password"
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/profile.php:105 ../../mod/display.php:66
-msgid "Access to this profile has been restricted."
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
 msgstr ""
 
-#: ../../mod/profile.php:127
-msgid "Tips for New Members"
+#: ../../mod/directory.php:49
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/ping.php:146
-msgid "{0} wants to be your friend"
+#: ../../mod/directory.php:55
+msgid "Normal site view"
 msgstr ""
 
-#: ../../mod/ping.php:151
-msgid "{0} sent you a message"
+#: ../../mod/directory.php:57
+msgid "Admin - View all site entries"
 msgstr ""
 
-#: ../../mod/ping.php:156
-msgid "{0} requested registration"
+#: ../../mod/directory.php:63
+msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/ping.php:162
-#, php-format
-msgid "{0} commented %s's post"
+#: ../../mod/directory.php:66
+msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/ping.php:167
-#, php-format
-msgid "{0} liked %s's post"
+#: ../../mod/directory.php:125
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/ping.php:172
-#, php-format
-msgid "{0} disliked %s's post"
+#: ../../mod/directory.php:151
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/ping.php:177
-#, php-format
-msgid "{0} is now friends with %s"
+#: ../../mod/admin.php:59 ../../mod/admin.php:295
+msgid "Site"
 msgstr ""
 
-#: ../../mod/ping.php:182
-msgid "{0} posted"
+#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
+msgid "Users"
 msgstr ""
 
-#: ../../mod/ping.php:187
-#, php-format
-msgid "{0} tagged %s's post with #%s"
+#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
+msgid "Plugins"
 msgstr ""
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
-#: ../../include/auth.php:147 ../../include/auth.php:201
-msgid "Login failed."
-msgstr ""
-
-#: ../../mod/openid.php:79 ../../include/auth.php:217
-msgid "Welcome "
+#: ../../mod/admin.php:76 ../../mod/admin.php:651
+msgid "Logs"
 msgstr ""
 
-#: ../../mod/openid.php:80 ../../include/auth.php:218
-msgid "Please upload a profile photo."
+#: ../../mod/admin.php:81
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/openid.php:83 ../../include/auth.php:221
-msgid "Welcome back "
+#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
+#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
+msgid "Administration"
 msgstr ""
 
-#: ../../mod/follow.php:39
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: ../../mod/admin.php:145
+msgid "Summary"
 msgstr ""
 
-#: ../../mod/follow.php:40 ../../mod/follow.php:50
-msgid "No compatible communication protocols or feeds were discovered."
+#: ../../mod/admin.php:146
+msgid "Registered users"
 msgstr ""
 
-#: ../../mod/follow.php:48
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/admin.php:148
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/follow.php:52
-msgid "An author or name was not found."
+#: ../../mod/admin.php:149
+msgid "Version"
 msgstr ""
 
-#: ../../mod/follow.php:54
-msgid "No browser URL could be matched to this address."
+#: ../../mod/admin.php:151
+msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/follow.php:61
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: ../../mod/admin.php:243
+msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/follow.php:66
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../mod/admin.php:287
+msgid "Closed"
 msgstr ""
 
-#: ../../mod/follow.php:133
-msgid "Unable to retrieve contact information."
+#: ../../mod/admin.php:288
+msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/follow.php:179
-msgid "following"
+#: ../../mod/admin.php:289
+msgid "Open"
 msgstr ""
 
-#: ../../mod/common.php:34
-msgid "Common Friends"
+#: ../../mod/admin.php:298
+msgid "File upload"
 msgstr ""
 
-#: ../../mod/common.php:42
-msgid "No friends in common."
+#: ../../mod/admin.php:299
+msgid "Policies"
 msgstr ""
 
-#: ../../mod/display.php:108
-msgid "Item has been removed."
+#: ../../mod/admin.php:300
+msgid "Advanced"
 msgstr ""
 
-#: ../../mod/apps.php:4
-msgid "Applications"
+#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
+msgid "Site name"
 msgstr ""
 
-#: ../../mod/apps.php:7
-msgid "No installed applications."
+#: ../../mod/admin.php:305
+msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
+#: ../../mod/admin.php:306
+msgid "System language"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/admin.php:307
+msgid "System theme"
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/admin.php:309
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/profiles.php:198
-msgid "Profile updated."
+#: ../../mod/admin.php:311
+msgid "Register policy"
 msgstr ""
 
-#: ../../mod/profiles.php:256
-msgid "Profile deleted."
+#: ../../mod/admin.php:312
+msgid "Register text"
 msgstr ""
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
-msgid "Profile-"
+#: ../../mod/admin.php:313
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
-msgid "New profile created."
+#: ../../mod/admin.php:313
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/profiles.php:309
-msgid "Profile unavailable to clone."
+#: ../../mod/admin.php:314
+msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/profiles.php:356
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/admin.php:315
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/profiles.php:374
-msgid "Edit Profile Details"
+#: ../../mod/admin.php:316
+msgid "Block public"
 msgstr ""
 
-#: ../../mod/profiles.php:376
-msgid "View this profile"
+#: ../../mod/admin.php:317
+msgid "Force publish"
 msgstr ""
 
-#: ../../mod/profiles.php:377
-msgid "Create a new profile using these settings"
+#: ../../mod/admin.php:318
+msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/profiles.php:378
-msgid "Clone this profile"
+#: ../../mod/admin.php:320
+msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/profiles.php:379
-msgid "Delete this profile"
+#: ../../mod/admin.php:321
+msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/profiles.php:380
-msgid "Profile Name:"
+#: ../../mod/admin.php:322
+msgid "Gravatar support"
 msgstr ""
 
-#: ../../mod/profiles.php:381
-msgid "Your Full Name:"
+#: ../../mod/admin.php:323
+msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/profiles.php:382
-msgid "Title/Description:"
+#: ../../mod/admin.php:324
+msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/profiles.php:383
-msgid "Your Gender:"
+#: ../../mod/admin.php:325
+msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/profiles.php:384
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/admin.php:326
+msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/profiles.php:385
-msgid "Street Address:"
+#: ../../mod/admin.php:327
+msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/profiles.php:386
-msgid "Locality/City:"
+#: ../../mod/admin.php:328
+msgid "Only allow Friendika contacts"
 msgstr ""
 
-#: ../../mod/profiles.php:387
-msgid "Postal/Zip Code:"
+#: ../../mod/admin.php:329
+msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/profiles.php:388
-msgid "Country:"
+#: ../../mod/admin.php:330
+msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/profiles.php:389
-msgid "Region/State:"
+#: ../../mod/admin.php:331
+msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/profiles.php:390
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/admin.php:332
+msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/profiles.php:391
-msgid "Who: (if applicable)"
-msgstr ""
+#: ../../mod/admin.php:353
+#, php-format
+msgid "%s user blocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/profiles.php:392
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/admin.php:360
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:394
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
-msgid "Sexual Preference:"
+#: ../../mod/admin.php:401
+#, php-format
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/profiles.php:394
-msgid "Homepage URL:"
+#: ../../mod/admin.php:401
+#, php-format
+msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
-msgid "Political Views:"
+#: ../../mod/admin.php:462
+msgid "select all"
 msgstr ""
 
-#: ../../mod/profiles.php:396
-msgid "Religious Views:"
+#: ../../mod/admin.php:463
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/profiles.php:397
-msgid "Public Keywords:"
+#: ../../mod/admin.php:464
+msgid "Request date"
 msgstr ""
 
-#: ../../mod/profiles.php:398
-msgid "Private Keywords:"
+#: ../../mod/admin.php:464 ../../mod/admin.php:473
+#: ../../include/contact_selectors.php:78
+msgid "Email"
 msgstr ""
 
-#: ../../mod/profiles.php:399
-msgid "Example: fishing photography software"
+#: ../../mod/admin.php:465
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/profiles.php:400
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: ../../mod/admin.php:467
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/profiles.php:401
-msgid "(Used for searching profiles, never shown to others)"
+#: ../../mod/admin.php:473
+msgid "Register date"
 msgstr ""
 
-#: ../../mod/profiles.php:402
-msgid "Tell us about yourself..."
+#: ../../mod/admin.php:473
+msgid "Last login"
 msgstr ""
 
-#: ../../mod/profiles.php:403
-msgid "Hobbies/Interests"
+#: ../../mod/admin.php:473
+msgid "Last item"
 msgstr ""
 
-#: ../../mod/profiles.php:404
-msgid "Contact information and Social Networks"
+#: ../../mod/admin.php:473
+msgid "Account"
 msgstr ""
 
-#: ../../mod/profiles.php:405
-msgid "Musical interests"
+#: ../../mod/admin.php:475
+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/profiles.php:406
-msgid "Books, literature"
+#: ../../mod/admin.php:476
+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/profiles.php:407
-msgid "Television"
+#: ../../mod/admin.php:512
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/profiles.php:408
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/admin.php:516
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/profiles.php:409
-msgid "Love/romance"
+#: ../../mod/admin.php:526
+msgid "Disable"
 msgstr ""
 
-#: ../../mod/profiles.php:410
-msgid "Work/employment"
+#: ../../mod/admin.php:528
+msgid "Enable"
 msgstr ""
 
-#: ../../mod/profiles.php:411
-msgid "School/education"
+#: ../../mod/admin.php:550
+msgid "Toggle"
 msgstr ""
 
-#: ../../mod/profiles.php:416
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: ../../mod/admin.php:551 ../../include/nav.php:128
+msgid "Settings"
 msgstr ""
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:122
-msgid "Age: "
+#: ../../mod/admin.php:613
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/profiles.php:461
-msgid "Edit/Manage Profiles"
+#: ../../mod/admin.php:653
+msgid "Clear"
 msgstr ""
 
-#: ../../mod/profiles.php:462 ../../boot.php:908
-msgid "Change profile photo"
+#: ../../mod/admin.php:659
+msgid "Debugging"
 msgstr ""
 
-#: ../../mod/profiles.php:463 ../../boot.php:909
-msgid "Create New Profile"
+#: ../../mod/admin.php:660
+msgid "Log file"
 msgstr ""
 
-#: ../../mod/profiles.php:473 ../../boot.php:919
-msgid "Profile Image"
+#: ../../mod/admin.php:660
+msgid "Must be writable by web server. Relative to your Friendika index.php."
 msgstr ""
 
-#: ../../mod/profiles.php:475 ../../boot.php:922
-msgid "visible to everybody"
+#: ../../mod/admin.php:661
+msgid "Log level"
 msgstr ""
 
-#: ../../mod/profiles.php:476 ../../boot.php:923
-msgid "Edit visibility"
+#: ../../mod/admin.php:702
+msgid "Close"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:116
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/admin.php:708
+msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
+#: ../../mod/admin.php:709
+msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/suggest.php:42
-msgid ""
-"No suggestions. This works best when you have more than one contact/friend."
+#: ../../mod/admin.php:710
+msgid "FTP User"
 msgstr ""
 
-#: ../../mod/suggest.php:55
-msgid "Ignore/Hide"
+#: ../../mod/admin.php:711
+msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/directory.php:49
-msgid "Global Directory"
+#: ../../mod/item.php:84
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/directory.php:55
-msgid "Normal site view"
+#: ../../mod/item.php:199
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/directory.php:57
-msgid "Admin - View all site entries"
+#: ../../mod/item.php:687 ../../mod/item.php:732 ../../mod/item.php:776
+#: ../../mod/item.php:819 ../../include/items.php:1835
+#: ../../include/items.php:2162 ../../include/items.php:2209
+#: ../../include/items.php:2321 ../../include/items.php:2367
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/directory.php:63
-msgid "Find on this site"
+#: ../../mod/item.php:731 ../../mod/item.php:818 ../../include/items.php:2366
+msgid "Administrator@"
 msgstr ""
 
-#: ../../mod/directory.php:66
-msgid "Site Directory"
+#: ../../mod/item.php:734 ../../include/items.php:2211
+#: ../../include/items.php:2369
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/directory.php:125
-msgid "Gender: "
+#: ../../mod/item.php:821
+#, php-format
+msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../mod/directory.php:151
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/item.php:855
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/invite.php:35
+#: ../../mod/item.php:880
 #, php-format
-msgid "%s : Not a valid email address."
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/invite.php:59
+#: ../../mod/item.php:882
 #, php-format
-msgid "Please join my network on %s"
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/invite.php:69
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/item.php:883
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/invite.php:73
+#: ../../mod/item.php:885
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s posted an update."
+msgstr ""
 
-#: ../../mod/invite.php:92
-msgid "You have no more invitations available"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/invite.php:102
-#, php-format
-msgid "Please join my social network on %s"
+#: ../../mod/tagrm.php:93
+msgid "Remove"
 msgstr ""
 
-#: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
+#: ../../mod/message.php:23
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/invite.php:104
-msgid "You will need to supply this invitation code: $invite_code"
+#: ../../mod/message.php:26
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/invite.php:104
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/message.php:29
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/message.php:32
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/message.php:35
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/message.php:55
+msgid "Inbox"
+msgstr ""
+
+#: ../../mod/message.php:60
+msgid "Outbox"
+msgstr ""
+
+#: ../../mod/message.php:65
+msgid "New Message"
+msgstr ""
+
+#: ../../mod/message.php:91
+msgid "Message deleted."
+msgstr ""
+
+#: ../../mod/message.php:121
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/message.php:137 ../../include/conversation.php:810
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/message.php:145
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/message.php:146 ../../mod/message.php:287
+msgid "To:"
+msgstr ""
+
+#: ../../mod/message.php:147 ../../mod/message.php:288
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/message.php:188
+msgid "No messages."
+msgstr ""
+
+#: ../../mod/message.php:201
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../mod/message.php:204
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:239
+msgid "Message not available."
+msgstr ""
+
+#: ../../mod/message.php:276
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/message.php:286
+msgid "Send Reply"
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:234
@@ -3400,8 +3448,8 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:459 ../../include/diaspora.php:479
-#: ../../include/conversation.php:79
+#: ../../mod/dfrn_confirm.php:459 ../../include/conversation.php:79
+#: ../../include/diaspora.php:488
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
@@ -3447,190 +3495,328 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:337
-msgid "Facebook disabled"
+#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
+#: ../../include/auth.php:147 ../../include/auth.php:201
+msgid "Login failed."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:342
-msgid "Updating contacts"
+#: ../../mod/openid.php:79 ../../include/auth.php:217
+msgid "Welcome "
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:351
-msgid "Facebook API key is missing."
+#: ../../mod/openid.php:80 ../../include/auth.php:218
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:358
-msgid "Facebook Connect"
+#: ../../mod/openid.php:83 ../../include/auth.php:221
+msgid "Welcome back "
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:364
-msgid "Install Facebook connector for this account."
+#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
+#, php-format
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:371
-msgid "Remove Facebook connector"
+#: ../../mod/viewcontacts.php:25 ../../include/text.php:570
+msgid "View Contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:376
-msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
+#: ../../mod/viewcontacts.php:40
+msgid "No contacts."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:383
-msgid "Post to Facebook by default"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:387
-msgid "Link all your Facebook friends and conversations on this website"
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:389
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
+msgstr ""
+
+#: ../../mod/group.php:56
+msgid "Group name changed."
+msgstr ""
+
+#: ../../mod/group.php:82
+msgid "Create a group of contacts/friends."
+msgstr ""
+
+#: ../../mod/group.php:83 ../../mod/group.php:166
+msgid "Group Name: "
+msgstr ""
+
+#: ../../mod/group.php:98
+msgid "Group removed."
+msgstr ""
+
+#: ../../mod/group.php:100
+msgid "Unable to remove group."
+msgstr ""
+
+#: ../../mod/group.php:165
+msgid "Group Editor"
+msgstr ""
+
+#: ../../mod/group.php:179
+msgid "Members"
+msgstr ""
+
+#: ../../mod/group.php:194
+msgid "All Contacts"
+msgstr ""
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr ""
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr ""
+
+#: ../../mod/common.php:34
+msgid "Common Friends"
+msgstr ""
+
+#: ../../mod/common.php:42
+msgid "No friends in common."
+msgstr ""
+
+#: ../../mod/match.php:10
+msgid "Profile Match"
+msgstr ""
+
+#: ../../mod/match.php:18
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr ""
+
+#: ../../mod/community.php:21
+msgid "Not available."
+msgstr ""
+
+#: ../../mod/community.php:30 ../../include/nav.php:97
+msgid "Community"
+msgstr ""
+
+#: ../../mod/community.php:87
 msgid ""
-"Facebook conversations consist of your <em>profile wall</em> and your friend "
-"<em>stream</em>."
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:390
-msgid "On this website, your Facebook friend stream is only visible to you."
+#: ../../addon/tumblr/tumblr.php:35
+msgid "Post to Tumblr"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/tumblr/tumblr.php:66
+msgid "Tumblr Post Settings"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:68
+msgid "Enable Tumblr Post Plugin"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:73
+msgid "Tumblr login"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:78
+msgid "Tumblr password"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:83
+msgid "Post to Tumblr by default"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:174 ../../addon/posterous/posterous.php:172
+#: ../../addon/wppost/wppost.php:171
+msgid "Post from Friendica"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:78
+msgid "Post to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:123
+msgid "Twitter settings updated."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:145
+msgid "Twitter Posting Settings"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:152
 msgid ""
-"The following settings determine the privacy of your Facebook profile wall "
-"on this website."
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:395
+#: ../../addon/twitter/twitter.php:171
 msgid ""
-"On this website your Facebook profile wall conversations will only be "
-"visible to you"
+"At this Friendika instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:400
-msgid "Do not import your Facebook profile wall conversations"
+#: ../../addon/twitter/twitter.php:172
+msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:402
+#: ../../addon/twitter/twitter.php:174
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:188 ../../addon/statusnet/statusnet.php:337
+msgid "Currently connected to: "
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:189
 msgid ""
-"If you choose to link conversations and leave both of these boxes unchecked, "
-"your Facebook profile wall will be merged with your profile wall on this "
-"website and your privacy settings on this website will be used to determine "
-"who may see the conversations."
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for "
+"every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:469
-#: ../../include/contact_selectors.php:78
-msgid "Facebook"
+#: ../../addon/twitter/twitter.php:191
+msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:470
-msgid "Facebook Connector Settings"
+#: ../../addon/twitter/twitter.php:194
+msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:484
-msgid "Post to Facebook"
+#: ../../addon/twitter/twitter.php:199 ../../addon/statusnet/statusnet.php:348
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:301
+msgid "Consumer key"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:302
+msgid "Consumer secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:561
+#: ../../addon/statusnet/statusnet.php:141
+msgid "Post to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:183
 msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:624
-msgid "Image: "
+#: ../../addon/statusnet/statusnet.php:211
+msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:700
-msgid "View on Friendika"
+#: ../../addon/statusnet/statusnet.php:238
+msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:724
-msgid "Facebook post failed. Queued for retry."
+#: ../../addon/statusnet/statusnet.php:261
+msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../addon/statusnet/statusnet.php:275
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr ""
 
-#: ../../addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../addon/statusnet/statusnet.php:276
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr ""
 
-#: ../../addon/widgets/widgets.php:55
-msgid "Generate new key"
+#: ../../addon/statusnet/statusnet.php:284
+msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:58
-msgid "Widgets key"
+#: ../../addon/statusnet/statusnet.php:285
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendika Account as "
+"an desktop client on your StatusNet account, copy the consumer key pair here "
+"and enter the API base root.<br />Before you register your own OAuth key "
+"pair ask the administrator if there is already a key pair for this Friendika "
+"installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:60
-msgid "Widgets available"
+#: ../../addon/statusnet/statusnet.php:287
+msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendika!"
+#: ../../addon/statusnet/statusnet.php:290
+msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
+#: ../../addon/statusnet/statusnet.php:293
+msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:49
-msgid "Comma separated words to treat as NSFW"
+#: ../../addon/statusnet/statusnet.php:314
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:66
-msgid "NSFW Settings saved."
+#: ../../addon/statusnet/statusnet.php:315
+msgid "Log in with StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:317
+msgid "Copy the security code from StatusNet here"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:323
+msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:102
-#, php-format
-msgid "%s - Click to open/close"
+#: ../../addon/statusnet/statusnet.php:325
+msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:682
-msgid "Login"
+#: ../../addon/statusnet/statusnet.php:326
+msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:29
-msgid "OpenID"
+#: ../../addon/statusnet/statusnet.php:338
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
+#: ../../addon/statusnet/statusnet.php:340
+msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
-msgid "Most active users"
+#: ../../addon/statusnet/statusnet.php:343
+msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
+#: ../../addon/statusnet/statusnet.php:478
+msgid "API URL"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
+#: ../../addon/oembed/oembed.php:30
+msgid "OEmbed settings updated"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../include/conversation.php:23 ../../include/conversation.php:96
-msgid "event"
+#: ../../addon/oembed/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
 msgstr ""
 
-#: ../../addon/membersince/membersince.php:17
-#, php-format
-msgid " - Member since: %s"
+#: ../../addon/oembed/oembed.php:71
+msgid "URL to embed:"
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:20
@@ -3687,40 +3873,15 @@ msgstr ""
 msgid "I won!"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:170
-msgid "Randplace Settings"
-msgstr ""
-
-#: ../../addon/randplace/randplace.php:172
-msgid "Enable Randplace Plugin"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:43
-msgid "Upload a file"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:46
-msgid "Failed"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:294
-msgid "No files were uploaded."
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:300
-msgid "Uploaded file is empty"
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:323
-msgid "File has an invalid extension, it should be one of "
+#: ../../addon/uhremotestorage/uhremotestorage.php:56
+#, php-format
+msgid ""
+"Allow to use your friendika id (%s) to connecto to external unhosted-enabled "
+"storage (like ownCloud)"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:334
-msgid "Upload was cancelled, or server error encountered"
+#: ../../addon/uhremotestorage/uhremotestorage.php:57
+msgid "Unhosted DAV storage url"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:25
@@ -3758,274 +3919,196 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr ""
-
-#: ../../addon/oembed/oembed.php:30
-msgid "OEmbed settings updated"
+#: ../../addon/facebook/facebook.php:339
+msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
+#: ../../addon/facebook/facebook.php:344
+msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:71
-msgid "URL to embed:"
+#: ../../addon/facebook/facebook.php:353
+msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:141
-msgid "Post to StatusNet"
+#: ../../addon/facebook/facebook.php:360
+msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:183
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
+#: ../../addon/facebook/facebook.php:366
+msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:211
-msgid "We could not contact the StatusNet API with the Path you entered."
+#: ../../addon/facebook/facebook.php:373
+msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:238
-msgid "StatusNet settings updated."
+#: ../../addon/facebook/facebook.php:378
+msgid ""
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:261
-msgid "StatusNet Posting Settings"
+#: ../../addon/facebook/facebook.php:385
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:275
-msgid "Globally Available StatusNet OAuthKeys"
+#: ../../addon/facebook/facebook.php:389
+msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/facebook/facebook.php:391
 msgid ""
-"There are preconfigured OAuth key pairs for some StatusNet servers "
-"available. If you are useing one of them, please use these credentials. If "
-"not feel free to connect to any other StatusNet instance (see below)."
+"Facebook conversations consist of your <em>profile wall</em> and your friend "
+"<em>stream</em>."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
-msgid "Provide your own OAuth Credentials"
+#: ../../addon/facebook/facebook.php:392
+msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:285
+#: ../../addon/facebook/facebook.php:393
 msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika Account as "
-"an desktop client on your StatusNet account, copy the consumer key pair here "
-"and enter the API base root.<br />Before you register your own OAuth key "
-"pair ask the administrator if there is already a key pair for this Friendika "
-"installation at your favorited StatusNet installation."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:287
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:290
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:293
-msgid "Base API Path (remember the trailing /)"
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/facebook/facebook.php:397
 msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below "
-"and submit the form. Only your <strong>public</strong> posts will be posted "
-"to StatusNet."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:315
-msgid "Log in with StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:317
-msgid "Copy the security code from StatusNet here"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:323
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:325
-msgid "Current StatusNet API is"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:326
-msgid "Cancel StatusNet Connection"
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:337 ../../addon/twitter/twitter.php:188
-msgid "Currently connected to: "
+#: ../../addon/facebook/facebook.php:402
+msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:338
+#: ../../addon/facebook/facebook.php:404
 msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated StatusNet account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:340
-msgid "Allow posting to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:343
-msgid "Send public postings to StatusNet by default"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:348 ../../addon/twitter/twitter.php:199
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:478
-msgid "API URL"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:35
-msgid "Post to Tumblr"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:66
-msgid "Tumblr Post Settings"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:68
-msgid "Enable Tumblr Post Plugin"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:73
-msgid "Tumblr login"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:78
-msgid "Tumblr password"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:83
-msgid "Post to Tumblr by default"
+"If you choose to link conversations and leave both of these boxes unchecked, "
+"your Facebook profile wall will be merged with your profile wall on this "
+"website and your privacy settings on this website will be used to determine "
+"who may see the conversations."
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:174 ../../addon/wppost/wppost.php:171
-#: ../../addon/posterous/posterous.php:172
-msgid "Post from Friendica"
+#: ../../addon/facebook/facebook.php:409
+msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:41
-msgid "Post to Wordpress"
+#: ../../addon/facebook/facebook.php:477
+#: ../../include/contact_selectors.php:78
+msgid "Facebook"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:73
-msgid "WordPress Post Settings"
+#: ../../addon/facebook/facebook.php:478
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:75
-msgid "Enable WordPress Post Plugin"
+#: ../../addon/facebook/facebook.php:492
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:80
-msgid "WordPress username"
+#: ../../addon/facebook/facebook.php:569
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:85
-msgid "WordPress password"
+#: ../../addon/facebook/facebook.php:632
+msgid "Image: "
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:90
-msgid "WordPress API URL"
+#: ../../addon/facebook/facebook.php:708
+msgid "View on Friendika"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:95
-msgid "Post to WordPress by default"
+#: ../../addon/facebook/facebook.php:732
+msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:70
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
+#: ../../addon/facebook/facebook.php:965
+msgid "link"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:73
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
+#: ../../addon/widgets/widgets.php:55
+msgid "Generate new key"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:82
-msgid "Piwik Base URL"
+#: ../../addon/widgets/widgets.php:58
+msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:83
-msgid "Site ID"
+#: ../../addon/widgets/widgets.php:60
+msgid "Widgets available"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:84
-msgid "Show opt-out cookie link?"
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendika!"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:78
-msgid "Post to Twitter"
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:123
-msgid "Twitter settings updated."
+#: ../../addon/nsfw/nsfw.php:47
+msgid "\"Not Safe For Work\" Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:145
-msgid "Twitter Posting Settings"
+#: ../../addon/nsfw/nsfw.php:49
+msgid "Comma separated words to treat as NSFW"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:152
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../addon/nsfw/nsfw.php:66
+msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:171
-msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+#: ../../addon/nsfw/nsfw.php:102
+#, php-format
+msgid "%s - Click to open/close"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172
-msgid "Log in with Twitter"
+#: ../../addon/communityhome/communityhome.php:29
+msgid "OpenID"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:174
-msgid "Copy the PIN from Twitter here"
+#: ../../addon/communityhome/communityhome.php:38
+msgid "Last users"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:189
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for "
-"every posting separately in the posting options when writing the entry."
+#: ../../addon/communityhome/communityhome.php:81
+msgid "Most active users"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:191
-msgid "Allow posting to Twitter"
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Last photos"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:194
-msgid "Send public postings to Twitter by default"
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Last likes"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:301
-msgid "Consumer key"
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../include/conversation.php:23 ../../include/conversation.php:96
+msgid "event"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:302
-msgid "Consumer secret"
+#: ../../addon/membersince/membersince.php:17
+#, php-format
+msgid " - Member since: %s"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:35
@@ -4052,77 +4135,110 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:944
-msgid "Gender:"
+#: ../../addon/randplace/randplace.php:170
+msgid "Randplace Settings"
 msgstr ""
 
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
+#: ../../addon/randplace/randplace.php:172
+msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../include/profile_advanced.php:23
-msgid "j F"
+#: ../../addon/jabberchat/jabberchat.php:81
+msgid "Chat Settings"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:421
-#: ../../include/items.php:1280
-msgid "Birthday:"
+#: ../../addon/jabberchat/jabberchat.php:89
+msgid "JabberID"
 msgstr ""
 
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
+#: ../../addon/jabberchat/jabberchat.php:90
+msgid "Password"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:947
-msgid "Status:"
+#: ../../addon/piwik/piwik.php:70
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:949
-msgid "Homepage:"
+#: ../../addon/piwik/piwik.php:73
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
 msgstr ""
 
-#: ../../include/profile_advanced.php:49
-msgid "Religion:"
+#: ../../addon/piwik/piwik.php:82
+msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../include/profile_advanced.php:51
-msgid "About:"
+#: ../../addon/piwik/piwik.php:83
+msgid "Site ID"
 msgstr ""
 
-#: ../../include/profile_advanced.php:53
-msgid "Hobbies/Interests:"
+#: ../../addon/piwik/piwik.php:84
+msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../include/profile_advanced.php:55
-msgid "Contact information and Social Networks:"
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
 msgstr ""
 
-#: ../../include/profile_advanced.php:57
-msgid "Musical interests:"
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
 msgstr ""
 
-#: ../../include/profile_advanced.php:59
-msgid "Books, literature:"
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
 msgstr ""
 
-#: ../../include/profile_advanced.php:61
-msgid "Television:"
+#: ../../addon/js_upload/js_upload.php:294
+msgid "No files were uploaded."
 msgstr ""
 
-#: ../../include/profile_advanced.php:63
-msgid "Film/dance/culture/entertainment:"
+#: ../../addon/js_upload/js_upload.php:300
+msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../include/profile_advanced.php:65
-msgid "Love/Romance:"
+#: ../../addon/js_upload/js_upload.php:323
+msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../include/profile_advanced.php:67
-msgid "Work/employment:"
+#: ../../addon/js_upload/js_upload.php:334
+msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/profile_advanced.php:69
-msgid "School/education:"
+#: ../../addon/wppost/wppost.php:41
+msgid "Post to Wordpress"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:73
+msgid "WordPress Post Settings"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:75
+msgid "Enable WordPress Post Plugin"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:80
+msgid "WordPress username"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:85
+msgid "WordPress password"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:90
+msgid "WordPress API URL"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:95
+msgid "Post to WordPress by default"
+msgstr ""
+
+#: ../../include/notifier.php:628 ../../include/delivery.php:415
+msgid "(no subject)"
 msgstr ""
 
 #: ../../include/contact_selectors.php:32
@@ -4353,760 +4469,729 @@ msgstr ""
 msgid "Happy"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Swinger"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Betrayed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Separated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Unstable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Widowed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Uncertain"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Don't care"
-msgstr ""
-
-#: ../../include/profile_selectors.php:33
-msgid "Ask me"
-msgstr ""
-
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:233
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:241
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/delivery.php:415 ../../include/notifier.php:628
-msgid "(no subject)"
-msgstr ""
-
-#: ../../include/text.php:232
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:234
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:263
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:266
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:546
-msgid "No contacts"
-msgstr ""
-
-#: ../../include/text.php:555
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr ""
 
-#: ../../include/text.php:626 ../../include/nav.php:87
-msgid "Search"
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Monday"
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Tuesday"
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Wednesday"
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Thursday"
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Friday"
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Saturday"
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/text.php:709
-msgid "Sunday"
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "January"
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "February"
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "March"
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:235
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "April"
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:243
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "May"
+#: ../../include/acl_selectors.php:279
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "June"
+#: ../../include/acl_selectors.php:280
+msgid "show"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "July"
+#: ../../include/acl_selectors.php:281
+msgid "don't show"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "August"
+#: ../../include/auth.php:27
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "September"
+#: ../../include/bbcode.php:165 ../../include/bbcode.php:228
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "October"
+#: ../../include/poller.php:459
+msgid "From: "
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "November"
+#: ../../include/Contact.php:125 ../../include/conversation.php:718
+msgid "View status"
 msgstr ""
 
-#: ../../include/text.php:713
-msgid "December"
+#: ../../include/Contact.php:126 ../../include/conversation.php:719
+msgid "View profile"
 msgstr ""
 
-#: ../../include/text.php:783
-msgid "bytes"
+#: ../../include/Contact.php:127 ../../include/conversation.php:720
+msgid "View photos"
 msgstr ""
 
-#: ../../include/text.php:875
-msgid "Select an alternate language"
+#: ../../include/Contact.php:128 ../../include/Contact.php:141
+#: ../../include/conversation.php:721
+msgid "View recent"
 msgstr ""
 
-#: ../../include/text.php:887
-msgid "default"
+#: ../../include/Contact.php:130 ../../include/Contact.php:141
+#: ../../include/conversation.php:723
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/diaspora.php:546
-msgid "Sharing notification from Diaspora network"
+#: ../../include/datetime.php:44 ../../include/datetime.php:46
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/diaspora.php:1529
-msgid "Attachments:"
+#: ../../include/datetime.php:105 ../../include/datetime.php:237
+msgid "year"
 msgstr ""
 
-#: ../../include/diaspora.php:1712
-#, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
+#: ../../include/datetime.php:110 ../../include/datetime.php:238
+msgid "month"
 msgstr ""
 
-#: ../../include/oembed.php:128
-msgid "Embedded content"
+#: ../../include/datetime.php:115 ../../include/datetime.php:240
+msgid "day"
 msgstr ""
 
-#: ../../include/oembed.php:137
-msgid "Embedding disabled"
+#: ../../include/datetime.php:228
+msgid "never"
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/datetime.php:234
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/group.php:168
-msgid "Everybody"
+#: ../../include/datetime.php:237
+msgid "years"
 msgstr ""
 
-#: ../../include/group.php:190
-msgid "edit"
+#: ../../include/datetime.php:238
+msgid "months"
 msgstr ""
 
-#: ../../include/group.php:211
-msgid "Groups"
+#: ../../include/datetime.php:239
+msgid "week"
 msgstr ""
 
-#: ../../include/group.php:212
-msgid "Create a new group"
+#: ../../include/datetime.php:239
+msgid "weeks"
 msgstr ""
 
-#: ../../include/nav.php:44 ../../boot.php:681
-msgid "Logout"
+#: ../../include/datetime.php:240
+msgid "days"
 msgstr ""
 
-#: ../../include/nav.php:44
-msgid "End this session"
+#: ../../include/datetime.php:241
+msgid "hour"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../boot.php:1284
-msgid "Status"
+#: ../../include/datetime.php:241
+msgid "hours"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
+#: ../../include/datetime.php:242
+msgid "minute"
 msgstr ""
 
-#: ../../include/nav.php:48
-msgid "Your profile page"
+#: ../../include/datetime.php:242
+msgid "minutes"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1294
-msgid "Photos"
+#: ../../include/datetime.php:243
+msgid "second"
 msgstr ""
 
-#: ../../include/nav.php:49
-msgid "Your photos"
+#: ../../include/datetime.php:243
+msgid "seconds"
 msgstr ""
 
-#: ../../include/nav.php:50
-msgid "Your events"
+#: ../../include/datetime.php:250
+msgid " ago"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Personal notes"
+#: ../../include/datetime.php:421 ../../include/profile_advanced.php:30
+#: ../../include/items.php:1280
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Your personal photos"
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/nav.php:62
-msgid "Sign in"
+#: ../../include/profile_advanced.php:23
+msgid "j F"
 msgstr ""
 
-#: ../../include/nav.php:73
-msgid "Home Page"
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
 msgstr ""
 
-#: ../../include/nav.php:77
-msgid "Create an account"
+#: ../../include/profile_advanced.php:49
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/nav.php:82
-msgid "Help and documentation"
+#: ../../include/profile_advanced.php:51
+msgid "About:"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Apps"
+#: ../../include/profile_advanced.php:53
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Addon applications, utilities, games"
+#: ../../include/profile_advanced.php:55
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/nav.php:87
-msgid "Search site content"
+#: ../../include/profile_advanced.php:57
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/nav.php:97
-msgid "Conversations on this site"
+#: ../../include/profile_advanced.php:59
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "Directory"
+#: ../../include/profile_advanced.php:61
+msgid "Television:"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "People directory"
+#: ../../include/profile_advanced.php:63
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Conversations from your friends"
+#: ../../include/profile_advanced.php:65
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/nav.php:117
-msgid "Friend Requests"
+#: ../../include/profile_advanced.php:67
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/nav.php:122
-msgid "Private mail"
+#: ../../include/profile_advanced.php:69
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/nav.php:125
-msgid "Manage"
+#: ../../include/text.php:232
+msgid "prev"
 msgstr ""
 
-#: ../../include/nav.php:125
-msgid "Manage other pages"
+#: ../../include/text.php:234
+msgid "first"
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:902
-msgid "Profiles"
+#: ../../include/text.php:263
+msgid "last"
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:902
-msgid "Manage/edit profiles"
+#: ../../include/text.php:266
+msgid "next"
 msgstr ""
 
-#: ../../include/nav.php:130
-msgid "Manage/edit friends and contacts"
+#: ../../include/text.php:549
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Admin"
+#: ../../include/text.php:558
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:629 ../../include/nav.php:87
+msgid "Search"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Site setup and configuration"
+#: ../../include/text.php:713
+msgid "Monday"
 msgstr ""
 
-#: ../../include/nav.php:160
-msgid "Nothing new here"
+#: ../../include/text.php:713
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
+#: ../../include/text.php:713
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
+#: ../../include/text.php:713
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/text.php:713
+msgid "Friday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:9 ../../boot.php:892
-msgid "Connect"
+#: ../../include/text.php:713
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
+#: ../../include/text.php:713
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:30
-msgid "Find People"
+#: ../../include/text.php:717
+msgid "January"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
-msgid "Enter name or interest"
+#: ../../include/text.php:717
+msgid "February"
 msgstr ""
 
-#: ../../include/contact_widgets.php:32
-msgid "Connect/Follow"
+#: ../../include/text.php:717
+msgid "March"
 msgstr ""
 
-#: ../../include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/text.php:717
+msgid "April"
 msgstr ""
 
-#: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
+#: ../../include/text.php:717
+msgid "May"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../include/text.php:717
+msgid "June"
 msgstr ""
 
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
-msgid "Miscellaneous"
+#: ../../include/text.php:717
+msgid "July"
 msgstr ""
 
-#: ../../include/datetime.php:105 ../../include/datetime.php:237
-msgid "year"
+#: ../../include/text.php:717
+msgid "August"
 msgstr ""
 
-#: ../../include/datetime.php:110 ../../include/datetime.php:238
-msgid "month"
+#: ../../include/text.php:717
+msgid "September"
 msgstr ""
 
-#: ../../include/datetime.php:115 ../../include/datetime.php:240
-msgid "day"
+#: ../../include/text.php:717
+msgid "October"
 msgstr ""
 
-#: ../../include/datetime.php:228
-msgid "never"
+#: ../../include/text.php:717
+msgid "November"
 msgstr ""
 
-#: ../../include/datetime.php:234
-msgid "less than a second ago"
+#: ../../include/text.php:717
+msgid "December"
 msgstr ""
 
-#: ../../include/datetime.php:237
-msgid "years"
+#: ../../include/text.php:787
+msgid "bytes"
 msgstr ""
 
-#: ../../include/datetime.php:238
-msgid "months"
+#: ../../include/text.php:879
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/datetime.php:239
-msgid "week"
+#: ../../include/text.php:891
+msgid "default"
 msgstr ""
 
-#: ../../include/datetime.php:239
-msgid "weeks"
+#: ../../include/nav.php:44
+msgid "End this session"
 msgstr ""
 
-#: ../../include/datetime.php:240
-msgid "days"
+#: ../../include/nav.php:47 ../../include/nav.php:111
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/datetime.php:241
-msgid "hour"
+#: ../../include/nav.php:48
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/datetime.php:241
-msgid "hours"
+#: ../../include/nav.php:49
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/datetime.php:242
-msgid "minute"
+#: ../../include/nav.php:50
+msgid "Your events"
 msgstr ""
 
-#: ../../include/datetime.php:242
-msgid "minutes"
+#: ../../include/nav.php:51
+msgid "Personal notes"
 msgstr ""
 
-#: ../../include/datetime.php:243
-msgid "second"
+#: ../../include/nav.php:51
+msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/datetime.php:243
-msgid "seconds"
+#: ../../include/nav.php:62
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/datetime.php:250
-msgid " ago"
+#: ../../include/nav.php:73
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/poller.php:457
-msgid "From: "
+#: ../../include/nav.php:77
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/bbcode.php:147
-msgid "Image/photo"
+#: ../../include/nav.php:82
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../include/nav.php:85
+msgid "Apps"
 msgstr ""
 
-#: ../../include/message.php:13
-msgid "[no subject]"
+#: ../../include/nav.php:85
+msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/acl_selectors.php:279
-msgid "Visible to everybody"
+#: ../../include/nav.php:87
+msgid "Search site content"
 msgstr ""
 
-#: ../../include/acl_selectors.php:280
-msgid "show"
+#: ../../include/nav.php:97
+msgid "Conversations on this site"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
+#: ../../include/nav.php:99
+msgid "Directory"
 msgstr ""
 
-#: ../../include/items.php:1895
-msgid "New mail received at "
+#: ../../include/nav.php:99
+msgid "People directory"
 msgstr ""
 
-#: ../../include/items.php:2532
-msgid "A new person is sharing with you at "
+#: ../../include/nav.php:109
+msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/items.php:2532
-msgid "You have a new follower at "
+#: ../../include/nav.php:117
+msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:51
-msgid "view full size"
+#: ../../include/nav.php:122
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:102
-msgid "image/photo"
+#: ../../include/nav.php:125
+msgid "Manage"
 msgstr ""
 
-#: ../../include/Contact.php:125 ../../include/conversation.php:713
-msgid "View status"
+#: ../../include/nav.php:125
+msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/Contact.php:126 ../../include/conversation.php:714
-msgid "View profile"
+#: ../../include/nav.php:130
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/Contact.php:127 ../../include/conversation.php:715
-msgid "View photos"
+#: ../../include/nav.php:137
+msgid "Admin"
 msgstr ""
 
-#: ../../include/Contact.php:128 ../../include/Contact.php:141
-#: ../../include/conversation.php:716
-msgid "View recent"
+#: ../../include/nav.php:137
+msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/Contact.php:130 ../../include/Contact.php:141
-#: ../../include/conversation.php:718
-msgid "Send PM"
+#: ../../include/nav.php:160
+msgid "Nothing new here"
 msgstr ""
 
-#: ../../include/conversation.php:247 ../../include/conversation.php:498
+#: ../../include/conversation.php:250 ../../include/conversation.php:504
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:262 ../../include/conversation.php:588
-#: ../../include/conversation.php:589
+#: ../../include/conversation.php:265 ../../include/conversation.php:598
+#: ../../include/conversation.php:599
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:271 ../../include/conversation.php:600
+#: ../../include/conversation.php:274 ../../include/conversation.php:610
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:287
+#: ../../include/conversation.php:290
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:398
+#: ../../include/conversation.php:404
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:401 ../../boot.php:421
-msgid "show more"
-msgstr ""
-
-#: ../../include/conversation.php:461
+#: ../../include/conversation.php:467
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:462
+#: ../../include/conversation.php:468
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:464
+#: ../../include/conversation.php:470
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:464
+#: ../../include/conversation.php:470
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:508
+#: ../../include/conversation.php:514
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:509
+#: ../../include/conversation.php:515
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:510
+#: ../../include/conversation.php:516
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:513
+#: ../../include/conversation.php:519
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:514
+#: ../../include/conversation.php:520
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:590
+#: ../../include/conversation.php:600
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:591
+#: ../../include/conversation.php:601
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:592
+#: ../../include/conversation.php:602
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:638
+#: ../../include/conversation.php:643
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:768
+#: ../../include/conversation.php:773
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:768
+#: ../../include/conversation.php:773
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:772
+#: ../../include/conversation.php:777
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:774
+#: ../../include/conversation.php:779
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:780
+#: ../../include/conversation.php:785
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:783
+#: ../../include/conversation.php:788
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:784
+#: ../../include/conversation.php:789
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:784
+#: ../../include/conversation.php:789
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:804
+#: ../../include/conversation.php:809
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:806
+#: ../../include/conversation.php:811
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:807
+#: ../../include/conversation.php:812
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:808
+#: ../../include/conversation.php:813
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:809
+#: ../../include/conversation.php:814
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:810
+#: ../../include/conversation.php:815
 msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../include/conversation.php:856
+#: ../../include/conversation.php:861
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:862
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:860
+#: ../../include/conversation.php:865
 msgid "Set title"
 msgstr ""
 
-#: ../../boot.php:419
-msgid "Delete this item?"
+#: ../../include/bb2diaspora.php:53
+msgid "view full size"
 msgstr ""
 
-#: ../../boot.php:422
-msgid "show fewer"
+#: ../../include/bb2diaspora.php:104
+msgid "image/photo"
 msgstr ""
 
-#: ../../boot.php:664
-msgid "Create a New Account"
+#: ../../include/dba.php:33
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../boot.php:684
-msgid "Nickname or Email address: "
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
 msgstr ""
 
-#: ../../boot.php:685
-msgid "Password: "
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
 msgstr ""
 
-#: ../../boot.php:688
-msgid "OpenID: "
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../boot.php:694
-msgid "Forgot your password?"
+#: ../../include/contact_widgets.php:18
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../boot.php:841
-msgid "Edit profile"
+#: ../../include/contact_widgets.php:24
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:30
+msgid "Find People"
 msgstr ""
 
-#: ../../boot.php:1008 ../../boot.php:1070
-msgid "g A l F d"
+#: ../../include/contact_widgets.php:31
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../boot.php:1009 ../../boot.php:1071
-msgid "F d"
+#: ../../include/contact_widgets.php:32
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../boot.php:1032
-msgid "Birthday Reminders"
+#: ../../include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../boot.php:1033
-msgid "Birthdays this week:"
+#: ../../include/contact_widgets.php:36
+msgid "Similar Interests"
 msgstr ""
 
-#: ../../boot.php:1049 ../../boot.php:1113
-msgid "[today]"
+#: ../../include/items.php:1895
+msgid "New mail received at "
 msgstr ""
 
-#: ../../boot.php:1094
-msgid "Event Reminders"
+#: ../../include/items.php:2532
+msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../boot.php:1095
-msgid "Events this week:"
+#: ../../include/items.php:2532
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../boot.php:1107
-msgid "[No description]"
+#: ../../include/message.php:14
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:168
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/group.php:191
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:212
+msgid "Groups"
+msgstr ""
+
+#: ../../include/group.php:213
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:214
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/diaspora.php:555
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: ../../include/diaspora.php:1798
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/diaspora.php:1981
+#, php-format
+msgid "[Relayed] Comment authored by %s from network %s"
+msgstr ""
+
+#: ../../include/oembed.php:128
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:137
+msgid "Embedding disabled"
 msgstr ""

diff --git a/view/match.tpl b/view/match.tpl
index 330245a2ae2dd33ade840dbebededd8d9b7c1076..5f2fc7a302f1b4b0d109edff5660fa07e03981a2 100644 (file)
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -9,4 +9,8 @@
                <a href="$url" title="$name[$tags]">$name</a>
        </div>
        <div class="profile-match-end"></div>
+       {{ if $connlnk }}
+       <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+       {{ endif }}
+
 </div>
\ No newline at end of file

diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
index 8d55151525b2e77599d2fb598d534866266499a3..4d84cee41662b23a7c466282839d0b30bd1b954c 100644 (file)
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
@@ -2,6 +2,6 @@
 {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
 {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
 {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }}
-{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
+{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
+{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
 </entry>

diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
index 8e605649448b27aa0ae532f422739edeef94c313..e97b5e8cce37944cb46727544d04bec92c3f911b 100644 (file)
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
@@ -10,4 +10,7 @@
                <a href="$url" title="$name">$name</a>
        </div>
        <div class="profile-match-end"></div>
+       {{ if $connlnk }}
+       <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+       {{ endif }}
 </div>
\ No newline at end of file

diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 338f40cbfbc65ddc755b978eebea1b2776267ba7..5d63583f42ac3bbea15faf2b60a342560bb24196 100644 (file)
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+       function() {
+               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.sidebar-group-element').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+       );
+
+
+$('.savedsearchdrop').hover(
+       function() {
+               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.savedsearchterm').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+       );
+
+});
+
+
+</script>
+EOT;

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1127f114510a6db15b401c91715ff8093e9a40f6..c6582d06855c652ba8dc05e85679462a9380b52d 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2383,6 +2383,11 @@ aside input[type='text'] {
        clear: both;
 }
 
+.profile-match-connect {
+       text-align: center;
+       font-weight: bold;
+}
+
 .profile-match-wrapper {
        float: left;
        padding: 10px;

diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index 338f40cbfbc65ddc755b978eebea1b2776267ba7..5d63583f42ac3bbea15faf2b60a342560bb24196 100644 (file)
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+       function() {
+               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.sidebar-group-element').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+       );
+
+
+$('.savedsearchdrop').hover(
+       function() {
+               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.savedsearchterm').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+       );
+
+});
+
+
+</script>
+EOT;

diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css
index f624fadac304170e8a0aaf9a323ead4160ee19ac..f0d5b96b94cd49a37081b094283a1c1816f3adcd 100644 (file)
--- a/view/theme/purplezero/style.css
+++ b/view/theme/purplezero/style.css
@@ -1,6 +1,6 @@
 @import url('../duepuntozero/style.css');
 
-a, a:visited { color: #7433af; text-decoration: none; }
+a, a:link, a:visited { color: #7433af; text-decoration: none; }
 a:hover {text-decoration: underline; }
 
 

diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index 338f40cbfbc65ddc755b978eebea1b2776267ba7..5d63583f42ac3bbea15faf2b60a342560bb24196 100644 (file)
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+       function() {
+               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.sidebar-group-element').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+       );
+
+
+$('.savedsearchdrop').hover(
+       function() {
+               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+       function() {
+               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       );
+
+$('.savedsearchterm').hover(
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+       function() {
+               id = $(this).attr('id');
+               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+       );
+
+});
+
+
+</script>
+EOT;

diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
index 49c3c81e4b64a1bf218ebf684404d7db1ee189cf..244b243ece5f651d64a255018d0c8005cfbf1ea1 100644 (file)
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
@@ -4,7 +4,10 @@
                        <img src="$photo" alt="$name" />
                </a>
        </div>
-       <span><a href="$url">$name</a> is interested in:<br />$tags</span>
+       <span><a href="$url">$name</a>$inttxt<br />$tags</span>
        <div class="profile-match-break"></div>
+       {{ if $connlnk }}
+       <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+       {{ endif }}
        <div class="profile-match-end"></div>
 </div>
\ No newline at end of file