Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape

diff --git a/boot.php b/boot.php
index 96b19add134b5a6f29f4d9f53a6047b4bc7b06e3..696928145fdd3d37b285850c6e4112266418ee53 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -18,7 +18,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Ginger');
 define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1178      );
+define ( 'DB_UPDATE_VERSION',      1179      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -127,6 +127,11 @@ define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
 define ( 'PAGE_PRVGROUP',          5 );
 
+// Type of the community page
+define ( 'CP_NO_COMMUNITY_PAGE',   -1 );
+define ( 'CP_USERS_ON_SERVER',     0 );
+define ( 'CP_GLOBAL_COMMUNITY',    1 );
+
 /**
  * Network and protocol family types
  */

diff --git a/include/bbcode.php b/include/bbcode.php
index c08c6d4d95682e83e5691e5587cf21603d8b8147..9a3563527ae4bc9eb8d11143391bf5497358e859 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1183,12 +1183,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        //$Text = str_replace('<br /><li>','<li>', $Text);
        //      $Text = str_replace('<br /><ul','<ul ', $Text);
 
-       // Remove all hashtag addresses
-/*     if (!$tryoembed AND get_config("system", "remove_hashtags_on_export")) {
-               $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
-               $Text = preg_replace($pattern, '#$2', $Text);
-       }
-*/
        call_hooks('bbcode',$Text);
 
        $a->save_timestamp($stamp1, "parser");

diff --git a/include/html2plain.php b/include/html2plain.php
index f09087e0b0179fab68fb4e42328ba5037dbabf61..1d5910d83bea975a11a02b2aef1e8c3eba01e68b 100644 (file)
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -113,12 +113,6 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        $message = str_replace("\r", "", $html);
 
-       // replace all hashtag addresses
-/*     if (get_config("system", "remove_hashtags_on_export")) {
-               $pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
-               $message = preg_replace($pattern, '#$2', $message);
-       }
-*/
        $doc = new DOMDocument();
        $doc->preserveWhiteSpace = false;
 

diff --git a/include/nav.php b/include/nav.php
index 7708f09e6b812d9dff9a158e601c0b821dea5987..9ea3b4b7f54b327a92b0a44cc785f58f3a01979b 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -125,8 +125,10 @@ function nav_info(&$a) {
                if(strlen($gdir))
                        $gdirpath = $gdir;
        }
-       elseif(! get_config('system','no_community_page'))
+       elseif(get_config('system','community_page_style') == CP_USERS_ON_SERVER)
                $nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
+       elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
+               $nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
 
        $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 

diff --git a/include/threads.php b/include/threads.php
index bd0cb0489926df5bfb68f1be61e390d760e199da..cefba2d6c0519890a426485ce510a701212be577 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -19,10 +19,6 @@ function add_thread($itemid, $onlyshadow = false) {
                logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
        }
 
-       // Store a shadow copy of public items for displaying a global community page?
-       if (!get_config('system', 'global_community'))
-               return;
-
        // is it already a copy?
        if (($itemid == 0) OR ($item['uid'] == 0))
                return;

diff --git a/mod/admin.php b/mod/admin.php
index 923795e42625a7502ca735beea632b866689dd03..0aa90237380980d474f99f3f2b761db5df52988e 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -312,8 +312,10 @@ function admin_page_site_post(&$a){
 
        $sitename               =       ((x($_POST,'sitename'))                 ? notags(trim($_POST['sitename']))              : '');
        $hostname               =       ((x($_POST,'hostname'))                 ? notags(trim($_POST['hostname']))              : '');
-       $sender_email   =       ((x($_POST,'sender_email'))             ? notags(trim($_POST['sender_email']))          : '');
+       $sender_email           =       ((x($_POST,'sender_email'))             ? notags(trim($_POST['sender_email']))          : '');
        $banner                 =       ((x($_POST,'banner'))                   ? trim($_POST['banner'])                        : false);
+       $shortcut_icon          =       ((x($_POST,'shortcut_icon'))            ? notags(trim($_POST['shortcut_icon']))         : '');
+       $touch_icon             =       ((x($_POST,'touch_icon'))               ? notags(trim($_POST['touch_icon']))            : '');
        $info                   =       ((x($_POST,'info'))                     ? trim($_POST['info'])                  : false);
        $language               =       ((x($_POST,'language'))                 ? notags(trim($_POST['language']))              : '');
        $theme                  =       ((x($_POST,'theme'))                    ? notags(trim($_POST['theme']))                 : '');
@@ -345,7 +347,8 @@ function admin_page_site_post(&$a){
        $no_openid              =       !((x($_POST,'no_openid'))               ? True                                          : False);
        $no_regfullname         =       !((x($_POST,'no_regfullname'))          ? True                                          : False);
        $no_utf                 =       !((x($_POST,'no_utf'))                  ? True                                          : False);
-       $no_community_page      =       !((x($_POST,'no_community_page'))       ? True                                          : False);
+       $community_page_style   =       ((x($_POST,'community_page_style'))     ? intval(trim($_POST['community_page_style']))  : 0);
+       $max_author_posts_community_page        =       ((x($_POST,'max_author_posts_community_page'))  ? intval(trim($_POST['max_author_posts_community_page']))       : 0);
 
        $verifyssl              =       ((x($_POST,'verifyssl'))                ? True                                          : False);
        $proxyuser              =       ((x($_POST,'proxyuser'))                ? notags(trim($_POST['proxyuser']))             : '');
@@ -356,13 +359,14 @@ function admin_page_site_post(&$a){
        $maxloadavg             =       ((x($_POST,'maxloadavg'))               ? intval(trim($_POST['maxloadavg']))            : 50);
        $dfrn_only              =       ((x($_POST,'dfrn_only'))                ? True                                          : False);
        $ostatus_disabled       =       !((x($_POST,'ostatus_disabled'))        ? True                                          : False);
-       $ostatus_poll_interval  =       ((x($_POST,'ostatus_poll_interval'))    ? intval(trim($_POST['ostatus_poll_interval']))         :  0);
+       $ostatus_poll_interval  =       ((x($_POST,'ostatus_poll_interval'))    ? intval(trim($_POST['ostatus_poll_interval'])) :  0);
        $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
        $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
        $force_ssl              =       ((x($_POST,'force_ssl'))                ? True                                          : False);
        $old_share              =       ((x($_POST,'old_share'))                ? True                                          : False);
        $hide_help              =       ((x($_POST,'hide_help'))                ? True                                          : False);
        $suppress_language      =       ((x($_POST,'suppress_language'))        ? True                                          : False);
+       $suppress_tags          =       ((x($_POST,'suppress_tags'))            ? True                                          : False);
        $use_fulltext_engine    =       ((x($_POST,'use_fulltext_engine'))      ? True                                          : False);
        $itemcache              =       ((x($_POST,'itemcache'))                ? notags(trim($_POST['itemcache']))             : '');
        $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
@@ -373,6 +377,7 @@ function admin_page_site_post(&$a){
        $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
        $proxy_disabled         =       ((x($_POST,'proxy_disabled'))           ? True                                          : False);
        $old_pager              =       ((x($_POST,'old_pager'))                ? True                                          : False);
+       $only_tag_search        =       ((x($_POST,'only_tag_search'))          ? True                                          : False);
 
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
@@ -422,6 +427,9 @@ function admin_page_site_post(&$a){
        set_config('config','hostname',$hostname);
        set_config('config','sender_email', $sender_email);
        set_config('system','suppress_language',$suppress_language);
+       set_config('system','suppress_tags',$suppress_tags);
+       set_config('system','shortcut_icon',$shortcut_icon);
+       set_config('system','touch_icon',$touch_icon);
        if ($banner==""){
                // don't know why, but del_config doesn't work...
                q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
@@ -478,7 +486,8 @@ function admin_page_site_post(&$a){
        set_config('system','block_extended_register', $no_multi_reg);
        set_config('system','no_openid', $no_openid);
        set_config('system','no_regfullname', $no_regfullname);
-       set_config('system','no_community_page', $no_community_page);
+       set_config('system','community_page_style', $community_page_style);
+       set_config('system','max_author_posts_community_page', $max_author_posts_community_page);
        set_config('system','no_utf', $no_utf);
        set_config('system','verifyssl', $verifyssl);
        set_config('system','proxyuser', $proxyuser);
@@ -486,7 +495,7 @@ function admin_page_site_post(&$a){
        set_config('system','curl_timeout', $timeout);
        set_config('system','dfrn_only', $dfrn_only);
        set_config('system','ostatus_disabled', $ostatus_disabled);
-               set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
+       set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
        set_config('system','diaspora_enabled', $diaspora_enabled);
        set_config('config','private_addons', $private_addons);
 
@@ -502,6 +511,7 @@ function admin_page_site_post(&$a){
        set_config('system','basepath', $basepath);
        set_config('system','proxy_disabled', $proxy_disabled);
        set_config('system','old_pager', $old_pager);
+       set_config('system','only_tag_search', $only_tag_search);
 
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
@@ -547,14 +557,21 @@ function admin_page_site(&$a) {
                }
                }
 
+               /* Community page style */
+               $community_page_style_choices = array(
+                       CP_NO_COMMUNITY_PAGE => t("No community page"),
+                       CP_USERS_ON_SERVER => t("Public postings from users of this site"),
+                       CP_GLOBAL_COMMUNITY => t("Global community page")
+                       );
+
                /* OStatus conversation poll choices */
                $ostatus_poll_choices = array(
-               "-2" => t("Never"),
-               "-1" => t("At post arrival"),
-               "0" => t("Frequently"),
-               "60" => t("Hourly"),
-               "720" => t("Twice daily"),
-               "1440" => t("Daily")
+                       "-2" => t("Never"),
+                       "-1" => t("At post arrival"),
+                       "0" => t("Frequently"),
+                       "60" => t("Hourly"),
+                       "720" => t("Twice daily"),
+                       "1440" => t("Daily")
                        );
 
                /* get user names to make the install a personal install of X */
@@ -613,6 +630,8 @@ function admin_page_site(&$a) {
                '$hostname'             => array('hostname', t("Host name"), $a->config['hostname'], ""),
                '$sender_email'         => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"),
                '$banner'               => array('banner', t("Banner/Logo"), $banner, ""),
+               '$shortcut_icon'        => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'),  "Link to an icon that will be used for browsers."),
+               '$touch_icon'           => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'),  "Link to an icon that will be used for tablets and mobiles."),
                '$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')),
                '$language'             => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
                '$theme'                => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
@@ -645,7 +664,8 @@ function admin_page_site(&$a) {
                '$no_openid'            => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
                '$no_regfullname'       => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
                '$no_utf'               => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
-               '$no_community_page'    => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
+               '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
+               '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
                '$ostatus_disabled'     => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
                '$ostatus_poll_interval'        => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices),
                '$diaspora_enabled'     => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
@@ -660,6 +680,7 @@ function admin_page_site(&$a) {
 
                '$use_fulltext_engine'  => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
                '$suppress_language'    => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")),
+               '$suppress_tags'        => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
                '$itemcache'            => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."),
                '$itemcache_duration'   => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
                '$max_comments'         => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
@@ -668,6 +689,7 @@ function admin_page_site(&$a) {
                '$basepath'             => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
                '$proxy_disabled'       => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
                '$old_pager'            => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
+               '$only_tag_search'      => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
 
                '$relocate_url'     => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
        '$form_security_token' => get_form_security_token("admin_site")

diff --git a/mod/community.php b/mod/community.php
index e3d2b77c00c5d9522a123b45f7643cf127e320b3..3f0adff04fde219f2c25651dd8f23b1041d018e8 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -19,7 +19,7 @@ function community_content(&$a, $update = 0) {
                return;
        }
 
-       if(get_config('system','no_community_page')) {
+       if(get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
                notice( t('Not available.') . EOL);
                return;
        }
@@ -113,8 +113,7 @@ function community_content(&$a, $update = 0) {
 }
 
 function community_getitems($start, $itemspage) {
-       // Work in progress
-       if (get_config('system', 'global_community'))
+       if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
                return(community_getpublicitems($start, $itemspage));
 
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,

diff --git a/mod/search.php b/mod/search.php
index 57f42d640c43cdeb62c99107bf05c09430c3390a..338b377e8d3cc6b66abaeac8d4f055c00591ca48 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -130,8 +130,8 @@ function search_content(&$a) {
        if($tag) {
                $sql_extra = "";
 
-               $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d) AS `term` ON `item`.`id` = `term`.`oid` ",
-                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
+               $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` IN (%d, 0)) AS `term` ON `item`.`id` = `term`.`oid` ",
+                                       dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
 
                $sql_order = "`item`.`id`";
        } else {
@@ -154,14 +154,12 @@ function search_content(&$a) {
                $r = q("SELECT distinct(`item`.`uri`) as `total`
                        FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-                       AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
-                               OR ( `item`.`uid` = %d ))
+                       AND ((`item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`uid` = 0)
+                               OR (`item`.`uid` = %d))
                        $sql_extra ",
                        intval(local_user())
                );
-//                     $sql_extra group by `item`.`uri` ",
 
                if(count($r))
                        $a->set_pager_total(count($r));
@@ -174,23 +172,21 @@ function search_content(&$a) {
 
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
-               `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
-               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
-               `user`.`nickname`, `user`.`uid`, `user`.`hidewall`
+               `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
+               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-               AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
-                       OR ( `item`.`uid` = %d ))
-               $sql_extra GROUP BY `item`.`uri`
+               AND ((`item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`uid`=0)
+                       OR `item`.`uid` = %d)
+               $sql_extra
+               GROUP BY `item`.`uri`
                ORDER BY $sql_order DESC LIMIT %d , %d ",
                intval(local_user()),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
 
        );
-//             group by `item`.`uri`
 
        if(! count($r)) {
                info( t('No results.') . EOL);

diff --git a/update.php b/update.php
index e80de3526a4b091917a839f39733b221e6556d22..53cd0e305c1ac6e619fba9d2a953bc4a39aa3f93 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1178 );
+define( 'UPDATE_VERSION' , 1179 );
 
 /**
  *
@@ -1630,3 +1630,13 @@ function update_1177() {
                        );
        }
 }
+
+function update_1178() {
+       if (get_config('system','no_community_page'))
+               set_config('system','community_page_style', CP_NO_COMMUNITY_PAGE);
+
+       // Update the central item storage with uid=0
+       proc_run('php',"include/threadupdate.php");
+
+       return UPDATE_SUCCESS;
+}

diff --git a/util/messages.po b/util/messages.po
index aad50fa4487f49b54953a1860ec84e026127f9d0..8da90654a1fd6d2b1fc4b07e8c237853f41c7042 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-04 11:35+0100\n"
+"POT-Creation-Date: 2015-02-09 08:57+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"
@@ -18,1088 +18,983 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: ../../object/Item.php:94
-msgid "This entry was edited"
+#: ../../mod/contacts.php:108
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/contacts.php:139 ../../mod/contacts.php:272
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../object/Item.php:116 ../../mod/content.php:620
-#: ../../mod/photos.php:1359
-msgid "Private Message"
+#: ../../mod/contacts.php:153
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../object/Item.php:120 ../../mod/content.php:728
-#: ../../mod/settings.php:676
-msgid "Edit"
+#: ../../mod/contacts.php:186
+msgid "Contact updated."
 msgstr ""
 
-#: ../../object/Item.php:129 ../../mod/content.php:437
-#: ../../mod/content.php:740 ../../mod/photos.php:1653
-#: ../../include/conversation.php:613
-msgid "Select"
+#: ../../mod/contacts.php:188 ../../mod/dfrn_request.php:576
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../object/Item.php:130 ../../mod/admin.php:985 ../../mod/content.php:438
-#: ../../mod/content.php:741 ../../mod/contacts.php:717
-#: ../../mod/settings.php:677 ../../mod/group.php:171
-#: ../../mod/photos.php:1654 ../../include/conversation.php:614
-msgid "Delete"
+#: ../../mod/contacts.php:254 ../../mod/manage.php:96
+#: ../../mod/display.php:499 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
+#: ../../mod/profile_photo.php:193 ../../mod/follow.php:9
+#: ../../mod/item.php:168 ../../mod/item.php:184 ../../mod/group.php:19
+#: ../../mod/dfrn_confirm.php:55 ../../mod/fsuggest.php:78
+#: ../../mod/wall_upload.php:66 ../../mod/viewcontacts.php:24
+#: ../../mod/notifications.php:66 ../../mod/message.php:38
+#: ../../mod/message.php:174 ../../mod/crepair.php:119
+#: ../../mod/nogroup.php:25 ../../mod/network.php:4 ../../mod/allfriends.php:9
+#: ../../mod/events.php:140 ../../mod/install.php:151
+#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
+#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
+#: ../../mod/wall_attach.php:55 ../../mod/settings.php:102
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
+#: ../../mod/register.php:42 ../../mod/delegate.php:12 ../../mod/mood.php:114
+#: ../../mod/suggest.php:58 ../../mod/profiles.php:165
+#: ../../mod/profiles.php:618 ../../mod/editpost.php:10 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/notes.php:20 ../../mod/poke.php:135
+#: ../../mod/invite.php:15 ../../mod/invite.php:101 ../../mod/photos.php:134
+#: ../../mod/photos.php:1050 ../../mod/regmod.php:110 ../../mod/uimport.php:23
+#: ../../mod/attach.php:33 ../../include/items.php:4712 ../../index.php:369
+msgid "Permission denied."
 msgstr ""
 
-#: ../../object/Item.php:133 ../../mod/content.php:763
-msgid "save to folder"
+#: ../../mod/contacts.php:287
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../object/Item.php:195 ../../mod/content.php:753
-msgid "add star"
+#: ../../mod/contacts.php:287
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../object/Item.php:196 ../../mod/content.php:754
-msgid "remove star"
+#: ../../mod/contacts.php:298
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../object/Item.php:197 ../../mod/content.php:755
-msgid "toggle star status"
+#: ../../mod/contacts.php:298
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../object/Item.php:200 ../../mod/content.php:758
-msgid "starred"
+#: ../../mod/contacts.php:310
+msgid "Contact has been archived"
 msgstr ""
 
-#: ../../object/Item.php:208
-msgid "ignore thread"
+#: ../../mod/contacts.php:310
+msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../object/Item.php:209
-msgid "unignore thread"
+#: ../../mod/contacts.php:335 ../../mod/contacts.php:711
+msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: ../../object/Item.php:210
-msgid "toggle ignore status"
+#: ../../mod/contacts.php:337 ../../mod/message.php:209
+#: ../../mod/settings.php:1010 ../../mod/settings.php:1016
+#: ../../mod/settings.php:1024 ../../mod/settings.php:1028
+#: ../../mod/settings.php:1033 ../../mod/settings.php:1039
+#: ../../mod/settings.php:1045 ../../mod/settings.php:1051
+#: ../../mod/settings.php:1081 ../../mod/settings.php:1082
+#: ../../mod/settings.php:1083 ../../mod/settings.php:1084
+#: ../../mod/settings.php:1085 ../../mod/dfrn_request.php:830
+#: ../../mod/register.php:233 ../../mod/suggest.php:29
+#: ../../mod/profiles.php:661 ../../mod/profiles.php:664 ../../mod/api.php:105
+#: ../../include/items.php:4557
+msgid "Yes"
 msgstr ""
 
-#: ../../object/Item.php:213
-msgid "ignored"
+#: ../../mod/contacts.php:340 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/message.php:212 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../mod/settings.php:615
+#: ../../mod/settings.php:641 ../../mod/dfrn_request.php:844
+#: ../../mod/suggest.php:32 ../../mod/editpost.php:148
+#: ../../mod/photos.php:203 ../../mod/photos.php:292
+#: ../../include/conversation.php:1129 ../../include/items.php:4560
+msgid "Cancel"
 msgstr ""
 
-#: ../../object/Item.php:220 ../../mod/content.php:759
-msgid "add tag"
+#: ../../mod/contacts.php:352
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../object/Item.php:231 ../../mod/content.php:684
-#: ../../mod/photos.php:1542
-msgid "I like this (toggle)"
+#: ../../mod/contacts.php:390
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../object/Item.php:231 ../../mod/content.php:684
-msgid "like"
+#: ../../mod/contacts.php:394
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../object/Item.php:232 ../../mod/content.php:685
-#: ../../mod/photos.php:1543
-msgid "I don't like this (toggle)"
+#: ../../mod/contacts.php:399
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../object/Item.php:232 ../../mod/content.php:685
-msgid "dislike"
+#: ../../mod/contacts.php:416
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../object/Item.php:234 ../../mod/content.php:687
-msgid "Share this"
+#: ../../mod/contacts.php:419 ../../mod/admin.php:569
+msgid "Never"
 msgstr ""
 
-#: ../../object/Item.php:234 ../../mod/content.php:687
-msgid "share"
+#: ../../mod/contacts.php:423
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../object/Item.php:316 ../../include/conversation.php:666
-msgid "Categories:"
+#: ../../mod/contacts.php:423
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../object/Item.php:317 ../../include/conversation.php:667
-msgid "Filed under:"
+#: ../../mod/contacts.php:425
+msgid "Suggest friends"
 msgstr ""
 
-#: ../../object/Item.php:326 ../../object/Item.php:327
-#: ../../mod/content.php:471 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../include/conversation.php:654
+#: ../../mod/contacts.php:429
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "Network type: %s"
 msgstr ""
 
-#: ../../object/Item.php:328 ../../mod/content.php:854
-msgid "to"
-msgstr ""
+#: ../../mod/contacts.php:432 ../../include/contact_widgets.php:200
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../object/Item.php:329
-msgid "via"
+#: ../../mod/contacts.php:437
+msgid "View all contacts"
 msgstr ""
 
-#: ../../object/Item.php:330 ../../mod/content.php:855
-msgid "Wall-to-Wall"
+#: ../../mod/contacts.php:442 ../../mod/contacts.php:501
+#: ../../mod/contacts.php:714 ../../mod/admin.php:1009
+msgid "Unblock"
 msgstr ""
 
-#: ../../object/Item.php:331 ../../mod/content.php:856
-msgid "via Wall-To-Wall:"
+#: ../../mod/contacts.php:442 ../../mod/contacts.php:501
+#: ../../mod/contacts.php:714 ../../mod/admin.php:1008
+msgid "Block"
 msgstr ""
 
-#: ../../object/Item.php:340 ../../mod/content.php:481
-#: ../../mod/content.php:864 ../../include/conversation.php:674
-#, php-format
-msgid "%s from %s"
+#: ../../mod/contacts.php:445
+msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../object/Item.php:361 ../../object/Item.php:677 ../../boot.php:745
-#: ../../mod/content.php:709 ../../mod/photos.php:1564
-#: ../../mod/photos.php:1608 ../../mod/photos.php:1696
-msgid "Comment"
+#: ../../mod/contacts.php:448 ../../mod/contacts.php:502
+#: ../../mod/contacts.php:715
+msgid "Unignore"
 msgstr ""
 
-#: ../../object/Item.php:364 ../../mod/wallmessage.php:156
-#: ../../mod/editpost.php:124 ../../mod/content.php:499
-#: ../../mod/content.php:883 ../../mod/message.php:334
-#: ../../mod/message.php:565 ../../mod/photos.php:1545
-#: ../../include/conversation.php:692 ../../include/conversation.php:1109
-msgid "Please wait"
+#: ../../mod/contacts.php:448 ../../mod/contacts.php:502
+#: ../../mod/contacts.php:715 ../../mod/notifications.php:51
+#: ../../mod/notifications.php:164 ../../mod/notifications.php:210
+msgid "Ignore"
 msgstr ""
 
-#: ../../object/Item.php:387 ../../mod/content.php:603
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../object/Item.php:389 ../../object/Item.php:402
-#: ../../mod/content.php:605 ../../include/text.php:1972
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../object/Item.php:390 ../../boot.php:746 ../../mod/content.php:606
-#: ../../include/contact_widgets.php:205
-msgid "show more"
+#: ../../mod/contacts.php:451
+msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../object/Item.php:675 ../../mod/content.php:707
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1606
-#: ../../mod/photos.php:1694
-msgid "This is you"
+#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
+msgid "Unarchive"
 msgstr ""
 
-#: ../../object/Item.php:678 ../../view/theme/perihel/config.php:95
-#: ../../view/theme/diabook/theme.php:633
-#: ../../view/theme/diabook/config.php:148
-#: ../../view/theme/quattro/config.php:64
-#: ../../view/theme/zero-childs/cleanzero/config.php:80
-#: ../../view/theme/dispy/config.php:70 ../../view/theme/clean/config.php:82
-#: ../../view/theme/duepuntozero/config.php:59
-#: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/vier/config.php:53
-#: ../../view/theme/vier-mobil/config.php:47 ../../mod/mood.php:137
-#: ../../mod/install.php:248 ../../mod/install.php:286
-#: ../../mod/crepair.php:186 ../../mod/content.php:710
-#: ../../mod/contacts.php:475 ../../mod/profiles.php:671
-#: ../../mod/message.php:335 ../../mod/message.php:564
-#: ../../mod/localtime.php:45 ../../mod/photos.php:1084
-#: ../../mod/photos.php:1203 ../../mod/photos.php:1514
-#: ../../mod/photos.php:1565 ../../mod/photos.php:1609
-#: ../../mod/photos.php:1697 ../../mod/poke.php:199 ../../mod/events.php:478
-#: ../../mod/fsuggest.php:107 ../../mod/invite.php:140
-#: ../../mod/manage.php:110
-msgid "Submit"
+#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
+msgid "Archive"
 msgstr ""
 
-#: ../../object/Item.php:679 ../../mod/content.php:711
-msgid "Bold"
+#: ../../mod/contacts.php:458
+msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../object/Item.php:680 ../../mod/content.php:712
-msgid "Italic"
+#: ../../mod/contacts.php:461
+msgid "Repair"
 msgstr ""
 
-#: ../../object/Item.php:681 ../../mod/content.php:713
-msgid "Underline"
+#: ../../mod/contacts.php:464
+msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../object/Item.php:682 ../../mod/content.php:714
-msgid "Quote"
+#: ../../mod/contacts.php:470
+msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../object/Item.php:683 ../../mod/content.php:715
-msgid "Code"
+#: ../../mod/contacts.php:473
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../object/Item.php:684 ../../mod/content.php:716
-msgid "Image"
+#: ../../mod/contacts.php:475 ../../mod/manage.php:110
+#: ../../mod/fsuggest.php:107 ../../mod/message.php:335
+#: ../../mod/message.php:564 ../../mod/crepair.php:186
+#: ../../mod/events.php:478 ../../mod/content.php:710
+#: ../../mod/install.php:248 ../../mod/install.php:286 ../../mod/mood.php:137
+#: ../../mod/profiles.php:686 ../../mod/localtime.php:45
+#: ../../mod/poke.php:199 ../../mod/invite.php:140 ../../mod/photos.php:1084
+#: ../../mod/photos.php:1203 ../../mod/photos.php:1514
+#: ../../mod/photos.php:1565 ../../mod/photos.php:1609
+#: ../../mod/photos.php:1697 ../../object/Item.php:678
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/dispy/config.php:70 ../../view/theme/quattro/config.php:64
+#: ../../view/theme/diabook/config.php:148
+#: ../../view/theme/diabook/theme.php:633 ../../view/theme/vier/config.php:53
+#: ../../view/theme/duepuntozero/config.php:59
+msgid "Submit"
 msgstr ""
 
-#: ../../object/Item.php:685 ../../mod/content.php:717
-msgid "Link"
+#: ../../mod/contacts.php:476
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../object/Item.php:686 ../../mod/content.php:718
-msgid "Video"
+#: ../../mod/contacts.php:477
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../object/Item.php:687 ../../mod/editpost.php:145
-#: ../../mod/content.php:719 ../../mod/photos.php:1566
-#: ../../mod/photos.php:1610 ../../mod/photos.php:1698
-#: ../../include/conversation.php:1126
-msgid "Preview"
+#: ../../mod/contacts.php:478
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../index.php:212 ../../mod/apps.php:7
-msgid "You must be logged in to use addons. "
+#: ../../mod/contacts.php:479
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../index.php:256 ../../mod/help.php:90
-msgid "Not Found"
+#: ../../mod/contacts.php:484 ../../mod/contacts.php:679
+#: ../../mod/viewcontacts.php:64 ../../mod/nogroup.php:40
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../index.php:259 ../../mod/help.php:93
-msgid "Page not found."
+#: ../../mod/contacts.php:485
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../index.php:368 ../../mod/group.php:72 ../../mod/profperm.php:19
-msgid "Permission denied"
+#: ../../mod/contacts.php:486
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../index.php:369 ../../mod/mood.php:114 ../../mod/display.php:499
-#: ../../mod/register.php:42 ../../mod/dfrn_confirm.php:55
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/wallmessage.php:9
-#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
-#: ../../mod/wallmessage.php:103 ../../mod/suggest.php:58
-#: ../../mod/network.php:4 ../../mod/install.php:151 ../../mod/editpost.php:10
-#: ../../mod/attach.php:33 ../../mod/regmod.php:110 ../../mod/crepair.php:119
-#: ../../mod/uimport.php:23 ../../mod/notes.php:20 ../../mod/contacts.php:254
-#: ../../mod/settings.php:102 ../../mod/settings.php:596
-#: ../../mod/settings.php:601 ../../mod/profiles.php:165
-#: ../../mod/profiles.php:603 ../../mod/group.php:19 ../../mod/follow.php:9
-#: ../../mod/message.php:38 ../../mod/message.php:174
-#: ../../mod/viewcontacts.php:24 ../../mod/photos.php:134
-#: ../../mod/photos.php:1050 ../../mod/wall_attach.php:55
-#: ../../mod/poke.php:135 ../../mod/wall_upload.php:66
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
-#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/events.php:140 ../../mod/delegate.php:12 ../../mod/nogroup.php:25
-#: ../../mod/fsuggest.php:78 ../../mod/item.php:168 ../../mod/item.php:184
-#: ../../mod/notifications.php:66 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/manage.php:96 ../../mod/allfriends.php:9
-#: ../../include/items.php:4696
-msgid "Permission denied."
+#: ../../mod/contacts.php:487
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../index.php:428
-msgid "toggle mobile"
+#: ../../mod/contacts.php:488
+msgid "View conversations"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:33
-#: ../../view/theme/diabook/theme.php:123 ../../mod/notifications.php:93
-#: ../../include/nav.php:105 ../../include/nav.php:146
-msgid "Home"
+#: ../../mod/contacts.php:490
+msgid "Delete contact"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:33
-#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:76
-#: ../../include/nav.php:146
-msgid "Your posts and conversations"
+#: ../../mod/contacts.php:494
+msgid "Last update:"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:34
-#: ../../view/theme/diabook/theme.php:124 ../../boot.php:2114
-#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../include/nav.php:77 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:87
-msgid "Profile"
+#: ../../mod/contacts.php:496
+msgid "Update public posts"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:34
-#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:77
-msgid "Your profile page"
+#: ../../mod/contacts.php:498 ../../mod/admin.php:1503
+msgid "Update now"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:35
-#: ../../view/theme/diabook/theme.php:126 ../../boot.php:2121
-#: ../../mod/fbrowser.php:25 ../../include/nav.php:78
-msgid "Photos"
+#: ../../mod/contacts.php:505
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:35
-#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:78
-msgid "Your photos"
+#: ../../mod/contacts.php:506
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:36
-#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2138
-#: ../../mod/events.php:370 ../../include/nav.php:80
-msgid "Events"
+#: ../../mod/contacts.php:507
+msgid "Currently archived"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:36
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:80
-msgid "Your events"
+#: ../../mod/contacts.php:508 ../../mod/notifications.php:157
+#: ../../mod/notifications.php:204
+msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:37
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:81
-msgid "Personal notes"
+#: ../../mod/contacts.php:508
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:37
-#: ../../view/theme/diabook/theme.php:128
-msgid "Your personal photos"
+#: ../../mod/contacts.php:509
+msgid "Notification for new posts"
 msgstr ""
 
-#: ../../view/theme/perihel/theme.php:38
-#: ../../view/theme/diabook/theme.php:129 ../../mod/community.php:32
-#: ../../include/nav.php:129
-msgid "Community"
+#: ../../mod/contacts.php:509
+msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:89
-#: ../../view/theme/diabook/theme.php:621
-#: ../../view/theme/diabook/config.php:142 ../../include/acl_selectors.php:335
-msgid "don't show"
+#: ../../mod/contacts.php:510
+msgid "Fetch further information for feeds"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:89
-#: ../../view/theme/diabook/theme.php:621
-#: ../../view/theme/diabook/config.php:142 ../../include/acl_selectors.php:334
-msgid "show"
+#: ../../mod/contacts.php:511
+msgid "Disabled"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:97
-#: ../../view/theme/diabook/config.php:150
-#: ../../view/theme/quattro/config.php:66
-#: ../../view/theme/zero-childs/cleanzero/config.php:82
-#: ../../view/theme/dispy/config.php:72 ../../view/theme/clean/config.php:84
-#: ../../view/theme/duepuntozero/config.php:61
-#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/vier/config.php:55
-#: ../../view/theme/vier-mobil/config.php:49
-msgid "Theme settings"
+#: ../../mod/contacts.php:511
+msgid "Fetch information"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:98
-#: ../../view/theme/diabook/config.php:151
-#: ../../view/theme/zero-childs/cleanzero/config.php:84
-#: ../../view/theme/dispy/config.php:73
-#: ../../view/theme/cleanzero/config.php:84
-msgid "Set font-size for posts and comments"
+#: ../../mod/contacts.php:511
+msgid "Fetch information and keywords"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:99
-#: ../../view/theme/diabook/config.php:152
-#: ../../view/theme/dispy/config.php:74
-msgid "Set line-height for posts and comments"
+#: ../../mod/contacts.php:513
+msgid "Blacklisted keywords"
 msgstr ""
 
-#: ../../view/theme/perihel/config.php:100
-#: ../../view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
+#: ../../mod/contacts.php:513
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:125 ../../mod/contacts.php:702
-#: ../../include/nav.php:175
-msgid "Contacts"
+#: ../../mod/contacts.php:564
+msgid "Suggestions"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:125
-msgid "Your contacts"
+#: ../../mod/contacts.php:567
+msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:624
-#: ../../view/theme/diabook/config.php:158
-msgid "Community Pages"
+#: ../../mod/contacts.php:570 ../../mod/group.php:194
+msgid "All Contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:391
-#: ../../view/theme/diabook/theme.php:626
-#: ../../view/theme/diabook/config.php:160
-msgid "Community Profiles"
+#: ../../mod/contacts.php:573
+msgid "Show all contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:412
-#: ../../view/theme/diabook/theme.php:630
-#: ../../view/theme/diabook/config.php:164
-msgid "Last users"
+#: ../../mod/contacts.php:576
+msgid "Unblocked"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:441
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:166
-msgid "Last likes"
+#: ../../mod/contacts.php:579
+msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:463 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../include/text.php:1966
-msgid "event"
+#: ../../mod/contacts.php:583
+msgid "Blocked"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475 ../../mod/tagger.php:62
-#: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
-#: ../../include/conversation.php:121 ../../include/conversation.php:130
-#: ../../include/conversation.php:249 ../../include/conversation.php:258
-#: ../../include/diaspora.php:2087
-msgid "status"
+#: ../../mod/contacts.php:586
+msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:471 ../../mod/tagger.php:62
-#: ../../mod/like.php:149 ../../mod/subthread.php:87
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../include/text.php:1968 ../../include/diaspora.php:2087
-msgid "photo"
+#: ../../mod/contacts.php:590
+msgid "Ignored"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:480 ../../mod/like.php:166
-#: ../../include/conversation.php:137 ../../include/diaspora.php:2103
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/contacts.php:593
+msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:486
-#: ../../view/theme/diabook/theme.php:631
-#: ../../view/theme/diabook/config.php:165
-msgid "Last photos"
+#: ../../mod/contacts.php:597
+msgid "Archived"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:499 ../../mod/photos.php:60
-#: ../../mod/photos.php:155 ../../mod/photos.php:1064
-#: ../../mod/photos.php:1187 ../../mod/photos.php:1210
-#: ../../mod/photos.php:1760 ../../mod/photos.php:1772
-msgid "Contact Photos"
+#: ../../mod/contacts.php:600
+msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:500 ../../mod/photos.php:155
-#: ../../mod/photos.php:731 ../../mod/photos.php:1187
-#: ../../mod/photos.php:1210 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
-#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
-#: ../../mod/profile_photo.php:305 ../../include/user.php:335
-#: ../../include/user.php:342 ../../include/user.php:349
-msgid "Profile Photos"
+#: ../../mod/contacts.php:604
+msgid "Hidden"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:523
-#: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:163
-msgid "Find Friends"
+#: ../../mod/contacts.php:607
+msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:524
-msgid "Local Directory"
+#: ../../mod/contacts.php:655
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:525 ../../mod/directory.php:51
-msgid "Global Directory"
+#: ../../mod/contacts.php:659
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:526 ../../include/contact_widgets.php:36
-msgid "Similar Interests"
+#: ../../mod/contacts.php:663
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:527 ../../mod/suggest.php:68
-#: ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
+#: ../../mod/contacts.php:680 ../../mod/nogroup.php:41
+msgid "Edit contact"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:528 ../../include/contact_widgets.php:38
-msgid "Invite Friends"
+#: ../../mod/contacts.php:702 ../../include/nav.php:177
+#: ../../view/theme/diabook/theme.php:125
+msgid "Contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:648 ../../mod/newmember.php:22
-#: ../../mod/admin.php:1082 ../../mod/admin.php:1303 ../../mod/settings.php:85
-#: ../../include/nav.php:170
-msgid "Settings"
+#: ../../mod/contacts.php:706
+msgid "Search your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:579
-#: ../../view/theme/diabook/theme.php:625
-#: ../../view/theme/diabook/config.php:159
-msgid "Earth Layers"
+#: ../../mod/contacts.php:707 ../../mod/directory.php:61
+msgid "Finding: "
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
+#: ../../mod/contacts.php:708 ../../mod/directory.php:63
+#: ../../include/contact_widgets.php:34
+msgid "Find"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/config.php:156
-msgid "Set longitude (X) for Earth Layers"
+#: ../../mod/contacts.php:713 ../../mod/settings.php:132
+#: ../../mod/settings.php:640
+msgid "Update"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:586
-#: ../../view/theme/diabook/config.php:157
-msgid "Set latitude (Y) for Earth Layers"
+#: ../../mod/contacts.php:717 ../../mod/group.php:171 ../../mod/admin.php:1007
+#: ../../mod/content.php:438 ../../mod/content.php:741
+#: ../../mod/settings.php:677 ../../mod/photos.php:1654
+#: ../../object/Item.php:130 ../../include/conversation.php:614
+msgid "Delete"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:627
-#: ../../view/theme/diabook/config.php:161
-msgid "Help or @NewHere ?"
+#: ../../mod/hcard.php:10
+msgid "No profile"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:628
-#: ../../view/theme/diabook/config.php:162
-msgid "Connect Services"
+#: ../../mod/manage.php:106
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
+#: ../../mod/manage.php:107
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:154
-msgid "Set color scheme"
+#: ../../mod/manage.php:108
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:67
-msgid "Alignment"
+#: ../../mod/profperm.php:19 ../../mod/group.php:72 ../../index.php:368
+msgid "Permission denied"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:67
-msgid "Left"
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:67
-msgid "Center"
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:68
-#: ../../view/theme/zero-childs/cleanzero/config.php:86
-#: ../../view/theme/clean/config.php:87
-#: ../../view/theme/cleanzero/config.php:86
-msgid "Color scheme"
+#: ../../mod/profperm.php:103 ../../mod/newmember.php:32 ../../boot.php:2119
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:87
+#: ../../include/nav.php:77 ../../view/theme/diabook/theme.php:124
+msgid "Profile"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:69
-msgid "Posts font size"
+#: ../../mod/profperm.php:105 ../../mod/group.php:224
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:70
-msgid "Textareas font size"
+#: ../../mod/profperm.php:114
+msgid "Visible To"
 msgstr ""
 
-#: ../../view/theme/zero-childs/cleanzero/config.php:83
-#: ../../view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../view/theme/zero-childs/cleanzero/config.php:85
-#: ../../view/theme/cleanzero/config.php:85
-msgid "Set theme width"
+#: ../../mod/display.php:82 ../../mod/display.php:284
+#: ../../mod/display.php:503 ../../mod/viewsrc.php:15 ../../mod/admin.php:169
+#: ../../mod/admin.php:1052 ../../mod/admin.php:1265 ../../mod/notice.php:15
+#: ../../include/items.php:4516
+msgid "Item not found."
 msgstr ""
 
-#: ../../view/theme/dispy/config.php:75
-msgid "Set colour scheme"
+#: ../../mod/display.php:212 ../../mod/videos.php:115
+#: ../../mod/viewcontacts.php:19 ../../mod/community.php:18
+#: ../../mod/dfrn_request.php:762 ../../mod/search.php:89
+#: ../../mod/directory.php:33 ../../mod/photos.php:920
+msgid "Public access denied."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:56
-#: ../../view/theme/duepuntozero/config.php:44 ../../include/user.php:247
-#: ../../include/text.php:1702
-msgid "default"
+#: ../../mod/display.php:332 ../../mod/profile.php:155
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:57
-msgid "Midnight"
+#: ../../mod/display.php:496
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:58
-msgid "Bootstrap"
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:59
-msgid "Shades of Pink"
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:60
-msgid "Lime and Orange"
+#: ../../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. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:61
-msgid "GeoCities Retro"
+#: ../../mod/newmember.php:14
+msgid "Getting Started"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:85
-msgid "Background Image"
+#: ../../mod/newmember.php:18
+msgid "Friendica Walk-Through"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:85
+#: ../../mod/newmember.php:18
 msgid ""
-"The URL to a picture (e.g. from your photo album) that should be used as "
-"background image."
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, make some new connections, and find some groups to "
+"join."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:86
-msgid "Background Color"
+#: ../../mod/newmember.php:22 ../../mod/admin.php:1104
+#: ../../mod/admin.php:1325 ../../mod/settings.php:85
+#: ../../include/nav.php:172 ../../view/theme/diabook/theme.php:544
+#: ../../view/theme/diabook/theme.php:648
+msgid "Settings"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:86
-msgid "HEX value for the background color. Don't include the #"
+#: ../../mod/newmember.php:26
+msgid "Go to Your Settings"
 msgstr ""
 
-#: ../../view/theme/clean/config.php:88
-msgid "font size"
+#: ../../mod/newmember.php:26
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../view/theme/clean/config.php:88
-msgid "base font size for your interface"
+#: ../../mod/newmember.php:28
+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 ""
 
-#: ../../view/theme/duepuntozero/config.php:45
-msgid "greenzero"
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244
+#: ../../mod/profiles.php:699
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:46
-msgid "purplezero"
+#: ../../mod/newmember.php:36
+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 ""
 
-#: ../../view/theme/duepuntozero/config.php:47
-msgid "easterbunny"
+#: ../../mod/newmember.php:38
+msgid "Edit Your Profile"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:48
-msgid "darkzero"
+#: ../../mod/newmember.php:38
+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 ""
 
-#: ../../view/theme/duepuntozero/config.php:49
-msgid "comix"
+#: ../../mod/newmember.php:40
+msgid "Profile Keywords"
 msgstr ""
 
-#: ../../view/theme/duepuntozero/config.php:50
-msgid "slackr"
+#: ../../mod/newmember.php:40
+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 ""
 
-#: ../../view/theme/duepuntozero/config.php:62
-msgid "Variations"
+#: ../../mod/newmember.php:44
+msgid "Connecting"
 msgstr ""
 
-#: ../../view/theme/vier/config.php:56
-#: ../../view/theme/vier-mobil/config.php:50
-msgid "Set style"
+#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: ../../boot.php:744
-msgid "Delete this item?"
+#: ../../mod/newmember.php:49
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../boot.php:747
-msgid "show fewer"
+#: ../../mod/newmember.php:51
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
 msgstr ""
 
-#: ../../boot.php:1117
-#, php-format
-msgid "Update %s failed. See error logs."
+#: ../../mod/newmember.php:56
+msgid "Importing Emails"
 msgstr ""
 
-#: ../../boot.php:1235
-msgid "Create a New Account"
+#: ../../mod/newmember.php:56
+msgid ""
+"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"
 msgstr ""
 
-#: ../../boot.php:1236 ../../mod/register.php:269 ../../include/nav.php:109
-msgid "Register"
+#: ../../mod/newmember.php:58
+msgid "Go to Your Contacts Page"
 msgstr ""
 
-#: ../../boot.php:1260 ../../include/nav.php:73
-msgid "Logout"
+#: ../../mod/newmember.php:58
+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>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../boot.php:1261 ../../mod/bookmarklet.php:12 ../../include/nav.php:92
-msgid "Login"
+#: ../../mod/newmember.php:60
+msgid "Go to Your Site's Directory"
 msgstr ""
 
-#: ../../boot.php:1263
-msgid "Nickname or Email address: "
+#: ../../mod/newmember.php:60
+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."
 msgstr ""
 
-#: ../../boot.php:1264
-msgid "Password: "
+#: ../../mod/newmember.php:62
+msgid "Finding New People"
 msgstr ""
 
-#: ../../boot.php:1265
-msgid "Remember me"
+#: ../../mod/newmember.php:62
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
 msgstr ""
 
-#: ../../boot.php:1268
-msgid "Or login using OpenID: "
+#: ../../mod/newmember.php:66 ../../include/group.php:270
+msgid "Groups"
 msgstr ""
 
-#: ../../boot.php:1274
-msgid "Forgot your password?"
+#: ../../mod/newmember.php:70
+msgid "Group Your Contacts"
 msgstr ""
 
-#: ../../boot.php:1275 ../../mod/lostpass.php:109
-msgid "Password Reset"
+#: ../../mod/newmember.php:70
+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."
 msgstr ""
 
-#: ../../boot.php:1277
-msgid "Website Terms of Service"
+#: ../../mod/newmember.php:73
+msgid "Why Aren't My Posts Public?"
 msgstr ""
 
-#: ../../boot.php:1278
-msgid "terms of service"
+#: ../../mod/newmember.php:73
+msgid ""
+"Friendica respects your privacy. By default, your posts will only show up to "
+"people you've added as friends. For more information, see the help section "
+"from the link above."
 msgstr ""
 
-#: ../../boot.php:1280
-msgid "Website Privacy Policy"
+#: ../../mod/newmember.php:78
+msgid "Getting Help"
 msgstr ""
 
-#: ../../boot.php:1281
-msgid "privacy policy"
+#: ../../mod/newmember.php:82
+msgid "Go to the Help Section"
 msgstr ""
 
-#: ../../boot.php:1414
-msgid "Requested account is not available."
+#: ../../mod/newmember.php:82
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: ../../boot.php:1453 ../../mod/profile.php:21
-msgid "Requested profile is not available."
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../boot.php:1496 ../../boot.php:1630
-#: ../../include/profile_advanced.php:84
-msgid "Edit profile"
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../boot.php:1563 ../../mod/suggest.php:90 ../../mod/match.php:58
-#: ../../include/contact_widgets.php:10
-msgid "Connect"
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
+msgid "Login failed."
 msgstr ""
 
-#: ../../boot.php:1595
-msgid "Message"
+#: ../../mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../boot.php:1601 ../../include/nav.php:173
-msgid "Profiles"
+#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:81
+#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:296 ../../mod/profile_photo.php:305
+#: ../../mod/photos.php:155 ../../mod/photos.php:731 ../../mod/photos.php:1187
+#: ../../mod/photos.php:1210 ../../include/user.php:335
+#: ../../include/user.php:342 ../../include/user.php:349
+#: ../../view/theme/diabook/theme.php:500
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../boot.php:1601
-msgid "Manage/edit profiles"
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
+#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../boot.php:1606 ../../boot.php:1632 ../../mod/profiles.php:789
-msgid "Change profile photo"
+#: ../../mod/profile_photo.php:118
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../boot.php:1607 ../../mod/profiles.php:790
-msgid "Create New Profile"
+#: ../../mod/profile_photo.php:128
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../boot.php:1617 ../../mod/profiles.php:801
-msgid "Profile Image"
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:122
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../boot.php:1620 ../../mod/profiles.php:803
-msgid "visible to everybody"
+#: ../../mod/profile_photo.php:153 ../../mod/wall_upload.php:144
+#: ../../mod/photos.php:807
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../boot.php:1621 ../../mod/profiles.php:804
-msgid "Edit visibility"
+#: ../../mod/profile_photo.php:242
+msgid "Upload File:"
 msgstr ""
 
-#: ../../boot.php:1643 ../../mod/directory.php:136 ../../mod/events.php:471
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:170
-msgid "Location:"
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
 msgstr ""
 
-#: ../../boot.php:1645 ../../mod/directory.php:138
-#: ../../include/profile_advanced.php:17
-msgid "Gender:"
+#: ../../mod/profile_photo.php:245
+msgid "Upload"
 msgstr ""
 
-#: ../../boot.php:1648 ../../mod/directory.php:140
-#: ../../include/profile_advanced.php:37
-msgid "Status:"
+#: ../../mod/profile_photo.php:248 ../../mod/settings.php:1062
+msgid "or"
 msgstr ""
 
-#: ../../boot.php:1650 ../../mod/directory.php:142
-#: ../../include/profile_advanced.php:48
-msgid "Homepage:"
+#: ../../mod/profile_photo.php:248
+msgid "skip this step"
 msgstr ""
 
-#: ../../boot.php:1652 ../../mod/directory.php:144
-#: ../../include/profile_advanced.php:58
-msgid "About:"
+#: ../../mod/profile_photo.php:248
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../boot.php:1701
-msgid "Network:"
+#: ../../mod/profile_photo.php:262
+msgid "Crop Image"
 msgstr ""
 
-#: ../../boot.php:1731 ../../boot.php:1817
-msgid "g A l F d"
+#: ../../mod/profile_photo.php:263
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../boot.php:1732 ../../boot.php:1818
-msgid "F d"
+#: ../../mod/profile_photo.php:265
+msgid "Done Editing"
 msgstr ""
 
-#: ../../boot.php:1777 ../../boot.php:1858
-msgid "[today]"
+#: ../../mod/profile_photo.php:299
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../boot.php:1789
-msgid "Birthday Reminders"
+#: ../../mod/profile_photo.php:301 ../../mod/wall_upload.php:172
+#: ../../mod/photos.php:834
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../boot.php:1790
-msgid "Birthdays this week:"
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:149
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../include/text.php:1968 ../../include/diaspora.php:2087
+#: ../../view/theme/diabook/theme.php:471
+msgid "photo"
 msgstr ""
 
-#: ../../boot.php:1851
-msgid "[No description]"
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:149
+#: ../../mod/like.php:319 ../../include/conversation.php:121
+#: ../../include/conversation.php:130 ../../include/conversation.php:249
+#: ../../include/conversation.php:258 ../../include/diaspora.php:2087
+#: ../../view/theme/diabook/theme.php:466
+#: ../../view/theme/diabook/theme.php:475
+msgid "status"
 msgstr ""
 
-#: ../../boot.php:1869
-msgid "Event Reminders"
+#: ../../mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../boot.php:1870
-msgid "Events this week:"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../boot.php:2107 ../../include/nav.php:76
-msgid "Status"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../boot.php:2110
-msgid "Status Messages and Posts"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../boot.php:2117
-msgid "Profile Details"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:139
+msgid "Remove"
 msgstr ""
 
-#: ../../boot.php:2124 ../../mod/photos.php:52
-msgid "Photo Albums"
+#: ../../mod/filer.php:30 ../../include/conversation.php:1006
+#: ../../include/conversation.php:1024
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../boot.php:2128 ../../boot.php:2131 ../../include/nav.php:79
-msgid "Videos"
+#: ../../mod/filer.php:30
+msgid "- select -"
 msgstr ""
 
-#: ../../boot.php:2141
-msgid "Events and Calendar"
+#: ../../mod/filer.php:31 ../../mod/editpost.php:109 ../../mod/notes.php:63
+#: ../../include/text.php:956
+msgid "Save"
 msgstr ""
 
-#: ../../boot.php:2145 ../../mod/notes.php:44
-msgid "Personal Notes"
+#: ../../mod/follow.php:27
+msgid "Contact added"
 msgstr ""
 
-#: ../../boot.php:2148
-msgid "Only You Can See This"
+#: ../../mod/item.php:113
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:227
-#, php-format
-msgid "%1$s is currently %2$s"
+#: ../../mod/item.php:345
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/mood.php:133
-msgid "Mood"
+#: ../../mod/item.php:484 ../../mod/wall_upload.php:169
+#: ../../mod/wall_upload.php:178 ../../mod/wall_upload.php:185
+#: ../../include/Photo.php:916 ../../include/Photo.php:931
+#: ../../include/Photo.php:938 ../../include/Photo.php:960
+#: ../../include/message.php:144
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/mood.php:134
-msgid "Set your current mood and tell your friends"
+#: ../../mod/item.php:938
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/display.php:82 ../../mod/display.php:284
-#: ../../mod/display.php:503 ../../mod/decrypt.php:15 ../../mod/admin.php:169
-#: ../../mod/admin.php:1030 ../../mod/admin.php:1243 ../../mod/notice.php:15
-#: ../../mod/viewsrc.php:15 ../../include/items.php:4500
-msgid "Item not found."
+#: ../../mod/item.php:964
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/display.php:212 ../../mod/_search.php:89
-#: ../../mod/directory.php:33 ../../mod/search.php:89
-#: ../../mod/dfrn_request.php:762 ../../mod/community.php:18
-#: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920
-#: ../../mod/videos.php:115
-msgid "Public access denied."
+#: ../../mod/item.php:966
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/display.php:332 ../../mod/profile.php:155
-msgid "Access to this profile has been restricted."
+#: ../../mod/item.php:967
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/display.php:496
-msgid "Item has been removed."
+#: ../../mod/item.php:971
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/decrypt.php:9 ../../mod/viewsrc.php:7
-msgid "Access denied."
+#: ../../mod/group.php:29
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/bookmarklet.php:41
-msgid "The post was created"
+#: ../../mod/group.php:35
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/friendica.php:62
-msgid "This is Friendica, version"
+#: ../../mod/group.php:47 ../../mod/group.php:140
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/friendica.php:63
-msgid "running at web location"
+#: ../../mod/group.php:60
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/friendica.php:65
-msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
+#: ../../mod/group.php:87
+msgid "Save Group"
 msgstr ""
 
-#: ../../mod/friendica.php:67
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/friendica.php:68
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-
-#: ../../mod/friendica.php:82
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/friendica.php:95
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: ../../mod/register.php:90
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: ../../mod/register.php:96
-#, php-format
-msgid ""
-"Failed to send email message. Here your accout details:<br> login: %s<br> "
-"password: %s<br><br>You can change your password after login."
-msgstr ""
-
-#: ../../mod/register.php:105
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:148
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:186 ../../mod/uimport.php:50
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:214
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-
-#: ../../mod/register.php:215
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: ../../mod/register.php:216
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: ../../mod/register.php:230
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: ../../mod/register.php:233 ../../mod/api.php:105 ../../mod/suggest.php:29
-#: ../../mod/dfrn_request.php:830 ../../mod/contacts.php:337
-#: ../../mod/settings.php:1010 ../../mod/settings.php:1016
-#: ../../mod/settings.php:1024 ../../mod/settings.php:1028
-#: ../../mod/settings.php:1033 ../../mod/settings.php:1039
-#: ../../mod/settings.php:1045 ../../mod/settings.php:1051
-#: ../../mod/settings.php:1081 ../../mod/settings.php:1082
-#: ../../mod/settings.php:1083 ../../mod/settings.php:1084
-#: ../../mod/settings.php:1085 ../../mod/profiles.php:646
-#: ../../mod/profiles.php:649 ../../mod/message.php:209
-#: ../../include/items.php:4541
-msgid "Yes"
-msgstr ""
-
-#: ../../mod/register.php:234 ../../mod/api.php:106
-#: ../../mod/dfrn_request.php:830 ../../mod/settings.php:1010
-#: ../../mod/settings.php:1016 ../../mod/settings.php:1024
-#: ../../mod/settings.php:1028 ../../mod/settings.php:1033
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1045
-#: ../../mod/settings.php:1051 ../../mod/settings.php:1081
-#: ../../mod/settings.php:1082 ../../mod/settings.php:1083
-#: ../../mod/settings.php:1084 ../../mod/settings.php:1085
-#: ../../mod/profiles.php:646 ../../mod/profiles.php:650
-msgid "No"
-msgstr ""
-
-#: ../../mod/register.php:251
-msgid "Membership on this site is by invitation only."
+#: ../../mod/group.php:93
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/register.php:252
-msgid "Your invitation ID: "
+#: ../../mod/group.php:94 ../../mod/group.php:180
+msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/register.php:255 ../../mod/admin.php:603
-msgid "Registration"
+#: ../../mod/group.php:113
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/register.php:263
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/group.php:115
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/register.php:264
-msgid "Your Email Address: "
+#: ../../mod/group.php:179
+msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/register.php:265
-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/group.php:192
+msgid "Members"
 msgstr ""
 
-#: ../../mod/register.php:266
-msgid "Choose a nickname: "
+#: ../../mod/apps.php:7 ../../index.php:212
+msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: ../../mod/register.php:275 ../../mod/uimport.php:64
-msgid "Import"
+#: ../../mod/apps.php:11
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/register.php:276
-msgid "Import your profile to this friendica instance"
+#: ../../mod/apps.php:14
+msgid "No installed applications."
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:64 ../../mod/profiles.php:18
 #: ../../mod/profiles.php:133 ../../mod/profiles.php:179
-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:630
 msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:120 ../../mod/crepair.php:133
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+#: ../../mod/dfrn_confirm.php:120 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/crepair.php:133
 msgid "Contact not found."
 msgstr ""
 
@@ -1181,7 +1076,7 @@ msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:752 ../../mod/dfrn_request.php:717
-#: ../../include/items.php:3992
+#: ../../include/items.php:4008
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1190,22 +1085,54 @@ msgstr ""
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/profile.php:21 ../../boot.php:1458
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/profile.php:180
+msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/videos.php:125
+msgid "No videos selected"
 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/videos.php:226 ../../mod/photos.php:1031
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/videos.php:301 ../../include/text.php:1405
+msgid "View Video"
+msgstr ""
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1808
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr ""
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr ""
+
+#: ../../mod/tagger.php:95 ../../include/conversation.php:266
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr ""
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr ""
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:19
@@ -1262,6 +1189,10 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
+#: ../../mod/lostpass.php:109 ../../boot.php:1280
+msgid "Password Reset"
+msgstr ""
+
 #: ../../mod/lostpass.php:110
 msgid "Your password has been reset as requested."
 msgstr ""
@@ -1334,708 +1265,582 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#: ../../mod/like.php:166 ../../include/conversation.php:137
+#: ../../include/diaspora.php:2103 ../../view/theme/diabook/theme.php:480
 #, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
-msgid "No recipient selected."
+#: ../../mod/like.php:168 ../../include/conversation.php:140
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/wallmessage.php:59
-msgid "Unable to check your home location."
+#: ../../mod/ping.php:240
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
-msgid "Message could not be sent."
+#: ../../mod/ping.php:245
+msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
-msgid "Message collection failure."
+#: ../../mod/ping.php:250
+msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
-msgid "Message sent."
+#: ../../mod/ping.php:256
+#, php-format
+msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
-msgid "No recipient."
+#: ../../mod/ping.php:261
+#, php-format
+msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
-#: ../../mod/message.php:283 ../../mod/message.php:291
-#: ../../mod/message.php:466 ../../mod/message.php:474
-#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
-msgid "Please enter a link URL:"
+#: ../../mod/ping.php:266
+#, php-format
+msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/wallmessage.php:142 ../../mod/message.php:319
-msgid "Send Private Message"
+#: ../../mod/ping.php:271
+#, php-format
+msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/wallmessage.php:143
+#: ../../mod/ping.php:276
+msgid "{0} posted"
+msgstr ""
+
+#: ../../mod/ping.php:281
 #, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
+msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/wallmessage.php:144 ../../mod/message.php:320
-#: ../../mod/message.php:553
-msgid "To:"
+#: ../../mod/ping.php:287
+msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:325
-#: ../../mod/message.php:555
-msgid "Subject:"
+#: ../../mod/viewcontacts.php:41
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/wallmessage.php:151 ../../mod/message.php:329
-#: ../../mod/message.php:558 ../../mod/invite.php:134
-msgid "Your message:"
+#: ../../mod/viewcontacts.php:78 ../../include/text.php:876
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/wallmessage.php:154 ../../mod/editpost.php:110
-#: ../../mod/message.php:332 ../../mod/message.php:562
-#: ../../include/conversation.php:1091
-msgid "Upload photo"
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/wallmessage.php:155 ../../mod/editpost.php:114
-#: ../../mod/message.php:333 ../../mod/message.php:563
-#: ../../include/conversation.php:1095
-msgid "Insert web link"
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendica"
+#: ../../mod/notifications.php:78
+msgid "System"
 msgstr ""
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
+#: ../../mod/notifications.php:83 ../../include/nav.php:145
+msgid "Network"
 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. A link to this page "
-"will be visible from your home page for two weeks after your initial "
-"registration and then will quietly disappear."
+#: ../../mod/notifications.php:88 ../../mod/network.php:371
+msgid "Personal"
 msgstr ""
 
-#: ../../mod/newmember.php:14
-msgid "Getting Started"
+#: ../../mod/notifications.php:93 ../../include/nav.php:105
+#: ../../include/nav.php:148 ../../view/theme/diabook/theme.php:123
+msgid "Home"
 msgstr ""
 
-#: ../../mod/newmember.php:18
-msgid "Friendica Walk-Through"
+#: ../../mod/notifications.php:98 ../../include/nav.php:154
+msgid "Introductions"
 msgstr ""
 
-#: ../../mod/newmember.php:18
-msgid ""
-"On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, make some new connections, and find some groups to "
-"join."
+#: ../../mod/notifications.php:122
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/newmember.php:26
-msgid "Go to Your Settings"
+#: ../../mod/notifications.php:122
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/newmember.php:26
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/newmember.php:28
-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/notifications.php:150
+msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/newmember.php:36 ../../mod/profiles.php:684
-#: ../../mod/profile_photo.php:244
-msgid "Upload Profile Photo"
+#: ../../mod/notifications.php:152
+#, php-format
+msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/newmember.php:36
-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/notifications.php:158 ../../mod/notifications.php:205
+msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/newmember.php:38
-msgid "Edit Your Profile"
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
+msgid "if applicable"
 msgstr ""
 
-#: ../../mod/newmember.php:38
-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."
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:1005
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/newmember.php:40
-msgid "Profile Keywords"
+#: ../../mod/notifications.php:181
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/newmember.php:40
-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/notifications.php:181
+msgid "yes"
 msgstr ""
 
-#: ../../mod/newmember.php:44
-msgid "Connecting"
+#: ../../mod/notifications.php:181
+msgid "no"
 msgstr ""
 
-#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
+#: ../../mod/notifications.php:188
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/newmember.php:49
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
+#: ../../mod/notifications.php:189
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/newmember.php:51
-msgid ""
-"<em>If</em> this is your own personal server, installing the Facebook addon "
-"may ease your transition to the free social web."
+#: ../../mod/notifications.php:190
+msgid "Sharer"
 msgstr ""
 
-#: ../../mod/newmember.php:56
-msgid "Importing Emails"
+#: ../../mod/notifications.php:190
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/newmember.php:56
-msgid ""
-"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"
+#: ../../mod/notifications.php:196
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/newmember.php:58
-msgid "Go to Your Contacts Page"
+#: ../../mod/notifications.php:196
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/newmember.php:58
-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>Add New Contact</em> dialog."
+#: ../../mod/notifications.php:217
+msgid "No introductions."
 msgstr ""
 
-#: ../../mod/newmember.php:60
-msgid "Go to Your Site's Directory"
+#: ../../mod/notifications.php:220 ../../include/nav.php:155
+msgid "Notifications"
 msgstr ""
 
-#: ../../mod/newmember.php:60
-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/notifications.php:258 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:478
+#, php-format
+msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/newmember.php:62
-msgid "Finding New People"
+#: ../../mod/notifications.php:268 ../../mod/notifications.php:397
+#: ../../mod/notifications.php:488
+#, php-format
+msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/newmember.php:62
-msgid ""
-"On the side panel of the Contacts page are several tools to find new "
-"friends. We can match people by interest, look up people by name or "
-"interest, and provide suggestions based on network relationships. On a brand "
-"new site, friend suggestions will usually begin to be populated within 24 "
-"hours."
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:412
+#: ../../mod/notifications.php:503
+#, php-format
+msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/newmember.php:66 ../../include/group.php:270
-msgid "Groups"
+#: ../../mod/notifications.php:290 ../../mod/notifications.php:419
+#, php-format
+msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/newmember.php:70
-msgid "Group Your Contacts"
+#: ../../mod/notifications.php:291 ../../mod/notifications.php:420
+#: ../../mod/notifications.php:513
+#, php-format
+msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/newmember.php:70
-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/notifications.php:306
+msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/newmember.php:73
-msgid "Why Aren't My Posts Public?"
+#: ../../mod/notifications.php:310
+msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/newmember.php:73
-msgid ""
-"Friendica respects your privacy. By default, your posts will only show up to "
-"people you've added as friends. For more information, see the help section "
-"from the link above."
+#: ../../mod/notifications.php:336 ../../mod/notify.php:75
+msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/newmember.php:78
-msgid "Getting Help"
+#: ../../mod/notifications.php:340 ../../mod/notify.php:79
+msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/newmember.php:82
-msgid "Go to the Help Section"
+#: ../../mod/notifications.php:435
+msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/newmember.php:82
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
+#: ../../mod/notifications.php:439
+msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
+#: ../../mod/notifications.php:520
+msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/suggest.php:32 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:844 ../../mod/contacts.php:340
-#: ../../mod/settings.php:615 ../../mod/settings.php:641
-#: ../../mod/message.php:212 ../../mod/photos.php:203 ../../mod/photos.php:292
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../include/conversation.php:1129
-#: ../../include/items.php:4544
-msgid "Cancel"
+#: ../../mod/notifications.php:524
+msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/suggest.php:74
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/babel.php:17
+msgid "Source (bbcode) text:"
 msgstr ""
 
-#: ../../mod/suggest.php:92
-msgid "Ignore/Hide"
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
 msgstr ""
 
-#: ../../mod/network.php:142
-msgid "Search Results For:"
+#: ../../mod/babel.php:31
+msgid "Source input: "
 msgstr ""
 
-#: ../../mod/network.php:185 ../../mod/_search.php:21 ../../mod/search.php:21
-msgid "Remove term"
+#: ../../mod/babel.php:35
+msgid "bb2html (raw HTML): "
 msgstr ""
 
-#: ../../mod/network.php:194 ../../mod/_search.php:30 ../../mod/search.php:30
-#: ../../include/features.php:42
-msgid "Saved Searches"
+#: ../../mod/babel.php:39
+msgid "bb2html: "
 msgstr ""
 
-#: ../../mod/network.php:195 ../../include/group.php:275
-msgid "add"
+#: ../../mod/babel.php:43
+msgid "bb2html2bb: "
 msgstr ""
 
-#: ../../mod/network.php:356
-msgid "Commented Order"
+#: ../../mod/babel.php:47
+msgid "bb2md: "
 msgstr ""
 
-#: ../../mod/network.php:359
-msgid "Sort by Comment Date"
+#: ../../mod/babel.php:51
+msgid "bb2md2html: "
 msgstr ""
 
-#: ../../mod/network.php:362
-msgid "Posted Order"
+#: ../../mod/babel.php:55
+msgid "bb2dia2bb: "
 msgstr ""
 
-#: ../../mod/network.php:365
-msgid "Sort by Post Date"
+#: ../../mod/babel.php:59
+msgid "bb2md2html2bb: "
 msgstr ""
 
-#: ../../mod/network.php:371 ../../mod/notifications.php:88
-msgid "Personal"
+#: ../../mod/babel.php:69
+msgid "Source input (Diaspora format): "
 msgstr ""
 
-#: ../../mod/network.php:374
-msgid "Posts that mention or involve you"
+#: ../../mod/babel.php:74
+msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/network.php:380
-msgid "New"
+#: ../../mod/navigation.php:20 ../../include/nav.php:34
+msgid "Nothing new here"
 msgstr ""
 
-#: ../../mod/network.php:383
-msgid "Activity Stream - by date"
+#: ../../mod/navigation.php:24 ../../include/nav.php:38
+msgid "Clear notifications"
 msgstr ""
 
-#: ../../mod/network.php:389
-msgid "Shared Links"
+#: ../../mod/message.php:9 ../../include/nav.php:164
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/network.php:392
-msgid "Interesting Links"
+#: ../../mod/message.php:63 ../../mod/wallmessage.php:56
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/network.php:398
-msgid "Starred"
+#: ../../mod/message.php:67
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/network.php:401
-msgid "Favourite Posts"
+#: ../../mod/message.php:70 ../../mod/wallmessage.php:62
+msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/network.php:463
-#, 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/network.php:466
-msgid "Private messages to this group are at risk of public disclosure."
+#: ../../mod/message.php:73 ../../mod/wallmessage.php:65
+msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/network.php:520 ../../mod/content.php:119
-msgid "No such group"
+#: ../../mod/message.php:76 ../../mod/wallmessage.php:68
+msgid "Message sent."
 msgstr ""
 
-#: ../../mod/network.php:537 ../../mod/content.php:130
-msgid "Group is empty"
+#: ../../mod/message.php:182 ../../include/nav.php:161
+msgid "Messages"
 msgstr ""
 
-#: ../../mod/network.php:544 ../../mod/content.php:134
-msgid "Group: "
+#: ../../mod/message.php:207
+msgid "Do you really want to delete this message?"
 msgstr ""
 
-#: ../../mod/network.php:554
-msgid "Contact: "
+#: ../../mod/message.php:227
+msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/network.php:556
-msgid "Private messages to this person are at risk of public disclosure."
+#: ../../mod/message.php:258
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/network.php:561
-msgid "Invalid contact."
+#: ../../mod/message.php:283 ../../mod/message.php:291
+#: ../../mod/message.php:466 ../../mod/message.php:474
+#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/install.php:117
-msgid "Friendica Communications Server - Setup"
+#: ../../mod/message.php:319 ../../mod/wallmessage.php:142
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/install.php:123
-msgid "Could not connect to database."
+#: ../../mod/message.php:320 ../../mod/message.php:553
+#: ../../mod/wallmessage.php:144
+msgid "To:"
 msgstr ""
 
-#: ../../mod/install.php:127
-msgid "Could not create table."
+#: ../../mod/message.php:325 ../../mod/message.php:555
+#: ../../mod/wallmessage.php:145
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "Your Friendica site database has been installed."
+#: ../../mod/message.php:329 ../../mod/message.php:558
+#: ../../mod/wallmessage.php:151 ../../mod/invite.php:134
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/install.php:138
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/message.php:332 ../../mod/message.php:562
+#: ../../mod/wallmessage.php:154 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1091
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/install.php:139 ../../mod/install.php:206
-#: ../../mod/install.php:525
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/message.php:333 ../../mod/message.php:563
+#: ../../mod/wallmessage.php:155 ../../mod/editpost.php:114
+#: ../../include/conversation.php:1095
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/install.php:203
-msgid "System check"
+#: ../../mod/message.php:334 ../../mod/message.php:565
+#: ../../mod/content.php:499 ../../mod/content.php:883
+#: ../../mod/wallmessage.php:156 ../../mod/editpost.php:124
+#: ../../mod/photos.php:1545 ../../object/Item.php:364
+#: ../../include/conversation.php:692 ../../include/conversation.php:1109
+msgid "Please wait"
 msgstr ""
 
-#: ../../mod/install.php:207 ../../mod/events.php:373
-msgid "Next"
+#: ../../mod/message.php:371
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/install.php:208
-msgid "Check again"
+#: ../../mod/message.php:378
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/install.php:227
-msgid "Database connection"
+#: ../../mod/message.php:381
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: ../../mod/install.php:228
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
+#: ../../mod/message.php:384
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: ../../mod/install.php:229
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/message.php:405 ../../mod/message.php:546
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/install.php:230
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/message.php:408
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/install.php:234
-msgid "Database Server Name"
-msgstr ""
+#: ../../mod/message.php:411
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/install.php:235
-msgid "Database Login Name"
+#: ../../mod/message.php:450
+msgid "Message not available."
 msgstr ""
 
-#: ../../mod/install.php:236
-msgid "Database Login Password"
+#: ../../mod/message.php:520
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/install.php:237
-msgid "Database Name"
+#: ../../mod/message.php:548
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/install.php:238 ../../mod/install.php:277
-msgid "Site administrator email address"
+#: ../../mod/message.php:552
+msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/install.php:238 ../../mod/install.php:277
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../mod/update_display.php:22 ../../mod/update_community.php:18
+#: ../../mod/update_notes.php:37 ../../mod/update_profile.php:41
+#: ../../mod/update_network.php:25
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/install.php:242 ../../mod/install.php:280
-msgid "Please select a default timezone for your website"
+#: ../../mod/crepair.php:106
+msgid "Contact settings applied."
 msgstr ""
 
-#: ../../mod/install.php:267
-msgid "Site settings"
+#: ../../mod/crepair.php:108
+msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/install.php:321
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/crepair.php:139
+msgid "Repair Contact Settings"
 msgstr ""
 
-#: ../../mod/install.php:322
+#: ../../mod/crepair.php:141
 msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See <a href='http://"
-"friendica.com/node/27'>'Activating scheduled tasks'</a>"
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: ../../mod/install.php:326
-msgid "PHP executable path"
+#: ../../mod/crepair.php:142
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: ../../mod/install.php:326
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../mod/crepair.php:148
+msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/install.php:331
-msgid "Command line PHP"
+#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
+msgid "No mirroring"
 msgstr ""
 
-#: ../../mod/install.php:340
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+#: ../../mod/crepair.php:159
+msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: ../../mod/install.php:341
-msgid "Found PHP version: "
+#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
+msgid "Mirror as my own posting"
 msgstr ""
 
-#: ../../mod/install.php:343
-msgid "PHP cli binary"
+#: ../../mod/crepair.php:165 ../../mod/admin.php:1003 ../../mod/admin.php:1015
+#: ../../mod/admin.php:1016 ../../mod/admin.php:1029
+#: ../../mod/settings.php:616 ../../mod/settings.php:642
+msgid "Name"
 msgstr ""
 
-#: ../../mod/install.php:354
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/crepair.php:166
+msgid "Account Nickname"
 msgstr ""
 
-#: ../../mod/install.php:355
-msgid "This is required for message delivery to work."
+#: ../../mod/crepair.php:167
+msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/install.php:357
-msgid "PHP register_argc_argv"
+#: ../../mod/crepair.php:168
+msgid "Account URL"
 msgstr ""
 
-#: ../../mod/install.php:378
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/crepair.php:169
+msgid "Friend Request URL"
 msgstr ""
 
-#: ../../mod/install.php:379
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/crepair.php:170
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../mod/install.php:381
-msgid "Generate encryption keys"
+#: ../../mod/crepair.php:171
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../mod/install.php:388
-msgid "libCurl PHP module"
+#: ../../mod/crepair.php:172
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../mod/install.php:389
-msgid "GD graphics PHP module"
+#: ../../mod/crepair.php:173
+msgid "New photo from this URL"
 msgstr ""
 
-#: ../../mod/install.php:390
-msgid "OpenSSL PHP module"
+#: ../../mod/crepair.php:174
+msgid "Remote Self"
 msgstr ""
 
-#: ../../mod/install.php:391
-msgid "mysqli PHP module"
+#: ../../mod/crepair.php:176
+msgid "Mirror postings from this contact"
 msgstr ""
 
-#: ../../mod/install.php:392
-msgid "mb_string PHP module"
+#: ../../mod/crepair.php:176
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
 msgstr ""
 
-#: ../../mod/install.php:397 ../../mod/install.php:399
-msgid "Apache mod_rewrite module"
+#: ../../mod/bookmarklet.php:12 ../../boot.php:1266 ../../include/nav.php:92
+msgid "Login"
 msgstr ""
 
-#: ../../mod/install.php:397
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/bookmarklet.php:41
+msgid "The post was created"
 msgstr ""
 
-#: ../../mod/install.php:405
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
 msgstr ""
 
-#: ../../mod/install.php:409
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/dirfind.php:26
+msgid "People Search"
 msgstr ""
 
-#: ../../mod/install.php:413
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/install.php:417
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/fbrowser.php:25 ../../boot.php:2126 ../../include/nav.php:78
+#: ../../view/theme/diabook/theme.php:126
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/install.php:421
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/fbrowser.php:113
+msgid "Files"
 msgstr ""
 
-#: ../../mod/install.php:438
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../mod/install.php:439
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../mod/install.php:440
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Friendica top folder."
-msgstr ""
-
-#: ../../mod/install.php:441
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../mod/install.php:444
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../mod/install.php:454
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../mod/install.php:455
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/smarty3/ under the Friendica top level "
-"folder."
-msgstr ""
-
-#: ../../mod/install.php:456
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../mod/install.php:457
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../mod/install.php:460
-msgid "view/smarty3 is writable"
-msgstr ""
-
-#: ../../mod/install.php:472
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr ""
-
-#: ../../mod/install.php:474
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../mod/install.php:484
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../mod/install.php:523
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../mod/install.php:524
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/nogroup.php:59
+msgid "Contacts who are not members of a group"
 msgstr ""
 
 #: ../../mod/admin.php:57
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:104 ../../mod/admin.php:601
+#: ../../mod/admin.php:104 ../../mod/admin.php:619
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:105 ../../mod/admin.php:976 ../../mod/admin.php:991
+#: ../../mod/admin.php:105 ../../mod/admin.php:998 ../../mod/admin.php:1013
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:1080 ../../mod/admin.php:1133
+#: ../../mod/admin.php:106 ../../mod/admin.php:1102 ../../mod/admin.php:1155
 #: ../../mod/settings.php:57
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:1301 ../../mod/admin.php:1335
+#: ../../mod/admin.php:107 ../../mod/admin.php:1323 ../../mod/admin.php:1357
 msgid "Themes"
 msgstr ""
 
@@ -2043,7 +1848,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:123 ../../mod/admin.php:132 ../../mod/admin.php:1422
+#: ../../mod/admin.php:123 ../../mod/admin.php:132 ../../mod/admin.php:1444
 msgid "Logs"
 msgstr ""
 
@@ -2055,7 +1860,7 @@ msgstr ""
 msgid "check webfinger"
 msgstr ""
 
-#: ../../mod/admin.php:130 ../../include/nav.php:182
+#: ../../mod/admin.php:130 ../../include/nav.php:184
 msgid "Admin"
 msgstr ""
 
@@ -2071,19 +1876,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:930
+#: ../../mod/admin.php:193 ../../mod/admin.php:952
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:931
+#: ../../mod/admin.php:194 ../../mod/admin.php:953
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:195 ../../mod/admin.php:932
+#: ../../mod/admin.php:195 ../../mod/admin.php:954
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:196 ../../mod/admin.php:933
+#: ../../mod/admin.php:196 ../../mod/admin.php:955
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -2099,9 +1904,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:222 ../../mod/admin.php:600 ../../mod/admin.php:975
-#: ../../mod/admin.php:1079 ../../mod/admin.php:1132 ../../mod/admin.php:1300
-#: ../../mod/admin.php:1334 ../../mod/admin.php:1421
+#: ../../mod/admin.php:222 ../../mod/admin.php:618 ../../mod/admin.php:997
+#: ../../mod/admin.php:1101 ../../mod/admin.php:1154 ../../mod/admin.php:1322
+#: ../../mod/admin.php:1356 ../../mod/admin.php:1443
 msgid "Administration"
 msgstr ""
 
@@ -2129,635 +1934,680 @@ msgstr ""
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:516
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:534 ../../mod/settings.php:828
+#: ../../mod/admin.php:545 ../../mod/settings.php:828
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../mod/contacts.php:419
-msgid "Never"
+#: ../../mod/admin.php:562
+msgid "No community page"
+msgstr ""
+
+#: ../../mod/admin.php:563
+msgid "Public postings from users of this site"
+msgstr ""
+
+#: ../../mod/admin.php:564
+msgid "Global community page"
 msgstr ""
 
-#: ../../mod/admin.php:552
+#: ../../mod/admin.php:570
 msgid "At post arrival"
 msgstr ""
 
-#: ../../mod/admin.php:553 ../../include/contact_selectors.php:56
+#: ../../mod/admin.php:571 ../../include/contact_selectors.php:56
 msgid "Frequently"
 msgstr ""
 
-#: ../../mod/admin.php:554 ../../include/contact_selectors.php:57
+#: ../../mod/admin.php:572 ../../include/contact_selectors.php:57
 msgid "Hourly"
 msgstr ""
 
-#: ../../mod/admin.php:555 ../../include/contact_selectors.php:58
+#: ../../mod/admin.php:573 ../../include/contact_selectors.php:58
 msgid "Twice daily"
 msgstr ""
 
-#: ../../mod/admin.php:556 ../../include/contact_selectors.php:59
+#: ../../mod/admin.php:574 ../../include/contact_selectors.php:59
 msgid "Daily"
 msgstr ""
 
-#: ../../mod/admin.php:561
+#: ../../mod/admin.php:579
 msgid "Multi user instance"
 msgstr ""
 
-#: ../../mod/admin.php:584
+#: ../../mod/admin.php:602
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:585
+#: ../../mod/admin.php:603
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:604
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:608
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:591
+#: ../../mod/admin.php:609
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:610
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:602 ../../mod/admin.php:1134 ../../mod/admin.php:1336
-#: ../../mod/admin.php:1423 ../../mod/settings.php:614
+#: ../../mod/admin.php:620 ../../mod/admin.php:1156 ../../mod/admin.php:1358
+#: ../../mod/admin.php:1445 ../../mod/settings.php:614
 #: ../../mod/settings.php:724 ../../mod/settings.php:798
 #: ../../mod/settings.php:880 ../../mod/settings.php:1113
 msgid "Save Settings"
 msgstr ""
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:621 ../../mod/register.php:255
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/admin.php:622
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:605
+#: ../../mod/admin.php:623
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:606
+#: ../../mod/admin.php:624
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:607
+#: ../../mod/admin.php:625
 msgid "Performance"
 msgstr ""
 
-#: ../../mod/admin.php:608
+#: ../../mod/admin.php:626
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: ../../mod/admin.php:611
+#: ../../mod/admin.php:629
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:612
+#: ../../mod/admin.php:630
 msgid "Host name"
 msgstr ""
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:631
 msgid "Sender Email"
 msgstr ""
 
-#: ../../mod/admin.php:614
+#: ../../mod/admin.php:632
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:633
+msgid "Shortcut icon"
+msgstr ""
+
+#: ../../mod/admin.php:634
+msgid "Touch icon"
+msgstr ""
+
+#: ../../mod/admin.php:635
 msgid "Additional Info"
 msgstr ""
 
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:635
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at dir.friendica.com/siteinfo."
 msgstr ""
 
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:636
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:617
+#: ../../mod/admin.php:637
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:617
+#: ../../mod/admin.php:637
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:618
+#: ../../mod/admin.php:638
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:618
+#: ../../mod/admin.php:638
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:639
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:639
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:620
+#: ../../mod/admin.php:640
 msgid "Force SSL"
 msgstr ""
 
-#: ../../mod/admin.php:620
+#: ../../mod/admin.php:640
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
 "to endless loops."
 msgstr ""
 
-#: ../../mod/admin.php:621
+#: ../../mod/admin.php:641
 msgid "Old style 'Share'"
 msgstr ""
 
-#: ../../mod/admin.php:621
+#: ../../mod/admin.php:641
 msgid "Deactivates the bbcode element 'share' for repeating items."
 msgstr ""
 
-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:642
 msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:642
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr ""
 
-#: ../../mod/admin.php:623
+#: ../../mod/admin.php:643
 msgid "Single user instance"
 msgstr ""
 
-#: ../../mod/admin.php:623
+#: ../../mod/admin.php:643
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:644
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:644
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:645
 msgid "Maximum image length"
 msgstr ""
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:645
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:646
 msgid "JPEG image quality"
 msgstr ""
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:646
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:648
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:649
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:649
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user "
 "registrations to accept per day.  If register is set to closed, this setting "
 "has no effect."
 msgstr ""
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:650
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:650
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:651
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:651
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:652
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:652
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:653
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:653
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:654
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:654
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:655
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:655
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:656
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:656
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:657
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:657
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:658
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:658
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:639
+#: ../../mod/admin.php:659
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: ../../mod/admin.php:639
+#: ../../mod/admin.php:659
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr ""
 
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:660
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:660
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:661
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:661
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a while."
 msgstr ""
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:662
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:662
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr ""
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:663
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:663
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:664
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:664
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:665
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:665
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:666
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:666
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:647
-msgid "Show Community Page"
+#: ../../mod/admin.php:667
+msgid "Community Page Style"
+msgstr ""
+
+#: ../../mod/admin.php:667
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr ""
+
+#: ../../mod/admin.php:668
+msgid "Posts per user on community page"
 msgstr ""
 
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:668
 msgid ""
-"Display a Community page showing all recent public postings on this site."
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
 msgstr ""
 
-#: ../../mod/admin.php:648
+#: ../../mod/admin.php:669
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:648
+#: ../../mod/admin.php:669
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:670
 msgid "OStatus conversation completion interval"
 msgstr ""
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:670
 msgid ""
 "How often shall the poller check for new entries in OStatus conversations? "
 "This can be a very ressource task."
 msgstr ""
 
-#: ../../mod/admin.php:650
+#: ../../mod/admin.php:671
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:650
+#: ../../mod/admin.php:671
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:651
+#: ../../mod/admin.php:672
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:651
+#: ../../mod/admin.php:672
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:674
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:675
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:676
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:676
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:677
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:677
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:657
+#: ../../mod/admin.php:678
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:657
+#: ../../mod/admin.php:678
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:679
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:679
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:681
 msgid "Use MySQL full text engine"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:681
 msgid ""
 "Activates the full text engine. Speeds up search - but can only search for "
 "four and more characters."
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:682
 msgid "Suppress Language"
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:682
 msgid "Suppress language information in meta information about a posting."
 msgstr ""
 
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:683
+msgid "Suppress Tags"
+msgstr ""
+
+#: ../../mod/admin.php:683
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr ""
+
+#: ../../mod/admin.php:684
 msgid "Path to item cache"
 msgstr ""
 
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:685
 msgid "Cache duration in seconds"
 msgstr ""
 
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:685
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One "
 "day). To disable the item cache, set the value to -1."
 msgstr ""
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:686
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:686
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:687
 msgid "Path for lock file"
 msgstr ""
 
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:688
 msgid "Temp path"
 msgstr ""
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:689
 msgid "Base path to installation"
 msgstr ""
 
-#: ../../mod/admin.php:668
+#: ../../mod/admin.php:690
 msgid "Disable picture proxy"
 msgstr ""
 
-#: ../../mod/admin.php:668
+#: ../../mod/admin.php:690
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on "
 "systems with very low bandwith."
 msgstr ""
 
-#: ../../mod/admin.php:670
-msgid "New base url"
+#: ../../mod/admin.php:691
+msgid "Enable old style pager"
 msgstr ""
 
-#: ../../mod/admin.php:672
-msgid "Disable noscrape"
+#: ../../mod/admin.php:691
+msgid ""
+"The old style pager has page numbers but slows down massively the page speed."
 msgstr ""
 
-#: ../../mod/admin.php:672
-msgid ""
-"The noscrape feature speeds up directory submissions by using JSON data "
-"instead of HTML scraping. Disabling it will cause higher load on your server "
-"and the directory server."
+#: ../../mod/admin.php:692
+msgid "Only search in tags"
 msgstr ""
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:692
+msgid "On large systems the text search can slow down the system extremely."
+msgstr ""
+
+#: ../../mod/admin.php:694
+msgid "New base url"
+msgstr ""
+
+#: ../../mod/admin.php:711
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:719
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:722
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: ../../mod/admin.php:712
+#: ../../mod/admin.php:734
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: ../../mod/admin.php:715
+#: ../../mod/admin.php:737
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:719
+#: ../../mod/admin.php:741
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:721
+#: ../../mod/admin.php:743
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:762
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:741
+#: ../../mod/admin.php:763
 msgid "Check database structure"
 msgstr ""
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:768
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:747
+#: ../../mod/admin.php:769
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:770
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:749
+#: ../../mod/admin.php:771
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:781
+#: ../../mod/admin.php:803
 #, php-format
 msgid ""
 "\n"
@@ -2765,7 +2615,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: ../../mod/admin.php:784
+#: ../../mod/admin.php:806
 #, php-format
 msgid ""
 "\n"
@@ -2801,1071 +2651,981 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: ../../mod/admin.php:816 ../../include/user.php:413
+#: ../../mod/admin.php:838 ../../include/user.php:413
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/admin.php:828
+#: ../../mod/admin.php:850
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:835
+#: ../../mod/admin.php:857
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:896
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:882
+#: ../../mod/admin.php:904
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:882
+#: ../../mod/admin.php:904
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:999
 msgid "Add User"
 msgstr ""
 
-#: ../../mod/admin.php:978
+#: ../../mod/admin.php:1000
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:979
+#: ../../mod/admin.php:1001
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:1002
 msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: ../../mod/admin.php:981
+#: ../../mod/admin.php:1003
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:981 ../../mod/admin.php:993 ../../mod/admin.php:994
-#: ../../mod/admin.php:1007 ../../mod/crepair.php:165
-#: ../../mod/settings.php:616 ../../mod/settings.php:642
-msgid "Name"
-msgstr ""
-
-#: ../../mod/admin.php:981 ../../mod/admin.php:993 ../../mod/admin.php:994
-#: ../../mod/admin.php:1009 ../../include/contact_selectors.php:79
+#: ../../mod/admin.php:1003 ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: ../../mod/admin.php:1031 ../../include/contact_selectors.php:79
 #: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:982
+#: ../../mod/admin.php:1004
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:983 ../../mod/notifications.php:161
-#: ../../mod/notifications.php:208
-msgid "Approve"
-msgstr ""
-
-#: ../../mod/admin.php:984
+#: ../../mod/admin.php:1006
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:986 ../../mod/contacts.php:442
-#: ../../mod/contacts.php:501 ../../mod/contacts.php:714
-msgid "Block"
-msgstr ""
-
-#: ../../mod/admin.php:987 ../../mod/contacts.php:442
-#: ../../mod/contacts.php:501 ../../mod/contacts.php:714
-msgid "Unblock"
-msgstr ""
-
-#: ../../mod/admin.php:988
+#: ../../mod/admin.php:1010
 msgid "Site admin"
 msgstr ""
 
-#: ../../mod/admin.php:989
+#: ../../mod/admin.php:1011
 msgid "Account expired"
 msgstr ""
 
-#: ../../mod/admin.php:992
+#: ../../mod/admin.php:1014
 msgid "New User"
 msgstr ""
 
-#: ../../mod/admin.php:993 ../../mod/admin.php:994
+#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:993 ../../mod/admin.php:994
+#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:993 ../../mod/admin.php:994
+#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:993
+#: ../../mod/admin.php:1015
 msgid "Deleted since"
 msgstr ""
 
-#: ../../mod/admin.php:994 ../../mod/settings.php:36
+#: ../../mod/admin.php:1016 ../../mod/settings.php:36
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:1018
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:997
+#: ../../mod/admin.php:1019
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:1007
+#: ../../mod/admin.php:1029
 msgid "Name of the new user."
 msgstr ""
 
-#: ../../mod/admin.php:1008
+#: ../../mod/admin.php:1030
 msgid "Nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1008
+#: ../../mod/admin.php:1030
 msgid "Nickname of the new user."
 msgstr ""
 
-#: ../../mod/admin.php:1009
+#: ../../mod/admin.php:1031
 msgid "Email address of the new user."
 msgstr ""
 
-#: ../../mod/admin.php:1042
+#: ../../mod/admin.php:1064
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:1046
+#: ../../mod/admin.php:1068
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:1056 ../../mod/admin.php:1272
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1294
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:1058 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1080 ../../mod/admin.php:1296
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:1081 ../../mod/admin.php:1302
+#: ../../mod/admin.php:1103 ../../mod/admin.php:1324
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:1089 ../../mod/admin.php:1312
+#: ../../mod/admin.php:1111 ../../mod/admin.php:1334
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:1090 ../../mod/admin.php:1313
+#: ../../mod/admin.php:1112 ../../mod/admin.php:1335
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1232
+#: ../../mod/admin.php:1254
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1294
+#: ../../mod/admin.php:1316
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1340
+#: ../../mod/admin.php:1362
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1341
+#: ../../mod/admin.php:1363
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1368
+#: ../../mod/admin.php:1390
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1424
+#: ../../mod/admin.php:1446
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1430
+#: ../../mod/admin.php:1452
 msgid "Enable Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1453
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1453
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1432
+#: ../../mod/admin.php:1454
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1481 ../../mod/contacts.php:498
-msgid "Update now"
-msgstr ""
-
-#: ../../mod/admin.php:1482
+#: ../../mod/admin.php:1504
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1488
+#: ../../mod/admin.php:1510
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1489
+#: ../../mod/admin.php:1511
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1490
+#: ../../mod/admin.php:1512
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1491
+#: ../../mod/admin.php:1513
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/_search.php:99 ../../mod/search.php:99 ../../include/text.php:953
-#: ../../include/text.php:954 ../../include/nav.php:119
-msgid "Search"
+#: ../../mod/network.php:142
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/_search.php:180 ../../mod/_search.php:206
-#: ../../mod/search.php:170 ../../mod/search.php:196
-#: ../../mod/community.php:62 ../../mod/community.php:71
-msgid "No results."
+#: ../../mod/network.php:185 ../../mod/search.php:21
+msgid "Remove term"
 msgstr ""
 
-#: ../../mod/profile.php:180
-msgid "Tips for New Members"
+#: ../../mod/network.php:194 ../../mod/search.php:30
+#: ../../include/features.php:42
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/share.php:44
-msgid "link"
+#: ../../mod/network.php:195 ../../include/group.php:275
+msgid "add"
 msgstr ""
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:266
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/network.php:356
+msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../mod/network.php:359
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/editpost.php:39
-msgid "Edit post"
+#: ../../mod/network.php:362
+msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../mod/notes.php:63 ../../mod/filer.php:31
-#: ../../include/text.php:956
-msgid "Save"
+#: ../../mod/network.php:365
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1092
-msgid "upload photo"
+#: ../../mod/network.php:374
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1093
-msgid "Attach file"
+#: ../../mod/network.php:380
+msgid "New"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1094
-msgid "attach file"
+#: ../../mod/network.php:383
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1096
-msgid "web link"
+#: ../../mod/network.php:389
+msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1097
-msgid "Insert video link"
+#: ../../mod/network.php:392
+msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1098
-msgid "video link"
+#: ../../mod/network.php:398
+msgid "Starred"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1099
-msgid "Insert audio link"
+#: ../../mod/network.php:401
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1100
-msgid "audio link"
-msgstr ""
+#: ../../mod/network.php:463
+#, 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/editpost.php:120 ../../include/conversation.php:1101
-msgid "Set your location"
+#: ../../mod/network.php:466
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1102
-msgid "set location"
+#: ../../mod/network.php:520 ../../mod/content.php:119
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1103
-msgid "Clear browser location"
+#: ../../mod/network.php:537 ../../mod/content.php:130
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/editpost.php:123 ../../include/conversation.php:1104
-msgid "clear location"
+#: ../../mod/network.php:544 ../../mod/content.php:134
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1110
-msgid "Permission settings"
+#: ../../mod/network.php:554
+msgid "Contact: "
 msgstr ""
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:1119
-msgid "CC: email addresses"
+#: ../../mod/network.php:556
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1120
-msgid "Public post"
+#: ../../mod/network.php:561
+msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1106
-msgid "Set title"
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
 msgstr ""
 
-#: ../../mod/editpost.php:139 ../../include/conversation.php:1108
-msgid "Categories (comma-separated list)"
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/editpost.php:140 ../../include/conversation.php:1122
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/attach.php:8
-msgid "Item not available."
+#: ../../mod/events.php:291
+msgid "l, F j"
 msgstr ""
 
-#: ../../mod/attach.php:20
-msgid "Item was not found."
+#: ../../mod/events.php:313
+msgid "Edit event"
 msgstr ""
 
-#: ../../mod/regmod.php:55
-msgid "Account approved."
+#: ../../mod/events.php:335 ../../include/text.php:1647
+#: ../../include/text.php:1657
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/regmod.php:92
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/events.php:370 ../../boot.php:2143 ../../include/nav.php:80
+#: ../../view/theme/diabook/theme.php:127
+msgid "Events"
 msgstr ""
 
-#: ../../mod/regmod.php:104
-msgid "Please login."
+#: ../../mod/events.php:371
+msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/directory.php:59
-msgid "Find on this site"
+#: ../../mod/events.php:372
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/directory.php:61 ../../mod/contacts.php:707
-msgid "Finding: "
+#: ../../mod/events.php:373 ../../mod/install.php:207
+msgid "Next"
 msgstr ""
 
-#: ../../mod/directory.php:62
-msgid "Site Directory"
+#: ../../mod/events.php:446
+msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/directory.php:63 ../../mod/contacts.php:708
-#: ../../include/contact_widgets.php:34
-msgid "Find"
+#: ../../mod/events.php:456
+msgid "Event details"
 msgstr ""
 
-#: ../../mod/directory.php:113 ../../mod/profiles.php:735
-msgid "Age: "
+#: ../../mod/events.php:457
+#, php-format
+msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/directory.php:116
-msgid "Gender: "
+#: ../../mod/events.php:459
+msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/directory.php:189
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/events.php:459 ../../mod/events.php:473
+msgid "Required"
 msgstr ""
 
-#: ../../mod/crepair.php:106
-msgid "Contact settings applied."
+#: ../../mod/events.php:462
+msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/crepair.php:108
-msgid "Contact update failed."
+#: ../../mod/events.php:464
+msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/crepair.php:139
-msgid "Repair Contact Settings"
+#: ../../mod/events.php:467
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/crepair.php:141
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
+#: ../../mod/events.php:469
+msgid "Description:"
 msgstr ""
 
-#: ../../mod/crepair.php:142
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
+#: ../../mod/events.php:471 ../../mod/directory.php:136 ../../boot.php:1648
+#: ../../include/bb2diaspora.php:170 ../../include/event.php:40
+msgid "Location:"
 msgstr ""
 
-#: ../../mod/crepair.php:148
-msgid "Return to contact editor"
+#: ../../mod/events.php:473
+msgid "Title:"
 msgstr ""
 
-#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
-msgid "No mirroring"
+#: ../../mod/events.php:475
+msgid "Share this event"
 msgstr ""
 
-#: ../../mod/crepair.php:159
-msgid "Mirror as forwarded posting"
+#: ../../mod/content.php:437 ../../mod/content.php:740
+#: ../../mod/photos.php:1653 ../../object/Item.php:129
+#: ../../include/conversation.php:613
+msgid "Select"
 msgstr ""
 
-#: ../../mod/crepair.php:159 ../../mod/crepair.php:161
-msgid "Mirror as my own posting"
+#: ../../mod/content.php:471 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../object/Item.php:326
+#: ../../object/Item.php:327 ../../include/conversation.php:654
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../mod/crepair.php:166
-msgid "Account Nickname"
+#: ../../mod/content.php:481 ../../mod/content.php:864
+#: ../../object/Item.php:340 ../../include/conversation.php:674
+#, php-format
+msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/crepair.php:167
-msgid "@Tagname - overrides Name/Nickname"
+#: ../../mod/content.php:497 ../../include/conversation.php:690
+msgid "View in context"
 msgstr ""
 
-#: ../../mod/crepair.php:168
-msgid "Account URL"
-msgstr ""
+#: ../../mod/content.php:603 ../../object/Item.php:387
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/crepair.php:169
-msgid "Friend Request URL"
-msgstr ""
+#: ../../mod/content.php:605 ../../object/Item.php:389
+#: ../../object/Item.php:402 ../../include/text.php:1972
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/crepair.php:170
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: ../../mod/crepair.php:171
-msgid "Notification Endpoint URL"
+#: ../../mod/content.php:606 ../../boot.php:751 ../../object/Item.php:390
+#: ../../include/contact_widgets.php:205
+msgid "show more"
 msgstr ""
 
-#: ../../mod/crepair.php:172
-msgid "Poll/Feed URL"
+#: ../../mod/content.php:620 ../../mod/photos.php:1359
+#: ../../object/Item.php:116
+msgid "Private Message"
 msgstr ""
 
-#: ../../mod/crepair.php:173
-msgid "New photo from this URL"
+#: ../../mod/content.php:684 ../../mod/photos.php:1542
+#: ../../object/Item.php:231
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/crepair.php:174
-msgid "Remote Self"
+#: ../../mod/content.php:684 ../../object/Item.php:231
+msgid "like"
 msgstr ""
 
-#: ../../mod/crepair.php:176
-msgid "Mirror postings from this contact"
+#: ../../mod/content.php:685 ../../mod/photos.php:1543
+#: ../../object/Item.php:232
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/crepair.php:176
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
+#: ../../mod/content.php:685 ../../object/Item.php:232
+msgid "dislike"
 msgstr ""
 
-#: ../../mod/uimport.php:66
-msgid "Move account"
+#: ../../mod/content.php:687 ../../object/Item.php:234
+msgid "Share this"
 msgstr ""
 
-#: ../../mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
+#: ../../mod/content.php:687 ../../object/Item.php:234
+msgid "share"
 msgstr ""
 
-#: ../../mod/uimport.php:68
-msgid ""
-"You need to export your account from the old server and upload it here. We "
-"will recreate your old account here with all your contacts. We will try also "
-"to inform your friends that you moved here."
+#: ../../mod/content.php:707 ../../mod/photos.php:1562
+#: ../../mod/photos.php:1606 ../../mod/photos.php:1694
+#: ../../object/Item.php:675
+msgid "This is you"
 msgstr ""
 
-#: ../../mod/uimport.php:69
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (statusnet/identi.ca) or from Diaspora"
+#: ../../mod/content.php:709 ../../mod/photos.php:1564
+#: ../../mod/photos.php:1608 ../../mod/photos.php:1696 ../../boot.php:750
+#: ../../object/Item.php:361 ../../object/Item.php:677
+msgid "Comment"
 msgstr ""
 
-#: ../../mod/uimport.php:70
-msgid "Account file"
+#: ../../mod/content.php:711 ../../object/Item.php:679
+msgid "Bold"
 msgstr ""
 
-#: ../../mod/uimport.php:70
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
+#: ../../mod/content.php:712 ../../object/Item.php:680
+msgid "Italic"
 msgstr ""
 
-#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/content.php:713 ../../object/Item.php:681
+msgid "Underline"
 msgstr ""
 
-#: ../../mod/lockview.php:48
-msgid "Visible to:"
+#: ../../mod/content.php:714 ../../object/Item.php:682
+msgid "Quote"
 msgstr ""
 
-#: ../../mod/help.php:79
-msgid "Help:"
+#: ../../mod/content.php:715 ../../object/Item.php:683
+msgid "Code"
 msgstr ""
 
-#: ../../mod/help.php:84 ../../include/nav.php:114
-msgid "Help"
+#: ../../mod/content.php:716 ../../object/Item.php:684
+msgid "Image"
 msgstr ""
 
-#: ../../mod/hcard.php:10
-msgid "No profile"
+#: ../../mod/content.php:717 ../../object/Item.php:685
+msgid "Link"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:95
-msgid "This introduction has already been accepted."
+#: ../../mod/content.php:718 ../../object/Item.php:686
+msgid "Video"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:518
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../mod/content.php:719 ../../mod/editpost.php:145
+#: ../../mod/photos.php:1566 ../../mod/photos.php:1610
+#: ../../mod/photos.php:1698 ../../object/Item.php:687
+#: ../../include/conversation.php:1126
+msgid "Preview"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:523
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../mod/content.php:728 ../../mod/settings.php:676
+#: ../../object/Item.php:120
+msgid "Edit"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:525
-msgid "Warning: profile location has no profile photo."
+#: ../../mod/content.php:753 ../../object/Item.php:195
+msgid "add star"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:528
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/dfrn_request.php:172
-msgid "Introduction complete."
+#: ../../mod/content.php:754 ../../object/Item.php:196
+msgid "remove star"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:214
-msgid "Unrecoverable protocol error."
+#: ../../mod/content.php:755 ../../object/Item.php:197
+msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:242
-msgid "Profile unavailable."
+#: ../../mod/content.php:758 ../../object/Item.php:200
+msgid "starred"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:267
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/content.php:759 ../../object/Item.php:220
+msgid "add tag"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:268
-msgid "Spam protection measures have been invoked."
+#: ../../mod/content.php:763 ../../object/Item.php:133
+msgid "save to folder"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:269
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../mod/content.php:854 ../../object/Item.php:328
+msgid "to"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:331
-msgid "Invalid locator"
+#: ../../mod/content.php:855 ../../object/Item.php:330
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:340
-msgid "Invalid email address."
+#: ../../mod/content.php:856 ../../object/Item.php:331
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:367
-msgid "This account has not been configured for email. Request failed."
+#: ../../mod/removeme.php:46 ../../mod/removeme.php:49
+msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:463
-msgid "Unable to resolve your name at the provided location."
+#: ../../mod/removeme.php:47
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:476
-msgid "You have already introduced yourself here."
+#: ../../mod/removeme.php:48
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:480
-#, php-format
-msgid "Apparently you are already friends with %s."
+#: ../../mod/install.php:117
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:501
-msgid "Invalid profile URL."
+#: ../../mod/install.php:123
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:507 ../../include/follow.php:27
-msgid "Disallowed profile URL."
+#: ../../mod/install.php:127
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:576 ../../mod/contacts.php:188
-msgid "Failed to update contact record."
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:597
-msgid "Your introduction has been sent."
+#: ../../mod/install.php:138
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:650
-msgid "Please login to confirm introduction."
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:525
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:660
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: ../../mod/install.php:203
+msgid "System check"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:671
-msgid "Hide this contact"
+#: ../../mod/install.php:208
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:674
-#, php-format
-msgid "Welcome home %s."
+#: ../../mod/install.php:227
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:675
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
+#: ../../mod/install.php:228
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:676
-msgid "Confirm"
+#: ../../mod/install.php:229
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:804
+#: ../../mod/install.php:230
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:824
-msgid ""
-"If you are not yet a member of the free social web, <a href=\"http://dir."
-"friendica.com/siteinfo\">follow this link to find a public Friendica site "
-"and join us today</a>."
+#: ../../mod/install.php:234
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:827
-msgid "Friend/Connection Request"
+#: ../../mod/install.php:235
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:828
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+#: ../../mod/install.php:236
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:829
-msgid "Please answer the following:"
+#: ../../mod/install.php:237
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:830
-#, php-format
-msgid "Does %s know you?"
+#: ../../mod/install.php:238 ../../mod/install.php:277
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:834
-msgid "Add a personal note:"
+#: ../../mod/install.php:238 ../../mod/install.php:277
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:836 ../../include/contact_selectors.php:76
-msgid "Friendica"
+#: ../../mod/install.php:242 ../../mod/install.php:280
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:837
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/install.php:267
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:838 ../../mod/settings.php:736
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
+#: ../../mod/install.php:321
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:839
-#, php-format
+#: ../../mod/install.php:322
 msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a href='http://"
+"friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:840
-msgid "Your Identity Address:"
+#: ../../mod/install.php:326
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:843
-msgid "Submit Request"
+#: ../../mod/install.php:326
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/update_profile.php:41 ../../mod/update_network.php:25
-#: ../../mod/update_display.php:22 ../../mod/update_community.php:18
-#: ../../mod/update_notes.php:37
-msgid "[Embedded content - reload page to view]"
+#: ../../mod/install.php:331
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/content.php:497 ../../include/conversation.php:690
-msgid "View in context"
+#: ../../mod/install.php:340
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: ../../mod/contacts.php:108
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:139 ../../mod/contacts.php:272
-msgid "Could not access contact record."
+#: ../../mod/install.php:341
+msgid "Found PHP version: "
 msgstr ""
 
-#: ../../mod/contacts.php:153
-msgid "Could not locate selected profile."
+#: ../../mod/install.php:343
+msgid "PHP cli binary"
 msgstr ""
 
-#: ../../mod/contacts.php:186
-msgid "Contact updated."
+#: ../../mod/install.php:354
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/contacts.php:287
-msgid "Contact has been blocked"
+#: ../../mod/install.php:355
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/contacts.php:287
-msgid "Contact has been unblocked"
+#: ../../mod/install.php:357
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/contacts.php:298
-msgid "Contact has been ignored"
+#: ../../mod/install.php:378
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/contacts.php:298
-msgid "Contact has been unignored"
+#: ../../mod/install.php:379
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/contacts.php:310
-msgid "Contact has been archived"
+#: ../../mod/install.php:381
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/contacts.php:310
-msgid "Contact has been unarchived"
+#: ../../mod/install.php:388
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/contacts.php:335 ../../mod/contacts.php:711
-msgid "Do you really want to delete this contact?"
+#: ../../mod/install.php:389
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/contacts.php:352
-msgid "Contact has been removed."
+#: ../../mod/install.php:390
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/contacts.php:390
-#, php-format
-msgid "You are mutual friends with %s"
+#: ../../mod/install.php:391
+msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/contacts.php:394
-#, php-format
-msgid "You are sharing with %s"
+#: ../../mod/install.php:392
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/contacts.php:399
-#, php-format
-msgid "%s is sharing with you"
+#: ../../mod/install.php:397 ../../mod/install.php:399
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/contacts.php:416
-msgid "Private communications are not available for this contact."
+#: ../../mod/install.php:397
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:423
-msgid "(Update was successful)"
+#: ../../mod/install.php:405
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:423
-msgid "(Update was not successful)"
+#: ../../mod/install.php:409
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:425
-msgid "Suggest friends"
+#: ../../mod/install.php:413
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:429
-#, php-format
-msgid "Network type: %s"
+#: ../../mod/install.php:417
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:432 ../../include/contact_widgets.php:200
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:437
-msgid "View all contacts"
+#: ../../mod/install.php:421
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/contacts.php:445
-msgid "Toggle Blocked status"
+#: ../../mod/install.php:438
+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/contacts.php:448 ../../mod/contacts.php:502
-#: ../../mod/contacts.php:715
-msgid "Unignore"
+#: ../../mod/install.php:439
+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/contacts.php:448 ../../mod/contacts.php:502
-#: ../../mod/contacts.php:715 ../../mod/notifications.php:51
-#: ../../mod/notifications.php:164 ../../mod/notifications.php:210
-msgid "Ignore"
+#: ../../mod/install.php:440
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/contacts.php:451
-msgid "Toggle Ignored status"
+#: ../../mod/install.php:441
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
-msgid "Unarchive"
+#: ../../mod/install.php:444
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/contacts.php:455 ../../mod/contacts.php:716
-msgid "Archive"
+#: ../../mod/install.php:454
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/contacts.php:458
-msgid "Toggle Archive status"
+#: ../../mod/install.php:455
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
 msgstr ""
 
-#: ../../mod/contacts.php:461
-msgid "Repair"
+#: ../../mod/install.php:456
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../mod/contacts.php:464
-msgid "Advanced Contact Settings"
+#: ../../mod/install.php:457
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/contacts.php:470
-msgid "Communications lost with this contact!"
+#: ../../mod/install.php:460
+msgid "view/smarty3 is writable"
 msgstr ""
 
-#: ../../mod/contacts.php:473
-msgid "Contact Editor"
+#: ../../mod/install.php:472
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/contacts.php:476
-msgid "Profile Visibility"
+#: ../../mod/install.php:474
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/contacts.php:477
-#, php-format
+#: ../../mod/install.php:484
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"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/contacts.php:478
-msgid "Contact Information / Notes"
+#: ../../mod/install.php:523
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/contacts.php:479
-msgid "Edit contact notes"
+#: ../../mod/install.php:524
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/contacts.php:484 ../../mod/contacts.php:679
-#: ../../mod/viewcontacts.php:64 ../../mod/nogroup.php:40
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
-msgid "Visit %s's profile [%s]"
+msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/contacts.php:485
-msgid "Block/Unblock contact"
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/contacts.php:486
-msgid "Ignore contact"
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
 msgstr ""
 
-#: ../../mod/contacts.php:487
-msgid "Repair URL settings"
+#: ../../mod/wallmessage.php:143
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/contacts.php:488
-msgid "View conversations"
+#: ../../mod/help.php:79
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/contacts.php:490
-msgid "Delete contact"
+#: ../../mod/help.php:84 ../../include/nav.php:114
+msgid "Help"
 msgstr ""
 
-#: ../../mod/contacts.php:494
-msgid "Last update:"
+#: ../../mod/help.php:90 ../../index.php:256
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/contacts.php:496
-msgid "Update public posts"
+#: ../../mod/help.php:93 ../../index.php:259
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/contacts.php:505
-msgid "Currently blocked"
+#: ../../mod/dfrn_poll.php:103 ../../mod/dfrn_poll.php:536
+#, php-format
+msgid "%1$s welcomes %2$s"
 msgstr ""
 
-#: ../../mod/contacts.php:506
-msgid "Currently ignored"
+#: ../../mod/home.php:35
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/contacts.php:507
-msgid "Currently archived"
+#: ../../mod/wall_attach.php:75
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: ../../mod/contacts.php:508 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:204
-msgid "Hide this contact from others"
+#: ../../mod/wall_attach.php:75
+msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: ../../mod/contacts.php:508
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
+#: ../../mod/wall_attach.php:81
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/contacts.php:509
-msgid "Notification for new posts"
+#: ../../mod/wall_attach.php:122 ../../mod/wall_attach.php:133
+msgid "File upload failed."
 msgstr ""
 
-#: ../../mod/contacts.php:509
-msgid "Send a notification of every new post of this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:510
-msgid "Fetch further information for feeds"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Disabled"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Fetch information"
-msgstr ""
-
-#: ../../mod/contacts.php:511
-msgid "Fetch information and keywords"
-msgstr ""
-
-#: ../../mod/contacts.php:513
-msgid "Blacklisted keywords"
-msgstr ""
-
-#: ../../mod/contacts.php:513
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr ""
-
-#: ../../mod/contacts.php:564
-msgid "Suggestions"
-msgstr ""
-
-#: ../../mod/contacts.php:567
-msgid "Suggest potential friends"
-msgstr ""
-
-#: ../../mod/contacts.php:570 ../../mod/group.php:194
-msgid "All Contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:573
-msgid "Show all contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:576
-msgid "Unblocked"
-msgstr ""
-
-#: ../../mod/contacts.php:579
-msgid "Only show unblocked contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:583
-msgid "Blocked"
-msgstr ""
-
-#: ../../mod/contacts.php:586
-msgid "Only show blocked contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:590
-msgid "Ignored"
-msgstr ""
-
-#: ../../mod/contacts.php:593
-msgid "Only show ignored contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:597
-msgid "Archived"
-msgstr ""
-
-#: ../../mod/contacts.php:600
-msgid "Only show archived contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:604
-msgid "Hidden"
+#: ../../mod/match.php:12
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/contacts.php:607
-msgid "Only show hidden contacts"
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/contacts.php:655
-msgid "Mutual Friendship"
+#: ../../mod/match.php:57
+msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/contacts.php:659
-msgid "is a fan of yours"
+#: ../../mod/match.php:58 ../../mod/suggest.php:90 ../../boot.php:1568
+#: ../../include/contact_widgets.php:10
+msgid "Connect"
 msgstr ""
 
-#: ../../mod/contacts.php:663
-msgid "you are a fan of"
+#: ../../mod/share.php:44
+msgid "link"
 msgstr ""
 
-#: ../../mod/contacts.php:680 ../../mod/nogroup.php:41
-msgid "Edit contact"
+#: ../../mod/community.php:23
+msgid "Not available."
 msgstr ""
 
-#: ../../mod/contacts.php:706
-msgid "Search your contacts"
+#: ../../mod/community.php:32 ../../include/nav.php:129
+#: ../../include/nav.php:131 ../../view/theme/diabook/theme.php:129
+msgid "Community"
 msgstr ""
 
-#: ../../mod/contacts.php:713 ../../mod/settings.php:132
-#: ../../mod/settings.php:640
-msgid "Update"
+#: ../../mod/community.php:62 ../../mod/community.php:71
+#: ../../mod/search.php:168 ../../mod/search.php:192
+msgid "No results."
 msgstr ""
 
 #: ../../mod/settings.php:29 ../../mod/photos.php:80
@@ -3884,7 +3644,7 @@ msgstr ""
 msgid "Social Networks"
 msgstr ""
 
-#: ../../mod/settings.php:62 ../../include/nav.php:168
+#: ../../mod/settings.php:62 ../../include/nav.php:170
 msgid "Delegations"
 msgstr ""
 
@@ -4038,6 +3798,11 @@ msgstr ""
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
+#: ../../mod/settings.php:736 ../../mod/dfrn_request.php:838
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr ""
+
 #: ../../mod/settings.php:736 ../../mod/settings.php:737
 msgid "enabled"
 msgstr ""
@@ -4224,6 +3989,18 @@ msgstr ""
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
+#: ../../mod/settings.php:1010 ../../mod/settings.php:1016
+#: ../../mod/settings.php:1024 ../../mod/settings.php:1028
+#: ../../mod/settings.php:1033 ../../mod/settings.php:1039
+#: ../../mod/settings.php:1045 ../../mod/settings.php:1051
+#: ../../mod/settings.php:1081 ../../mod/settings.php:1082
+#: ../../mod/settings.php:1083 ../../mod/settings.php:1084
+#: ../../mod/settings.php:1085 ../../mod/dfrn_request.php:830
+#: ../../mod/register.php:234 ../../mod/profiles.php:661
+#: ../../mod/profiles.php:665 ../../mod/api.php:106
+msgid "No"
+msgstr ""
+
 #: ../../mod/settings.php:1016
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
@@ -4262,10 +4039,6 @@ msgstr ""
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:1062 ../../mod/profile_photo.php:248
-msgid "or"
-msgstr ""
-
 #: ../../mod/settings.php:1067
 msgid "Your Identity Address is"
 msgstr ""
@@ -4494,1482 +4267,1475 @@ msgstr ""
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: ../../mod/profiles.php:37
-msgid "Profile deleted."
+#: ../../mod/dfrn_request.php:95
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
-msgid "Profile-"
+#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:518
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
-msgid "New profile created."
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:523
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/profiles.php:95
-msgid "Profile unavailable to clone."
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:525
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/profiles.php:189
-msgid "Profile Name is required."
+#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:528
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/dfrn_request.php:172
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/profiles.php:340
-msgid "Marital Status"
+#: ../../mod/dfrn_request.php:214
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/profiles.php:344
-msgid "Romantic Partner"
+#: ../../mod/dfrn_request.php:242
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/profiles.php:348
-msgid "Likes"
+#: ../../mod/dfrn_request.php:267
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/profiles.php:352
-msgid "Dislikes"
+#: ../../mod/dfrn_request.php:268
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/profiles.php:356
-msgid "Work/Employment"
+#: ../../mod/dfrn_request.php:269
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/profiles.php:359
-msgid "Religion"
+#: ../../mod/dfrn_request.php:331
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/profiles.php:363
-msgid "Political Views"
+#: ../../mod/dfrn_request.php:340
+msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/profiles.php:367
-msgid "Gender"
+#: ../../mod/dfrn_request.php:367
+msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/profiles.php:371
-msgid "Sexual Preference"
+#: ../../mod/dfrn_request.php:463
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/profiles.php:375
-msgid "Homepage"
+#: ../../mod/dfrn_request.php:476
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/profiles.php:379 ../../mod/profiles.php:683
-msgid "Interests"
+#: ../../mod/dfrn_request.php:480
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/profiles.php:383
-msgid "Address"
+#: ../../mod/dfrn_request.php:501
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/profiles.php:390 ../../mod/profiles.php:679
-msgid "Location"
+#: ../../mod/dfrn_request.php:507 ../../include/follow.php:27
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/profiles.php:473
-msgid "Profile updated."
+#: ../../mod/dfrn_request.php:597
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/profiles.php:553
-msgid " and "
+#: ../../mod/dfrn_request.php:650
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/profiles.php:561
-msgid "public profile"
+#: ../../mod/dfrn_request.php:660
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/profiles.php:564
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../mod/dfrn_request.php:671
+msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/profiles.php:565
+#: ../../mod/dfrn_request.php:674
 #, php-format
-msgid " - Visit %1$s's %2$s"
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/dfrn_request.php:675
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/profiles.php:643
-msgid "Hide contacts and friends:"
+#: ../../mod/dfrn_request.php:676
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/profiles.php:648
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/dfrn_request.php:804
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
 msgstr ""
 
-#: ../../mod/profiles.php:670
-msgid "Edit Profile Details"
+#: ../../mod/dfrn_request.php:824
+msgid ""
+"If you are not yet a member of the free social web, <a href=\"http://dir."
+"friendica.com/siteinfo\">follow this link to find a public Friendica site "
+"and join us today</a>."
 msgstr ""
 
-#: ../../mod/profiles.php:672
-msgid "Change Profile Photo"
+#: ../../mod/dfrn_request.php:827
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/profiles.php:673
-msgid "View this profile"
+#: ../../mod/dfrn_request.php:828
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/profiles.php:674
-msgid "Create a new profile using these settings"
+#: ../../mod/dfrn_request.php:829
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/profiles.php:675
-msgid "Clone this profile"
+#: ../../mod/dfrn_request.php:830
+#, php-format
+msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/profiles.php:676
-msgid "Delete this profile"
+#: ../../mod/dfrn_request.php:834
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/profiles.php:677
-msgid "Basic information"
+#: ../../mod/dfrn_request.php:836 ../../include/contact_selectors.php:76
+msgid "Friendica"
 msgstr ""
 
-#: ../../mod/profiles.php:678
-msgid "Profile picture"
+#: ../../mod/dfrn_request.php:837
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/profiles.php:680
-msgid "Preferences"
+#: ../../mod/dfrn_request.php:839
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: ../../mod/profiles.php:681
-msgid "Status information"
+#: ../../mod/dfrn_request.php:840
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:682
-msgid "Additional information"
+#: ../../mod/dfrn_request.php:843
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/profiles.php:685
-msgid "Profile Name:"
+#: ../../mod/register.php:90
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:686
-msgid "Your Full Name:"
+#: ../../mod/register.php:96
+#, php-format
+msgid ""
+"Failed to send email message. Here your accout details:<br> login: %s<br> "
+"password: %s<br><br>You can change your password after login."
 msgstr ""
 
-#: ../../mod/profiles.php:687
-msgid "Title/Description:"
+#: ../../mod/register.php:105
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/profiles.php:688
-msgid "Your Gender:"
+#: ../../mod/register.php:148
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/profiles.php:689
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/register.php:186 ../../mod/uimport.php:50
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/profiles.php:690
-msgid "Street Address:"
+#: ../../mod/register.php:214
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/profiles.php:691
-msgid "Locality/City:"
+#: ../../mod/register.php:215
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/profiles.php:692
-msgid "Postal/Zip Code:"
+#: ../../mod/register.php:216
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/profiles.php:693
-msgid "Country:"
+#: ../../mod/register.php:230
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/profiles.php:694
-msgid "Region/State:"
+#: ../../mod/register.php:251
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/profiles.php:695
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/register.php:252
+msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/profiles.php:696
-msgid "Who: (if applicable)"
+#: ../../mod/register.php:263
+msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/profiles.php:697
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/register.php:264
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/profiles.php:698
-msgid "Since [date]:"
+#: ../../mod/register.php:265
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be '<strong>nickname@$sitename</"
+"strong>'."
 msgstr ""
 
-#: ../../mod/profiles.php:699 ../../include/profile_advanced.php:46
-msgid "Sexual Preference:"
+#: ../../mod/register.php:266
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/profiles.php:700
-msgid "Homepage URL:"
+#: ../../mod/register.php:269 ../../boot.php:1241 ../../include/nav.php:109
+msgid "Register"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../include/profile_advanced.php:50
-msgid "Hometown:"
+#: ../../mod/register.php:275 ../../mod/uimport.php:64
+msgid "Import"
 msgstr ""
 
-#: ../../mod/profiles.php:702 ../../include/profile_advanced.php:54
-msgid "Political Views:"
+#: ../../mod/register.php:276
+msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: ../../mod/profiles.php:703
-msgid "Religious Views:"
+#: ../../mod/maintenance.php:5
+msgid "System down for maintenance"
 msgstr ""
 
-#: ../../mod/profiles.php:704
-msgid "Public Keywords:"
+#: ../../mod/search.php:99 ../../include/text.php:953
+#: ../../include/text.php:954 ../../include/nav.php:119
+msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:705
-msgid "Private Keywords:"
+#: ../../mod/directory.php:51 ../../view/theme/diabook/theme.php:525
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/profiles.php:706 ../../include/profile_advanced.php:62
-msgid "Likes:"
+#: ../../mod/directory.php:59
+msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/profiles.php:707 ../../include/profile_advanced.php:64
-msgid "Dislikes:"
+#: ../../mod/directory.php:62
+msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/profiles.php:708
-msgid "Example: fishing photography software"
+#: ../../mod/directory.php:113 ../../mod/profiles.php:750
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:709
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: ../../mod/directory.php:116
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/profiles.php:710
-msgid "(Used for searching profiles, never shown to others)"
+#: ../../mod/directory.php:138 ../../boot.php:1650
+#: ../../include/profile_advanced.php:17
+msgid "Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:711
-msgid "Tell us about yourself..."
+#: ../../mod/directory.php:140 ../../boot.php:1653
+#: ../../include/profile_advanced.php:37
+msgid "Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:712
-msgid "Hobbies/Interests"
+#: ../../mod/directory.php:142 ../../boot.php:1655
+#: ../../include/profile_advanced.php:48
+msgid "Homepage:"
 msgstr ""
 
-#: ../../mod/profiles.php:713
-msgid "Contact information and Social Networks"
+#: ../../mod/directory.php:144 ../../boot.php:1657
+#: ../../include/profile_advanced.php:58
+msgid "About:"
 msgstr ""
 
-#: ../../mod/profiles.php:714
-msgid "Musical interests"
+#: ../../mod/directory.php:189
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/profiles.php:715
-msgid "Books, literature"
+#: ../../mod/delegate.php:101
+msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/profiles.php:716
-msgid "Television"
+#: ../../mod/delegate.php:130 ../../include/nav.php:170
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/profiles.php:717
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/delegate.php:132
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/profiles.php:718
-msgid "Love/romance"
+#: ../../mod/delegate.php:133
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/profiles.php:719
-msgid "Work/employment"
+#: ../../mod/delegate.php:135
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/profiles.php:720
-msgid "School/education"
+#: ../../mod/delegate.php:137
+msgid "Potential Delegates"
 msgstr ""
 
-#: ../../mod/profiles.php:725
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: ../../mod/delegate.php:140
+msgid "Add"
 msgstr ""
 
-#: ../../mod/profiles.php:788
-msgid "Edit/Manage Profiles"
+#: ../../mod/delegate.php:141
+msgid "No entries."
 msgstr ""
 
-#: ../../mod/group.php:29
-msgid "Group created."
+#: ../../mod/common.php:42
+msgid "Common Friends"
 msgstr ""
 
-#: ../../mod/group.php:35
-msgid "Could not create group."
+#: ../../mod/common.php:78
+msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/group.php:47 ../../mod/group.php:140
-msgid "Group not found."
+#: ../../mod/uexport.php:77
+msgid "Export account"
 msgstr ""
 
-#: ../../mod/group.php:60
-msgid "Group name changed."
+#: ../../mod/uexport.php:77
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
 msgstr ""
 
-#: ../../mod/group.php:87
-msgid "Save Group"
+#: ../../mod/uexport.php:78
+msgid "Export all"
 msgstr ""
 
-#: ../../mod/group.php:93
-msgid "Create a group of contacts/friends."
+#: ../../mod/uexport.php:78
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
 msgstr ""
 
-#: ../../mod/group.php:94 ../../mod/group.php:180
-msgid "Group Name: "
+#: ../../mod/mood.php:62 ../../include/conversation.php:227
+#, php-format
+msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: ../../mod/group.php:113
-msgid "Group removed."
+#: ../../mod/mood.php:133
+msgid "Mood"
 msgstr ""
 
-#: ../../mod/group.php:115
-msgid "Unable to remove group."
+#: ../../mod/mood.php:134
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../mod/group.php:179
-msgid "Group Editor"
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: ../../mod/group.php:192
-msgid "Members"
+#: ../../mod/suggest.php:68 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:527
+msgid "Friend Suggestions"
 msgstr ""
 
-#: ../../mod/group.php:224 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
+#: ../../mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: ../../mod/babel.php:17
-msgid "Source (bbcode) text:"
+#: ../../mod/suggest.php:92
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
+#: ../../mod/profiles.php:37
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/babel.php:31
-msgid "Source input: "
+#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/babel.php:35
-msgid "bb2html (raw HTML): "
+#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/babel.php:39
-msgid "bb2html: "
+#: ../../mod/profiles.php:95
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/babel.php:43
-msgid "bb2html2bb: "
+#: ../../mod/profiles.php:189
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/babel.php:47
-msgid "bb2md: "
-msgstr ""
-
-#: ../../mod/babel.php:51
-msgid "bb2md2html: "
+#: ../../mod/profiles.php:340
+msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/babel.php:55
-msgid "bb2dia2bb: "
+#: ../../mod/profiles.php:344
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/babel.php:59
-msgid "bb2md2html2bb: "
+#: ../../mod/profiles.php:348
+msgid "Likes"
 msgstr ""
 
-#: ../../mod/babel.php:69
-msgid "Source input (Diaspora format): "
+#: ../../mod/profiles.php:352
+msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/babel.php:74
-msgid "diaspora2bb: "
+#: ../../mod/profiles.php:356
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/community.php:23
-msgid "Not available."
+#: ../../mod/profiles.php:359
+msgid "Religion"
 msgstr ""
 
-#: ../../mod/follow.php:27
-msgid "Contact added"
+#: ../../mod/profiles.php:363
+msgid "Political Views"
 msgstr ""
 
-#: ../../mod/notify.php:75 ../../mod/notifications.php:336
-msgid "No more system notifications."
+#: ../../mod/profiles.php:367
+msgid "Gender"
 msgstr ""
 
-#: ../../mod/notify.php:79 ../../mod/notifications.php:340
-msgid "System Notifications"
+#: ../../mod/profiles.php:371
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/message.php:9 ../../include/nav.php:162
-msgid "New Message"
+#: ../../mod/profiles.php:375
+msgid "Homepage"
 msgstr ""
 
-#: ../../mod/message.php:67
-msgid "Unable to locate contact information."
+#: ../../mod/profiles.php:379 ../../mod/profiles.php:698
+msgid "Interests"
 msgstr ""
 
-#: ../../mod/message.php:182 ../../include/nav.php:159
-msgid "Messages"
+#: ../../mod/profiles.php:383
+msgid "Address"
 msgstr ""
 
-#: ../../mod/message.php:207
-msgid "Do you really want to delete this message?"
+#: ../../mod/profiles.php:390 ../../mod/profiles.php:694
+msgid "Location"
 msgstr ""
 
-#: ../../mod/message.php:227
-msgid "Message deleted."
+#: ../../mod/profiles.php:473
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/message.php:258
-msgid "Conversation removed."
+#: ../../mod/profiles.php:568
+msgid " and "
 msgstr ""
 
-#: ../../mod/message.php:371
-msgid "No messages."
+#: ../../mod/profiles.php:576
+msgid "public profile"
 msgstr ""
 
-#: ../../mod/message.php:378
+#: ../../mod/profiles.php:579
 #, php-format
-msgid "Unknown sender - %s"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/message.php:381
+#: ../../mod/profiles.php:580
 #, php-format
-msgid "You and %s"
+msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/message.php:384
+#: ../../mod/profiles.php:583
 #, php-format
-msgid "%s and You"
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/message.php:405 ../../mod/message.php:546
-msgid "Delete conversation"
+#: ../../mod/profiles.php:658
+msgid "Hide contacts and friends:"
 msgstr ""
 
-#: ../../mod/message.php:408
-msgid "D, d M Y - g:i A"
+#: ../../mod/profiles.php:663
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/message.php:411
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/message.php:450
-msgid "Message not available."
+#: ../../mod/profiles.php:685
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/message.php:520
-msgid "Delete message"
+#: ../../mod/profiles.php:687
+msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/message.php:548
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../mod/profiles.php:688
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/message.php:552
-msgid "Send Reply"
+#: ../../mod/profiles.php:689
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/like.php:168 ../../include/conversation.php:140
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/profiles.php:690
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/oexchange.php:25
-msgid "Post successful."
+#: ../../mod/profiles.php:691
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:148
-msgid "l F d, Y \\@ g:i A"
+#: ../../mod/profiles.php:692
+msgid "Basic information"
 msgstr ""
 
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
+#: ../../mod/profiles.php:693
+msgid "Profile picture"
 msgstr ""
 
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+#: ../../mod/profiles.php:695
+msgid "Preferences"
 msgstr ""
 
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
+#: ../../mod/profiles.php:696
+msgid "Status information"
 msgstr ""
 
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
+#: ../../mod/profiles.php:697
+msgid "Additional information"
 msgstr ""
 
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
+#: ../../mod/profiles.php:700
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
+#: ../../mod/profiles.php:701
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:1006
-#: ../../include/conversation.php:1024
-msgid "Save to Folder:"
+#: ../../mod/profiles.php:702
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/filer.php:30
-msgid "- select -"
+#: ../../mod/profiles.php:703
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
+#: ../../mod/profiles.php:704
+#, php-format
+msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
+#: ../../mod/profiles.php:705
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profperm.php:114
-msgid "Visible To"
+#: ../../mod/profiles.php:706
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
+#: ../../mod/profiles.php:707
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:41
-msgid "No contacts."
+#: ../../mod/profiles.php:708
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:78 ../../include/text.php:876
-msgid "View Contacts"
+#: ../../mod/profiles.php:709
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/dirfind.php:26
-msgid "People Search"
+#: ../../mod/profiles.php:710
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
-msgid "No matches"
+#: ../../mod/profiles.php:711
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/photos.php:67 ../../mod/photos.php:1262 ../../mod/photos.php:1819
-msgid "Upload New Photos"
+#: ../../mod/profiles.php:712
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/photos.php:144
-msgid "Contact information unavailable"
+#: ../../mod/profiles.php:713
+msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/photos.php:165
-msgid "Album not found."
+#: ../../mod/profiles.php:714 ../../include/profile_advanced.php:46
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/photos.php:188 ../../mod/photos.php:200 ../../mod/photos.php:1204
-msgid "Delete Album"
+#: ../../mod/profiles.php:715
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/photos.php:198
-msgid "Do you really want to delete this photo album and all its photos?"
+#: ../../mod/profiles.php:716 ../../include/profile_advanced.php:50
+msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/photos.php:278 ../../mod/photos.php:289 ../../mod/photos.php:1515
-msgid "Delete Photo"
+#: ../../mod/profiles.php:717 ../../include/profile_advanced.php:54
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/photos.php:287
-msgid "Do you really want to delete this photo?"
+#: ../../mod/profiles.php:718
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/photos.php:662
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
+#: ../../mod/profiles.php:719
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/photos.php:662
-msgid "a photo"
+#: ../../mod/profiles.php:720
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/photos.php:767
-msgid "Image exceeds size limit of "
+#: ../../mod/profiles.php:721 ../../include/profile_advanced.php:62
+msgid "Likes:"
 msgstr ""
 
-#: ../../mod/photos.php:775
-msgid "Image file is empty."
+#: ../../mod/profiles.php:722 ../../include/profile_advanced.php:64
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/photos.php:807 ../../mod/wall_upload.php:144
-#: ../../mod/profile_photo.php:153
-msgid "Unable to process image."
+#: ../../mod/profiles.php:723
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/photos.php:834 ../../mod/wall_upload.php:172
-#: ../../mod/profile_photo.php:301
-msgid "Image upload failed."
+#: ../../mod/profiles.php:724
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/photos.php:930
-msgid "No photos selected"
+#: ../../mod/profiles.php:725
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/photos.php:1031 ../../mod/videos.php:226
-msgid "Access to this item is restricted."
+#: ../../mod/profiles.php:726
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/photos.php:1094
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+#: ../../mod/profiles.php:727
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/photos.php:1129
-msgid "Upload Photos"
+#: ../../mod/profiles.php:728
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/photos.php:1133 ../../mod/photos.php:1199
-msgid "New album name: "
+#: ../../mod/profiles.php:729
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/photos.php:1134
-msgid "or existing album name: "
+#: ../../mod/profiles.php:730
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/photos.php:1135
-msgid "Do not show a status post for this upload"
+#: ../../mod/profiles.php:731
+msgid "Television"
 msgstr ""
 
-#: ../../mod/photos.php:1137 ../../mod/photos.php:1510
-msgid "Permissions"
+#: ../../mod/profiles.php:732
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/photos.php:1148
-msgid "Private Photo"
+#: ../../mod/profiles.php:733
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/photos.php:1149
-msgid "Public Photo"
+#: ../../mod/profiles.php:734
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/photos.php:1212
-msgid "Edit Album"
+#: ../../mod/profiles.php:735
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/photos.php:1218
-msgid "Show Newest First"
+#: ../../mod/profiles.php:740
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/photos.php:1220
-msgid "Show Oldest First"
+#: ../../mod/profiles.php:803
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/photos.php:1248 ../../mod/photos.php:1802
-msgid "View Photo"
+#: ../../mod/profiles.php:804 ../../boot.php:1611 ../../boot.php:1637
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1294
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/profiles.php:805 ../../boot.php:1612
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/photos.php:1296
-msgid "Photo not available"
+#: ../../mod/profiles.php:816 ../../boot.php:1622
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/photos.php:1352
-msgid "View photo"
+#: ../../mod/profiles.php:818 ../../boot.php:1625
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/photos.php:1352
-msgid "Edit photo"
+#: ../../mod/profiles.php:819 ../../boot.php:1626
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/photos.php:1353
-msgid "Use as profile photo"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/photos.php:1378
-msgid "View Full Size"
+#: ../../mod/editpost.php:39
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/photos.php:1457
-msgid "Tags: "
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1092
+msgid "upload photo"
 msgstr ""
 
-#: ../../mod/photos.php:1460
-msgid "[Remove any tag]"
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1093
+msgid "Attach file"
 msgstr ""
 
-#: ../../mod/photos.php:1500
-msgid "Rotate CW (right)"
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1094
+msgid "attach file"
 msgstr ""
 
-#: ../../mod/photos.php:1501
-msgid "Rotate CCW (left)"
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1096
+msgid "web link"
 msgstr ""
 
-#: ../../mod/photos.php:1503
-msgid "New album name"
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1097
+msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/photos.php:1506
-msgid "Caption"
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1098
+msgid "video link"
 msgstr ""
 
-#: ../../mod/photos.php:1508
-msgid "Add a Tag"
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1099
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/photos.php:1512
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1100
+msgid "audio link"
 msgstr ""
 
-#: ../../mod/photos.php:1521
-msgid "Private photo"
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1101
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/photos.php:1522
-msgid "Public photo"
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1102
+msgid "set location"
 msgstr ""
 
-#: ../../mod/photos.php:1544 ../../include/conversation.php:1090
-msgid "Share"
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1103
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/photos.php:1808 ../../mod/videos.php:308
-msgid "View Album"
+#: ../../mod/editpost.php:123 ../../include/conversation.php:1104
+msgid "clear location"
 msgstr ""
 
-#: ../../mod/photos.php:1817
-msgid "Recent Photos"
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1110
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/wall_attach.php:75
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+#: ../../mod/editpost.php:133 ../../include/conversation.php:1119
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/wall_attach.php:75
-msgid "Or - did you try to upload an empty file?"
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1120
+msgid "Public post"
 msgstr ""
 
-#: ../../mod/wall_attach.php:81
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1106
+msgid "Set title"
 msgstr ""
 
-#: ../../mod/wall_attach.php:122 ../../mod/wall_attach.php:133
-msgid "File upload failed."
+#: ../../mod/editpost.php:139 ../../include/conversation.php:1108
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/videos.php:125
-msgid "No videos selected"
+#: ../../mod/editpost.php:140 ../../include/conversation.php:1122
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/videos.php:301 ../../include/text.php:1405
-msgid "View Video"
+#: ../../mod/friendica.php:59
+msgid "This is Friendica, version"
 msgstr ""
 
-#: ../../mod/videos.php:317
-msgid "Recent Videos"
+#: ../../mod/friendica.php:60
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/videos.php:319
-msgid "Upload New Videos"
+#: ../../mod/friendica.php:62
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
 msgstr ""
 
-#: ../../mod/poke.php:192
-msgid "Poke/Prod"
+#: ../../mod/friendica.php:64
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
+#: ../../mod/friendica.php:65
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
 msgstr ""
 
-#: ../../mod/poke.php:194
-msgid "Recipient"
+#: ../../mod/friendica.php:79
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
+#: ../../mod/friendica.php:92
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/poke.php:198
-msgid "Make this post private"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/uexport.php:77
-msgid "Export account"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/uexport.php:77
+#: ../../mod/api.php:104
 msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/uexport.php:78
-msgid "Export all"
+#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/uexport.php:78
-msgid ""
-"Export your accout info, contacts and all your items as json. Could be a "
-"very big file, and could take a lot of time. Use this to make a full backup "
-"of your account (photos are not exported)"
+#: ../../mod/lockview.php:48
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/common.php:42
-msgid "Common Friends"
+#: ../../mod/notes.php:44 ../../boot.php:2150
+msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/common.php:78
-msgid "No contacts in common."
+#: ../../mod/localtime.php:12 ../../include/bb2diaspora.php:148
+#: ../../include/event.php:11
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../mod/wall_upload.php:122 ../../mod/profile_photo.php:144
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: ../../mod/wall_upload.php:169 ../../mod/wall_upload.php:178
-#: ../../mod/wall_upload.php:185 ../../mod/item.php:484
-#: ../../include/Photo.php:916 ../../include/Photo.php:931
-#: ../../include/Photo.php:938 ../../include/Photo.php:960
-#: ../../include/message.php:144
-msgid "Wall Photos"
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: ../../mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
 msgstr ""
 
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
-#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308
+#: ../../mod/localtime.php:33
 #, php-format
-msgid "Image size reduction [%s] failed."
+msgid "Current timezone: %s"
 msgstr ""
 
-#: ../../mod/profile_photo.php:118
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: ../../mod/profile_photo.php:128
-msgid "Unable to process image"
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:242
-msgid "Upload File:"
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
 msgstr ""
 
-#: ../../mod/profile_photo.php:243
-msgid "Select a profile:"
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../mod/profile_photo.php:245
-msgid "Upload"
+#: ../../mod/poke.php:194
+msgid "Recipient"
 msgstr ""
 
-#: ../../mod/profile_photo.php:248
-msgid "skip this step"
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../mod/profile_photo.php:248
-msgid "select a photo from your photo albums"
+#: ../../mod/poke.php:198
+msgid "Make this post private"
 msgstr ""
 
-#: ../../mod/profile_photo.php:262
-msgid "Crop Image"
+#: ../../mod/invite.php:27
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../mod/profile_photo.php:263
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/profile_photo.php:265
-msgid "Done Editing"
+#: ../../mod/invite.php:73
+msgid "Please join us on Friendica"
 msgstr ""
 
-#: ../../mod/profile_photo.php:299
-msgid "Image uploaded successfully."
+#: ../../mod/invite.php:84
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../mod/apps.php:11
-msgid "Applications"
+#: ../../mod/invite.php:89
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/apps.php:14
-msgid "No installed applications."
-msgstr ""
+#: ../../mod/invite.php:93
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/navigation.php:20 ../../include/nav.php:34
-msgid "Nothing new here"
+#: ../../mod/invite.php:112
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/navigation.php:24 ../../include/nav.php:38
-msgid "Clear notifications"
+#: ../../mod/invite.php:120
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many "
+"other social networks."
 msgstr ""
 
-#: ../../mod/match.php:12
-msgid "Profile Match"
+#: ../../mod/invite.php:122
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
-#: ../../mod/match.php:20
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/invite.php:123
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
 msgstr ""
 
-#: ../../mod/match.php:57
-msgid "is interested in:"
+#: ../../mod/invite.php:126
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/invite.php:132
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/invite.php:133
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../mod/invite.php:135
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:139
-msgid "Remove"
+#: ../../mod/invite.php:137
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/events.php:66
-msgid "Event title and start time are required."
+#: ../../mod/invite.php:137
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/events.php:291
-msgid "l, F j"
+#: ../../mod/invite.php:139
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
 msgstr ""
 
-#: ../../mod/events.php:313
-msgid "Edit event"
+#: ../../mod/photos.php:52 ../../boot.php:2129
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/events.php:335 ../../include/text.php:1647
-#: ../../include/text.php:1657
-msgid "link to source"
+#: ../../mod/photos.php:60 ../../mod/photos.php:155 ../../mod/photos.php:1064
+#: ../../mod/photos.php:1187 ../../mod/photos.php:1210
+#: ../../mod/photos.php:1760 ../../mod/photos.php:1772
+#: ../../view/theme/diabook/theme.php:499
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/events.php:371
-msgid "Create New Event"
+#: ../../mod/photos.php:67 ../../mod/photos.php:1262 ../../mod/photos.php:1819
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/events.php:372
-msgid "Previous"
+#: ../../mod/photos.php:144
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/events.php:446
-msgid "hour:minute"
+#: ../../mod/photos.php:165
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/events.php:456
-msgid "Event details"
+#: ../../mod/photos.php:188 ../../mod/photos.php:200 ../../mod/photos.php:1204
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/events.php:457
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
+#: ../../mod/photos.php:198
+msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: ../../mod/events.php:459
-msgid "Event Starts:"
+#: ../../mod/photos.php:278 ../../mod/photos.php:289 ../../mod/photos.php:1515
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/events.php:459 ../../mod/events.php:473
-msgid "Required"
+#: ../../mod/photos.php:287
+msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: ../../mod/events.php:462
-msgid "Finish date/time is not known or not relevant"
+#: ../../mod/photos.php:662
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/events.php:464
-msgid "Event Finishes:"
+#: ../../mod/photos.php:662
+msgid "a photo"
 msgstr ""
 
-#: ../../mod/events.php:467
-msgid "Adjust for viewer timezone"
+#: ../../mod/photos.php:767
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/events.php:469
-msgid "Description:"
+#: ../../mod/photos.php:775
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/events.php:473
-msgid "Title:"
+#: ../../mod/photos.php:930
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/events.php:475
-msgid "Share this event"
+#: ../../mod/photos.php:1094
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/delegate.php:101
-msgid "No potential page delegates located."
+#: ../../mod/photos.php:1129
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/delegate.php:130 ../../include/nav.php:168
-msgid "Delegate Page Management"
+#: ../../mod/photos.php:1133 ../../mod/photos.php:1199
+msgid "New album name: "
 msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
+#: ../../mod/photos.php:1134
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/delegate.php:133
-msgid "Existing Page Managers"
+#: ../../mod/photos.php:1135
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/delegate.php:135
-msgid "Existing Page Delegates"
+#: ../../mod/photos.php:1137 ../../mod/photos.php:1510
+msgid "Permissions"
 msgstr ""
 
-#: ../../mod/delegate.php:137
-msgid "Potential Delegates"
+#: ../../mod/photos.php:1148
+msgid "Private Photo"
 msgstr ""
 
-#: ../../mod/delegate.php:140
-msgid "Add"
+#: ../../mod/photos.php:1149
+msgid "Public Photo"
 msgstr ""
 
-#: ../../mod/delegate.php:141
-msgid "No entries."
+#: ../../mod/photos.php:1212
+msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/nogroup.php:59
-msgid "Contacts who are not members of a group"
+#: ../../mod/photos.php:1218
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/fbrowser.php:113
-msgid "Files"
+#: ../../mod/photos.php:1220
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/maintenance.php:5
-msgid "System down for maintenance"
+#: ../../mod/photos.php:1248 ../../mod/photos.php:1802
+msgid "View Photo"
 msgstr ""
 
-#: ../../mod/removeme.php:46 ../../mod/removeme.php:49
-msgid "Remove My Account"
+#: ../../mod/photos.php:1294
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/removeme.php:47
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/photos.php:1296
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/removeme.php:48
-msgid "Please enter your password for verification:"
+#: ../../mod/photos.php:1352
+msgid "View photo"
 msgstr ""
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
+#: ../../mod/photos.php:1352
+msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
+#: ../../mod/photos.php:1353
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
+#: ../../mod/photos.php:1378
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/item.php:113
-msgid "Unable to locate original post."
+#: ../../mod/photos.php:1457
+msgid "Tags: "
 msgstr ""
 
-#: ../../mod/item.php:345
-msgid "Empty post discarded."
+#: ../../mod/photos.php:1460
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/item.php:938
-msgid "System error. Post not saved."
+#: ../../mod/photos.php:1500
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/item.php:964
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+#: ../../mod/photos.php:1501
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/item.php:966
-#, php-format
-msgid "You may visit them online at %s"
+#: ../../mod/photos.php:1503
+msgid "New album name"
 msgstr ""
 
-#: ../../mod/item.php:967
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: ../../mod/photos.php:1506
+msgid "Caption"
 msgstr ""
 
-#: ../../mod/item.php:971
-#, php-format
-msgid "%s posted an update."
+#: ../../mod/photos.php:1508
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/ping.php:240
-msgid "{0} wants to be your friend"
+#: ../../mod/photos.php:1512
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/ping.php:245
-msgid "{0} sent you a message"
+#: ../../mod/photos.php:1521
+msgid "Private photo"
 msgstr ""
 
-#: ../../mod/ping.php:250
-msgid "{0} requested registration"
+#: ../../mod/photos.php:1522
+msgid "Public photo"
 msgstr ""
 
-#: ../../mod/ping.php:256
-#, php-format
-msgid "{0} commented %s's post"
+#: ../../mod/photos.php:1544 ../../include/conversation.php:1090
+msgid "Share"
 msgstr ""
 
-#: ../../mod/ping.php:261
-#, php-format
-msgid "{0} liked %s's post"
+#: ../../mod/photos.php:1817
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/ping.php:266
-#, php-format
-msgid "{0} disliked %s's post"
+#: ../../mod/regmod.php:55
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/ping.php:271
+#: ../../mod/regmod.php:92
 #, php-format
-msgid "{0} is now friends with %s"
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/ping.php:276
-msgid "{0} posted"
+#: ../../mod/regmod.php:104
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/ping.php:281
-#, php-format
-msgid "{0} tagged %s's post with #%s"
+#: ../../mod/uimport.php:66
+msgid "Move account"
 msgstr ""
 
-#: ../../mod/ping.php:287
-msgid "{0} mentioned you in a post"
+#: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
 msgstr ""
 
-#: ../../mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
+#: ../../mod/uimport.php:68
+msgid ""
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also "
+"to inform your friends that you moved here."
 msgstr ""
 
-#: ../../mod/openid.php:53
+#: ../../mod/uimport.php:69
 msgid ""
-"Account not found and OpenID registration is not permitted on this site."
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:112
-#: ../../include/auth.php:175
-msgid "Login failed."
+#: ../../mod/uimport.php:70
+msgid "Account file"
 msgstr ""
 
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
+#: ../../mod/uimport.php:70
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
-#: ../../mod/notifications.php:211
-msgid "Discard"
+#: ../../mod/attach.php:8
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/notifications.php:78
-msgid "System"
+#: ../../mod/attach.php:20
+msgid "Item was not found."
 msgstr ""
 
-#: ../../mod/notifications.php:83 ../../include/nav.php:143
-msgid "Network"
+#: ../../boot.php:749
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:152
-msgid "Introductions"
+#: ../../boot.php:752
+msgid "show fewer"
 msgstr ""
 
-#: ../../mod/notifications.php:122
-msgid "Show Ignored Requests"
+#: ../../boot.php:1122
+#, php-format
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../mod/notifications.php:122
-msgid "Hide Ignored Requests"
+#: ../../boot.php:1240
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
-msgid "Notification type: "
+#: ../../boot.php:1265 ../../include/nav.php:73
+msgid "Logout"
 msgstr ""
 
-#: ../../mod/notifications.php:150
-msgid "Friend Suggestion"
+#: ../../boot.php:1268
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../mod/notifications.php:152
-#, php-format
-msgid "suggested by %s"
+#: ../../boot.php:1269
+msgid "Password: "
 msgstr ""
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "Post a new friend activity"
+#: ../../boot.php:1270
+msgid "Remember me"
 msgstr ""
 
-#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
-msgid "if applicable"
+#: ../../boot.php:1273
+msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../mod/notifications.php:181
-msgid "Claims to be known to you: "
+#: ../../boot.php:1279
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../mod/notifications.php:181
-msgid "yes"
+#: ../../boot.php:1282
+msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../mod/notifications.php:181
-msgid "no"
+#: ../../boot.php:1283
+msgid "terms of service"
 msgstr ""
 
-#: ../../mod/notifications.php:188
-msgid "Approve as: "
+#: ../../boot.php:1285
+msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../mod/notifications.php:189
-msgid "Friend"
+#: ../../boot.php:1286
+msgid "privacy policy"
 msgstr ""
 
-#: ../../mod/notifications.php:190
-msgid "Sharer"
+#: ../../boot.php:1419
+msgid "Requested account is not available."
 msgstr ""
 
-#: ../../mod/notifications.php:190
-msgid "Fan/Admirer"
+#: ../../boot.php:1501 ../../boot.php:1635
+#: ../../include/profile_advanced.php:84
+msgid "Edit profile"
 msgstr ""
 
-#: ../../mod/notifications.php:196
-msgid "Friend/Connect Request"
+#: ../../boot.php:1600
+msgid "Message"
 msgstr ""
 
-#: ../../mod/notifications.php:196
-msgid "New Follower"
+#: ../../boot.php:1606 ../../include/nav.php:175
+msgid "Profiles"
 msgstr ""
 
-#: ../../mod/notifications.php:217
-msgid "No introductions."
+#: ../../boot.php:1606
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../mod/notifications.php:220 ../../include/nav.php:153
-msgid "Notifications"
+#: ../../boot.php:1706
+msgid "Network:"
 msgstr ""
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:387
-#: ../../mod/notifications.php:478
-#, php-format
-msgid "%s liked %s's post"
+#: ../../boot.php:1736 ../../boot.php:1822
+msgid "g A l F d"
 msgstr ""
 
-#: ../../mod/notifications.php:268 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:488
-#, php-format
-msgid "%s disliked %s's post"
+#: ../../boot.php:1737 ../../boot.php:1823
+msgid "F d"
 msgstr ""
 
-#: ../../mod/notifications.php:283 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:503
-#, php-format
-msgid "%s is now friends with %s"
+#: ../../boot.php:1782 ../../boot.php:1863
+msgid "[today]"
 msgstr ""
 
-#: ../../mod/notifications.php:290 ../../mod/notifications.php:419
-#, php-format
-msgid "%s created a new post"
+#: ../../boot.php:1794
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../mod/notifications.php:291 ../../mod/notifications.php:420
-#: ../../mod/notifications.php:513
-#, php-format
-msgid "%s commented on %s's post"
+#: ../../boot.php:1795
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../mod/notifications.php:306
-msgid "No more network notifications."
+#: ../../boot.php:1856
+msgid "[No description]"
 msgstr ""
 
-#: ../../mod/notifications.php:310
-msgid "Network Notifications"
+#: ../../boot.php:1874
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../mod/notifications.php:435
-msgid "No more personal notifications."
+#: ../../boot.php:1875
+msgid "Events this week:"
 msgstr ""
 
-#: ../../mod/notifications.php:439
-msgid "Personal Notifications"
+#: ../../boot.php:2112 ../../include/nav.php:76
+msgid "Status"
 msgstr ""
 
-#: ../../mod/notifications.php:520
-msgid "No more home notifications."
+#: ../../boot.php:2115
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../mod/notifications.php:524
-msgid "Home Notifications"
+#: ../../boot.php:2122
+msgid "Profile Details"
 msgstr ""
 
-#: ../../mod/invite.php:27
-msgid "Total invitation limit exceeded."
+#: ../../boot.php:2133 ../../boot.php:2136 ../../include/nav.php:79
+msgid "Videos"
 msgstr ""
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../boot.php:2146
+msgid "Events and Calendar"
 msgstr ""
 
-#: ../../mod/invite.php:73
-msgid "Please join us on Friendica"
+#: ../../boot.php:2153
+msgid "Only You Can See This"
 msgstr ""
 
-#: ../../mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../object/Item.php:94
+msgid "This entry was edited"
 msgstr ""
 
-#: ../../mod/invite.php:89
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../object/Item.php:208
+msgid "ignore thread"
 msgstr ""
 
-#: ../../mod/invite.php:93
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../object/Item.php:209
+msgid "unignore thread"
+msgstr ""
 
-#: ../../mod/invite.php:112
-msgid "You have no more invitations available"
+#: ../../object/Item.php:210
+msgid "toggle ignore status"
 msgstr ""
 
-#: ../../mod/invite.php:120
-#, php-format
-msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many "
-"other social networks."
+#: ../../object/Item.php:213
+msgid "ignored"
 msgstr ""
 
-#: ../../mod/invite.php:122
+#: ../../object/Item.php:316 ../../include/conversation.php:666
+msgid "Categories:"
+msgstr ""
+
+#: ../../object/Item.php:317 ../../include/conversation.php:667
+msgid "Filed under:"
+msgstr ""
+
+#: ../../object/Item.php:329
+msgid "via"
+msgstr ""
+
+#: ../../include/dbstructure.php:26
 #, php-format
 msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
 msgstr ""
 
-#: ../../mod/invite.php:123
+#: ../../include/dbstructure.php:31
 #, php-format
 msgid ""
-"Friendica sites all inter-connect to create a huge privacy-enhanced social "
-"web that is owned and controlled by its members. They can also connect with "
-"many traditional social networks. See %s for a list of alternate Friendica "
-"sites you can join."
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: ../../mod/invite.php:126
-msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
+#: ../../include/dbstructure.php:162
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/invite.php:132
-msgid "Send invitations"
+#: ../../include/dbstructure.php:220
+msgid "Errors encountered performing database changes."
 msgstr ""
 
-#: ../../mod/invite.php:133
-msgid "Enter email addresses, one per line:"
+#: ../../include/auth.php:38
+msgid "Logged out."
 msgstr ""
 
-#: ../../mod/invite.php:135
+#: ../../include/auth.php:128 ../../include/user.php:67
 msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
+#: ../../include/auth.php:128 ../../include/user.php:67
+msgid "The error message was:"
 msgstr ""
 
-#: ../../mod/invite.php:137
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
 msgstr ""
 
-#: ../../mod/invite.php:139
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
-msgstr ""
-
-#: ../../mod/manage.php:106
-msgid "Manage Identities and/or Pages"
-msgstr ""
-
-#: ../../mod/manage.php:107
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr ""
-
-#: ../../mod/manage.php:108
-msgid "Select an identity to manage: "
-msgstr ""
-
-#: ../../mod/home.php:35
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
-msgstr ""
-
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
-msgstr ""
-
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr ""
-
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
 msgstr ""
 
 #: ../../include/contact_widgets.php:8
@@ -5999,10 +5765,18 @@ msgstr ""
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
+#: ../../include/contact_widgets.php:36 ../../view/theme/diabook/theme.php:526
+msgid "Similar Interests"
+msgstr ""
+
 #: ../../include/contact_widgets.php:37
 msgid "Random Profile"
 msgstr ""
 
+#: ../../include/contact_widgets.php:38 ../../view/theme/diabook/theme.php:528
+msgid "Invite Friends"
+msgstr ""
+
 #: ../../include/contact_widgets.php:71
 msgid "Networks"
 msgstr ""
@@ -6023,275 +5797,448 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: ../../include/plugin.php:455 ../../include/plugin.php:457
-msgid "Click here to upgrade."
+#: ../../include/features.php:23
+msgid "General Features"
 msgstr ""
 
-#: ../../include/plugin.php:463
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/plugin.php:468
-msgid "This action is not available under your subscription plan."
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/api.php:304 ../../include/api.php:315
-#: ../../include/api.php:416 ../../include/api.php:1063
-#: ../../include/api.php:1065
-msgid "User not found."
+#: ../../include/features.php:30
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/api.php:771
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
+#: ../../include/features.php:31
+msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/api.php:790
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/api.php:809
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
+#: ../../include/features.php:32
+msgid "Post Preview"
 msgstr ""
 
-#: ../../include/api.php:1272
-msgid "There is no status with this id."
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/api.php:1342
-msgid "There is no conversation with this id."
+#: ../../include/features.php:33
+msgid "Auto-mention Forums"
 msgstr ""
 
-#: ../../include/api.php:1614
-msgid "Invalid request."
+#: ../../include/features.php:33
+msgid ""
+"Add/remove mention when a fourm page is selected/deselected in ACL window."
 msgstr ""
 
-#: ../../include/api.php:1625
-msgid "Invalid item."
+#: ../../include/features.php:38
+msgid "Network Sidebar Widgets"
 msgstr ""
 
-#: ../../include/api.php:1635
-msgid "Invalid action. "
+#: ../../include/features.php:39
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/api.php:1643
-msgid "DB error"
+#: ../../include/features.php:39
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/network.php:895
-msgid "view full size"
+#: ../../include/features.php:40
+msgid "Group Filter"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:154
-msgid "Starts:"
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected group"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:162
-msgid "Finishes:"
+#: ../../include/features.php:41
+msgid "Network Filter"
 msgstr ""
 
-#: ../../include/dba_pdo.php:72 ../../include/dba.php:56
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../include/features.php:41
+msgid "Enable widget to display Network posts only from selected network"
 msgstr ""
 
-#: ../../include/notifier.php:786 ../../include/delivery.php:456
-msgid "(no subject)"
+#: ../../include/features.php:42
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/notifier.php:796 ../../include/enotify.php:33
-#: ../../include/delivery.php:467
-msgid "noreply"
+#: ../../include/features.php:47
+msgid "Network Tabs"
 msgstr ""
 
-#: ../../include/user.php:40
-msgid "An invitation is required."
+#: ../../include/features.php:48
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/user.php:45
-msgid "Invitation could not be verified."
+#: ../../include/features.php:48
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/user.php:53
-msgid "Invalid OpenID url"
+#: ../../include/features.php:49
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/user.php:67 ../../include/auth.php:128
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+#: ../../include/features.php:49
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: ../../include/user.php:67 ../../include/auth.php:128
-msgid "The error message was:"
+#: ../../include/features.php:50
+msgid "Network Shared Links Tab"
 msgstr ""
 
-#: ../../include/user.php:74
-msgid "Please enter the required information."
+#: ../../include/features.php:50
+msgid "Enable tab to display only Network posts with links in them"
 msgstr ""
 
-#: ../../include/user.php:88
-msgid "Please use a shorter name."
+#: ../../include/features.php:55
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/user.php:90
-msgid "Name too short."
+#: ../../include/features.php:56
+msgid "Multiple Deletion"
 msgstr ""
 
-#: ../../include/user.php:105
-msgid "That doesn't appear to be your full (First Last) name."
+#: ../../include/features.php:56
+msgid "Select and delete multiple posts/comments at once"
 msgstr ""
 
-#: ../../include/user.php:110
-msgid "Your email domain is not among those allowed on this site."
+#: ../../include/features.php:57
+msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/user.php:113
-msgid "Not a valid email address."
+#: ../../include/features.php:57
+msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/user.php:126
-msgid "Cannot use that email."
+#: ../../include/features.php:58
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/user.php:132
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../include/features.php:58
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/user.php:138 ../../include/user.php:236
-msgid "Nickname is already registered. Please choose another."
+#: ../../include/features.php:59
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/user.php:148
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
+#: ../../include/features.php:59
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/user.php:164
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../include/features.php:60
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/user.php:222
-msgid "An error occurred during registration. Please try again."
+#: ../../include/features.php:61
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/user.php:257
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../include/features.php:61
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/user.php:289 ../../include/user.php:293
-#: ../../include/profile_selectors.php:42
-msgid "Friends"
+#: ../../include/features.php:62
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/user.php:377
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
+#: ../../include/features.php:62
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/user.php:381
-#, php-format
-msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
+#: ../../include/features.php:63
+msgid "Mute Post Notifications"
 msgstr ""
 
-#: ../../include/conversation.php:207
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/features.php:63
+msgid "Ability to mute notifications for a thread"
 msgstr ""
 
-#: ../../include/conversation.php:211 ../../include/text.php:1005
-msgid "poked"
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
 msgstr ""
 
-#: ../../include/conversation.php:291
-msgid "post/item"
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../include/conversation.php:292
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr ""
+
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
+msgstr ""
+
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
+msgstr ""
+
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
+msgstr ""
+
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr ""
+
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr ""
+
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
+msgstr ""
+
+#: ../../include/follow.php:258
+msgid "following"
+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:207
+msgid "Default privacy group for new contacts"
+msgstr ""
+
+#: ../../include/group.php:226
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/group.php:249
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:271
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:272
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:273
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:153 ../../include/datetime.php:290
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:158 ../../include/datetime.php:291
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:163 ../../include/datetime.php:293
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:276
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:282
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:290
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:291
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:292
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:292
+msgid "weeks"
+msgstr ""
+
+#: ../../include/datetime.php:293
+msgid "days"
+msgstr ""
+
+#: ../../include/datetime.php:294
+msgid "hour"
+msgstr ""
+
+#: ../../include/datetime.php:294
+msgid "hours"
+msgstr ""
+
+#: ../../include/datetime.php:295
+msgid "minute"
+msgstr ""
+
+#: ../../include/datetime.php:295
+msgid "minutes"
+msgstr ""
+
+#: ../../include/datetime.php:296
+msgid "second"
+msgstr ""
+
+#: ../../include/datetime.php:296
+msgid "seconds"
+msgstr ""
+
+#: ../../include/datetime.php:305
 #, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/conversation.php:772
-msgid "remove"
+#: ../../include/datetime.php:477 ../../include/items.php:2211
+#, php-format
+msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/conversation.php:776
-msgid "Delete Selected Items"
+#: ../../include/datetime.php:478 ../../include/items.php:2212
+#, php-format
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/conversation.php:875
-msgid "Follow Thread"
+#: ../../include/acl_selectors.php:333
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/acl_selectors.php:334 ../../view/theme/diabook/config.php:142
+#: ../../view/theme/diabook/theme.php:621
+msgid "show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:335 ../../view/theme/diabook/config.php:142
+#: ../../view/theme/diabook/theme.php:621
+msgid "don't show"
+msgstr ""
+
+#: ../../include/message.php:15 ../../include/message.php:172
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/conversation.php:876 ../../include/Contact.php:229
+#: ../../include/Contact.php:115
+msgid "stopped following"
+msgstr ""
+
+#: ../../include/Contact.php:228 ../../include/conversation.php:882
+msgid "Poke"
+msgstr ""
+
+#: ../../include/Contact.php:229 ../../include/conversation.php:876
 msgid "View Status"
 msgstr ""
 
-#: ../../include/conversation.php:877 ../../include/Contact.php:230
+#: ../../include/Contact.php:230 ../../include/conversation.php:877
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/conversation.php:878 ../../include/Contact.php:231
+#: ../../include/Contact.php:231 ../../include/conversation.php:878
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/conversation.php:879 ../../include/Contact.php:232
-#: ../../include/Contact.php:255
+#: ../../include/Contact.php:232 ../../include/Contact.php:255
+#: ../../include/conversation.php:879
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/conversation.php:880 ../../include/Contact.php:233
-#: ../../include/Contact.php:255
+#: ../../include/Contact.php:233 ../../include/Contact.php:255
+#: ../../include/conversation.php:880
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/conversation.php:881 ../../include/Contact.php:235
-#: ../../include/Contact.php:255
+#: ../../include/Contact.php:234
+msgid "Drop Contact"
+msgstr ""
+
+#: ../../include/Contact.php:235 ../../include/Contact.php:255
+#: ../../include/conversation.php:881
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:882 ../../include/Contact.php:228
-msgid "Poke"
+#: ../../include/security.php:22
+msgid "Welcome "
+msgstr ""
+
+#: ../../include/security.php:23
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../include/security.php:26
+msgid "Welcome back "
+msgstr ""
+
+#: ../../include/security.php:366
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/conversation.php:118 ../../include/conversation.php:246
+#: ../../include/text.php:1966 ../../view/theme/diabook/theme.php:463
+msgid "event"
+msgstr ""
+
+#: ../../include/conversation.php:207
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:211 ../../include/text.php:1005
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:291
+msgid "post/item"
+msgstr ""
+
+#: ../../include/conversation.php:292
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr ""
+
+#: ../../include/conversation.php:772
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:776
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:875
+msgid "Follow Thread"
 msgstr ""
 
 #: ../../include/conversation.php:944
@@ -6382,56 +6329,20 @@ msgstr ""
 msgid "Private post"
 msgstr ""
 
-#: ../../include/auth.php:38
-msgid "Logged out."
+#: ../../include/network.php:895
+msgid "view full size"
 msgstr ""
 
-#: ../../include/uimport.php:94
-msgid "Error decoding account file"
+#: ../../include/text.php:297
+msgid "newer"
 msgstr ""
 
-#: ../../include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: ../../include/text.php:299
+msgid "older"
 msgstr ""
 
-#: ../../include/uimport.php:116 ../../include/uimport.php:127
-msgid "Error! Cannot check nickname"
-msgstr ""
-
-#: ../../include/uimport.php:120 ../../include/uimport.php:131
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
-
-#: ../../include/uimport.php:153
-msgid "User creation error"
-msgstr ""
-
-#: ../../include/uimport.php:171
-msgid "User profile creation error"
-msgstr ""
-
-#: ../../include/uimport.php:220
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/uimport.php:290
-msgid "Done. You can now login with your username and password"
-msgstr ""
-
-#: ../../include/text.php:297
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:299
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:304
-msgid "prev"
+#: ../../include/text.php:304
+msgid "prev"
 msgstr ""
 
 #: ../../include/text.php:306
@@ -6665,6 +6576,11 @@ msgstr ""
 msgid "Click to open/close"
 msgstr ""
 
+#: ../../include/text.php:1702 ../../include/user.php:247
+#: ../../view/theme/duepuntozero/config.php:44
+msgid "default"
+msgstr ""
+
 #: ../../include/text.php:1714
 msgid "Select an alternate language"
 msgstr ""
@@ -6681,390 +6597,241 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/enotify.php:18
-msgid "Friendica Notification"
-msgstr ""
-
-#: ../../include/enotify.php:21
-msgid "Thank You,"
+#: ../../include/bbcode.php:428 ../../include/bbcode.php:1047
+#: ../../include/bbcode.php:1048
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/enotify.php:23
+#: ../../include/bbcode.php:528
 #, php-format
-msgid "%s Administrator"
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: ../../include/enotify.php:64
+#: ../../include/bbcode.php:562
 #, php-format
-msgid "%s <!item_type!>"
+msgid ""
+"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href="
+"\"%s\" target=\"_blank\">post</a>"
 msgstr ""
 
-#: ../../include/enotify.php:68
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
+#: ../../include/bbcode.php:1011 ../../include/bbcode.php:1031
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/enotify.php:70
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
+#: ../../include/bbcode.php:1056 ../../include/bbcode.php:1057
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/enotify.php:71
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/notifier.php:786 ../../include/delivery.php:456
+msgid "(no subject)"
 msgstr ""
 
-#: ../../include/enotify.php:71
-msgid "a private message"
+#: ../../include/notifier.php:796 ../../include/delivery.php:467
+#: ../../include/enotify.php:33
+msgid "noreply"
 msgstr ""
 
-#: ../../include/enotify.php:72
+#: ../../include/dba_pdo.php:72 ../../include/dba.php:56
 #, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/enotify.php:124
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/enotify.php:131
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/enotify.php:139
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/enotify.php:149
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
 msgstr ""
 
-#: ../../include/enotify.php:150
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
 msgstr ""
 
-#: ../../include/enotify.php:153 ../../include/enotify.php:168
-#: ../../include/enotify.php:181 ../../include/enotify.php:194
-#: ../../include/enotify.php:212 ../../include/enotify.php:225
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
 msgstr ""
 
-#: ../../include/enotify.php:160
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/enotify.php:162
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/enotify.php:164
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/enotify.php:175
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/enotify.php:176
-#, php-format
-msgid "%1$s tagged you at %2$s"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
 msgstr ""
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s shared a new post at %2$s"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/enotify.php:190
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
 msgstr ""
 
-#: ../../include/enotify.php:202
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
+#: ../../include/contact_selectors.php:88
+msgid "pump.io"
 msgstr ""
 
-#: ../../include/enotify.php:203
-#, php-format
-msgid "%1$s poked you at %2$s"
+#: ../../include/contact_selectors.php:89
+msgid "Twitter"
 msgstr ""
 
-#: ../../include/enotify.php:204
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
+#: ../../include/contact_selectors.php:90
+msgid "Diaspora Connector"
 msgstr ""
 
-#: ../../include/enotify.php:219
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
+#: ../../include/contact_selectors.php:91
+msgid "Statusnet"
 msgstr ""
 
-#: ../../include/enotify.php:220
-#, php-format
-msgid "%1$s tagged your post at %2$s"
+#: ../../include/contact_selectors.php:92
+msgid "App.net"
 msgstr ""
 
-#: ../../include/enotify.php:221
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
+#: ../../include/Scrape.php:614
+msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/enotify.php:232
-msgid "[Friendica:Notify] Introduction received"
+#: ../../include/bb2diaspora.php:154 ../../include/event.php:20
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/enotify.php:233
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+#: ../../include/bb2diaspora.php:162 ../../include/event.php:30
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/enotify.php:234
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/enotify.php:237 ../../include/enotify.php:279
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/profile_advanced.php:23
+msgid "j F"
 msgstr ""
 
-#: ../../include/enotify.php:239
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: ../../include/profile_advanced.php:30
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/enotify.php:247
-msgid "[Friendica:Notify] A new person is sharing with you"
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
 msgstr ""
 
-#: ../../include/enotify.php:248 ../../include/enotify.php:249
+#: ../../include/profile_advanced.php:43
 #, php-format
-msgid "%1$s is sharing with you at %2$s"
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:255
-msgid "[Friendica:Notify] You have a new follower"
+#: ../../include/profile_advanced.php:52
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/enotify.php:256 ../../include/enotify.php:257
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
+#: ../../include/profile_advanced.php:56
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/enotify.php:270
-msgid "[Friendica:Notify] Friend suggestion received"
+#: ../../include/profile_advanced.php:60
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/enotify.php:271
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+#: ../../include/profile_advanced.php:67
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/enotify.php:272
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+#: ../../include/profile_advanced.php:69
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/enotify.php:277
-msgid "Name:"
+#: ../../include/profile_advanced.php:71
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/enotify.php:278
-msgid "Photo:"
+#: ../../include/profile_advanced.php:73
+msgid "Television:"
 msgstr ""
 
-#: ../../include/enotify.php:281
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/profile_advanced.php:75
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/enotify.php:289 ../../include/enotify.php:302
-msgid "[Friendica:Notify] Connection accepted"
+#: ../../include/profile_advanced.php:77
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/enotify.php:290 ../../include/enotify.php:303
-#, php-format
-msgid "'%1$s' has acepted your connection request at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:291 ../../include/enotify.php:304
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr ""
-
-#: ../../include/enotify.php:294
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email\n"
-"\twithout restriction."
-msgstr ""
-
-#: ../../include/enotify.php:297 ../../include/enotify.php:311
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr ""
-
-#: ../../include/enotify.php:307
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr ""
-
-#: ../../include/enotify.php:309
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future. "
-msgstr ""
-
-#: ../../include/enotify.php:322
-msgid "[Friendica System:Notify] registration request"
-msgstr ""
-
-#: ../../include/enotify.php:323
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:324
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:327
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr ""
-
-#: ../../include/enotify.php:330
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr ""
-
-#: ../../include/Scrape.php:614
-msgid " on Last.fm"
-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:207
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:226
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/group.php:249
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:271
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:272
-msgid "Create a new group"
-msgstr ""
-
-#: ../../include/group.php:273
-msgid "Contacts not in any group"
-msgstr ""
-
-#: ../../include/follow.php:32
-msgid "Connect URL missing."
-msgstr ""
-
-#: ../../include/follow.php:59
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr ""
-
-#: ../../include/follow.php:60 ../../include/follow.php:80
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
-
-#: ../../include/follow.php:78
-msgid "The profile address specified does not provide adequate information."
+#: ../../include/profile_advanced.php:79
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "An author or name was not found."
+#: ../../include/profile_advanced.php:81
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/follow.php:84
-msgid "No browser URL could be matched to this address."
+#: ../../include/plugin.php:455 ../../include/plugin.php:457
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/follow.php:86
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
+#: ../../include/plugin.php:463
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/follow.php:87
-msgid "Use mailto: in front of address to force email check."
+#: ../../include/plugin.php:468
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/follow.php:93
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: ../../include/nav.php:73
+msgid "End this session"
 msgstr ""
 
-#: ../../include/follow.php:103
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../include/nav.php:76 ../../include/nav.php:148
+#: ../../view/theme/diabook/theme.php:123
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/follow.php:205
-msgid "Unable to retrieve contact information."
+#: ../../include/nav.php:77 ../../view/theme/diabook/theme.php:124
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/follow.php:258
-msgid "following"
+#: ../../include/nav.php:78 ../../view/theme/diabook/theme.php:126
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/message.php:15 ../../include/message.php:172
-msgid "[no subject]"
+#: ../../include/nav.php:79
+msgid "Your videos"
 msgstr ""
 
-#: ../../include/nav.php:73
-msgid "End this session"
+#: ../../include/nav.php:80 ../../view/theme/diabook/theme.php:127
+msgid "Your events"
 msgstr ""
 
-#: ../../include/nav.php:79
-msgid "Your videos"
+#: ../../include/nav.php:81 ../../view/theme/diabook/theme.php:128
+msgid "Personal notes"
 msgstr ""
 
 #: ../../include/nav.php:81
@@ -7104,811 +6871,1011 @@ msgid "Conversations on this site"
 msgstr ""
 
 #: ../../include/nav.php:131
+msgid "Conversations on the network"
+msgstr ""
+
+#: ../../include/nav.php:133
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:131
+#: ../../include/nav.php:133
 msgid "People directory"
 msgstr ""
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:135
 msgid "Information"
 msgstr ""
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:135
 msgid "Information about this friendica instance"
 msgstr ""
 
-#: ../../include/nav.php:143
+#: ../../include/nav.php:145
 msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:146
 msgid "Network Reset"
 msgstr ""
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:146
 msgid "Load Network page with no filters"
 msgstr ""
 
-#: ../../include/nav.php:152
+#: ../../include/nav.php:154
 msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/nav.php:154
+#: ../../include/nav.php:156
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:155
+#: ../../include/nav.php:157
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:161
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:160
+#: ../../include/nav.php:162
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:163
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:165
+#: ../../include/nav.php:167
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:165
+#: ../../include/nav.php:167
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:172
 msgid "Account settings"
 msgstr ""
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:177
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:182
+#: ../../include/nav.php:184
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:186
+#: ../../include/nav.php:188
 msgid "Navigation"
 msgstr ""
 
-#: ../../include/nav.php:186
+#: ../../include/nav.php:188
 msgid "Site map"
 msgstr ""
 
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
+#: ../../include/api.php:304 ../../include/api.php:315
+#: ../../include/api.php:416 ../../include/api.php:1063
+#: ../../include/api.php:1065
+msgid "User not found."
 msgstr ""
 
-#: ../../include/profile_advanced.php:23
-msgid "j F"
+#: ../../include/api.php:771
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/profile_advanced.php:30
-msgid "Birthday:"
+#: ../../include/api.php:790
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
+#: ../../include/api.php:809
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: ../../include/profile_advanced.php:43
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/api.php:1272
+msgid "There is no status with this id."
 msgstr ""
 
-#: ../../include/profile_advanced.php:52
-msgid "Tags:"
+#: ../../include/api.php:1342
+msgid "There is no conversation with this id."
 msgstr ""
 
-#: ../../include/profile_advanced.php:56
-msgid "Religion:"
+#: ../../include/api.php:1614
+msgid "Invalid request."
 msgstr ""
 
-#: ../../include/profile_advanced.php:60
-msgid "Hobbies/Interests:"
+#: ../../include/api.php:1625
+msgid "Invalid item."
 msgstr ""
 
-#: ../../include/profile_advanced.php:67
-msgid "Contact information and Social Networks:"
+#: ../../include/api.php:1635
+msgid "Invalid action. "
 msgstr ""
 
-#: ../../include/profile_advanced.php:69
-msgid "Musical interests:"
+#: ../../include/api.php:1643
+msgid "DB error"
 msgstr ""
 
-#: ../../include/profile_advanced.php:71
-msgid "Books, literature:"
+#: ../../include/user.php:40
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/profile_advanced.php:73
-msgid "Television:"
+#: ../../include/user.php:45
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/profile_advanced.php:75
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/user.php:53
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../include/profile_advanced.php:77
-msgid "Love/Romance:"
+#: ../../include/user.php:74
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/profile_advanced.php:79
-msgid "Work/employment:"
+#: ../../include/user.php:88
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../include/profile_advanced.php:81
-msgid "School/education:"
+#: ../../include/user.php:90
+msgid "Name too short."
 msgstr ""
 
-#: ../../include/bbcode.php:428 ../../include/bbcode.php:1047
-#: ../../include/bbcode.php:1048
-msgid "Image/photo"
+#: ../../include/user.php:105
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../include/bbcode.php:528
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+#: ../../include/user.php:110
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../include/bbcode.php:562
-#, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href="
-"\"%s\" target=\"_blank\">post</a>"
+#: ../../include/user.php:113
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../include/bbcode.php:1011 ../../include/bbcode.php:1031
-msgid "$1 wrote:"
+#: ../../include/user.php:126
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../include/bbcode.php:1056 ../../include/bbcode.php:1057
-msgid "Encrypted content"
+#: ../../include/user.php:132
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: ../../include/user.php:138 ../../include/user.php:236
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
+#: ../../include/user.php:148
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../include/user.php:164
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../include/user.php:222
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: ../../include/user.php:257
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: ../../include/user.php:289 ../../include/user.php:293
+#: ../../include/profile_selectors.php:42
+msgid "Friends"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/user.php:377
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/user.php:381
+#, php-format
+msgid ""
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$s\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\tthan that.\n"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/diaspora.php:703
+msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/diaspora.php:2520
+msgid "Attachments:"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/items.php:4555
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/items.php:4778
+msgid "Archives"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
 msgstr ""
 
-#: ../../include/contact_selectors.php:87
-msgid "Google+"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/contact_selectors.php:88
-msgid "pump.io"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/contact_selectors.php:89
-msgid "Twitter"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/contact_selectors.php:90
-msgid "Diaspora Connector"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/contact_selectors.php:91
-msgid "Statusnet"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/contact_selectors.php:92
-msgid "App.net"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/datetime.php:153 ../../include/datetime.php:290
-msgid "year"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/datetime.php:158 ../../include/datetime.php:291
-msgid "month"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/datetime.php:163 ../../include/datetime.php:293
-msgid "day"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/datetime.php:276
-msgid "never"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
 msgstr ""
 
-#: ../../include/datetime.php:282
-msgid "less than a second ago"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/datetime.php:290
-msgid "years"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
 msgstr ""
 
-#: ../../include/datetime.php:291
-msgid "months"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
 msgstr ""
 
-#: ../../include/datetime.php:292
-msgid "week"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
 msgstr ""
 
-#: ../../include/datetime.php:292
-msgid "weeks"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/datetime.php:293
-msgid "days"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/datetime.php:294
-msgid "hour"
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/datetime.php:294
-msgid "hours"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/datetime.php:295
-msgid "minute"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/datetime.php:295
-msgid "minutes"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/datetime.php:296
-msgid "second"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/datetime.php:296
-msgid "seconds"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/datetime.php:305
-#, php-format
-msgid "%1$d %2$s ago"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/datetime.php:477 ../../include/items.php:2204
-#, php-format
-msgid "%s's birthday"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/datetime.php:478 ../../include/items.php:2205
-#, php-format
-msgid "Happy Birthday %s"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
 msgstr ""
 
-#: ../../include/features.php:23
-msgid "General Features"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Multiple Profiles"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Ability to create multiple profiles"
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/features.php:30
-msgid "Post Composition Features"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid "Richtext Editor"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid "Enable richtext editor"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Post Preview"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Allow previewing posts and comments before publishing them"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid "Auto-mention Forums"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid ""
-"Add/remove mention when a fourm page is selected/deselected in ACL window."
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
 msgstr ""
 
-#: ../../include/features.php:38
-msgid "Network Sidebar Widgets"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Search by Date"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Ability to select posts by date ranges"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Group Filter"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Enable widget to display Network posts only from selected group"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Network Filter"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Enable widget to display Network posts only from selected network"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Save search terms for re-use"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Network Tabs"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Network Personal Tab"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Network New Tab"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Network Shared Links Tab"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Enable tab to display only Network posts with links in them"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Post/Comment Tools"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Multiple Deletion"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Select and delete multiple posts/comments at once"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Edit Sent Posts"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Edit and correct posts and comments after sending"
+#: ../../include/enotify.php:18
+msgid "Friendica Notification"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Tagging"
+#: ../../include/enotify.php:21
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Ability to tag existing posts"
+#: ../../include/enotify.php:23
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Post Categories"
+#: ../../include/enotify.php:64
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Add categories to your posts"
+#: ../../include/enotify.php:68
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Ability to file posts under folders"
+#: ../../include/enotify.php:70
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Dislike Posts"
+#: ../../include/enotify.php:71
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Ability to dislike posts/comments"
+#: ../../include/enotify.php:71
+msgid "a private message"
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Star Posts"
+#: ../../include/enotify.php:72
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/enotify.php:124
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Mute Post Notifications"
+#: ../../include/enotify.php:131
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Ability to mute notifications for a thread"
+#: ../../include/enotify.php:139
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: ../../include/diaspora.php:703
-msgid "Sharing notification from Diaspora network"
+#: ../../include/enotify.php:149
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/diaspora.php:2520
-msgid "Attachments:"
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/dbstructure.php:26
+#: ../../include/enotify.php:153 ../../include/enotify.php:168
+#: ../../include/enotify.php:181 ../../include/enotify.php:194
+#: ../../include/enotify.php:212 ../../include/enotify.php:225
 #, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/dbstructure.php:31
+#: ../../include/enotify.php:160
 #, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
+msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/dbstructure.php:162
-msgid "Errors encountered creating database tables."
+#: ../../include/enotify.php:162
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: ../../include/dbstructure.php:220
-msgid "Errors encountered performing database changes."
+#: ../../include/enotify.php:164
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: ../../include/acl_selectors.php:333
-msgid "Visible to everybody"
+#: ../../include/enotify.php:175
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/items.php:4539
-msgid "Do you really want to delete this item?"
+#: ../../include/enotify.php:176
+#, php-format
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: ../../include/items.php:4762
-msgid "Archives"
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: ../../include/oembed.php:212
-msgid "Embedded content"
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
 msgstr ""
 
-#: ../../include/oembed.php:221
-msgid "Embedding disabled"
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s shared a new post at %2$s"
 msgstr ""
 
-#: ../../include/security.php:22
-msgid "Welcome "
+#: ../../include/enotify.php:190
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr ""
 
-#: ../../include/security.php:23
-msgid "Please upload a profile photo."
+#: ../../include/enotify.php:202
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/security.php:26
-msgid "Welcome back "
+#: ../../include/enotify.php:203
+#, php-format
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../include/security.php:366
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/enotify.php:204
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
+#: ../../include/enotify.php:219
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
+#: ../../include/enotify.php:220
+#, php-format
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../include/enotify.php:221
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../include/enotify.php:232
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:233
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:234
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:237 ../../include/enotify.php:279
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:239
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: ../../include/enotify.php:247
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr ""
+
+#: ../../include/enotify.php:248 ../../include/enotify.php:249
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:255
+msgid "[Friendica:Notify] You have a new follower"
+msgstr ""
+
+#: ../../include/enotify.php:256 ../../include/enotify.php:257
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr ""
+
+#: ../../include/enotify.php:270
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:271
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:277
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:278
+msgid "Photo:"
+msgstr ""
+
+#: ../../include/enotify.php:281
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../include/enotify.php:289 ../../include/enotify.php:302
+msgid "[Friendica:Notify] Connection accepted"
+msgstr ""
+
+#: ../../include/enotify.php:290 ../../include/enotify.php:303
+#, php-format
+msgid "'%1$s' has acepted your connection request at %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:291 ../../include/enotify.php:304
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr ""
+
+#: ../../include/enotify.php:294
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email\n"
+"\twithout restriction."
+msgstr ""
+
+#: ../../include/enotify.php:297 ../../include/enotify.php:311
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr ""
+
+#: ../../include/enotify.php:307
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr ""
+
+#: ../../include/enotify.php:309
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future. "
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../include/enotify.php:322
+msgid "[Friendica System:Notify] registration request"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../include/enotify.php:323
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../include/enotify.php:324
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../include/enotify.php:327
+#, php-format
+msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../include/enotify.php:330
+#, php-format
+msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../include/oembed.php:212
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../include/oembed.php:221
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../include/uimport.php:94
+msgid "Error decoding account file"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
+#: ../../include/uimport.php:100
+msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/uimport.php:116 ../../include/uimport.php:127
+msgid "Error! Cannot check nickname"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
+#: ../../include/uimport.php:120 ../../include/uimport.php:131
+#, php-format
+msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
+#: ../../include/uimport.php:153
+msgid "User creation error"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
+#: ../../include/uimport.php:171
+msgid "User profile creation error"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr ""
+#: ../../include/uimport.php:220
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
+#: ../../include/uimport.php:290
+msgid "Done. You can now login with your username and password"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
+#: ../../index.php:428
+msgid "toggle mobile"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/dispy/config.php:72 ../../view/theme/quattro/config.php:66
+#: ../../view/theme/diabook/config.php:150 ../../view/theme/vier/config.php:55
+#: ../../view/theme/duepuntozero/config.php:61
+msgid "Theme settings"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/dispy/config.php:73
+#: ../../view/theme/diabook/config.php:151
+msgid "Set font-size for posts and comments"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
+#: ../../view/theme/cleanzero/config.php:86
+#: ../../view/theme/quattro/config.php:68
+msgid "Color scheme"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
+#: ../../view/theme/dispy/config.php:74
+#: ../../view/theme/diabook/config.php:152
+msgid "Set line-height for posts and comments"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
+#: ../../view/theme/quattro/config.php:67
+msgid "Alignment"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
+#: ../../view/theme/quattro/config.php:67
+msgid "Left"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
+#: ../../view/theme/quattro/config.php:67
+msgid "Center"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
+#: ../../view/theme/quattro/config.php:69
+msgid "Posts font size"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
+#: ../../view/theme/quattro/config.php:70
+msgid "Textareas font size"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
+#: ../../view/theme/diabook/config.php:153
+msgid "Set resolution for middle column"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
+#: ../../view/theme/diabook/config.php:154
+msgid "Set color scheme"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
+#: ../../view/theme/diabook/config.php:155
+msgid "Set zoomfactor for Earth Layer"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
+#: ../../view/theme/diabook/config.php:156
+#: ../../view/theme/diabook/theme.php:585
+msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: ../../view/theme/diabook/config.php:157
+#: ../../view/theme/diabook/theme.php:586
+msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
+#: ../../view/theme/diabook/config.php:158
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/theme.php:544
+#: ../../view/theme/diabook/theme.php:624
+msgid "Community Pages"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
+#: ../../view/theme/diabook/config.php:159
+#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:625
+msgid "Earth Layers"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
+#: ../../view/theme/diabook/config.php:160
+#: ../../view/theme/diabook/theme.php:391
+#: ../../view/theme/diabook/theme.php:626
+msgid "Community Profiles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: ../../view/theme/diabook/config.php:161
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:627
+msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
+#: ../../view/theme/diabook/config.php:162
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:628
+msgid "Connect Services"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
+#: ../../view/theme/diabook/config.php:163
+#: ../../view/theme/diabook/theme.php:523
+#: ../../view/theme/diabook/theme.php:629
+msgid "Find Friends"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
+#: ../../view/theme/diabook/config.php:164
+#: ../../view/theme/diabook/theme.php:412
+#: ../../view/theme/diabook/theme.php:630
+msgid "Last users"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
+#: ../../view/theme/diabook/config.php:165
+#: ../../view/theme/diabook/theme.php:486
+#: ../../view/theme/diabook/theme.php:631
+msgid "Last photos"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
+#: ../../view/theme/diabook/config.php:166
+#: ../../view/theme/diabook/theme.php:441
+#: ../../view/theme/diabook/theme.php:632
+msgid "Last likes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
+#: ../../view/theme/diabook/theme.php:125
+msgid "Your contacts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
+#: ../../view/theme/diabook/theme.php:128
+msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
+#: ../../view/theme/diabook/theme.php:524
+msgid "Local Directory"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
+#: ../../view/theme/diabook/theme.php:584
+msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
+#: ../../view/theme/diabook/theme.php:622
+msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: ../../view/theme/vier/config.php:56
+msgid "Set style"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
+#: ../../view/theme/duepuntozero/config.php:45
+msgid "greenzero"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
+#: ../../view/theme/duepuntozero/config.php:46
+msgid "purplezero"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
+#: ../../view/theme/duepuntozero/config.php:47
+msgid "easterbunny"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
+#: ../../view/theme/duepuntozero/config.php:48
+msgid "darkzero"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
+#: ../../view/theme/duepuntozero/config.php:49
+msgid "comix"
 msgstr ""
 
-#: ../../include/Contact.php:115
-msgid "stopped following"
+#: ../../view/theme/duepuntozero/config.php:50
+msgid "slackr"
 msgstr ""
 
-#: ../../include/Contact.php:234
-msgid "Drop Contact"
+#: ../../view/theme/duepuntozero/config.php:62
+msgid "Variations"
 msgstr ""

diff --git a/view/cs/messages.po b/view/cs/messages.po
index ba1cb061f4f69ecf46a57c092e206161ffb7b61f..5d8a5096ea0c54c1ef9558ea3c9b37413066a081 100644 (file)
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-04 11:35+0100\n"
-"PO-Revision-Date: 2015-02-05 09:47+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"PO-Revision-Date: 2015-02-08 22:34+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -614,77 +614,77 @@ msgstr "standardní"
 
 #: ../../view/theme/clean/config.php:57
 msgid "Midnight"
-msgstr ""
+msgstr "půlnoc"
 
 #: ../../view/theme/clean/config.php:58
 msgid "Bootstrap"
-msgstr ""
+msgstr "Bootstrap"
 
 #: ../../view/theme/clean/config.php:59
 msgid "Shades of Pink"
-msgstr ""
+msgstr "Odstíny růžové"
 
 #: ../../view/theme/clean/config.php:60
 msgid "Lime and Orange"
-msgstr ""
+msgstr "Limetka a pomeranč"
 
 #: ../../view/theme/clean/config.php:61
 msgid "GeoCities Retro"
-msgstr ""
+msgstr "GeoCities Retro"
 
 #: ../../view/theme/clean/config.php:85
 msgid "Background Image"
-msgstr ""
+msgstr "Obrázek pozadí"
 
 #: ../../view/theme/clean/config.php:85
 msgid ""
 "The URL to a picture (e.g. from your photo album) that should be used as "
 "background image."
-msgstr ""
+msgstr "URL odkaz na obrázek (např. z Vašeho foto alba), který bude použit jako obrázek na pozadí."
 
 #: ../../view/theme/clean/config.php:86
 msgid "Background Color"
-msgstr ""
+msgstr "Barva pozadí"
 
 #: ../../view/theme/clean/config.php:86
 msgid "HEX value for the background color. Don't include the #"
-msgstr ""
+msgstr "HEXadecimální hodnota barvy pozadí. Nevkládejte znak #"
 
 #: ../../view/theme/clean/config.php:88
 msgid "font size"
-msgstr ""
+msgstr "velikost fondu"
 
 #: ../../view/theme/clean/config.php:88
 msgid "base font size for your interface"
-msgstr ""
+msgstr "základní velikost fontu"
 
 #: ../../view/theme/duepuntozero/config.php:45
 msgid "greenzero"
-msgstr ""
+msgstr "zelená nula"
 
 #: ../../view/theme/duepuntozero/config.php:46
 msgid "purplezero"
-msgstr ""
+msgstr "fialová nula"
 
 #: ../../view/theme/duepuntozero/config.php:47
 msgid "easterbunny"
-msgstr ""
+msgstr "velikonoční zajíček"
 
 #: ../../view/theme/duepuntozero/config.php:48
 msgid "darkzero"
-msgstr ""
+msgstr "tmavá nula"
 
 #: ../../view/theme/duepuntozero/config.php:49
 msgid "comix"
-msgstr ""
+msgstr "komiksová"
 
 #: ../../view/theme/duepuntozero/config.php:50
 msgid "slackr"
-msgstr ""
+msgstr "flákač"
 
 #: ../../view/theme/duepuntozero/config.php:62
 msgid "Variations"
-msgstr ""
+msgstr "Variace"
 
 #: ../../view/theme/vier/config.php:56
 #: ../../view/theme/vier-mobil/config.php:50
@@ -2050,11 +2050,11 @@ msgstr "Logy"
 
 #: ../../mod/admin.php:124
 msgid "probe address"
-msgstr ""
+msgstr "vyzkoušet adresu"
 
 #: ../../mod/admin.php:125
 msgid "check webfinger"
-msgstr ""
+msgstr "vyzkoušet webfinger"
 
 #: ../../mod/admin.php:130 ../../include/nav.php:182
 msgid "Admin"
@@ -6233,7 +6233,7 @@ msgid ""
 "\n"
 "\n"
 "\t\tThank you and welcome to %2$s."
-msgstr ""
+msgstr "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3$s\n\t\t\tpřihlašovací jméno:\t%1$s\n\t\t\theslo:\t%5$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2$s."
 
 #: ../../include/conversation.php:207
 #, php-format

diff --git a/view/cs/strings.php b/view/cs/strings.php
index 1dcc73c40a868adce34625ed57b032727c78971c..d8c9eda05f4d722c5bb81b30cca78b47d54c3b90 100644 (file)
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -120,24 +120,24 @@ $a->strings["Set resize level for images in posts and comments (width and height
 $a->strings["Set theme width"] = "Nastavení šířku grafické šablony";
 $a->strings["Set colour scheme"] = "Nastavit barevné schéma";
 $a->strings["default"] = "standardní";
-$a->strings["Midnight"] = "";
-$a->strings["Bootstrap"] = "";
-$a->strings["Shades of Pink"] = "";
-$a->strings["Lime and Orange"] = "";
-$a->strings["GeoCities Retro"] = "";
-$a->strings["Background Image"] = "";
-$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "";
-$a->strings["Background Color"] = "";
-$a->strings["HEX value for the background color. Don't include the #"] = "";
-$a->strings["font size"] = "";
-$a->strings["base font size for your interface"] = "";
-$a->strings["greenzero"] = "";
-$a->strings["purplezero"] = "";
-$a->strings["easterbunny"] = "";
-$a->strings["darkzero"] = "";
-$a->strings["comix"] = "";
-$a->strings["slackr"] = "";
-$a->strings["Variations"] = "";
+$a->strings["Midnight"] = "půlnoc";
+$a->strings["Bootstrap"] = "Bootstrap";
+$a->strings["Shades of Pink"] = "Odstíny růžové";
+$a->strings["Lime and Orange"] = "Limetka a pomeranč";
+$a->strings["GeoCities Retro"] = "GeoCities Retro";
+$a->strings["Background Image"] = "Obrázek pozadí";
+$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "URL odkaz na obrázek (např. z Vašeho foto alba), který bude použit jako obrázek na pozadí.";
+$a->strings["Background Color"] = "Barva pozadí";
+$a->strings["HEX value for the background color. Don't include the #"] = "HEXadecimální hodnota barvy pozadí. Nevkládejte znak #";
+$a->strings["font size"] = "velikost fondu";
+$a->strings["base font size for your interface"] = "základní velikost fontu";
+$a->strings["greenzero"] = "zelená nula";
+$a->strings["purplezero"] = "fialová nula";
+$a->strings["easterbunny"] = "velikonoční zajíček";
+$a->strings["darkzero"] = "tmavá nula";
+$a->strings["comix"] = "komiksová";
+$a->strings["slackr"] = "flákač";
+$a->strings["Variations"] = "Variace";
 $a->strings["Set style"] = "Nastavit styl";
 $a->strings["Delete this item?"] = "Odstranit tuto položku?";
 $a->strings["show fewer"] = "zobrazit méně";
@@ -421,8 +421,8 @@ $a->strings["Plugins"] = "Pluginy";
 $a->strings["Themes"] = "Témata";
 $a->strings["DB updates"] = "Aktualizace databáze";
 $a->strings["Logs"] = "Logy";
-$a->strings["probe address"] = "";
-$a->strings["check webfinger"] = "";
+$a->strings["probe address"] = "vyzkoušet adresu";
+$a->strings["check webfinger"] = "vyzkoušet webfinger";
 $a->strings["Admin"] = "Administrace";
 $a->strings["Plugin Features"] = "Funkčnosti rozšíření";
 $a->strings["diagnostics"] = "diagnostika";
@@ -1405,7 +1405,7 @@ $a->strings["An error occurred during registration. Please try again."] = "Došl
 $a->strings["An error occurred creating your default profile. Please try again."] = "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu.";
 $a->strings["Friends"] = "Přátelé";
 $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDrahý %1\$s,\n\t\t\tDěkujeme Vám za registraci na %2\$s. Váš účet byl vytvořen.\n\t";
-$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "";
+$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3\$s\n\t\t\tpřihlašovací jméno:\t%1\$s\n\t\t\theslo:\t%5\$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2\$s.";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul %2\$s";
 $a->strings["poked"] = "šťouchnut";
 $a->strings["post/item"] = "příspěvek/položka";

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index e1930bc5cb26517b88e9b6d0356706cee9699403..38db510a3c6db6d78bb91681274f9e8da5bd1770 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -48,6 +48,8 @@
        {{include file="field_input.tpl" field=$hostname}}
        {{include file="field_input.tpl" field=$sender_email}}
        {{include file="field_textarea.tpl" field=$banner}}
+       {{include file="field_input.tpl" field=$shortcut_icon}}
+       {{include file="field_input.tpl" field=$touch_icon}}
        {{include file="field_textarea.tpl" field=$info}}
        {{include file="field_select.tpl" field=$language}}
        {{include file="field_select.tpl" field=$theme}}
@@ -81,7 +83,8 @@
        {{include file="field_input.tpl" field=$allowed_email}}
        {{include file="field_checkbox.tpl" field=$block_public}}
        {{include file="field_checkbox.tpl" field=$force_publish}}
-       {{include file="field_checkbox.tpl" field=$no_community_page}}
+       {{include file="field_select.tpl" field=$community_page_style}}
+       {{include file="field_input.tpl" field=$max_author_posts_community_page}}
        {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
        {{include file="field_select.tpl" field=$ostatus_poll_interval}}
        {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -109,9 +112,11 @@
        {{include file="field_input.tpl" field=$temppath}}
        {{include file="field_input.tpl" field=$basepath}}
        {{include file="field_checkbox.tpl" field=$suppress_language}}
+       {{include file="field_checkbox.tpl" field=$suppress_tags}}
 
        <h3>{{$performance}}</h3>
        {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+       {{include file="field_checkbox.tpl" field=$only_tag_search}}
        {{include file="field_input.tpl" field=$itemcache}}
        {{include file="field_input.tpl" field=$itemcache_duration}}
        {{include file="field_input.tpl" field=$max_comments}}