Merge pull request #8147 from annando/fetch-post

Fix for AP posts where the URL don't match

diff --git a/include/conversation.php b/include/conversation.php
index 264fa6ceb4d56603edb4168a1abeb17d6374e313..ed273a52ce22c70985df1b77c6bfeb1b2f372b1a 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -494,7 +494,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                }
        } elseif ($mode === 'profile') {
                $items = conversation_add_children($items, false, $order, $uid);
-               $profile_owner = $a->profile['profile_uid'];
+               $profile_owner = $a->profile['uid'];
 
                if (!$update) {
                        $tab = 'posts';
@@ -508,7 +508,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                                 */
 
                                $live_update_div = '<div id="live-profile"></div>' . "\r\n"
-                                       . "<script> var profile_uid = " . $a->profile['profile_uid']
+                                       . "<script> var profile_uid = " . $a->profile['uid']
                                        . "; var netargs = '?f='; var profile_page = " . $pager->getPage() . "; </script>\r\n";
                        }
                }

diff --git a/mod/cal.php b/mod/cal.php
index cf0e498d56ea714ea8a0dccedcffc3b059f584b7..e6570018b7cb64aa8fcc972c5ff6b21b3992a2df 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -101,27 +101,14 @@ function cal_content(App $a)
        }
 
        // Setup permissions structures
-       $remote_contact = false;
-       $contact_id = 0;
-
        $owner_uid = intval($a->data['user']['uid']);
        $nick = $a->data['user']['nickname'];
 
-       if (!empty(Session::getRemoteContactID($a->profile['profile_uid']))) {
-               $contact_id = Session::getRemoteContactID($a->profile['profile_uid']);
-       }
+       $contact_id = Session::getRemoteContactID($a->profile['uid']);
 
-       if ($contact_id) {
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($contact_id),
-                       intval($a->profile['profile_uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $remote_contact = true;
-               }
-       }
+       $remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $a->profile['uid']]);
 
-       $is_owner = local_user() == $a->profile['profile_uid'];
+       $is_owner = local_user() == $a->profile['uid'];
 
        if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
                notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);

diff --git a/mod/display.php b/mod/display.php
index f06b98dd4aa0ea721400b238daee19d56abd06f4..b5edafc5f93f84db4a20fa61125df4853ab229b3 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -100,7 +100,7 @@ function display_init(App $a)
                $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"]));
 
                if ($nickname != $a->user["nickname"]) {
-                       $profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                       $profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
                                INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                                WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
                                $nickname
@@ -175,9 +175,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $item_id = $_REQUEST['item_id'];
                $item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
                if ($item['uid'] != 0) {
-                       $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+                       $a->profile = ['uid' => intval($item['uid'])];
                } else {
-                       $a->profile = ['uid' => intval($update_uid), 'profile_uid' => intval($update_uid)];
+                       $a->profile = ['uid' => intval($update_uid)];
                }
                $item_parent = $item['parent'];
                $item_parent_uri = $item['parent-uri'];
@@ -249,13 +249,12 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if (DBA::isResult($parent)) {
                $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
-               $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
-               $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
+               $is_remote_contact = Session::getRemoteContactID($a->profile['uid']);
                if ($is_remote_contact) {
                        $item_uid = $parent['uid'];
                }
        } else {
-               $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+               $a->profile = ['uid' => intval($item['uid'])];
        }
 
        $page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
@@ -263,7 +262,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $a->page_contact = $page_contact;
        }
 
-       $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
+       $is_owner = (local_user() && (in_array($a->profile['uid'], [local_user(), 0])) ? true : false);
 
        if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
                throw new HTTPException\ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
@@ -284,9 +283,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                ];
                $o .= status_editor($a, $x, 0, true);
        }
-       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
 
-       if (local_user() && (local_user() == $a->profile['profile_uid'])) {
+       if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
                $unseen = Item::exists($condition);
        } else {
@@ -299,7 +298,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
        $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink', 'author-id', 'owner-id', 'contact-id'];
-       $item = Item::selectFirstForUser($a->profile['profile_uid'], $fields, $condition);
+       $item = Item::selectFirstForUser($a->profile['uid'], $fields, $condition);
 
        if (!DBA::isResult($item)) {
                throw new HTTPException\NotFoundException(DI::l10n()->t('The requested item doesn\'t exist or has been deleted.'));

diff --git a/mod/photos.php b/mod/photos.php
index c2fb8256968193ea9ecd95ad20523578043ae5a7..5b8d22b655fa7ec8fd9103f5b5045643ac77ecb8 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1236,7 +1236,7 @@ function photos_content(App $a)
                        } else {
                                $tools['edit'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit', DI::l10n()->t('Edit photo')];
                                $tools['delete'] = ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/drop', DI::l10n()->t('Delete photo')];
-                               $tools['profile'] = ['profile_photo/use/'.$ph[0]['resource-id'], DI::l10n()->t('Use as profile photo')];
+                               $tools['profile'] = ['settings/profile/photo/crop/' . $ph[0]['resource-id'], DI::l10n()->t('Use as profile photo')];
                        }
 
                        if (

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
deleted file mode 100644 (file)
index d34c783..0000000
--- a/mod/profile_photo.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @file mod/profile_photo.php
- */
-
-use Friendica\App;
-use Friendica\BaseModule;
-use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\Photo;
-use Friendica\Model\Profile;
-use Friendica\Object\Image;
-use Friendica\Util\Strings;
-
-function profile_photo_init(App $a)
-{
-       if (!local_user()) {
-               return;
-       }
-
-       Profile::load($a, $a->user['nickname']);
-}
-
-function profile_photo_post(App $a)
-{
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
-               return;
-       }
-
-       BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
-
-       if (!empty($_POST['cropfinal']) && $_POST['cropfinal'] == 1) {
-
-               // unless proven otherwise
-               $is_default_profile = 1;
-
-               if ($_REQUEST['profile']) {
-                       $r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']),
-                               intval(local_user())
-                       );
-
-                       if (DBA::isResult($r) && (!intval($r[0]['is-default']))) {
-                               $is_default_profile = 0;
-                       }
-               }
-
-
-
-               // phase 2 - we have finished cropping
-
-               if ($a->argc != 2) {
-                       notice(DI::l10n()->t('Image uploaded but image cropping failed.') . EOL);
-                       return;
-               }
-
-               $image_id = $a->argv[1];
-
-               if (substr($image_id, -2, 1) == '-') {
-                       $scale = substr($image_id, -1, 1);
-                       $image_id = substr($image_id, 0, -2);
-               }
-
-
-               $srcX = $_POST['xstart'];
-               $srcY = $_POST['ystart'];
-               $srcW = $_POST['xfinal'] - $srcX;
-               $srcH = $_POST['yfinal'] - $srcY;
-
-               $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]);
-
-               $path = 'profile/' . $a->user['nickname'];
-               if (DBA::isResult($base_image)) {
-
-                       $Image = Photo::getImageForPhoto($base_image);
-                       if ($Image->isValid()) {
-                               $Image->crop(300, $srcX, $srcY, $srcW, $srcH);
-
-                               $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
-                                               DI::l10n()->t('Profile Photos'), 4, $is_default_profile);
-
-                               if ($r === false) {
-                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', "300") . EOL);
-                               }
-
-                               $Image->scaleDown(80);
-
-                               $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
-                                               DI::l10n()->t('Profile Photos'), 5, $is_default_profile);
-
-                               if ($r === false) {
-                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', "80") . EOL);
-                               }
-
-                               $Image->scaleDown(48);
-
-                               $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
-                                               DI::l10n()->t('Profile Photos'), 6, $is_default_profile);
-
-                               if ($r === false) {
-                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', "48") . EOL);
-                               }
-
-                               // If setting for the default profile, unset the profile photo flag from any other photos I own
-
-                               if ($is_default_profile) {
-                                       q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
-                                               DBA::escape($base_image['resource-id']), intval(local_user())
-                                       );
-                               } else {
-                                       q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-                                               DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
-                                               DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
-                                               intval($_REQUEST['profile']), intval(local_user())
-                                       );
-                               }
-
-                               Contact::updateSelfFromUserID(local_user(), true);
-
-                               info(DI::l10n()->t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
-                               // Update global directory in background
-                               if ($path && strlen(DI::config()->get('system', 'directory'))) {
-                                       Worker::add(PRIORITY_LOW, "Directory", DI::baseUrl()->get() . '/' . $path);
-                               }
-
-                               Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
-                       } else {
-                               notice(DI::l10n()->t('Unable to process image') . EOL);
-                       }
-               }
-
-               DI::baseUrl()->redirect($path);
-               return; // NOTREACHED
-       }
-
-       $src = $_FILES['userfile']['tmp_name'];
-       $filename = basename($_FILES['userfile']['name']);
-       $filesize = intval($_FILES['userfile']['size']);
-       $filetype = $_FILES['userfile']['type'];
-       if ($filetype == "") {
-               $filetype = Image::guessType($filename);
-       }
-
-       $maximagesize = DI::config()->get('system', 'maximagesize');
-
-       if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
-               @unlink($src);
-               return;
-       }
-
-       $imagedata = @file_get_contents($src);
-       $ph = new Image($imagedata, $filetype);
-
-       if (!$ph->isValid()) {
-               notice(DI::l10n()->t('Unable to process image.') . EOL);
-               @unlink($src);
-               return;
-       }
-
-       $ph->orient($src);
-       @unlink($src);
-
-       $imagecrop = profile_photo_crop_ui_head($ph);
-       DI::baseUrl()->redirect('profile_photo/use/' . $imagecrop['hash']);
-}
-
-function profile_photo_content(App $a)
-{
-
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
-               return;
-       }
-
-       $newuser = false;
-
-       if ($a->argc == 2 && $a->argv[1] === 'new') {
-               $newuser = true;
-       }
-
-       $imagecrop = [];
-
-       if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
-               // BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
-
-               $resource_id = $a->argv[2];
-               //die(":".local_user());
-
-               $r = Photo::selectToArray([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale" => false]]);
-               if (!DBA::isResult($r)) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
-                       return;
-               }
-
-               $havescale = false;
-               foreach ($r as $rr) {
-                       if ($rr['scale'] == 5) {
-                               $havescale = true;
-                       }
-               }
-
-               // set an already uloaded photo as profile photo
-               // if photo is in 'Profile Photos', change it in db
-               if (($r[0]['album'] == DI::l10n()->t('Profile Photos')) && ($havescale)) {
-                       q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user()));
-
-                       q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()),
-                               DBA::escape($resource_id)
-                       );
-
-                       Contact::updateSelfFromUserID(local_user(), true);
-
-                       // Update global directory in background
-                       $url = $_SESSION['my_url'];
-                       if ($url && strlen(DI::config()->get('system', 'directory'))) {
-                               Worker::add(PRIORITY_LOW, "Directory", $url);
-                       }
-
-                       DI::baseUrl()->redirect('profile/' . $a->user['nickname']);
-                       return; // NOTREACHED
-               }
-               $ph = Photo::getImageForPhoto($r[0]);
-               
-               $imagecrop = profile_photo_crop_ui_head($ph);
-               // go ahead as we have jus uploaded a new photo to crop
-       }
-
-       $profiles = q("select `id`,`profile-name` as `name`,`is-default` as `default` from profile where uid = %d",
-               intval(local_user())
-       );
-
-       if (empty($imagecrop)) {
-               $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
-
-               $o = Renderer::replaceMacros($tpl,
-                       [
-                       '$user' => $a->user['nickname'],
-                       '$lbl_upfile' => DI::l10n()->t('Upload File:'),
-                       '$lbl_profiles' => DI::l10n()->t('Select a profile:'),
-                       '$title' => DI::l10n()->t('Upload Profile Photo'),
-                       '$submit' => DI::l10n()->t('Upload'),
-                       '$profiles' => $profiles,
-                       '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
-                       '$select' => sprintf('%s %s', DI::l10n()->t('or'),
-                               ($newuser) ? '<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>' : '<a href="' . DI::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . DI::l10n()->t('select a photo from your photo albums') . '</a>')
-               ]);
-
-               return $o;
-       } else {
-               $filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
-               $tpl = Renderer::getMarkupTemplate("cropbody.tpl");
-               $o = Renderer::replaceMacros($tpl,
-                       [
-                       '$filename'  => $filename,
-                       '$profile'   => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0),
-                       '$resource'  => $imagecrop['hash'] . '-' . $imagecrop['resolution'],
-                       '$image_url' => DI::baseUrl() . '/photo/' . $filename,
-                       '$title'     => DI::l10n()->t('Crop Image'),
-                       '$desc'      => DI::l10n()->t('Please adjust the image cropping for optimum viewing.'),
-                       '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
-                       '$done'      => DI::l10n()->t('Done Editing')
-               ]);
-               return $o;
-       }
-}
-
-function profile_photo_crop_ui_head(Image $image)
-{
-       $max_length = DI::config()->get('system', 'max_image_length');
-       if (!$max_length) {
-               $max_length = MAX_IMAGE_LENGTH;
-       }
-       if ($max_length > 0) {
-               $image->scaleDown($max_length);
-       }
-
-       $width = $image->getWidth();
-       $height = $image->getHeight();
-
-       if ($width < 175 || $height < 175) {
-               $image->scaleUp(300);
-               $width = $image->getWidth();
-               $height = $image->getHeight();
-       }
-
-       $hash = Photo::newResource();
-
-
-       $smallest = 0;
-       $filename = '';
-
-       $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 0);
-
-       if ($r) {
-               info(DI::l10n()->t('Image uploaded successfully.') . EOL);
-       } else {
-               notice(DI::l10n()->t('Image upload failed.') . EOL);
-       }
-
-       if ($width > 640 || $height > 640) {
-               $image->scaleDown(640);
-               $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 1);
-
-               if ($r === false) {
-                       notice(DI::l10n()->t('Image size reduction [%s] failed.', "640") . EOL);
-               } else {
-                       $smallest = 1;
-               }
-       }
-
-       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
-
-       $imagecrop = [
-               'hash'       => $hash,
-               'resolution' => $smallest,
-               'ext'        => $image->getExt(),
-       ];
-
-       return $imagecrop;
-}

diff --git a/mod/profiles.php b/mod/profiles.php
index 551ae54f9b46fa5a459687489383fc71e0b1867d..53da8510c40472904a1e6920aabc7d0250c434ee 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -598,7 +598,7 @@ function profiles_content(App $a) {
                        '$region' => ['region', DI::l10n()->t('Region/State:'), $r[0]['region']],
                        '$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $r[0]['postal-code']],
                        '$country_name' => ['country_name', DI::l10n()->t('Country:'), $r[0]['country-name']],
-                       '$age' => ((intval($r[0]['dob'])) ? '(' . DI::l10n()->t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
+                       '$age' => ((intval($r[0]['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($r[0]['dob'], $a->user['timezone'])) . ')' : ''),
                        '$gender' => DI::l10n()->t(ContactSelector::gender($r[0]['gender'])),
                        '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => DI::l10n()->t($r[0]['marital'])],
                        '$with' => ['with', DI::l10n()->t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), DI::l10n()->t('Examples: cathy123, Cathy Williams, cathy@example.com')],

diff --git a/src/App/Authentication.php b/src/App/Authentication.php
index c0408a8111e19deeac91bc1207e5cba599675370..2e1a823c71d2e9fb60b6fd282248ee563db4cab8 100644 (file)
--- a/src/App/Authentication.php
+++ b/src/App/Authentication.php
@@ -373,7 +373,7 @@ class Authentication
                        if ($user_record['login_date'] <= DBA::NULL_DATETIME) {
                                info($this->l10n->t('Welcome %s', $user_record['username']));
                                info($this->l10n->t('Please upload a profile photo.'));
-                               $this->baseUrl->redirect('profile_photo/new');
+                               $this->baseUrl->redirect('settings/profile/photo/new');
                        } else {
                                info($this->l10n->t("Welcome back %s", $user_record['username']));
                        }

diff --git a/src/BaseCollection.php b/src/BaseCollection.php
index 8bad3b8d28abf5863474bb9086446ac3cc43711d..4d5803d58524e1b8dccfdba00a9b056c2fccef8a 100644 (file)
--- a/src/BaseCollection.php
+++ b/src/BaseCollection.php
@@ -28,6 +28,30 @@ abstract class BaseCollection extends \ArrayIterator
                $this->totalCount = $totalCount ?? count($models);
        }
 
+       /**
+        * @inheritDoc
+        */
+       public function offsetSet($offset, $value)
+       {
+               if (is_null($offset)) {
+                       $this->totalCount++;
+               }
+
+               parent::offsetSet($offset, $value);
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function offsetUnset($offset)
+       {
+               if ($this->offsetExists($offset)) {
+                       $this->totalCount--;
+               }
+
+               parent::offsetUnset($offset);
+       }
+
        /**
         * @return int
         */
@@ -35,4 +59,42 @@ abstract class BaseCollection extends \ArrayIterator
        {
                return $this->totalCount;
        }
+
+       /**
+        * Return the values from a single field in the collection
+        *
+        * @param string   $column
+        * @param int|null $index_key
+        * @return array
+        * @see array_column()
+        */
+       public function column($column, $index_key = null)
+       {
+               return array_column($this->getArrayCopy(), $column, $index_key);
+       }
+
+       /**
+        * Apply a callback function on all elements in the collection and returns a new collection with the updated elements
+        *
+        * @param callable $callback
+        * @return BaseCollection
+        * @see array_map()
+        */
+       public function map(callable $callback)
+       {
+               return new static(array_map($callback, $this->getArrayCopy()), $this->getTotalCount());
+       }
+
+       /**
+        * Filters the collection based on a callback that returns a boolean whether the current item should be kept.
+        *
+        * @param callable|null $callback
+        * @param int           $flag
+        * @return BaseCollection
+        * @see array_filter()
+        */
+       public function filter(callable $callback = null, int $flag = 0)
+       {
+               return new static(array_filter($this->getArrayCopy(), $callback, $flag));
+       }
 }

diff --git a/src/BaseModel.php b/src/BaseModel.php
index 055f9c4a19a46dd07c40ad4fa32a612c1a99e807..b2dc7eedaf50ad58b88da114134f2d4671b79852 100644 (file)
--- a/src/BaseModel.php
+++ b/src/BaseModel.php
@@ -28,6 +28,13 @@ abstract class BaseModel
         */
        private $data = [];
 
+       /**
+        * Used to limit/avoid updates if no data was changed.
+        *
+        * @var array
+        */
+    private $originalData = [];
+
        /**
         * @param Database        $dba
         * @param LoggerInterface $logger
@@ -38,6 +45,12 @@ abstract class BaseModel
                $this->dba = $dba;
                $this->logger = $logger;
                $this->data = $data;
+               $this->originalData = $data;
+       }
+
+       public function getOriginalData()
+       {
+               return $this->originalData;
        }
 
        /**
@@ -51,10 +64,23 @@ abstract class BaseModel
        {
                $model = clone $prototype;
                $model->data = $data;
+               $model->originalData = $data;
 
                return $model;
        }
 
+       /**
+        * Magic isset method. Returns true if the field exists, either in the data prperty array or in any of the local properties.
+        * Used by array_column() on an array of objects.
+        *
+        * @param $name
+        * @return bool
+        */
+       public function __isset($name)
+       {
+               return in_array($name, array_merge(array_keys($this->data), array_keys(get_object_vars($this))));
+       }
+
        /**
         * Magic getter. This allows to retrieve model fields with the following syntax:
         * - $model->field (outside of class)
@@ -66,9 +92,7 @@ abstract class BaseModel
         */
        public function __get($name)
        {
-               if (empty($this->data['id'])) {
-                       throw new HTTPException\InternalServerErrorException(static::class . ' record uninitialized');
-               }
+               $this->checkValid();
 
                if (!array_key_exists($name, $this->data)) {
                        throw new HTTPException\InternalServerErrorException('Field ' . $name . ' not found in ' . static::class);
@@ -90,4 +114,11 @@ abstract class BaseModel
        {
                return $this->data;
        }
+
+       protected function checkValid()
+       {
+               if (empty($this->data['id'])) {
+                       throw new HTTPException\InternalServerErrorException(static::class . ' record uninitialized');
+               }
+       }
 }

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 2250f22bbca611940e4368a7abc7f3e922ca6ac2..96ec2e9f1fbda4729d5c6455642593bb4f9eb668 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -61,8 +61,7 @@ abstract class BaseModule
         */
        public static function post(array $parameters = [])
        {
-               // $a = self::getApp();
-               // $a->internalRedirect('module');
+               // DI::baseurl()->redirect('module');
        }
 
        /**

diff --git a/src/BaseRepository.php b/src/BaseRepository.php
index 9f43d8fe144437adb62ee5c311667cb45833eb50..c0bcab18f92fbafc37a8e96b23561eecb1899c66 100644 (file)
--- a/src/BaseRepository.php
+++ b/src/BaseRepository.php
@@ -122,7 +122,7 @@ abstract class BaseRepository extends BaseFactory
         */
        public function update(BaseModel $model)
        {
-               return $this->dba->update(static::$table_name, $model->toArray(), ['id' => $model->id], true);
+               return $this->dba->update(static::$table_name, $model->toArray(), ['id' => $model->id], $model->getOriginalData());
        }
 
        /**
@@ -136,11 +136,13 @@ abstract class BaseRepository extends BaseFactory
        {
                $return = $this->dba->insert(static::$table_name, $fields);
 
-               if ($return) {
-                       $fields['id'] = $this->dba->lastInsertId();
-                       $return = $this->create($fields);
+               if (!$return) {
+                       throw new HTTPException\InternalServerErrorException('Unable to insert new row in table "' . static::$table_name . '"');
                }
 
+               $fields['id'] = $this->dba->lastInsertId();
+               $return = $this->create($fields);
+
                return $return;
        }
 
@@ -197,4 +199,12 @@ abstract class BaseRepository extends BaseFactory
 
                return $models;
        }
+
+       /**
+        * @param BaseCollection $collection
+        */
+       public function saveCollection(BaseCollection $collection)
+       {
+               $collection->map([$this, 'update']);
+       }
 }

diff --git a/src/Collection/PermissionSets.php b/src/Collection/PermissionSets.php
new file mode 100644 (file)
index 0000000..7511d04
--- /dev/null
+++ b/src/Collection/PermissionSets.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Collection;
+
+use Friendica\BaseCollection;
+
+class PermissionSets extends BaseCollection
+{
+
+}

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index f3f3392ec189c907ef77be4cd3f8723c70dca2a7..ce945aa1d6bbfa90e8c966f209e9e42fecd009be 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,8 +5,8 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -152,8 +152,8 @@ class ForumManager
        public static function profileAdvanced($uid)
        {
                $profile = intval(Feature::isEnabled($uid, 'forumlist_profile'));
-               if (! $profile) {
-                       return;
+               if (!$profile) {
+                       return '';
                }
 
                $o = '';
@@ -167,19 +167,15 @@ class ForumManager
                $contacts = self::getList($uid, $lastitem, false, false);
 
                $total_shown = 0;
-               $forumlist = '';
                foreach ($contacts as $contact) {
-                       $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
-                       $total_shown ++;
+                       $o .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
+                       $total_shown++;
                        if ($total_shown == $show_total) {
                                break;
                        }
                }
 
-               if (count($contacts) > 0) {
-                       $o .= $forumlist;
-                       return $o;
-               }
+               return $o;
        }
 
        /**

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index a38b9a305102d4bd16fc1067f77222743d927f06..8fa09ee8a25cf63da6d2f3719a0b751c5dfef3fb 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -301,7 +301,7 @@ class Widget
        {
                $a = DI::app();
 
-               $uid = intval($a->profile['profile_uid']);
+               $uid = intval($a->profile['uid']);
 
                if (!Feature::isEnabled($uid, 'categories')) {
                        return '';
@@ -418,7 +418,7 @@ class Widget
        {
                $a = DI::app();
 
-               $uid = intval($a->profile['profile_uid']);
+               $uid = intval($a->profile['uid']);
 
                if (!$uid || !$a->profile['url']) {
                        return '';

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 09d19321aefc6bbf7c7e5976ec353abdeb5e8dfd..cfe46e77061f9adff0ebe8fcd784c6e1235929ce 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -228,19 +228,34 @@ class ACL
        /**
         * Returns the ACL list of contacts for a given user id
         *
-        * @param int $user_id
+        * @param int   $user_id
+        * @param array $condition Additional contact lookup table conditions
         * @return array
         * @throws \Exception
         */
-       public static function getContactListByUserId(int $user_id)
+       public static function getContactListByUserId(int $user_id, array $condition = [])
        {
                $fields = ['id', 'name', 'addr', 'micro'];
                $params = ['order' => ['name']];
-               $acl_contacts = Contact::selectToArray($fields,
-                       ['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
-                       'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]], $params
+               $acl_contacts = Contact::selectToArray(
+                       $fields,
+                       array_merge([
+                               'uid' => $user_id,
+                               'self' => false,
+                               'blocked' => false,
+                               'archive' => false,
+                               'deleted' => false,
+                               'pending' => false,
+                               'rel' => [Contact::FOLLOWER, Contact::FRIEND]
+                       ], $condition),
+                       $params
                );
 
+               $acl_yourself = Contact::selectFirst($fields, ['uid' => $user_id, 'self' => true]);
+               $acl_yourself['name'] = DI::l10n()->t('Yourself');
+
+               $acl_contacts[] = $acl_yourself;
+
                $acl_forums = Contact::selectToArray($fields,
                        ['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
                        'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params
@@ -295,26 +310,38 @@ class ACL
        /**
         * Return the full jot ACL selector HTML
         *
-        * @param Page  $page
-        * @param array $user                User array
-        * @param bool  $for_federation
-        * @param array $default_permissions Static defaults permission array:
-        *                                   [
+        * @param Page   $page
+        * @param array  $user                  User array
+        * @param bool   $for_federation
+        * @param array  $default_permissions   Static defaults permission array:
+        *                                      [
         *                                      'allow_cid' => [],
         *                                      'allow_gid' => [],
         *                                      'deny_cid' => [],
         *                                      'deny_gid' => [],
         *                                      'hidewall' => true/false
-        *                                   ]
+        *                                      ]
+        * @param array  $condition
+        * @param string $form_prefix
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function getFullSelectorHTML(Page $page, array $user = null, bool $for_federation = false, array $default_permissions = [])
-       {
+       public static function getFullSelectorHTML(
+               Page $page,
+               array $user = null,
+               bool $for_federation = false,
+               array $default_permissions = [],
+               array $condition = [],
+               $form_prefix = ''
+       ) {
                if (empty($user['uid'])) {
                        return '';
                }
 
+               static $input_group_id = 0;
+
+               $input_group_id++;
+
                $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
                $page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
                $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
@@ -373,12 +400,21 @@ class ACL
                        }
                }
 
-               $acl_contacts = self::getContactListByUserId($user['uid']);
+               $acl_contacts = self::getContactListByUserId($user['uid'], $condition);
 
                $acl_groups = self::getGroupListByUserId($user['uid']);
 
                $acl_list = array_merge($acl_groups, $acl_contacts);
 
+               $input_names = [
+                       'visibility'    => $form_prefix ? $form_prefix . '[visibility]'    : 'visibility',
+                       'group_allow'   => $form_prefix ? $form_prefix . '[group_allow]'   : 'group_allow',
+                       'contact_allow' => $form_prefix ? $form_prefix . '[contact_allow]' : 'contact_allow',
+                       'group_deny'    => $form_prefix ? $form_prefix . '[group_deny]'    : 'group_deny',
+                       'contact_deny'  => $form_prefix ? $form_prefix . '[contact_deny]'  : 'contact_deny',
+                       'emailcc'       => $form_prefix ? $form_prefix . '[emailcc]'       : 'emailcc',
+               ];
+
                $tpl = Renderer::getMarkupTemplate('acl_selector.tpl');
                $o = Renderer::replaceMacros($tpl, [
                        '$public_title'   => DI::l10n()->t('Public'),
@@ -402,6 +438,8 @@ class ACL
                        '$for_federation' => $for_federation,
                        '$jotnets_fields' => $jotnets_fields,
                        '$user_hidewall'  => $default_permissions['hidewall'],
+                       '$input_names'    => $input_names,
+                       '$input_group_id' => $input_group_id,
                ]);
 
                return $o;

diff --git a/src/Core/Session.php b/src/Core/Session.php
index d0c8581d31e4a07560b261d77039c6684c4d9454..0af4d344b11337c019bc27ea3bdba480aa09ab86 100644 (file)
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -61,7 +61,7 @@ class Session
                $session = DI::session();
 
                if (empty($session->get('remote')[$uid])) {
-                       return false;
+                       return 0;
                }
 
                return $session->get('remote')[$uid];

diff --git a/src/DI.php b/src/DI.php
index 22c81079b9a715fbb50f28f91b170b12cc8a2e85..e6d9c341b7ed42a826734686df9c550611b652c7 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -284,6 +284,14 @@ abstract class DI
                return self::$dice->create(Repository\Introduction::class);
        }
 
+       /**
+        * @return Repository\PermissionSet
+        */
+       public static function permissionSet()
+       {
+               return self::$dice->create(Repository\PermissionSet::class);
+       }
+
        //
        // "Protocol" namespace instances
        //

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 8a893ab9350c0aac19e6bc78c492d5790e99e789..14e186a72f63a4cbf94d31869da5b81e2f5d52eb 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -1342,19 +1342,13 @@ class Database
                        }
                }
 
-               $do_update = (count($old_fields) == 0);
-
                foreach ($old_fields AS $fieldname => $content) {
-                       if (isset($fields[$fieldname])) {
-                               if (($fields[$fieldname] == $content) && !is_null($content)) {
-                                       unset($fields[$fieldname]);
-                               } else {
-                                       $do_update = true;
-                               }
+                       if (isset($fields[$fieldname]) && !is_null($content) && ($fields[$fieldname] == $content)) {
+                               unset($fields[$fieldname]);
                        }
                }
 
-               if (!$do_update || (count($fields) == 0)) {
+               if (count($fields) == 0) {
                        return true;
                }
 

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 64737f604f831e1aba747751c27359969c1e4aef..7fd28419ea60106eeef11689bb7cb57968a55ed5 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -10,11 +10,14 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
-use Friendica\Model\UserItem;
 use Friendica\Model\PermissionSet;
+use Friendica\Model\UserItem;
 
 /**
- * Post update functions
+ * These database-intensive post update routines are meant to be executed in the background by the cronjob.
+ *
+ * If there is a need for a intensive migration after a database structure change, update this file
+ * by adding a new method at the end with the number of the new DB_UPDATE_VERSION.
  */
 class PostUpdate
 {
@@ -204,14 +207,20 @@ class PostUpdate
                        }
 
                        if (empty($item['psid'])) {
-                               $item['psid'] = PermissionSet::fetchIDForPost($item);
-                       } else {
-                               $item['allow_cid'] = null;
-                               $item['allow_gid'] = null;
-                               $item['deny_cid'] = null;
-                               $item['deny_gid'] = null;
+                               $item['psid'] = PermissionSet::getIdFromACL(
+                                       $item['uid'],
+                                       $item['allow_cid'],
+                                       $item['allow_gid'],
+                                       $item['deny_cid'],
+                                       $item['deny_gid']
+                               );
                        }
 
+                       $item['allow_cid'] = null;
+                       $item['allow_gid'] = null;
+                       $item['deny_cid'] = null;
+                       $item['deny_gid'] = null;
+
                        if ($item['post-type'] == 0) {
                                if (!empty($item['type']) && ($item['type'] == 'note')) {
                                        $item['post-type'] = Item::PT_PERSONAL_NOTE;

diff --git a/src/Model/Group.php b/src/Model/Group.php
index c38e78000b6a25247625d5afacee96ca3aee87ab..199ff1ebd7e112950286b5889cac3b56e18e61d3 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -117,6 +117,16 @@ class Group
                }
                DBA::close($stmt);
 
+               // Meta-groups
+               $contact = Contact::getById($cid, ['rel']);
+               if ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND) {
+                       $return[] = self::FOLLOWERS;
+               }
+
+               if ($contact['rel'] == Contact::FRIEND) {
+                       $return[] = self::MUTUALS;
+               }
+
                return $return;
        }
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 41c6eeb94dba76d4adc8f03c5640d50697da7184..47af3d5a69b9e2afdf9a004c9b40fc9638a6dd42 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1856,7 +1856,18 @@ class Item
                }
 
                // Creates or assigns the permission set
-               $item['psid'] = PermissionSet::fetchIDForPost($item);
+               $item['psid'] = PermissionSet::getIdFromACL(
+                       $item['uid'],
+                       $item['allow_cid'],
+                       $item['allow_gid'],
+                       $item['deny_cid'],
+                       $item['deny_gid']
+               );
+
+               $item['allow_cid'] = null;
+               $item['allow_gid'] = null;
+               $item['deny_cid'] = null;
+               $item['deny_gid'] = null;
 
                // We are doing this outside of the transaction to avoid timing problems
                if (!self::insertActivity($item)) {
@@ -2729,7 +2740,13 @@ class Item
 
                $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0;
 
-               $psid = PermissionSet::fetchIDForPost($user);
+               $psid = PermissionSet::getIdFromACL(
+                       $user['uid'],
+                       $user['allow_cid'],
+                       $user['allow_gid'],
+                       $user['deny_cid'],
+                       $user['deny_gid']
+               );
 
                $forum_mode = ($prvgroup ? 2 : 1);
 

diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
index d0e256d15363c9b71cd218e43afec21b8f658903..9bf2642c8b84787239a631eafa1026919af066b8 100644 (file)
--- a/src/Model/PermissionSet.php
+++ b/src/Model/PermissionSet.php
@@ -2,63 +2,38 @@
 /**
  * @file src/Model/PermissionSet.php
  */
+
 namespace Friendica\Model;
 
-use Friendica\Database\DBA;
+use Friendica\BaseModel;
+use Friendica\DI;
 
 /**
  * functions for interacting with the permission set of an object (item, photo, event, ...)
  */
-class PermissionSet
+class PermissionSet extends BaseModel
 {
        /**
         * Fetch the id of a given permission set. Generate a new one when needed
         *
-        * @param array $postarray The array from an item, picture or event post
+        * @param int         $uid
+        * @param string|null $allow_cid Allowed contact IDs    - empty = everyone
+        * @param string|null $allow_gid Allowed group IDs      - empty = everyone
+        * @param string|null $deny_cid  Disallowed contact IDs - empty = no one
+        * @param string|null $deny_gid  Disallowed group IDs   - empty = no one
         * @return int id
         * @throws \Exception
+        * @deprecated since 2020.03, use Repository\PermissionSet instead
+        * @see \Friendica\Repository\PermissionSet->getIdFromACL
         */
-       public static function fetchIDForPost(&$postarray)
-       {
-               $condition = ['uid' => $postarray['uid'],
-                       'allow_cid' => self::sortPermissions($postarray['allow_cid'] ?? ''),
-                       'allow_gid' => self::sortPermissions($postarray['allow_gid'] ?? ''),
-                       'deny_cid'  => self::sortPermissions($postarray['deny_cid']  ?? ''),
-                       'deny_gid'  => self::sortPermissions($postarray['deny_gid']  ?? '')];
-
-               $set = DBA::selectFirst('permissionset', ['id'], $condition);
-
-               if (!DBA::isResult($set)) {
-                       DBA::insert('permissionset', $condition, true);
-
-                       $set = DBA::selectFirst('permissionset', ['id'], $condition);
-               }
-
-               $postarray['allow_cid'] = null;
-               $postarray['allow_gid'] = null;
-               $postarray['deny_cid'] = null;
-               $postarray['deny_gid'] = null;
-
-               return $set['id'];
-       }
-
-       private static function sortPermissions($permissionlist)
-       {
-               $cleaned_list = trim($permissionlist, '<>');
-
-               if (empty($cleaned_list)) {
-                       return $permissionlist;
-               }
-
-               $elements = explode('><', $cleaned_list);
-
-               if (count($elements) <= 1) {
-                       return $permissionlist;
-               }
-
-               asort($elements);
-
-               return '<' . implode('><', $elements) . '>';
+       public static function getIdFromACL(
+               int $uid,
+               string $allow_cid = null,
+               string $allow_gid = null,
+               string $deny_cid = null,
+               string $deny_gid = null
+       ) {
+               return DI::permissionSet()->getIdFromACL($uid, $allow_cid, $allow_gid, $deny_cid, $deny_gid);
        }
 
        /**
@@ -69,36 +44,13 @@ class PermissionSet
         *
         * @return array of permission set ids.
         * @throws \Exception
+        * @deprecated since 2020.03, use Repository\PermissionSet instead
+        * @see \Friendica\Repository\PermissionSet->selectByContactId
         */
-       static public function get($uid, $contact_id)
+       public static function get($uid, $contact_id)
        {
-               if (DBA::exists('contact', ['id' => $contact_id, 'uid' => $uid, 'blocked' => false])) {
-                       $groups = Group::getIdsByContactId($contact_id);
-               }
-
-               if (empty($groups) || !is_array($groups)) {
-                       return [];
-               }
-
-               $group_str = '<<>>'; // should be impossible to match
-
-               foreach ($groups as $g) {
-                       $group_str .= '|<' . intval($g) . '>';
-               }
-
-               $contact_str = '<' . $contact_id . '>';
-
-               $condition = ["`uid` = ? AND (NOT (`deny_cid` REGEXP ? OR deny_gid REGEXP ?)
-                       AND (allow_cid REGEXP ? OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))",
-                       $uid, $contact_str, $group_str, $contact_str, $group_str];
-
-               $ret = DBA::select('permissionset', ['id'], $condition);
-               $set = [];
-               while ($permission = DBA::fetch($ret)) {
-                       $set[] = $permission['id'];
-               }
-               DBA::close($ret);
+               $permissionSets = DI::permissionSet()->selectByContactId($contact_id, $uid);
 
-               return $set;
+               return $permissionSets->column('id');
        }
 }

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 341727ceef4f6c84427705f4bcf03faa8ab988da..b993562cecc76ab140266ae3e48458f49a114336 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -126,13 +126,13 @@ class Profile
         *
         * @param App     $a
         * @param string  $nickname     string
-        * @param int     $profile      int
+        * @param int     $profile_id   int
         * @param array   $profiledata  array
         * @param boolean $show_connect Show connect link
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
+       public static function load(App $a, $nickname, $profile_id = 0, array $profiledata = [], $show_connect = true)
        {
                $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
@@ -155,31 +155,31 @@ class Profile
                        }
                }
 
-               $pdata = self::getByNickname($nickname, $user['uid'], $profile);
+               $profile = self::getByNickname($nickname, $user['uid'], $profile_id);
 
-               if (empty($pdata) && empty($profiledata)) {
+               if (empty($profile) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
                        return;
                }
 
-               if (empty($pdata)) {
-                       $pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname];
+               if (empty($profile)) {
+                       $profile = ['uid' => 0, 'is-default' => false,'name' => $nickname];
                }
 
                // fetch user tags if this isn't the default profile
 
-               if (!$pdata['is-default']) {
-                       $condition = ['uid' => $pdata['profile_uid'], 'is-default' => true];
-                       $profile = DBA::selectFirst('profile', ['pub_keywords'], $condition);
-                       if (DBA::isResult($profile)) {
-                               $pdata['pub_keywords'] = $profile['pub_keywords'];
+               if (!$profile['is-default']) {
+                       $condition = ['uid' => $profile['uid'], 'is-default' => true];
+                       $profile_id = DBA::selectFirst('profile', ['pub_keywords'], $condition);
+                       if (DBA::isResult($profile_id)) {
+                               $profile['pub_keywords'] = $profile_id['pub_keywords'];
                        }
                }
 
-               $a->profile = $pdata;
-               $a->profile_uid = $pdata['profile_uid'];
+               $a->profile = $profile;
+               $a->profile_uid = $profile['uid'];
 
-               $a->profile['mobile-theme'] = DI::pConfig()->get($a->profile['profile_uid'], 'system', 'mobile_theme');
+               $a->profile['mobile-theme'] = DI::pConfig()->get($a->profile['uid'], 'system', 'mobile_theme');
                $a->profile['network'] = Protocol::DFRN;
 
                DI::page()['title'] = $a->profile['name'] . ' @ ' . DI::config()->get('config', 'sitename');
@@ -255,7 +255,7 @@ class Profile
                        $profile = DBA::fetchFirst(
                                "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
                                        `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
-                                       `profile`.`uid` AS `profile_uid`, `profile`.*,
+                                       `profile`.*,
                                        `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
                                FROM `profile`
                                INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
@@ -269,7 +269,7 @@ class Profile
                        $profile = DBA::fetchFirst(
                                "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
                                        `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
-                                       `profile`.`uid` AS `profile_uid`, `profile`.*,
+                                       `profile`.*,
                                        `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
                                FROM `profile`
                                INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
@@ -350,7 +350,7 @@ class Profile
 
                $profile_is_dfrn = $profile['network'] == Protocol::DFRN;
                $profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
-               $local_user_is_self = local_user() && local_user() == ($profile['profile_uid'] ?? 0);
+               $local_user_is_self = local_user() && local_user() == ($profile['uid'] ?? 0);
                $visitor_is_authenticated = (bool)self::getMyURL();
                $visitor_is_following =
                        in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
@@ -527,7 +527,7 @@ class Profile
 
                $p['url'] = Contact::magicLink(($p['url'] ?? '') ?: $profile_url);
 
-               $tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
+               $tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$profile' => $p,
                        '$xmpp' => $xmpp,
@@ -747,8 +747,6 @@ class Profile
                $uid = intval($a->profile['uid']);
 
                if ($a->profile['name']) {
-                       $tpl = Renderer::getMarkupTemplate('profile_advanced.tpl');
-
                        $profile = [];
 
                        $profile['fullname'] = [DI::l10n()->t('Full Name:'), $a->profile['name']];
@@ -776,9 +774,9 @@ class Profile
 
                        if (!empty($a->profile['dob'])
                                && $a->profile['dob'] > DBA::NULL_DATE
-                               && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
+                               && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'])
                        ) {
-                               $profile['age'] = [DI::l10n()->t('Age:'), $age];
+                               $profile['age'] = [DI::l10n()->t('Age: ') , DI::l10n()->tt('%d year old', '%d years old', $age)];
                        }
 
                        if ($a->profile['marital']) {
@@ -875,6 +873,7 @@ class Profile
                                $profile['edit'] = [DI::baseUrl() . '/profiles/' . $a->profile['id'], DI::l10n()->t('Edit profile'), '', DI::l10n()->t('Edit profile')];
                        }
 
+                       $tpl = Renderer::getMarkupTemplate('profile/advanced.tpl');
                        return Renderer::replaceMacros($tpl, [
                                '$title' => DI::l10n()->t('Profile'),
                                '$basic' => DI::l10n()->t('Basic'),

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 97c108841c623ef0af4fb6a66a946e60ecc48fe2..e3ae7b3f578a52f475973975dca9d1a18def0e10 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -82,8 +82,8 @@ class Profile extends BaseModule
 
                        $page['htmlhead'] .= "\n";
 
-                       $blocked   = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && DI::config()->get('system', 'block_public');
-                       $userblock = !local_user() && !Session::getRemoteContactID($a->profile['profile_uid']) && $a->profile['hidewall'];
+                       $blocked   = !local_user() && !Session::getRemoteContactID($a->profile['uid']) && DI::config()->get('system', 'block_public');
+                       $userblock = !local_user() && !Session::getRemoteContactID($a->profile['uid']) && $a->profile['hidewall'];
 
                        if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
                                $page['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
@@ -149,7 +149,7 @@ class Profile extends BaseModule
 
                $hashtags = $_GET['tag'] ?? '';
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['profile_uid'])) {
+               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['uid'])) {
                        return Login::form();
                }
 
@@ -157,14 +157,14 @@ class Profile extends BaseModule
 
                if ($update) {
                        // Ensure we've got a profile owner if updating.
-                       $a->profile['profile_uid'] = $update;
-               } elseif ($a->profile['profile_uid'] == local_user()) {
+                       $a->profile['uid'] = $update;
+               } elseif ($a->profile['uid'] == local_user()) {
                        Nav::setSelected('home');
                }
 
-               $remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
-               $is_owner = local_user() == $a->profile['profile_uid'];
-               $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . $remote_contact;
+               $remote_contact = Session::getRemoteContactID($a->profile['uid']);
+               $is_owner = local_user() == $a->profile['uid'];
+               $last_updated_key = "profile:" . $a->profile['uid'] . ":" . local_user() . ":" . $remote_contact;
 
                if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
                        notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
@@ -182,16 +182,16 @@ class Profile extends BaseModule
                                return $o;
                        }
 
-                       $o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
+                       $o .= Widget::commonFriendsVisitor($a->profile['uid']);
 
                        $commpage = $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                        $commvisitor = $commpage && $remote_contact;
 
-                       DI::page()['aside'] .= Widget::postedByYear(DI::baseUrl()->get(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'] ?? 0, true);
+                       DI::page()['aside'] .= Widget::postedByYear(DI::baseUrl()->get(true) . '/profile/' . $a->profile['nickname'], $a->profile['uid'] ?? 0, true);
                        DI::page()['aside'] .= Widget::categories(DI::baseUrl()->get(true) . '/profile/' . $a->profile['nickname'], XML::escape($category));
                        DI::page()['aside'] .= Widget::tagCloud();
 
-                       if (Security::canWriteToUserWall($a->profile['profile_uid'])) {
+                       if (Security::canWriteToUserWall($a->profile['uid'])) {
                                $x = [
                                        'is_owner' => $is_owner,
                                        'allow_location' => ($is_owner || $commvisitor) && $a->profile['allow_location'],
@@ -206,7 +206,7 @@ class Profile extends BaseModule
                                        'acl' => $is_owner ? ACL::getFullSelectorHTML(DI::page(), $a->user, true) : '',
                                        'bang' => '',
                                        'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
-                                       'profile_uid' => $a->profile['profile_uid'],
+                                       'profile_uid' => $a->profile['uid'],
                                ];
 
                                $o .= status_editor($a, $x);
@@ -214,7 +214,7 @@ class Profile extends BaseModule
                }
 
                // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-               $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid']);
+               $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
                $sql_extra2 = '';
 
                $last_updated_array = Session::get('last_updated', []);
@@ -246,7 +246,7 @@ class Profile extends BaseModule
                                        $sql_extra4
                                        $sql_extra
                                ORDER BY `item`.`received` DESC",
-                               $a->profile['profile_uid'],
+                               $a->profile['uid'],
                                GRAVITY_ACTIVITY
                        );
 
@@ -260,12 +260,12 @@ class Profile extends BaseModule
 
                        if (!empty($category)) {
                                $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-                                       DBA::escape(Strings::protectSprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['profile_uid']));
+                                       DBA::escape(Strings::protectSprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['uid']));
                        }
 
                        if (!empty($hashtags)) {
                                $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-                                       DBA::escape(Strings::protectSprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
+                                       DBA::escape(Strings::protectSprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['uid']));
                        }
 
                        if (!empty($datequery)) {
@@ -277,7 +277,7 @@ class Profile extends BaseModule
 
                        // Does the profile page belong to a forum?
                        // If not then we can improve the performance with an additional condition
-                       $condition = ['uid' => $a->profile['profile_uid'], 'page-flags' => [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]];
+                       $condition = ['uid' => $a->profile['uid'], 'page-flags' => [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]];
                        if (!DBA::exists('user', $condition)) {
                                $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
                        } else {
@@ -321,7 +321,7 @@ class Profile extends BaseModule
                                        $sql_extra2
                                ORDER BY `thread`.`received` DESC
                                $pager_sql",
-                               $a->profile['profile_uid']
+                               $a->profile['uid']
                        );
                }
 
@@ -344,13 +344,13 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               if ($pager->getStart() == 0 && !empty($a->profile['profile_uid'])) {
-                       $pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri', 'pinned'], ['true' . $sql_extra]);
+               if ($pager->getStart() == 0 && !empty($a->profile['uid'])) {
+                       $pinned_items = Item::selectPinned($a->profile['uid'], ['uri', 'pinned'], ['true' . $sql_extra]);
                        $pinned = Item::inArray($pinned_items);
                        $items = array_merge($items, $pinned);
                }
 
-               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'pinned_received', $a->profile['profile_uid']);
+               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'pinned_received', $a->profile['uid']);
 
                if (!$update) {
                        $o .= $pager->renderMinimal(count($items));

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 09691100aa4597dcfae605ffa923dc7a8cf5aeff..1a21df0ece64ec9b49b76ac1544c6405534699cc 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -40,7 +40,7 @@ class Contacts extends BaseModule
 
                Profile::load($a, $nickname);
 
-               $is_owner = $a->profile['profile_uid'] == local_user();
+               $is_owner = $a->profile['uid'] == local_user();
 
                // tabs
                $o = Profile::getTabs($a, 'contacts', $is_owner, $nickname);

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 8a92b250882e846f7fee46ef2eb2f28d15cf3084..98af06543d1d2f1552c637806d5f0c300b7dd4f4 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -87,7 +87,7 @@ class Register extends BaseModule
                if (DI::config()->get('system', 'publish_all')) {
                        $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
                } else {
-                       $publish_tpl = Renderer::getMarkupTemplate('profile_publish.tpl');
+                       $publish_tpl = Renderer::getMarkupTemplate('profile/publish.tpl');
                        $profile_publish = Renderer::replaceMacros($publish_tpl, [
                                '$instance'     => 'reg',
                                '$pubdesc'      => DI::l10n()->t('Include your profile in member directory?'),

diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
new file mode 100644 (file)
index 0000000..738e3fc
--- /dev/null
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Friendica\Module\Settings\Profile\Photo;
+
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Model\Photo;
+use Friendica\Module\BaseSettingsModule;
+use Friendica\Network\HTTPException;
+
+class Crop extends BaseSettingsModule
+{
+       public static function post(array $parameters = [])
+       {
+               if (!Session::isAuthenticated()) {
+                       return;
+               }
+
+               $photo_prefix = $parameters['guid'];
+               $resource_id = $photo_prefix;
+               $scale = 0;
+               if (substr($photo_prefix, -2, 1) == '-') {
+                       list($resource_id, $scale) = explode('-', $photo_prefix);
+               }
+
+               self::checkFormSecurityTokenRedirectOnError('settings/profile/photo/crop/' . $photo_prefix, 'settings_profile_photo_crop');
+
+               $action = $_POST['action'] ?? 'crop';
+
+               // Image selection origin is top left
+               $selectionX = intval($_POST['xstart'] ?? 0);
+               $selectionY = intval($_POST['ystart'] ?? 0);
+               $selectionW = intval($_POST['width']  ?? 0);
+               $selectionH = intval($_POST['height'] ?? 0);
+
+               $path = 'profile/' . DI::app()->user['nickname'];
+
+               $base_image = Photo::selectFirst([], ['resource-id' => $resource_id, 'uid' => local_user(), 'scale' => $scale]);
+               if (DBA::isResult($base_image)) {
+                       $Image = Photo::getImageForPhoto($base_image);
+                       if ($Image->isValid()) {
+                               // If setting for the default profile, unset the profile photo flag from any other photos I own
+                               DBA::update('photo', ['profile' => 0], ['uid' => local_user()]);
+
+                               // Normalizing expected square crop parameters
+                               $selectionW = $selectionH = min($selectionW, $selectionH);
+
+                               $imageIsSquare = $Image->getWidth() === $Image->getHeight();
+                               $selectionIsFullImage = $selectionX === 0 && $selectionY === 0 && $selectionW === $Image->getWidth() && $selectionH === $Image->getHeight();
+
+                               // Bypassed UI with a rectangle image, we force a square cropped image
+                               if (!$imageIsSquare && $action == 'skip') {
+                                       $selectionX = $selectionY = 0;
+                                       $selectionW = $selectionH = min($Image->getWidth(), $Image->getHeight());
+                                       $action = 'crop';
+                               }
+
+                               // Selective crop if it was asked and the selection isn't the full image
+                               if ($action == 'crop'
+                                       && !($imageIsSquare && !$selectionIsFullImage)
+                               ) {
+                                       $Image->crop(300, $selectionX, $selectionY, $selectionW, $selectionH);
+                                       $resource_id = Photo::newResource();
+                               } else {
+                                       $Image->scaleDown(300);
+                               }
+
+                               $r = Photo::store(
+                                       $Image,
+                                       local_user(),
+                                       0,
+                                       $resource_id,
+                                       $base_image['filename'],
+                                       DI::l10n()->t('Profile Photos'),
+                                       4,
+                                       1
+                               );
+                               if ($r === false) {
+                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', '300'));
+                               }
+
+                               $Image->scaleDown(80);
+
+                               $r = Photo::store(
+                                       $Image,
+                                       local_user(),
+                                       0,
+                                       $resource_id,
+                                       $base_image['filename'],
+                                       DI::l10n()->t('Profile Photos'),
+                                       5,
+                                       1
+                               );
+                               if ($r === false) {
+                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', '80'));
+                               }
+
+                               $Image->scaleDown(48);
+
+                               $r = Photo::store(
+                                       $Image,
+                                       local_user(),
+                                       0,
+                                       $resource_id,
+                                       $base_image['filename'],
+                                       DI::l10n()->t('Profile Photos'),
+                                       6,
+                                       1
+                               );
+                               if ($r === false) {
+                                       notice(DI::l10n()->t('Image size reduction [%s] failed.', '48'));
+                               }
+
+                               Contact::updateSelfFromUserID(local_user(), true);
+
+                               info(DI::l10n()->t('Shift-reload the page or clear browser cache if the new photo does not display immediately.'));
+                               // Update global directory in background
+                               if ($path && strlen(DI::config()->get('system', 'directory'))) {
+                                       Worker::add(PRIORITY_LOW, 'Directory', DI::baseUrl()->get() . '/' . $path);
+                               }
+
+                               Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
+                       } else {
+                               notice(DI::l10n()->t('Unable to process image'));
+                       }
+               }
+
+               DI::baseUrl()->redirect($path);
+       }
+
+       public static function content(array $parameters = [])
+       {
+               if (!Session::isAuthenticated()) {
+                       throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
+               }
+
+               parent::content();
+
+               $resource_id = $parameters['guid'];
+
+               $photos = Photo::selectToArray([], ['resource-id' => $resource_id, 'uid' => local_user()], ['order' => ['scale' => false]]);
+               if (!DBA::isResult($photos)) {
+                       throw new HTTPException\NotFoundException(DI::l10n()->t('Photo not found.'));
+               }
+
+               $havescale = false;
+               $smallest = 0;
+               foreach ($photos as $photo) {
+                       $smallest = $photo['scale'] == 1 ? 1 : $smallest;
+                       $havescale = $havescale || $photo['scale'] == 5;
+               }
+
+               // set an already uloaded photo as profile photo
+               // if photo is in 'Profile Photos', change it in db
+               if ($photos[0]['album'] == DI::l10n()->t('Profile Photos') && $havescale) {
+                       Photo::update(['profile' => false], ['uid' => local_user()]);
+
+                       Photo::update(['profile' => true], ['resource-id' => $resource_id, 'uid' => local_user()]);
+
+                       Contact::updateSelfFromUserID(local_user(), true);
+
+                       // Update global directory in background
+                       if (Session::get('my_url') && strlen(DI::config()->get('system', 'directory'))) {
+                               Worker::add(PRIORITY_LOW, 'Directory', Session::get('my_url'));
+                       }
+
+                       notice(DI::l10n()->t('Profile picture successfully updated.'));
+
+                       DI::baseUrl()->redirect('profile/' . DI::app()->user['nickname']);
+               }
+
+               $Image = Photo::getImageForPhoto($photos[0]);
+
+               $imagecrop = [
+                       'resource-id' => $resource_id,
+                       'scale'       => $smallest,
+                       'ext'         => $Image->getExt(),
+               ];
+
+               $isSquare = $Image->getWidth() === $Image->getHeight();
+
+               DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/photo/crop_head.tpl'), []);
+
+               $filename = $imagecrop['resource-id'] . '-' . $imagecrop['scale'] . '.' . $imagecrop['ext'];
+               $tpl = Renderer::getMarkupTemplate('settings/profile/photo/crop.tpl');
+               $o = Renderer::replaceMacros($tpl, [
+                       '$filename'  => $filename,
+                       '$resource'  => $imagecrop['resource-id'] . '-' . $imagecrop['scale'],
+                       '$image_url' => DI::baseUrl() . '/photo/' . $filename,
+                       '$title'     => DI::l10n()->t('Crop Image'),
+                       '$desc'      => DI::l10n()->t('Please adjust the image cropping for optimum viewing.'),
+                       '$form_security_token' => self::getFormSecurityToken('settings_profile_photo_crop'),
+                       '$skip'      => $isSquare ? DI::l10n()->t('Use Image As Is') : '',
+                       '$crop'      => DI::l10n()->t('Crop Image'),
+               ]);
+
+               return $o;
+       }
+}

diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
new file mode 100644 (file)
index 0000000..9d2648a
--- /dev/null
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Friendica\Module\Settings\Profile\Photo;
+
+use Friendica\App\Arguments;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
+use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Model\Photo;
+use Friendica\Module\BaseSettingsModule;
+use Friendica\Network\HTTPException;
+use Friendica\Object\Image;
+use Friendica\Util\Images;
+use Friendica\Util\Strings;
+
+class Index extends BaseSettingsModule
+{
+       public static function post(array $parameters = [])
+       {
+               if (!Session::isAuthenticated()) {
+                       return;
+               }
+
+               self::checkFormSecurityTokenRedirectOnError('/settings/profile/photo', 'settings_profile_photo');
+
+               if (empty($_FILES['userfile'])) {
+                       notice(DI::l10n()->t('Missing uploaded image.'));
+                       return;
+               }
+
+               $src = $_FILES['userfile']['tmp_name'];
+               $filename = basename($_FILES['userfile']['name']);
+               $filesize = intval($_FILES['userfile']['size']);
+               $filetype = $_FILES['userfile']['type'];
+               if ($filetype == '') {
+                       $filetype = Images::guessType($filename);
+               }
+
+               $maximagesize = DI::config()->get('system', 'maximagesize', 0);
+
+               if ($maximagesize && $filesize > $maximagesize) {
+                       notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
+                       @unlink($src);
+                       return;
+               }
+
+               $imagedata = @file_get_contents($src);
+               $Image = new Image($imagedata, $filetype);
+
+               if (!$Image->isValid()) {
+                       notice(DI::l10n()->t('Unable to process image.'));
+                       @unlink($src);
+                       return;
+               }
+
+               $Image->orient($src);
+               @unlink($src);
+
+               $max_length = DI::config()->get('system', 'max_image_length', 0);
+               if ($max_length > 0) {
+                       $Image->scaleDown($max_length);
+               }
+
+               $width = $Image->getWidth();
+               $height = $Image->getHeight();
+
+               if ($width < 175 || $height < 175) {
+                       $Image->scaleUp(300);
+                       $width = $Image->getWidth();
+                       $height = $Image->getHeight();
+               }
+
+               $resource_id = Photo::newResource();
+
+               $filename = '';
+
+               if (Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 0)) {
+                       info(DI::l10n()->t('Image uploaded successfully.'));
+               } else {
+                       notice(DI::l10n()->t('Image upload failed.'));
+               }
+
+               if ($width > 640 || $height > 640) {
+                       $Image->scaleDown(640);
+                       if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 1)) {
+                               notice(DI::l10n()->t('Image size reduction [%s] failed.', '640'));
+                       }
+               }
+
+               DI::baseUrl()->redirect('settings/profile/photo/crop/' . $resource_id);
+       }
+
+       public static function content(array $parameters = [])
+       {
+               if (!Session::isAuthenticated()) {
+                       throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
+               }
+
+               parent::content();
+
+               $args = DI::args();
+
+               $newuser = $args->get($args->getArgc() - 1) === 'new';
+
+               $contact = Contact::selectFirst(['avatar'], ['uid' => local_user(), 'self' => true]);
+
+               $tpl = Renderer::getMarkupTemplate('settings/profile/photo/index.tpl');
+               $o = Renderer::replaceMacros($tpl, [
+                       '$title'           => DI::l10n()->t('Profile Picture Settings'),
+                       '$current_picture' => DI::l10n()->t('Current Profile Picture'),
+                       '$upload_picture'  => DI::l10n()->t('Upload Profile Picture'),
+                       '$lbl_upfile'      => DI::l10n()->t('Upload Picture:'),
+                       '$submit'          => DI::l10n()->t('Upload'),
+                       '$avatar'          => $contact['avatar'],
+                       '$form_security_token' => self::getFormSecurityToken('settings_profile_photo'),
+                       '$select'          => sprintf('%s %s',
+                               DI::l10n()->t('or'),
+                               ($newuser) ?
+                                       '<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>'
+                                       : '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->user['nickname'] . '">'
+                                               . DI::l10n()->t('select a photo from your photo albums') . '</a>'
+                       ),
+               ]);
+
+               return $o;
+       }
+}

diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index d2c850385939cb80ed2497ec1248c2d42934e0fd..55357d09c61aa0a94f2abc286edc0f5f7df7f534 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -50,7 +50,13 @@ class HTTPException
                        $message = $explanation[$e->getCode()] ?? '';
                }
 
-               return ['$title' => $title, '$message' => $message, '$back' => DI::l10n()->t('Go back')];
+               $vars = ['$title' => $title, '$message' => $message, '$back' => DI::l10n()->t('Go back')];
+
+               if (is_site_admin()) {
+                       $vars['$trace'] = $e->getTraceAsString();
+               }
+
+               return $vars;
        }
 
        /**

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index f88dee2c41262357e266b706fb6b581aa173e232..0d0def06120927c00b57f664b9494316b2af2cd4 100644 (file)
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -61,7 +61,7 @@ class Thread
                                $this->writable = true;
                                break;
                        case 'profile':
-                               $this->profile_owner = $a->profile['profile_uid'];
+                               $this->profile_owner = $a->profile['uid'];
                                $this->writable = Security::canWriteToUserWall($this->profile_owner);
                                break;
                        case 'display':

diff --git a/src/Repository/PermissionSet.php b/src/Repository/PermissionSet.php
new file mode 100644 (file)
index 0000000..906dd71
--- /dev/null
+++ b/src/Repository/PermissionSet.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Friendica\Repository;
+
+use Friendica\BaseModel;
+use Friendica\BaseRepository;
+use Friendica\Collection;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model;
+use Friendica\Model\Group;
+use Friendica\Network\HTTPException;
+
+class PermissionSet extends BaseRepository
+{
+       protected static $table_name = 'permissionset';
+
+       protected static $model_class = Model\PermissionSet::class;
+
+       protected static $collection_class = Collection\PermissionSets::class;
+
+       /**
+        * @param array $data
+        * @return Model\PermissionSet
+        */
+       protected function create(array $data)
+       {
+               return new Model\PermissionSet($this->dba, $this->logger, $data);
+       }
+
+       /**
+        * @param array $condition
+        * @return Model\PermissionSet
+        * @throws \Friendica\Network\HTTPException\NotFoundException
+        */
+       public function selectFirst(array $condition)
+       {
+               if (isset($condition['id']) && !$condition['id']) {
+                       return $this->create([
+                               'id' => 0,
+                               'uid' => $condition['uid'] ?? 0,
+                               'allow_cid' => '',
+                               'allow_gid' => '',
+                               'deny_cid' => '',
+                               'deny_gid' => '',
+                       ]);
+               }
+
+               return parent::selectFirst($condition);
+       }
+
+       /**
+        * @param array $condition
+        * @param array $params
+        * @return Collection\PermissionSets
+        * @throws \Exception
+        */
+       public function select(array $condition = [], array $params = [])
+       {
+               return parent::select($condition, $params);
+       }
+
+       /**
+        * @param array $condition
+        * @param array $params
+        * @param int|null $max_id
+        * @param int|null $since_id
+        * @param int $limit
+        * @return Collection\PermissionSets
+        * @throws \Exception
+        */
+       public function selectByBoundaries(array $condition = [], array $params = [], int $max_id = null, int $since_id = null, int $limit = self::LIMIT)
+       {
+               return parent::selectByBoundaries($condition, $params, $max_id, $since_id, $limit);
+       }
+
+       /**
+        * Fetch the id of a given permission set. Generate a new one when needed
+        *
+        * @param int         $uid
+        * @param string|null $allow_cid Allowed contact IDs    - empty = everyone
+        * @param string|null $allow_gid Allowed group IDs      - empty = everyone
+        * @param string|null $deny_cid  Disallowed contact IDs - empty = no one
+        * @param string|null $deny_gid  Disallowed group IDs   - empty = no one
+        * @return int id
+        * @throws \Exception
+        */
+       public function getIdFromACL(
+               int $uid,
+               string $allow_cid = null,
+               string $allow_gid = null,
+               string $deny_cid = null,
+               string $deny_gid = null
+       ) {
+               $ACLFormatter = DI::aclFormatter();
+
+               $allow_cid = $ACLFormatter->sanitize($allow_cid);
+               $allow_gid = $ACLFormatter->sanitize($allow_gid);
+               $deny_cid = $ACLFormatter->sanitize($deny_cid);
+               $deny_gid = $ACLFormatter->sanitize($deny_gid);
+
+               // Public permission
+               if (!$allow_cid && !$allow_gid && !$deny_cid && !$deny_gid) {
+                       return 0;
+               }
+
+               $condition = [
+                       'uid' => $uid,
+                       'allow_cid' => $allow_cid,
+                       'allow_gid' => $allow_gid,
+                       'deny_cid'  => $deny_cid,
+                       'deny_gid'  => $deny_gid
+               ];
+
+               try {
+                       $permissionset = $this->selectFirst($condition);
+               } catch(HTTPException\NotFoundException $exception) {
+                       $permissionset = $this->insert($condition);
+               }
+
+               return $permissionset->id;
+       }
+
+       /**
+        * Returns a permission set collection for a given contact
+        *
+        * @param integer $contact_id Contact id of the visitor
+        * @param integer $uid        User id whom the items belong, used for ownership check.
+        *
+        * @return Collection\PermissionSets
+        * @throws \Exception
+        */
+       public function selectByContactId($contact_id, $uid)
+       {
+               $groups = [];
+               if (DBA::exists('contact', ['id' => $contact_id, 'uid' => $uid, 'blocked' => false])) {
+                       $groups = Group::getIdsByContactId($contact_id);
+               }
+
+               $group_str = '<<>>'; // should be impossible to match
+               foreach ($groups as $group_id) {
+                       $group_str .= '|<' . preg_quote($group_id) . '>';
+               }
+
+               $contact_str = '<' . $contact_id . '>';
+
+               $condition = ["`uid` = ? AND (NOT (`deny_cid` REGEXP ? OR deny_gid REGEXP ?)
+                       AND (allow_cid REGEXP ? OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))",
+                       $uid, $contact_str, $group_str, $contact_str, $group_str];
+
+               return $this->select($condition);
+       }
+}

diff --git a/src/Util/ACLFormatter.php b/src/Util/ACLFormatter.php
index a7d851508d4e22d1c9441b959eb541c56e2875b9..d79a73298b086ea1ec46308651c736538f14c45a 100644 (file)
--- a/src/Util/ACLFormatter.php
+++ b/src/Util/ACLFormatter.php
@@ -12,30 +12,57 @@ final class ACLFormatter
        /**
         * Turn user/group ACLs stored as angle bracketed text into arrays
         *
-        * @param string|null $ids A angle-bracketed list of IDs
+        * @param string|null $acl_string A angle-bracketed list of IDs
         *
         * @return array The array based on the IDs (empty in case there is no list)
         */
-       public function expand(string $ids = null)
+       public function expand(string $acl_string = null)
        {
                // In case there is no ID list, return empty array (=> no ACL set)
-               if (!isset($ids)) {
+               if (!isset($acl_string)) {
                        return [];
                }
 
                // turn string array of angle-bracketed elements into numeric array
                // e.g. "<1><2><3>" => array(1,2,3);
-               preg_match_all('/<(' . Group::FOLLOWERS . '|'. Group::MUTUALS . '|[0-9]+)>/', $ids, $matches, PREG_PATTERN_ORDER);
+               preg_match_all('/<(' . Group::FOLLOWERS . '|'. Group::MUTUALS . '|[0-9]+)>/', $acl_string, $matches, PREG_PATTERN_ORDER);
 
                return $matches[1];
        }
 
+       /**
+        * Takes an arbitrary ACL string and sanitizes it for storage
+        *
+        * @param string|null $acl_string
+        * @return string
+        */
+       public function sanitize(string $acl_string = null)
+       {
+               if (empty($acl_string)) {
+                       return '';
+               }
+
+               $cleaned_list = trim($acl_string, '<>');
+
+               if (empty($cleaned_list)) {
+                       return '';
+               }
+
+               $elements = explode('><', $cleaned_list);
+
+               sort($elements);
+
+               array_walk($elements, [$this, 'sanitizeItem']);
+
+               return implode('', $elements);
+       }
+
        /**
         * Wrap ACL elements in angle brackets for storage
         *
         * @param string $item The item to sanitise
         */
-       private function sanitize(string &$item) {
+       private function sanitizeItem(string &$item) {
                // The item is an ACL int value
                if (intval($item)) {
                        $item = '<' . intval(Strings::escapeTags(trim($item))) . '>';
@@ -70,7 +97,7 @@ final class ACLFormatter
                }
 
                if (is_array($item)) {
-                       array_walk($item, [$this, 'sanitize']);
+                       array_walk($item, [$this, 'sanitizeItem']);
                        $return = implode('', $item);
                }
                return $return;

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index ecbfcae5432d398519dfe7595ca0d302414900ec..ef27b54b2d00547e292a629a7164861b69ad3842 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -131,12 +131,15 @@ class Temporal
 
                if ($dob < '0000-01-01') {
                        $value = '';
+                       $age = 0;
+               } elseif ($dob < '0001-00-00') {
+                       $value = substr($dob, 5);
+                       $age = 0;
                } else {
-                       $value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
+                       $value = DateTimeFormat::utc($dob, 'Y-m-d');
+                       $age = self::getAgeByTimezone($value, $timezone);
                }
 
-               $age = (intval($value) ? self::getAgeByTimezone($value, $timezone, $timezone) : "");
-
                $tpl = Renderer::getMarkupTemplate("field_input.tpl");
                $o = Renderer::replaceMacros($tpl,
                        [
@@ -144,7 +147,7 @@ class Temporal
                                'dob',
                                DI::l10n()->t('Birthday:'),
                                $value,
-                               intval($age) > 0 ? DI::l10n()->t('Age: ') . $age : "",
+                               intval($age) > 0 ? DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', $age) : '',
                                '',
                                'placeholder="' . DI::l10n()->t('YYYY-MM-DD or MM-DD') . '"'
                        ]
@@ -339,48 +342,31 @@ class Temporal
        /**
         * Returns timezone correct age in years.
         *
-        * Returns the age in years, given a date of birth, the timezone of the person
-        * whose date of birth is provided, and the timezone of the person viewing the
-        * result.
-        *
-        * Why? Bear with me. Let's say I live in Mittagong, Australia, and my birthday
-        * is on New Year's. You live in San Bruno, California.
-        * When exactly are you going to see my age increase?
-        *
-        * A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start celebrating
-        * and become a year older. If you wish me happy birthday on January 1
-        * (San Bruno time), you'll be a day late.
+        * Returns the age in years, given a date of birth and the timezone of the person
+        * whose date of birth is provided.
         *
         * @param string $dob       Date of Birth
         * @param string $owner_tz  (optional) Timezone of the person of interest
-        * @param string $viewer_tz (optional) Timezone of the person viewing
         *
         * @return int Age in years
         * @throws \Exception
         */
-       public static function getAgeByTimezone($dob, $owner_tz = '', $viewer_tz = '')
+       public static function getAgeByTimezone($dob, $owner_tz = '')
        {
                if (!intval($dob)) {
                        return 0;
                }
+
                if (!$owner_tz) {
                        $owner_tz = date_default_timezone_get();
                }
-               if (!$viewer_tz) {
-                       $viewer_tz = date_default_timezone_get();
-               }
 
-               $birthdate = DateTimeFormat::convert($dob . ' 00:00:00+00:00', $owner_tz, 'UTC', 'Y-m-d');
-               list($year, $month, $day) = explode("-", $birthdate);
-               $year_diff  = DateTimeFormat::timezoneNow($viewer_tz, 'Y') - $year;
-               $curr_month = DateTimeFormat::timezoneNow($viewer_tz, 'm');
-               $curr_day   = DateTimeFormat::timezoneNow($viewer_tz, 'd');
+               $birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($owner_tz));
+               $currentDate = new DateTime('now', new DateTimeZone('UTC'));
 
-               if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) {
-                       $year_diff--;
-               }
+               $interval = $birthdate->diff($currentDate);
 
-               return $year_diff;
+               return $interval->format('%y');
        }
 
        /**

diff --git a/static/routes.config.php b/static/routes.config.php
index 115b8f5f6deb6ae980d018510b2a3271e07b568a..05f2599561a90ed777aa9d672f85937d1b236ad5 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -228,6 +228,10 @@ return [
                        '/verify'       => [Module\Settings\TwoFactor\Verify::class,      [R::GET, R::POST]],
                ],
                '/delegation[/{action}/{user_id}]' => [Module\Settings\Delegation::class,       [R::GET, R::POST]],
+               '/profile' => [
+                       '/photo[/new]'         => [Module\Settings\Profile\Photo\Index::class, [R::GET, R::POST]],
+                       '/photo/crop/{guid}'   => [Module\Settings\Profile\Photo\Crop::class,  [R::GET, R::POST]],
+               ],
                '/userexport[/{action}]' => [Module\Settings\UserExport::class,             [R::GET, R::POST]],
        ],
 

diff --git a/update.php b/update.php
index 4d12730fab6e5cbf05b486bdef307e3238864f5d..22ed4ae9e3cfe3027a4f7edb58f1cfeb31375bcb 100644 (file)
--- a/update.php
+++ b/update.php
@@ -15,15 +15,15 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
 /**
+ * update.php - automatic post-databse structure change updates
  *
- * update.php - automatic system update
- *
- * This function is responsible for doing post update changes to the data
- * (not the structure) in the database.
+ * These functions are responsible for doing critical post update changes to the data (not the structure) in the database.
  *
  * Database structure changes are done in static/dbstructure.config.php
  *
- * If there is a need for a post process to a structure change, update this file
+ * For non-critical database migrations, please add a method in the Database\PostUpdate class
+ *
+ * If there is a need for a post update to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
  *
  * The numbered script in this file has to be exactly like the DB_UPDATE_VERSION

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 9bbbd1602fae0e58b5b3126e551758009f854e67..e96239a5162ba195cc7791db95103d5bbbcfc99b 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2020.03-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-18 20:32+0000\n"
+"POT-Creation-Date: 2020-01-20 11:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,5929 +18,5854 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: addon/piwik/piwik.php:95
-msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> "
-"analytics tool."
-msgstr ""
-
-#: addon/piwik/piwik.php:98
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr ""
-
-#: addon/piwik/piwik.php:105 addon/gravatar/gravatar.php:113
-#: addon/ifttt/ifttt.php:84 addon/pageheader/pageheader.php:39
-#: addon/impressum/impressum.php:107 addon/notimeline/notimeline.php:64
-#: addon/diaspora/diaspora.php:167 addon/mathjax/mathjax.php:58
-#: addon/blockbot/blockbot.php:35 addon/newmemberwidget/newmemberwidget.php:71
-#: addon/showmore/showmore.php:59 addon/blogger/blogger.php:122
-#: addon/libertree/libertree.php:112 addon/twitter/twitter.php:341
-#: addon/twitter/twitter.php:395 addon/twitter/twitter.php:730
-#: addon/jappixmini/jappixmini.php:384 addon/numfriends/numfriends.php:79
-#: addon/wppost/wppost.php:145 addon/curweather/curweather.php:203
-#: addon/curweather/curweather.php:243 addon/webrtc/webrtc.php:31
-#: addon/group_text/group_text.php:85 addon/gnot/gnot.php:85
-#: addon/randplace/randplace.php:180
-#: addon/windowsphonepush/windowsphonepush.php:135 addon/fromapp/fromapp.php:83
-#: addon/cookienotice/cookienotice.php:51 addon/statusnet/statusnet.php:296
-#: addon/statusnet/statusnet.php:313 addon/statusnet/statusnet.php:340
-#: addon/statusnet/statusnet.php:347 addon/statusnet/statusnet.php:394
-#: addon/statusnet/statusnet.php:720 addon/startpage/startpage.php:96
-#: addon/superblock/superblock.php:59 addon/nsfw/nsfw.php:93
-#: addon/remote_permissions/remote_permissions.php:55
-#: addon/remote_permissions/remote_permissions.php:205
-#: addon/securemail/securemail.php:63 addon/xmpp/xmpp.php:97
-#: addon/xmpp/xmpp.php:113 addon/markdown/markdown.php:33
-#: addon/tumblr/tumblr.php:80 addon/tumblr/tumblr.php:296
-#: addon/langfilter/langfilter.php:62 addon/public_server/public_server.php:171
-#: addon/krynn/krynn.php:172 addon/libravatar/libravatar.php:115
-#: addon/discourse/discourse.php:52 addon/blockem/blockem.php:68
-#: addon/ljpost/ljpost.php:106 addon/ijpost/ijpost.php:109
-#: addon/geonames/geonames.php:149 addon/geocoordinates/geocoordinates.php:95
-#: addon/pumpio/pumpio.php:330 addon/mailstream/mailstream.php:86
-#: addon/mailstream/mailstream.php:397 addon/dwpost/dwpost.php:110
-#: addon/blackout/blackout.php:106 addon/qcomment/qcomment.php:57
-#: addon/buffer/buffer.php:80 addon/buffer/buffer.php:230
-#: addon/planets/planets.php:169 addon/irc/irc.php:45 addon/irc/irc.php:146
-#: src/Module/Admin/Tos.php:50 src/Module/Admin/Addons/Index.php:50
-#: src/Module/Admin/Themes/Index.php:95 src/Module/Admin/Site.php:557
-#: src/Module/Admin/Features.php:69 src/Module/Admin/Logs/Settings.php:63
-#: src/Module/Settings/Delegation.php:150 mod/settings.php:664
-#: mod/settings.php:771 mod/settings.php:869 mod/settings.php:948
-#: mod/settings.php:1173
-msgid "Save Settings"
-msgstr ""
+#: include/api.php:1108
+#, php-format
+msgid "Daily posting limit of %d post reached. The post was rejected."
+msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/piwik/piwik.php:106
-msgid "Matomo (Piwik) Base URL"
-msgstr ""
+#: include/api.php:1122
+#, php-format
+msgid "Weekly posting limit of %d post reached. The post was rejected."
+msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/piwik/piwik.php:106
-msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol (http/"
-"s), with trailing slash)"
+#: include/api.php:1136
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr ""
 
-#: addon/piwik/piwik.php:107
-msgid "Site ID"
+#: include/api.php:4599 mod/photos.php:87 mod/photos.php:178 mod/photos.php:624
+#: mod/photos.php:1046 mod/photos.php:1063 mod/photos.php:1570
+#: mod/profile_photo.php:83 mod/profile_photo.php:92 mod/profile_photo.php:101
+#: mod/profile_photo.php:208 mod/profile_photo.php:296
+#: mod/profile_photo.php:306 src/Model/User.php:838 src/Model/User.php:846
+#: src/Model/User.php:854
+msgid "Profile Photos"
 msgstr ""
 
-#: addon/piwik/piwik.php:108
-msgid "Show opt-out cookie link?"
+#: include/conversation.php:161 include/conversation.php:298
+#: src/Model/Item.php:3389
+msgid "event"
 msgstr ""
 
-#: addon/piwik/piwik.php:109
-msgid "Asynchronous tracking"
+#: include/conversation.php:164 include/conversation.php:174
+#: include/conversation.php:301 include/conversation.php:310
+#: mod/subthread.php:91 mod/tagger.php:72
+msgid "status"
 msgstr ""
 
-#: addon/piwik/piwik.php:121 addon/impressum/impressum.php:102
-#: addon/blockbot/blockbot.php:46 addon/twitter/twitter.php:722
-#: addon/webrtc/webrtc.php:38
-#: addon/remote_permissions/remote_permissions.php:214 addon/xmpp/xmpp.php:127
-#: addon/tumblr/tumblr.php:95 addon/geocoordinates/geocoordinates.php:108
-#: addon/openstreetmap/openstreetmap.php:228 addon/buffer/buffer.php:95
-#: mod/settings.php:604
-msgid "Settings updated."
+#: include/conversation.php:169 include/conversation.php:306
+#: mod/subthread.php:91 mod/tagger.php:72 src/Model/Item.php:3391
+msgid "photo"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:89 addon/libravatar/libravatar.php:89
-msgid "generic profile image"
+#: include/conversation.php:182
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:90 addon/libravatar/libravatar.php:90
-msgid "random geometric pattern"
+#: include/conversation.php:184
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:91 addon/libravatar/libravatar.php:91
-msgid "monster face"
+#: include/conversation.php:186
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:92 addon/libravatar/libravatar.php:92
-msgid "computer generated face"
+#: include/conversation.php:188
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:93 addon/libravatar/libravatar.php:93
-msgid "retro arcade style face"
+#: include/conversation.php:190
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:107 addon/libravatar/libravatar.php:109
-#: src/Content/Nav.php:232 src/Module/BaseAdminModule.php:73
-msgid "Information"
+#: include/conversation.php:225
+#, php-format
+msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:107
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
+#: include/conversation.php:266
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:114 addon/libravatar/libravatar.php:116
-msgid "Default avatar image"
+#: include/conversation.php:320 mod/tagger.php:105
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:114
-msgid "Select default avatar image if none was found at Gravatar. See README"
+#: include/conversation.php:342
+msgid "post/item"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:115
-msgid "Rating of images"
+#: include/conversation.php:343
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:115
-msgid "Select the appropriate avatar rating for your site. See README"
+#: include/conversation.php:567 mod/photos.php:1398 mod/profiles.php:349
+msgid "Likes"
 msgstr ""
 
-#: addon/gravatar/gravatar.php:129
-msgid "Gravatar settings updated."
+#: include/conversation.php:568 mod/photos.php:1398 mod/profiles.php:352
+msgid "Dislikes"
 msgstr ""
 
-#: addon/advancedcontentfilter/src/middlewares.php:30
-msgid "Method not found"
+#: include/conversation.php:569 include/conversation.php:1588
+#: mod/photos.php:1399
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/conversation.php:570 mod/photos.php:1399
+msgid "Not attending"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:142
-#, php-format
-msgid "Filtered by rule: %s"
+#: include/conversation.php:571 mod/photos.php:1399
+msgid "Might attend"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:156
-#: addon/advancedcontentfilter/advancedcontentfilter.php:213
-msgid "Advanced Content Filter"
+#: include/conversation.php:572
+msgid "Reshares"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:212
-msgid "Back to Addon Settings"
+#: include/conversation.php:652 mod/photos.php:1459 src/Object/Post.php:207
+msgid "Select"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:214
-msgid "Add a Rule"
+#: include/conversation.php:653 mod/photos.php:1460 mod/settings.php:724
+#: mod/settings.php:866 src/Module/Admin/Users.php:285
+#: src/Module/Contact.php:827 src/Module/Contact.php:1108
+msgid "Delete"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:215
-#: view/theme/vier/theme.php:270 src/Content/Nav.php:191 src/Module/Help.php:50
-#: src/Module/Settings/TwoFactor/Verify.php:113
-#: src/Module/Settings/TwoFactor/AppSpecific.php:96
-#: src/Module/Settings/TwoFactor/Index.php:87
-#: src/Module/Settings/TwoFactor/Recovery.php:74
-msgid "Help"
+#: include/conversation.php:679 src/Object/Post.php:400 src/Object/Post.php:401
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:216
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have "
-"a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
+#: include/conversation.php:692 src/Object/Post.php:388
+msgid "Categories:"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:217
-msgid "Your rules"
+#: include/conversation.php:693 src/Object/Post.php:389
+msgid "Filed under:"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:218
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next "
-"to the title."
+#: include/conversation.php:700 src/Object/Post.php:414
+#, php-format
+msgid "%s from %s"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:219
-#: addon/statusnet/statusnet.php:380 src/Module/Admin/Site.php:463
-#: src/Module/Admin/Site.php:654 src/Module/Admin/Site.php:664
-#: src/Module/Settings/TwoFactor/Index.php:94 src/Module/Contact.php:545
-msgid "Disabled"
+#: include/conversation.php:715
+msgid "View in context"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:220
-#: addon/mailstream/mailstream.php:379 src/Module/Admin/Site.php:654
-msgid "Enabled"
+#: include/conversation.php:717 include/conversation.php:1237
+#: mod/editpost.php:87 mod/message.php:258 mod/message.php:440
+#: mod/photos.php:1371 mod/wallmessage.php:140 src/Module/Item/Compose.php:140
+#: src/Object/Post.php:444
+msgid "Please wait"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:221
-msgid "Disable this rule"
+#: include/conversation.php:781
+msgid "remove"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:222
-msgid "Enable this rule"
+#: include/conversation.php:785
+msgid "Delete Selected Items"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:223
-msgid "Edit this rule"
+#: include/conversation.php:946 view/theme/frio/theme.php:362
+msgid "Follow Thread"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:224
-msgid "Edit the rule"
+#: include/conversation.php:947 src/Model/Contact.php:1278
+msgid "View Status"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:225
-msgid "Save this rule"
+#: include/conversation.php:948 include/conversation.php:966 mod/match.php:85
+#: mod/suggest.php:86 src/Model/Contact.php:1208 src/Model/Contact.php:1270
+#: src/Model/Contact.php:1279 src/Module/AllFriends.php:74
+#: src/Module/BaseSearchModule.php:132 src/Module/Directory.php:148
+msgid "View Profile"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:226
-msgid "Delete this rule"
+#: include/conversation.php:949 src/Model/Contact.php:1280
+msgid "View Photos"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:227
-msgid "Rule"
+#: include/conversation.php:950 src/Model/Contact.php:1271
+#: src/Model/Contact.php:1281
+msgid "Network Posts"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:228
-msgid "Close"
+#: include/conversation.php:951 src/Model/Contact.php:1272
+#: src/Model/Contact.php:1282
+msgid "View Contact"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:229
-msgid "Add new rule"
+#: include/conversation.php:952 src/Model/Contact.php:1284
+msgid "Send PM"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:230
-msgid "Rule Name"
+#: include/conversation.php:953 src/Module/Admin/Blocklist/Contact.php:65
+#: src/Module/Admin/Users.php:286 src/Module/Contact.php:603
+#: src/Module/Contact.php:824 src/Module/Contact.php:1083
+msgid "Block"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:231
-msgid "Rule Expression"
+#: include/conversation.php:954 mod/notifications.php:37
+#: mod/notifications.php:173 mod/notifications.php:266
+#: src/Module/Contact.php:604 src/Module/Contact.php:825
+#: src/Module/Contact.php:1091
+msgid "Ignore"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:232
-#: addon/js_upload/js_upload.php:36 include/conversation.php:1256
-#: include/items.php:386 src/Module/Contact.php:446 mod/dfrn_request.php:653
-#: mod/follow.php:173 mod/fbrowser.php:109 mod/fbrowser.php:138
-#: mod/unfollow.php:131 mod/photos.php:1041 mod/photos.php:1148
-#: mod/settings.php:665 mod/settings.php:691 mod/suggest.php:75
-#: mod/editpost.php:111 mod/message.php:151 mod/tagrm.php:20 mod/tagrm.php:115
-msgid "Cancel"
+#: include/conversation.php:958 src/Model/Contact.php:1285
+msgid "Poke"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:299
-#: addon/advancedcontentfilter/advancedcontentfilter.php:310
-#: addon/advancedcontentfilter/advancedcontentfilter.php:321
-#: addon/advancedcontentfilter/advancedcontentfilter.php:355
-#: addon/advancedcontentfilter/advancedcontentfilter.php:384
-#: addon/advancedcontentfilter/advancedcontentfilter.php:405
-msgid "You must be logged in to use this method"
+#: include/conversation.php:963 mod/follow.php:158 mod/match.php:86
+#: mod/suggest.php:87 view/theme/vier/theme.php:176 src/Content/Widget.php:62
+#: src/Model/Contact.php:1273 src/Model/Contact.php:1286
+#: src/Module/AllFriends.php:75 src/Module/BaseSearchModule.php:133
+msgid "Connect/Follow"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:325
-#: addon/advancedcontentfilter/advancedcontentfilter.php:359
-#: addon/advancedcontentfilter/advancedcontentfilter.php:388
-msgid "Invalid form security token, please refresh the page."
+#: include/conversation.php:1089
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:337
-msgid "The rule name and expression are required."
+#: include/conversation.php:1092
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:349
-msgid "Rule successfully added"
+#: include/conversation.php:1095
+#, php-format
+msgid "%s attends."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:363
-#: addon/advancedcontentfilter/advancedcontentfilter.php:392
-msgid "Rule doesn't exist or doesn't belong to you."
+#: include/conversation.php:1098
+#, php-format
+msgid "%s doesn't attend."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:378
-msgid "Rule successfully updated"
+#: include/conversation.php:1101
+#, php-format
+msgid "%s attends maybe."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:399
-msgid "Rule successfully deleted"
+#: include/conversation.php:1104 include/conversation.php:1147
+#, php-format
+msgid "%s reshared this."
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:409
-msgid "Missing argument: guid."
+#: include/conversation.php:1112
+msgid "and"
 msgstr ""
 
-#: addon/advancedcontentfilter/advancedcontentfilter.php:417
+#: include/conversation.php:1118
 #, php-format
-msgid "Unknown post with guid: %s"
+msgid "and %d other people"
 msgstr ""
 
-#: addon/ifttt/ifttt.php:56 addon/ifttt/ifttt.php:60
-msgid "IFTTT Mirror"
+#: include/conversation.php:1126
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: addon/ifttt/ifttt.php:64
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a href=\"https://ifttt.com/"
-"maker\">Maker</a> (In the form \"if Facebook then Maker\") with the "
-"following parameters:"
+#: include/conversation.php:1127
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: addon/ifttt/ifttt.php:71
-msgid "Body for \"new status message\""
+#: include/conversation.php:1130
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: addon/ifttt/ifttt.php:73
-msgid "Body for \"new photo upload\""
+#: include/conversation.php:1131
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: addon/ifttt/ifttt.php:75
-msgid "Body for \"new link post\""
+#: include/conversation.php:1134
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
 msgstr ""
 
-#: addon/ifttt/ifttt.php:80 addon/widgets/widgets.php:65
-msgid "Generate new key"
+#: include/conversation.php:1135
+#, php-format
+msgid "%s attend."
 msgstr ""
 
-#: addon/pageheader/pageheader.php:37
-msgid "\"pageheader\" Settings"
+#: include/conversation.php:1138
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr ""
 
-#: addon/pageheader/pageheader.php:38
-#: addon/newmemberwidget/newmemberwidget.php:72 include/conversation.php:1268
-#: src/Model/Profile.php:545 src/Module/Contact.php:321 mod/editpost.php:115
-msgid "Message"
+#: include/conversation.php:1139
+#, php-format
+msgid "%s don't attend."
 msgstr ""
 
-#: addon/pageheader/pageheader.php:38
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
+#: include/conversation.php:1142
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr ""
 
-#: addon/pageheader/pageheader.php:55
-msgid "pageheader Settings saved."
+#: include/conversation.php:1143
+#, php-format
+msgid "%s attend maybe."
 msgstr ""
 
-#: addon/impressum/impressum.php:61
-msgid "Impressum"
+#: include/conversation.php:1146
+#, php-format
+msgid "<span  %1$s>%2$d people</span> reshared this"
 msgstr ""
 
-#: addon/impressum/impressum.php:74 addon/impressum/impressum.php:76
-#: addon/impressum/impressum.php:108
-msgid "Site Owner"
+#: include/conversation.php:1176
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: addon/impressum/impressum.php:74 addon/impressum/impressum.php:112
-#: addon/mailstream/mailstream.php:383
-msgid "Email Address"
+#: include/conversation.php:1177 src/Module/Item/Compose.php:134
+#: src/Object/Post.php:912
+msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
-#: addon/impressum/impressum.php:79 addon/impressum/impressum.php:110
-msgid "Postal Address"
+#: include/conversation.php:1178
+msgid "Tag term:"
 msgstr ""
 
-#: addon/impressum/impressum.php:85
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
+#: include/conversation.php:1179 src/Module/Filer/SaveTag.php:47
+msgid "Save to Folder:"
 msgstr ""
 
-#: addon/impressum/impressum.php:108
-msgid "The page operators name."
+#: include/conversation.php:1180
+msgid "Where are you right now?"
 msgstr ""
 
-#: addon/impressum/impressum.php:109
-msgid "Site Owners Profile"
+#: include/conversation.php:1181
+msgid "Delete item(s)?"
 msgstr ""
 
-#: addon/impressum/impressum.php:109
-msgid "Profile address of the operator."
+#: include/conversation.php:1213
+msgid "New Post"
 msgstr ""
 
-#: addon/impressum/impressum.php:110
-msgid "How to contact the operator via snail mail. You can use BBCode here."
+#: include/conversation.php:1216
+msgid "Share"
 msgstr ""
 
-#: addon/impressum/impressum.php:111
-msgid "Notes"
+#: include/conversation.php:1217 mod/editpost.php:73 mod/message.php:256
+#: mod/message.php:437 mod/wallmessage.php:138
+msgid "Upload photo"
 msgstr ""
 
-#: addon/impressum/impressum.php:111
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can "
-"use BBCode here."
+#: include/conversation.php:1218 mod/editpost.php:74
+msgid "upload photo"
 msgstr ""
 
-#: addon/impressum/impressum.php:112
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
+#: include/conversation.php:1219 mod/editpost.php:75
+msgid "Attach file"
 msgstr ""
 
-#: addon/impressum/impressum.php:113
-msgid "Footer note"
+#: include/conversation.php:1220 mod/editpost.php:76
+msgid "attach file"
 msgstr ""
 
-#: addon/impressum/impressum.php:113
-msgid "Text for the footer. You can use BBCode here."
+#: include/conversation.php:1221 src/Module/Item/Compose.php:126
+#: src/Object/Post.php:904
+msgid "Bold"
 msgstr ""
 
-#: addon/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
+#: include/conversation.php:1222 src/Module/Item/Compose.php:127
+#: src/Object/Post.php:905
+msgid "Italic"
 msgstr ""
 
-#: addon/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
+#: include/conversation.php:1223 src/Module/Item/Compose.php:128
+#: src/Object/Post.php:906
+msgid "Underline"
 msgstr ""
 
-#: addon/tictac/tictac.php:59
-msgid "New game"
+#: include/conversation.php:1224 src/Module/Item/Compose.php:129
+#: src/Object/Post.php:907
+msgid "Quote"
 msgstr ""
 
-#: addon/tictac/tictac.php:60
-msgid "New game with handicap"
+#: include/conversation.php:1225 src/Module/Item/Compose.php:130
+#: src/Object/Post.php:908
+msgid "Code"
 msgstr ""
 
-#: addon/tictac/tictac.php:61
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: include/conversation.php:1226 src/Module/Item/Compose.php:131
+#: src/Object/Post.php:909
+msgid "Image"
 msgstr ""
 
-#: addon/tictac/tictac.php:62
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+#: include/conversation.php:1227 src/Module/Item/Compose.php:132
+#: src/Object/Post.php:910
+msgid "Link"
 msgstr ""
 
-#: addon/tictac/tictac.php:64
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
+#: include/conversation.php:1228 src/Module/Item/Compose.php:133
+#: src/Object/Post.php:911
+msgid "Link or Media"
 msgstr ""
 
-#: addon/tictac/tictac.php:183
-msgid "You go first..."
+#: include/conversation.php:1229 mod/editpost.php:83
+#: src/Module/Item/Compose.php:136
+msgid "Set your location"
 msgstr ""
 
-#: addon/tictac/tictac.php:188
-msgid "I'm going first this time..."
+#: include/conversation.php:1230 mod/editpost.php:84
+msgid "set location"
 msgstr ""
 
-#: addon/tictac/tictac.php:194
-msgid "You won!"
+#: include/conversation.php:1231 mod/editpost.php:85
+msgid "Clear browser location"
 msgstr ""
 
-#: addon/tictac/tictac.php:200 addon/tictac/tictac.php:225
-msgid "\"Cat\" game!"
+#: include/conversation.php:1232 mod/editpost.php:86
+msgid "clear location"
 msgstr ""
 
-#: addon/tictac/tictac.php:223
-msgid "I won!"
+#: include/conversation.php:1234 mod/editpost.php:100
+#: src/Module/Item/Compose.php:141
+msgid "Set title"
 msgstr ""
 
-#: addon/notimeline/notimeline.php:33
-msgid "No Timeline settings updated."
+#: include/conversation.php:1236 mod/editpost.php:102
+#: src/Module/Item/Compose.php:142
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: addon/notimeline/notimeline.php:56
-msgid "No Timeline Settings"
+#: include/conversation.php:1238 mod/editpost.php:88
+msgid "Permission settings"
 msgstr ""
 
-#: addon/notimeline/notimeline.php:58
-msgid "Disable Archive selector on profile wall"
+#: include/conversation.php:1239 mod/editpost.php:117
+msgid "permissions"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:52
-msgid "Post to Diaspora"
+#: include/conversation.php:1248 mod/editpost.php:97
+msgid "Public post"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:88
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica "
-"handle %s. "
+#: include/conversation.php:1252 mod/editpost.php:108 mod/events.php:549
+#: mod/photos.php:1389 mod/photos.php:1428 mod/photos.php:1492
+#: src/Module/Item/Compose.php:135 src/Object/Post.php:913
+msgid "Preview"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:89
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
+#: include/conversation.php:1256 include/items.php:385 mod/dfrn_request.php:652
+#: mod/editpost.php:111 mod/fbrowser.php:109 mod/fbrowser.php:138
+#: mod/follow.php:172 mod/message.php:151 mod/photos.php:1040
+#: mod/photos.php:1147 mod/settings.php:664 mod/settings.php:690
+#: mod/suggest.php:75 mod/tagrm.php:20 mod/tagrm.php:115 mod/unfollow.php:131
+#: src/Module/Contact.php:444
+msgid "Cancel"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:90
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle "
-"%s instead."
+#: include/conversation.php:1261
+msgid "Post to Groups"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
+#: include/conversation.php:1262
+msgid "Post to Contacts"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:108 addon/diaspora/diaspora.php:112
-msgid "Diaspora Export"
+#: include/conversation.php:1263
+msgid "Private post"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:122
-msgid "Enable Diaspora Post Addon"
+#: include/conversation.php:1268 mod/editpost.php:115 src/Model/Profile.php:540
+#: src/Module/Contact.php:319
+msgid "Message"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:127
-msgid "Diaspora handle"
+#: include/conversation.php:1269 mod/editpost.php:116
+msgid "Browser"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:132
-msgid "Diaspora password"
+#: include/conversation.php:1558
+msgid "View all"
 msgstr ""
 
-#: addon/diaspora/diaspora.php:139
-msgid "All aspects"
-msgstr ""
+#: include/conversation.php:1582
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/diaspora/diaspora.php:144 src/Core/ACL.php:384
-msgid "Public"
-msgstr ""
+#: include/conversation.php:1585
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/diaspora/diaspora.php:147
-msgid "Post to aspect:"
-msgstr ""
+#: include/conversation.php:1591
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/diaspora/diaspora.php:161
-msgid "Post to Diaspora by default"
-msgstr ""
+#: include/conversation.php:1594 src/Content/ContactSelector.php:250
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
 
-#: addon/mathjax/mathjax.php:56
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
+#: include/enotify.php:58
+msgid "Friendica Notification"
 msgstr ""
 
-#: addon/mathjax/mathjax.php:57
-msgid "Use the MathJax renderer"
+#: include/enotify.php:61
+msgid "Thank You,"
 msgstr ""
 
-#: addon/blockbot/blockbot.php:36
-msgid "Allow \"good\" crawlers"
+#: include/enotify.php:64
+#, php-format
+msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: addon/blockbot/blockbot.php:37
-msgid "Block GabSocial"
+#: include/enotify.php:66
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: addon/blockbot/blockbot.php:38
-msgid "Training mode"
+#: include/enotify.php:135
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:35
-msgid "New Member"
+#: include/enotify.php:137
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:36 src/Model/Profile.php:981
-#: src/Model/Profile.php:984
-msgid "Tips for New Members"
+#: include/enotify.php:138
+msgid "a private message"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:39
-msgid "Global Support Forum"
+#: include/enotify.php:138
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:43
-msgid "Local Support Forum"
+#: include/enotify.php:140
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:72
-msgid "Your message for new members. You can use bbcode here."
+#: include/enotify.php:224
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:73
-msgid "Add a link to global support forum"
+#: include/enotify.php:226
+#, php-format
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:73
-msgid "Should a link to the global support forum be displayed?"
+#: include/enotify.php:228
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:74
-msgid "Add a link to the local support forum"
+#: include/enotify.php:230
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:74
-msgid ""
-"If you have a local support forum and want to have a link displayed in the "
-"widget, check this box."
+#: include/enotify.php:235 include/enotify.php:250 include/enotify.php:265
+#: include/enotify.php:284 include/enotify.php:300
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:75
-msgid "Name of the local support group"
+#: include/enotify.php:242
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: addon/newmemberwidget/newmemberwidget.php:75
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support "
-"group here (i.e. helpers)"
+#: include/enotify.php:244
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: addon/testdrive/testdrive.php:78 addon/public_server/public_server.php:76
-msgid "Administrator"
+#: include/enotify.php:245
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: addon/testdrive/testdrive.php:103 addon/public_server/public_server.php:130
+#: include/enotify.php:257
 #, php-format
-msgid "Your account on %s will expire in a few days."
+msgid "[Friendica:Notify] %s shared a new post"
 msgstr ""
 
-#: addon/testdrive/testdrive.php:104
-msgid "Your Friendica test account is about to expire."
+#: include/enotify.php:259
+#, php-format
+msgid "%1$s shared a new post at %2$s"
 msgstr ""
 
-#: addon/testdrive/testdrive.php:105
+#: include/enotify.php:260
 #, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you "
-"enjoyed this test drive and use this opportunity to find a permanent "
-"Friendica website for your integrated social communications. A list of "
-"public sites is available at %s/siteinfo - and for more information on "
-"setting up your own Friendica server please see the Friendica project "
-"website at https://friendi.ca."
+msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr ""
 
-#: addon/showmore/showmore.php:43 addon/showmore/showmore.php:47
-msgid "\"Show more\" Settings"
+#: include/enotify.php:272
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: addon/showmore/showmore.php:52
-msgid "Enable Show More"
+#: include/enotify.php:274
+#, php-format
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: addon/showmore/showmore.php:55
-msgid "Cutting posts after how much characters"
+#: include/enotify.php:275
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: addon/showmore/showmore.php:77
-msgid "Show More Settings saved."
+#: include/enotify.php:292
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: addon/showmore/showmore.php:137 view/theme/vier/theme.php:231
-#: src/Content/Widget.php:405 src/Content/Widget.php:505
-#: src/Content/ForumManager.php:134
-msgid "show more"
+#: include/enotify.php:294
+#, php-format
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: addon/blogger/blogger.php:55
-msgid "Post to blogger"
+#: include/enotify.php:295
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: addon/blogger/blogger.php:89 addon/blogger/blogger.php:93
-msgid "Blogger Export"
+#: include/enotify.php:307
+msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: addon/blogger/blogger.php:97
-msgid "Enable Blogger Post Addon"
+#: include/enotify.php:309
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: addon/blogger/blogger.php:102
-msgid "Blogger username"
+#: include/enotify.php:310
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: addon/blogger/blogger.php:107
-msgid "Blogger password"
+#: include/enotify.php:315 include/enotify.php:361
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: addon/blogger/blogger.php:112
-msgid "Blogger API URL"
+#: include/enotify.php:317
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: addon/blogger/blogger.php:117
-msgid "Post to Blogger by default"
+#: include/enotify.php:324
+msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr ""
 
-#: addon/blogger/blogger.php:206 addon/wppost/wppost.php:305
-msgid "Post from Friendica"
+#: include/enotify.php:326 include/enotify.php:327
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
 msgstr ""
 
-#: addon/libertree/libertree.php:49
-msgid "Post to libertree"
+#: include/enotify.php:334
+msgid "[Friendica:Notify] You have a new follower"
 msgstr ""
 
-#: addon/libertree/libertree.php:83 addon/libertree/libertree.php:87
-msgid "libertree Export"
+#: include/enotify.php:336 include/enotify.php:337
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
 msgstr ""
 
-#: addon/libertree/libertree.php:91
-msgid "Enable Libertree Post Addon"
+#: include/enotify.php:350
+msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: addon/libertree/libertree.php:96
-msgid "Libertree API token"
+#: include/enotify.php:352
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: addon/libertree/libertree.php:101
-msgid "Libertree site URL"
+#: include/enotify.php:353
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: addon/libertree/libertree.php:106
-msgid "Post to Libertree by default"
+#: include/enotify.php:359
+msgid "Name:"
 msgstr ""
 
-#: addon/twitter/twitter.php:206
-msgid "Post to Twitter"
+#: include/enotify.php:360
+msgid "Photo:"
 msgstr ""
 
-#: addon/twitter/twitter.php:251
-msgid ""
-"You submitted an empty PIN, please Sign In with Twitter again to get a new "
-"one."
+#: include/enotify.php:363
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: addon/twitter/twitter.php:280
-msgid "Twitter settings updated."
+#: include/enotify.php:371 include/enotify.php:386
+msgid "[Friendica:Notify] Connection accepted"
 msgstr ""
 
-#: addon/twitter/twitter.php:310 addon/twitter/twitter.php:314
-msgid "Twitter Import/Export/Mirror"
+#: include/enotify.php:373 include/enotify.php:388
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr ""
 
-#: addon/twitter/twitter.php:321
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: include/enotify.php:374 include/enotify.php:389
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr ""
 
-#: addon/twitter/twitter.php:333
+#: include/enotify.php:379
 msgid ""
-"At this Friendica instance the Twitter addon was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
 msgstr ""
 
-#: addon/twitter/twitter.php:334
-msgid "Log in with Twitter"
+#: include/enotify.php:381
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr ""
 
-#: addon/twitter/twitter.php:336
-msgid "Copy the PIN from Twitter here"
+#: include/enotify.php:394
+#, 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 ""
 
-#: addon/twitter/twitter.php:343 addon/twitter/twitter.php:397
-msgid "An error occured: "
+#: include/enotify.php:396
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
 msgstr ""
 
-#: addon/twitter/twitter.php:360 addon/statusnet/statusnet.php:356
-msgid "Currently connected to: "
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr ""
 
-#: addon/twitter/twitter.php:361
-msgid "Disconnect"
+#: include/enotify.php:408 mod/removeme.php:45
+msgid "[Friendica System Notify]"
 msgstr ""
 
-#: addon/twitter/twitter.php:377
-msgid "Allow posting to Twitter"
+#: include/enotify.php:408
+msgid "registration request"
 msgstr ""
 
-#: addon/twitter/twitter.php:377
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for "
-"every posting separately in the posting options when writing the entry."
+#: include/enotify.php:410
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: addon/twitter/twitter.php:380
-msgid ""
-"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
+#: include/enotify.php:411
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: addon/twitter/twitter.php:383
-msgid "Send public postings to Twitter by default"
+#: include/enotify.php:416
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
 msgstr ""
 
-#: addon/twitter/twitter.php:386
-msgid "Mirror all posts from twitter that are no replies"
+#: include/enotify.php:422
+#, php-format
+msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
-#: addon/twitter/twitter.php:389 addon/statusnet/statusnet.php:376
-#: addon/pumpio/pumpio.php:295
-msgid "Import the remote timeline"
+#: include/items.php:348 src/Module/Admin/Themes/Details.php:53
+#: src/Module/Admin/Themes/Index.php:40 src/Module/Debug/ItemBody.php:27
+#: src/Module/Debug/ItemBody.php:40
+msgid "Item not found."
 msgstr ""
 
-#: addon/twitter/twitter.php:392
-msgid "Automatically create contacts"
+#: include/items.php:380
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: addon/twitter/twitter.php:392
-msgid ""
-"This will automatically create a contact in Friendica as soon as you receive "
-"a message from an existing contact via the Twitter network. If you do not "
-"enable this, you need to manually add those Twitter contacts in Friendica "
-"from whom you would like to see posts here. However if enabled, you cannot "
-"merely remove a twitter contact from the Friendica contact list, as it will "
-"recreate this contact when they post again."
+#: include/items.php:382 mod/api.php:109 mod/dfrn_request.php:642
+#: mod/follow.php:161 mod/message.php:148 mod/profiles.php:523
+#: mod/profiles.php:526 mod/profiles.php:548 mod/settings.php:1083
+#: mod/settings.php:1089 mod/settings.php:1096 mod/settings.php:1100
+#: mod/settings.php:1104 mod/settings.php:1108 mod/settings.php:1112
+#: mod/settings.php:1116 mod/settings.php:1136 mod/settings.php:1137
+#: mod/settings.php:1138 mod/settings.php:1139 mod/settings.php:1140
+#: mod/suggest.php:72 src/Module/Contact.php:441 src/Module/Register.php:96
+msgid "Yes"
 msgstr ""
 
-#: addon/twitter/twitter.php:732
-msgid "Consumer key"
+#: include/items.php:432 mod/api.php:34 mod/api.php:39 mod/cal.php:288
+#: mod/common.php:27 mod/crepair.php:89 mod/dfrn_confirm.php:64
+#: mod/editpost.php:22 mod/events.php:212 mod/follow.php:55 mod/follow.php:132
+#: mod/fsuggest.php:63 mod/item.php:171 mod/message.php:54 mod/message.php:99
+#: mod/network.php:35 mod/notes.php:27 mod/notifications.php:49
+#: mod/ostatus_subscribe.php:16 mod/photos.php:160 mod/photos.php:922
+#: mod/poke.php:142 mod/profile_photo.php:30 mod/profile_photo.php:175
+#: mod/profile_photo.php:195 mod/profiles.php:179 mod/profiles.php:496
+#: mod/regmod.php:84 mod/repair_ostatus.php:15 mod/settings.php:48
+#: mod/settings.php:161 mod/settings.php:653 mod/suggest.php:38
+#: mod/uimport.php:16 mod/unfollow.php:21 mod/unfollow.php:76
+#: mod/unfollow.php:108 mod/wall_attach.php:62 mod/wall_attach.php:65
+#: mod/wall_upload.php:93 mod/wall_upload.php:96 mod/wallmessage.php:18
+#: mod/wallmessage.php:42 mod/wallmessage.php:81 mod/wallmessage.php:105
+#: src/Module/Notifications/Notify.php:18 src/Module/Profile/Contacts.php:49
+#: src/Module/Search/Directory.php:19 src/Module/Settings/Delegation.php:23
+#: src/Module/Settings/Delegation.php:51 src/Module/Attach.php:41
+#: src/Module/Base/Api.php:40 src/Module/Base/Api.php:46
+#: src/Module/Contact.php:358 src/Module/Delegation.php:98
+#: src/Module/FollowConfirm.php:16 src/Module/Group.php:29
+#: src/Module/Group.php:75 src/Module/Invite.php:21 src/Module/Invite.php:109
+#: src/Module/Register.php:43 src/Module/Register.php:56
+#: src/Module/Register.php:176 src/Module/Register.php:215
+msgid "Permission denied."
 msgstr ""
 
-#: addon/twitter/twitter.php:733
-msgid "Consumer secret"
+#: mod/api.php:84 mod/api.php:106
+msgid "Authorize application connection"
 msgstr ""
 
-#: addon/viewsrc/viewsrc.php:55
-msgid "View Source"
+#: mod/api.php:85
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:334 addon/jappixmini/jappixmini.php:338
-msgid "Jappix Mini"
+#: mod/api.php:94 src/Module/BaseAdminModule.php:54
+msgid "Please login to continue."
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:341
-msgid "Activate addon"
+#: mod/api.php:108
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:344
-msgid "Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+#: mod/api.php:110 mod/dfrn_request.php:642 mod/follow.php:161
+#: mod/profiles.php:523 mod/profiles.php:527 mod/profiles.php:548
+#: mod/settings.php:1083 mod/settings.php:1089 mod/settings.php:1096
+#: mod/settings.php:1100 mod/settings.php:1104 mod/settings.php:1108
+#: mod/settings.php:1112 mod/settings.php:1116 mod/settings.php:1136
+#: mod/settings.php:1137 mod/settings.php:1138 mod/settings.php:1139
+#: mod/settings.php:1140 src/Module/Register.php:97
+msgid "No"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:347
-msgid "Jabber username"
+#: mod/cal.php:28 mod/cal.php:32 mod/community.php:31 mod/follow.php:18
+#: src/Module/Debug/ItemBody.php:18 src/Module/Diaspora/Receive.php:32
+#: src/Module/Item/Ignore.php:22
+msgid "Access denied."
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:350
-msgid "Jabber server"
+#: mod/cal.php:127 mod/display.php:269 src/Module/Profile.php:170
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:355 addon/xmpp/xmpp.php:88
-#: addon/xmpp/xmpp.php:114
-msgid "Jabber BOSH host"
+#: mod/cal.php:258 mod/events.php:393 view/theme/frio/theme.php:270
+#: view/theme/frio/theme.php:274 src/Content/Nav.php:161
+#: src/Content/Nav.php:225 src/Model/Profile.php:943 src/Model/Profile.php:954
+msgid "Events"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:360
-msgid "Jabber password"
+#: mod/cal.php:259 mod/events.php:394
+msgid "View"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:365
-msgid "Encrypt Jabber password with Friendica password (recommended)"
+#: mod/cal.php:260 mod/events.php:396
+msgid "Previous"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:368
-msgid "Friendica password"
+#: mod/cal.php:261 mod/events.php:397 src/Module/Install.php:173
+msgid "Next"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:371
-msgid "Approve subscription requests from Friendica contacts automatically"
+#: mod/cal.php:264 mod/events.php:402 src/Model/Event.php:427
+msgid "today"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:374
-msgid "Subscribe to Friendica contacts automatically"
+#: mod/cal.php:265 mod/events.php:403 src/Util/Temporal.php:312
+#: src/Model/Event.php:428
+msgid "month"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:377
-msgid "Purge internal list of jabber addresses of contacts"
+#: mod/cal.php:266 mod/events.php:404 src/Util/Temporal.php:313
+#: src/Model/Event.php:429
+msgid "week"
 msgstr ""
 
-#: addon/jappixmini/jappixmini.php:385
-msgid "Add contact"
+#: mod/cal.php:267 mod/events.php:405 src/Util/Temporal.php:314
+#: src/Model/Event.php:430
+msgid "day"
 msgstr ""
 
-#: addon/numfriends/numfriends.php:44
-msgid "Numfriends settings updated."
+#: mod/cal.php:268 mod/events.php:406
+msgid "list"
 msgstr ""
 
-#: addon/numfriends/numfriends.php:71
-msgid "Numfriends Settings"
+#: mod/cal.php:281 src/Model/User.php:413 src/Console/NewPassword.php:88
+msgid "User not found"
 msgstr ""
 
-#: addon/numfriends/numfriends.php:73
-msgid "How many contacts to display on profile sidebar"
+#: mod/cal.php:297
+msgid "This calendar format is not supported"
 msgstr ""
 
-#: addon/wppost/wppost.php:57
-msgid "Post to Wordpress"
+#: mod/cal.php:299
+msgid "No exportable data found"
 msgstr ""
 
-#: addon/wppost/wppost.php:98 addon/wppost/wppost.php:102
-msgid "Wordpress Export"
+#: mod/cal.php:316
+msgid "calendar"
 msgstr ""
 
-#: addon/wppost/wppost.php:105
-msgid "Enable WordPress Post Addon"
+#: mod/common.php:90
+msgid "No contacts in common."
 msgstr ""
 
-#: addon/wppost/wppost.php:110
-msgid "WordPress username"
+#: mod/common.php:141 src/Module/Contact.php:892
+msgid "Common Friends"
 msgstr ""
 
-#: addon/wppost/wppost.php:115
-msgid "WordPress password"
+#: mod/community.php:24 mod/dfrn_request.php:599 mod/display.php:167
+#: mod/photos.php:836 mod/videos.php:111 src/Module/Debug/Probe.php:20
+#: src/Module/Debug/WebFinger.php:19 src/Module/Search/Index.php:29
+#: src/Module/Search/Index.php:34 src/Module/Directory.php:31
+msgid "Public access denied."
 msgstr ""
 
-#: addon/wppost/wppost.php:120
-msgid "WordPress API URL"
+#: mod/community.php:67
+msgid "Community option not available."
 msgstr ""
 
-#: addon/wppost/wppost.php:125
-msgid "Post to WordPress by default"
+#: mod/community.php:84
+msgid "Not available."
 msgstr ""
 
-#: addon/wppost/wppost.php:130
-msgid "Provide a backlink to the Friendica post"
+#: mod/community.php:94
+msgid "Local Community"
 msgstr ""
 
-#: addon/wppost/wppost.php:134
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
+#: mod/community.php:97
+msgid "Posts from local users on this server"
 msgstr ""
 
-#: addon/wppost/wppost.php:139
-msgid "Don't post messages that are too short"
+#: mod/community.php:105
+msgid "Global Community"
 msgstr ""
 
-#: addon/wppost/wppost.php:247
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
+#: mod/community.php:108
+msgid "Posts from users of the whole federated network"
 msgstr ""
 
-#: addon/curweather/curweather.php:57
-msgid "Error fetching weather data. Error was: "
+#: mod/community.php:154 src/Module/Search/Index.php:168
+msgid "No results."
 msgstr ""
 
-#: addon/curweather/curweather.php:140 addon/curweather/curweather.php:204
-msgid "Current Weather"
+#: mod/community.php:206
+msgid ""
+"This community stream shows all public posts received by this node. They may "
+"not reflect the opinions of this node’s users."
 msgstr ""
 
-#: addon/curweather/curweather.php:147
-msgid "Relative Humidity"
+#: mod/crepair.php:78
+msgid "Contact settings applied."
 msgstr ""
 
-#: addon/curweather/curweather.php:148
-msgid "Pressure"
+#: mod/crepair.php:80
+msgid "Contact update failed."
 msgstr ""
 
-#: addon/curweather/curweather.php:149
-msgid "Wind"
+#: mod/crepair.php:101 mod/dfrn_confirm.php:125 mod/fsuggest.php:32
+#: mod/fsuggest.php:75 mod/redir.php:32 mod/redir.php:122 mod/redir.php:137
+#: src/Module/Group.php:90
+msgid "Contact not found."
 msgstr ""
 
-#: addon/curweather/curweather.php:150
-msgid "Last Updated"
+#: mod/crepair.php:114
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: addon/curweather/curweather.php:151
-msgid "Data by"
+#: mod/crepair.php:115
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: addon/curweather/curweather.php:152
-msgid "Show on map"
+#: mod/crepair.php:129 mod/crepair.php:131
+msgid "No mirroring"
 msgstr ""
 
-#: addon/curweather/curweather.php:157
-msgid "There was a problem accessing the weather data. But have a look"
+#: mod/crepair.php:129
+msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: addon/curweather/curweather.php:159
-msgid "at OpenWeatherMap"
+#: mod/crepair.php:129 mod/crepair.php:131
+msgid "Mirror as my own posting"
 msgstr ""
 
-#: addon/curweather/curweather.php:176
-msgid "Current Weather settings updated."
+#: mod/crepair.php:144
+msgid "Return to contact editor"
 msgstr ""
 
-#: addon/curweather/curweather.php:191
-msgid "No APPID found, please contact your admin to obtain one."
+#: mod/crepair.php:146
+msgid "Refetch contact data"
 msgstr ""
 
-#: addon/curweather/curweather.php:204 view/theme/frio/theme.php:277
-#: src/Content/Nav.php:261 src/Module/Admin/Addons/Details.php:102
-#: src/Module/Admin/Themes/Details.php:107 src/Module/Welcome.php:33
-#: src/Module/BaseSettingsModule.php:105 mod/settings.php:144
-msgid "Settings"
+#: mod/crepair.php:148 mod/events.php:551 mod/fsuggest.php:92
+#: mod/message.php:259 mod/message.php:439 mod/photos.php:951
+#: mod/photos.php:1057 mod/photos.php:1343 mod/photos.php:1388
+#: mod/photos.php:1427 mod/photos.php:1491 mod/poke.php:185
+#: mod/profiles.php:559 view/theme/duepuntozero/config.php:69
+#: view/theme/frio/config.php:124 view/theme/quattro/config.php:71
+#: view/theme/vier/config.php:119 src/Module/Debug/Localtime.php:45
+#: src/Module/Item/Compose.php:125 src/Module/Contact.php:578
+#: src/Module/Delegation.php:131 src/Module/Install.php:211
+#: src/Module/Install.php:251 src/Module/Install.php:287
+#: src/Module/Invite.php:156 src/Object/Post.php:903
+msgid "Submit"
 msgstr ""
 
-#: addon/curweather/curweather.php:206
-msgid "Enter either the name of your location or the zip code."
+#: mod/crepair.php:149
+msgid "Remote Self"
 msgstr ""
 
-#: addon/curweather/curweather.php:207
-msgid "Your Location"
+#: mod/crepair.php:152
+msgid "Mirror postings from this contact"
 msgstr ""
 
-#: addon/curweather/curweather.php:207
+#: mod/crepair.php:154
 msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
 msgstr ""
 
-#: addon/curweather/curweather.php:208
-msgid "Units"
+#: mod/crepair.php:158 mod/settings.php:665 mod/settings.php:691
+#: src/Module/Admin/Blocklist/Contact.php:71 src/Module/Admin/Users.php:269
+#: src/Module/Admin/Users.php:280 src/Module/Admin/Users.php:294
+#: src/Module/Admin/Users.php:310
+msgid "Name"
 msgstr ""
 
-#: addon/curweather/curweather.php:208
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+#: mod/crepair.php:159
+msgid "Account Nickname"
 msgstr ""
 
-#: addon/curweather/curweather.php:209
-msgid "Show weather data"
+#: mod/crepair.php:160
+msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: addon/curweather/curweather.php:227
-msgid "Curweather settings saved."
+#: mod/crepair.php:161
+msgid "Account URL"
 msgstr ""
 
-#: addon/curweather/curweather.php:246
-msgid "Caching Interval"
+#: mod/crepair.php:162
+msgid "Account URL Alias"
 msgstr ""
 
-#: addon/curweather/curweather.php:248
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
+#: mod/crepair.php:163
+msgid "Friend Request URL"
 msgstr ""
 
-#: addon/curweather/curweather.php:249
-msgid "no cache"
+#: mod/crepair.php:164
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: addon/curweather/curweather.php:250 addon/curweather/curweather.php:251
-#: addon/curweather/curweather.php:252 addon/curweather/curweather.php:253
-#: src/Util/Temporal.php:316
-msgid "minutes"
+#: mod/crepair.php:165
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: addon/curweather/curweather.php:256
-msgid "Your APPID"
+#: mod/crepair.php:166
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: addon/curweather/curweather.php:256
-msgid "Your API key provided by OpenWeatherMap"
+#: mod/crepair.php:167
+msgid "New photo from this URL"
 msgstr ""
 
-#: addon/js_upload/js_upload.php:34
-msgid "Select files for upload"
+#: mod/dfrn_confirm.php:70 mod/profiles.php:40 mod/profiles.php:149
+#: mod/profiles.php:193 mod/profiles.php:508
+msgid "Profile not found."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:35
-msgid "Drop files here to upload"
+#: mod/dfrn_confirm.php:126
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:37
-msgid "Failed"
+#: mod/dfrn_confirm.php:227
+msgid "Response from remote site was not understood."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:215
-msgid "No files were uploaded."
+#: mod/dfrn_confirm.php:234 mod/dfrn_confirm.php:240
+msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: addon/js_upload/js_upload.php:221
-msgid "Uploaded file is empty"
+#: mod/dfrn_confirm.php:249
+msgid "Confirmation completed successfully."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:233
-msgid "Image exceeds size limit of "
+#: mod/dfrn_confirm.php:261
+msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:247
-msgid "File has an invalid extension, it should be one of "
+#: mod/dfrn_confirm.php:264
+msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: addon/js_upload/js_upload.php:258
-msgid "Upload was cancelled, or server error encountered"
+#: mod/dfrn_confirm.php:269
+msgid "Remote site reported: "
 msgstr ""
 
-#: addon/webrtc/webrtc.php:25
-msgid "WebRTC Videochat"
+#: mod/dfrn_confirm.php:374
+#, php-format
+msgid "No user record found for '%s' "
 msgstr ""
 
-#: addon/webrtc/webrtc.php:32
-msgid "WebRTC Base URL"
+#: mod/dfrn_confirm.php:384
+msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: addon/webrtc/webrtc.php:32
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use "
-"https://live.mayfirst.org ."
+#: mod/dfrn_confirm.php:395
+msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: addon/webrtc/webrtc.php:52
-msgid "Video Chat"
+#: mod/dfrn_confirm.php:411
+msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: addon/webrtc/webrtc.php:53
-msgid ""
-"WebRTC is a video and audio conferencing tool that works with Firefox "
-"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
-"create a new chat room and send the link to someone you want to chat with."
+#: mod/dfrn_confirm.php:425
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: addon/webrtc/webrtc.php:55
+#: mod/dfrn_confirm.php:441
 msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:33
-msgid "Send email to all members"
+#: mod/dfrn_confirm.php:452
+msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:52 include/enotify.php:67
-#, php-format
-msgid "%s Administrator"
+#: mod/dfrn_confirm.php:508
+msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: addon/notifyall/notifyall.php:54 include/enotify.php:65
-#, php-format
-msgid "%1$s, %2$s Administrator"
+#: mod/dfrn_confirm.php:538 mod/dfrn_request.php:562 src/Model/Contact.php:2642
+msgid "[Name Withheld]"
 msgstr ""
 
-#: addon/notifyall/notifyall.php:81
-msgid "No recipients found."
+#: mod/dfrn_poll.php:121 mod/dfrn_poll.php:524
+#, php-format
+msgid "%1$s welcomes %2$s"
 msgstr ""
 
-#: addon/notifyall/notifyall.php:97
-msgid "Emails sent"
+#: mod/dfrn_request.php:100
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:107
-msgid "Send email to all members of this Friendica instance."
+#: mod/dfrn_request.php:118 mod/dfrn_request.php:356
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:112
-msgid "Message subject"
+#: mod/dfrn_request.php:122 mod/dfrn_request.php:360
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:113
-msgid "Test mode (only send to administrator)"
+#: mod/dfrn_request.php:125 mod/dfrn_request.php:363
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: addon/notifyall/notifyall.php:114 addon/openstreetmap/openstreetmap.php:208
-#: view/theme/vier/config.php:120 view/theme/duepuntozero/config.php:70
-#: view/theme/frio/config.php:125 view/theme/quattro/config.php:72
-#: src/Object/Post.php:904 src/Module/Delegation.php:131
-#: src/Module/Install.php:211 src/Module/Install.php:251
-#: src/Module/Install.php:287 src/Module/Debug/Localtime.php:45
-#: src/Module/Contact.php:580 src/Module/Invite.php:156
-#: src/Module/Item/Compose.php:125 mod/fsuggest.php:91 mod/events.php:551
-#: mod/crepair.php:149 mod/poke.php:185 mod/photos.php:952 mod/photos.php:1058
-#: mod/photos.php:1344 mod/photos.php:1389 mod/photos.php:1428
-#: mod/photos.php:1492 mod/profiles.php:560 mod/message.php:259
-#: mod/message.php:439
-msgid "Submit"
-msgstr ""
+#: mod/dfrn_request.php:129 mod/dfrn_request.php:367
+#, 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] ""
 
-#: addon/group_text/group_text.php:47
-msgid "Group Text settings updated."
+#: mod/dfrn_request.php:167
+msgid "Introduction complete."
 msgstr ""
 
-#: addon/group_text/group_text.php:77
-msgid "Group Text"
-msgstr ""
-
-#: addon/group_text/group_text.php:79
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+#: mod/dfrn_request.php:203
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:24
-msgid "bitchslap"
+#: mod/dfrn_request.php:230
+msgid "Profile unavailable."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:24
-msgid "bitchslapped"
+#: mod/dfrn_request.php:251
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:25
-msgid "shag"
+#: mod/dfrn_request.php:252
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:25
-msgid "shagged"
+#: mod/dfrn_request.php:253
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:26
-msgid "do something obscenely biological to"
+#: mod/dfrn_request.php:277
+msgid "Invalid locator"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:26
-msgid "did something obscenely biological to"
+#: mod/dfrn_request.php:313
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:27
-msgid "point out the poke feature to"
+#: mod/dfrn_request.php:316
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:27
-msgid "pointed out the poke feature to"
+#: mod/dfrn_request.php:336
+msgid "Invalid profile URL."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:28
-msgid "declare undying love for"
+#: mod/dfrn_request.php:342 src/Model/Contact.php:2265
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:28
-msgid "declared undying love for"
+#: mod/dfrn_request.php:348 src/Model/Contact.php:2270
+#: src/Module/Friendica.php:58
+msgid "Blocked domain"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:29
-msgid "patent"
+#: mod/dfrn_request.php:415 src/Module/Contact.php:140
+msgid "Failed to update contact record."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:29
-msgid "patented"
+#: mod/dfrn_request.php:435
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:30
-msgid "stroke beard"
+#: mod/dfrn_request.php:473
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:30
-msgid "stroked their beard at"
+#: mod/dfrn_request.php:489
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:31
+#: mod/dfrn_request.php:497
 msgid ""
-"bemoan the declining standards of modern secondary and tertiary education to"
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:31
-msgid ""
-"bemoans the declining standards of modern secondary and tertiary education to"
+#: mod/dfrn_request.php:511 mod/dfrn_request.php:526
+msgid "Confirm"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:32
-msgid "hug"
+#: mod/dfrn_request.php:522
+msgid "Hide this contact"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:32
-msgid "hugged"
+#: mod/dfrn_request.php:524
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:33
-msgid "kiss"
+#: mod/dfrn_request.php:525
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:33
-msgid "kissed"
+#: mod/dfrn_request.php:634
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:34
-msgid "raise eyebrows at"
+#: mod/dfrn_request.php:636
+#, php-format
+msgid ""
+"If you are not yet a member of the free social web, <a href=\"%s\">follow "
+"this link to find a public Friendica site and join us today</a>."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:34
-msgid "raised their eyebrows at"
+#: mod/dfrn_request.php:639
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:35
-msgid "insult"
+#: mod/dfrn_request.php:640
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@gnusocial.de"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:35
-msgid "insulted"
+#: mod/dfrn_request.php:641 mod/follow.php:160
+msgid "Please answer the following:"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:36
-msgid "praise"
+#: mod/dfrn_request.php:642 mod/follow.php:161
+#, php-format
+msgid "Does %s know you?"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:36
-msgid "praised"
+#: mod/dfrn_request.php:643 mod/follow.php:162
+msgid "Add a personal note:"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:37
-msgid "be dubious of"
+#: mod/dfrn_request.php:645
+msgid "Friendica"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:37
-msgid "was dubious of"
+#: mod/dfrn_request.php:646
+msgid "GNU Social (Pleroma, Mastodon)"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:38
-msgid "eat"
+#: mod/dfrn_request.php:647
+msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:38
-msgid "ate"
+#: mod/dfrn_request.php:648
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:39
-msgid "giggle and fawn at"
+#: mod/dfrn_request.php:649 mod/follow.php:168 mod/unfollow.php:127
+msgid "Your Identity Address:"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:39
-msgid "giggled and fawned at"
+#: mod/dfrn_request.php:651 mod/follow.php:74 mod/unfollow.php:130
+msgid "Submit Request"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:40
-msgid "doubt"
+#: mod/display.php:224 mod/display.php:305
+msgid "The requested item doesn't exist or has been deleted."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:40
-msgid "doubted"
+#: mod/display.php:385
+msgid "The feed for this item is unavailable."
 msgstr ""
 
-#: addon/morepokes/morepokes.php:41
-msgid "glare"
+#: mod/editpost.php:29 mod/editpost.php:39
+msgid "Item not found"
 msgstr ""
 
-#: addon/morepokes/morepokes.php:41
-msgid "glared at"
+#: mod/editpost.php:46
+msgid "Edit post"
 msgstr ""
 
-#: addon/gnot/gnot.php:52
-msgid "Gnot settings updated."
+#: mod/editpost.php:72 mod/notes.php:46 src/Content/Text/HTML.php:894
+#: src/Module/Filer/SaveTag.php:48
+msgid "Save"
 msgstr ""
 
-#: addon/gnot/gnot.php:84
-msgid "Gnot Settings"
+#: mod/editpost.php:77 mod/message.php:257 mod/message.php:438
+#: mod/wallmessage.php:139
+msgid "Insert web link"
 msgstr ""
 
-#: addon/gnot/gnot.php:86
-msgid "Enable this addon?"
+#: mod/editpost.php:78
+msgid "web link"
 msgstr ""
 
-#: addon/gnot/gnot.php:88
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the "
-"subject line."
+#: mod/editpost.php:79
+msgid "Insert video link"
 msgstr ""
 
-#: addon/gnot/gnot.php:97
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
+#: mod/editpost.php:80
+msgid "video link"
 msgstr ""
 
-#: addon/randplace/randplace.php:172
-msgid "Randplace Settings"
+#: mod/editpost.php:81
+msgid "Insert audio link"
 msgstr ""
 
-#: addon/randplace/randplace.php:174
-msgid "Enable Randplace Addon"
+#: mod/editpost.php:82
+msgid "audio link"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:34
-msgid "Androgyne"
+#: mod/editpost.php:96 src/Core/ACL.php:390
+msgid "CC: email addresses"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:35
-msgid "Bear"
+#: mod/editpost.php:103 src/Core/ACL.php:391
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:36
-msgid "Bigender"
+#: mod/events.php:119 mod/events.php:121
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:37
-msgid "Cross dresser"
+#: mod/events.php:128 mod/events.php:130
+msgid "Event title and start time are required."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:38
-msgid "Drag queen"
+#: mod/events.php:395
+msgid "Create New Event"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:39
-msgid "Eunuch"
+#: mod/events.php:507
+msgid "Event details"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:40
-msgid "Faux queen"
+#: mod/events.php:508
+msgid "Starting date and Title are required."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:41
-msgid "Gender fluid"
+#: mod/events.php:509 mod/events.php:514
+msgid "Event Starts:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:42
-msgid "Kathoey"
+#: mod/events.php:509 mod/events.php:541 mod/profiles.php:589
+msgid "Required"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:43
-msgid "Lady"
+#: mod/events.php:522 mod/events.php:547
+msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:44
-msgid "Lipstick lesbian"
+#: mod/events.php:524 mod/events.php:529
+msgid "Event Finishes:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:45
-msgid "Metrosexual"
+#: mod/events.php:535 mod/events.php:548
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:46
-msgid "Monk"
+#: mod/events.php:537
+msgid "Description:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:47
-msgid "Nun"
+#: mod/events.php:539 mod/notifications.php:248 src/Model/Event.php:67
+#: src/Model/Event.php:94 src/Model/Event.php:436 src/Model/Event.php:932
+#: src/Model/Profile.php:437 src/Module/Contact.php:625
+#: src/Module/Directory.php:135
+msgid "Location:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:48
-msgid "Soft butch"
+#: mod/events.php:541 mod/events.php:543
+msgid "Title:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:49
-msgid "Stone femme"
+#: mod/events.php:544 mod/events.php:545
+msgid "Share this event"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:50
-msgid "Tomboy"
+#: mod/events.php:552 src/Model/Profile.php:880
+msgid "Basic"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:51
-msgid "Transman"
+#: mod/events.php:553 src/Model/Profile.php:881 src/Module/Admin/Site.php:561
+#: src/Module/Contact.php:902
+msgid "Advanced"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:52
-msgid "Transwoman"
+#: mod/events.php:554 mod/photos.php:969 mod/photos.php:1339
+msgid "Permissions"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:53
-msgid "Transvesti"
+#: mod/events.php:570
+msgid "Failed to remove event"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:54
-msgid "Trigender"
+#: mod/events.php:572
+msgid "Event removed"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:55
-msgid "Can't remember"
+#: mod/fbrowser.php:42 view/theme/frio/theme.php:268 src/Content/Nav.php:159
+#: src/Model/Profile.php:923
+msgid "Photos"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:56
-msgid "Hard to tell these days"
+#: mod/fbrowser.php:51 mod/fbrowser.php:75 mod/photos.php:178
+#: mod/photos.php:933 mod/photos.php:1046 mod/photos.php:1063
+#: mod/photos.php:1544 mod/photos.php:1559 src/Model/Photo.php:552
+#: src/Model/Photo.php:561
+msgid "Contact Photos"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:60
-msgid "Girls with big tits"
+#: mod/fbrowser.php:111 mod/fbrowser.php:140 mod/profile_photo.php:245
+msgid "Upload"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:61
-msgid "Millionaires"
+#: mod/fbrowser.php:135
+msgid "Files"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:62
-msgid "Guys with big schlongs"
+#: mod/follow.php:44
+msgid "The contact could not be added."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:63
-msgid "Easy women"
+#: mod/follow.php:85
+msgid "You already added this contact."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:64
-msgid "People with impaired mobility"
+#: mod/follow.php:97
+msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:65
-msgid "Amputees"
+#: mod/follow.php:104
+msgid "OStatus support is disabled. Contact can't be added."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:66
-msgid "Statues, mannequins and immobility"
+#: mod/follow.php:111
+msgid "The network type couldn't be detected. Contact can't be added."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:67
-msgid "Pain"
+#: mod/follow.php:177 mod/notifications.php:166 mod/notifications.php:258
+#: mod/unfollow.php:136 src/Module/Admin/Blocklist/Contact.php:81
+#: src/Module/Contact.php:621
+msgid "Profile URL"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:68
-msgid "Trans men"
+#: mod/follow.php:181 mod/notifications.php:252 src/Model/Profile.php:810
+#: src/Module/Contact.php:631
+msgid "Tags:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:69
-msgid "Older women"
+#: mod/follow.php:193 mod/unfollow.php:146 src/Model/Profile.php:910
+#: src/Module/Contact.php:864
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:70
-msgid "Asphyxiation"
+#: mod/fsuggest.php:44
+msgid "Suggested contact not found."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:71
-msgid "In public"
+#: mod/fsuggest.php:57
+msgid "Friend suggestion sent."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:72
-msgid "In danger"
+#: mod/fsuggest.php:79
+msgid "Suggest Friends"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:73
-msgid "Pretending to be male"
+#: mod/fsuggest.php:81
+#, php-format
+msgid "Suggest a friend for %s"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:74
-msgid "Pretending to be female"
+#: mod/item.php:124
+msgid "Unable to locate original post."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:75
-msgid "Breats"
+#: mod/item.php:326
+msgid "Empty post discarded."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:76
-msgid "Scat"
+#: mod/item.php:798
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:77
-msgid "Crying"
+#: mod/item.php:800
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:78
-msgid "Nappies/Diapers"
+#: mod/item.php:801
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:79
-msgid "Trees"
+#: mod/item.php:805
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:80
-msgid "Vomit"
+#: mod/lockview.php:47 mod/lockview.php:58
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:81
-msgid "Murder"
+#: mod/lockview.php:69
+msgid "Visible to:"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:82
-msgid "Fat people"
+#: mod/lockview.php:75 mod/lockview.php:110 src/Core/ACL.php:269
+#: src/Content/Widget.php:192 src/Module/Profile/Contacts.php:125
+#: src/Module/Contact.php:793
+msgid "Followers"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:83
-msgid "Feet"
+#: mod/lockview.php:81 mod/lockview.php:116 src/Core/ACL.php:276
+msgid "Mutuals"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:84
-msgid "Covered in insects"
+#: mod/lostpass.php:25
+msgid "No valid account found."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:85
-msgid "Turning a human being into furniture"
+#: mod/lostpass.php:37
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:86
-msgid "Elderly people"
+#: mod/lostpass.php:43
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
+"\t\tpassword. In order to confirm this request, please select the "
+"verification link\n"
+"\t\tbelow or paste it into your web browser address bar.\n"
+"\n"
+"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
+"\t\tprovided and ignore and/or delete this email, the request will expire "
+"shortly.\n"
+"\n"
+"\t\tYour password will not be changed unless we can verify that you\n"
+"\t\tissued this request."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:87
-msgid "Transgender people"
+#: mod/lostpass.php:54
+#, php-format
+msgid ""
+"\n"
+"\t\tFollow this link soon to verify your identity:\n"
+"\n"
+"\t\t%1$s\n"
+"\n"
+"\t\tYou will then receive a follow-up message containing the new password.\n"
+"\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\n"
+"\t\tThe login details are as follows:\n"
+"\n"
+"\t\tSite Location:\t%2$s\n"
+"\t\tLogin Name:\t%3$s"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:88
-msgid "Criminals"
+#: mod/lostpass.php:73
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:89
-msgid "Stealing"
+#: mod/lostpass.php:88
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:90
-msgid "Breast milk"
+#: mod/lostpass.php:101
+msgid "Request has expired, please make a new one."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:91
-msgid "Immersing genitals in liquids"
+#: mod/lostpass.php:116
+msgid "Forgot your Password?"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:92
-msgid "Giants"
+#: mod/lostpass.php:117
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:93
-msgid "Masochism"
+#: mod/lostpass.php:118 src/Module/Security/Login.php:131
+msgid "Nickname or Email: "
 msgstr ""
 
-#: addon/morechoice/morechoice.php:94
-msgid "Cars"
+#: mod/lostpass.php:119
+msgid "Reset"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:95
-msgid "Menstruation"
+#: mod/lostpass.php:134 src/Module/Security/Login.php:143
+msgid "Password Reset"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:96
-msgid "Mucus"
+#: mod/lostpass.php:135
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:97
-msgid "Obscene language"
+#: mod/lostpass.php:136
+msgid "Your new password is"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:98
-msgid "Noses"
+#: mod/lostpass.php:137
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:99
-msgid "Navels"
+#: mod/lostpass.php:138
+msgid "click here to login"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:100
-msgid "Corpses"
+#: mod/lostpass.php:139
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:101
-msgid "Smells"
+#: mod/lostpass.php:146
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tYour password has been changed as requested. Please retain this\n"
+"\t\t\tinformation for your records (or change your password immediately to\n"
+"\t\t\tsomething that you will remember).\n"
+"\t\t"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:102
-msgid "Buttocks"
+#: mod/lostpass.php:152
+#, php-format
+msgid ""
+"\n"
+"\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t%2$s\n"
+"\t\t\tPassword:\t%3$s\n"
+"\n"
+"\t\t\tYou may change that password from your account settings page after "
+"logging in.\n"
+"\t\t"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:103
-msgid "Nonliving objects"
+#: mod/lostpass.php:168
+#, php-format
+msgid "Your password has been changed at %s"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:104
-msgid "Sleeping people"
+#: mod/match.php:47
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:105
-msgid "Urination"
+#: mod/match.php:100 mod/suggest.php:105 src/Content/Widget.php:39
+#: src/Module/AllFriends.php:91 src/Module/BaseSearchModule.php:130
+msgid "Connect"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:106
-msgid "Eating people"
+#: mod/match.php:113 src/Content/Pager.php:198
+msgid "first"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:107
-msgid "Being eaten"
+#: mod/match.php:118 src/Content/Pager.php:258
+msgid "next"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:108
-msgid "Animals"
+#: mod/match.php:128 src/Module/BaseSearchModule.php:93
+msgid "No matches"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:109
-msgid "I'd rather just have some chocolate"
+#: mod/match.php:133
+msgid "Profile Match"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:113
-msgid "Married to my job"
+#: mod/message.php:31 mod/message.php:114 src/Content/Nav.php:253
+msgid "New Message"
 msgstr ""
 
-#: addon/morechoice/morechoice.php:114
-msgid "Polygamist"
+#: mod/message.php:68 mod/wallmessage.php:59
+msgid "No recipient selected."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:115
-msgid "Half married"
+#: mod/message.php:72
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:116
-msgid "Living in the past"
+#: mod/message.php:75 mod/wallmessage.php:65
+msgid "Message could not be sent."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:117
-msgid "Pretending to be over my ex"
+#: mod/message.php:78 mod/wallmessage.php:68
+msgid "Message collection failure."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:118
-msgid "Hurt in the past"
+#: mod/message.php:81 mod/wallmessage.php:71
+msgid "Message sent."
 msgstr ""
 
-#: addon/morechoice/morechoice.php:119
-msgid "Wallowing in self-pity"
+#: mod/message.php:108 mod/notifications.php:34 mod/notifications.php:174
+#: mod/notifications.php:230
+msgid "Discard"
 msgstr ""
 
-#: addon/windowsphonepush/windowsphonepush.php:96
-msgid "WindowsPhonePush settings updated."
+#: mod/message.php:121 view/theme/frio/theme.php:275 src/Content/Nav.php:250
+msgid "Messages"
 msgstr ""
 
-#: addon/windowsphonepush/windowsphonepush.php:122
-msgid "WindowsPhonePush Settings"
+#: mod/message.php:146
+msgid "Do you really want to delete this message?"
 msgstr ""
 
-#: addon/windowsphonepush/windowsphonepush.php:125
-msgid "Enable WindowsPhonePush Addon"
+#: mod/message.php:164
+msgid "Conversation not found."
 msgstr ""
 
-#: addon/windowsphonepush/windowsphonepush.php:130
-msgid "Push text of new item"
+#: mod/message.php:169
+msgid "Message deleted."
 msgstr ""
 
-#: addon/fromapp/fromapp.php:40
-msgid "Fromapp settings updated."
+#: mod/message.php:174 mod/message.php:188
+msgid "Conversation removed."
 msgstr ""
 
-#: addon/fromapp/fromapp.php:65 addon/fromapp/fromapp.php:69
-msgid "FromApp Settings"
-msgstr ""
-
-#: addon/fromapp/fromapp.php:72
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
+#: mod/message.php:202 mod/message.php:358 mod/wallmessage.php:122
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: addon/fromapp/fromapp.php:76
-msgid "Use this application name even if another application was used."
+#: mod/message.php:244 mod/wallmessage.php:127
+msgid "Send Private Message"
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:43
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
+#: mod/message.php:245 mod/message.php:428 mod/wallmessage.php:129
+msgid "To:"
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:44
-#: addon/cookienotice/cookienotice.php:110
-msgid "OK"
+#: mod/message.php:249 mod/message.php:430 mod/wallmessage.php:130
+msgid "Subject:"
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:48
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
+#: mod/message.php:253 mod/message.php:433 mod/wallmessage.php:136
+#: src/Module/Invite.php:149
+msgid "Your message:"
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:49
-msgid "Cookie Usage Notice"
+#: mod/message.php:287
+msgid "No messages."
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:50
-msgid "OK Button Text"
+#: mod/message.php:350
+msgid "Message not available."
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:74
-msgid "cookienotice Settings saved."
+#: mod/message.php:404
+msgid "Delete message"
 msgstr ""
 
-#: addon/cookienotice/cookienotice.php:109
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
+#: mod/message.php:406 mod/message.php:538
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:115
-msgid "Post to GNU Social"
+#: mod/message.php:421 mod/message.php:535
+msgid "Delete conversation"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:166
+#: mod/message.php:423
 msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: addon/statusnet/statusnet.php:195
-msgid "We could not contact the GNU Social API with the Path you entered."
+#: mod/message.php:427
+msgid "Send Reply"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:229
-msgid "GNU Social settings updated."
+#: mod/message.php:510
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:270 addon/statusnet/statusnet.php:274
-msgid "GNU Social Import/Export/Mirror"
+#: mod/message.php:512
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:289
-msgid "Globally Available GNU Social OAuthKeys"
+#: mod/message.php:514
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:290
+#: mod/message.php:541
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/network.php:492
+#, php-format
 msgid ""
-"There are preconfigured OAuth key pairs for some GNU Social servers "
-"available. If you are using one of them, please use these credentials. If "
-"not feel free to connect to any other GNU Social instance (see below)."
+"Warning: This group contains %s member from a network that doesn't allow non "
+"public messages."
+msgid_plural ""
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/network.php:495
+msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: addon/statusnet/statusnet.php:298
-msgid "Provide your own OAuth Credentials"
+#: mod/network.php:562
+msgid "No such group"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:299
-msgid ""
-"No consumer key pair for GNU Social found. Register your Friendica Account "
-"as an desktop client on your GNU Social account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Friendica installation at your favorited GNU Social installation."
+#: mod/network.php:583 src/Module/Group.php:280
+msgid "Group is empty"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:301
-msgid "OAuth Consumer Key"
+#: mod/network.php:587
+#, php-format
+msgid "Group: %s"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:304
-msgid "OAuth Consumer Secret"
+#: mod/network.php:613
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: addon/statusnet/statusnet.php:307 addon/statusnet/statusnet.php:700
-#: addon/statusnet/statusnet.php:712
-msgid "Base API Path (remember the trailing /)"
+#: mod/network.php:616 src/Module/AllFriends.php:35
+#: src/Module/AllFriends.php:43
+msgid "Invalid contact."
 msgstr ""
 
-#: addon/statusnet/statusnet.php:332
-msgid ""
-"To connect to your GNU Social account click the button below to get a "
-"security code from GNU Social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU Social."
+#: mod/network.php:900
+msgid "Latest Activity"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:333
-msgid "Log in with GNU Social"
+#: mod/network.php:903
+msgid "Sort by latest activity"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:335
-msgid "Copy the security code from GNU Social here"
+#: mod/network.php:908
+msgid "Latest Posts"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:341
-msgid "Cancel Connection Process"
+#: mod/network.php:911
+msgid "Sort by post received date"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:343
-msgid "Current GNU Social API is"
+#: mod/network.php:918 mod/profiles.php:576
+msgid "Personal"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:344
-msgid "Cancel GNU Social Connection"
+#: mod/network.php:921
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:358
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated GNU Social account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
+#: mod/network.php:928
+msgid "New"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:360
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
+#: mod/network.php:931
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:363
-msgid "Allow posting to GNU Social"
+#: mod/network.php:939
+msgid "Shared Links"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:366
-msgid "Send public postings to GNU Social by default"
+#: mod/network.php:942
+msgid "Interesting Links"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:370
-msgid ""
-"Mirror all posts from GNU Social that are no replies or repeated messages"
+#: mod/network.php:949
+msgid "Starred"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:381
-msgid "Full Timeline"
+#: mod/network.php:952
+msgid "Favourite Posts"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:382
-msgid "Only Mentions"
+#: mod/notes.php:34 src/Model/Profile.php:965
+msgid "Personal Notes"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:391
-msgid "Clear OAuth configuration"
+#: mod/notifications.php:72 src/Content/Nav.php:245
+msgid "Notifications"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:711 src/Module/Admin/Site.php:572
-msgid "Site name"
+#: mod/notifications.php:91
+msgid "Network Notifications"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:713 addon/tumblr/tumblr.php:83
-#: mod/settings.php:668 mod/settings.php:694
-msgid "Consumer Secret"
+#: mod/notifications.php:96
+msgid "System Notifications"
 msgstr ""
 
-#: addon/statusnet/statusnet.php:714 addon/tumblr/tumblr.php:82
-#: mod/settings.php:667 mod/settings.php:693
-msgid "Consumer Key"
+#: mod/notifications.php:101
+msgid "Personal Notifications"
 msgstr ""
 
-#: addon/startpage/startpage.php:82 addon/startpage/startpage.php:86
-msgid "Startpage"
+#: mod/notifications.php:106
+msgid "Home Notifications"
 msgstr ""
 
-#: addon/startpage/startpage.php:89
-msgid "Home page to load after login  - leave blank for profile wall"
+#: mod/notifications.php:129
+msgid "Show unread"
 msgstr ""
 
-#: addon/startpage/startpage.php:92
-msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+#: mod/notifications.php:129
+msgid "Show all"
 msgstr ""
 
-#: addon/superblock/superblock.php:48 addon/superblock/superblock.php:52
-msgid "Superblock"
+#: mod/notifications.php:140
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: addon/superblock/superblock.php:55
-msgid "Comma separated profile URLS to block"
+#: mod/notifications.php:140
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: addon/superblock/superblock.php:72
-msgid "SUPERBLOCK Settings saved."
+#: mod/notifications.php:153 mod/notifications.php:238
+msgid "Notification type:"
 msgstr ""
 
-#: addon/superblock/superblock.php:145
-msgid "Block Completely"
+#: mod/notifications.php:156
+msgid "Suggested by:"
 msgstr ""
 
-#: addon/superblock/superblock.php:166
-msgid "superblock settings updated"
+#: mod/notifications.php:168 mod/notifications.php:255
+#: src/Module/Contact.php:612
+msgid "Hide this contact from others"
 msgstr ""
 
-#: addon/nsfw/nsfw.php:77 addon/nsfw/nsfw.php:81
-msgid "Content Filter (NSFW and more)"
+#: mod/notifications.php:170 mod/notifications.php:264
+#: src/Model/Contact.php:1293 src/Module/Admin/Users.php:283
+msgid "Approve"
 msgstr ""
 
-#: addon/nsfw/nsfw.php:85
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It "
-"can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
+#: mod/notifications.php:190
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: addon/nsfw/nsfw.php:86
-msgid "Enable Content filter"
+#: mod/notifications.php:191
+msgid "yes"
 msgstr ""
 
-#: addon/nsfw/nsfw.php:89
-msgid "Comma separated list of keywords to hide"
+#: mod/notifications.php:191
+msgid "no"
 msgstr ""
 
-#: addon/nsfw/nsfw.php:94
-msgid "Use /expression/ to provide regular expressions"
+#: mod/notifications.php:192 mod/notifications.php:196
+msgid "Shall your connection be bidirectional or not?"
 msgstr ""
 
-#: addon/nsfw/nsfw.php:109
-msgid "NSFW Settings saved."
+#: mod/notifications.php:193 mod/notifications.php:197
+#, php-format
+msgid ""
+"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
+"also receive updates from them in your news feed."
 msgstr ""
 
-#: addon/nsfw/nsfw.php:162
+#: mod/notifications.php:194
 #, php-format
-msgid "Filtered tag: %s"
+msgid ""
+"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: addon/nsfw/nsfw.php:164
+#: mod/notifications.php:198
 #, php-format
-msgid "Filtered word: %s"
+msgid ""
+"Accepting %s as a sharer allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:52
-msgid "Remote Permissions Settings"
+#: mod/notifications.php:209
+msgid "Friend"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:53
-msgid ""
-"Allow recipients of your private posts to see the other recipients of the "
-"posts"
+#: mod/notifications.php:210
+msgid "Sharer"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:65
-msgid "Remote Permissions settings updated."
+#: mod/notifications.php:210
+msgid "Subscriber"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:133 mod/lockview.php:69
-msgid "Visible to:"
+#: mod/notifications.php:250 src/Model/Profile.php:443
+#: src/Model/Profile.php:822 src/Module/Contact.php:629
+#: src/Module/Directory.php:143
+msgid "About:"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:187
-msgid "Visible to"
+#: mod/notifications.php:254 src/Model/Profile.php:440
+#: src/Model/Profile.php:761 src/Module/Directory.php:140
+msgid "Gender:"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:187
-msgid "may only be a partial list"
+#: mod/notifications.php:261 src/Model/Profile.php:548
+#: src/Module/Contact.php:313
+msgid "Network:"
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:206
-msgid "Global"
+#: mod/notifications.php:275
+msgid "No introductions."
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:206
-msgid "The posts of every user on this server show the post recipients"
+#: mod/notifications.php:309
+#, php-format
+msgid "No more %s notifications."
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:207
-msgid "Individual"
+#: mod/oexchange.php:31
+msgid "Post successful."
 msgstr ""
 
-#: addon/remote_permissions/remote_permissions.php:207
-msgid "Each user chooses whether his/her posts show the post recipients"
+#: mod/ostatus_subscribe.php:21
+msgid "Subscribing to OStatus contacts"
 msgstr ""
 
-#: addon/membersince/membersince.php:42 addon/membersince/membersince.php:57
-#: src/Model/Profile.php:762
-msgid "Member since:"
+#: mod/ostatus_subscribe.php:31
+msgid "No contact provided."
 msgstr ""
 
-#: addon/securemail/securemail.php:62
-msgid "\"Secure Mail\" Settings"
+#: mod/ostatus_subscribe.php:38
+msgid "Couldn't fetch information for contact."
 msgstr ""
 
-#: addon/securemail/securemail.php:64 addon/securemail/securemail.php:92
-msgid "Save and send test"
+#: mod/ostatus_subscribe.php:48
+msgid "Couldn't fetch friends for contact."
 msgstr ""
 
-#: addon/securemail/securemail.php:65
-msgid "Enable Secure Mail"
+#: mod/ostatus_subscribe.php:66 mod/repair_ostatus.php:49
+msgid "Done"
 msgstr ""
 
-#: addon/securemail/securemail.php:66
-msgid "Public key"
+#: mod/ostatus_subscribe.php:80
+msgid "success"
 msgstr ""
 
-#: addon/securemail/securemail.php:66
-msgid "Your public PGP key, ascii armored format"
+#: mod/ostatus_subscribe.php:82
+msgid "failed"
 msgstr ""
 
-#: addon/securemail/securemail.php:90
-msgid "Secure Mail Settings saved."
+#: mod/ostatus_subscribe.php:85 src/Object/Post.php:283
+msgid "ignored"
 msgstr ""
 
-#: addon/securemail/securemail.php:127
-msgid "Test email sent"
+#: mod/ostatus_subscribe.php:90 mod/repair_ostatus.php:55
+msgid "Keep this window open until done."
 msgstr ""
 
-#: addon/securemail/securemail.php:129
-msgid "There was an error sending the test email"
+#: mod/photos.php:109 src/Model/Profile.php:926
+msgid "Photo Albums"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:38
-#: addon/forumdirectory/forumdirectory.php:148
-msgid "Forum Directory"
+#: mod/photos.php:110 mod/photos.php:1599
+msgid "Recent Photos"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:58 src/Module/Directory.php:31
-#: src/Module/Debug/WebFinger.php:19 src/Module/Debug/Probe.php:20
-#: src/Module/Search/Index.php:30 src/Module/Search/Index.php:35
-#: mod/community.php:25 mod/display.php:168 mod/dfrn_request.php:600
-#: mod/photos.php:837 mod/videos.php:112
-msgid "Public access denied."
+#: mod/photos.php:112 mod/photos.php:1108 mod/photos.php:1601
+msgid "Upload New Photos"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:136 src/Module/Directory.php:59
-msgid "No entries (some entries may be hidden)."
+#: mod/photos.php:130 mod/settings.php:56 src/Module/BaseSettingsModule.php:18
+msgid "everybody"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:142 view/theme/vier/theme.php:184
-#: src/Content/Widget.php:70 src/Module/Directory.php:76
-msgid "Global Directory"
+#: mod/photos.php:167
+msgid "Contact information unavailable"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:144 src/Module/Directory.php:78
-msgid "Find on this site"
+#: mod/photos.php:189
+msgid "Album not found."
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:146 src/Module/Directory.php:80
-msgid "Results for:"
+#: mod/photos.php:247
+msgid "Album successfully deleted"
 msgstr ""
 
-#: addon/forumdirectory/forumdirectory.php:150 view/theme/vier/theme.php:179
-#: src/Content/Widget.php:65 src/Module/Directory.php:84
-#: src/Module/Contact.php:819
-msgid "Find"
+#: mod/photos.php:249
+msgid "Album was empty."
 msgstr ""
 
-#: addon/xmpp/xmpp.php:44
-msgid "XMPP settings updated."
+#: mod/photos.php:574
+msgid "a photo"
 msgstr ""
 
-#: addon/xmpp/xmpp.php:69 addon/xmpp/xmpp.php:73
-msgid "XMPP-Chat (Jabber)"
+#: mod/photos.php:574
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: addon/xmpp/xmpp.php:77
-msgid "Enable Webchat"
+#: mod/photos.php:669 mod/photos.php:672 mod/photos.php:701
+#: mod/profile_photo.php:150 mod/wall_upload.php:184
+#, php-format
+msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: addon/xmpp/xmpp.php:82
-msgid "Individual Credentials"
+#: mod/photos.php:675
+msgid "Image upload didn't complete, please try again"
 msgstr ""
 
-#: addon/xmpp/xmpp.php:115
-msgid "Use central userbase"
+#: mod/photos.php:678
+msgid "Image file is missing"
 msgstr ""
 
-#: addon/xmpp/xmpp.php:115
+#: mod/photos.php:683
 msgid ""
-"If enabled, users will automatically login to an ejabberd server that has to "
-"be installed on this machine with synchronized credentials via the "
-"\"auth_ejabberd.php\" script."
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
 msgstr ""
 
-#: addon/markdown/markdown.php:31 src/Module/Debug/Babel.php:184
-msgid "Markdown"
+#: mod/photos.php:709
+msgid "Image file is empty."
 msgstr ""
 
-#: addon/markdown/markdown.php:32
-msgid "Enable Markdown parsing"
-msgstr ""
-
-#: addon/markdown/markdown.php:32
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-
-#: addon/tumblr/tumblr.php:50 addon/pumpio/pumpio.php:69
-#: addon/buffer/buffer.php:51 include/items.php:433
-#: src/Module/Delegation.php:98 src/Module/Notifications/Notify.php:18
-#: src/Module/Attach.php:41 src/Module/Settings/Delegation.php:23
-#: src/Module/Settings/Delegation.php:51 src/Module/Group.php:30
-#: src/Module/Group.php:76 src/Module/FollowConfirm.php:16
-#: src/Module/Profile/Contacts.php:50 src/Module/Contact.php:360
-#: src/Module/Invite.php:21 src/Module/Invite.php:109
-#: src/Module/Register.php:44 src/Module/Register.php:57
-#: src/Module/Register.php:177 src/Module/Register.php:216
-#: src/Module/Search/Directory.php:19 src/Module/Base/Api.php:40
-#: src/Module/Base/Api.php:46 mod/notes.php:27 mod/uimport.php:17
-#: mod/fsuggest.php:62 mod/common.php:27 mod/events.php:212 mod/api.php:35
-#: mod/api.php:40 mod/cal.php:288 mod/crepair.php:90 mod/notifications.php:49
-#: mod/wallmessage.php:18 mod/wallmessage.php:42 mod/wallmessage.php:81
-#: mod/wallmessage.php:105 mod/ostatus_subscribe.php:16 mod/follow.php:56
-#: mod/follow.php:133 mod/network.php:36 mod/unfollow.php:21
-#: mod/unfollow.php:76 mod/unfollow.php:108 mod/profile_photo.php:31
-#: mod/profile_photo.php:176 mod/profile_photo.php:196 mod/poke.php:142
-#: mod/photos.php:161 mod/photos.php:923 mod/profiles.php:180
-#: mod/profiles.php:497 mod/wall_attach.php:62 mod/wall_attach.php:65
-#: mod/item.php:172 mod/regmod.php:85 mod/settings.php:49 mod/settings.php:162
-#: mod/settings.php:654 mod/suggest.php:38 mod/dfrn_confirm.php:64
-#: mod/wall_upload.php:94 mod/wall_upload.php:97 mod/editpost.php:22
-#: mod/message.php:54 mod/message.php:99 mod/repair_ostatus.php:15
-msgid "Permission denied."
+#: mod/photos.php:724 mod/profile_photo.php:159 mod/wall_upload.php:198
+msgid "Unable to process image."
 msgstr ""
 
-#: addon/tumblr/tumblr.php:190
-msgid "You are now authenticated to tumblr."
+#: mod/photos.php:753 mod/profile_photo.php:301 mod/wall_upload.php:237
+msgid "Image upload failed."
 msgstr ""
 
-#: addon/tumblr/tumblr.php:191 addon/pumpio/pumpio.php:206
-#: addon/buffer/buffer.php:122
-msgid "return to the connector page"
+#: mod/photos.php:841
+msgid "No photos selected"
 msgstr ""
 
-#: addon/tumblr/tumblr.php:207
-msgid "Post to Tumblr"
+#: mod/photos.php:907 mod/videos.php:164
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: addon/tumblr/tumblr.php:237 addon/tumblr/tumblr.php:241
-msgid "Tumblr Export"
+#: mod/photos.php:961
+msgid "Upload Photos"
 msgstr ""
 
-#: addon/tumblr/tumblr.php:245
-msgid "(Re-)Authenticate your tumblr page"
+#: mod/photos.php:965 mod/photos.php:1053
+msgid "New album name: "
 msgstr ""
 
-#: addon/tumblr/tumblr.php:249
-msgid "Enable Tumblr Post Addon"
+#: mod/photos.php:966
+msgid "or select existing album:"
 msgstr ""
 
-#: addon/tumblr/tumblr.php:255
-msgid "Post to Tumblr by default"
+#: mod/photos.php:967
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: addon/tumblr/tumblr.php:276
-msgid "Post to page:"
+#: mod/photos.php:983 mod/photos.php:1347 mod/settings.php:1208
+msgid "Show to Groups"
 msgstr ""
 
-#: addon/tumblr/tumblr.php:290
-msgid "You are not authenticated to tumblr"
+#: mod/photos.php:984 mod/photos.php:1348 mod/settings.php:1209
+msgid "Show to Contacts"
 msgstr ""
 
-#: addon/rendertime/rendertime.php:42
-#, php-format
-msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
+#: mod/photos.php:1035
+msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:56
-msgid "Language Filter"
+#: mod/photos.php:1037 mod/photos.php:1058
+msgid "Delete Album"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:57
-msgid ""
-"This addon tries to identify the language posts are writen in. If it does "
-"not match any language specifed below, posts will be hidden by collapsing "
-"them."
+#: mod/photos.php:1064
+msgid "Edit Album"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:58
-msgid "Use the language filter"
+#: mod/photos.php:1065
+msgid "Drop Album"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:59
-msgid "Able to read"
+#: mod/photos.php:1070
+msgid "Show Newest First"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:59
-msgid ""
-"List of abbreviations (iso2 codes) for languages you speak, comma separated. "
-"For example \"de,it\"."
+#: mod/photos.php:1072
+msgid "Show Oldest First"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:60
-msgid "Minimum confidence in language detection"
+#: mod/photos.php:1093 mod/photos.php:1584
+msgid "View Photo"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:60
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts "
-"will not be filtered when the confidence of language detection is below this "
-"percent value."
+#: mod/photos.php:1130
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: addon/langfilter/langfilter.php:61
-msgid "Minimum length of message body"
+#: mod/photos.php:1132
+msgid "Photo not available"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:61
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
+#: mod/photos.php:1142
+msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:103
-msgid "Language Filter Settings saved."
+#: mod/photos.php:1144 mod/photos.php:1344
+msgid "Delete Photo"
 msgstr ""
 
-#: addon/langfilter/langfilter.php:200
-#, php-format
-msgid "Filtered language: %s"
+#: mod/photos.php:1235
+msgid "View photo"
 msgstr ""
 
-#: addon/public_server/public_server.php:131
-msgid "Your Friendica account is about to expire."
+#: mod/photos.php:1237
+msgid "Edit photo"
 msgstr ""
 
-#: addon/public_server/public_server.php:132
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your "
-"account by logging in at least once every 30 days"
+#: mod/photos.php:1238
+msgid "Delete photo"
 msgstr ""
 
-#: addon/public_server/public_server.php:163
-msgid "Settings saved"
+#: mod/photos.php:1239
+msgid "Use as profile photo"
 msgstr ""
 
-#: addon/public_server/public_server.php:173
-msgid "Set any of these options to 0 to deactivate it."
+#: mod/photos.php:1246
+msgid "Private Photo"
 msgstr ""
 
-#: addon/krynn/krynn.php:156 addon/krynn/krynn.php:160
-msgid "Krynn"
+#: mod/photos.php:1252
+msgid "View Full Size"
 msgstr ""
 
-#: addon/krynn/krynn.php:165
-msgid "Krynn Settings"
+#: mod/photos.php:1312
+msgid "Tags: "
 msgstr ""
 
-#: addon/krynn/krynn.php:167
-msgid "Enable Krynn Addon"
+#: mod/photos.php:1315
+msgid "[Select tags to remove]"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:98
-msgid "Warning"
+#: mod/photos.php:1330
+msgid "New album name"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:99
-#, php-format
-msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+#: mod/photos.php:1331
+msgid "Caption"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:100
-msgid "This addon is not functional on your server."
+#: mod/photos.php:1332
+msgid "Add a Tag"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:109
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
+#: mod/photos.php:1332
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:116
-msgid "Select default avatar image if none was found. See README"
+#: mod/photos.php:1333
+msgid "Do not rotate"
 msgstr ""
 
-#: addon/libravatar/libravatar.php:129
-msgid "Libravatar settings updated."
+#: mod/photos.php:1334
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: addon/discourse/discourse.php:50 src/Content/ContactSelector.php:128
-msgid "Discourse"
+#: mod/photos.php:1335
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: addon/discourse/discourse.php:51
-msgid "Enable processing of Discourse mailing list mails"
+#: mod/photos.php:1369 src/Object/Post.php:324
+msgid "I like this (toggle)"
 msgstr ""
 
-#: addon/discourse/discourse.php:51
-msgid ""
-"If enabled, incoming mails from Discourse will be improved so they look much "
-"better. To make it work, you have to configure the e-mail settings in "
-"Friendica. You also have to enable the mailing list mode in Discourse. Then "
-"you have to add the Discourse mail account as contact."
+#: mod/photos.php:1370 src/Object/Post.php:325
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: addon/blockem/blockem.php:55 addon/blockem/blockem.php:59
-msgid "Blockem"
+#: mod/photos.php:1385 mod/photos.php:1424 mod/photos.php:1488
+#: src/Module/Item/Compose.php:123 src/Module/Contact.php:1024
+#: src/Object/Post.php:900
+msgid "This is you"
 msgstr ""
 
-#: addon/blockem/blockem.php:63
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
+#: mod/photos.php:1387 mod/photos.php:1426 mod/photos.php:1490
+#: src/Object/Post.php:440 src/Object/Post.php:902
+msgid "Comment"
 msgstr ""
 
-#: addon/blockem/blockem.php:64
-msgid "Comma separated profile URLS:"
+#: mod/photos.php:1519
+msgid "Map"
 msgstr ""
 
-#: addon/blockem/blockem.php:82
-msgid "BLOCKEM Settings saved."
+#: mod/photos.php:1590 mod/videos.php:241
+msgid "View Album"
 msgstr ""
 
-#: addon/blockem/blockem.php:144
-#, php-format
-msgid "Filtered user: %s"
+#: mod/ping.php:269
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: addon/blockem/blockem.php:203
-msgid "Unblock Author"
+#: mod/ping.php:285
+msgid "{0} requested registration"
 msgstr ""
 
-#: addon/blockem/blockem.php:205
-msgid "Block Author"
+#: mod/poke.php:178
+msgid "Poke/Prod"
 msgstr ""
 
-#: addon/blockem/blockem.php:245
-msgid "blockem settings updated"
+#: mod/poke.php:179
+msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: addon/catavatar/catavatar.php:62
-msgid "Use Cat as Avatar"
+#: mod/poke.php:180
+msgid "Recipient"
 msgstr ""
 
-#: addon/catavatar/catavatar.php:63
-msgid "More Random Cat!"
+#: mod/poke.php:181
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: addon/catavatar/catavatar.php:64
-msgid "Reset to email Cat"
+#: mod/poke.php:184
+msgid "Make this post private"
 msgstr ""
 
-#: addon/catavatar/catavatar.php:66
-msgid "Cat Avatar Settings"
+#: mod/profile_photo.php:56
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: addon/catavatar/catavatar.php:91
-msgid "The cat hadn't found itself."
+#: mod/profile_photo.php:86 mod/profile_photo.php:95 mod/profile_photo.php:104
+#: mod/profile_photo.php:309
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: addon/catavatar/catavatar.php:100
-msgid "There was an error, the cat ran away."
+#: mod/profile_photo.php:123
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: addon/catavatar/catavatar.php:106 include/api.php:4618
-#: src/Model/User.php:839 src/Model/User.php:847 src/Model/User.php:855
-#: mod/profile_photo.php:84 mod/profile_photo.php:93 mod/profile_photo.php:102
-#: mod/profile_photo.php:209 mod/profile_photo.php:297
-#: mod/profile_photo.php:307 mod/photos.php:88 mod/photos.php:179
-#: mod/photos.php:625 mod/photos.php:1047 mod/photos.php:1064
-#: mod/photos.php:1571
-msgid "Profile Photos"
+#: mod/profile_photo.php:131
+msgid "Unable to process image"
 msgstr ""
 
-#: addon/catavatar/catavatar.php:121
-msgid "Meow!"
+#: mod/profile_photo.php:242
+msgid "Upload File:"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:49
-msgid "Post to LiveJournal"
+#: mod/profile_photo.php:243
+msgid "Select a profile:"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:83
-msgid "LiveJournal Post Settings"
+#: mod/profile_photo.php:244 mod/profiles.php:580 src/Module/Welcome.php:39
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:85
-msgid "Enable LiveJournal Post Addon"
+#: mod/profile_photo.php:248
+msgid "or"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:90
-msgid "LiveJournal username"
+#: mod/profile_photo.php:249
+msgid "skip this step"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:95
-msgid "LiveJournal password"
+#: mod/profile_photo.php:249
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: addon/ljpost/ljpost.php:100
-msgid "Post to LiveJournal by default"
+#: mod/profile_photo.php:262
+msgid "Crop Image"
 msgstr ""
 
-#: addon/buglink/buglink.php:25
-msgid "Report Bug"
+#: mod/profile_photo.php:263
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: addon/ijpost/ijpost.php:49
-msgid "Post to Insanejournal"
+#: mod/profile_photo.php:265
+msgid "Done Editing"
 msgstr ""
 
-#: addon/ijpost/ijpost.php:81 addon/ijpost/ijpost.php:85
-msgid "InsaneJournal Export"
+#: mod/profile_photo.php:299
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: addon/ijpost/ijpost.php:89
-msgid "Enable InsaneJournal Post Addon"
+#: mod/profiles.php:59
+msgid "Profile deleted."
 msgstr ""
 
-#: addon/ijpost/ijpost.php:94
-msgid "InsaneJournal username"
+#: mod/profiles.php:75 mod/profiles.php:111
+msgid "Profile-"
 msgstr ""
 
-#: addon/ijpost/ijpost.php:99
-msgid "InsaneJournal password"
+#: mod/profiles.php:94 mod/profiles.php:132
+msgid "New profile created."
 msgstr ""
 
-#: addon/ijpost/ijpost.php:104
-msgid "Post to InsaneJournal by default"
+#: mod/profiles.php:117
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: addon/geonames/geonames.php:114
-msgid "Geonames settings updated."
+#: mod/profiles.php:203
+msgid "Profile Name is required."
 msgstr ""
 
-#: addon/geonames/geonames.php:146
-msgid "Geonames Settings"
+#: mod/profiles.php:343
+msgid "Marital Status"
 msgstr ""
 
-#: addon/geonames/geonames.php:147
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your "
-"posts."
+#: mod/profiles.php:346
+msgid "Romantic Partner"
 msgstr ""
 
-#: addon/geonames/geonames.php:148
-msgid "Enable Geonames Addon"
+#: mod/profiles.php:355
+msgid "Work/Employment"
 msgstr ""
 
-#: addon/geocoordinates/geocoordinates.php:96
-msgid "API Key"
+#: mod/profiles.php:358
+msgid "Religion"
 msgstr ""
 
-#: addon/geocoordinates/geocoordinates.php:97
-msgid "Language code (IETF format)"
+#: mod/profiles.php:361
+msgid "Political Views"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:164
-#, php-format
-msgid "Unable to register the client at the pump.io server '%s'."
+#: mod/profiles.php:364
+msgid "Gender"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:205
-msgid "You are now authenticated to pumpio."
+#: mod/profiles.php:367
+msgid "Sexual Preference"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:226
-msgid "Post to pumpio"
+#: mod/profiles.php:370
+msgid "XMPP"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:267 addon/pumpio/pumpio.php:271
-msgid "Pump.io Import/Export/Mirror"
+#: mod/profiles.php:373
+msgid "Homepage"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:275
-msgid "pump.io username (without the servername)"
+#: mod/profiles.php:376 mod/profiles.php:575
+msgid "Interests"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:280
-msgid "pump.io servername (without \"http://\" or \"https://\" )"
+#: mod/profiles.php:379
+msgid "Address"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:291
-msgid "Authenticate your pump.io connection"
+#: mod/profiles.php:386 mod/profiles.php:571
+msgid "Location"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:300
-msgid "Enable pump.io Post Addon"
+#: mod/profiles.php:466
+msgid "Profile updated."
 msgstr ""
 
-#: addon/pumpio/pumpio.php:305
-msgid "Post to pump.io by default"
+#: mod/profiles.php:520
+msgid "Hide contacts and friends:"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:310
-msgid "Should posts be public?"
+#: mod/profiles.php:525
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:315
-msgid "Mirror all public posts"
+#: mod/profiles.php:545
+msgid "Show more profile fields:"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:320 addon/buffer/buffer.php:198
-msgid "Check to delete this preset"
+#: mod/profiles.php:557
+msgid "Profile Actions"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:999 include/conversation.php:165
-#: include/conversation.php:175 include/conversation.php:302
-#: include/conversation.php:311 mod/tagger.php:72 mod/subthread.php:91
-msgid "status"
+#: mod/profiles.php:558
+msgid "Edit Profile Details"
 msgstr ""
 
-#: addon/pumpio/pumpio.php:1003 include/conversation.php:183
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: mod/profiles.php:560
+msgid "Change Profile Photo"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:181
-msgid "View Larger"
+#: mod/profiles.php:562
+msgid "View this profile"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:209
-msgid "Tile Server URL"
+#: mod/profiles.php:563
+msgid "View all profiles"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:209
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
+#: mod/profiles.php:564 mod/profiles.php:659 src/Model/Profile.php:413
+msgid "Edit visibility"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:210
-msgid "Nominatim (reverse geocoding) Server URL"
+#: mod/profiles.php:565
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:210
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
-"\"_blank\">Nominatim servers</a>"
+#: mod/profiles.php:566
+msgid "Clone this profile"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:211
-msgid "Default zoom"
+#: mod/profiles.php:567
+msgid "Delete this profile"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:211
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+#: mod/profiles.php:569
+msgid "Basic information"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:212
-msgid "Include marker on map"
+#: mod/profiles.php:570
+msgid "Profile picture"
 msgstr ""
 
-#: addon/openstreetmap/openstreetmap.php:212
-msgid "Include a marker on the map."
+#: mod/profiles.php:572
+msgid "Preferences"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:81
-msgid "From Address"
+#: mod/profiles.php:573
+msgid "Status information"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:83
-msgid "Email address that stream items will appear to be from."
+#: mod/profiles.php:574
+msgid "Additional information"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:240
-msgid "Re:"
+#: mod/profiles.php:577
+msgid "Relation"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:248
-msgid "Friendica post"
+#: mod/profiles.php:578 src/Util/Temporal.php:78 src/Util/Temporal.php:80
+msgid "Miscellaneous"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:251
-msgid "Diaspora post"
+#: mod/profiles.php:581
+msgid "Your Gender:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:261
-msgid "Feed item"
+#: mod/profiles.php:582
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:264 src/Content/ContactSelector.php:119
-#: src/Module/Admin/Users.php:270 src/Module/Admin/Users.php:281
-#: src/Module/Admin/Users.php:295 src/Module/Admin/Users.php:313
-msgid "Email"
+#: mod/profiles.php:583 src/Model/Profile.php:798
+msgid "Sexual Preference:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:266
-msgid "Friendica Item"
+#: mod/profiles.php:584
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:311
-msgid "Upstream"
+#: mod/profiles.php:589
+msgid "Profile Name:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:312
-msgid "Local"
+#: mod/profiles.php:591
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: addon/mailstream/mailstream.php:385
-msgid "Leave blank to use your account email address"
+#: mod/profiles.php:592
+msgid "Your Full Name:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:388
-msgid "Exclude Likes"
+#: mod/profiles.php:593
+msgid "Title/Description:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:390
-msgid "Check this to omit mailing \"Like\" notifications"
+#: mod/profiles.php:596
+msgid "Street Address:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:393
-msgid "Attach Images"
+#: mod/profiles.php:597
+msgid "Locality/City:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:395
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
+#: mod/profiles.php:598
+msgid "Region/State:"
 msgstr ""
 
-#: addon/mailstream/mailstream.php:396
-msgid "Mail Stream Settings"
+#: mod/profiles.php:599
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: addon/dwpost/dwpost.php:51
-msgid "Post to Dreamwidth"
+#: mod/profiles.php:600
+msgid "Country:"
 msgstr ""
 
-#: addon/dwpost/dwpost.php:82 addon/dwpost/dwpost.php:86
-msgid "Dreamwidth Export"
+#: mod/profiles.php:601 src/Util/Temporal.php:147
+msgid "Age: "
 msgstr ""
 
-#: addon/dwpost/dwpost.php:90
-msgid "Enable dreamwidth Post Addon"
+#: mod/profiles.php:604
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: addon/dwpost/dwpost.php:95
-msgid "dreamwidth username"
+#: mod/profiles.php:604
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: addon/dwpost/dwpost.php:100
-msgid "dreamwidth password"
+#: mod/profiles.php:605
+msgid "Since [date]:"
 msgstr ""
 
-#: addon/dwpost/dwpost.php:105
-msgid "Post to dreamwidth by default"
+#: mod/profiles.php:607
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: addon/blackout/blackout.php:101
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix this"
+#: mod/profiles.php:608
+msgid "XMPP (Jabber) address:"
 msgstr ""
 
-#: addon/blackout/blackout.php:103
-#, php-format
+#: mod/profiles.php:608
 msgid ""
-"Please double check that the current settings for the blackout. Begin will "
-"be <strong>%s</strong> and it will end <strong>%s</strong>."
+"The XMPP address will be propagated to your contacts so that they can follow "
+"you."
 msgstr ""
 
-#: addon/blackout/blackout.php:107
-msgid "Redirect URL"
+#: mod/profiles.php:609
+msgid "Homepage URL:"
 msgstr ""
 
-#: addon/blackout/blackout.php:107
-msgid "all your visitors from the web will be redirected to this URL"
+#: mod/profiles.php:610 src/Model/Profile.php:806
+msgid "Hometown:"
 msgstr ""
 
-#: addon/blackout/blackout.php:108
-msgid "Begin of the Blackout"
+#: mod/profiles.php:611 src/Model/Profile.php:814
+msgid "Political Views:"
 msgstr ""
 
-#: addon/blackout/blackout.php:108
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+#: mod/profiles.php:612
+msgid "Religious Views:"
 msgstr ""
 
-#: addon/blackout/blackout.php:109
-msgid "End of the Blackout"
+#: mod/profiles.php:613
+msgid "Public Keywords:"
 msgstr ""
 
-#: addon/blackout/blackout.php:111
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press "
-"the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out should the blackout is "
-"still in place."
+#: mod/profiles.php:613
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:47
-msgid ":-)"
+#: mod/profiles.php:614
+msgid "Private Keywords:"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:47
-msgid ":-("
+#: mod/profiles.php:614
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:47
-msgid "lol"
+#: mod/profiles.php:615 src/Model/Profile.php:830
+msgid "Likes:"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:50
-msgid "Quick Comment Settings"
+#: mod/profiles.php:616 src/Model/Profile.php:834
+msgid "Dislikes:"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:52
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to "
-"provide simple replies."
+#: mod/profiles.php:617
+msgid "Musical interests"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:53
-msgid "Enter quick comments, one per line"
+#: mod/profiles.php:618
+msgid "Books, literature"
 msgstr ""
 
-#: addon/qcomment/qcomment.php:71
-msgid "Quick Comment settings saved."
+#: mod/profiles.php:619
+msgid "Television"
 msgstr ""
 
-#: addon/buffer/buffer.php:82
-msgid "Client ID"
+#: mod/profiles.php:620
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: addon/buffer/buffer.php:83
-msgid "Client Secret"
+#: mod/profiles.php:621
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: addon/buffer/buffer.php:101
-msgid "Error when registering buffer connection:"
+#: mod/profiles.php:622
+msgid "Love/romance"
 msgstr ""
 
-#: addon/buffer/buffer.php:121
-msgid "You are now authenticated to buffer. "
+#: mod/profiles.php:623
+msgid "Work/employment"
 msgstr ""
 
-#: addon/buffer/buffer.php:140
-msgid "Post to Buffer"
+#: mod/profiles.php:624
+msgid "School/education"
 msgstr ""
 
-#: addon/buffer/buffer.php:169 addon/buffer/buffer.php:173
-msgid "Buffer Export"
+#: mod/profiles.php:625
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: addon/buffer/buffer.php:184
-msgid "Authenticate your Buffer connection"
+#: mod/profiles.php:656 src/Model/Profile.php:409
+msgid "Profile Image"
 msgstr ""
 
-#: addon/buffer/buffer.php:188
-msgid "Enable Buffer Post Addon"
+#: mod/profiles.php:658 src/Model/Profile.php:412
+msgid "visible to everybody"
 msgstr ""
 
-#: addon/buffer/buffer.php:193
-msgid "Post to Buffer by default"
+#: mod/profiles.php:665
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: addon/buffer/buffer.php:210
-msgid "Posts are going to all accounts that are enabled by default:"
+#: mod/profiles.php:666 src/Model/Profile.php:399 src/Model/Profile.php:420
+msgid "Change profile photo"
 msgstr ""
 
-#: addon/planets/planets.php:153 addon/planets/planets.php:157
-msgid "Planets"
+#: mod/profiles.php:667 src/Model/Profile.php:400
+msgid "Create New Profile"
 msgstr ""
 
-#: addon/planets/planets.php:161
-msgid "Planets Settings"
+#: mod/profperm.php:28
+msgid "Permission denied"
 msgstr ""
 
-#: addon/planets/planets.php:163
-msgid "Enable Planets Addon"
+#: mod/profperm.php:34 mod/profperm.php:67
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: addon/irc/irc.php:43
-msgid "IRC Settings"
+#: mod/profperm.php:113
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: addon/irc/irc.php:44
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
+#: mod/profperm.php:115 view/theme/frio/theme.php:267 src/Content/Nav.php:158
+#: src/Model/Profile.php:879 src/Model/Profile.php:915
+#: src/Module/Contact.php:636 src/Module/Contact.php:869
+#: src/Module/Welcome.php:38
+msgid "Profile"
 msgstr ""
 
-#: addon/irc/irc.php:46 addon/irc/irc.php:147
-msgid "Channel(s) to auto connect (comma separated)"
+#: mod/profperm.php:117 src/Module/Group.php:313
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: addon/irc/irc.php:46 addon/irc/irc.php:147
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
+#: mod/profperm.php:126
+msgid "Visible To"
 msgstr ""
 
-#: addon/irc/irc.php:47 addon/irc/irc.php:148
-msgid "Popular Channels (comma separated)"
+#: mod/profperm.php:142
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: addon/irc/irc.php:47 addon/irc/irc.php:148
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
+#: mod/regmod.php:48
+msgid "Account approved."
 msgstr ""
 
-#: addon/irc/irc.php:67 addon/irc/irc.php:138
-msgid "IRC settings saved."
+#: mod/regmod.php:72
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: addon/irc/irc.php:72
-msgid "IRC Chatroom"
+#: mod/regmod.php:79
+msgid "Please login."
 msgstr ""
 
-#: addon/irc/irc.php:100
-msgid "Popular Channels"
+#: mod/removeme.php:45
+msgid "User deleted their account"
 msgstr ""
 
-#: addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:23
-msgid "Infinite Improbability Drive"
+#: mod/removeme.php:46
+msgid ""
+"On your Friendica node an user deleted their account. Please ensure that "
+"their data is removed from the backups."
 msgstr ""
 
-#: addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addon/widgets/widget_like.php:64
+#: mod/removeme.php:47
 #, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addon/widgets/widget_friendheader.php:50
-msgid "Get added to this list!"
+msgid "The user id is %d"
 msgstr ""
 
-#: addon/widgets/widget_friends.php:53
-msgid "Connect on Friendica!"
+#: mod/removeme.php:83 mod/removeme.php:86
+msgid "Remove My Account"
 msgstr ""
 
-#: addon/widgets/widgets.php:67
-msgid "Widgets key"
+#: mod/removeme.php:84
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: addon/widgets/widgets.php:69
-msgid "Widgets available"
+#: mod/removeme.php:85
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: addon/widgets/widgets.php:130 mod/settings.php:748
-msgid "Addon Settings"
+#: mod/repair_ostatus.php:20
+msgid "Resubscribing to OStatus contacts"
 msgstr ""
 
-#: include/api.php:1113
-#, php-format
-msgid "Daily posting limit of %d post reached. The post was rejected."
-msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
+#: mod/repair_ostatus.php:34 src/Module/Security/TwoFactor/Verify.php:63
+msgid "Error"
+msgid_plural "Errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1127
-#, php-format
-msgid "Weekly posting limit of %d post reached. The post was rejected."
-msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:61 src/Module/BaseSettingsModule.php:24
+msgid "Account"
+msgstr ""
 
-#: include/api.php:1141
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
+#: mod/settings.php:69 src/Module/Settings/TwoFactor/Index.php:86
+#: src/Module/BaseSettingsModule.php:31
+#: src/Module/Security/TwoFactor/Verify.php:61
+msgid "Two-factor authentication"
 msgstr ""
 
-#: include/enotify.php:59
-msgid "Friendica Notification"
+#: mod/settings.php:76 src/Content/Nav.php:262 src/Model/Profile.php:392
+#: src/Module/BaseSettingsModule.php:38
+msgid "Profiles"
 msgstr ""
 
-#: include/enotify.php:62
-msgid "Thank You,"
+#: mod/settings.php:84 src/Module/BaseAdminModule.php:82
+#: src/Module/BaseSettingsModule.php:46
+msgid "Additional features"
 msgstr ""
 
-#: include/enotify.php:136
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
+#: mod/settings.php:92 src/Module/BaseSettingsModule.php:54
+msgid "Display"
 msgstr ""
 
-#: include/enotify.php:138
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
+#: mod/settings.php:99 mod/settings.php:836
+#: src/Module/BaseSettingsModule.php:61
+msgid "Social Networks"
 msgstr ""
 
-#: include/enotify.php:139
-msgid "a private message"
+#: mod/settings.php:106 src/Module/Admin/Addons/Details.php:100
+#: src/Module/Admin/Addons/Index.php:49 src/Module/BaseAdminModule.php:80
+#: src/Module/BaseSettingsModule.php:68
+msgid "Addons"
 msgstr ""
 
-#: include/enotify.php:139
-#, php-format
-msgid "%1$s sent you %2$s."
+#: mod/settings.php:113 src/Module/BaseSettingsModule.php:75
+msgid "Delegations"
 msgstr ""
 
-#: include/enotify.php:141
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: mod/settings.php:120 src/Module/BaseSettingsModule.php:82
+msgid "Connected apps"
 msgstr ""
 
-#: include/enotify.php:225
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
+#: mod/settings.php:127 src/Module/Settings/UserExport.php:49
+#: src/Module/BaseSettingsModule.php:89
+msgid "Export personal data"
 msgstr ""
 
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s tagged you at %2$s"
+#: mod/settings.php:134 src/Module/BaseSettingsModule.php:96
+msgid "Remove account"
 msgstr ""
 
-#: include/enotify.php:229
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+#: mod/settings.php:143 view/theme/frio/theme.php:276 src/Content/Nav.php:259
+#: src/Module/Admin/Addons/Details.php:102
+#: src/Module/Admin/Themes/Details.php:107
+#: src/Module/BaseSettingsModule.php:105 src/Module/Welcome.php:33
+msgid "Settings"
 msgstr ""
 
-#: include/enotify.php:231
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
+#: mod/settings.php:186
+msgid "Missing some important data!"
 msgstr ""
 
-#: include/enotify.php:236 include/enotify.php:251 include/enotify.php:266
-#: include/enotify.php:285 include/enotify.php:301
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: mod/settings.php:188 mod/settings.php:689 src/Module/Contact.php:823
+msgid "Update"
 msgstr ""
 
-#: include/enotify.php:243
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
+#: mod/settings.php:296
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: include/enotify.php:245
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+#: mod/settings.php:301
+msgid "Email settings updated."
 msgstr ""
 
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
+#: mod/settings.php:317
+msgid "Features updated"
 msgstr ""
 
-#: include/enotify.php:258
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
+#: mod/settings.php:378
+msgid "The theme you chose isn't available."
 msgstr ""
 
-#: include/enotify.php:260
-#, php-format
-msgid "%1$s shared a new post at %2$s"
+#: mod/settings.php:394
+msgid "Contact CSV file upload error"
 msgstr ""
 
-#: include/enotify.php:261
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
+#: mod/settings.php:408
+msgid "Importing Contacts done"
 msgstr ""
 
-#: include/enotify.php:273
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
+#: mod/settings.php:417
+msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: include/enotify.php:275
-#, php-format
-msgid "%1$s poked you at %2$s"
+#: mod/settings.php:429
+msgid "Passwords do not match."
 msgstr ""
 
-#: include/enotify.php:276
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
+#: mod/settings.php:437 src/Console/NewPassword.php:101
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: include/enotify.php:293
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
+#: mod/settings.php:440 src/Console/NewPassword.php:104
+msgid "Password changed."
 msgstr ""
 
-#: include/enotify.php:295
-#, php-format
-msgid "%1$s tagged your post at %2$s"
+#: mod/settings.php:443
+msgid "Password unchanged."
 msgstr ""
 
-#: include/enotify.php:296
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
+#: mod/settings.php:525
+msgid " Please use a shorter name."
 msgstr ""
 
-#: include/enotify.php:308
-msgid "[Friendica:Notify] Introduction received"
+#: mod/settings.php:528
+msgid " Name too short."
 msgstr ""
 
-#: include/enotify.php:310
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+#: mod/settings.php:535 src/Module/Settings/TwoFactor/Index.php:69
+msgid "Wrong Password"
 msgstr ""
 
-#: include/enotify.php:311
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+#: mod/settings.php:540
+msgid "Invalid email."
 msgstr ""
 
-#: include/enotify.php:316 include/enotify.php:362
-#, php-format
-msgid "You may visit their profile at %s"
+#: mod/settings.php:546
+msgid "Cannot change to that email."
 msgstr ""
 
-#: include/enotify.php:318
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: mod/settings.php:583
+msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: include/enotify.php:325
-msgid "[Friendica:Notify] A new person is sharing with you"
+#: mod/settings.php:586
+msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: include/enotify.php:327 include/enotify.php:328
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
+#: mod/settings.php:603
+msgid "Settings updated."
 msgstr ""
 
-#: include/enotify.php:335
-msgid "[Friendica:Notify] You have a new follower"
+#: mod/settings.php:662 mod/settings.php:688 mod/settings.php:722
+msgid "Add application"
 msgstr ""
 
-#: include/enotify.php:337 include/enotify.php:338
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
+#: mod/settings.php:663 mod/settings.php:770 mod/settings.php:868
+#: mod/settings.php:947 mod/settings.php:1172
+#: src/Module/Admin/Addons/Index.php:50 src/Module/Admin/Logs/Settings.php:62
+#: src/Module/Admin/Themes/Index.php:94 src/Module/Admin/Features.php:68
+#: src/Module/Admin/Site.php:556 src/Module/Admin/Tos.php:49
+#: src/Module/Settings/Delegation.php:150
+msgid "Save Settings"
 msgstr ""
 
-#: include/enotify.php:351
-msgid "[Friendica:Notify] Friend suggestion received"
+#: mod/settings.php:666 mod/settings.php:692
+msgid "Consumer Key"
 msgstr ""
 
-#: include/enotify.php:353
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+#: mod/settings.php:667 mod/settings.php:693
+msgid "Consumer Secret"
 msgstr ""
 
-#: include/enotify.php:354
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+#: mod/settings.php:668 mod/settings.php:694
+msgid "Redirect"
 msgstr ""
 
-#: include/enotify.php:360
-msgid "Name:"
+#: mod/settings.php:669 mod/settings.php:695
+msgid "Icon url"
 msgstr ""
 
-#: include/enotify.php:361
-msgid "Photo:"
+#: mod/settings.php:680
+msgid "You can't edit this application."
 msgstr ""
 
-#: include/enotify.php:364
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: mod/settings.php:721
+msgid "Connected Apps"
 msgstr ""
 
-#: include/enotify.php:372 include/enotify.php:387
-msgid "[Friendica:Notify] Connection accepted"
+#: mod/settings.php:723 src/Object/Post.php:164 src/Object/Post.php:166
+msgid "Edit"
 msgstr ""
 
-#: include/enotify.php:374 include/enotify.php:389
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
+#: mod/settings.php:725
+msgid "Client key starts with"
 msgstr ""
 
-#: include/enotify.php:375 include/enotify.php:390
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+#: mod/settings.php:726
+msgid "No name"
 msgstr ""
 
-#: include/enotify.php:380
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
+#: mod/settings.php:727
+msgid "Remove authorization"
 msgstr ""
 
-#: include/enotify.php:382
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
+#: mod/settings.php:738
+msgid "No Addon settings configured"
 msgstr ""
 
-#: include/enotify.php:395
-#, 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."
+#: mod/settings.php:747
+msgid "Addon Settings"
 msgstr ""
 
-#: include/enotify.php:397
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
+#: mod/settings.php:761 src/Module/Admin/Features.php:57
+#: src/Module/Admin/Features.php:58
+msgid "Off"
 msgstr ""
 
-#: include/enotify.php:399
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
+#: mod/settings.php:761 src/Module/Admin/Features.php:57
+#: src/Module/Admin/Features.php:58
+msgid "On"
 msgstr ""
 
-#: include/enotify.php:409 mod/removeme.php:46
-msgid "[Friendica System Notify]"
+#: mod/settings.php:768
+msgid "Additional Features"
 msgstr ""
 
-#: include/enotify.php:409
-msgid "registration request"
+#: mod/settings.php:793 src/Content/ContactSelector.php:121
+msgid "Diaspora"
 msgstr ""
 
-#: include/enotify.php:411
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
+#: mod/settings.php:793 mod/settings.php:794
+msgid "enabled"
 msgstr ""
 
-#: include/enotify.php:412
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+#: mod/settings.php:793 mod/settings.php:794
+msgid "disabled"
 msgstr ""
 
-#: include/enotify.php:417
+#: mod/settings.php:793 mod/settings.php:794
 #, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
+msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: include/enotify.php:423
-#, php-format
-msgid "Please visit %s to approve or reject the request."
+#: mod/settings.php:794
+msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: include/conversation.php:162 include/conversation.php:299
-#: src/Model/Item.php:3394
-msgid "event"
+#: mod/settings.php:825
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: include/conversation.php:170 include/conversation.php:307
-#: src/Model/Item.php:3396 mod/tagger.php:72 mod/subthread.php:91
-msgid "photo"
+#: mod/settings.php:830 mod/settings.php:866
+msgid "None"
 msgstr ""
 
-#: include/conversation.php:185
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: mod/settings.php:841
+msgid "General Social Media Settings"
 msgstr ""
 
-#: include/conversation.php:187
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
+#: mod/settings.php:842
+msgid "Accept only top level posts by contacts you follow"
 msgstr ""
 
-#: include/conversation.php:189
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
+#: mod/settings.php:842
+msgid ""
+"The system does an auto completion of threads when a comment arrives. This "
+"has got the side effect that you can receive posts that had been started by "
+"a non-follower but had been commented by someone you follow. This setting "
+"deactivates this behaviour. When activated, you strictly only will receive "
+"posts from people you really do follow."
 msgstr ""
 
-#: include/conversation.php:191
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
+#: mod/settings.php:843
+msgid "Disable Content Warning"
 msgstr ""
 
-#: include/conversation.php:226
-#, php-format
-msgid "%1$s is now friends with %2$s"
+#: mod/settings.php:843
+msgid ""
+"Users on networks like Mastodon or Pleroma are able to set a content warning "
+"field which collapse their post by default. This disables the automatic "
+"collapsing and sets the content warning as the post title. Doesn't affect "
+"any other content filtering you eventually set up."
 msgstr ""
 
-#: include/conversation.php:267
-#, php-format
-msgid "%1$s poked %2$s"
+#: mod/settings.php:844
+msgid "Disable intelligent shortening"
 msgstr ""
 
-#: include/conversation.php:321 mod/tagger.php:105
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: mod/settings.php:844
+msgid ""
+"Normally the system tries to find the best link to add to shortened posts. "
+"If this option is enabled then every shortened post will always point to the "
+"original friendica post."
 msgstr ""
 
-#: include/conversation.php:343
-msgid "post/item"
+#: mod/settings.php:845
+msgid "Attach the link title"
 msgstr ""
 
-#: include/conversation.php:344
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
+#: mod/settings.php:845
+msgid ""
+"When activated, the title of the attached link will be added as a title on "
+"posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that "
+"share feed content."
 msgstr ""
 
-#: include/conversation.php:568 mod/photos.php:1399 mod/profiles.php:350
-msgid "Likes"
+#: mod/settings.php:846
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr ""
 
-#: include/conversation.php:569 mod/photos.php:1399 mod/profiles.php:353
-msgid "Dislikes"
+#: mod/settings.php:846
+msgid ""
+"If you receive a message from an unknown OStatus user, this option decides "
+"what to do. If it is checked, a new contact will be created for every "
+"unknown user."
 msgstr ""
 
-#: include/conversation.php:570 include/conversation.php:1591
-#: mod/photos.php:1400
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:847
+msgid "Default group for OStatus contacts"
+msgstr ""
 
-#: include/conversation.php:571 mod/photos.php:1400
-msgid "Not attending"
+#: mod/settings.php:848
+msgid "Your legacy GNU Social account"
 msgstr ""
 
-#: include/conversation.php:572 mod/photos.php:1400
-msgid "Might attend"
+#: mod/settings.php:848
+msgid ""
+"If you enter your old GNU Social/Statusnet account name here (in the format "
+"user@domain.tld), your contacts will be added automatically. The field will "
+"be emptied when done."
 msgstr ""
 
-#: include/conversation.php:573
-msgid "Reshares"
+#: mod/settings.php:851
+msgid "Repair OStatus subscriptions"
 msgstr ""
 
-#: include/conversation.php:653 src/Object/Post.php:208 mod/photos.php:1460
-msgid "Select"
+#: mod/settings.php:855
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: include/conversation.php:654 src/Module/Admin/Users.php:286
-#: src/Module/Contact.php:829 src/Module/Contact.php:1110 mod/photos.php:1461
-#: mod/settings.php:725 mod/settings.php:867
-msgid "Delete"
+#: mod/settings.php:856
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: include/conversation.php:680 src/Object/Post.php:401 src/Object/Post.php:402
-#, php-format
-msgid "View %s's profile @ %s"
+#: mod/settings.php:857
+msgid "Last successful email check:"
 msgstr ""
 
-#: include/conversation.php:693 src/Object/Post.php:389
-msgid "Categories:"
+#: mod/settings.php:859
+msgid "IMAP server name:"
 msgstr ""
 
-#: include/conversation.php:694 src/Object/Post.php:390
-msgid "Filed under:"
+#: mod/settings.php:860
+msgid "IMAP port:"
 msgstr ""
 
-#: include/conversation.php:701 src/Object/Post.php:415
-#, php-format
-msgid "%s from %s"
+#: mod/settings.php:861
+msgid "Security:"
 msgstr ""
 
-#: include/conversation.php:716
-msgid "View in context"
+#: mod/settings.php:862
+msgid "Email login name:"
 msgstr ""
 
-#: include/conversation.php:718 include/conversation.php:1237
-#: src/Object/Post.php:445 src/Module/Item/Compose.php:140
-#: mod/wallmessage.php:140 mod/photos.php:1372 mod/editpost.php:87
-#: mod/message.php:258 mod/message.php:440
-msgid "Please wait"
+#: mod/settings.php:863
+msgid "Email password:"
 msgstr ""
 
-#: include/conversation.php:782
-msgid "remove"
+#: mod/settings.php:864
+msgid "Reply-to address:"
 msgstr ""
 
-#: include/conversation.php:786
-msgid "Delete Selected Items"
+#: mod/settings.php:865
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: include/conversation.php:947 view/theme/frio/theme.php:363
-msgid "Follow Thread"
+#: mod/settings.php:866
+msgid "Action after import:"
 msgstr ""
 
-#: include/conversation.php:948 src/Model/Contact.php:1279
-msgid "View Status"
+#: mod/settings.php:866 src/Content/Nav.php:247
+msgid "Mark as seen"
 msgstr ""
 
-#: include/conversation.php:949 include/conversation.php:967
-#: src/Model/Contact.php:1209 src/Model/Contact.php:1271
-#: src/Model/Contact.php:1280 src/Module/Directory.php:148
-#: src/Module/BaseSearchModule.php:132 src/Module/AllFriends.php:74
-#: mod/match.php:86 mod/suggest.php:86
-msgid "View Profile"
+#: mod/settings.php:866
+msgid "Move to folder"
 msgstr ""
 
-#: include/conversation.php:950 src/Model/Contact.php:1281
-msgid "View Photos"
+#: mod/settings.php:867
+msgid "Move to folder:"
 msgstr ""
 
-#: include/conversation.php:951 src/Model/Contact.php:1272
-#: src/Model/Contact.php:1282
-msgid "Network Posts"
+#: mod/settings.php:891 src/Module/Admin/Site.php:425
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: include/conversation.php:952 src/Model/Contact.php:1273
-#: src/Model/Contact.php:1283
-msgid "View Contact"
+#: mod/settings.php:899
+#, php-format
+msgid "%s - (Unsupported)"
 msgstr ""
 
-#: include/conversation.php:953 src/Model/Contact.php:1285
-msgid "Send PM"
+#: mod/settings.php:901 src/Module/Admin/Site.php:442
+#, php-format
+msgid "%s - (Experimental)"
 msgstr ""
 
-#: include/conversation.php:954 src/Module/Admin/Blocklist/Contact.php:65
-#: src/Module/Admin/Users.php:287 src/Module/Contact.php:605
-#: src/Module/Contact.php:826 src/Module/Contact.php:1085
-msgid "Block"
+#: mod/settings.php:929 src/Core/L10n.php:349 src/Model/Event.php:394
+msgid "Sunday"
 msgstr ""
 
-#: include/conversation.php:955 src/Module/Contact.php:606
-#: src/Module/Contact.php:827 src/Module/Contact.php:1093
-#: mod/notifications.php:37 mod/notifications.php:173 mod/notifications.php:266
-msgid "Ignore"
+#: mod/settings.php:929 src/Core/L10n.php:349 src/Model/Event.php:395
+msgid "Monday"
 msgstr ""
 
-#: include/conversation.php:959 src/Model/Contact.php:1286
-msgid "Poke"
+#: mod/settings.php:945
+msgid "Display Settings"
 msgstr ""
 
-#: include/conversation.php:964 view/theme/vier/theme.php:177
-#: src/Content/Widget.php:63 src/Model/Contact.php:1274
-#: src/Model/Contact.php:1287 src/Module/BaseSearchModule.php:133
-#: src/Module/AllFriends.php:75 mod/follow.php:159 mod/match.php:87
-#: mod/suggest.php:87
-msgid "Connect/Follow"
+#: mod/settings.php:951
+msgid "Display Theme:"
 msgstr ""
 
-#: include/conversation.php:1089
-#, php-format
-msgid "%s likes this."
+#: mod/settings.php:952
+msgid "Mobile Theme:"
 msgstr ""
 
-#: include/conversation.php:1092
-#, php-format
-msgid "%s doesn't like this."
+#: mod/settings.php:953
+msgid "Suppress warning of insecure networks"
 msgstr ""
 
-#: include/conversation.php:1095
-#, php-format
-msgid "%s attends."
+#: mod/settings.php:953
+msgid ""
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
 msgstr ""
 
-#: include/conversation.php:1098
-#, php-format
-msgid "%s doesn't attend."
+#: mod/settings.php:954
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: include/conversation.php:1101
-#, php-format
-msgid "%s attends maybe."
+#: mod/settings.php:954
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr ""
 
-#: include/conversation.php:1104 include/conversation.php:1147
-#, php-format
-msgid "%s reshared this."
+#: mod/settings.php:955
+msgid "Number of items to display per page:"
 msgstr ""
 
-#: include/conversation.php:1112
-msgid "and"
+#: mod/settings.php:955 mod/settings.php:956
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: include/conversation.php:1118
-#, php-format
-msgid "and %d other people"
+#: mod/settings.php:956
+msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: include/conversation.php:1126
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
+#: mod/settings.php:957
+msgid "Don't show emoticons"
 msgstr ""
 
-#: include/conversation.php:1127
-#, php-format
-msgid "%s like this."
+#: mod/settings.php:958
+msgid "Calendar"
 msgstr ""
 
-#: include/conversation.php:1130
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
+#: mod/settings.php:959
+msgid "Beginning of week:"
 msgstr ""
 
-#: include/conversation.php:1131
-#, php-format
-msgid "%s don't like this."
+#: mod/settings.php:960
+msgid "Don't show notices"
 msgstr ""
 
-#: include/conversation.php:1134
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
+#: mod/settings.php:961
+msgid "Infinite scroll"
 msgstr ""
 
-#: include/conversation.php:1135
-#, php-format
-msgid "%s attend."
+#: mod/settings.php:962
+msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: include/conversation.php:1138
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
+#: mod/settings.php:962
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
 msgstr ""
 
-#: include/conversation.php:1139
-#, php-format
-msgid "%s don't attend."
+#: mod/settings.php:963
+msgid "Bandwidth Saver Mode"
 msgstr ""
 
-#: include/conversation.php:1142
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
+#: mod/settings.php:963
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
 msgstr ""
 
-#: include/conversation.php:1143
-#, php-format
-msgid "%s attend maybe."
+#: mod/settings.php:964
+msgid "Disable Smart Threading"
 msgstr ""
 
-#: include/conversation.php:1146
-#, php-format
-msgid "<span  %1$s>%2$d people</span> reshared this"
+#: mod/settings.php:964
+msgid "Disable the automatic suppression of extraneous thread indentation."
 msgstr ""
 
-#: include/conversation.php:1176
-msgid "Visible to <strong>everybody</strong>"
+#: mod/settings.php:966
+msgid "General Theme Settings"
 msgstr ""
 
-#: include/conversation.php:1177 src/Object/Post.php:913
-#: src/Module/Item/Compose.php:134
-msgid "Please enter a image/video/audio/webpage URL:"
+#: mod/settings.php:967
+msgid "Custom Theme Settings"
 msgstr ""
 
-#: include/conversation.php:1178
-msgid "Tag term:"
+#: mod/settings.php:968
+msgid "Content Settings"
 msgstr ""
 
-#: include/conversation.php:1179 src/Module/Filer/SaveTag.php:47
-msgid "Save to Folder:"
+#: mod/settings.php:969 view/theme/duepuntozero/config.php:70
+#: view/theme/frio/config.php:125 view/theme/quattro/config.php:72
+#: view/theme/vier/config.php:120
+msgid "Theme settings"
 msgstr ""
 
-#: include/conversation.php:1180
-msgid "Where are you right now?"
+#: mod/settings.php:983
+msgid "Unable to find your profile. Please contact your admin."
 msgstr ""
 
-#: include/conversation.php:1181
-msgid "Delete item(s)?"
+#: mod/settings.php:1022
+msgid "Account Types"
 msgstr ""
 
-#: include/conversation.php:1213
-msgid "New Post"
+#: mod/settings.php:1023
+msgid "Personal Page Subtypes"
 msgstr ""
 
-#: include/conversation.php:1216
-msgid "Share"
+#: mod/settings.php:1024
+msgid "Community Forum Subtypes"
 msgstr ""
 
-#: include/conversation.php:1217 mod/wallmessage.php:138 mod/editpost.php:73
-#: mod/message.php:256 mod/message.php:437
-msgid "Upload photo"
+#: mod/settings.php:1031 src/Module/Admin/Users.php:226
+msgid "Personal Page"
 msgstr ""
 
-#: include/conversation.php:1218 mod/editpost.php:74
-msgid "upload photo"
+#: mod/settings.php:1032
+msgid "Account for a personal profile."
 msgstr ""
 
-#: include/conversation.php:1219 mod/editpost.php:75
-msgid "Attach file"
+#: mod/settings.php:1035 src/Module/Admin/Users.php:227
+msgid "Organisation Page"
 msgstr ""
 
-#: include/conversation.php:1220 mod/editpost.php:76
-msgid "attach file"
+#: mod/settings.php:1036
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: include/conversation.php:1221 src/Object/Post.php:905
-#: src/Module/Item/Compose.php:126
-msgid "Bold"
+#: mod/settings.php:1039 src/Module/Admin/Users.php:228
+msgid "News Page"
 msgstr ""
 
-#: include/conversation.php:1222 src/Object/Post.php:906
-#: src/Module/Item/Compose.php:127
-msgid "Italic"
+#: mod/settings.php:1040
+msgid ""
+"Account for a news reflector that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: include/conversation.php:1223 src/Object/Post.php:907
-#: src/Module/Item/Compose.php:128
-msgid "Underline"
+#: mod/settings.php:1043 src/Module/Admin/Users.php:229
+msgid "Community Forum"
 msgstr ""
 
-#: include/conversation.php:1224 src/Object/Post.php:908
-#: src/Module/Item/Compose.php:129
-msgid "Quote"
+#: mod/settings.php:1044
+msgid "Account for community discussions."
 msgstr ""
 
-#: include/conversation.php:1225 src/Object/Post.php:909
-#: src/Module/Item/Compose.php:130
-msgid "Code"
+#: mod/settings.php:1047 src/Module/Admin/Users.php:219
+msgid "Normal Account Page"
 msgstr ""
 
-#: include/conversation.php:1226 src/Object/Post.php:910
-#: src/Module/Item/Compose.php:131
-msgid "Image"
+#: mod/settings.php:1048
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
 msgstr ""
 
-#: include/conversation.php:1227 src/Object/Post.php:911
-#: src/Module/Item/Compose.php:132
-msgid "Link"
+#: mod/settings.php:1051 src/Module/Admin/Users.php:220
+msgid "Soapbox Page"
 msgstr ""
 
-#: include/conversation.php:1228 src/Object/Post.php:912
-#: src/Module/Item/Compose.php:133
-msgid "Link or Media"
+#: mod/settings.php:1052
+msgid ""
+"Account for a public profile that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: include/conversation.php:1229 src/Module/Item/Compose.php:136
-#: mod/editpost.php:83
-msgid "Set your location"
+#: mod/settings.php:1055 src/Module/Admin/Users.php:221
+msgid "Public Forum"
 msgstr ""
 
-#: include/conversation.php:1230 mod/editpost.php:84
-msgid "set location"
+#: mod/settings.php:1056
+msgid "Automatically approves all contact requests."
 msgstr ""
 
-#: include/conversation.php:1231 mod/editpost.php:85
-msgid "Clear browser location"
+#: mod/settings.php:1059 src/Module/Admin/Users.php:222
+msgid "Automatic Friend Page"
 msgstr ""
 
-#: include/conversation.php:1232 mod/editpost.php:86
-msgid "clear location"
+#: mod/settings.php:1060
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
 msgstr ""
 
-#: include/conversation.php:1234 src/Module/Item/Compose.php:141
-#: mod/editpost.php:100
-msgid "Set title"
+#: mod/settings.php:1063
+msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: include/conversation.php:1236 src/Module/Item/Compose.php:142
-#: mod/editpost.php:102
-msgid "Categories (comma-separated list)"
+#: mod/settings.php:1064
+msgid "Requires manual approval of contact requests."
 msgstr ""
 
-#: include/conversation.php:1238 mod/editpost.php:88
-msgid "Permission settings"
+#: mod/settings.php:1075
+msgid "OpenID:"
 msgstr ""
 
-#: include/conversation.php:1239 mod/editpost.php:117
-msgid "permissions"
+#: mod/settings.php:1075
+msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: include/conversation.php:1248 mod/editpost.php:97
-msgid "Public post"
+#: mod/settings.php:1083
+msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: include/conversation.php:1252 src/Object/Post.php:914
-#: src/Module/Item/Compose.php:135 mod/events.php:549 mod/photos.php:1390
-#: mod/photos.php:1429 mod/photos.php:1493 mod/editpost.php:108
-msgid "Preview"
+#: mod/settings.php:1083
+#, php-format
+msgid ""
+"Your profile will be published in this node's <a href=\"%s\">local "
+"directory</a>. Your profile details may be publicly visible depending on the "
+"system settings."
 msgstr ""
 
-#: include/conversation.php:1261
-msgid "Post to Groups"
+#: mod/settings.php:1089
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: include/conversation.php:1262
-msgid "Post to Contacts"
+#: mod/settings.php:1089
+#, php-format
+msgid ""
+"Your profile will be published in the global friendica directories (e.g. <a "
+"href=\"%s\">%s</a>). Your profile will be visible in public."
 msgstr ""
 
-#: include/conversation.php:1263
-msgid "Private post"
+#: mod/settings.php:1089
+msgid ""
+"This setting also determines whether Friendica will inform search engines "
+"that your profile should be indexed or not. Third-party search engines may "
+"or may not respect this setting."
 msgstr ""
 
-#: include/conversation.php:1269 mod/editpost.php:116
-msgid "Browser"
+#: mod/settings.php:1096
+msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: include/conversation.php:1561
-msgid "View all"
+#: mod/settings.php:1096
+msgid ""
+"Your contact list won't be shown in your default profile page. You can "
+"decide to show your contact list separately for each additional profile you "
+"create"
 msgstr ""
 
-#: include/conversation.php:1585
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:1100
+msgid "Hide your profile details from anonymous viewers?"
+msgstr ""
 
-#: include/conversation.php:1588
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:1100
+msgid ""
+"Anonymous visitors will only see your profile picture, your display name and "
+"the nickname you are using on your profile page. Your public posts and "
+"replies will still be accessible by other means."
+msgstr ""
 
-#: include/conversation.php:1594
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:1597 src/Content/ContactSelector.php:249
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/items.php:349 src/Module/Admin/Themes/Details.php:53
-#: src/Module/Admin/Themes/Index.php:41 src/Module/Debug/ItemBody.php:27
-#: src/Module/Debug/ItemBody.php:40
-msgid "Item not found."
+#: mod/settings.php:1104
+msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: include/items.php:381
-msgid "Do you really want to delete this item?"
+#: mod/settings.php:1104
+msgid ""
+"Your contacts may write posts on your profile wall. These posts will be "
+"distributed to your contacts"
 msgstr ""
 
-#: include/items.php:383 src/Module/Contact.php:443 src/Module/Register.php:97
-#: mod/api.php:110 mod/dfrn_request.php:643 mod/follow.php:162
-#: mod/profiles.php:524 mod/profiles.php:527 mod/profiles.php:549
-#: mod/settings.php:1084 mod/settings.php:1090 mod/settings.php:1097
-#: mod/settings.php:1101 mod/settings.php:1105 mod/settings.php:1109
-#: mod/settings.php:1113 mod/settings.php:1117 mod/settings.php:1137
-#: mod/settings.php:1138 mod/settings.php:1139 mod/settings.php:1140
-#: mod/settings.php:1141 mod/suggest.php:72 mod/message.php:148
-msgid "Yes"
+#: mod/settings.php:1108
+msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: update.php:218
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
+#: mod/settings.php:1108
+msgid "Your contacts can add additional tags to your posts."
 msgstr ""
 
-#: update.php:273
-#, php-format
-msgid "%s: Updating post-type."
+#: mod/settings.php:1112
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: view/theme/vier/theme.php:127 view/theme/vier/config.php:124
-msgid "Community Profiles"
+#: mod/settings.php:1112
+msgid "If you like, Friendica may suggest new members to add you as a contact."
 msgstr ""
 
-#: view/theme/vier/theme.php:157 view/theme/vier/config.php:128
-msgid "Last users"
+#: mod/settings.php:1116
+msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: view/theme/vier/theme.php:175 src/Content/Widget.php:61
-msgid "Find People"
+#: mod/settings.php:1116
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
 msgstr ""
 
-#: view/theme/vier/theme.php:176 src/Content/Widget.php:62
-msgid "Enter name or interest"
+#: mod/settings.php:1120
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: view/theme/vier/theme.php:178 src/Content/Widget.php:64
-msgid "Examples: Robert Morgenstein, Fishing"
+#: mod/settings.php:1126
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: view/theme/vier/theme.php:180 src/Content/Widget.php:66 mod/suggest.php:118
-msgid "Friend Suggestions"
+#: mod/settings.php:1133
+msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: view/theme/vier/theme.php:181 src/Content/Widget.php:67
-msgid "Similar Interests"
+#: mod/settings.php:1133
+msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: view/theme/vier/theme.php:182 src/Content/Widget.php:68
-msgid "Random Profile"
+#: mod/settings.php:1134
+msgid "Advanced expiration settings"
 msgstr ""
 
-#: view/theme/vier/theme.php:183 src/Content/Widget.php:69
-msgid "Invite Friends"
+#: mod/settings.php:1135
+msgid "Advanced Expiration"
 msgstr ""
 
-#: view/theme/vier/theme.php:186 src/Content/Widget.php:72
-msgid "Local Directory"
+#: mod/settings.php:1136
+msgid "Expire posts:"
 msgstr ""
 
-#: view/theme/vier/theme.php:226 src/Content/Text/HTML.php:915
-#: src/Content/ForumManager.php:129 src/Content/Nav.php:208
-msgid "Forums"
+#: mod/settings.php:1137
+msgid "Expire personal notes:"
 msgstr ""
 
-#: view/theme/vier/theme.php:228 src/Content/ForumManager.php:131
-msgid "External link to forum"
+#: mod/settings.php:1138
+msgid "Expire starred posts:"
 msgstr ""
 
-#: view/theme/vier/theme.php:264
-msgid "Quick Start"
+#: mod/settings.php:1139
+msgid "Expire photos:"
 msgstr ""
 
-#: view/theme/vier/theme.php:349 view/theme/vier/config.php:126
-msgid "Connect Services"
+#: mod/settings.php:1140
+msgid "Only expire posts by others:"
 msgstr ""
 
-#: view/theme/vier/config.php:76
-msgid "Comma separated list of helper forums"
+#: mod/settings.php:1170
+msgid "Account Settings"
 msgstr ""
 
-#: view/theme/vier/config.php:116
-msgid "don't show"
+#: mod/settings.php:1178
+msgid "Password Settings"
 msgstr ""
 
-#: view/theme/vier/config.php:116
-msgid "show"
+#: mod/settings.php:1179 src/Module/Register.php:130
+msgid "New Password:"
 msgstr ""
 
-#: view/theme/vier/config.php:121 view/theme/duepuntozero/config.php:71
-#: view/theme/frio/config.php:126 view/theme/quattro/config.php:73
-#: mod/settings.php:970
-msgid "Theme settings"
+#: mod/settings.php:1179
+msgid ""
+"Allowed characters are a-z, A-Z, 0-9 and special characters except white "
+"spaces, accentuated letters and colon (:)."
 msgstr ""
 
-#: view/theme/vier/config.php:122
-msgid "Set style"
+#: mod/settings.php:1180 src/Module/Register.php:131
+msgid "Confirm:"
 msgstr ""
 
-#: view/theme/vier/config.php:123
-msgid "Community Pages"
+#: mod/settings.php:1180
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: view/theme/vier/config.php:125
-msgid "Help or @NewHere ?"
+#: mod/settings.php:1181
+msgid "Current Password:"
 msgstr ""
 
-#: view/theme/vier/config.php:127
-msgid "Find Friends"
+#: mod/settings.php:1181 mod/settings.php:1182
+msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:53 src/Model/User.php:788
-msgid "default"
+#: mod/settings.php:1182
+msgid "Password:"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:54
-msgid "greenzero"
+#: mod/settings.php:1185
+msgid "Delete OpenID URL"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:55
-msgid "purplezero"
+#: mod/settings.php:1187
+msgid "Basic Settings"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:56
-msgid "easterbunny"
+#: mod/settings.php:1188 src/Model/Profile.php:754
+msgid "Full Name:"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:57
-msgid "darkzero"
+#: mod/settings.php:1189
+msgid "Email Address:"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:58
-msgid "comix"
+#: mod/settings.php:1190
+msgid "Your Timezone:"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:59
-msgid "slackr"
+#: mod/settings.php:1191
+msgid "Your Language:"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:72
-msgid "Variations"
+#: mod/settings.php:1191
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
+#: mod/settings.php:1192
+msgid "Default Post Location:"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
+#: mod/settings.php:1193
+msgid "Use Browser Location:"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
+#: mod/settings.php:1196
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
+#: mod/settings.php:1198
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
+#: mod/settings.php:1198 mod/settings.php:1227
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
+#: mod/settings.php:1199
+msgid "Default Post Permissions"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
+#: mod/settings.php:1200
+msgid "(click to open/close)"
 msgstr ""
 
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
+#: mod/settings.php:1210
+msgid "Default Private Post"
 msgstr ""
 
-#: view/theme/frio/theme.php:246
-msgid "Guest"
+#: mod/settings.php:1211
+msgid "Default Public Post"
 msgstr ""
 
-#: view/theme/frio/theme.php:251
-msgid "Visitor"
+#: mod/settings.php:1215
+msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:159
-#: src/Model/Profile.php:912 src/Module/Settings/TwoFactor/Index.php:88
-#: src/Module/Contact.php:636 src/Module/Contact.php:855
-msgid "Status"
+#: mod/settings.php:1227
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:159
-#: src/Content/Nav.php:242
-msgid "Your posts and conversations"
+#: mod/settings.php:1230
+msgid "Notification Settings"
 msgstr ""
 
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:160
-#: src/Model/Profile.php:884 src/Model/Profile.php:920
-#: src/Module/Welcome.php:38 src/Module/Contact.php:638
-#: src/Module/Contact.php:871 mod/profperm.php:116
-msgid "Profile"
+#: mod/settings.php:1231
+msgid "Send a notification email when:"
 msgstr ""
 
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:160
-msgid "Your profile page"
+#: mod/settings.php:1232
+msgid "You receive an introduction"
 msgstr ""
 
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:161
-#: src/Model/Profile.php:928 mod/fbrowser.php:42
-msgid "Photos"
+#: mod/settings.php:1233
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:161
-msgid "Your photos"
+#: mod/settings.php:1234
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:162
-#: src/Model/Profile.php:936 src/Model/Profile.php:939
-msgid "Videos"
+#: mod/settings.php:1235
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:162
-msgid "Your videos"
+#: mod/settings.php:1236
+msgid "You receive a private message"
 msgstr ""
 
-#: view/theme/frio/theme.php:271 view/theme/frio/theme.php:275
-#: src/Content/Nav.php:163 src/Content/Nav.php:227 src/Model/Profile.php:948
-#: src/Model/Profile.php:959 mod/events.php:393 mod/cal.php:258
-msgid "Events"
+#: mod/settings.php:1237
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:163
-msgid "Your events"
+#: mod/settings.php:1238
+msgid "You are tagged in a post"
 msgstr ""
 
-#: view/theme/frio/theme.php:274 src/Content/Nav.php:240
-msgid "Network"
+#: mod/settings.php:1239
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: view/theme/frio/theme.php:274 src/Content/Nav.php:240
-msgid "Conversations from your friends"
+#: mod/settings.php:1241
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: view/theme/frio/theme.php:275 src/Content/Nav.php:227
-#: src/Model/Profile.php:951 src/Model/Profile.php:962
-msgid "Events and Calendar"
+#: mod/settings.php:1241
+msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: view/theme/frio/theme.php:276 src/Content/Nav.php:252 mod/message.php:121
-msgid "Messages"
+#: mod/settings.php:1243
+msgid "Text-only notification emails"
 msgstr ""
 
-#: view/theme/frio/theme.php:276 src/Content/Nav.php:252
-msgid "Private mail"
+#: mod/settings.php:1245
+msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: view/theme/frio/theme.php:277 src/Content/Nav.php:261
-msgid "Account settings"
+#: mod/settings.php:1247
+msgid "Show detailled notifications"
 msgstr ""
 
-#: view/theme/frio/theme.php:278 src/Content/Text/HTML.php:911
-#: src/Content/Nav.php:204 src/Content/Nav.php:267 src/Model/Profile.php:991
-#: src/Model/Profile.php:994 src/Module/Contact.php:798
-#: src/Module/Contact.php:883
-msgid "Contacts"
+#: mod/settings.php:1249
+msgid ""
+"Per default, notifications are condensed to a single notification per item. "
+"When enabled every notification is displayed."
 msgstr ""
 
-#: view/theme/frio/theme.php:278 src/Content/Nav.php:267
-msgid "Manage/edit friends and contacts"
+#: mod/settings.php:1251
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: view/theme/frio/config.php:109
-msgid "Custom"
+#: mod/settings.php:1252
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: view/theme/frio/config.php:121
-msgid "Note"
+#: mod/settings.php:1255
+msgid "Import Contacts"
 msgstr ""
 
-#: view/theme/frio/config.php:121
-msgid "Check image permissions if all users are allowed to see the image"
+#: mod/settings.php:1256
+msgid ""
+"Upload a CSV file that contains the handle of your followed accounts in the "
+"first column you exported from the old account."
 msgstr ""
 
-#: view/theme/frio/config.php:127
-msgid "Select color scheme"
+#: mod/settings.php:1257
+msgid "Upload File"
 msgstr ""
 
-#: view/theme/frio/config.php:128
-msgid "Copy or paste schemestring"
+#: mod/settings.php:1259
+msgid "Relocate"
 msgstr ""
 
-#: view/theme/frio/config.php:128
+#: mod/settings.php:1260
 msgid ""
-"You can copy this string to share your theme with others. Pasting here "
-"applies the schemestring"
+"If you have moved this profile from another server, and some of your "
+"contacts don't receive your updates, try pushing this button."
 msgstr ""
 
-#: view/theme/frio/config.php:129
-msgid "Navigation bar background color"
+#: mod/settings.php:1261
+msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: view/theme/frio/config.php:130
-msgid "Navigation bar icon color "
+#: mod/subthread.php:107
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: view/theme/frio/config.php:131
-msgid "Link color"
+#: mod/suggest.php:27
+msgid "Contact suggestion successfully ignored."
 msgstr ""
 
-#: view/theme/frio/config.php:132
-msgid "Set the background color"
+#: mod/suggest.php:51
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: view/theme/frio/config.php:133
-msgid "Content background opacity"
+#: mod/suggest.php:70
+msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: view/theme/frio/config.php:134
-msgid "Set the background image"
+#: mod/suggest.php:88 mod/suggest.php:108
+msgid "Ignore/Hide"
 msgstr ""
 
-#: view/theme/frio/config.php:135
-msgid "Background image style"
+#: mod/suggest.php:118 view/theme/vier/theme.php:179 src/Content/Widget.php:65
+msgid "Friend Suggestions"
 msgstr ""
 
-#: view/theme/frio/config.php:137
-msgid "Enable Compose page"
-msgstr ""
+#: mod/tagrm.php:31
+msgid "Tag(s) removed"
+msgstr ""
 
-#: view/theme/frio/config.php:137
-msgid ""
-"This replaces the jot modal window for writing new posts with a link to <a "
-"href=\"compose\">the new Compose page</a>."
+#: mod/tagrm.php:101
+msgid "Remove Item Tag"
 msgstr ""
 
-#: view/theme/frio/config.php:141
-msgid "Login page background image"
+#: mod/tagrm.php:103
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: view/theme/frio/config.php:145
-msgid "Login page background color"
+#: mod/tagrm.php:114 src/Module/Settings/Delegation.php:159
+msgid "Remove"
 msgstr ""
 
-#: view/theme/frio/config.php:145
-msgid "Leave background image and color empty for theme defaults"
+#: mod/uimport.php:29
+msgid "User imports on closed servers can only be done by an administrator."
 msgstr ""
 
-#: view/theme/quattro/config.php:74
-msgid "Alignment"
+#: mod/uimport.php:38 src/Module/Register.php:65
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: view/theme/quattro/config.php:74
-msgid "Left"
+#: mod/uimport.php:45 src/Module/Register.php:141
+msgid "Import"
 msgstr ""
 
-#: view/theme/quattro/config.php:74
-msgid "Center"
+#: mod/uimport.php:47
+msgid "Move account"
 msgstr ""
 
-#: view/theme/quattro/config.php:75
-msgid "Color scheme"
+#: mod/uimport.php:48
+msgid "You can import an account from another Friendica server."
 msgstr ""
 
-#: view/theme/quattro/config.php:76
-msgid "Posts font size"
+#: mod/uimport.php:49
+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 ""
 
-#: view/theme/quattro/config.php:77
-msgid "Textareas font size"
+#: mod/uimport.php:50
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
 msgstr ""
 
-#: src/Database/DBStructure.php:49
-msgid "There are no tables on MyISAM."
+#: mod/uimport.php:51
+msgid "Account file"
 msgstr ""
 
-#: src/Database/DBStructure.php:73
-#, php-format
+#: mod/uimport.php:51
 msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
 msgstr ""
 
-#: src/Database/DBStructure.php:76
-msgid "Errors encountered performing database changes: "
+#: mod/unfollow.php:35 mod/unfollow.php:91
+msgid "You aren't following this contact."
 msgstr ""
 
-#: src/Database/DBStructure.php:265
-#, php-format
-msgid "%s: Database update"
+#: mod/unfollow.php:45 mod/unfollow.php:97
+msgid "Unfollowing is currently not supported by your network."
 msgstr ""
 
-#: src/Database/DBStructure.php:526
-#, php-format
-msgid "%s: updating %s table."
+#: mod/unfollow.php:66
+msgid "Contact unfollowed"
 msgstr ""
 
-#: src/Object/Post.php:132
-msgid "This entry was edited"
+#: mod/unfollow.php:117
+msgid "Disconnect/Unfollow"
 msgstr ""
 
-#: src/Object/Post.php:155
-msgid "Private Message"
+#: mod/update_community.php:22 mod/update_contact.php:22
+#: mod/update_display.php:23 mod/update_network.php:32 mod/update_notes.php:35
+#: mod/update_profile.php:33
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: src/Object/Post.php:165 src/Object/Post.php:167 mod/settings.php:724
-msgid "Edit"
+#: mod/videos.php:116
+msgid "No videos selected"
 msgstr ""
 
-#: src/Object/Post.php:194
-msgid "pinned item"
+#: mod/videos.php:234 src/Model/Item.php:3581
+msgid "View Video"
 msgstr ""
 
-#: src/Object/Post.php:199
-msgid "Delete locally"
+#: mod/videos.php:249
+msgid "Recent Videos"
 msgstr ""
 
-#: src/Object/Post.php:202
-msgid "Delete globally"
+#: mod/videos.php:251
+msgid "Upload New Videos"
 msgstr ""
 
-#: src/Object/Post.php:202
-msgid "Remove locally"
+#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:71
+#: mod/wall_upload.php:41 mod/wall_upload.php:57 mod/wall_upload.php:102
+#: mod/wall_upload.php:153 mod/wall_upload.php:156
+msgid "Invalid request."
 msgstr ""
 
-#: src/Object/Post.php:216
-msgid "save to folder"
+#: mod/wall_attach.php:89
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: src/Object/Post.php:251
-msgid "I will attend"
+#: mod/wall_attach.php:89
+msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: src/Object/Post.php:251
-msgid "I will not attend"
+#: mod/wall_attach.php:100
+#, php-format
+msgid "File exceeds size limit of %s"
 msgstr ""
 
-#: src/Object/Post.php:251
-msgid "I might attend"
+#: mod/wall_attach.php:115
+msgid "File upload failed."
 msgstr ""
 
-#: src/Object/Post.php:279
-msgid "ignore thread"
+#: mod/wall_upload.php:229
+msgid "Wall Photos"
 msgstr ""
 
-#: src/Object/Post.php:280
-msgid "unignore thread"
+#: mod/wallmessage.php:51 mod/wallmessage.php:114
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: src/Object/Post.php:281
-msgid "toggle ignore status"
+#: mod/wallmessage.php:62
+msgid "Unable to check your home location."
 msgstr ""
 
-#: src/Object/Post.php:284 mod/ostatus_subscribe.php:85
-msgid "ignored"
+#: mod/wallmessage.php:88 mod/wallmessage.php:97
+msgid "No recipient."
 msgstr ""
 
-#: src/Object/Post.php:293
-msgid "pin"
+#: mod/wallmessage.php:128
+#, 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 ""
 
-#: src/Object/Post.php:294
-msgid "unpin"
+#: view/theme/duepuntozero/config.php:52 src/Model/User.php:787
+msgid "default"
 msgstr ""
 
-#: src/Object/Post.php:295
-msgid "toggle pin status"
+#: view/theme/duepuntozero/config.php:53
+msgid "greenzero"
 msgstr ""
 
-#: src/Object/Post.php:298
-msgid "pinned"
+#: view/theme/duepuntozero/config.php:54
+msgid "purplezero"
 msgstr ""
 
-#: src/Object/Post.php:305
-msgid "add star"
+#: view/theme/duepuntozero/config.php:55
+msgid "easterbunny"
 msgstr ""
 
-#: src/Object/Post.php:306
-msgid "remove star"
+#: view/theme/duepuntozero/config.php:56
+msgid "darkzero"
 msgstr ""
 
-#: src/Object/Post.php:307
-msgid "toggle star status"
+#: view/theme/duepuntozero/config.php:57
+msgid "comix"
 msgstr ""
 
-#: src/Object/Post.php:310
-msgid "starred"
+#: view/theme/duepuntozero/config.php:58
+msgid "slackr"
 msgstr ""
 
-#: src/Object/Post.php:314
-msgid "add tag"
+#: view/theme/duepuntozero/config.php:71
+msgid "Variations"
 msgstr ""
 
-#: src/Object/Post.php:325 mod/photos.php:1370
-msgid "I like this (toggle)"
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
 msgstr ""
 
-#: src/Object/Post.php:325
-msgid "like"
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
 msgstr ""
 
-#: src/Object/Post.php:326 mod/photos.php:1371
-msgid "I don't like this (toggle)"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
 msgstr ""
 
-#: src/Object/Post.php:326
-msgid "dislike"
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
 msgstr ""
 
-#: src/Object/Post.php:329
-msgid "Share this"
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
 msgstr ""
 
-#: src/Object/Post.php:329
-msgid "share"
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
 msgstr ""
 
-#: src/Object/Post.php:378
-#, php-format
-msgid "%s (Received %s)"
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
 msgstr ""
 
-#: src/Object/Post.php:403
-msgid "to"
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
 msgstr ""
 
-#: src/Object/Post.php:404
-msgid "via"
+#: view/theme/frio/config.php:108
+msgid "Custom"
 msgstr ""
 
-#: src/Object/Post.php:405
-msgid "Wall-to-Wall"
+#: view/theme/frio/config.php:120
+msgid "Note"
 msgstr ""
 
-#: src/Object/Post.php:406
-msgid "via Wall-To-Wall:"
+#: view/theme/frio/config.php:120
+msgid "Check image permissions if all users are allowed to see the image"
 msgstr ""
 
-#: src/Object/Post.php:441 src/Object/Post.php:903 mod/photos.php:1388
-#: mod/photos.php:1427 mod/photos.php:1491
-msgid "Comment"
+#: view/theme/frio/config.php:126
+msgid "Select color scheme"
 msgstr ""
 
-#: src/Object/Post.php:442
-#, php-format
-msgid "Reply to %s"
+#: view/theme/frio/config.php:127
+msgid "Copy or paste schemestring"
 msgstr ""
 
-#: src/Object/Post.php:458
-msgid "Notifier task is pending"
+#: view/theme/frio/config.php:127
+msgid ""
+"You can copy this string to share your theme with others. Pasting here "
+"applies the schemestring"
 msgstr ""
 
-#: src/Object/Post.php:459
-msgid "Delivery to remote servers is pending"
+#: view/theme/frio/config.php:128
+msgid "Navigation bar background color"
 msgstr ""
 
-#: src/Object/Post.php:460
-msgid "Delivery to remote servers is underway"
+#: view/theme/frio/config.php:129
+msgid "Navigation bar icon color "
 msgstr ""
 
-#: src/Object/Post.php:461
-msgid "Delivery to remote servers is mostly done"
+#: view/theme/frio/config.php:130
+msgid "Link color"
 msgstr ""
 
-#: src/Object/Post.php:462
-msgid "Delivery to remote servers is done"
+#: view/theme/frio/config.php:131
+msgid "Set the background color"
 msgstr ""
 
-#: src/Object/Post.php:482
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Object/Post.php:483
-msgid "Show more"
+#: view/theme/frio/config.php:132
+msgid "Content background opacity"
 msgstr ""
 
-#: src/Object/Post.php:484
-msgid "Show fewer"
+#: view/theme/frio/config.php:133
+msgid "Set the background image"
 msgstr ""
 
-#: src/Object/Post.php:495 src/Model/Item.php:3400
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Object/Post.php:901 src/Module/Contact.php:1026
-#: src/Module/Item/Compose.php:123 mod/photos.php:1386 mod/photos.php:1425
-#: mod/photos.php:1489
-msgid "This is you"
+#: view/theme/frio/config.php:134
+msgid "Background image style"
 msgstr ""
 
-#: src/App.php:333
-msgid "No system theme config value set."
+#: view/theme/frio/config.php:136
+msgid "Enable Compose page"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:908 src/Content/Text/BBCode.php:1604
-#: src/Content/Text/BBCode.php:1605
-msgid "Image/photo"
+#: view/theme/frio/config.php:136
+msgid ""
+"This replaces the jot modal window for writing new posts with a link to <a "
+"href=\"compose\">the new Compose page</a>."
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1025
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+#: view/theme/frio/config.php:140
+msgid "Login page background image"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1522 src/Content/Text/HTML.php:952
-msgid "Click to open/close"
+#: view/theme/frio/config.php:144
+msgid "Login page background color"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1553
-msgid "$1 wrote:"
+#: view/theme/frio/config.php:144
+msgid "Leave background image and color empty for theme defaults"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
-msgid "Encrypted content"
+#: view/theme/frio/theme.php:245
+msgid "Guest"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1833
-msgid "Invalid source protocol"
+#: view/theme/frio/theme.php:250
+msgid "Visitor"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1848
-msgid "Invalid link protocol"
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:157
+#: src/Model/Profile.php:907 src/Module/Settings/TwoFactor/Index.php:88
+#: src/Module/Contact.php:634 src/Module/Contact.php:853
+msgid "Status"
 msgstr ""
 
-#: src/Content/Text/HTML.php:800
-msgid "Loading more entries..."
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:157
+#: src/Content/Nav.php:240
+msgid "Your posts and conversations"
 msgstr ""
 
-#: src/Content/Text/HTML.php:801
-msgid "The end"
+#: view/theme/frio/theme.php:267 src/Content/Nav.php:158
+msgid "Your profile page"
 msgstr ""
 
-#: src/Content/Text/HTML.php:894 src/Module/Filer/SaveTag.php:48
-#: mod/notes.php:46 mod/editpost.php:72
-msgid "Save"
+#: view/theme/frio/theme.php:268 src/Content/Nav.php:159
+msgid "Your photos"
 msgstr ""
 
-#: src/Content/Text/HTML.php:894 src/Model/Profile.php:539
-#: src/Module/Contact.php:317
-msgid "Follow"
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:160
+#: src/Model/Profile.php:931 src/Model/Profile.php:934
+msgid "Videos"
 msgstr ""
 
-#: src/Content/Text/HTML.php:900 src/Content/Nav.php:199
-#: src/Module/Search/Index.php:79
-msgid "Search"
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:160
+msgid "Your videos"
 msgstr ""
 
-#: src/Content/Text/HTML.php:902 src/Content/Nav.php:78
-msgid "@name, !forum, #tags, content"
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:161
+msgid "Your events"
 msgstr ""
 
-#: src/Content/Text/HTML.php:909 src/Content/Nav.php:202
-msgid "Full Text"
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:238
+msgid "Network"
 msgstr ""
 
-#: src/Content/Text/HTML.php:910 src/Content/Nav.php:203
-#: src/Content/Widget/TagCloud.php:53
-msgid "Tags"
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:238
+msgid "Conversations from your friends"
 msgstr ""
 
-#: src/Content/ContactSelector.php:57
-msgid "Frequently"
+#: view/theme/frio/theme.php:274 src/Content/Nav.php:225
+#: src/Model/Profile.php:946 src/Model/Profile.php:957
+msgid "Events and Calendar"
 msgstr ""
 
-#: src/Content/ContactSelector.php:58
-msgid "Hourly"
+#: view/theme/frio/theme.php:275 src/Content/Nav.php:250
+msgid "Private mail"
 msgstr ""
 
-#: src/Content/ContactSelector.php:59
-msgid "Twice daily"
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:259
+msgid "Account settings"
 msgstr ""
 
-#: src/Content/ContactSelector.php:60
-msgid "Daily"
+#: view/theme/frio/theme.php:277 src/Content/Text/HTML.php:911
+#: src/Content/Nav.php:202 src/Content/Nav.php:265 src/Model/Profile.php:986
+#: src/Model/Profile.php:989 src/Module/Contact.php:796
+#: src/Module/Contact.php:881
+msgid "Contacts"
 msgstr ""
 
-#: src/Content/ContactSelector.php:61
-msgid "Weekly"
+#: view/theme/frio/theme.php:277 src/Content/Nav.php:265
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: src/Content/ContactSelector.php:62
-msgid "Monthly"
+#: view/theme/quattro/config.php:73
+msgid "Alignment"
 msgstr ""
 
-#: src/Content/ContactSelector.php:116
-msgid "DFRN"
+#: view/theme/quattro/config.php:73
+msgid "Left"
 msgstr ""
 
-#: src/Content/ContactSelector.php:117
-msgid "OStatus"
+#: view/theme/quattro/config.php:73
+msgid "Center"
 msgstr ""
 
-#: src/Content/ContactSelector.php:118
-msgid "RSS/Atom"
+#: view/theme/quattro/config.php:74
+msgid "Color scheme"
 msgstr ""
 
-#: src/Content/ContactSelector.php:120 mod/settings.php:794
-msgid "Diaspora"
+#: view/theme/quattro/config.php:75
+msgid "Posts font size"
 msgstr ""
 
-#: src/Content/ContactSelector.php:121
-msgid "Zot!"
+#: view/theme/quattro/config.php:76
+msgid "Textareas font size"
 msgstr ""
 
-#: src/Content/ContactSelector.php:122
-msgid "LinkedIn"
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
 msgstr ""
 
-#: src/Content/ContactSelector.php:123
-msgid "XMPP/IM"
+#: view/theme/vier/config.php:115
+msgid "don't show"
 msgstr ""
 
-#: src/Content/ContactSelector.php:124
-msgid "MySpace"
+#: view/theme/vier/config.php:115
+msgid "show"
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Google+"
+#: view/theme/vier/config.php:121
+msgid "Set style"
 msgstr ""
 
-#: src/Content/ContactSelector.php:126
-msgid "pump.io"
+#: view/theme/vier/config.php:122
+msgid "Community Pages"
 msgstr ""
 
-#: src/Content/ContactSelector.php:127
-msgid "Twitter"
+#: view/theme/vier/config.php:123 view/theme/vier/theme.php:126
+msgid "Community Profiles"
 msgstr ""
 
-#: src/Content/ContactSelector.php:129
-msgid "Diaspora Connector"
+#: view/theme/vier/config.php:124
+msgid "Help or @NewHere ?"
 msgstr ""
 
-#: src/Content/ContactSelector.php:130
-msgid "GNU Social Connector"
+#: view/theme/vier/config.php:125 view/theme/vier/theme.php:348
+msgid "Connect Services"
 msgstr ""
 
-#: src/Content/ContactSelector.php:131
-msgid "ActivityPub"
+#: view/theme/vier/config.php:126
+msgid "Find Friends"
 msgstr ""
 
-#: src/Content/ContactSelector.php:132
-msgid "pnut"
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:156
+msgid "Last users"
 msgstr ""
 
-#: src/Content/ContactSelector.php:166
-#, php-format
-msgid "%s (via %s)"
+#: view/theme/vier/theme.php:174 src/Content/Widget.php:60
+msgid "Find People"
 msgstr ""
 
-#: src/Content/ContactSelector.php:235 src/Content/ContactSelector.php:275
-#: src/Content/ContactSelector.php:313
-msgid "No answer"
+#: view/theme/vier/theme.php:175 src/Content/Widget.php:61
+msgid "Enter name or interest"
 msgstr ""
 
-#: src/Content/ContactSelector.php:236
-msgid "Male"
+#: view/theme/vier/theme.php:177 src/Content/Widget.php:63
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: src/Content/ContactSelector.php:237
-msgid "Female"
+#: view/theme/vier/theme.php:178 src/Content/Widget.php:64
+#: src/Module/Contact.php:817 src/Module/Directory.php:84
+msgid "Find"
 msgstr ""
 
-#: src/Content/ContactSelector.php:238
-msgid "Currently Male"
+#: view/theme/vier/theme.php:180 src/Content/Widget.php:66
+msgid "Similar Interests"
 msgstr ""
 
-#: src/Content/ContactSelector.php:239
-msgid "Currently Female"
+#: view/theme/vier/theme.php:181 src/Content/Widget.php:67
+msgid "Random Profile"
 msgstr ""
 
-#: src/Content/ContactSelector.php:240
-msgid "Mostly Male"
+#: view/theme/vier/theme.php:182 src/Content/Widget.php:68
+msgid "Invite Friends"
 msgstr ""
 
-#: src/Content/ContactSelector.php:241
-msgid "Mostly Female"
+#: view/theme/vier/theme.php:183 src/Content/Widget.php:69
+#: src/Module/Directory.php:76
+msgid "Global Directory"
 msgstr ""
 
-#: src/Content/ContactSelector.php:242
-msgid "Transgender"
+#: view/theme/vier/theme.php:185 src/Content/Widget.php:71
+msgid "Local Directory"
 msgstr ""
 
-#: src/Content/ContactSelector.php:243
-msgid "Intersex"
+#: view/theme/vier/theme.php:225 src/Content/Text/HTML.php:915
+#: src/Content/ForumManager.php:129 src/Content/Nav.php:206
+msgid "Forums"
 msgstr ""
 
-#: src/Content/ContactSelector.php:244
-msgid "Transsexual"
+#: view/theme/vier/theme.php:227 src/Content/ForumManager.php:131
+msgid "External link to forum"
 msgstr ""
 
-#: src/Content/ContactSelector.php:245
-msgid "Hermaphrodite"
+#: view/theme/vier/theme.php:230 src/Content/ForumManager.php:134
+#: src/Content/Widget.php:404 src/Content/Widget.php:503
+msgid "show more"
 msgstr ""
 
-#: src/Content/ContactSelector.php:246
-msgid "Neuter"
+#: view/theme/vier/theme.php:263
+msgid "Quick Start"
 msgstr ""
 
-#: src/Content/ContactSelector.php:247
-msgid "Non-specific"
+#: view/theme/vier/theme.php:269 src/Content/Nav.php:189
+#: src/Module/Settings/TwoFactor/AppSpecific.php:96
+#: src/Module/Settings/TwoFactor/Index.php:87
+#: src/Module/Settings/TwoFactor/Recovery.php:74
+#: src/Module/Settings/TwoFactor/Verify.php:113 src/Module/Help.php:50
+msgid "Help"
 msgstr ""
 
-#: src/Content/ContactSelector.php:248 src/Module/Admin/Federation.php:34
-msgid "Other"
+#: src/Core/ACL.php:366
+msgid "Post to Email"
 msgstr ""
 
-#: src/Content/ContactSelector.php:276
-msgid "Males"
+#: src/Core/ACL.php:384
+msgid "Public"
 msgstr ""
 
-#: src/Content/ContactSelector.php:277
-msgid "Females"
+#: src/Core/ACL.php:385
+msgid ""
+"This content will be shown to all your followers and can be seen in the "
+"community pages and by anyone with its link."
 msgstr ""
 
-#: src/Content/ContactSelector.php:278
-msgid "Gay"
+#: src/Core/ACL.php:386
+msgid "Limited/Private"
 msgstr ""
 
-#: src/Content/ContactSelector.php:279
-msgid "Lesbian"
+#: src/Core/ACL.php:387
+msgid ""
+"This content will be shown only to the people in the first box, to the "
+"exception of the people mentioned in the second box. It won't appear "
+"anywhere public."
 msgstr ""
 
-#: src/Content/ContactSelector.php:280
-msgid "No Preference"
+#: src/Core/ACL.php:388
+msgid "Show to:"
 msgstr ""
 
-#: src/Content/ContactSelector.php:281
-msgid "Bisexual"
+#: src/Core/ACL.php:389
+msgid "Except to:"
 msgstr ""
 
-#: src/Content/ContactSelector.php:282
-msgid "Autosexual"
+#: src/Core/ACL.php:392
+msgid "Connectors"
 msgstr ""
 
-#: src/Content/ContactSelector.php:283
-msgid "Abstinent"
+#: src/Core/ACL.php:393
+msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: src/Content/ContactSelector.php:284
-msgid "Virgin"
+#: src/Core/ACL.php:393
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr ""
 
-#: src/Content/ContactSelector.php:285
-msgid "Deviant"
+#: src/Core/Installer.php:163
+msgid ""
+"The database configuration file \"config/local.config.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your "
+"web server root."
 msgstr ""
 
-#: src/Content/ContactSelector.php:286
-msgid "Fetish"
+#: src/Core/Installer.php:182
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: src/Content/ContactSelector.php:287
-msgid "Oodles"
+#: src/Core/Installer.php:183 src/Module/Install.php:172
+#: src/Module/Install.php:326
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: src/Content/ContactSelector.php:288
-msgid "Nonsexual"
+#: src/Core/Installer.php:244
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: src/Content/ContactSelector.php:314
-msgid "Single"
+#: src/Core/Installer.php:245
+msgid ""
+"If you don't have a command line version of PHP installed on your server, "
+"you will not be able to run the background processing. See <a href='https://"
+"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
+"worker'>'Setup the worker'</a>"
 msgstr ""
 
-#: src/Content/ContactSelector.php:315
-msgid "Lonely"
+#: src/Core/Installer.php:250
+msgid "PHP executable path"
 msgstr ""
 
-#: src/Content/ContactSelector.php:316
-msgid "In a relation"
+#: src/Core/Installer.php:250
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: src/Content/ContactSelector.php:317
-msgid "Has crush"
+#: src/Core/Installer.php:255
+msgid "Command line PHP"
 msgstr ""
 
-#: src/Content/ContactSelector.php:318
-msgid "Infatuated"
+#: src/Core/Installer.php:264
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: src/Content/ContactSelector.php:319
-msgid "Dating"
+#: src/Core/Installer.php:265
+msgid "Found PHP version: "
 msgstr ""
 
-#: src/Content/ContactSelector.php:320
-msgid "Unfaithful"
+#: src/Core/Installer.php:267
+msgid "PHP cli binary"
 msgstr ""
 
-#: src/Content/ContactSelector.php:321
-msgid "Sex Addict"
+#: src/Core/Installer.php:280
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: src/Content/ContactSelector.php:322 src/Model/User.php:805
-msgid "Friends"
+#: src/Core/Installer.php:281
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: src/Content/ContactSelector.php:323
-msgid "Friends/Benefits"
+#: src/Core/Installer.php:286
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: src/Content/ContactSelector.php:324
-msgid "Casual"
+#: src/Core/Installer.php:318
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: src/Content/ContactSelector.php:325
-msgid "Engaged"
+#: src/Core/Installer.php:319
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: src/Content/ContactSelector.php:326
-msgid "Married"
+#: src/Core/Installer.php:322
+msgid "Generate encryption keys"
 msgstr ""
 
-#: src/Content/ContactSelector.php:327
-msgid "Imaginarily married"
+#: src/Core/Installer.php:374
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:328
-msgid "Partners"
+#: src/Core/Installer.php:379
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:329
-msgid "Cohabiting"
+#: src/Core/Installer.php:385
+msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:330
-msgid "Common law"
+#: src/Core/Installer.php:390
+msgid "Error: The MySQL driver for PDO is not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:331
-msgid "Happy"
+#: src/Core/Installer.php:394
+msgid "PDO or MySQLi PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:332
-msgid "Not looking"
+#: src/Core/Installer.php:402
+msgid "Error, XML PHP module required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:333
-msgid "Swinger"
+#: src/Core/Installer.php:406
+msgid "XML PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:334
-msgid "Betrayed"
+#: src/Core/Installer.php:409
+msgid "libCurl PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:335
-msgid "Separated"
+#: src/Core/Installer.php:410
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:336
-msgid "Unstable"
+#: src/Core/Installer.php:416
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:337
-msgid "Divorced"
+#: src/Core/Installer.php:417
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:338
-msgid "Imaginarily divorced"
+#: src/Core/Installer.php:423
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:339
-msgid "Widowed"
+#: src/Core/Installer.php:424
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:340
-msgid "Uncertain"
+#: src/Core/Installer.php:430
+msgid "mb_string PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:341
-msgid "It's complicated"
+#: src/Core/Installer.php:431
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:342
-msgid "Don't care"
+#: src/Core/Installer.php:437
+msgid "iconv PHP module"
 msgstr ""
 
-#: src/Content/ContactSelector.php:343
-msgid "Ask me"
+#: src/Core/Installer.php:438
+msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: src/Content/Widget.php:36
-msgid "Add New Contact"
+#: src/Core/Installer.php:444
+msgid "POSIX PHP module"
 msgstr ""
 
-#: src/Content/Widget.php:37
-msgid "Enter address or web location"
+#: src/Core/Installer.php:445
+msgid "Error: POSIX PHP module required but not installed."
 msgstr ""
 
-#: src/Content/Widget.php:38
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: src/Core/Installer.php:451
+msgid "JSON PHP module"
 msgstr ""
 
-#: src/Content/Widget.php:40 src/Module/BaseSearchModule.php:130
-#: src/Module/AllFriends.php:91 mod/match.php:101 mod/suggest.php:105
-msgid "Connect"
+#: src/Core/Installer.php:452
+msgid "Error: JSON PHP module required but not installed."
 msgstr ""
 
-#: src/Content/Widget.php:55
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Content/Widget.php:193 src/Core/ACL.php:269
-#: src/Module/Profile/Contacts.php:126 src/Module/Contact.php:795
-#: mod/lockview.php:75 mod/lockview.php:110
-msgid "Followers"
+#: src/Core/Installer.php:458
+msgid "File Information PHP module"
 msgstr ""
 
-#: src/Content/Widget.php:194 src/Module/Profile/Contacts.php:127
-#: src/Module/Contact.php:796
-msgid "Following"
+#: src/Core/Installer.php:459
+msgid "Error: File Information PHP module required but not installed."
 msgstr ""
 
-#: src/Content/Widget.php:195 src/Module/Profile/Contacts.php:128
-#: src/Module/Contact.php:797
-msgid "Mutual friends"
+#: src/Core/Installer.php:482
+msgid ""
+"The web installer needs to be able to create a file called \"local.config.php"
+"\" in the \"config\" folder of your web server and it is unable to do so."
 msgstr ""
 
-#: src/Content/Widget.php:200
-msgid "Relationships"
+#: src/Core/Installer.php:483
+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 ""
 
-#: src/Content/Widget.php:202 src/Module/Group.php:280
-#: src/Module/Contact.php:684
-msgid "All Contacts"
+#: src/Core/Installer.php:484
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named local.config.php in your Friendica \"config\" folder."
 msgstr ""
 
-#: src/Content/Widget.php:245
-msgid "Protocols"
+#: src/Core/Installer.php:485
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: src/Content/Widget.php:247
-msgid "All Protocols"
+#: src/Core/Installer.php:488
+msgid "config/local.config.php is writable"
 msgstr ""
 
-#: src/Content/Widget.php:284
-msgid "Saved Folders"
+#: src/Core/Installer.php:508
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: src/Content/Widget.php:286 src/Content/Widget.php:325
-msgid "Everything"
+#: src/Core/Installer.php:509
+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 ""
 
-#: src/Content/Widget.php:323
-msgid "Categories"
+#: src/Core/Installer.php:510
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: src/Content/Widget.php:400
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Core/Installer.php:511
+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 ""
 
-#: src/Content/Widget.php:499 src/Content/Feature.php:99
-msgid "Archives"
+#: src/Core/Installer.php:514
+msgid "view/smarty3 is writable"
 msgstr ""
 
-#: src/Content/OEmbed.php:253
-msgid "Embedding disabled"
+#: src/Core/Installer.php:543
+msgid ""
+"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
+"to .htaccess."
 msgstr ""
 
-#: src/Content/OEmbed.php:376
-msgid "Embedded content"
+#: src/Core/Installer.php:545
+msgid "Error message from Curl when fetching"
 msgstr ""
 
-#: src/Content/Feature.php:81
-msgid "General Features"
+#: src/Core/Installer.php:550
+msgid "Url rewrite is working"
 msgstr ""
 
-#: src/Content/Feature.php:83
-msgid "Multiple Profiles"
+#: src/Core/Installer.php:579
+msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: src/Content/Feature.php:83
-msgid "Ability to create multiple profiles"
+#: src/Core/Installer.php:581
+msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: src/Content/Feature.php:84
-msgid "Photo Location"
+#: src/Core/Installer.php:583 tests/src/Core/InstallerTest.php:367
+#: tests/src/Core/InstallerTest.php:390
+msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: src/Content/Feature.php:84
-msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present) "
-"prior to stripping metadata and links it to a map."
+#: src/Core/Installer.php:605
+msgid "Database already in use."
 msgstr ""
 
-#: src/Content/Feature.php:85
-msgid "Export Public Calendar"
+#: src/Core/Installer.php:610
+msgid "Could not connect to database."
 msgstr ""
 
-#: src/Content/Feature.php:85
-msgid "Ability for visitors to download the public calendar"
+#: src/Core/L10n.php:349 src/Model/Event.php:396
+msgid "Tuesday"
 msgstr ""
 
-#: src/Content/Feature.php:86
-msgid "Trending Tags"
+#: src/Core/L10n.php:349 src/Model/Event.php:397
+msgid "Wednesday"
 msgstr ""
 
-#: src/Content/Feature.php:86
-msgid ""
-"Show a community page widget with a list of the most popular tags in recent "
-"public posts."
+#: src/Core/L10n.php:349 src/Model/Event.php:398
+msgid "Thursday"
 msgstr ""
 
-#: src/Content/Feature.php:91
-msgid "Post Composition Features"
+#: src/Core/L10n.php:349 src/Model/Event.php:399
+msgid "Friday"
 msgstr ""
 
-#: src/Content/Feature.php:92
-msgid "Auto-mention Forums"
+#: src/Core/L10n.php:349 src/Model/Event.php:400
+msgid "Saturday"
 msgstr ""
 
-#: src/Content/Feature.php:92
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
+#: src/Core/L10n.php:353 src/Model/Event.php:415
+msgid "January"
 msgstr ""
 
-#: src/Content/Feature.php:93
-msgid "Explicit Mentions"
+#: src/Core/L10n.php:353 src/Model/Event.php:416
+msgid "February"
 msgstr ""
 
-#: src/Content/Feature.php:93
-msgid ""
-"Add explicit mentions to comment box for manual control over who gets "
-"mentioned in replies."
+#: src/Core/L10n.php:353 src/Model/Event.php:417
+msgid "March"
 msgstr ""
 
-#: src/Content/Feature.php:98
-msgid "Network Sidebar"
+#: src/Core/L10n.php:353 src/Model/Event.php:418
+msgid "April"
 msgstr ""
 
-#: src/Content/Feature.php:99
-msgid "Ability to select posts by date ranges"
+#: src/Core/L10n.php:353 src/Core/L10n.php:373 src/Model/Event.php:406
+msgid "May"
 msgstr ""
 
-#: src/Content/Feature.php:100
-msgid "Protocol Filter"
+#: src/Core/L10n.php:353 src/Model/Event.php:419
+msgid "June"
 msgstr ""
 
-#: src/Content/Feature.php:100
-msgid "Enable widget to display Network posts only from selected protocols"
+#: src/Core/L10n.php:353 src/Model/Event.php:420
+msgid "July"
 msgstr ""
 
-#: src/Content/Feature.php:105
-msgid "Network Tabs"
+#: src/Core/L10n.php:353 src/Model/Event.php:421
+msgid "August"
 msgstr ""
 
-#: src/Content/Feature.php:106
-msgid "Network New Tab"
+#: src/Core/L10n.php:353 src/Model/Event.php:422
+msgid "September"
 msgstr ""
 
-#: src/Content/Feature.php:106
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+#: src/Core/L10n.php:353 src/Model/Event.php:423
+msgid "October"
 msgstr ""
 
-#: src/Content/Feature.php:107
-msgid "Network Shared Links Tab"
+#: src/Core/L10n.php:353 src/Model/Event.php:424
+msgid "November"
 msgstr ""
 
-#: src/Content/Feature.php:107
-msgid "Enable tab to display only Network posts with links in them"
+#: src/Core/L10n.php:353 src/Model/Event.php:425
+msgid "December"
 msgstr ""
 
-#: src/Content/Feature.php:112
-msgid "Post/Comment Tools"
+#: src/Core/L10n.php:369 src/Model/Event.php:387
+msgid "Mon"
 msgstr ""
 
-#: src/Content/Feature.php:113
-msgid "Post Categories"
+#: src/Core/L10n.php:369 src/Model/Event.php:388
+msgid "Tue"
 msgstr ""
 
-#: src/Content/Feature.php:113
-msgid "Add categories to your posts"
+#: src/Core/L10n.php:369 src/Model/Event.php:389
+msgid "Wed"
 msgstr ""
 
-#: src/Content/Feature.php:118
-msgid "Advanced Profile Settings"
+#: src/Core/L10n.php:369 src/Model/Event.php:390
+msgid "Thu"
 msgstr ""
 
-#: src/Content/Feature.php:119
-msgid "List Forums"
+#: src/Core/L10n.php:369 src/Model/Event.php:391
+msgid "Fri"
 msgstr ""
 
-#: src/Content/Feature.php:119
-msgid "Show visitors public community forums at the Advanced Profile Page"
+#: src/Core/L10n.php:369 src/Model/Event.php:392
+msgid "Sat"
 msgstr ""
 
-#: src/Content/Feature.php:120
-msgid "Tag Cloud"
+#: src/Core/L10n.php:369 src/Model/Event.php:386
+msgid "Sun"
 msgstr ""
 
-#: src/Content/Feature.php:120
-msgid "Provide a personal tag cloud on your profile page"
+#: src/Core/L10n.php:373 src/Model/Event.php:402
+msgid "Jan"
 msgstr ""
 
-#: src/Content/Feature.php:121
-msgid "Display Membership Date"
+#: src/Core/L10n.php:373 src/Model/Event.php:403
+msgid "Feb"
 msgstr ""
 
-#: src/Content/Feature.php:121
-msgid "Display membership date in profile"
+#: src/Core/L10n.php:373 src/Model/Event.php:404
+msgid "Mar"
 msgstr ""
 
-#: src/Content/Nav.php:73
-msgid "Nothing new here"
+#: src/Core/L10n.php:373 src/Model/Event.php:405
+msgid "Apr"
 msgstr ""
 
-#: src/Content/Nav.php:77
-msgid "Clear notifications"
+#: src/Core/L10n.php:373 src/Model/Event.php:407
+msgid "Jun"
 msgstr ""
 
-#: src/Content/Nav.php:152 src/Module/Security/Login.php:129
-msgid "Logout"
+#: src/Core/L10n.php:373 src/Model/Event.php:408
+msgid "Jul"
 msgstr ""
 
-#: src/Content/Nav.php:152
-msgid "End this session"
+#: src/Core/L10n.php:373 src/Model/Event.php:409
+msgid "Aug"
 msgstr ""
 
-#: src/Content/Nav.php:154 src/Module/Security/Login.php:130
-#: src/Module/Bookmarklet.php:26
-msgid "Login"
+#: src/Core/L10n.php:373
+msgid "Sep"
 msgstr ""
 
-#: src/Content/Nav.php:154
-msgid "Sign in"
+#: src/Core/L10n.php:373 src/Model/Event.php:411
+msgid "Oct"
 msgstr ""
 
-#: src/Content/Nav.php:164
-msgid "Personal notes"
+#: src/Core/L10n.php:373 src/Model/Event.php:412
+msgid "Nov"
 msgstr ""
 
-#: src/Content/Nav.php:164
-msgid "Your personal notes"
+#: src/Core/L10n.php:373 src/Model/Event.php:413
+msgid "Dec"
 msgstr ""
 
-#: src/Content/Nav.php:181 src/Content/Nav.php:242
-msgid "Home"
+#: src/Core/L10n.php:392
+msgid "poke"
 msgstr ""
 
-#: src/Content/Nav.php:181
-msgid "Home Page"
+#: src/Core/L10n.php:392
+msgid "poked"
 msgstr ""
 
-#: src/Content/Nav.php:185 src/Module/Security/Login.php:90
-#: src/Module/Register.php:137
-msgid "Register"
+#: src/Core/L10n.php:393
+msgid "ping"
 msgstr ""
 
-#: src/Content/Nav.php:185
-msgid "Create an account"
+#: src/Core/L10n.php:393
+msgid "pinged"
 msgstr ""
 
-#: src/Content/Nav.php:191
-msgid "Help and documentation"
+#: src/Core/L10n.php:394
+msgid "prod"
 msgstr ""
 
-#: src/Content/Nav.php:195
-msgid "Apps"
+#: src/Core/L10n.php:394
+msgid "prodded"
 msgstr ""
 
-#: src/Content/Nav.php:195
-msgid "Addon applications, utilities, games"
+#: src/Core/L10n.php:395
+msgid "slap"
 msgstr ""
 
-#: src/Content/Nav.php:199
-msgid "Search site content"
+#: src/Core/L10n.php:395
+msgid "slapped"
 msgstr ""
 
-#: src/Content/Nav.php:223
-msgid "Community"
+#: src/Core/L10n.php:396
+msgid "finger"
 msgstr ""
 
-#: src/Content/Nav.php:223
-msgid "Conversations on this and other servers"
+#: src/Core/L10n.php:396
+msgid "fingered"
 msgstr ""
 
-#: src/Content/Nav.php:230
-msgid "Directory"
+#: src/Core/L10n.php:397
+msgid "rebuff"
 msgstr ""
 
-#: src/Content/Nav.php:230
-msgid "People directory"
+#: src/Core/L10n.php:397
+msgid "rebuffed"
 msgstr ""
 
-#: src/Content/Nav.php:232
-msgid "Information about this friendica instance"
+#: src/Core/Update.php:194
+#, php-format
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: src/Content/Nav.php:235 src/Module/Tos.php:72
-#: src/Module/BaseAdminModule.php:83 src/Module/Admin/Tos.php:43
-#: src/Module/Register.php:145
-msgid "Terms of Service"
+#: src/Core/Update.php:258
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
+"a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
 msgstr ""
 
-#: src/Content/Nav.php:235
-msgid "Terms of Service of this Friendica instance"
+#: src/Core/Update.php:264
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: src/Content/Nav.php:246
-msgid "Introductions"
+#: src/Core/Update.php:270 src/Core/Update.php:308
+msgid "[Friendica Notify] Database update"
 msgstr ""
 
-#: src/Content/Nav.php:246
-msgid "Friend Requests"
+#: src/Core/Update.php:300
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
 msgstr ""
 
-#: src/Content/Nav.php:247 mod/notifications.php:72
-msgid "Notifications"
+#: src/Core/UserImport.php:107
+msgid "Error decoding account file"
 msgstr ""
 
-#: src/Content/Nav.php:248
-msgid "See all notifications"
+#: src/Core/UserImport.php:113
+msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: src/Content/Nav.php:249 mod/settings.php:867
-msgid "Mark as seen"
+#: src/Core/UserImport.php:121
+#, php-format
+msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: src/Content/Nav.php:249
-msgid "Mark all system notifications seen"
+#: src/Core/UserImport.php:157
+msgid "User creation error"
 msgstr ""
 
-#: src/Content/Nav.php:253
-msgid "Inbox"
+#: src/Core/UserImport.php:175
+msgid "User profile creation error"
 msgstr ""
 
-#: src/Content/Nav.php:254
-msgid "Outbox"
-msgstr ""
+#: src/Core/UserImport.php:219
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Content/Nav.php:255 mod/message.php:31 mod/message.php:114
-msgid "New Message"
+#: src/Core/UserImport.php:284
+msgid "Done. You can now login with your username and password"
 msgstr ""
 
-#: src/Content/Nav.php:258
-msgid "Delegation"
+#: src/Util/Temporal.php:145 src/Model/Profile.php:774
+msgid "Birthday:"
 msgstr ""
 
-#: src/Content/Nav.php:258
-msgid "Manage other pages"
+#: src/Util/Temporal.php:149
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: src/Content/Nav.php:264 src/Model/Profile.php:397
-#: src/Module/BaseSettingsModule.php:38 mod/settings.php:77
-msgid "Profiles"
+#: src/Util/Temporal.php:296
+msgid "never"
 msgstr ""
 
-#: src/Content/Nav.php:264
-msgid "Manage/Edit Profiles"
+#: src/Util/Temporal.php:303
+msgid "less than a second ago"
 msgstr ""
 
-#: src/Content/Nav.php:272 src/Module/BaseAdminModule.php:112
-msgid "Admin"
+#: src/Util/Temporal.php:311
+msgid "year"
 msgstr ""
 
-#: src/Content/Nav.php:272
-msgid "Site setup and configuration"
+#: src/Util/Temporal.php:311
+msgid "years"
 msgstr ""
 
-#: src/Content/Nav.php:275
-msgid "Navigation"
+#: src/Util/Temporal.php:312
+msgid "months"
 msgstr ""
 
-#: src/Content/Nav.php:275
-msgid "Site map"
+#: src/Util/Temporal.php:313
+msgid "weeks"
 msgstr ""
 
-#: src/Content/Widget/SavedSearches.php:29
-msgid "Remove term"
+#: src/Util/Temporal.php:314
+msgid "days"
 msgstr ""
 
-#: src/Content/Widget/SavedSearches.php:37
-msgid "Saved Searches"
+#: src/Util/Temporal.php:315
+msgid "hour"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:64
-msgid "Export"
+#: src/Util/Temporal.php:315
+msgid "hours"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:65
-msgid "Export calendar as ical"
+#: src/Util/Temporal.php:316
+msgid "minute"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export calendar as csv"
+#: src/Util/Temporal.php:316
+msgid "minutes"
 msgstr ""
 
-#: src/Content/Widget/TrendingTags.php:32
-#, php-format
-msgid "Trending Tags (last %d hour)"
-msgid_plural "Trending Tags (last %d hours)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Content/Widget/TrendingTags.php:33
-msgid "More Trending Tags"
+#: src/Util/Temporal.php:317
+msgid "second"
 msgstr ""
 
-#: src/Content/Widget/ContactBlock.php:57
-msgid "No contacts"
+#: src/Util/Temporal.php:317
+msgid "seconds"
 msgstr ""
 
-#: src/Content/Widget/ContactBlock.php:89
+#: src/Util/Temporal.php:327
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Content/Widget/ContactBlock.php:108
-msgid "View Contacts"
+msgid "in %1$d %2$s"
 msgstr ""
 
-#: src/Content/Pager.php:153
-msgid "newer"
+#: src/Util/Temporal.php:330
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: src/Content/Pager.php:158
-msgid "older"
+#: src/Content/Text/BBCode.php:908 src/Content/Text/BBCode.php:1604
+#: src/Content/Text/BBCode.php:1605
+msgid "Image/photo"
 msgstr ""
 
-#: src/Content/Pager.php:198 mod/match.php:114
-msgid "first"
+#: src/Content/Text/BBCode.php:1025
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Pager.php:203
-msgid "prev"
+#: src/Content/Text/BBCode.php:1522 src/Content/Text/HTML.php:952
+msgid "Click to open/close"
 msgstr ""
 
-#: src/Content/Pager.php:258 mod/match.php:119
-msgid "next"
+#: src/Content/Text/BBCode.php:1553
+msgid "$1 wrote:"
 msgstr ""
 
-#: src/Content/Pager.php:263
-msgid "last"
+#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608
+msgid "Encrypted content"
 msgstr ""
 
-#: src/Model/Profile.php:210 src/Model/Profile.php:423
-#: src/Model/Profile.php:880
-msgid "Edit profile"
+#: src/Content/Text/BBCode.php:1833
+msgid "Invalid source protocol"
 msgstr ""
 
-#: src/Model/Profile.php:397
-msgid "Manage/edit profiles"
+#: src/Content/Text/BBCode.php:1848
+msgid "Invalid link protocol"
 msgstr ""
 
-#: src/Model/Profile.php:404 src/Model/Profile.php:425 mod/profiles.php:667
-msgid "Change profile photo"
+#: src/Content/Text/HTML.php:800
+msgid "Loading more entries..."
 msgstr ""
 
-#: src/Model/Profile.php:405 mod/profiles.php:668
-msgid "Create New Profile"
+#: src/Content/Text/HTML.php:801
+msgid "The end"
 msgstr ""
 
-#: src/Model/Profile.php:414 mod/profiles.php:657
-msgid "Profile Image"
+#: src/Content/Text/HTML.php:894 src/Model/Profile.php:534
+#: src/Module/Contact.php:315
+msgid "Follow"
 msgstr ""
 
-#: src/Model/Profile.php:417 mod/profiles.php:659
-msgid "visible to everybody"
+#: src/Content/Text/HTML.php:900 src/Content/Nav.php:197
+#: src/Module/Search/Index.php:78
+msgid "Search"
 msgstr ""
 
-#: src/Model/Profile.php:418 mod/profiles.php:565 mod/profiles.php:660
-msgid "Edit visibility"
+#: src/Content/Text/HTML.php:902 src/Content/Nav.php:77
+msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: src/Model/Profile.php:442 src/Model/Event.php:67 src/Model/Event.php:94
-#: src/Model/Event.php:436 src/Model/Event.php:932 src/Module/Directory.php:135
-#: src/Module/Contact.php:627 mod/events.php:539 mod/notifications.php:248
-msgid "Location:"
+#: src/Content/Text/HTML.php:909 src/Content/Nav.php:200
+msgid "Full Text"
 msgstr ""
 
-#: src/Model/Profile.php:445 src/Model/Profile.php:766
-#: src/Module/Directory.php:140 mod/notifications.php:254
-msgid "Gender:"
+#: src/Content/Text/HTML.php:910 src/Content/Widget/TagCloud.php:52
+#: src/Content/Nav.php:201
+msgid "Tags"
 msgstr ""
 
-#: src/Model/Profile.php:446 src/Model/Profile.php:790
-#: src/Module/Directory.php:141
-msgid "Status:"
+#: src/Content/Widget/CalendarExport.php:64
+msgid "Export"
 msgstr ""
 
-#: src/Model/Profile.php:447 src/Model/Profile.php:807
-#: src/Module/Directory.php:142
-msgid "Homepage:"
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export calendar as ical"
 msgstr ""
 
-#: src/Model/Profile.php:448 src/Model/Profile.php:827
-#: src/Module/Directory.php:143 src/Module/Contact.php:631
-#: mod/notifications.php:250
-msgid "About:"
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as csv"
 msgstr ""
 
-#: src/Model/Profile.php:449 src/Module/Contact.php:629
-msgid "XMPP:"
+#: src/Content/Widget/ContactBlock.php:57
+msgid "No contacts"
 msgstr ""
 
-#: src/Model/Profile.php:541 src/Module/Contact.php:319
-msgid "Unfollow"
-msgstr ""
+#: src/Content/Widget/ContactBlock.php:89
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Model/Profile.php:543
-msgid "Atom feed"
+#: src/Content/Widget/ContactBlock.php:108
+msgid "View Contacts"
 msgstr ""
 
-#: src/Model/Profile.php:553 src/Module/Contact.php:315
-#: mod/notifications.php:261
-msgid "Network:"
+#: src/Content/Widget/SavedSearches.php:29
+msgid "Remove term"
 msgstr ""
 
-#: src/Model/Profile.php:583 src/Model/Profile.php:680
-msgid "g A l F d"
+#: src/Content/Widget/SavedSearches.php:37
+msgid "Saved Searches"
 msgstr ""
 
-#: src/Model/Profile.php:584
-msgid "F d"
-msgstr ""
+#: src/Content/Widget/TrendingTags.php:32
+#, php-format
+msgid "Trending Tags (last %d hour)"
+msgid_plural "Trending Tags (last %d hours)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Model/Profile.php:646 src/Model/Profile.php:731
-msgid "[today]"
+#: src/Content/Widget/TrendingTags.php:33
+msgid "More Trending Tags"
 msgstr ""
 
-#: src/Model/Profile.php:656
-msgid "Birthday Reminders"
+#: src/Content/ContactSelector.php:58
+msgid "Frequently"
 msgstr ""
 
-#: src/Model/Profile.php:657
-msgid "Birthdays this week:"
+#: src/Content/ContactSelector.php:59
+msgid "Hourly"
 msgstr ""
 
-#: src/Model/Profile.php:718
-msgid "[No description]"
+#: src/Content/ContactSelector.php:60
+msgid "Twice daily"
 msgstr ""
 
-#: src/Model/Profile.php:744
-msgid "Event Reminders"
+#: src/Content/ContactSelector.php:61
+msgid "Daily"
 msgstr ""
 
-#: src/Model/Profile.php:745
-msgid "Upcoming events the next 7 days:"
+#: src/Content/ContactSelector.php:62
+msgid "Weekly"
 msgstr ""
 
-#: src/Model/Profile.php:759 mod/settings.php:1189
-msgid "Full Name:"
+#: src/Content/ContactSelector.php:63
+msgid "Monthly"
 msgstr ""
 
-#: src/Model/Profile.php:770
-msgid "j F, Y"
+#: src/Content/ContactSelector.php:117
+msgid "DFRN"
 msgstr ""
 
-#: src/Model/Profile.php:771
-msgid "j F"
+#: src/Content/ContactSelector.php:118
+msgid "OStatus"
 msgstr ""
 
-#: src/Model/Profile.php:779 src/Util/Temporal.php:145
-msgid "Birthday:"
+#: src/Content/ContactSelector.php:119
+msgid "RSS/Atom"
 msgstr ""
 
-#: src/Model/Profile.php:786
-msgid "Age:"
+#: src/Content/ContactSelector.php:120 src/Module/Admin/Users.php:269
+#: src/Module/Admin/Users.php:280 src/Module/Admin/Users.php:294
+#: src/Module/Admin/Users.php:312
+msgid "Email"
 msgstr ""
 
-#: src/Model/Profile.php:799
-#, php-format
-msgid "for %1$d %2$s"
+#: src/Content/ContactSelector.php:122
+msgid "Zot!"
 msgstr ""
 
-#: src/Model/Profile.php:803 mod/profiles.php:584
-msgid "Sexual Preference:"
+#: src/Content/ContactSelector.php:123
+msgid "LinkedIn"
 msgstr ""
 
-#: src/Model/Profile.php:811 mod/profiles.php:611
-msgid "Hometown:"
+#: src/Content/ContactSelector.php:124
+msgid "XMPP/IM"
 msgstr ""
 
-#: src/Model/Profile.php:815 src/Module/Contact.php:633
-#: mod/notifications.php:252 mod/follow.php:182
-msgid "Tags:"
+#: src/Content/ContactSelector.php:125
+msgid "MySpace"
 msgstr ""
 
-#: src/Model/Profile.php:819 mod/profiles.php:612
-msgid "Political Views:"
+#: src/Content/ContactSelector.php:126
+msgid "Google+"
 msgstr ""
 
-#: src/Model/Profile.php:823
-msgid "Religion:"
+#: src/Content/ContactSelector.php:127
+msgid "pump.io"
 msgstr ""
 
-#: src/Model/Profile.php:831
-msgid "Hobbies/Interests:"
+#: src/Content/ContactSelector.php:128
+msgid "Twitter"
 msgstr ""
 
-#: src/Model/Profile.php:835 mod/profiles.php:616
-msgid "Likes:"
+#: src/Content/ContactSelector.php:129
+msgid "Discourse"
 msgstr ""
 
-#: src/Model/Profile.php:839 mod/profiles.php:617
-msgid "Dislikes:"
+#: src/Content/ContactSelector.php:130
+msgid "Diaspora Connector"
 msgstr ""
 
-#: src/Model/Profile.php:843
-msgid "Contact information and Social Networks:"
+#: src/Content/ContactSelector.php:131
+msgid "GNU Social Connector"
 msgstr ""
 
-#: src/Model/Profile.php:847
-msgid "Musical interests:"
+#: src/Content/ContactSelector.php:132
+msgid "ActivityPub"
 msgstr ""
 
-#: src/Model/Profile.php:851
-msgid "Books, literature:"
+#: src/Content/ContactSelector.php:133
+msgid "pnut"
 msgstr ""
 
-#: src/Model/Profile.php:855
-msgid "Television:"
+#: src/Content/ContactSelector.php:167
+#, php-format
+msgid "%s (via %s)"
 msgstr ""
 
-#: src/Model/Profile.php:859
-msgid "Film/dance/culture/entertainment:"
+#: src/Content/ContactSelector.php:236 src/Content/ContactSelector.php:276
+#: src/Content/ContactSelector.php:314
+msgid "No answer"
 msgstr ""
 
-#: src/Model/Profile.php:863
-msgid "Love/Romance:"
+#: src/Content/ContactSelector.php:237
+msgid "Male"
 msgstr ""
 
-#: src/Model/Profile.php:867
-msgid "Work/employment:"
+#: src/Content/ContactSelector.php:238
+msgid "Female"
 msgstr ""
 
-#: src/Model/Profile.php:871
-msgid "School/education:"
+#: src/Content/ContactSelector.php:239
+msgid "Currently Male"
 msgstr ""
 
-#: src/Model/Profile.php:876
-msgid "Forums:"
+#: src/Content/ContactSelector.php:240
+msgid "Currently Female"
 msgstr ""
 
-#: src/Model/Profile.php:885 mod/events.php:552
-msgid "Basic"
+#: src/Content/ContactSelector.php:241
+msgid "Mostly Male"
 msgstr ""
 
-#: src/Model/Profile.php:886 src/Module/Admin/Site.php:562
-#: src/Module/Contact.php:904 mod/events.php:553
-msgid "Advanced"
+#: src/Content/ContactSelector.php:242
+msgid "Mostly Female"
 msgstr ""
 
-#: src/Model/Profile.php:915 src/Module/Contact.php:866 mod/follow.php:194
-#: mod/unfollow.php:146
-msgid "Status Messages and Posts"
+#: src/Content/ContactSelector.php:243
+msgid "Transgender"
 msgstr ""
 
-#: src/Model/Profile.php:923 src/Module/Contact.php:874
-msgid "Profile Details"
+#: src/Content/ContactSelector.php:244
+msgid "Intersex"
 msgstr ""
 
-#: src/Model/Profile.php:931 mod/photos.php:110
-msgid "Photo Albums"
+#: src/Content/ContactSelector.php:245
+msgid "Transsexual"
 msgstr ""
 
-#: src/Model/Profile.php:970 mod/notes.php:34
-msgid "Personal Notes"
+#: src/Content/ContactSelector.php:246
+msgid "Hermaphrodite"
 msgstr ""
 
-#: src/Model/Profile.php:973
-msgid "Only You Can See This"
+#: src/Content/ContactSelector.php:247
+msgid "Neuter"
 msgstr ""
 
-#: src/Model/Profile.php:1177
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
+#: src/Content/ContactSelector.php:248
+msgid "Non-specific"
 msgstr ""
 
-#: src/Model/Event.php:33 src/Model/Event.php:846
-#: src/Module/Debug/Localtime.php:17
-msgid "l F d, Y \\@ g:i A"
+#: src/Content/ContactSelector.php:249 src/Module/Admin/Federation.php:33
+msgid "Other"
 msgstr ""
 
-#: src/Model/Event.php:60 src/Model/Event.php:77 src/Model/Event.php:434
-#: src/Model/Event.php:914
-msgid "Starts:"
+#: src/Content/ContactSelector.php:277
+msgid "Males"
 msgstr ""
 
-#: src/Model/Event.php:63 src/Model/Event.php:83 src/Model/Event.php:435
-#: src/Model/Event.php:918
-msgid "Finishes:"
+#: src/Content/ContactSelector.php:278
+msgid "Females"
 msgstr ""
 
-#: src/Model/Event.php:384
-msgid "all-day"
+#: src/Content/ContactSelector.php:279
+msgid "Gay"
 msgstr ""
 
-#: src/Model/Event.php:386 src/Core/L10n.php:369
-msgid "Sun"
+#: src/Content/ContactSelector.php:280
+msgid "Lesbian"
 msgstr ""
 
-#: src/Model/Event.php:387 src/Core/L10n.php:369
-msgid "Mon"
+#: src/Content/ContactSelector.php:281
+msgid "No Preference"
 msgstr ""
 
-#: src/Model/Event.php:388 src/Core/L10n.php:369
-msgid "Tue"
+#: src/Content/ContactSelector.php:282
+msgid "Bisexual"
 msgstr ""
 
-#: src/Model/Event.php:389 src/Core/L10n.php:369
-msgid "Wed"
+#: src/Content/ContactSelector.php:283
+msgid "Autosexual"
 msgstr ""
 
-#: src/Model/Event.php:390 src/Core/L10n.php:369
-msgid "Thu"
+#: src/Content/ContactSelector.php:284
+msgid "Abstinent"
 msgstr ""
 
-#: src/Model/Event.php:391 src/Core/L10n.php:369
-msgid "Fri"
+#: src/Content/ContactSelector.php:285
+msgid "Virgin"
 msgstr ""
 
-#: src/Model/Event.php:392 src/Core/L10n.php:369
-msgid "Sat"
+#: src/Content/ContactSelector.php:286
+msgid "Deviant"
 msgstr ""
 
-#: src/Model/Event.php:394 src/Core/L10n.php:349 mod/settings.php:930
-msgid "Sunday"
+#: src/Content/ContactSelector.php:287
+msgid "Fetish"
 msgstr ""
 
-#: src/Model/Event.php:395 src/Core/L10n.php:349 mod/settings.php:930
-msgid "Monday"
+#: src/Content/ContactSelector.php:288
+msgid "Oodles"
 msgstr ""
 
-#: src/Model/Event.php:396 src/Core/L10n.php:349
-msgid "Tuesday"
+#: src/Content/ContactSelector.php:289
+msgid "Nonsexual"
 msgstr ""
 
-#: src/Model/Event.php:397 src/Core/L10n.php:349
-msgid "Wednesday"
+#: src/Content/ContactSelector.php:315
+msgid "Single"
 msgstr ""
 
-#: src/Model/Event.php:398 src/Core/L10n.php:349
-msgid "Thursday"
+#: src/Content/ContactSelector.php:316
+msgid "Lonely"
 msgstr ""
 
-#: src/Model/Event.php:399 src/Core/L10n.php:349
-msgid "Friday"
+#: src/Content/ContactSelector.php:317
+msgid "In a relation"
 msgstr ""
 
-#: src/Model/Event.php:400 src/Core/L10n.php:349
-msgid "Saturday"
+#: src/Content/ContactSelector.php:318
+msgid "Has crush"
 msgstr ""
 
-#: src/Model/Event.php:402 src/Core/L10n.php:373
-msgid "Jan"
+#: src/Content/ContactSelector.php:319
+msgid "Infatuated"
 msgstr ""
 
-#: src/Model/Event.php:403 src/Core/L10n.php:373
-msgid "Feb"
+#: src/Content/ContactSelector.php:320
+msgid "Dating"
 msgstr ""
 
-#: src/Model/Event.php:404 src/Core/L10n.php:373
-msgid "Mar"
+#: src/Content/ContactSelector.php:321
+msgid "Unfaithful"
 msgstr ""
 
-#: src/Model/Event.php:405 src/Core/L10n.php:373
-msgid "Apr"
+#: src/Content/ContactSelector.php:322
+msgid "Sex Addict"
 msgstr ""
 
-#: src/Model/Event.php:406 src/Core/L10n.php:353 src/Core/L10n.php:373
-msgid "May"
+#: src/Content/ContactSelector.php:323 src/Model/User.php:804
+msgid "Friends"
 msgstr ""
 
-#: src/Model/Event.php:407 src/Core/L10n.php:373
-msgid "Jun"
+#: src/Content/ContactSelector.php:324
+msgid "Friends/Benefits"
 msgstr ""
 
-#: src/Model/Event.php:408 src/Core/L10n.php:373
-msgid "Jul"
+#: src/Content/ContactSelector.php:325
+msgid "Casual"
 msgstr ""
 
-#: src/Model/Event.php:409 src/Core/L10n.php:373
-msgid "Aug"
+#: src/Content/ContactSelector.php:326
+msgid "Engaged"
 msgstr ""
 
-#: src/Model/Event.php:410
-msgid "Sept"
+#: src/Content/ContactSelector.php:327
+msgid "Married"
 msgstr ""
 
-#: src/Model/Event.php:411 src/Core/L10n.php:373
-msgid "Oct"
+#: src/Content/ContactSelector.php:328
+msgid "Imaginarily married"
 msgstr ""
 
-#: src/Model/Event.php:412 src/Core/L10n.php:373
-msgid "Nov"
+#: src/Content/ContactSelector.php:329
+msgid "Partners"
 msgstr ""
 
-#: src/Model/Event.php:413 src/Core/L10n.php:373
-msgid "Dec"
+#: src/Content/ContactSelector.php:330
+msgid "Cohabiting"
 msgstr ""
 
-#: src/Model/Event.php:415 src/Core/L10n.php:353
-msgid "January"
+#: src/Content/ContactSelector.php:331
+msgid "Common law"
 msgstr ""
 
-#: src/Model/Event.php:416 src/Core/L10n.php:353
-msgid "February"
+#: src/Content/ContactSelector.php:332
+msgid "Happy"
 msgstr ""
 
-#: src/Model/Event.php:417 src/Core/L10n.php:353
-msgid "March"
+#: src/Content/ContactSelector.php:333
+msgid "Not looking"
 msgstr ""
 
-#: src/Model/Event.php:418 src/Core/L10n.php:353
-msgid "April"
+#: src/Content/ContactSelector.php:334
+msgid "Swinger"
 msgstr ""
 
-#: src/Model/Event.php:419 src/Core/L10n.php:353
-msgid "June"
+#: src/Content/ContactSelector.php:335
+msgid "Betrayed"
 msgstr ""
 
-#: src/Model/Event.php:420 src/Core/L10n.php:353
-msgid "July"
+#: src/Content/ContactSelector.php:336
+msgid "Separated"
 msgstr ""
 
-#: src/Model/Event.php:421 src/Core/L10n.php:353
-msgid "August"
+#: src/Content/ContactSelector.php:337
+msgid "Unstable"
 msgstr ""
 
-#: src/Model/Event.php:422 src/Core/L10n.php:353
-msgid "September"
+#: src/Content/ContactSelector.php:338
+msgid "Divorced"
 msgstr ""
 
-#: src/Model/Event.php:423 src/Core/L10n.php:353
-msgid "October"
+#: src/Content/ContactSelector.php:339
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: src/Model/Event.php:424 src/Core/L10n.php:353
-msgid "November"
+#: src/Content/ContactSelector.php:340
+msgid "Widowed"
 msgstr ""
 
-#: src/Model/Event.php:425 src/Core/L10n.php:353
-msgid "December"
+#: src/Content/ContactSelector.php:341
+msgid "Uncertain"
 msgstr ""
 
-#: src/Model/Event.php:427 mod/events.php:402 mod/cal.php:264
-msgid "today"
+#: src/Content/ContactSelector.php:342
+msgid "It's complicated"
 msgstr ""
 
-#: src/Model/Event.php:428 src/Util/Temporal.php:312 mod/events.php:403
-#: mod/cal.php:265
-msgid "month"
+#: src/Content/ContactSelector.php:343
+msgid "Don't care"
 msgstr ""
 
-#: src/Model/Event.php:429 src/Util/Temporal.php:313 mod/events.php:404
-#: mod/cal.php:266
-msgid "week"
+#: src/Content/ContactSelector.php:344
+msgid "Ask me"
 msgstr ""
 
-#: src/Model/Event.php:430 src/Util/Temporal.php:314 mod/events.php:405
-#: mod/cal.php:267
-msgid "day"
+#: src/Content/Feature.php:80
+msgid "General Features"
 msgstr ""
 
-#: src/Model/Event.php:432
-msgid "No events to display"
+#: src/Content/Feature.php:82
+msgid "Multiple Profiles"
 msgstr ""
 
-#: src/Model/Event.php:560
-msgid "l, F j"
+#: src/Content/Feature.php:82
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: src/Model/Event.php:591
-msgid "Edit event"
+#: src/Content/Feature.php:83
+msgid "Photo Location"
 msgstr ""
 
-#: src/Model/Event.php:592
-msgid "Duplicate event"
+#: src/Content/Feature.php:83
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present) "
+"prior to stripping metadata and links it to a map."
 msgstr ""
 
-#: src/Model/Event.php:593
-msgid "Delete event"
+#: src/Content/Feature.php:84
+msgid "Export Public Calendar"
 msgstr ""
 
-#: src/Model/Event.php:625 src/Model/Item.php:3656 src/Model/Item.php:3663
-msgid "link to source"
+#: src/Content/Feature.php:84
+msgid "Ability for visitors to download the public calendar"
 msgstr ""
 
-#: src/Model/Event.php:847
-msgid "D g:i A"
+#: src/Content/Feature.php:85
+msgid "Trending Tags"
 msgstr ""
 
-#: src/Model/Event.php:848
-msgid "g:i A"
+#: src/Content/Feature.php:85
+msgid ""
+"Show a community page widget with a list of the most popular tags in recent "
+"public posts."
 msgstr ""
 
-#: src/Model/Event.php:933 src/Model/Event.php:935
-msgid "Show map"
+#: src/Content/Feature.php:90
+msgid "Post Composition Features"
 msgstr ""
 
-#: src/Model/Event.php:934
-msgid "Hide map"
-msgstr ""
-
-#: src/Model/Event.php:1026
-#, php-format
-msgid "%s's birthday"
+#: src/Content/Feature.php:91
+msgid "Auto-mention Forums"
 msgstr ""
 
-#: src/Model/Event.php:1027
-#, php-format
-msgid "Happy Birthday %s"
+#: src/Content/Feature.php:91
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
 msgstr ""
 
-#: src/Model/Photo.php:553 src/Model/Photo.php:562 mod/fbrowser.php:51
-#: mod/fbrowser.php:75 mod/photos.php:179 mod/photos.php:934
-#: mod/photos.php:1047 mod/photos.php:1064 mod/photos.php:1545
-#: mod/photos.php:1560
-msgid "Contact Photos"
+#: src/Content/Feature.php:92
+msgid "Explicit Mentions"
 msgstr ""
 
-#: src/Model/User.php:356
-msgid "Login failed"
+#: src/Content/Feature.php:92
+msgid ""
+"Add explicit mentions to comment box for manual control over who gets "
+"mentioned in replies."
 msgstr ""
 
-#: src/Model/User.php:388
-msgid "Not enough information to authenticate"
+#: src/Content/Feature.php:97
+msgid "Network Sidebar"
 msgstr ""
 
-#: src/Model/User.php:414 src/Console/NewPassword.php:88 mod/cal.php:281
-msgid "User not found"
+#: src/Content/Feature.php:98 src/Content/Widget.php:497
+msgid "Archives"
 msgstr ""
 
-#: src/Model/User.php:482
-msgid "Password can't be empty"
+#: src/Content/Feature.php:98
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: src/Model/User.php:501
-msgid "Empty passwords are not allowed."
+#: src/Content/Feature.php:99
+msgid "Protocol Filter"
 msgstr ""
 
-#: src/Model/User.php:505
-msgid ""
-"The new password has been exposed in a public data dump, please choose "
-"another."
+#: src/Content/Feature.php:99
+msgid "Enable widget to display Network posts only from selected protocols"
 msgstr ""
 
-#: src/Model/User.php:511
-msgid ""
-"The password can't contain accentuated letters, white spaces or colons (:)"
+#: src/Content/Feature.php:104
+msgid "Network Tabs"
 msgstr ""
 
-#: src/Model/User.php:610
-msgid "Passwords do not match. Password unchanged."
+#: src/Content/Feature.php:105
+msgid "Network New Tab"
 msgstr ""
 
-#: src/Model/User.php:617
-msgid "An invitation is required."
+#: src/Content/Feature.php:105
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: src/Model/User.php:621
-msgid "Invitation could not be verified."
+#: src/Content/Feature.php:106
+msgid "Network Shared Links Tab"
 msgstr ""
 
-#: src/Model/User.php:629
-msgid "Invalid OpenID url"
+#: src/Content/Feature.php:106
+msgid "Enable tab to display only Network posts with links in them"
 msgstr ""
 
-#: src/Model/User.php:642 src/App/Authentication.php:209
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+#: src/Content/Feature.php:111
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: src/Model/User.php:642 src/App/Authentication.php:209
-msgid "The error message was:"
+#: src/Content/Feature.php:112
+msgid "Post Categories"
 msgstr ""
 
-#: src/Model/User.php:648
-msgid "Please enter the required information."
+#: src/Content/Feature.php:112
+msgid "Add categories to your posts"
 msgstr ""
 
-#: src/Model/User.php:662
-#, php-format
-msgid ""
-"system.username_min_length (%s) and system.username_max_length (%s) are "
-"excluding each other, swapping values."
+#: src/Content/Feature.php:117
+msgid "Advanced Profile Settings"
 msgstr ""
 
-#: src/Model/User.php:669
-#, php-format
-msgid "Username should be at least %s character."
-msgid_plural "Username should be at least %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:673
-#, php-format
-msgid "Username should be at most %s character."
-msgid_plural "Username should be at most %s characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Model/User.php:681
-msgid "That doesn't appear to be your full (First Last) name."
+#: src/Content/Feature.php:118
+msgid "List Forums"
 msgstr ""
 
-#: src/Model/User.php:686
-msgid "Your email domain is not among those allowed on this site."
+#: src/Content/Feature.php:118
+msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr ""
 
-#: src/Model/User.php:690
-msgid "Not a valid email address."
+#: src/Content/Feature.php:119
+msgid "Tag Cloud"
 msgstr ""
 
-#: src/Model/User.php:693
-msgid "The nickname was blocked from registration by the nodes admin."
+#: src/Content/Feature.php:119
+msgid "Provide a personal tag cloud on your profile page"
 msgstr ""
 
-#: src/Model/User.php:697 src/Model/User.php:705
-msgid "Cannot use that email."
+#: src/Content/Feature.php:120
+msgid "Display Membership Date"
 msgstr ""
 
-#: src/Model/User.php:712
-msgid "Your nickname can only contain a-z, 0-9 and _."
+#: src/Content/Feature.php:120
+msgid "Display membership date in profile"
 msgstr ""
 
-#: src/Model/User.php:720 src/Model/User.php:777
-msgid "Nickname is already registered. Please choose another."
+#: src/Content/Nav.php:72
+msgid "Nothing new here"
 msgstr ""
 
-#: src/Model/User.php:730
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: src/Content/Nav.php:76
+msgid "Clear notifications"
 msgstr ""
 
-#: src/Model/User.php:764 src/Model/User.php:768
-msgid "An error occurred during registration. Please try again."
+#: src/Content/Nav.php:150 src/Module/Security/Login.php:128
+msgid "Logout"
 msgstr ""
 
-#: src/Model/User.php:793
-msgid "An error occurred creating your default profile. Please try again."
+#: src/Content/Nav.php:150
+msgid "End this session"
 msgstr ""
 
-#: src/Model/User.php:800
-msgid "An error occurred creating your self contact. Please try again."
+#: src/Content/Nav.php:152 src/Module/Bookmarklet.php:26
+#: src/Module/Security/Login.php:129
+msgid "Login"
 msgstr ""
 
-#: src/Model/User.php:809
-msgid ""
-"An error occurred creating your default contact group. Please try again."
+#: src/Content/Nav.php:152
+msgid "Sign in"
 msgstr ""
 
-#: src/Model/User.php:886
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account is pending for "
-"approval by the administrator.\n"
-"\n"
-"\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%4$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\t\t"
+#: src/Content/Nav.php:162
+msgid "Personal notes"
 msgstr ""
 
-#: src/Model/User.php:907
-#, php-format
-msgid "Registration at %s"
+#: src/Content/Nav.php:162
+msgid "Your personal notes"
 msgstr ""
 
-#: src/Model/User.php:929
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t\t\t"
+#: src/Content/Nav.php:179 src/Content/Nav.php:240
+msgid "Home"
 msgstr ""
 
-#: src/Model/User.php:937
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%1$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default "
-"profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/"
-"removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %2$s."
+#: src/Content/Nav.php:179
+msgid "Home Page"
 msgstr ""
 
-#: src/Model/User.php:976 src/Module/Admin/Users.php:86
-#, php-format
-msgid "Registration details for %s"
+#: src/Content/Nav.php:183 src/Module/Register.php:136
+#: src/Module/Security/Login.php:89
+msgid "Register"
 msgstr ""
 
-#: src/Model/Mail.php:112 src/Model/Mail.php:247
-msgid "[no subject]"
+#: src/Content/Nav.php:183
+msgid "Create an account"
 msgstr ""
 
-#: src/Model/Group.php:76
-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."
+#: src/Content/Nav.php:189
+msgid "Help and documentation"
 msgstr ""
 
-#: src/Model/Group.php:425
-msgid "Default privacy group for new contacts"
+#: src/Content/Nav.php:193
+msgid "Apps"
 msgstr ""
 
-#: src/Model/Group.php:457
-msgid "Everybody"
+#: src/Content/Nav.php:193
+msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: src/Model/Group.php:476
-msgid "edit"
+#: src/Content/Nav.php:197
+msgid "Search site content"
 msgstr ""
 
-#: src/Model/Group.php:501
-msgid "add"
+#: src/Content/Nav.php:221
+msgid "Community"
 msgstr ""
 
-#: src/Model/Group.php:502 src/Module/Welcome.php:57 src/Module/Contact.php:732
-msgid "Groups"
+#: src/Content/Nav.php:221
+msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Model/Group.php:506
-msgid "Edit group"
+#: src/Content/Nav.php:228
+msgid "Directory"
 msgstr ""
 
-#: src/Model/Group.php:507 src/Module/Group.php:179
-msgid "Contacts not in any group"
+#: src/Content/Nav.php:228
+msgid "People directory"
 msgstr ""
 
-#: src/Model/Group.php:509
-msgid "Create a new group"
+#: src/Content/Nav.php:230 src/Module/BaseAdminModule.php:73
+msgid "Information"
 msgstr ""
 
-#: src/Model/Group.php:510 src/Module/Group.php:164 src/Module/Group.php:187
-#: src/Module/Group.php:264
-msgid "Group Name: "
+#: src/Content/Nav.php:230
+msgid "Information about this friendica instance"
 msgstr ""
 
-#: src/Model/Group.php:511
-msgid "Edit groups"
+#: src/Content/Nav.php:233 src/Module/Admin/Tos.php:42
+#: src/Module/BaseAdminModule.php:83 src/Module/Register.php:144
+#: src/Module/Tos.php:71
+msgid "Terms of Service"
 msgstr ""
 
-#: src/Model/FileTag.php:264
-msgid "Item filed"
+#: src/Content/Nav.php:233
+msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
-#: src/Model/Contact.php:1275 src/Model/Contact.php:1288
-msgid "UnFollow"
+#: src/Content/Nav.php:244
+msgid "Introductions"
 msgstr ""
 
-#: src/Model/Contact.php:1284
-msgid "Drop Contact"
+#: src/Content/Nav.php:244
+msgid "Friend Requests"
 msgstr ""
 
-#: src/Model/Contact.php:1294 src/Module/Admin/Users.php:284
-#: mod/notifications.php:170 mod/notifications.php:264
-msgid "Approve"
+#: src/Content/Nav.php:246
+msgid "See all notifications"
 msgstr ""
 
-#: src/Model/Contact.php:1853
-msgid "Organisation"
+#: src/Content/Nav.php:247
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: src/Model/Contact.php:1857
-msgid "News"
+#: src/Content/Nav.php:251
+msgid "Inbox"
 msgstr ""
 
-#: src/Model/Contact.php:1861
-msgid "Forum"
+#: src/Content/Nav.php:252
+msgid "Outbox"
 msgstr ""
 
-#: src/Model/Contact.php:2265 mod/dfrn_request.php:343
-msgid "Disallowed profile URL."
+#: src/Content/Nav.php:256
+msgid "Delegation"
 msgstr ""
 
-#: src/Model/Contact.php:2270 src/Module/Friendica.php:58
-#: mod/dfrn_request.php:349
-msgid "Blocked domain"
+#: src/Content/Nav.php:256
+msgid "Manage other pages"
 msgstr ""
 
-#: src/Model/Contact.php:2275
-msgid "Connect URL missing."
+#: src/Content/Nav.php:262
+msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: src/Model/Contact.php:2284
-msgid ""
-"The contact could not be added. Please check the relevant network "
-"credentials in your Settings -> Social Networks page."
+#: src/Content/Nav.php:270 src/Module/BaseAdminModule.php:112
+msgid "Admin"
 msgstr ""
 
-#: src/Model/Contact.php:2325
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: src/Content/Nav.php:270
+msgid "Site setup and configuration"
 msgstr ""
 
-#: src/Model/Contact.php:2326 src/Model/Contact.php:2339
-msgid "No compatible communication protocols or feeds were discovered."
+#: src/Content/Nav.php:273
+msgid "Navigation"
 msgstr ""
 
-#: src/Model/Contact.php:2337
-msgid "The profile address specified does not provide adequate information."
+#: src/Content/Nav.php:273
+msgid "Site map"
 msgstr ""
 
-#: src/Model/Contact.php:2342
-msgid "An author or name was not found."
+#: src/Content/OEmbed.php:252
+msgid "Embedding disabled"
 msgstr ""
 
-#: src/Model/Contact.php:2345
-msgid "No browser URL could be matched to this address."
+#: src/Content/OEmbed.php:374
+msgid "Embedded content"
 msgstr ""
 
-#: src/Model/Contact.php:2348
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
+#: src/Content/Pager.php:153
+msgid "newer"
 msgstr ""
 
-#: src/Model/Contact.php:2349
-msgid "Use mailto: in front of address to force email check."
+#: src/Content/Pager.php:158
+msgid "older"
 msgstr ""
 
-#: src/Model/Contact.php:2355
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: src/Content/Pager.php:203
+msgid "prev"
 msgstr ""
 
-#: src/Model/Contact.php:2360
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: src/Content/Pager.php:263
+msgid "last"
 msgstr ""
 
-#: src/Model/Contact.php:2421
-msgid "Unable to retrieve contact information."
+#: src/Content/Widget.php:35
+msgid "Add New Contact"
 msgstr ""
 
-#: src/Model/Contact.php:2642 mod/dfrn_request.php:563 mod/dfrn_confirm.php:538
-msgid "[Name Withheld]"
+#: src/Content/Widget.php:36
+msgid "Enter address or web location"
 msgstr ""
 
-#: src/Model/Item.php:3398
-msgid "activity"
+#: src/Content/Widget.php:37
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: src/Model/Item.php:3403
-msgid "post"
+#: src/Content/Widget.php:54
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Content/Widget.php:193 src/Module/Profile/Contacts.php:126
+#: src/Module/Contact.php:794
+msgid "Following"
+msgstr ""
+
+#: src/Content/Widget.php:194 src/Module/Profile/Contacts.php:127
+#: src/Module/Contact.php:795
+msgid "Mutual friends"
+msgstr ""
+
+#: src/Content/Widget.php:199
+msgid "Relationships"
+msgstr ""
+
+#: src/Content/Widget.php:201 src/Module/Contact.php:682
+#: src/Module/Group.php:279
+msgid "All Contacts"
+msgstr ""
+
+#: src/Content/Widget.php:244
+msgid "Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:246
+msgid "All Protocols"
+msgstr ""
+
+#: src/Content/Widget.php:283
+msgid "Saved Folders"
+msgstr ""
+
+#: src/Content/Widget.php:285 src/Content/Widget.php:324
+msgid "Everything"
+msgstr ""
+
+#: src/Content/Widget.php:322
+msgid "Categories"
 msgstr ""
 
-#: src/Model/Item.php:3526
+#: src/Content/Widget.php:399
 #, php-format
-msgid "Content warning: %s"
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Database/DBStructure.php:47
+msgid "There are no tables on MyISAM."
 msgstr ""
 
-#: src/Model/Item.php:3586 mod/videos.php:235
-msgid "View Video"
+#: src/Database/DBStructure.php:71
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
 msgstr ""
 
-#: src/Model/Item.php:3603
-msgid "bytes"
+#: src/Database/DBStructure.php:74
+msgid "Errors encountered performing database changes: "
 msgstr ""
 
-#: src/Model/Item.php:3650
-msgid "View on separate page"
+#: src/Database/DBStructure.php:263
+#, php-format
+msgid "%s: Database update"
 msgstr ""
 
-#: src/Model/Item.php:3651
-msgid "view on separate page"
+#: src/Database/DBStructure.php:524
+#, php-format
+msgid "%s: updating %s table."
 msgstr ""
 
 #: src/Model/Storage/Database.php:59
@@ -5979,7461 +5904,4884 @@ msgstr ""
 msgid "Enter a valid existing folder"
 msgstr ""
 
-#: src/Model/Notify.php:275 src/Model/Notify.php:287
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: src/Model/Notify.php:286
-#, php-format
-msgid "%s created a new post"
+#: src/Model/Contact.php:1274 src/Model/Contact.php:1287
+msgid "UnFollow"
 msgstr ""
 
-#: src/Model/Notify.php:300
-#, php-format
-msgid "%s liked %s's post"
+#: src/Model/Contact.php:1283
+msgid "Drop Contact"
 msgstr ""
 
-#: src/Model/Notify.php:313
-#, php-format
-msgid "%s disliked %s's post"
+#: src/Model/Contact.php:1852
+msgid "Organisation"
 msgstr ""
 
-#: src/Model/Notify.php:326
-#, php-format
-msgid "%s is attending %s's event"
+#: src/Model/Contact.php:1856
+msgid "News"
 msgstr ""
 
-#: src/Model/Notify.php:339
-#, php-format
-msgid "%s is not attending %s's event"
+#: src/Model/Contact.php:1860
+msgid "Forum"
 msgstr ""
 
-#: src/Model/Notify.php:352
-#, php-format
-msgid "%s may attend %s's event"
+#: src/Model/Contact.php:2275
+msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Notify.php:385
-#, php-format
-msgid "%s is now friends with %s"
+#: src/Model/Contact.php:2284
+msgid ""
+"The contact could not be added. Please check the relevant network "
+"credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Notify.php:678
-msgid "Friend Suggestion"
+#: src/Model/Contact.php:2325
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: src/Model/Notify.php:712
-msgid "Friend/Connect Request"
+#: src/Model/Contact.php:2326 src/Model/Contact.php:2339
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Notify.php:712
-msgid "New Follower"
+#: src/Model/Contact.php:2337
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1272 src/Module/Profile.php:116
-#: src/Module/Profile.php:119
-#, php-format
-msgid "%s's timeline"
+#: src/Model/Contact.php:2342
+msgid "An author or name was not found."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1276 src/Module/Profile.php:117
-#, php-format
-msgid "%s's posts"
+#: src/Model/Contact.php:2345
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1279 src/Module/Profile.php:118
-#, php-format
-msgid "%s's comments"
+#: src/Model/Contact.php:2348
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1834
-#, php-format
-msgid "%s is now following %s."
+#: src/Model/Contact.php:2349
+msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1835
-msgid "following"
+#: src/Model/Contact.php:2355
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1838
-#, php-format
-msgid "%s stopped following %s."
+#: src/Model/Contact.php:2360
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1839
-msgid "stopped following"
+#: src/Model/Contact.php:2421
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Protocol/Diaspora.php:3576
-msgid "Attachments:"
+#: src/Model/Event.php:33 src/Model/Event.php:846
+#: src/Module/Debug/Localtime.php:17
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: src/LegacyModule.php:30
-#, php-format
-msgid "Legacy module file not found: %s"
+#: src/Model/Event.php:60 src/Model/Event.php:77 src/Model/Event.php:434
+#: src/Model/Event.php:914
+msgid "Starts:"
 msgstr ""
 
-#: src/Core/L10n.php:373
-msgid "Sep"
+#: src/Model/Event.php:63 src/Model/Event.php:83 src/Model/Event.php:435
+#: src/Model/Event.php:918
+msgid "Finishes:"
 msgstr ""
 
-#: src/Core/L10n.php:392
-msgid "poke"
+#: src/Model/Event.php:384
+msgid "all-day"
 msgstr ""
 
-#: src/Core/L10n.php:392
-msgid "poked"
+#: src/Model/Event.php:410
+msgid "Sept"
 msgstr ""
 
-#: src/Core/L10n.php:393
-msgid "ping"
+#: src/Model/Event.php:432
+msgid "No events to display"
 msgstr ""
 
-#: src/Core/L10n.php:393
-msgid "pinged"
+#: src/Model/Event.php:560
+msgid "l, F j"
 msgstr ""
 
-#: src/Core/L10n.php:394
-msgid "prod"
+#: src/Model/Event.php:591
+msgid "Edit event"
 msgstr ""
 
-#: src/Core/L10n.php:394
-msgid "prodded"
+#: src/Model/Event.php:592
+msgid "Duplicate event"
 msgstr ""
 
-#: src/Core/L10n.php:395
-msgid "slap"
+#: src/Model/Event.php:593
+msgid "Delete event"
 msgstr ""
 
-#: src/Core/L10n.php:395
-msgid "slapped"
+#: src/Model/Event.php:625 src/Model/Item.php:3651 src/Model/Item.php:3658
+msgid "link to source"
 msgstr ""
 
-#: src/Core/L10n.php:396
-msgid "finger"
+#: src/Model/Event.php:847
+msgid "D g:i A"
 msgstr ""
 
-#: src/Core/L10n.php:396
-msgid "fingered"
+#: src/Model/Event.php:848
+msgid "g:i A"
 msgstr ""
 
-#: src/Core/L10n.php:397
-msgid "rebuff"
+#: src/Model/Event.php:933 src/Model/Event.php:935
+msgid "Show map"
 msgstr ""
 
-#: src/Core/L10n.php:397
-msgid "rebuffed"
+#: src/Model/Event.php:934
+msgid "Hide map"
 msgstr ""
 
-#: src/Core/Update.php:194
+#: src/Model/Event.php:1026
 #, php-format
-msgid "Update %s failed. See error logs."
+msgid "%s's birthday"
 msgstr ""
 
-#: src/Core/Update.php:258
+#: src/Model/Event.php:1027
 #, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
-"a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: src/Core/Update.php:264
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
+#: src/Model/FileTag.php:264
+msgid "Item filed"
 msgstr ""
 
-#: src/Core/Update.php:270 src/Core/Update.php:308
-msgid "[Friendica Notify] Database update"
+#: src/Model/Group.php:76
+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 ""
 
-#: src/Core/Update.php:300
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
+#: src/Model/Group.php:425
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: src/Core/ACL.php:276 mod/lockview.php:81 mod/lockview.php:116
-msgid "Mutuals"
+#: src/Model/Group.php:457
+msgid "Everybody"
 msgstr ""
 
-#: src/Core/ACL.php:366
-msgid "Post to Email"
+#: src/Model/Group.php:476
+msgid "edit"
 msgstr ""
 
-#: src/Core/ACL.php:385
-msgid ""
-"This content will be shown to all your followers and can be seen in the "
-"community pages and by anyone with its link."
+#: src/Model/Group.php:501
+msgid "add"
 msgstr ""
 
-#: src/Core/ACL.php:386
-msgid "Limited/Private"
+#: src/Model/Group.php:502 src/Module/Contact.php:730 src/Module/Welcome.php:57
+msgid "Groups"
 msgstr ""
 
-#: src/Core/ACL.php:387
-msgid ""
-"This content will be shown only to the people in the first box, to the "
-"exception of the people mentioned in the second box. It won't appear "
-"anywhere public."
+#: src/Model/Group.php:506
+msgid "Edit group"
 msgstr ""
 
-#: src/Core/ACL.php:388
-msgid "Show to:"
+#: src/Model/Group.php:507 src/Module/Group.php:178
+msgid "Contacts not in any group"
 msgstr ""
 
-#: src/Core/ACL.php:389
-msgid "Except to:"
+#: src/Model/Group.php:509
+msgid "Create a new group"
 msgstr ""
 
-#: src/Core/ACL.php:390 mod/editpost.php:96
-msgid "CC: email addresses"
+#: src/Model/Group.php:510 src/Module/Group.php:163 src/Module/Group.php:186
+#: src/Module/Group.php:263
+msgid "Group Name: "
 msgstr ""
 
-#: src/Core/ACL.php:391 mod/editpost.php:103
-msgid "Example: bob@example.com, mary@example.com"
+#: src/Model/Group.php:511
+msgid "Edit groups"
 msgstr ""
 
-#: src/Core/ACL.php:392
-msgid "Connectors"
+#: src/Model/Item.php:3393
+msgid "activity"
 msgstr ""
 
-#: src/Core/ACL.php:393
-msgid "Hide your profile details from unknown viewers?"
+#: src/Model/Item.php:3395 src/Object/Post.php:494
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/Item.php:3398
+msgid "post"
 msgstr ""
 
-#: src/Core/ACL.php:393
+#: src/Model/Item.php:3521
 #, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
+msgid "Content warning: %s"
 msgstr ""
 
-#: src/Core/UserImport.php:107
-msgid "Error decoding account file"
+#: src/Model/Item.php:3598
+msgid "bytes"
 msgstr ""
 
-#: src/Core/UserImport.php:113
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: src/Model/Item.php:3645
+msgid "View on separate page"
 msgstr ""
 
-#: src/Core/UserImport.php:121
+#: src/Model/Item.php:3646
+msgid "view on separate page"
+msgstr ""
+
+#: src/Model/Mail.php:112 src/Model/Mail.php:247
+msgid "[no subject]"
+msgstr ""
+
+#: src/Model/Notify.php:275 src/Model/Notify.php:287
 #, php-format
-msgid "User '%s' already exists on this server!"
+msgid "%s commented on %s's post"
 msgstr ""
 
-#: src/Core/UserImport.php:157
-msgid "User creation error"
+#: src/Model/Notify.php:286
+#, php-format
+msgid "%s created a new post"
 msgstr ""
 
-#: src/Core/UserImport.php:175
-msgid "User profile creation error"
+#: src/Model/Notify.php:300
+#, php-format
+msgid "%s liked %s's post"
 msgstr ""
 
-#: src/Core/UserImport.php:219
+#: src/Model/Notify.php:313
 #, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s disliked %s's post"
+msgstr ""
 
-#: src/Core/UserImport.php:284
-msgid "Done. You can now login with your username and password"
+#: src/Model/Notify.php:326
+#, php-format
+msgid "%s is attending %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:162
-msgid ""
-"The database configuration file \"config/local.config.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your "
-"web server root."
+#: src/Model/Notify.php:339
+#, php-format
+msgid "%s is not attending %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:181
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: src/Model/Notify.php:352
+#, php-format
+msgid "%s may attend %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:182 src/Module/Install.php:172
-#: src/Module/Install.php:326
-msgid "Please see the file \"INSTALL.txt\"."
+#: src/Model/Notify.php:385
+#, php-format
+msgid "%s is now friends with %s"
 msgstr ""
 
-#: src/Core/Installer.php:243
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: src/Model/Notify.php:678
+msgid "Friend Suggestion"
 msgstr ""
 
-#: src/Core/Installer.php:244
-msgid ""
-"If you don't have a command line version of PHP installed on your server, "
-"you will not be able to run the background processing. See <a href='https://"
-"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
-"worker'>'Setup the worker'</a>"
+#: src/Model/Notify.php:712
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: src/Core/Installer.php:249
-msgid "PHP executable path"
+#: src/Model/Notify.php:712
+msgid "New Follower"
 msgstr ""
 
-#: src/Core/Installer.php:249
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: src/Model/Profile.php:207 src/Model/Profile.php:418
+#: src/Model/Profile.php:875
+msgid "Edit profile"
 msgstr ""
 
-#: src/Core/Installer.php:254
-msgid "Command line PHP"
+#: src/Model/Profile.php:392
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: src/Core/Installer.php:263
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+#: src/Model/Profile.php:441 src/Model/Profile.php:785
+#: src/Module/Directory.php:141
+msgid "Status:"
 msgstr ""
 
-#: src/Core/Installer.php:264
-msgid "Found PHP version: "
+#: src/Model/Profile.php:442 src/Model/Profile.php:802
+#: src/Module/Directory.php:142
+msgid "Homepage:"
 msgstr ""
 
-#: src/Core/Installer.php:266
-msgid "PHP cli binary"
+#: src/Model/Profile.php:444 src/Module/Contact.php:627
+msgid "XMPP:"
 msgstr ""
 
-#: src/Core/Installer.php:279
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: src/Model/Profile.php:536 src/Module/Contact.php:317
+msgid "Unfollow"
 msgstr ""
 
-#: src/Core/Installer.php:280
-msgid "This is required for message delivery to work."
+#: src/Model/Profile.php:538
+msgid "Atom feed"
 msgstr ""
 
-#: src/Core/Installer.php:285
-msgid "PHP register_argc_argv"
+#: src/Model/Profile.php:578 src/Model/Profile.php:675
+msgid "g A l F d"
 msgstr ""
 
-#: src/Core/Installer.php:317
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: src/Model/Profile.php:579
+msgid "F d"
 msgstr ""
 
-#: src/Core/Installer.php:318
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: src/Model/Profile.php:641 src/Model/Profile.php:726
+msgid "[today]"
 msgstr ""
 
-#: src/Core/Installer.php:321
-msgid "Generate encryption keys"
+#: src/Model/Profile.php:651
+msgid "Birthday Reminders"
 msgstr ""
 
-#: src/Core/Installer.php:373
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: src/Model/Profile.php:652
+msgid "Birthdays this week:"
 msgstr ""
 
-#: src/Core/Installer.php:378
-msgid "Apache mod_rewrite module"
+#: src/Model/Profile.php:713
+msgid "[No description]"
 msgstr ""
 
-#: src/Core/Installer.php:384
-msgid "Error: PDO or MySQLi PHP module required but not installed."
+#: src/Model/Profile.php:739
+msgid "Event Reminders"
 msgstr ""
 
-#: src/Core/Installer.php:389
-msgid "Error: The MySQL driver for PDO is not installed."
+#: src/Model/Profile.php:740
+msgid "Upcoming events the next 7 days:"
 msgstr ""
 
-#: src/Core/Installer.php:393
-msgid "PDO or MySQLi PHP module"
+#: src/Model/Profile.php:757
+msgid "Member since:"
 msgstr ""
 
-#: src/Core/Installer.php:401
-msgid "Error, XML PHP module required but not installed."
+#: src/Model/Profile.php:765
+msgid "j F, Y"
 msgstr ""
 
-#: src/Core/Installer.php:405
-msgid "XML PHP module"
+#: src/Model/Profile.php:766
+msgid "j F"
 msgstr ""
 
-#: src/Core/Installer.php:408
-msgid "libCurl PHP module"
+#: src/Model/Profile.php:781
+msgid "Age:"
 msgstr ""
 
-#: src/Core/Installer.php:409
-msgid "Error: libCURL PHP module required but not installed."
+#: src/Model/Profile.php:794
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: src/Core/Installer.php:415
-msgid "GD graphics PHP module"
+#: src/Model/Profile.php:818
+msgid "Religion:"
 msgstr ""
 
-#: src/Core/Installer.php:416
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: src/Model/Profile.php:826
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: src/Core/Installer.php:422
-msgid "OpenSSL PHP module"
+#: src/Model/Profile.php:838
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: src/Core/Installer.php:423
-msgid "Error: openssl PHP module required but not installed."
+#: src/Model/Profile.php:842
+msgid "Musical interests:"
 msgstr ""
 
-#: src/Core/Installer.php:429
-msgid "mb_string PHP module"
+#: src/Model/Profile.php:846
+msgid "Books, literature:"
 msgstr ""
 
-#: src/Core/Installer.php:430
-msgid "Error: mb_string PHP module required but not installed."
+#: src/Model/Profile.php:850
+msgid "Television:"
 msgstr ""
 
-#: src/Core/Installer.php:436
-msgid "iconv PHP module"
+#: src/Model/Profile.php:854
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: src/Core/Installer.php:437
-msgid "Error: iconv PHP module required but not installed."
+#: src/Model/Profile.php:858
+msgid "Love/Romance:"
 msgstr ""
 
-#: src/Core/Installer.php:443
-msgid "POSIX PHP module"
+#: src/Model/Profile.php:862
+msgid "Work/employment:"
 msgstr ""
 
-#: src/Core/Installer.php:444
-msgid "Error: POSIX PHP module required but not installed."
+#: src/Model/Profile.php:866
+msgid "School/education:"
 msgstr ""
 
-#: src/Core/Installer.php:450
-msgid "JSON PHP module"
+#: src/Model/Profile.php:871
+msgid "Forums:"
 msgstr ""
 
-#: src/Core/Installer.php:451
-msgid "Error: JSON PHP module required but not installed."
+#: src/Model/Profile.php:918 src/Module/Contact.php:872
+msgid "Profile Details"
 msgstr ""
 
-#: src/Core/Installer.php:457
-msgid "File Information PHP module"
+#: src/Model/Profile.php:968
+msgid "Only You Can See This"
 msgstr ""
 
-#: src/Core/Installer.php:458
-msgid "Error: File Information PHP module required but not installed."
+#: src/Model/Profile.php:976 src/Model/Profile.php:979
+msgid "Tips for New Members"
 msgstr ""
 
-#: src/Core/Installer.php:481
-msgid ""
-"The web installer needs to be able to create a file called \"local.config.php"
-"\" in the \"config\" folder of your web server and it is unable to do so."
+#: src/Model/Profile.php:1172
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr ""
 
-#: src/Core/Installer.php:482
-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."
+#: src/Model/User.php:355
+msgid "Login failed"
 msgstr ""
 
-#: src/Core/Installer.php:483
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named local.config.php in your Friendica \"config\" folder."
+#: src/Model/User.php:387
+msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Core/Installer.php:484
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
+#: src/Model/User.php:481
+msgid "Password can't be empty"
 msgstr ""
 
-#: src/Core/Installer.php:487
-msgid "config/local.config.php is writable"
+#: src/Model/User.php:500
+msgid "Empty passwords are not allowed."
 msgstr ""
 
-#: src/Core/Installer.php:507
+#: src/Model/User.php:504
 msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+"The new password has been exposed in a public data dump, please choose "
+"another."
 msgstr ""
 
-#: src/Core/Installer.php:508
+#: src/Model/User.php:510
 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."
+"The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr ""
 
-#: src/Core/Installer.php:509
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: src/Model/User.php:609
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: src/Core/Installer.php:510
-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."
+#: src/Model/User.php:616
+msgid "An invitation is required."
 msgstr ""
 
-#: src/Core/Installer.php:513
-msgid "view/smarty3 is writable"
+#: src/Model/User.php:620
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Core/Installer.php:542
-msgid ""
-"Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
-"to .htaccess."
+#: src/Model/User.php:628
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Core/Installer.php:544
-msgid "Error message from Curl when fetching"
+#: src/Model/User.php:641 src/App/Authentication.php:209
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: src/Core/Installer.php:549
-msgid "Url rewrite is working"
+#: src/Model/User.php:641 src/App/Authentication.php:209
+msgid "The error message was:"
 msgstr ""
 
-#: src/Core/Installer.php:578
-msgid "ImageMagick PHP extension is not installed"
+#: src/Model/User.php:647
+msgid "Please enter the required information."
 msgstr ""
 
-#: src/Core/Installer.php:580
-msgid "ImageMagick PHP extension is installed"
+#: src/Model/User.php:661
+#, php-format
+msgid ""
+"system.username_min_length (%s) and system.username_max_length (%s) are "
+"excluding each other, swapping values."
 msgstr ""
 
-#: src/Core/Installer.php:582 tests/src/Core/InstallerTest.php:367
-#: tests/src/Core/InstallerTest.php:390
-msgid "ImageMagick supports GIF"
-msgstr ""
+#: src/Model/User.php:668
+#, php-format
+msgid "Username should be at least %s character."
+msgid_plural "Username should be at least %s characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Core/Installer.php:604
-msgid "Database already in use."
+#: src/Model/User.php:672
+#, php-format
+msgid "Username should be at most %s character."
+msgid_plural "Username should be at most %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/User.php:680
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Core/Installer.php:609
-msgid "Could not connect to database."
+#: src/Model/User.php:685
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Module/Directory.php:82
-msgid "Site Directory"
+#: src/Model/User.php:689
+msgid "Not a valid email address."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:30
-msgid "Bad Request"
+#: src/Model/User.php:692
+msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:31
-msgid "Unauthorized"
+#: src/Model/User.php:696 src/Model/User.php:704
+msgid "Cannot use that email."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:32
-msgid "Forbidden"
+#: src/Model/User.php:711
+msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:33
-msgid "Not Found"
+#: src/Model/User.php:719 src/Model/User.php:776
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:34
-msgid "Internal Server Error"
+#: src/Model/User.php:729
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:35
-msgid "Service Unavailable"
+#: src/Model/User.php:763 src/Model/User.php:767
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:42
-msgid ""
-"The server cannot or will not process the request due to an apparent client "
-"error."
+#: src/Model/User.php:792
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:43
-msgid "Authentication is required and has failed or has not yet been provided."
+#: src/Model/User.php:799
+msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:44
+#: src/Model/User.php:808
 msgid ""
-"The request was valid, but the server is refusing action. The user might not "
-"have the necessary permissions for a resource, or may need an account."
+"An error occurred creating your default contact group. Please try again."
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:45
+#: src/Model/User.php:885
+#, php-format
 msgid ""
-"The requested resource could not be found but may be available in the future."
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account is pending for "
+"approval by the administrator.\n"
+"\n"
+"\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%4$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\t\t"
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:46
-msgid ""
-"An unexpected condition was encountered and no more specific message is "
-"suitable."
+#: src/Model/User.php:906
+#, php-format
+msgid "Registration at %s"
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:47
+#: src/Model/User.php:928
+#, php-format
 msgid ""
-"The server is currently unavailable (because it is overloaded or down for "
-"maintenance). Please try again later."
+"\n"
+"\t\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t\t\t"
 msgstr ""
 
-#: src/Module/Special/HTTPException.php:53
-msgid "Go back"
+#: src/Model/User.php:936
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%1$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default "
+"profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/"
+"removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: src/Module/Help.php:43
-msgid "Help:"
+#: src/Model/User.php:975 src/Module/Admin/Users.php:85
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: src/Module/Delegation.php:127
-msgid "Manage Identities and/or Pages"
+#: src/Protocol/Diaspora.php:3575
+msgid "Attachments:"
 msgstr ""
 
-#: src/Module/Delegation.php:128
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
+#: src/Protocol/OStatus.php:1271 src/Module/Profile.php:115
+#: src/Module/Profile.php:118
+#, php-format
+msgid "%s's timeline"
 msgstr ""
 
-#: src/Module/Delegation.php:129
-msgid "Select an identity to manage: "
+#: src/Protocol/OStatus.php:1275 src/Module/Profile.php:116
+#, php-format
+msgid "%s's posts"
 msgstr ""
 
-#: src/Module/Tos.php:34 src/Module/Tos.php:76
-msgid ""
-"At the time of registration, and for providing communications between the "
-"user account and their contacts, the user has to provide a display name (pen "
-"name), an username (nickname) and a working email address. The names will be "
-"accessible on the profile page of the account by any visitor of the page, "
-"even if other profile details are not displayed. The email address will only "
-"be used to send the user notifications about interactions, but wont be "
-"visibly displayed. The listing of an account in the node's user directory or "
-"the global user directory is optional and can be controlled in the user "
-"settings, it is not necessary for communication."
+#: src/Protocol/OStatus.php:1278 src/Module/Profile.php:117
+#, php-format
+msgid "%s's comments"
 msgstr ""
 
-#: src/Module/Tos.php:35 src/Module/Tos.php:77
-msgid ""
-"This data is required for communication and is passed on to the nodes of the "
-"communication partners and is stored there. Users can enter additional "
-"private data that may be transmitted to the communication partners accounts."
+#: src/Protocol/OStatus.php:1833
+#, php-format
+msgid "%s is now following %s."
 msgstr ""
 
-#: src/Module/Tos.php:36 src/Module/Tos.php:78
-#, php-format
-msgid ""
-"At any point in time a logged in user can export their account data from the "
-"<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a href=\"%1$s/removeme\">%1$s/"
-"removeme</a>. The deletion of the account will be permanent. Deletion of the "
-"data will also be requested from the nodes of the communication partners."
+#: src/Protocol/OStatus.php:1834
+msgid "following"
 msgstr ""
 
-#: src/Module/Tos.php:39 src/Module/Tos.php:75
-msgid "Privacy Statement"
+#: src/Protocol/OStatus.php:1837
+#, php-format
+msgid "%s stopped following %s."
 msgstr ""
 
-#: src/Module/Install.php:158
-msgid "Friendica Communications Server - Setup"
+#: src/Protocol/OStatus.php:1838
+msgid "stopped following"
 msgstr ""
 
-#: src/Module/Install.php:169
-msgid "System check"
+#: src/Worker/Delivery.php:538
+msgid "(no subject)"
 msgstr ""
 
-#: src/Module/Install.php:173 mod/events.php:397 mod/cal.php:261
-msgid "Next"
+#: src/Module/Admin/Addons/Details.php:51
+msgid "Addon not found."
 msgstr ""
 
-#: src/Module/Install.php:174
-msgid "Check again"
+#: src/Module/Admin/Addons/Details.php:62 src/Module/Admin/Addons/Index.php:30
+#, php-format
+msgid "Addon %s disabled."
 msgstr ""
 
-#: src/Module/Install.php:181 src/Module/Admin/Site.php:507
-msgid "No SSL policy, links will track page SSL state"
+#: src/Module/Admin/Addons/Details.php:65 src/Module/Admin/Addons/Index.php:32
+#, php-format
+msgid "Addon %s enabled."
 msgstr ""
 
-#: src/Module/Install.php:182 src/Module/Admin/Site.php:508
-msgid "Force all links to use SSL"
+#: src/Module/Admin/Addons/Details.php:76
+#: src/Module/Admin/Themes/Details.php:60
+msgid "Disable"
 msgstr ""
 
-#: src/Module/Install.php:183 src/Module/Admin/Site.php:509
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+#: src/Module/Admin/Addons/Details.php:79
+#: src/Module/Admin/Themes/Details.php:63
+msgid "Enable"
 msgstr ""
 
-#: src/Module/Install.php:189
-msgid "Base settings"
+#: src/Module/Admin/Addons/Details.php:99 src/Module/Admin/Addons/Index.php:48
+#: src/Module/Admin/Blocklist/Contact.php:59
+#: src/Module/Admin/Blocklist/Server.php:70 src/Module/Admin/Item/Delete.php:46
+#: src/Module/Admin/Logs/Settings.php:60 src/Module/Admin/Logs/View.php:45
+#: src/Module/Admin/Themes/Details.php:104 src/Module/Admin/Themes/Index.php:92
+#: src/Module/Admin/Federation.php:121 src/Module/Admin/Queue.php:56
+#: src/Module/Admin/Site.php:554 src/Module/Admin/Summary.php:190
+#: src/Module/Admin/Tos.php:41 src/Module/Admin/Users.php:274
+msgid "Administration"
 msgstr ""
 
-#: src/Module/Install.php:191 src/Module/Admin/Site.php:581
-msgid "SSL link policy"
+#: src/Module/Admin/Addons/Details.php:101
+#: src/Module/Admin/Themes/Details.php:106
+msgid "Toggle"
 msgstr ""
 
-#: src/Module/Install.php:193 src/Module/Admin/Site.php:581
-msgid "Determines whether generated links should be forced to use SSL"
+#: src/Module/Admin/Addons/Details.php:109
+#: src/Module/Admin/Themes/Details.php:115
+msgid "Author: "
 msgstr ""
 
-#: src/Module/Install.php:196
-msgid "Host name"
+#: src/Module/Admin/Addons/Details.php:110
+#: src/Module/Admin/Themes/Details.php:116
+msgid "Maintainer: "
 msgstr ""
 
-#: src/Module/Install.php:198
-msgid ""
-"Overwrite this field in case the determinated hostname isn't right, "
-"otherweise leave it as is."
+#: src/Module/Admin/Addons/Index.php:34
+#, php-format
+msgid "Addon %s failed to install."
 msgstr ""
 
-#: src/Module/Install.php:201
-msgid "Base path to installation"
+#: src/Module/Admin/Addons/Index.php:51
+msgid "Reload active addons"
 msgstr ""
 
-#: src/Module/Install.php:203
+#: src/Module/Admin/Addons/Index.php:56
+#, php-format
 msgid ""
-"If the system cannot detect the correct path to your installation, enter the "
-"correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
+"There are currently no addons available on your node. You can find the "
+"official addon repository at %1$s and might find other interesting addons in "
+"the open addon registry at %2$s"
 msgstr ""
 
-#: src/Module/Install.php:206
-msgid "Sub path of the URL"
+#: src/Module/Admin/Blocklist/Contact.php:28
+#: src/Console/GlobalCommunityBlock.php:87
+msgid "The contact has been blocked from the node"
 msgstr ""
 
-#: src/Module/Install.php:208
-msgid ""
-"Overwrite this field in case the sub path determination isn't right, "
-"otherwise leave it as is. Leaving this field blank means the installation is "
-"at the base URL without sub path."
+#: src/Module/Admin/Blocklist/Contact.php:30
+#: src/Console/GlobalCommunityBlock.php:82
+#, php-format
+msgid "Could not find any contact entry for this URL (%s)"
 msgstr ""
 
-#: src/Module/Install.php:219
-msgid "Database connection"
-msgstr ""
+#: src/Module/Admin/Blocklist/Contact.php:38
+#, php-format
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Module/Install.php:220
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
+#: src/Module/Admin/Blocklist/Contact.php:60
+msgid "Remote Contact Blocklist"
 msgstr ""
 
-#: src/Module/Install.php:221
+#: src/Module/Admin/Blocklist/Contact.php:61
 msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+"This page allows you to prevent any message from a remote contact to reach "
+"your node."
 msgstr ""
 
-#: src/Module/Install.php:222
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: src/Module/Admin/Blocklist/Contact.php:62
+msgid "Block Remote Contact"
 msgstr ""
 
-#: src/Module/Install.php:229
-msgid "Database Server Name"
+#: src/Module/Admin/Blocklist/Contact.php:63 src/Module/Admin/Users.php:277
+msgid "select all"
 msgstr ""
 
-#: src/Module/Install.php:234
-msgid "Database Login Name"
+#: src/Module/Admin/Blocklist/Contact.php:64
+msgid "select none"
 msgstr ""
 
-#: src/Module/Install.php:240
-msgid "Database Login Password"
+#: src/Module/Admin/Blocklist/Contact.php:66 src/Module/Admin/Users.php:288
+#: src/Module/Contact.php:603 src/Module/Contact.php:824
+#: src/Module/Contact.php:1083
+msgid "Unblock"
 msgstr ""
 
-#: src/Module/Install.php:242
-msgid "For security reasons the password must not be empty"
+#: src/Module/Admin/Blocklist/Contact.php:67
+msgid "No remote contact is blocked from this node."
 msgstr ""
 
-#: src/Module/Install.php:245
-msgid "Database Name"
+#: src/Module/Admin/Blocklist/Contact.php:69
+msgid "Blocked Remote Contacts"
 msgstr ""
 
-#: src/Module/Install.php:249 src/Module/Install.php:278
-msgid "Please select a default timezone for your website"
+#: src/Module/Admin/Blocklist/Contact.php:70
+msgid "Block New Remote Contact"
 msgstr ""
 
-#: src/Module/Install.php:263
-msgid "Site settings"
+#: src/Module/Admin/Blocklist/Contact.php:71
+msgid "Photo"
 msgstr ""
 
-#: src/Module/Install.php:273
-msgid "Site administrator email address"
+#: src/Module/Admin/Blocklist/Contact.php:71
+msgid "Reason"
 msgstr ""
 
-#: src/Module/Install.php:275
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: src/Module/Admin/Blocklist/Contact.php:79
+#, php-format
+msgid "%s total blocked contact"
+msgid_plural "%s total blocked contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Module/Admin/Blocklist/Contact.php:81
+msgid "URL of the remote contact to block."
 msgstr ""
 
-#: src/Module/Install.php:282
-msgid "System Language:"
+#: src/Module/Admin/Blocklist/Contact.php:82
+msgid "Block Reason"
 msgstr ""
 
-#: src/Module/Install.php:284
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
+#: src/Module/Admin/Blocklist/Server.php:30
+msgid "Server domain pattern added to blocklist."
 msgstr ""
 
-#: src/Module/Install.php:296
-msgid "Your Friendica site database has been installed."
+#: src/Module/Admin/Blocklist/Server.php:46
+msgid "Site blocklist updated."
 msgstr ""
 
-#: src/Module/Install.php:304
-msgid "Installation finished"
+#: src/Module/Admin/Blocklist/Server.php:61
+#: src/Module/Admin/Blocklist/Server.php:86
+msgid "Blocked server domain pattern"
 msgstr ""
 
-#: src/Module/Install.php:324
-msgid "<h1>What next</h1>"
+#: src/Module/Admin/Blocklist/Server.php:62
+#: src/Module/Admin/Blocklist/Server.php:87 src/Module/Friendica.php:59
+msgid "Reason for the block"
 msgstr ""
 
-#: src/Module/Install.php:325
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the worker."
+#: src/Module/Admin/Blocklist/Server.php:63
+msgid "Delete server domain pattern"
 msgstr ""
 
-#: src/Module/Install.php:328
-#, php-format
-msgid ""
-"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
-"and register as new user. Remember to use the same email you have entered as "
-"administrator email. This will allow you to enter the site admin panel."
+#: src/Module/Admin/Blocklist/Server.php:63
+msgid "Check to delete this entry from the blocklist"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:54 mod/api.php:95
-msgid "Please login to continue."
+#: src/Module/Admin/Blocklist/Server.php:71
+msgid "Server Domain Pattern Blocklist"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:60
+#: src/Module/Admin/Blocklist/Server.php:72
 msgid ""
-"Submanaged account can't access the administation pages. Please log back in "
-"as the master account."
+"This page can be used to define a blacklist of server domain patterns from "
+"the federated network that are not allowed to interact with your node. For "
+"each domain pattern you should also provide the reason why you block it."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:74
-msgid "Overview"
+#: src/Module/Admin/Blocklist/Server.php:73
+msgid ""
+"The list of blocked server domain patterns will be made publically available "
+"on the <a href=\"/friendica\">/friendica</a> page so that your users and "
+"people investigating communication problems can find the reason easily."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:75 src/Module/Admin/Federation.php:123
-msgid "Federation Statistics"
+#: src/Module/Admin/Blocklist/Server.php:74
+msgid ""
+"<p>The server domain pattern syntax is case-insensitive shell wildcard, "
+"comprising the following special characters:</p>\n"
+"<ul>\n"
+"\t<li><code>*</code>: Any number of characters</li>\n"
+"\t<li><code>?</code>: Any single character</li>\n"
+"\t<li><code>[&lt;char1&gt;&lt;char2&gt;...]</code>: char1 or char2</li>\n"
+"</ul>"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:77
-msgid "Configuration"
+#: src/Module/Admin/Blocklist/Server.php:80
+msgid "Add new entry to block list"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:78 src/Module/Admin/Site.php:556
-msgid "Site"
+#: src/Module/Admin/Blocklist/Server.php:81
+msgid "Server Domain Pattern"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:79 src/Module/Admin/Users.php:276
-#: src/Module/Admin/Users.php:293 src/Module/Admin/Site.php:464
-msgid "Users"
+#: src/Module/Admin/Blocklist/Server.php:81
+msgid ""
+"The domain pattern of the new server to add to the block list. Do not "
+"include the protocol."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:80 src/Module/Admin/Addons/Details.php:100
-#: src/Module/Admin/Addons/Index.php:49 src/Module/BaseSettingsModule.php:68
-#: mod/settings.php:107
-msgid "Addons"
+#: src/Module/Admin/Blocklist/Server.php:82
+msgid "Block reason"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:81 src/Module/Admin/Themes/Details.php:105
-#: src/Module/Admin/Themes/Index.php:94
-msgid "Themes"
+#: src/Module/Admin/Blocklist/Server.php:82
+msgid "The reason why you blocked this server domain pattern."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:82 src/Module/BaseSettingsModule.php:46
-#: mod/settings.php:85
-msgid "Additional features"
+#: src/Module/Admin/Blocklist/Server.php:83
+msgid "Add Entry"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:85
-msgid "Database"
+#: src/Module/Admin/Blocklist/Server.php:84
+msgid "Save changes to the blocklist"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:86
-msgid "DB updates"
+#: src/Module/Admin/Blocklist/Server.php:85
+msgid "Current Entries in the Blocklist"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:87
-msgid "Inspect Deferred Workers"
+#: src/Module/Admin/Blocklist/Server.php:88
+msgid "Delete entry from blocklist"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:88
-msgid "Inspect worker Queue"
+#: src/Module/Admin/Blocklist/Server.php:91
+msgid "Delete entry from blocklist?"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:90
-msgid "Tools"
+#: src/Module/Admin/Item/Delete.php:35
+msgid "Item marked for deletion."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:91
-msgid "Contact Blocklist"
+#: src/Module/Admin/Item/Delete.php:47 src/Module/BaseAdminModule.php:93
+msgid "Delete Item"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:92
-msgid "Server Blocklist"
+#: src/Module/Admin/Item/Delete.php:48
+msgid "Delete this Item"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:93 src/Module/Admin/Item/Delete.php:47
-msgid "Delete Item"
+#: src/Module/Admin/Item/Delete.php:49
+msgid ""
+"On this page you can delete an item from your node. If the item is a top "
+"level posting, the entire thread will be deleted."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:95 src/Module/BaseAdminModule.php:96
-#: src/Module/Admin/Logs/Settings.php:62
-msgid "Logs"
+#: src/Module/Admin/Item/Delete.php:50
+msgid ""
+"You need to know the GUID of the item. You can find it e.g. by looking at "
+"the display URL. The last part of http://example.com/display/123456 is the "
+"GUID, here 123456."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:97 src/Module/Admin/Logs/View.php:47
-msgid "View Logs"
+#: src/Module/Admin/Item/Delete.php:51
+msgid "GUID"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:99
-msgid "Diagnostics"
+#: src/Module/Admin/Item/Delete.php:51
+msgid "The GUID of the item you want to delete."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:100
-msgid "PHP Info"
+#: src/Module/Admin/Item/Source.php:47
+msgid "Item Guid"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:101
-msgid "probe address"
+#: src/Module/Admin/Logs/Settings.php:26
+#, php-format
+msgid "The logfile '%s' is not writable. No logging possible"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:102
-msgid "check webfinger"
+#: src/Module/Admin/Logs/Settings.php:35
+msgid "Log settings updated."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:103
-msgid "Item Source"
+#: src/Module/Admin/Logs/Settings.php:52
+msgid "PHP log currently enabled."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:104
-msgid "Babel"
+#: src/Module/Admin/Logs/Settings.php:54
+msgid "PHP log currently disabled."
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:113
-msgid "Addon Features"
+#: src/Module/Admin/Logs/Settings.php:61 src/Module/BaseAdminModule.php:95
+#: src/Module/BaseAdminModule.php:96
+msgid "Logs"
 msgstr ""
 
-#: src/Module/BaseAdminModule.php:114
-msgid "User registrations waiting for confirmation"
+#: src/Module/Admin/Logs/Settings.php:63
+msgid "Clear"
 msgstr ""
 
-#: src/Module/Security/Login.php:89
-msgid "Create a New Account"
+#: src/Module/Admin/Logs/Settings.php:67
+msgid "Enable Debugging"
 msgstr ""
 
-#: src/Module/Security/Login.php:114
-msgid "Your OpenID: "
+#: src/Module/Admin/Logs/Settings.php:68
+msgid "Log file"
 msgstr ""
 
-#: src/Module/Security/Login.php:117
+#: src/Module/Admin/Logs/Settings.php:68
 msgid ""
-"Please enter your username and password to add the OpenID to your existing "
-"account."
-msgstr ""
-
-#: src/Module/Security/Login.php:119
-msgid "Or login using OpenID: "
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
 msgstr ""
 
-#: src/Module/Security/Login.php:132 mod/lostpass.php:119
-msgid "Nickname or Email: "
+#: src/Module/Admin/Logs/Settings.php:69
+msgid "Log level"
 msgstr ""
 
-#: src/Module/Security/Login.php:133
-msgid "Password: "
+#: src/Module/Admin/Logs/Settings.php:71
+msgid "PHP logging"
 msgstr ""
 
-#: src/Module/Security/Login.php:134
-msgid "Remember me"
+#: src/Module/Admin/Logs/Settings.php:72
+msgid ""
+"To temporarily enable logging of PHP errors and warnings you can prepend the "
+"following to the index.php file of your installation. The filename set in "
+"the 'error_log' line is relative to the friendica top-level directory and "
+"must be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: src/Module/Security/Login.php:143
-msgid "Forgot your password?"
+#: src/Module/Admin/Logs/View.php:21
+#, php-format
+msgid ""
+"Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
+"if file %1$s exist and is readable."
 msgstr ""
 
-#: src/Module/Security/Login.php:144 mod/lostpass.php:135
-msgid "Password Reset"
+#: src/Module/Admin/Logs/View.php:25
+#, php-format
+msgid ""
+"Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file "
+"%1$s is readable."
 msgstr ""
 
-#: src/Module/Security/Login.php:146
-msgid "Website Terms of Service"
+#: src/Module/Admin/Logs/View.php:46 src/Module/BaseAdminModule.php:97
+msgid "View Logs"
 msgstr ""
 
-#: src/Module/Security/Login.php:147
-msgid "terms of service"
+#: src/Module/Admin/Themes/Details.php:32 src/Module/Admin/Themes/Embed.php:46
+msgid "Theme settings updated."
 msgstr ""
 
-#: src/Module/Security/Login.php:149
-msgid "Website Privacy Policy"
+#: src/Module/Admin/Themes/Details.php:71 src/Module/Admin/Themes/Index.php:46
+#, php-format
+msgid "Theme %s disabled."
 msgstr ""
 
-#: src/Module/Security/Login.php:150
-msgid "privacy policy"
+#: src/Module/Admin/Themes/Details.php:73 src/Module/Admin/Themes/Index.php:48
+#, php-format
+msgid "Theme %s successfully enabled."
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:42
-#: src/Module/Security/TwoFactor/Recovery.php:45
-#: src/Module/Settings/TwoFactor/Verify.php:63
-msgid "Invalid code, please retry."
+#: src/Module/Admin/Themes/Details.php:75 src/Module/Admin/Themes/Index.php:50
+#, php-format
+msgid "Theme %s failed to install."
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:61
-#: src/Module/Settings/TwoFactor/Index.php:86
-#: src/Module/BaseSettingsModule.php:31 mod/settings.php:70
-msgid "Two-factor authentication"
+#: src/Module/Admin/Themes/Details.php:97
+msgid "Screenshot"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:62
-msgid ""
-"<p>Open the two-factor authentication app on your device to get an "
-"authentication code and verify your identity.</p>"
+#: src/Module/Admin/Themes/Details.php:105 src/Module/Admin/Themes/Index.php:93
+#: src/Module/BaseAdminModule.php:81
+msgid "Themes"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:63 mod/repair_ostatus.php:34
-msgid "Error"
-msgid_plural "Errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Security/TwoFactor/Verify.php:65
-#: src/Module/Security/TwoFactor/Recovery.php:66
-#, php-format
-msgid ""
-"Don’t have your phone? <a href=\"%s\">Enter a two-factor recovery code</a>"
+#: src/Module/Admin/Themes/Embed.php:67
+msgid "Unknown theme."
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:66
-#: src/Module/Settings/TwoFactor/Verify.php:122
-msgid "Please enter a code from your authentication app"
+#: src/Module/Admin/Themes/Index.php:95
+msgid "Reload active themes"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Verify.php:67
-msgid "Verify code and complete login"
+#: src/Module/Admin/Themes/Index.php:100
+#, php-format
+msgid "No themes found on the system. They should be placed in %1$s"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Recovery.php:41
-#, php-format
-msgid "Remaining recovery codes: %d"
+#: src/Module/Admin/Themes/Index.php:101
+msgid "[Experimental]"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Recovery.php:64
-msgid "Two-factor recovery"
+#: src/Module/Admin/Themes/Index.php:102
+msgid "[Unsupported]"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Recovery.php:65
-msgid ""
-"<p>You can enter one of your one-time recovery codes in case you lost access "
-"to your mobile device.</p>"
+#: src/Module/Admin/DBSync.php:31
+msgid "Update has been marked successful"
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Recovery.php:67
-msgid "Please enter a recovery code"
+#: src/Module/Admin/DBSync.php:41
+#, php-format
+msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: src/Module/Security/TwoFactor/Recovery.php:68
-msgid "Submit recovery code and complete login"
+#: src/Module/Admin/DBSync.php:45
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: src/Module/Security/OpenID.php:35
-msgid "OpenID protocol error. No ID returned"
+#: src/Module/Admin/DBSync.php:62
+#, php-format
+msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: src/Module/Security/OpenID.php:73
-msgid ""
-"Account not found. Please login to your existing account to add the OpenID "
-"to it."
+#: src/Module/Admin/DBSync.php:64
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: src/Module/Security/OpenID.php:75
-msgid ""
-"Account not found. Please register a new account or login to your existing "
-"account to add the OpenID to it."
+#: src/Module/Admin/DBSync.php:67
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: src/Module/Security/Logout.php:39
-msgid "Logged out."
+#: src/Module/Admin/DBSync.php:70
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: src/Module/Profile.php:171 mod/cal.php:127 mod/display.php:270
-msgid "Access to this profile has been restricted."
+#: src/Module/Admin/DBSync.php:90
+msgid "No failed updates."
 msgstr ""
 
-#: src/Module/Maintenance.php:27
-msgid "System down for maintenance"
+#: src/Module/Admin/DBSync.php:91
+msgid "Check database structure"
 msgstr ""
 
-#: src/Module/Bookmarklet.php:36
-msgid "This page is missing a url parameter."
+#: src/Module/Admin/DBSync.php:96
+msgid "Failed Updates"
 msgstr ""
 
-#: src/Module/Bookmarklet.php:58
-msgid "The post was created"
+#: src/Module/Admin/DBSync.php:97
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: src/Module/Photo.php:86
-#, php-format
-msgid "Invalid photo with id %s."
+#: src/Module/Admin/DBSync.php:98
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: src/Module/Attach.php:35 src/Module/Attach.php:47
-msgid "Item was not found."
+#: src/Module/Admin/DBSync.php:99
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:31
-msgid "Server domain pattern added to blocklist."
+#: src/Module/Admin/Features.php:58
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:47
-msgid "Site blocklist updated."
+#: src/Module/Admin/Features.php:66
+msgid "Manage Additional Features"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:62
-#: src/Module/Admin/Blocklist/Server.php:87
-msgid "Blocked server domain pattern"
+#: src/Module/Admin/Federation.php:87 src/Module/Admin/Federation.php:249
+msgid "unknown"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:63
-#: src/Module/Admin/Blocklist/Server.php:88 src/Module/Friendica.php:59
-msgid "Reason for the block"
+#: src/Module/Admin/Federation.php:115
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:64
-msgid "Delete server domain pattern"
+#: src/Module/Admin/Federation.php:116
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:64
-msgid "Check to delete this entry from the blocklist"
+#: src/Module/Admin/Federation.php:122 src/Module/BaseAdminModule.php:75
+msgid "Federation Statistics"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:71
-#: src/Module/Admin/Blocklist/Contact.php:59 src/Module/Admin/Tos.php:42
-#: src/Module/Admin/Addons/Details.php:99 src/Module/Admin/Addons/Index.php:48
-#: src/Module/Admin/Themes/Details.php:104 src/Module/Admin/Themes/Index.php:93
-#: src/Module/Admin/Users.php:275 src/Module/Admin/Site.php:555
-#: src/Module/Admin/Federation.php:122 src/Module/Admin/Queue.php:56
-#: src/Module/Admin/Item/Delete.php:46 src/Module/Admin/Logs/Settings.php:61
-#: src/Module/Admin/Logs/View.php:46 src/Module/Admin/Summary.php:190
-msgid "Administration"
+#: src/Module/Admin/Federation.php:128
+#, php-format
+msgid ""
+"Currently this node is aware of %d nodes with %d registered users from the "
+"following platforms:"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:72
-msgid "Server Domain Pattern Blocklist"
+#: src/Module/Admin/Queue.php:34
+msgid "Inspect Deferred Worker Queue"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:73
+#: src/Module/Admin/Queue.php:35
 msgid ""
-"This page can be used to define a blacklist of server domain patterns from "
-"the federated network that are not allowed to interact with your node. For "
-"each domain pattern you should also provide the reason why you block it."
+"This page lists the deferred worker jobs. This are jobs that couldn't be "
+"executed at the first time."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:74
-msgid ""
-"The list of blocked server domain patterns will be made publically available "
-"on the <a href=\"/friendica\">/friendica</a> page so that your users and "
-"people investigating communication problems can find the reason easily."
+#: src/Module/Admin/Queue.php:38
+msgid "Inspect Worker Queue"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:75
+#: src/Module/Admin/Queue.php:39
 msgid ""
-"<p>The server domain pattern syntax is case-insensitive shell wildcard, "
-"comprising the following special characters:</p>\n"
-"<ul>\n"
-"\t<li><code>*</code>: Any number of characters</li>\n"
-"\t<li><code>?</code>: Any single character</li>\n"
-"\t<li><code>[&lt;char1&gt;&lt;char2&gt;...]</code>: char1 or char2</li>\n"
-"</ul>"
+"This page lists the currently queued worker jobs. These jobs are handled by "
+"the worker cronjob you've set up during install."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:81
-msgid "Add new entry to block list"
+#: src/Module/Admin/Queue.php:59
+msgid "ID"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:82
-msgid "Server Domain Pattern"
+#: src/Module/Admin/Queue.php:60
+msgid "Job Parameters"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:82
-msgid ""
-"The domain pattern of the new server to add to the block list. Do not "
-"include the protocol."
+#: src/Module/Admin/Queue.php:61
+msgid "Created"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:83
-msgid "Block reason"
+#: src/Module/Admin/Queue.php:62
+msgid "Priority"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:83
-msgid "The reason why you blocked this server domain pattern."
+#: src/Module/Admin/Site.php:48
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:84
-msgid "Add Entry"
+#: src/Module/Admin/Site.php:229
+msgid "Invalid storage backend setting value."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:85
-msgid "Save changes to the blocklist"
+#: src/Module/Admin/Site.php:404
+msgid "Site settings updated."
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:86
-msgid "Current Entries in the Blocklist"
+#: src/Module/Admin/Site.php:454
+msgid "No community page for local users"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:89
-msgid "Delete entry from blocklist"
+#: src/Module/Admin/Site.php:455
+msgid "No community page"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Server.php:92
-msgid "Delete entry from blocklist?"
+#: src/Module/Admin/Site.php:456
+msgid "Public postings from users of this site"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:28
-#: src/Console/GlobalCommunityBlock.php:87
-msgid "The contact has been blocked from the node"
+#: src/Module/Admin/Site.php:457
+msgid "Public postings from the federated network"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:30
-#: src/Console/GlobalCommunityBlock.php:82
-#, php-format
-msgid "Could not find any contact entry for this URL (%s)"
+#: src/Module/Admin/Site.php:458
+msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:38
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Module/Admin/Site.php:462 src/Module/Admin/Site.php:653
+#: src/Module/Admin/Site.php:663 src/Module/Settings/TwoFactor/Index.php:94
+#: src/Module/Contact.php:543
+msgid "Disabled"
+msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:60
-msgid "Remote Contact Blocklist"
+#: src/Module/Admin/Site.php:463 src/Module/Admin/Users.php:275
+#: src/Module/Admin/Users.php:292 src/Module/BaseAdminModule.php:79
+msgid "Users"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:61
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
+#: src/Module/Admin/Site.php:464
+msgid "Users, Global Contacts"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:62
-msgid "Block Remote Contact"
+#: src/Module/Admin/Site.php:465
+msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:63 src/Module/Admin/Users.php:278
-msgid "select all"
+#: src/Module/Admin/Site.php:469
+msgid "One month"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:64
-msgid "select none"
-msgstr ""
-
-#: src/Module/Admin/Blocklist/Contact.php:66 src/Module/Admin/Users.php:289
-#: src/Module/Contact.php:605 src/Module/Contact.php:826
-#: src/Module/Contact.php:1085
-msgid "Unblock"
-msgstr ""
-
-#: src/Module/Admin/Blocklist/Contact.php:67
-msgid "No remote contact is blocked from this node."
+#: src/Module/Admin/Site.php:470
+msgid "Three months"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:69
-msgid "Blocked Remote Contacts"
+#: src/Module/Admin/Site.php:471
+msgid "Half a year"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:70
-msgid "Block New Remote Contact"
+#: src/Module/Admin/Site.php:472
+msgid "One year"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:71
-msgid "Photo"
+#: src/Module/Admin/Site.php:478
+msgid "Multi user instance"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:71 src/Module/Admin/Users.php:270
-#: src/Module/Admin/Users.php:281 src/Module/Admin/Users.php:295
-#: src/Module/Admin/Users.php:311 mod/crepair.php:159 mod/settings.php:666
-#: mod/settings.php:692
-msgid "Name"
+#: src/Module/Admin/Site.php:500
+msgid "Closed"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:71
-msgid "Reason"
+#: src/Module/Admin/Site.php:501
+msgid "Requires approval"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:79
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Admin/Blocklist/Contact.php:81 src/Module/Contact.php:623
-#: mod/notifications.php:166 mod/notifications.php:258 mod/follow.php:178
-#: mod/unfollow.php:136
-msgid "Profile URL"
+#: src/Module/Admin/Site.php:502
+msgid "Open"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:81
-msgid "URL of the remote contact to block."
+#: src/Module/Admin/Site.php:506 src/Module/Install.php:181
+msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: src/Module/Admin/Blocklist/Contact.php:82
-msgid "Block Reason"
+#: src/Module/Admin/Site.php:507 src/Module/Install.php:182
+msgid "Force all links to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:30
-msgid "The Terms of Service settings have been updated."
+#: src/Module/Admin/Site.php:508 src/Module/Install.php:183
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:44
-msgid "Display Terms of Service"
+#: src/Module/Admin/Site.php:512
+msgid "Don't check"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:44
-msgid ""
-"Enable the Terms of Service page. If this is enabled a link to the terms "
-"will be added to the registration form and the general information page."
+#: src/Module/Admin/Site.php:513
+msgid "check the stable version"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:45
-msgid "Display Privacy Statement"
+#: src/Module/Admin/Site.php:514
+msgid "check the development version"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:45
-#, php-format
-msgid ""
-"Show some informations regarding the needed information to operate the node "
-"according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
+#: src/Module/Admin/Site.php:531
+msgid "Database (legacy)"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:46
-msgid "Privacy Statement Preview"
+#: src/Module/Admin/Site.php:555 src/Module/BaseAdminModule.php:78
+msgid "Site"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:48
-msgid "The Terms of Service"
+#: src/Module/Admin/Site.php:557
+msgid "Republish users to directory"
 msgstr ""
 
-#: src/Module/Admin/Tos.php:48
-msgid ""
-"Enter the Terms of Service for your node here. You can use BBCode. Headers "
-"of sections should be [h2] and below."
+#: src/Module/Admin/Site.php:558 src/Module/Register.php:120
+msgid "Registration"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:51
-msgid "Addon not found."
+#: src/Module/Admin/Site.php:559
+msgid "File upload"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:62 src/Module/Admin/Addons/Index.php:30
-#, php-format
-msgid "Addon %s disabled."
+#: src/Module/Admin/Site.php:560
+msgid "Policies"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:65 src/Module/Admin/Addons/Index.php:32
-#, php-format
-msgid "Addon %s enabled."
+#: src/Module/Admin/Site.php:562
+msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:76
-#: src/Module/Admin/Themes/Details.php:60
-msgid "Disable"
+#: src/Module/Admin/Site.php:563
+msgid "Performance"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:79
-#: src/Module/Admin/Themes/Details.php:63
-msgid "Enable"
+#: src/Module/Admin/Site.php:564
+msgid "Worker"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:101
-#: src/Module/Admin/Themes/Details.php:106
-msgid "Toggle"
+#: src/Module/Admin/Site.php:565
+msgid "Message Relay"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:109
-#: src/Module/Admin/Themes/Details.php:115
-msgid "Author: "
+#: src/Module/Admin/Site.php:566
+msgid "Relocate Instance"
 msgstr ""
 
-#: src/Module/Admin/Addons/Details.php:110
-#: src/Module/Admin/Themes/Details.php:116
-msgid "Maintainer: "
+#: src/Module/Admin/Site.php:567
+msgid "Warning! Advanced function. Could make this server unreachable."
 msgstr ""
 
-#: src/Module/Admin/Addons/Index.php:34
-#, php-format
-msgid "Addon %s failed to install."
+#: src/Module/Admin/Site.php:571
+msgid "Site name"
 msgstr ""
 
-#: src/Module/Admin/Addons/Index.php:51
-msgid "Reload active addons"
+#: src/Module/Admin/Site.php:572
+msgid "Sender Email"
 msgstr ""
 
-#: src/Module/Admin/Addons/Index.php:56
-#, php-format
+#: src/Module/Admin/Site.php:572
 msgid ""
-"There are currently no addons available on your node. You can find the "
-"official addon repository at %1$s and might find other interesting addons in "
-"the open addon registry at %2$s"
-msgstr ""
-
-#: src/Module/Admin/Themes/Embed.php:46 src/Module/Admin/Themes/Details.php:32
-msgid "Theme settings updated."
+"The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: src/Module/Admin/Themes/Embed.php:67
-msgid "Unknown theme."
+#: src/Module/Admin/Site.php:573
+msgid "Banner/Logo"
 msgstr ""
 
-#: src/Module/Admin/Themes/Details.php:71 src/Module/Admin/Themes/Index.php:47
-#, php-format
-msgid "Theme %s disabled."
+#: src/Module/Admin/Site.php:574
+msgid "Shortcut icon"
 msgstr ""
 
-#: src/Module/Admin/Themes/Details.php:73 src/Module/Admin/Themes/Index.php:49
-#, php-format
-msgid "Theme %s successfully enabled."
+#: src/Module/Admin/Site.php:574
+msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: src/Module/Admin/Themes/Details.php:75 src/Module/Admin/Themes/Index.php:51
-#, php-format
-msgid "Theme %s failed to install."
+#: src/Module/Admin/Site.php:575
+msgid "Touch icon"
 msgstr ""
 
-#: src/Module/Admin/Themes/Details.php:97
-msgid "Screenshot"
+#: src/Module/Admin/Site.php:575
+msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: src/Module/Admin/Themes/Index.php:96
-msgid "Reload active themes"
+#: src/Module/Admin/Site.php:576
+msgid "Additional Info"
 msgstr ""
 
-#: src/Module/Admin/Themes/Index.php:101
+#: src/Module/Admin/Site.php:576
 #, php-format
-msgid "No themes found on the system. They should be placed in %1$s"
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/servers."
 msgstr ""
 
-#: src/Module/Admin/Themes/Index.php:102
-msgid "[Experimental]"
+#: src/Module/Admin/Site.php:577
+msgid "System language"
 msgstr ""
 
-#: src/Module/Admin/Themes/Index.php:103
-msgid "[Unsupported]"
+#: src/Module/Admin/Site.php:578
+msgid "System theme"
 msgstr ""
 
-#: src/Module/Admin/Users.php:46
-#, php-format
+#: src/Module/Admin/Site.php:578
 msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
+"Default system theme - may be over-ridden by user profiles - <a href=\"/"
+"admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
 msgstr ""
 
-#: src/Module/Admin/Users.php:49
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default "
-"profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %1$s/"
-"removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
+#: src/Module/Admin/Site.php:579
+msgid "Mobile system theme"
 msgstr ""
 
-#: src/Module/Admin/Users.php:94
-#, php-format
-msgid "%s user blocked"
-msgid_plural "%s users blocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Admin/Users.php:100
-#, php-format
-msgid "%s user unblocked"
-msgid_plural "%s users unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Admin/Users.php:108 src/Module/Admin/Users.php:158
-msgid "You can't remove yourself"
+#: src/Module/Admin/Site.php:579
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Users.php:112
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Admin/Users.php:156
-#, php-format
-msgid "User \"%s\" deleted"
+#: src/Module/Admin/Site.php:580 src/Module/Install.php:191
+msgid "SSL link policy"
 msgstr ""
 
-#: src/Module/Admin/Users.php:165
-#, php-format
-msgid "User \"%s\" blocked"
+#: src/Module/Admin/Site.php:580 src/Module/Install.php:193
+msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Users.php:171
-#, php-format
-msgid "User \"%s\" unblocked"
+#: src/Module/Admin/Site.php:581
+msgid "Force SSL"
 msgstr ""
 
-#: src/Module/Admin/Users.php:220 mod/settings.php:1048
-msgid "Normal Account Page"
+#: src/Module/Admin/Site.php:581
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
 msgstr ""
 
-#: src/Module/Admin/Users.php:221 mod/settings.php:1052
-msgid "Soapbox Page"
+#: src/Module/Admin/Site.php:582
+msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: src/Module/Admin/Users.php:222 mod/settings.php:1056
-msgid "Public Forum"
+#: src/Module/Admin/Site.php:582
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
 msgstr ""
 
-#: src/Module/Admin/Users.php:223 mod/settings.php:1060
-msgid "Automatic Friend Page"
+#: src/Module/Admin/Site.php:583
+msgid "Single user instance"
 msgstr ""
 
-#: src/Module/Admin/Users.php:224
-msgid "Private Forum"
+#: src/Module/Admin/Site.php:583
+msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: src/Module/Admin/Users.php:227 mod/settings.php:1032
-msgid "Personal Page"
+#: src/Module/Admin/Site.php:585
+msgid "File storage backend"
 msgstr ""
 
-#: src/Module/Admin/Users.php:228 mod/settings.php:1036
-msgid "Organisation Page"
+#: src/Module/Admin/Site.php:585
+msgid ""
+"The backend used to store uploaded data. If you change the storage backend, "
+"you can manually move the existing files. If you do not do so, the files "
+"uploaded before the change will still be available at the old backend. "
+"Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> "
+"for more information about the choices and the moving procedure."
 msgstr ""
 
-#: src/Module/Admin/Users.php:229 mod/settings.php:1040
-msgid "News Page"
+#: src/Module/Admin/Site.php:587
+msgid "Maximum image size"
 msgstr ""
 
-#: src/Module/Admin/Users.php:230 mod/settings.php:1044
-msgid "Community Forum"
+#: src/Module/Admin/Site.php:587
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: src/Module/Admin/Users.php:231
-msgid "Relay"
+#: src/Module/Admin/Site.php:588
+msgid "Maximum image length"
 msgstr ""
 
-#: src/Module/Admin/Users.php:270 src/Module/Admin/Users.php:295
-msgid "Register date"
+#: src/Module/Admin/Site.php:588
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
 msgstr ""
 
-#: src/Module/Admin/Users.php:270 src/Module/Admin/Users.php:295
-msgid "Last login"
+#: src/Module/Admin/Site.php:589
+msgid "JPEG image quality"
 msgstr ""
 
-#: src/Module/Admin/Users.php:270 src/Module/Admin/Users.php:295
-msgid "Last item"
+#: src/Module/Admin/Site.php:589
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
 msgstr ""
 
-#: src/Module/Admin/Users.php:270
-msgid "Type"
+#: src/Module/Admin/Site.php:591
+msgid "Register policy"
 msgstr ""
 
-#: src/Module/Admin/Users.php:277
-msgid "Add User"
+#: src/Module/Admin/Site.php:592
+msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: src/Module/Admin/Users.php:279
-msgid "User registrations waiting for confirm"
+#: src/Module/Admin/Site.php:592
+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 ""
 
-#: src/Module/Admin/Users.php:280
-msgid "User waiting for permanent deletion"
+#: src/Module/Admin/Site.php:593
+msgid "Register text"
 msgstr ""
 
-#: src/Module/Admin/Users.php:281
-msgid "Request date"
+#: src/Module/Admin/Site.php:593
+msgid ""
+"Will be displayed prominently on the registration page. You can use BBCode "
+"here."
 msgstr ""
 
-#: src/Module/Admin/Users.php:282
-msgid "No registrations."
+#: src/Module/Admin/Site.php:594
+msgid "Forbidden Nicknames"
 msgstr ""
 
-#: src/Module/Admin/Users.php:283
-msgid "Note from the user"
+#: src/Module/Admin/Site.php:594
+msgid ""
+"Comma separated list of nicknames that are forbidden from registration. "
+"Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: src/Module/Admin/Users.php:285
-msgid "Deny"
+#: src/Module/Admin/Site.php:595
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: src/Module/Admin/Users.php:288
-msgid "User blocked"
+#: src/Module/Admin/Site.php:595
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: src/Module/Admin/Users.php:290
-msgid "Site admin"
+#: src/Module/Admin/Site.php:596
+msgid "Allowed friend domains"
 msgstr ""
 
-#: src/Module/Admin/Users.php:291
-msgid "Account expired"
+#: src/Module/Admin/Site.php:596
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: src/Module/Admin/Users.php:294
-msgid "New User"
+#: src/Module/Admin/Site.php:597
+msgid "Allowed email domains"
 msgstr ""
 
-#: src/Module/Admin/Users.php:295
-msgid "Permanent deletion"
+#: src/Module/Admin/Site.php:597
+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 ""
 
-#: src/Module/Admin/Users.php:300
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: src/Module/Admin/Site.php:598
+msgid "No OEmbed rich content"
 msgstr ""
 
-#: src/Module/Admin/Users.php:301
+#: src/Module/Admin/Site.php:598
 msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+"Don't show the rich content (e.g. embedded PDF), except from the domains "
+"listed below."
 msgstr ""
 
-#: src/Module/Admin/Users.php:311
-msgid "Name of the new user."
+#: src/Module/Admin/Site.php:599
+msgid "Allowed OEmbed domains"
 msgstr ""
 
-#: src/Module/Admin/Users.php:312
-msgid "Nickname"
+#: src/Module/Admin/Site.php:599
+msgid ""
+"Comma separated list of domains which oembed content is allowed to be "
+"displayed. Wildcards are accepted."
 msgstr ""
 
-#: src/Module/Admin/Users.php:312
-msgid "Nickname of the new user."
+#: src/Module/Admin/Site.php:600
+msgid "Block public"
 msgstr ""
 
-#: src/Module/Admin/Users.php:313
-msgid "Email address of the new user."
+#: src/Module/Admin/Site.php:600
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
 msgstr ""
 
-#: src/Module/Admin/Site.php:49
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+#: src/Module/Admin/Site.php:601
+msgid "Force publish"
 msgstr ""
 
-#: src/Module/Admin/Site.php:230
-msgid "Invalid storage backend setting value."
+#: src/Module/Admin/Site.php:601
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:405
-msgid "Site settings updated."
+#: src/Module/Admin/Site.php:601
+msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: src/Module/Admin/Site.php:426 mod/settings.php:892
-msgid "No special theme for mobile devices"
+#: src/Module/Admin/Site.php:602
+msgid "Global directory URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:443 mod/settings.php:902
-#, php-format
-msgid "%s - (Experimental)"
+#: src/Module/Admin/Site.php:602
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
 msgstr ""
 
-#: src/Module/Admin/Site.php:455
-msgid "No community page for local users"
+#: src/Module/Admin/Site.php:603
+msgid "Private posts by default for new users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:456
-msgid "No community page"
+#: src/Module/Admin/Site.php:603
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:457
-msgid "Public postings from users of this site"
+#: src/Module/Admin/Site.php:604
+msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: src/Module/Admin/Site.php:458
-msgid "Public postings from the federated network"
+#: src/Module/Admin/Site.php:604
+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 ""
 
-#: src/Module/Admin/Site.php:459
-msgid "Public postings from local users and the federated network"
+#: src/Module/Admin/Site.php:605
+msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: src/Module/Admin/Site.php:465
-msgid "Users, Global Contacts"
+#: src/Module/Admin/Site.php:605
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
 msgstr ""
 
-#: src/Module/Admin/Site.php:466
-msgid "Users, Global Contacts/fallback"
+#: src/Module/Admin/Site.php:606
+msgid "Don't embed private images in posts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:470
-msgid "One month"
+#: src/Module/Admin/Site.php:606
+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 ""
 
-#: src/Module/Admin/Site.php:471
-msgid "Three months"
+#: src/Module/Admin/Site.php:607
+msgid "Explicit Content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:472
-msgid "Half a year"
+#: src/Module/Admin/Site.php:607
+msgid ""
+"Set this to announce that your node is used mostly for explicit content that "
+"might not be suited for minors. This information will be published in the "
+"node information and might be used, e.g. by the global directory, to filter "
+"your node from listings of nodes to join. Additionally a note about this "
+"will be shown at the user registration page."
 msgstr ""
 
-#: src/Module/Admin/Site.php:473
-msgid "One year"
+#: src/Module/Admin/Site.php:608
+msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: src/Module/Admin/Site.php:479
-msgid "Multi user instance"
+#: src/Module/Admin/Site.php:608
+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 ""
 
-#: src/Module/Admin/Site.php:501
-msgid "Closed"
+#: src/Module/Admin/Site.php:609
+msgid "Block multiple registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:502
-msgid "Requires approval"
+#: src/Module/Admin/Site.php:609
+msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:503
-msgid "Open"
+#: src/Module/Admin/Site.php:610
+msgid "Disable OpenID"
 msgstr ""
 
-#: src/Module/Admin/Site.php:513
-msgid "Don't check"
+#: src/Module/Admin/Site.php:610
+msgid "Disable OpenID support for registration and logins."
 msgstr ""
 
-#: src/Module/Admin/Site.php:514
-msgid "check the stable version"
+#: src/Module/Admin/Site.php:611
+msgid "No Fullname check"
 msgstr ""
 
-#: src/Module/Admin/Site.php:515
-msgid "check the development version"
+#: src/Module/Admin/Site.php:611
+msgid ""
+"Allow users to register without a space between the first name and the last "
+"name in their full name."
 msgstr ""
 
-#: src/Module/Admin/Site.php:532
-msgid "Database (legacy)"
+#: src/Module/Admin/Site.php:612
+msgid "Community pages for visitors"
 msgstr ""
 
-#: src/Module/Admin/Site.php:558
-msgid "Republish users to directory"
+#: src/Module/Admin/Site.php:612
+msgid ""
+"Which community pages should be available for visitors. Local users always "
+"see both pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:559 src/Module/Register.php:121
-msgid "Registration"
+#: src/Module/Admin/Site.php:613
+msgid "Posts per user on community page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:560
-msgid "File upload"
+#: src/Module/Admin/Site.php:613
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"\"Global Community\")"
 msgstr ""
 
-#: src/Module/Admin/Site.php:561
-msgid "Policies"
+#: src/Module/Admin/Site.php:614
+msgid "Disable OStatus support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:563
-msgid "Auto Discovered Contact Directory"
+#: src/Module/Admin/Site.php:614
+msgid ""
+"Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
 msgstr ""
 
-#: src/Module/Admin/Site.php:564
-msgid "Performance"
+#: src/Module/Admin/Site.php:615
+msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: src/Module/Admin/Site.php:565
-msgid "Worker"
+#: src/Module/Admin/Site.php:617
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:566
-msgid "Message Relay"
+#: src/Module/Admin/Site.php:618
+msgid "Enable Diaspora support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:567
-msgid "Relocate Instance"
+#: src/Module/Admin/Site.php:618
+msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: src/Module/Admin/Site.php:568
-msgid "Warning! Advanced function. Could make this server unreachable."
+#: src/Module/Admin/Site.php:619
+msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:573
-msgid "Sender Email"
+#: src/Module/Admin/Site.php:619
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
 msgstr ""
 
-#: src/Module/Admin/Site.php:573
-msgid ""
-"The email address your server shall use to send notification emails from."
+#: src/Module/Admin/Site.php:620
+msgid "Verify SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:574
-msgid "Banner/Logo"
+#: src/Module/Admin/Site.php:620
+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 ""
 
-#: src/Module/Admin/Site.php:575
-msgid "Shortcut icon"
+#: src/Module/Admin/Site.php:621
+msgid "Proxy user"
 msgstr ""
 
-#: src/Module/Admin/Site.php:575
-msgid "Link to an icon that will be used for browsers."
+#: src/Module/Admin/Site.php:622
+msgid "Proxy URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:576
-msgid "Touch icon"
+#: src/Module/Admin/Site.php:623
+msgid "Network timeout"
 msgstr ""
 
-#: src/Module/Admin/Site.php:576
-msgid "Link to an icon that will be used for tablets and mobiles."
+#: src/Module/Admin/Site.php:623
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:577
-msgid "Additional Info"
+#: src/Module/Admin/Site.php:624
+msgid "Maximum Load Average"
 msgstr ""
 
-#: src/Module/Admin/Site.php:577
+#: src/Module/Admin/Site.php:624
 #, php-format
 msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/servers."
+"Maximum system load before delivery and poll processes are deferred - "
+"default %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:578
-msgid "System language"
+#: src/Module/Admin/Site.php:625
+msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:579
-msgid "System theme"
+#: src/Module/Admin/Site.php:625
+msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: src/Module/Admin/Site.php:579
+#: src/Module/Admin/Site.php:626
+msgid "Minimal Memory"
+msgstr ""
+
+#: src/Module/Admin/Site.php:626
 msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href=\"/"
-"admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
+"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:580
-msgid "Mobile system theme"
+#: src/Module/Admin/Site.php:627
+msgid "Maximum table size for optimization"
 msgstr ""
 
-#: src/Module/Admin/Site.php:580
-msgid "Theme for mobile devices"
+#: src/Module/Admin/Site.php:627
+msgid ""
+"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
+"disable it."
 msgstr ""
 
-#: src/Module/Admin/Site.php:582
-msgid "Force SSL"
+#: src/Module/Admin/Site.php:628
+msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: src/Module/Admin/Site.php:582
+#: src/Module/Admin/Site.php:628
 msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
 msgstr ""
 
-#: src/Module/Admin/Site.php:583
-msgid "Hide help entry from navigation menu"
+#: src/Module/Admin/Site.php:630
+msgid "Periodical check of global contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:583
+#: src/Module/Admin/Site.php:630
 msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:584
-msgid "Single user instance"
+#: src/Module/Admin/Site.php:631
+msgid "Days between requery"
 msgstr ""
 
-#: src/Module/Admin/Site.php:584
-msgid "Make this instance multi-user or single-user for the named user"
+#: src/Module/Admin/Site.php:631
+msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
-msgid "File storage backend"
+#: src/Module/Admin/Site.php:632
+msgid "Discover contacts from other servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:632
 msgid ""
-"The backend used to store uploaded data. If you change the storage backend, "
-"you can manually move the existing files. If you do not do so, the files "
-"uploaded before the change will still be available at the old backend. "
-"Please see <a href=\"/help/Settings#1_2_3_1\">the settings documentation</a> "
-"for more information about the choices and the moving procedure."
+"Periodically query other servers for contacts. You can choose between \"Users"
+"\": the users on the remote system, \"Global Contacts\": active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommended setting is \"Users, "
+"Global Contacts\"."
 msgstr ""
 
-#: src/Module/Admin/Site.php:588
-msgid "Maximum image size"
+#: src/Module/Admin/Site.php:633
+msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:633
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:589
-msgid "Maximum image length"
+#: src/Module/Admin/Site.php:634
+msgid "Search the local directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:589
+#: src/Module/Admin/Site.php:634
 msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
 msgstr ""
 
-#: src/Module/Admin/Site.php:590
-msgid "JPEG image quality"
+#: src/Module/Admin/Site.php:636
+msgid "Publish server information"
 msgstr ""
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:636
 msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: src/Module/Admin/Site.php:592
-msgid "Register policy"
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a "
+"href=\"http://the-federation.info/\">the-federation.info</a> for details."
 msgstr ""
 
-#: src/Module/Admin/Site.php:593
-msgid "Maximum Daily Registrations"
+#: src/Module/Admin/Site.php:638
+msgid "Check upstream version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:638
 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."
+"Enables checking for new Friendica versions at github. If there is a new "
+"version, you will be informed in the admin panel overview."
 msgstr ""
 
-#: src/Module/Admin/Site.php:594
-msgid "Register text"
+#: src/Module/Admin/Site.php:639
+msgid "Suppress Tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:594
-msgid ""
-"Will be displayed prominently on the registration page. You can use BBCode "
-"here."
+#: src/Module/Admin/Site.php:639
+msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
-msgid "Forbidden Nicknames"
+#: src/Module/Admin/Site.php:640
+msgid "Clean database"
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:640
 msgid ""
-"Comma separated list of nicknames that are forbidden from registration. "
-"Preset is a list of role names according RFC 2142."
+"Remove old remote items, orphaned database records and old content from some "
+"other helper tables."
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
-msgid "Accounts abandoned after x days"
+#: src/Module/Admin/Site.php:641
+msgid "Lifespan of remote items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:641
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+"When the database cleanup is enabled, this defines the days after which "
+"remote items will be deleted. Own items, and marked or filed items are "
+"always kept. 0 disables this behaviour."
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
-msgid "Allowed friend domains"
+#: src/Module/Admin/Site.php:642
+msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:642
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+"When the database cleanup is enabled, this defines the days after which "
+"unclaimed remote items (mostly content from the relay) will be deleted. "
+"Default value is 90 days. Defaults to the general lifespan value of remote "
+"items if set to 0."
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
-msgid "Allowed email domains"
+#: src/Module/Admin/Site.php:643
+msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:643
 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"
+"The conversation data is used for ActivityPub and OStatus, as well as for "
+"debug purposes. It should be safe to remove it after 14 days, default is 90 "
+"days."
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
-msgid "No OEmbed rich content"
+#: src/Module/Admin/Site.php:644
+msgid "Path to item cache"
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
-msgid ""
-"Don't show the rich content (e.g. embedded PDF), except from the domains "
-"listed below."
+#: src/Module/Admin/Site.php:644
+msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
-msgid "Allowed OEmbed domains"
+#: src/Module/Admin/Site.php:645
+msgid "Cache duration in seconds"
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:645
 msgid ""
-"Comma separated list of domains which oembed content is allowed to be "
-"displayed. Wildcards are accepted."
+"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 ""
 
-#: src/Module/Admin/Site.php:601
-msgid "Block public"
+#: src/Module/Admin/Site.php:646
+msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: src/Module/Admin/Site.php:601
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+#: src/Module/Admin/Site.php:646
+msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: src/Module/Admin/Site.php:602
-msgid "Force publish"
+#: src/Module/Admin/Site.php:647
+msgid "Temp path"
 msgstr ""
 
-#: src/Module/Admin/Site.php:602
+#: src/Module/Admin/Site.php:647
 msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: src/Module/Admin/Site.php:602
-msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr ""
-
-#: src/Module/Admin/Site.php:603
-msgid "Global directory URL"
-msgstr ""
-
-#: src/Module/Admin/Site.php:603
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr ""
-
-#: src/Module/Admin/Site.php:604
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: src/Module/Admin/Site.php:604
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: src/Module/Admin/Site.php:605
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: src/Module/Admin/Site.php:605
-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 ""
-
-#: src/Module/Admin/Site.php:606
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: src/Module/Admin/Site.php:606
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:607
-msgid "Don't embed private images in posts"
+#: src/Module/Admin/Site.php:648
+msgid "Disable picture proxy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:607
+#: src/Module/Admin/Site.php:648
 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."
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwidth."
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
-msgid "Explicit Content"
+#: src/Module/Admin/Site.php:649
+msgid "Only search in tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
-msgid ""
-"Set this to announce that your node is used mostly for explicit content that "
-"might not be suited for minors. This information will be published in the "
-"node information and might be used, e.g. by the global directory, to filter "
-"your node from listings of nodes to join. Additionally a note about this "
-"will be shown at the user registration page."
+#: src/Module/Admin/Site.php:649
+msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
-msgid "Allow Users to set remote_self"
+#: src/Module/Admin/Site.php:651
+msgid "New base url"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:651
 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 ""
-
-#: src/Module/Admin/Site.php:610
-msgid "Block multiple registrations"
+"Change base url for this server. Sends relocate message to all Friendica and "
+"Diaspora* contacts of all users."
 msgstr ""
 
-#: src/Module/Admin/Site.php:610
-msgid "Disallow users to register additional accounts for use as pages."
+#: src/Module/Admin/Site.php:653
+msgid "RINO Encryption"
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
-msgid "Disable OpenID"
+#: src/Module/Admin/Site.php:653
+msgid "Encryption layer between nodes."
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
-msgid "Disable OpenID support for registration and logins."
+#: src/Module/Admin/Site.php:653
+msgid "Enabled"
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
-msgid "No Fullname check"
+#: src/Module/Admin/Site.php:655
+msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:655
+#, php-format
 msgid ""
-"Allow users to register without a space between the first name and the last "
-"name in their full name."
+"On shared hosters set this to %d. On larger systems, values of %d are great. "
+"Default value is %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:613
-msgid "Community pages for visitors"
+#: src/Module/Admin/Site.php:656
+msgid "Don't use \"proc_open\" with the worker"
 msgstr ""
 
-#: src/Module/Admin/Site.php:613
+#: src/Module/Admin/Site.php:656
 msgid ""
-"Which community pages should be available for visitors. Local users always "
-"see both pages."
+"Enable this if your system doesn't allow the use of \"proc_open\". This can "
+"happen on shared hosters. If this is enabled you should increase the "
+"frequency of worker calls in your crontab."
 msgstr ""
 
-#: src/Module/Admin/Site.php:614
-msgid "Posts per user on community page"
+#: src/Module/Admin/Site.php:657
+msgid "Enable fastlane"
 msgstr ""
 
-#: src/Module/Admin/Site.php:614
+#: src/Module/Admin/Site.php:657
 msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"\"Global Community\")"
+"When enabed, the fastlane mechanism starts an additional worker if processes "
+"with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
-msgid "Disable OStatus support"
+#: src/Module/Admin/Site.php:658
+msgid "Enable frontend worker"
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:658
+#, php-format
 msgid ""
-"Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
+"When enabled the Worker process is triggered when backend access is "
+"performed (e.g. messages being delivered). On smaller sites you might want "
+"to call %s/worker on a regular basis via an external cron job. You should "
+"only enable this option if you cannot utilize cron/scheduled jobs on your "
+"server."
 msgstr ""
 
-#: src/Module/Admin/Site.php:616
-msgid "OStatus support can only be enabled if threading is enabled."
+#: src/Module/Admin/Site.php:660
+msgid "Subscribe to relay"
 msgstr ""
 
-#: src/Module/Admin/Site.php:618
+#: src/Module/Admin/Site.php:660
 msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
-msgstr ""
-
-#: src/Module/Admin/Site.php:619
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: src/Module/Admin/Site.php:619
-msgid "Provide built-in Diaspora network compatibility."
+"Enables the receiving of public posts from the relay. They will be included "
+"in the search, subscribed tags and on the global community page."
 msgstr ""
 
-#: src/Module/Admin/Site.php:620
-msgid "Only allow Friendica contacts"
+#: src/Module/Admin/Site.php:661
+msgid "Relay server"
 msgstr ""
 
-#: src/Module/Admin/Site.php:620
+#: src/Module/Admin/Site.php:661
 msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
+"Address of the relay server where public posts should be send to. For "
+"example https://relay.diasp.org"
 msgstr ""
 
-#: src/Module/Admin/Site.php:621
-msgid "Verify SSL"
+#: src/Module/Admin/Site.php:662
+msgid "Direct relay transfer"
 msgstr ""
 
-#: src/Module/Admin/Site.php:621
+#: src/Module/Admin/Site.php:662
 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 ""
-
-#: src/Module/Admin/Site.php:622
-msgid "Proxy user"
-msgstr ""
-
-#: src/Module/Admin/Site.php:623
-msgid "Proxy URL"
-msgstr ""
-
-#: src/Module/Admin/Site.php:624
-msgid "Network timeout"
-msgstr ""
-
-#: src/Module/Admin/Site.php:624
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+"Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:625
-msgid "Maximum Load Average"
+#: src/Module/Admin/Site.php:663
+msgid "Relay scope"
 msgstr ""
 
-#: src/Module/Admin/Site.php:625
-#, php-format
+#: src/Module/Admin/Site.php:663
 msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default %d."
-msgstr ""
-
-#: src/Module/Admin/Site.php:626
-msgid "Maximum Load Average (Frontend)"
-msgstr ""
-
-#: src/Module/Admin/Site.php:626
-msgid "Maximum system load before the frontend quits service - default 50."
+"Can be \"all\" or \"tags\". \"all\" means that every public post should be "
+"received. \"tags\" means that only posts with selected tags should be "
+"received."
 msgstr ""
 
-#: src/Module/Admin/Site.php:627
-msgid "Minimal Memory"
+#: src/Module/Admin/Site.php:663
+msgid "all"
 msgstr ""
 
-#: src/Module/Admin/Site.php:627
-msgid ""
-"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
+#: src/Module/Admin/Site.php:663
+msgid "tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:628
-msgid "Maximum table size for optimization"
+#: src/Module/Admin/Site.php:664
+msgid "Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:628
-msgid ""
-"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
-"disable it."
+#: src/Module/Admin/Site.php:664
+msgid "Comma separated list of tags for the \"tags\" subscription."
 msgstr ""
 
-#: src/Module/Admin/Site.php:629
-msgid "Minimum level of fragmentation"
+#: src/Module/Admin/Site.php:665
+msgid "Allow user tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:629
+#: src/Module/Admin/Site.php:665
 msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
+"If enabled, the tags from the saved searches will used for the \"tags\" "
+"subscription in addition to the \"relay_server_tags\"."
 msgstr ""
 
-#: src/Module/Admin/Site.php:631
-msgid "Periodical check of global contacts"
+#: src/Module/Admin/Site.php:668
+msgid "Start Relocation"
 msgstr ""
 
-#: src/Module/Admin/Site.php:631
+#: src/Module/Admin/Summary.php:31
+#, php-format
 msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr ""
-
-#: src/Module/Admin/Site.php:632
-msgid "Days between requery"
-msgstr ""
-
-#: src/Module/Admin/Site.php:632
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr ""
-
-#: src/Module/Admin/Site.php:633
-msgid "Discover contacts from other servers"
-msgstr ""
-
-#: src/Module/Admin/Site.php:633
-msgid ""
-"Periodically query other servers for contacts. You can choose between \"Users"
-"\": the users on the remote system, \"Global Contacts\": active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommended setting is \"Users, "
-"Global Contacts\"."
-msgstr ""
-
-#: src/Module/Admin/Site.php:634
-msgid "Timeframe for fetching global contacts"
-msgstr ""
-
-#: src/Module/Admin/Site.php:634
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr ""
-
-#: src/Module/Admin/Site.php:635
-msgid "Search the local directory"
-msgstr ""
-
-#: src/Module/Admin/Site.php:635
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr ""
-
-#: src/Module/Admin/Site.php:637
-msgid "Publish server information"
-msgstr ""
-
-#: src/Module/Admin/Site.php:637
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a "
-"href=\"http://the-federation.info/\">the-federation.info</a> for details."
-msgstr ""
-
-#: src/Module/Admin/Site.php:639
-msgid "Check upstream version"
-msgstr ""
-
-#: src/Module/Admin/Site.php:639
-msgid ""
-"Enables checking for new Friendica versions at github. If there is a new "
-"version, you will be informed in the admin panel overview."
-msgstr ""
-
-#: src/Module/Admin/Site.php:640
-msgid "Suppress Tags"
-msgstr ""
-
-#: src/Module/Admin/Site.php:640
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
-
-#: src/Module/Admin/Site.php:641
-msgid "Clean database"
-msgstr ""
-
-#: src/Module/Admin/Site.php:641
-msgid ""
-"Remove old remote items, orphaned database records and old content from some "
-"other helper tables."
-msgstr ""
-
-#: src/Module/Admin/Site.php:642
-msgid "Lifespan of remote items"
-msgstr ""
-
-#: src/Module/Admin/Site.php:642
-msgid ""
-"When the database cleanup is enabled, this defines the days after which "
-"remote items will be deleted. Own items, and marked or filed items are "
-"always kept. 0 disables this behaviour."
-msgstr ""
-
-#: src/Module/Admin/Site.php:643
-msgid "Lifespan of unclaimed items"
-msgstr ""
-
-#: src/Module/Admin/Site.php:643
-msgid ""
-"When the database cleanup is enabled, this defines the days after which "
-"unclaimed remote items (mostly content from the relay) will be deleted. "
-"Default value is 90 days. Defaults to the general lifespan value of remote "
-"items if set to 0."
-msgstr ""
-
-#: src/Module/Admin/Site.php:644
-msgid "Lifespan of raw conversation data"
-msgstr ""
-
-#: src/Module/Admin/Site.php:644
-msgid ""
-"The conversation data is used for ActivityPub and OStatus, as well as for "
-"debug purposes. It should be safe to remove it after 14 days, default is 90 "
-"days."
-msgstr ""
-
-#: src/Module/Admin/Site.php:645
-msgid "Path to item cache"
-msgstr ""
-
-#: src/Module/Admin/Site.php:645
-msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
-
-#: src/Module/Admin/Site.php:646
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: src/Module/Admin/Site.php:646
-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 ""
-
-#: src/Module/Admin/Site.php:647
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: src/Module/Admin/Site.php:647
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: src/Module/Admin/Site.php:648
-msgid "Temp path"
-msgstr ""
-
-#: src/Module/Admin/Site.php:648
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr ""
-
-#: src/Module/Admin/Site.php:649
-msgid "Disable picture proxy"
-msgstr ""
-
-#: src/Module/Admin/Site.php:649
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwidth."
-msgstr ""
-
-#: src/Module/Admin/Site.php:650
-msgid "Only search in tags"
-msgstr ""
-
-#: src/Module/Admin/Site.php:650
-msgid "On large systems the text search can slow down the system extremely."
-msgstr ""
-
-#: src/Module/Admin/Site.php:652
-msgid "New base url"
-msgstr ""
-
-#: src/Module/Admin/Site.php:652
-msgid ""
-"Change base url for this server. Sends relocate message to all Friendica and "
-"Diaspora* contacts of all users."
-msgstr ""
-
-#: src/Module/Admin/Site.php:654
-msgid "RINO Encryption"
-msgstr ""
-
-#: src/Module/Admin/Site.php:654
-msgid "Encryption layer between nodes."
-msgstr ""
-
-#: src/Module/Admin/Site.php:656
-msgid "Maximum number of parallel workers"
-msgstr ""
-
-#: src/Module/Admin/Site.php:656
-#, php-format
-msgid ""
-"On shared hosters set this to %d. On larger systems, values of %d are great. "
-"Default value is %d."
-msgstr ""
-
-#: src/Module/Admin/Site.php:657
-msgid "Don't use \"proc_open\" with the worker"
-msgstr ""
-
-#: src/Module/Admin/Site.php:657
-msgid ""
-"Enable this if your system doesn't allow the use of \"proc_open\". This can "
-"happen on shared hosters. If this is enabled you should increase the "
-"frequency of worker calls in your crontab."
-msgstr ""
-
-#: src/Module/Admin/Site.php:658
-msgid "Enable fastlane"
-msgstr ""
-
-#: src/Module/Admin/Site.php:658
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes "
-"with higher priority are blocked by processes of lower priority."
-msgstr ""
-
-#: src/Module/Admin/Site.php:659
-msgid "Enable frontend worker"
-msgstr ""
-
-#: src/Module/Admin/Site.php:659
-#, php-format
-msgid ""
-"When enabled the Worker process is triggered when backend access is "
-"performed (e.g. messages being delivered). On smaller sites you might want "
-"to call %s/worker on a regular basis via an external cron job. You should "
-"only enable this option if you cannot utilize cron/scheduled jobs on your "
-"server."
-msgstr ""
-
-#: src/Module/Admin/Site.php:661
-msgid "Subscribe to relay"
-msgstr ""
-
-#: src/Module/Admin/Site.php:661
-msgid ""
-"Enables the receiving of public posts from the relay. They will be included "
-"in the search, subscribed tags and on the global community page."
-msgstr ""
-
-#: src/Module/Admin/Site.php:662
-msgid "Relay server"
-msgstr ""
-
-#: src/Module/Admin/Site.php:662
-msgid ""
-"Address of the relay server where public posts should be send to. For "
-"example https://relay.diasp.org"
-msgstr ""
-
-#: src/Module/Admin/Site.php:663
-msgid "Direct relay transfer"
-msgstr ""
-
-#: src/Module/Admin/Site.php:663
-msgid ""
-"Enables the direct transfer to other servers without using the relay servers"
-msgstr ""
-
-#: src/Module/Admin/Site.php:664
-msgid "Relay scope"
-msgstr ""
-
-#: src/Module/Admin/Site.php:664
-msgid ""
-"Can be \"all\" or \"tags\". \"all\" means that every public post should be "
-"received. \"tags\" means that only posts with selected tags should be "
-"received."
-msgstr ""
-
-#: src/Module/Admin/Site.php:664
-msgid "all"
-msgstr ""
-
-#: src/Module/Admin/Site.php:664
-msgid "tags"
-msgstr ""
-
-#: src/Module/Admin/Site.php:665
-msgid "Server tags"
-msgstr ""
-
-#: src/Module/Admin/Site.php:665
-msgid "Comma separated list of tags for the \"tags\" subscription."
-msgstr ""
-
-#: src/Module/Admin/Site.php:666
-msgid "Allow user tags"
-msgstr ""
-
-#: src/Module/Admin/Site.php:666
-msgid ""
-"If enabled, the tags from the saved searches will used for the \"tags\" "
-"subscription in addition to the \"relay_server_tags\"."
-msgstr ""
-
-#: src/Module/Admin/Site.php:669
-msgid "Start Relocation"
-msgstr ""
-
-#: src/Module/Admin/Federation.php:88 src/Module/Admin/Federation.php:250
-msgid "unknown"
-msgstr ""
-
-#: src/Module/Admin/Federation.php:116
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
-msgstr ""
-
-#: src/Module/Admin/Federation.php:117
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr ""
-
-#: src/Module/Admin/Federation.php:129
-#, php-format
-msgid ""
-"Currently this node is aware of %d nodes with %d registered users from the "
-"following platforms:"
-msgstr ""
-
-#: src/Module/Admin/Features.php:58 src/Module/Admin/Features.php:59
-#: mod/settings.php:762
-msgid "Off"
-msgstr ""
-
-#: src/Module/Admin/Features.php:58 src/Module/Admin/Features.php:59
-#: mod/settings.php:762
-msgid "On"
-msgstr ""
-
-#: src/Module/Admin/Features.php:59
-#, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: src/Module/Admin/Features.php:67
-msgid "Manage Additional Features"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:34
-msgid "Inspect Deferred Worker Queue"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:35
-msgid ""
-"This page lists the deferred worker jobs. This are jobs that couldn't be "
-"executed at the first time."
-msgstr ""
-
-#: src/Module/Admin/Queue.php:38
-msgid "Inspect Worker Queue"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:39
-msgid ""
-"This page lists the currently queued worker jobs. These jobs are handled by "
-"the worker cronjob you've set up during install."
-msgstr ""
-
-#: src/Module/Admin/Queue.php:59
-msgid "ID"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:60
-msgid "Job Parameters"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:61
-msgid "Created"
-msgstr ""
-
-#: src/Module/Admin/Queue.php:62
-msgid "Priority"
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:35
-msgid "Item marked for deletion."
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:48
-msgid "Delete this Item"
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:49
-msgid ""
-"On this page you can delete an item from your node. If the item is a top "
-"level posting, the entire thread will be deleted."
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:50
-msgid ""
-"You need to know the GUID of the item. You can find it e.g. by looking at "
-"the display URL. The last part of http://example.com/display/123456 is the "
-"GUID, here 123456."
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:51
-msgid "GUID"
-msgstr ""
-
-#: src/Module/Admin/Item/Delete.php:51
-msgid "The GUID of the item you want to delete."
-msgstr ""
-
-#: src/Module/Admin/Item/Source.php:47
-msgid "Item Guid"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:27
-#, php-format
-msgid "The logfile '%s' is not writable. No logging possible"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:36
-msgid "Log settings updated."
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:53
-msgid "PHP log currently enabled."
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:55
-msgid "PHP log currently disabled."
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:64
-msgid "Clear"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:68
-msgid "Enable Debugging"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:69
-msgid "Log file"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:69
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:70
-msgid "Log level"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:72
-msgid "PHP logging"
-msgstr ""
-
-#: src/Module/Admin/Logs/Settings.php:73
-msgid ""
-"To temporarily enable logging of PHP errors and warnings you can prepend the "
-"following to the index.php file of your installation. The filename set in "
-"the 'error_log' line is relative to the friendica top-level directory and "
-"must be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr ""
-
-#: src/Module/Admin/Logs/View.php:22
-#, php-format
-msgid ""
-"Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
-"if file %1$s exist and is readable."
-msgstr ""
-
-#: src/Module/Admin/Logs/View.php:26
-#, php-format
-msgid ""
-"Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file "
-"%1$s is readable."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:31
-#, php-format
-msgid ""
-"Your DB still runs with MyISAM tables. You should change the engine type to "
-"InnoDB. As Friendica will use InnoDB only features in the future, you should "
-"change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
-"converting the table engines. You may also use the command <tt>php bin/"
-"console.php dbstructure toinnodb</tt> of your Friendica installation for an "
-"automatic conversion.<br />"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:39
-#, php-format
-msgid ""
-"There is a new version of Friendica available for download. Your current "
-"version is %1$s, upstream version is %2$s"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:48
-msgid ""
-"The database update failed. Please run \"php bin/console.php dbstructure "
-"update\" from the command line and have a look at the errors that might "
-"appear."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:52
-msgid ""
-"The last update failed. Please run \"php bin/console.php dbstructure update"
-"\" from the command line and have a look at the errors that might appear. "
-"(Some of the errors are possibly inside the logfile.)"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:57
-msgid "The worker was never executed. Please check your database structure!"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:59
-#, php-format
-msgid ""
-"The last worker execution was on %s UTC. This is older than one hour. Please "
-"check your crontab settings."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:64
-#, php-format
-msgid ""
-"Friendica's configuration now is stored in config/local.config.php, please "
-"copy config/local-sample.config.php and move your config from <code>."
-"htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help "
-"with the transition."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:68
-#, php-format
-msgid ""
-"Friendica's configuration now is stored in config/local.config.php, please "
-"copy config/local-sample.config.php and move your config from <code>config/"
-"local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help "
-"with the transition."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:74
-#, php-format
-msgid ""
-"<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
-"configuration issue that prevents server to server communication. See <a "
-"href=\"%s\">the installation page</a> for help."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:92
-#, php-format
-msgid "The logfile '%s' is not usable. No logging possible (error: '%s')"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:107
-#, php-format
-msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:123
-#, php-format
-msgid ""
-"Friendica's system.basepath was updated from '%s' to '%s'. Please remove the "
-"system.basepath from your db to avoid differences."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:131
-#, php-format
-msgid ""
-"Friendica's current system.basepath '%s' is wrong and the config file '%s' "
-"isn't used."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:139
-#, php-format
-msgid ""
-"Friendica's current system.basepath '%s' is not equal to the config file "
-"'%s'. Please fix your configuration."
-msgstr ""
-
-#: src/Module/Admin/Summary.php:146
-msgid "Normal Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:147
-msgid "Automatic Follower Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:148
-msgid "Public Forum Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:149
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:150
-msgid "Blog Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:151
-msgid "Private Forum Account"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:171
-msgid "Message queues"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:177
-msgid "Server Settings"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:191
-msgid "Summary"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:193
-msgid "Registered users"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:195
-msgid "Pending registrations"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:196
-msgid "Version"
-msgstr ""
-
-#: src/Module/Admin/Summary.php:200
-msgid "Active addons"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:32
-msgid "Update has been marked successful"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:42
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:46
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:63
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:65
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:68
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:71
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:91
-msgid "No failed updates."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:92
-msgid "Check database structure"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:97
-msgid "Failed Updates"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:98
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:99
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: src/Module/Admin/DBSync.php:100
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:34
-msgid "Delegation successfully granted."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:36
-msgid "Parent user not found, unavailable or password doesn't match."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:40
-msgid "Delegation successfully revoked."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:62 src/Module/Settings/Delegation.php:84
-msgid ""
-"Delegated administrators can view but not change delegation permissions."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:76
-msgid "Delegate user not found."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:123
-msgid "No parent user"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:135 src/Module/Register.php:152
-msgid "Parent Password:"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:135 src/Module/Register.php:152
-msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:142
-msgid "Additional Accounts"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:143
-msgid ""
-"Register additional accounts that are automatically connected to your "
-"existing account so you can manage it from this account."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:144
-msgid "Register an additional account"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:145
-msgid "Parent User"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:148
-msgid ""
-"Parent users have total control about this account, including the account "
-"settings. Please double check whom you give this access."
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:151
-msgid "Manage Accounts"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:152
-msgid "Delegates"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:154
-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 ""
-
-#: src/Module/Settings/Delegation.php:155
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:157
-msgid "Potential Delegates"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:159 mod/tagrm.php:114
-msgid "Remove"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:160
-msgid "Add"
-msgstr ""
-
-#: src/Module/Settings/Delegation.php:161
-msgid "No entries."
-msgstr ""
-
-#: src/Module/Settings/UserExport.php:41
-msgid "Export account"
-msgstr ""
-
-#: src/Module/Settings/UserExport.php:41
-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 ""
-
-#: src/Module/Settings/UserExport.php:42
-msgid "Export all"
-msgstr ""
-
-#: src/Module/Settings/UserExport.php:42
-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 ""
-
-#: src/Module/Settings/UserExport.php:43
-msgid "Export Contacts to CSV"
-msgstr ""
-
-#: src/Module/Settings/UserExport.php:43
-msgid ""
-"Export the list of the accounts you are following as CSV file. Compatible to "
-"e.g. Mastodon."
-msgstr ""
-
-#: src/Module/Settings/UserExport.php:49 src/Module/BaseSettingsModule.php:89
-#: mod/settings.php:128
-msgid "Export personal data"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:37
-#: src/Module/Settings/TwoFactor/AppSpecific.php:33
-#: src/Module/Settings/TwoFactor/Recovery.php:31
-msgid "Please enter your password to access this page."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:59
-msgid "Two-factor authentication successfully activated."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:92
-#, php-format
-msgid ""
-"<p>Or you can submit the authentication settings manually:</p>\n"
-"<dl>\n"
-"\t<dt>Issuer</dt>\n"
-"\t<dd>%s</dd>\n"
-"\t<dt>Account Name</dt>\n"
-"\t<dd>%s</dd>\n"
-"\t<dt>Secret Key</dt>\n"
-"\t<dd>%s</dd>\n"
-"\t<dt>Type</dt>\n"
-"\t<dd>Time-based</dd>\n"
-"\t<dt>Number of digits</dt>\n"
-"\t<dd>6</dd>\n"
-"\t<dt>Hashing algorithm</dt>\n"
-"\t<dd>SHA-1</dd>\n"
-"</dl>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:112
-msgid "Two-factor code verification"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:114
-msgid ""
-"<p>Please scan this QR Code with your authenticator app and submit the "
-"provided code.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:116
-#, php-format
-msgid ""
-"<p>Or you can open the following URL in your mobile devicde:</p><p><a href="
-"\"%s\">%s</a></p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Verify.php:123
-msgid "Verify code and enable two-factor authentication"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:51
-msgid "App-specific password generation failed: The description is empty."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:54
-msgid ""
-"App-specific password generation failed: This description already exists."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:58
-msgid "New app-specific password generated."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:64
-msgid "App-specific passwords successfully revoked."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:74
-msgid "App-specific password successfully revoked."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:95
-msgid "Two-factor app-specific passwords"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:97
-msgid ""
-"<p>App-specific passwords are randomly generated passwords used instead your "
-"regular password to authenticate your account on third-party applications "
-"that don't support two-factor authentication.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:98
-msgid ""
-"Make sure to copy your new app-specific password now. You won’t be able to "
-"see it again!"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:101
-msgid "Description"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:102
-msgid "Last Used"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:103
-msgid "Revoke"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:104
-msgid "Revoke All"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:107
-msgid ""
-"When you generate a new app-specific password, you must use it right away, "
-"it will be shown to you once after you generate it."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:108
-msgid "Generate new app-specific password"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:109
-msgid "Friendiqa on my Fairphone 2..."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/AppSpecific.php:110
-msgid "Generate"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:48
-msgid "Two-factor authentication successfully disabled."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:69 mod/settings.php:536
-msgid "Wrong Password"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:89
-msgid ""
-"<p>Use an application on a mobile device to get two-factor authentication "
-"codes when prompted on login.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:93
-msgid "Authenticator app"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:94
-msgid "Configured"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:94
-msgid "Not Configured"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:95
-msgid "<p>You haven't finished configuring your authenticator app.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:96
-msgid "<p>Your authenticator app is correctly configured.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:98
-msgid "Recovery codes"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:99
-msgid "Remaining valid codes"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:101
-msgid ""
-"<p>These one-use codes can replace an authenticator app code in case you "
-"have lost access to it.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:103
-msgid "App-specific passwords"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:104
-msgid "Generated app-specific passwords"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:106
-msgid ""
-"<p>These randomly generated passwords allow you to authenticate on apps not "
-"supporting two-factor authentication.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:108 src/Module/Contact.php:634
-msgid "Actions"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:109
-msgid "Current password:"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:109
-msgid ""
-"You need to provide your current password to change two-factor "
-"authentication settings."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:110
-msgid "Enable two-factor authentication"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:111
-msgid "Disable two-factor authentication"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:112
-msgid "Show recovery codes"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:113
-msgid "Manage app-specific passwords"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Index.php:114
-msgid "Finish app configuration"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:47
-msgid "New recovery codes successfully generated."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:73
-msgid "Two-factor recovery codes"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:75
-msgid ""
-"<p>Recovery codes can be used to access your account in the event you lose "
-"access to your device and cannot receive two-factor authentication codes.</"
-"p><p><strong>Put these in a safe spot!</strong> If you lose your device and "
-"don’t have the recovery codes you will lose access to your account.</p>"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:77
-msgid ""
-"When you generate new recovery codes, you must copy the new codes. Your old "
-"codes won’t work anymore."
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:78
-msgid "Generate new recovery codes"
-msgstr ""
-
-#: src/Module/Settings/TwoFactor/Recovery.php:80
-msgid "Next: Verification"
-msgstr ""
-
-#: src/Module/HTTPException/MethodNotAllowed.php:13
-msgid "Method Not Allowed."
-msgstr ""
-
-#: src/Module/HTTPException/PageNotFound.php:13 src/App/Router.php:185
-msgid "Page not found."
-msgstr ""
-
-#: src/Module/BaseSearchModule.php:52
-#, php-format
-msgid "People Search - %s"
-msgstr ""
-
-#: src/Module/BaseSearchModule.php:62
-#, php-format
-msgid "Forum Search - %s"
-msgstr ""
-
-#: src/Module/BaseSearchModule.php:93 mod/match.php:129
-msgid "No matches"
-msgstr ""
-
-#: src/Module/Apps.php:29
-msgid "No installed applications."
-msgstr ""
-
-#: src/Module/Apps.php:34
-msgid "Applications"
-msgstr ""
-
-#: src/Module/Credits.php:24
-msgid "Credits"
-msgstr ""
-
-#: src/Module/Credits.php:25
-msgid ""
-"Friendica is a community project, that would not be possible without the "
-"help of many people. Here is a list of those who have contributed to the "
-"code or the translation of Friendica. Thank you all!"
-msgstr ""
-
-#: src/Module/Group.php:41
-msgid "Group created."
-msgstr ""
-
-#: src/Module/Group.php:47
-msgid "Could not create group."
-msgstr ""
-
-#: src/Module/Group.php:58 src/Module/Group.php:200 src/Module/Group.php:226
-msgid "Group not found."
-msgstr ""
-
-#: src/Module/Group.php:64
-msgid "Group name changed."
-msgstr ""
-
-#: src/Module/Group.php:86
-msgid "Unknown group."
-msgstr ""
-
-#: src/Module/Group.php:91 mod/fsuggest.php:31 mod/fsuggest.php:74
-#: mod/crepair.php:102 mod/dfrn_confirm.php:125 mod/redir.php:32
-#: mod/redir.php:122 mod/redir.php:137
-msgid "Contact not found."
-msgstr ""
-
-#: src/Module/Group.php:95
-msgid "Contact is deleted."
-msgstr ""
-
-#: src/Module/Group.php:101
-msgid "Unable to add the contact to the group."
-msgstr ""
-
-#: src/Module/Group.php:104
-msgid "Contact successfully added to group."
-msgstr ""
-
-#: src/Module/Group.php:108
-msgid "Unable to remove the contact from the group."
-msgstr ""
-
-#: src/Module/Group.php:111
-msgid "Contact successfully removed from group."
-msgstr ""
-
-#: src/Module/Group.php:114
-msgid "Unknown group command."
-msgstr ""
-
-#: src/Module/Group.php:117
-msgid "Bad request."
-msgstr ""
-
-#: src/Module/Group.php:156
-msgid "Save Group"
-msgstr ""
-
-#: src/Module/Group.php:157
-msgid "Filter"
-msgstr ""
-
-#: src/Module/Group.php:163
-msgid "Create a group of contacts/friends."
-msgstr ""
-
-#: src/Module/Group.php:205
-msgid "Group removed."
-msgstr ""
-
-#: src/Module/Group.php:207
-msgid "Unable to remove group."
-msgstr ""
-
-#: src/Module/Group.php:258
-msgid "Delete Group"
-msgstr ""
-
-#: src/Module/Group.php:268
-msgid "Edit Group Name"
-msgstr ""
-
-#: src/Module/Group.php:278
-msgid "Members"
-msgstr ""
-
-#: src/Module/Group.php:281 mod/network.php:584
-msgid "Group is empty"
-msgstr ""
-
-#: src/Module/Group.php:294
-msgid "Remove contact from group"
-msgstr ""
-
-#: src/Module/Group.php:314 mod/profperm.php:118
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: src/Module/Group.php:328
-msgid "Add contact to group"
-msgstr ""
-
-#: src/Module/Debug/WebFinger.php:18 src/Module/Debug/Probe.php:19
-msgid "Only logged in users are permitted to perform a probing."
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:30
-msgid "Time Conversion"
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:31
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:32
-#, php-format
-msgid "UTC time: %s"
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:35
-#, php-format
-msgid "Current timezone: %s"
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:39
-#, php-format
-msgid "Converted localtime: %s"
-msgstr ""
-
-#: src/Module/Debug/Localtime.php:43
-msgid "Please select your timezone:"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:31
-msgid "Source input"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:37
-msgid "BBCode::toPlaintext"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:43
-msgid "BBCode::convert (raw HTML)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:48
-msgid "BBCode::convert"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:54
-msgid "BBCode::convert => HTML::toBBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:60
-msgid "BBCode::toMarkdown"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:66
-msgid "BBCode::toMarkdown => Markdown::convert (raw HTML)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:70
-msgid "BBCode::toMarkdown => Markdown::convert"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:76
-msgid "BBCode::toMarkdown => Markdown::toBBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:82
-msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:93
-msgid "Item Body"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:97
-msgid "Item Tags"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:104
-msgid "Source input (Diaspora format)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:110
-msgid "Markdown::convert (raw HTML)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:115
-msgid "Markdown::convert"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:121
-msgid "Markdown::toBBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:128
-msgid "Raw HTML input"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:133
-msgid "HTML Input"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:139
-msgid "HTML::toBBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:145
-msgid "HTML::toBBCode => BBCode::convert"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:150
-msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:156
-msgid "HTML::toBBCode => BBCode::toPlaintext"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:162
-msgid "HTML::toMarkdown"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:168
-msgid "HTML::toPlaintext"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:174
-msgid "HTML::toPlaintext (compact)"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:182
-msgid "Source text"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:183
-msgid "BBCode"
-msgstr ""
-
-#: src/Module/Debug/Babel.php:185
-msgid "HTML"
-msgstr ""
-
-#: src/Module/Debug/ItemBody.php:18 src/Module/Item/Ignore.php:22
-#: src/Module/Diaspora/Receive.php:32 mod/community.php:32 mod/cal.php:28
-#: mod/cal.php:32 mod/follow.php:19
-msgid "Access denied."
-msgstr ""
-
-#: src/Module/Debug/Feed.php:20 src/Module/Filer/SaveTag.php:19
-msgid "You must be logged in to use this module"
-msgstr ""
-
-#: src/Module/Debug/Feed.php:46
-msgid "Source URL"
-msgstr ""
-
-#: src/Module/Debug/Probe.php:35
-msgid "Lookup address"
-msgstr ""
-
-#: src/Module/Home.php:35
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: src/Module/Welcome.php:25
-msgid "Welcome to Friendica"
-msgstr ""
-
-#: src/Module/Welcome.php:26
-msgid "New Member Checklist"
-msgstr ""
-
-#: src/Module/Welcome.php:27
-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 ""
-
-#: src/Module/Welcome.php:29
-msgid "Getting Started"
-msgstr ""
-
-#: src/Module/Welcome.php:30
-msgid "Friendica Walk-Through"
-msgstr ""
-
-#: src/Module/Welcome.php:31
-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."
-msgstr ""
-
-#: src/Module/Welcome.php:34
-msgid "Go to Your Settings"
-msgstr ""
-
-#: src/Module/Welcome.php:35
-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 ""
-
-#: src/Module/Welcome.php:36
-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 ""
-
-#: src/Module/Welcome.php:39 mod/profile_photo.php:245 mod/profiles.php:581
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: src/Module/Welcome.php:40
-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 ""
-
-#: src/Module/Welcome.php:41
-msgid "Edit Your Profile"
-msgstr ""
-
-#: src/Module/Welcome.php:42
-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 ""
-
-#: src/Module/Welcome.php:43
-msgid "Profile Keywords"
-msgstr ""
-
-#: src/Module/Welcome.php:44
-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 ""
-
-#: src/Module/Welcome.php:46
-msgid "Connecting"
-msgstr ""
-
-#: src/Module/Welcome.php:48
-msgid "Importing Emails"
-msgstr ""
-
-#: src/Module/Welcome.php:49
-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 ""
-
-#: src/Module/Welcome.php:50
-msgid "Go to Your Contacts Page"
-msgstr ""
-
-#: src/Module/Welcome.php:51
-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 ""
-
-#: src/Module/Welcome.php:52
-msgid "Go to Your Site's Directory"
-msgstr ""
-
-#: src/Module/Welcome.php:53
-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 ""
-
-#: src/Module/Welcome.php:54
-msgid "Finding New People"
-msgstr ""
-
-#: src/Module/Welcome.php:55
-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 ""
-
-#: src/Module/Welcome.php:58
-msgid "Group Your Contacts"
-msgstr ""
-
-#: src/Module/Welcome.php:59
-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 ""
-
-#: src/Module/Welcome.php:61
-msgid "Why Aren't My Posts Public?"
-msgstr ""
-
-#: src/Module/Welcome.php:62
-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 ""
-
-#: src/Module/Welcome.php:64
-msgid "Getting Help"
-msgstr ""
-
-#: src/Module/Welcome.php:65
-msgid "Go to the Help Section"
-msgstr ""
-
-#: src/Module/Welcome.php:66
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
-msgstr ""
-
-#: src/Module/Profile/Contacts.php:24 src/Module/Profile/Contacts.php:37
-#: src/Module/Register.php:242
-msgid "User not found."
-msgstr ""
-
-#: src/Module/Profile/Contacts.php:78
-msgid "No contacts."
-msgstr ""
-
-#: src/Module/Profile/Contacts.php:93 src/Module/Contact.php:589
-#: src/Module/Contact.php:1032
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr ""
-
-#: src/Module/Profile/Contacts.php:112
-#, php-format
-msgid "Follower (%s)"
-msgid_plural "Followers (%s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Profile/Contacts.php:113
-#, php-format
-msgid "Following (%s)"
-msgid_plural "Following (%s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Profile/Contacts.php:114
-#, php-format
-msgid "Mutual friend (%s)"
-msgid_plural "Mutual friends (%s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Profile/Contacts.php:116
-#, php-format
-msgid "Contact (%s)"
-msgid_plural "Contacts (%s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Profile/Contacts.php:125
-msgid "All contacts"
-msgstr ""
-
-#: src/Module/Filer/SaveTag.php:38
-#, php-format
-msgid "Filetag %s saved to item"
-msgstr ""
-
-#: src/Module/Filer/SaveTag.php:47
-msgid "- select -"
-msgstr ""
-
-#: src/Module/AllFriends.php:35 src/Module/AllFriends.php:43
-#: mod/network.php:617
-msgid "Invalid contact."
-msgstr ""
-
-#: src/Module/AllFriends.php:55
-msgid "No friends to display."
-msgstr ""
-
-#: src/Module/Contact.php:71
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Contact.php:98
-msgid "Could not access contact record."
-msgstr ""
-
-#: src/Module/Contact.php:108
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: src/Module/Contact.php:140
-msgid "Contact updated."
-msgstr ""
-
-#: src/Module/Contact.php:142 mod/dfrn_request.php:416
-msgid "Failed to update contact record."
-msgstr ""
-
-#: src/Module/Contact.php:375
-msgid "Contact not found"
-msgstr ""
-
-#: src/Module/Contact.php:394
-msgid "Contact has been blocked"
-msgstr ""
-
-#: src/Module/Contact.php:394
-msgid "Contact has been unblocked"
-msgstr ""
-
-#: src/Module/Contact.php:404
-msgid "Contact has been ignored"
-msgstr ""
-
-#: src/Module/Contact.php:404
-msgid "Contact has been unignored"
-msgstr ""
-
-#: src/Module/Contact.php:414
-msgid "Contact has been archived"
-msgstr ""
-
-#: src/Module/Contact.php:414
-msgid "Contact has been unarchived"
-msgstr ""
-
-#: src/Module/Contact.php:438
-msgid "Drop contact"
-msgstr ""
-
-#: src/Module/Contact.php:441 src/Module/Contact.php:822
-msgid "Do you really want to delete this contact?"
-msgstr ""
-
-#: src/Module/Contact.php:455
-msgid "Contact has been removed."
-msgstr ""
-
-#: src/Module/Contact.php:485
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr ""
-
-#: src/Module/Contact.php:490
-#, php-format
-msgid "You are sharing with %s"
-msgstr ""
-
-#: src/Module/Contact.php:495
-#, php-format
-msgid "%s is sharing with you"
-msgstr ""
-
-#: src/Module/Contact.php:519
-msgid "Private communications are not available for this contact."
-msgstr ""
-
-#: src/Module/Contact.php:521
-msgid "Never"
-msgstr ""
-
-#: src/Module/Contact.php:524
-msgid "(Update was successful)"
-msgstr ""
-
-#: src/Module/Contact.php:524
-msgid "(Update was not successful)"
-msgstr ""
-
-#: src/Module/Contact.php:526 src/Module/Contact.php:1066
-msgid "Suggest friends"
-msgstr ""
-
-#: src/Module/Contact.php:530
-#, php-format
-msgid "Network type: %s"
-msgstr ""
-
-#: src/Module/Contact.php:535
-msgid "Communications lost with this contact!"
-msgstr ""
-
-#: src/Module/Contact.php:541
-msgid "Fetch further information for feeds"
-msgstr ""
-
-#: src/Module/Contact.php:543
-msgid ""
-"Fetch information like preview pictures, title and teaser from the feed "
-"item. You can activate this if the feed doesn't contain much text. Keywords "
-"are taken from the meta header in the feed item and are posted as hash tags."
-msgstr ""
-
-#: src/Module/Contact.php:546
-msgid "Fetch information"
-msgstr ""
-
-#: src/Module/Contact.php:547
-msgid "Fetch keywords"
-msgstr ""
-
-#: src/Module/Contact.php:548
-msgid "Fetch information and keywords"
-msgstr ""
-
-#: src/Module/Contact.php:567
-msgid "Profile Visibility"
-msgstr ""
-
-#: src/Module/Contact.php:568
-msgid "Contact Information / Notes"
-msgstr ""
-
-#: src/Module/Contact.php:569
-msgid "Contact Settings"
-msgstr ""
-
-#: src/Module/Contact.php:578
-msgid "Contact"
-msgstr ""
-
-#: src/Module/Contact.php:582
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-
-#: src/Module/Contact.php:584
-msgid "Their personal note"
-msgstr ""
-
-#: src/Module/Contact.php:586
-msgid "Edit contact notes"
-msgstr ""
-
-#: src/Module/Contact.php:590
-msgid "Block/Unblock contact"
-msgstr ""
-
-#: src/Module/Contact.php:591
-msgid "Ignore contact"
-msgstr ""
-
-#: src/Module/Contact.php:592
-msgid "Repair URL settings"
-msgstr ""
-
-#: src/Module/Contact.php:593
-msgid "View conversations"
-msgstr ""
-
-#: src/Module/Contact.php:598
-msgid "Last update:"
-msgstr ""
-
-#: src/Module/Contact.php:600
-msgid "Update public posts"
-msgstr ""
-
-#: src/Module/Contact.php:602 src/Module/Contact.php:1076
-msgid "Update now"
-msgstr ""
-
-#: src/Module/Contact.php:606 src/Module/Contact.php:827
-#: src/Module/Contact.php:1093
-msgid "Unignore"
-msgstr ""
-
-#: src/Module/Contact.php:610
-msgid "Currently blocked"
-msgstr ""
-
-#: src/Module/Contact.php:611
-msgid "Currently ignored"
-msgstr ""
-
-#: src/Module/Contact.php:612
-msgid "Currently archived"
-msgstr ""
-
-#: src/Module/Contact.php:613
-msgid "Awaiting connection acknowledge"
-msgstr ""
-
-#: src/Module/Contact.php:614 mod/notifications.php:168
-#: mod/notifications.php:255
-msgid "Hide this contact from others"
-msgstr ""
-
-#: src/Module/Contact.php:614
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr ""
-
-#: src/Module/Contact.php:615
-msgid "Notification for new posts"
-msgstr ""
-
-#: src/Module/Contact.php:615
-msgid "Send a notification of every new post of this contact"
-msgstr ""
-
-#: src/Module/Contact.php:617
-msgid "Blacklisted keywords"
-msgstr ""
-
-#: src/Module/Contact.php:617
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr ""
-
-#: src/Module/Contact.php:687
-msgid "Show all contacts"
-msgstr ""
-
-#: src/Module/Contact.php:692 src/Module/Contact.php:802
-msgid "Pending"
-msgstr ""
-
-#: src/Module/Contact.php:695
-msgid "Only show pending contacts"
-msgstr ""
-
-#: src/Module/Contact.php:700 src/Module/Contact.php:803
-msgid "Blocked"
-msgstr ""
-
-#: src/Module/Contact.php:703
-msgid "Only show blocked contacts"
-msgstr ""
-
-#: src/Module/Contact.php:708 src/Module/Contact.php:805
-msgid "Ignored"
-msgstr ""
-
-#: src/Module/Contact.php:711
-msgid "Only show ignored contacts"
-msgstr ""
-
-#: src/Module/Contact.php:716 src/Module/Contact.php:806
-msgid "Archived"
-msgstr ""
-
-#: src/Module/Contact.php:719
-msgid "Only show archived contacts"
-msgstr ""
-
-#: src/Module/Contact.php:724 src/Module/Contact.php:804
-msgid "Hidden"
-msgstr ""
-
-#: src/Module/Contact.php:727
-msgid "Only show hidden contacts"
-msgstr ""
-
-#: src/Module/Contact.php:735
-msgid "Organize your contact groups"
-msgstr ""
-
-#: src/Module/Contact.php:817
-msgid "Search your contacts"
-msgstr ""
-
-#: src/Module/Contact.php:818 src/Module/Search/Index.php:176
-#, php-format
-msgid "Results for: %s"
-msgstr ""
-
-#: src/Module/Contact.php:825 mod/settings.php:189 mod/settings.php:690
-msgid "Update"
-msgstr ""
-
-#: src/Module/Contact.php:828 src/Module/Contact.php:1102
-msgid "Archive"
-msgstr ""
-
-#: src/Module/Contact.php:828 src/Module/Contact.php:1102
-msgid "Unarchive"
-msgstr ""
-
-#: src/Module/Contact.php:831
-msgid "Batch Actions"
-msgstr ""
-
-#: src/Module/Contact.php:858
-msgid "Conversations started by this contact"
-msgstr ""
-
-#: src/Module/Contact.php:863
-msgid "Posts and Comments"
-msgstr ""
-
-#: src/Module/Contact.php:886
-msgid "View all contacts"
-msgstr ""
-
-#: src/Module/Contact.php:894 mod/common.php:141
-msgid "Common Friends"
-msgstr ""
-
-#: src/Module/Contact.php:897
-msgid "View all common friends"
-msgstr ""
-
-#: src/Module/Contact.php:907
-msgid "Advanced Contact Settings"
-msgstr ""
-
-#: src/Module/Contact.php:990
-msgid "Mutual Friendship"
-msgstr ""
-
-#: src/Module/Contact.php:995
-msgid "is a fan of yours"
-msgstr ""
-
-#: src/Module/Contact.php:1000
-msgid "you are a fan of"
-msgstr ""
-
-#: src/Module/Contact.php:1018
-msgid "Pending outgoing contact request"
-msgstr ""
-
-#: src/Module/Contact.php:1020
-msgid "Pending incoming contact request"
-msgstr ""
-
-#: src/Module/Contact.php:1033
-msgid "Edit contact"
-msgstr ""
-
-#: src/Module/Contact.php:1087
-msgid "Toggle Blocked status"
-msgstr ""
-
-#: src/Module/Contact.php:1095
-msgid "Toggle Ignored status"
-msgstr ""
-
-#: src/Module/Contact.php:1104
-msgid "Toggle Archive status"
-msgstr ""
-
-#: src/Module/Contact.php:1112
-msgid "Delete contact"
-msgstr ""
-
-#: src/Module/Invite.php:36
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: src/Module/Invite.php:59
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: src/Module/Invite.php:86
-msgid "Please join us on Friendica"
-msgstr ""
-
-#: src/Module/Invite.php:95
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: src/Module/Invite.php:99
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: src/Module/Invite.php:103
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Module/Invite.php:121
-msgid "You have no more invitations available"
-msgstr ""
-
-#: src/Module/Invite.php:128
-#, 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 ""
-
-#: src/Module/Invite.php:130
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr ""
-
-#: src/Module/Invite.php:131
-#, 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 ""
-
-#: src/Module/Invite.php:135
-msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
-msgstr ""
-
-#: src/Module/Invite.php:138
-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."
-msgstr ""
-
-#: src/Module/Invite.php:137
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr ""
-
-#: src/Module/Invite.php:145
-msgid "Send invitations"
-msgstr ""
-
-#: src/Module/Invite.php:146
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: src/Module/Invite.php:149 mod/wallmessage.php:136 mod/message.php:253
-#: mod/message.php:433
-msgid "Your message:"
-msgstr ""
-
-#: src/Module/Invite.php:150
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr ""
-
-#: src/Module/Invite.php:152
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr ""
-
-#: src/Module/Invite.php:152
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr ""
-
-#: src/Module/Invite.php:154
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendi.ca"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:18 mod/photos.php:131 mod/settings.php:57
-msgid "everybody"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:24 mod/settings.php:62
-msgid "Account"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:54 mod/settings.php:93
-msgid "Display"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:61 mod/settings.php:100
-#: mod/settings.php:837
-msgid "Social Networks"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:75 mod/settings.php:114
-msgid "Delegations"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:82 mod/settings.php:121
-msgid "Connected apps"
-msgstr ""
-
-#: src/Module/BaseSettingsModule.php:96 mod/settings.php:135
-msgid "Remove account"
-msgstr ""
-
-#: src/Module/Item/Compose.php:27
-msgid "Please enter a post body."
-msgstr ""
-
-#: src/Module/Item/Compose.php:40
-msgid "This feature is only available with the frio theme."
-msgstr ""
-
-#: src/Module/Item/Compose.php:67
-msgid "Compose new personal note"
-msgstr ""
-
-#: src/Module/Item/Compose.php:76
-msgid "Compose new post"
-msgstr ""
-
-#: src/Module/Item/Compose.php:116
-msgid "Visibility"
-msgstr ""
-
-#: src/Module/Item/Compose.php:137
-msgid "Clear the location"
-msgstr ""
-
-#: src/Module/Item/Compose.php:138
-msgid "Location services are unavailable on your device"
-msgstr ""
-
-#: src/Module/Item/Compose.php:139
-msgid ""
-"Location services are disabled. Please check the website's permissions on "
-"your device"
-msgstr ""
-
-#: src/Module/Friendica.php:39
-msgid "Installed addons/apps:"
-msgstr ""
-
-#: src/Module/Friendica.php:44
-msgid "No installed addons/apps"
-msgstr ""
-
-#: src/Module/Friendica.php:49
-#, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr ""
-
-#: src/Module/Friendica.php:56
-msgid "On this server the following remote servers are blocked."
-msgstr ""
-
-#: src/Module/Friendica.php:74
-#, php-format
-msgid ""
-"This is Friendica, version %s that is running at the web location %s. The "
-"database version is %s, the post update version is %s."
-msgstr ""
-
-#: src/Module/Friendica.php:79
-msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr ""
-
-#: src/Module/Friendica.php:80
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: src/Module/Friendica.php:80
-msgid "the bugtracker at github"
-msgstr ""
-
-#: src/Module/Friendica.php:81
-msgid ""
-"Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
-msgstr ""
-
-#: src/Module/HoverCard.php:30
-msgid "No profile"
-msgstr ""
-
-#: src/Module/Register.php:51
-msgid "Only parent users can create additional accounts."
-msgstr ""
-
-#: src/Module/Register.php:66 mod/uimport.php:39
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: src/Module/Register.php:83
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking \"Register\"."
-msgstr ""
-
-#: src/Module/Register.php:84
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: src/Module/Register.php:85
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: src/Module/Register.php:94
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: src/Module/Register.php:98 mod/api.php:111 mod/dfrn_request.php:643
-#: mod/follow.php:162 mod/profiles.php:524 mod/profiles.php:528
-#: mod/profiles.php:549 mod/settings.php:1084 mod/settings.php:1090
-#: mod/settings.php:1097 mod/settings.php:1101 mod/settings.php:1105
-#: mod/settings.php:1109 mod/settings.php:1113 mod/settings.php:1117
-#: mod/settings.php:1137 mod/settings.php:1138 mod/settings.php:1139
-#: mod/settings.php:1140 mod/settings.php:1141
-msgid "No"
-msgstr ""
-
-#: src/Module/Register.php:117
-msgid "Note for the admin"
-msgstr ""
-
-#: src/Module/Register.php:117
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr ""
-
-#: src/Module/Register.php:118
-msgid "Membership on this site is by invitation only."
-msgstr ""
-
-#: src/Module/Register.php:119
-msgid "Your invitation code: "
-msgstr ""
-
-#: src/Module/Register.php:127
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr ""
-
-#: src/Module/Register.php:128
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr ""
-
-#: src/Module/Register.php:129
-msgid "Please repeat your e-mail address:"
-msgstr ""
-
-#: src/Module/Register.php:131 mod/settings.php:1180
-msgid "New Password:"
-msgstr ""
-
-#: src/Module/Register.php:131
-msgid "Leave empty for an auto generated password."
-msgstr ""
-
-#: src/Module/Register.php:132 mod/settings.php:1181
-msgid "Confirm:"
-msgstr ""
-
-#: src/Module/Register.php:133
-#, php-format
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be \"<strong>nickname@%s</strong>\"."
-msgstr ""
-
-#: src/Module/Register.php:134
-msgid "Choose a nickname: "
-msgstr ""
-
-#: src/Module/Register.php:142 mod/uimport.php:46
-msgid "Import"
-msgstr ""
-
-#: src/Module/Register.php:143
-msgid "Import your profile to this friendica instance"
-msgstr ""
-
-#: src/Module/Register.php:150
-msgid "Note: This node explicitly contains adult content"
-msgstr ""
-
-#: src/Module/Register.php:183
-msgid "Password doesn't match."
-msgstr ""
-
-#: src/Module/Register.php:189
-msgid "Please enter your password."
-msgstr ""
-
-#: src/Module/Register.php:231
-msgid "You have entered too much information."
-msgstr ""
-
-#: src/Module/Register.php:255
-msgid "Please enter the identical mail address in the second field."
-msgstr ""
-
-#: src/Module/Register.php:282
-msgid "The additional account was created."
-msgstr ""
-
-#: src/Module/Register.php:307
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: src/Module/Register.php:311
-#, 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 ""
-
-#: src/Module/Register.php:317
-msgid "Registration successful."
-msgstr ""
-
-#: src/Module/Register.php:322 src/Module/Register.php:329
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: src/Module/Register.php:328
-msgid "You have to leave a request note for the admin."
-msgstr ""
-
-#: src/Module/Register.php:376
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: src/Module/Search/Saved.php:25
-msgid "Search term successfully saved."
-msgstr ""
-
-#: src/Module/Search/Saved.php:27
-msgid "Search term already saved."
-msgstr ""
-
-#: src/Module/Search/Saved.php:33
-msgid "Search term successfully removed."
-msgstr ""
-
-#: src/Module/Search/Index.php:34
-msgid "Only logged in users are permitted to perform a search."
-msgstr ""
-
-#: src/Module/Search/Index.php:56
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr ""
-
-#: src/Module/Search/Index.php:169 mod/community.php:155
-msgid "No results."
-msgstr ""
-
-#: src/Module/Search/Index.php:174
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: src/Module/Search/Acl.php:36
-msgid "You must be logged in to use this module."
-msgstr ""
-
-#: src/BaseModule.php:132
-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 ""
-
-#: src/App/Page.php:228
-msgid "Delete this item?"
-msgstr ""
-
-#: src/App/Page.php:276
-msgid "toggle mobile"
-msgstr ""
-
-#: src/App/Router.php:183
-#, php-format
-msgid "Method not allowed for this module. Allowed method(s): %s"
-msgstr ""
-
-#: src/App/Authentication.php:195 src/App/Authentication.php:247
-msgid "Login failed."
-msgstr ""
-
-#: src/App/Authentication.php:258
-msgid "Login failed. Please check your credentials."
-msgstr ""
-
-#: src/App/Authentication.php:374
-#, php-format
-msgid "Welcome %s"
-msgstr ""
-
-#: src/App/Authentication.php:375
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: src/App/Authentication.php:378
-#, php-format
-msgid "Welcome back %s"
-msgstr ""
-
-#: src/App/Module.php:221
-msgid "You must be logged in to use addons. "
-msgstr ""
-
-#: src/Util/Temporal.php:78 src/Util/Temporal.php:80 mod/profiles.php:579
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/Util/Temporal.php:147 mod/profiles.php:602
-msgid "Age: "
-msgstr ""
-
-#: src/Util/Temporal.php:149
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: src/Util/Temporal.php:296
-msgid "never"
-msgstr ""
-
-#: src/Util/Temporal.php:303
-msgid "less than a second ago"
-msgstr ""
-
-#: src/Util/Temporal.php:311
-msgid "year"
-msgstr ""
-
-#: src/Util/Temporal.php:311
-msgid "years"
-msgstr ""
-
-#: src/Util/Temporal.php:312
-msgid "months"
-msgstr ""
-
-#: src/Util/Temporal.php:313
-msgid "weeks"
-msgstr ""
-
-#: src/Util/Temporal.php:314
-msgid "days"
-msgstr ""
-
-#: src/Util/Temporal.php:315
-msgid "hour"
-msgstr ""
-
-#: src/Util/Temporal.php:315
-msgid "hours"
-msgstr ""
-
-#: src/Util/Temporal.php:316
-msgid "minute"
-msgstr ""
-
-#: src/Util/Temporal.php:317
-msgid "second"
-msgstr ""
-
-#: src/Util/Temporal.php:317
-msgid "seconds"
-msgstr ""
-
-#: src/Util/Temporal.php:327
-#, php-format
-msgid "in %1$d %2$s"
-msgstr ""
-
-#: src/Util/Temporal.php:330
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: src/Worker/Delivery.php:539
-msgid "(no subject)"
-msgstr ""
-
-#: src/Console/PostUpdate.php:73
-#, php-format
-msgid "Post update version number has been set to %s."
-msgstr ""
-
-#: src/Console/PostUpdate.php:81
-msgid "Check for pending update actions."
-msgstr ""
-
-#: src/Console/PostUpdate.php:83
-msgid "Done."
-msgstr ""
-
-#: src/Console/PostUpdate.php:85
-msgid "Execute pending post updates."
-msgstr ""
-
-#: src/Console/PostUpdate.php:91
-msgid "All pending post updates are done."
-msgstr ""
-
-#: src/Console/NewPassword.php:93
-msgid "Enter new password: "
-msgstr ""
-
-#: src/Console/NewPassword.php:101 mod/settings.php:438
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: src/Console/NewPassword.php:104 mod/settings.php:441
-msgid "Password changed."
-msgstr ""
-
-#: src/Console/ArchiveContact.php:85
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr ""
-
-#: src/Console/ArchiveContact.php:88
-msgid "The contact entries have been archived"
-msgstr ""
-
-#: mod/lostpass.php:26
-msgid "No valid account found."
-msgstr ""
-
-#: mod/lostpass.php:38
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: mod/lostpass.php:44
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
-"\t\tpassword. In order to confirm this request, please select the "
-"verification link\n"
-"\t\tbelow or paste it into your web browser address bar.\n"
-"\n"
-"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
-"\t\tprovided and ignore and/or delete this email, the request will expire "
-"shortly.\n"
-"\n"
-"\t\tYour password will not be changed unless we can verify that you\n"
-"\t\tissued this request."
-msgstr ""
-
-#: mod/lostpass.php:55
-#, php-format
-msgid ""
-"\n"
-"\t\tFollow this link soon to verify your identity:\n"
-"\n"
-"\t\t%1$s\n"
-"\n"
-"\t\tYou will then receive a follow-up message containing the new password.\n"
-"\t\tYou may change that password from your account settings page after "
-"logging in.\n"
-"\n"
-"\t\tThe login details are as follows:\n"
-"\n"
-"\t\tSite Location:\t%2$s\n"
-"\t\tLogin Name:\t%3$s"
-msgstr ""
-
-#: mod/lostpass.php:74
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: mod/lostpass.php:89
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: mod/lostpass.php:102
-msgid "Request has expired, please make a new one."
-msgstr ""
-
-#: mod/lostpass.php:117
-msgid "Forgot your Password?"
-msgstr ""
-
-#: mod/lostpass.php:118
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: mod/lostpass.php:120
-msgid "Reset"
-msgstr ""
-
-#: mod/lostpass.php:136
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: mod/lostpass.php:137
-msgid "Your new password is"
-msgstr ""
-
-#: mod/lostpass.php:138
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: mod/lostpass.php:139
-msgid "click here to login"
-msgstr ""
-
-#: mod/lostpass.php:140
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: mod/lostpass.php:147
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tYour password has been changed as requested. Please retain this\n"
-"\t\t\tinformation for your records (or change your password immediately to\n"
-"\t\t\tsomething that you will remember).\n"
-"\t\t"
-msgstr ""
-
-#: mod/lostpass.php:153
-#, php-format
-msgid ""
-"\n"
-"\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t%2$s\n"
-"\t\t\tPassword:\t%3$s\n"
-"\n"
-"\t\t\tYou may change that password from your account settings page after "
-"logging in.\n"
-"\t\t"
-msgstr ""
-
-#: mod/lostpass.php:169
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr ""
-
-#: mod/update_contact.php:22 mod/update_profile.php:33 mod/update_notes.php:35
-#: mod/update_community.php:22 mod/update_display.php:23
-#: mod/update_network.php:32
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: mod/uimport.php:30
-msgid "User imports on closed servers can only be done by an administrator."
-msgstr ""
-
-#: mod/uimport.php:48
-msgid "Move account"
-msgstr ""
-
-#: mod/uimport.php:49
-msgid "You can import an account from another Friendica server."
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should "
+"change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the command <tt>php bin/"
+"console.php dbstructure toinnodb</tt> of your Friendica installation for an "
+"automatic conversion.<br />"
 msgstr ""
 
-#: mod/uimport.php:50
+#: src/Module/Admin/Summary.php:39
+#, php-format
 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."
+"There is a new version of Friendica available for download. Your current "
+"version is %1$s, upstream version is %2$s"
 msgstr ""
 
-#: mod/uimport.php:51
+#: src/Module/Admin/Summary.php:48
 msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
+"The database update failed. Please run \"php bin/console.php dbstructure "
+"update\" from the command line and have a look at the errors that might "
+"appear."
 msgstr ""
 
-#: mod/uimport.php:52
-msgid "Account file"
+#: src/Module/Admin/Summary.php:52
+msgid ""
+"The last update failed. Please run \"php bin/console.php dbstructure update"
+"\" from the command line and have a look at the errors that might appear. "
+"(Some of the errors are possibly inside the logfile.)"
 msgstr ""
 
-#: mod/uimport.php:52
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
+#: src/Module/Admin/Summary.php:57
+msgid "The worker was never executed. Please check your database structure!"
 msgstr ""
 
-#: mod/community.php:68
-msgid "Community option not available."
+#: src/Module/Admin/Summary.php:59
+#, php-format
+msgid ""
+"The last worker execution was on %s UTC. This is older than one hour. Please "
+"check your crontab settings."
 msgstr ""
 
-#: mod/community.php:85
-msgid "Not available."
+#: src/Module/Admin/Summary.php:64
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.config.php, please "
+"copy config/local-sample.config.php and move your config from <code>."
+"htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help "
+"with the transition."
 msgstr ""
 
-#: mod/community.php:95
-msgid "Local Community"
+#: src/Module/Admin/Summary.php:68
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.config.php, please "
+"copy config/local-sample.config.php and move your config from <code>config/"
+"local.ini.php</code>. See <a href=\"%s\">the Config help page</a> for help "
+"with the transition."
 msgstr ""
 
-#: mod/community.php:98
-msgid "Posts from local users on this server"
+#: src/Module/Admin/Summary.php:74
+#, php-format
+msgid ""
+"<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
+"configuration issue that prevents server to server communication. See <a "
+"href=\"%s\">the installation page</a> for help."
 msgstr ""
 
-#: mod/community.php:106
-msgid "Global Community"
+#: src/Module/Admin/Summary.php:92
+#, php-format
+msgid "The logfile '%s' is not usable. No logging possible (error: '%s')"
 msgstr ""
 
-#: mod/community.php:109
-msgid "Posts from users of the whole federated network"
+#: src/Module/Admin/Summary.php:107
+#, php-format
+msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')"
 msgstr ""
 
-#: mod/community.php:207
+#: src/Module/Admin/Summary.php:123
+#, php-format
 msgid ""
-"This community stream shows all public posts received by this node. They may "
-"not reflect the opinions of this node’s users."
+"Friendica's system.basepath was updated from '%s' to '%s'. Please remove the "
+"system.basepath from your db to avoid differences."
 msgstr ""
 
-#: mod/fsuggest.php:43
-msgid "Suggested contact not found."
+#: src/Module/Admin/Summary.php:131
+#, php-format
+msgid ""
+"Friendica's current system.basepath '%s' is wrong and the config file '%s' "
+"isn't used."
 msgstr ""
 
-#: mod/fsuggest.php:56
-msgid "Friend suggestion sent."
+#: src/Module/Admin/Summary.php:139
+#, php-format
+msgid ""
+"Friendica's current system.basepath '%s' is not equal to the config file "
+"'%s'. Please fix your configuration."
 msgstr ""
 
-#: mod/fsuggest.php:78
-msgid "Suggest Friends"
+#: src/Module/Admin/Summary.php:146
+msgid "Normal Account"
 msgstr ""
 
-#: mod/fsuggest.php:80
-#, php-format
-msgid "Suggest a friend for %s"
+#: src/Module/Admin/Summary.php:147
+msgid "Automatic Follower Account"
 msgstr ""
 
-#: mod/common.php:90
-msgid "No contacts in common."
+#: src/Module/Admin/Summary.php:148
+msgid "Public Forum Account"
 msgstr ""
 
-#: mod/ping.php:270
-msgid "{0} wants to be your friend"
+#: src/Module/Admin/Summary.php:149
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: mod/ping.php:286
-msgid "{0} requested registration"
+#: src/Module/Admin/Summary.php:150
+msgid "Blog Account"
 msgstr ""
 
-#: mod/lockview.php:47 mod/lockview.php:58
-msgid "Remote privacy information not available."
+#: src/Module/Admin/Summary.php:151
+msgid "Private Forum Account"
 msgstr ""
 
-#: mod/events.php:119 mod/events.php:121
-msgid "Event can not end before it has started."
+#: src/Module/Admin/Summary.php:171
+msgid "Message queues"
 msgstr ""
 
-#: mod/events.php:128 mod/events.php:130
-msgid "Event title and start time are required."
+#: src/Module/Admin/Summary.php:177
+msgid "Server Settings"
 msgstr ""
 
-#: mod/events.php:394 mod/cal.php:259
-msgid "View"
+#: src/Module/Admin/Summary.php:191
+msgid "Summary"
 msgstr ""
 
-#: mod/events.php:395
-msgid "Create New Event"
+#: src/Module/Admin/Summary.php:193
+msgid "Registered users"
 msgstr ""
 
-#: mod/events.php:396 mod/cal.php:260
-msgid "Previous"
+#: src/Module/Admin/Summary.php:195
+msgid "Pending registrations"
 msgstr ""
 
-#: mod/events.php:406 mod/cal.php:268
-msgid "list"
+#: src/Module/Admin/Summary.php:196
+msgid "Version"
 msgstr ""
 
-#: mod/events.php:507
-msgid "Event details"
+#: src/Module/Admin/Summary.php:200
+msgid "Active addons"
 msgstr ""
 
-#: mod/events.php:508
-msgid "Starting date and Title are required."
+#: src/Module/Admin/Tos.php:29
+msgid "The Terms of Service settings have been updated."
 msgstr ""
 
-#: mod/events.php:509 mod/events.php:514
-msgid "Event Starts:"
+#: src/Module/Admin/Tos.php:43
+msgid "Display Terms of Service"
 msgstr ""
 
-#: mod/events.php:509 mod/events.php:541 mod/profiles.php:590
-msgid "Required"
+#: src/Module/Admin/Tos.php:43
+msgid ""
+"Enable the Terms of Service page. If this is enabled a link to the terms "
+"will be added to the registration form and the general information page."
 msgstr ""
 
-#: mod/events.php:522 mod/events.php:547
-msgid "Finish date/time is not known or not relevant"
+#: src/Module/Admin/Tos.php:44
+msgid "Display Privacy Statement"
 msgstr ""
 
-#: mod/events.php:524 mod/events.php:529
-msgid "Event Finishes:"
+#: src/Module/Admin/Tos.php:44
+#, php-format
+msgid ""
+"Show some informations regarding the needed information to operate the node "
+"according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 msgstr ""
 
-#: mod/events.php:535 mod/events.php:548
-msgid "Adjust for viewer timezone"
+#: src/Module/Admin/Tos.php:45
+msgid "Privacy Statement Preview"
 msgstr ""
 
-#: mod/events.php:537
-msgid "Description:"
+#: src/Module/Admin/Tos.php:47
+msgid "The Terms of Service"
 msgstr ""
 
-#: mod/events.php:541 mod/events.php:543
-msgid "Title:"
+#: src/Module/Admin/Tos.php:47
+msgid ""
+"Enter the Terms of Service for your node here. You can use BBCode. Headers "
+"of sections should be [h2] and below."
 msgstr ""
 
-#: mod/events.php:544 mod/events.php:545
-msgid "Share this event"
+#: src/Module/Admin/Users.php:45
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/events.php:554 mod/photos.php:970 mod/photos.php:1340
-msgid "Permissions"
+#: src/Module/Admin/Users.php:48
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default "
+"profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %1$s/"
+"removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/events.php:570
-msgid "Failed to remove event"
-msgstr ""
+#: src/Module/Admin/Users.php:93
+#, php-format
+msgid "%s user blocked"
+msgid_plural "%s users blocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/events.php:572
-msgid "Event removed"
-msgstr ""
+#: src/Module/Admin/Users.php:99
+#, php-format
+msgid "%s user unblocked"
+msgid_plural "%s users unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
+#: src/Module/Admin/Users.php:107 src/Module/Admin/Users.php:157
+msgid "You can't remove yourself"
 msgstr ""
 
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr ""
+#: src/Module/Admin/Users.php:111
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/api.php:109
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: src/Module/Admin/Users.php:155
+#, php-format
+msgid "User \"%s\" deleted"
 msgstr ""
 
-#: mod/dfrn_poll.php:122 mod/dfrn_poll.php:525
+#: src/Module/Admin/Users.php:164
 #, php-format
-msgid "%1$s welcomes %2$s"
+msgid "User \"%s\" blocked"
 msgstr ""
 
-#: mod/cal.php:297
-msgid "This calendar format is not supported"
+#: src/Module/Admin/Users.php:170
+#, php-format
+msgid "User \"%s\" unblocked"
 msgstr ""
 
-#: mod/cal.php:299
-msgid "No exportable data found"
+#: src/Module/Admin/Users.php:223
+msgid "Private Forum"
 msgstr ""
 
-#: mod/cal.php:316
-msgid "calendar"
+#: src/Module/Admin/Users.php:230
+msgid "Relay"
 msgstr ""
 
-#: mod/display.php:225 mod/display.php:306
-msgid "The requested item doesn't exist or has been deleted."
+#: src/Module/Admin/Users.php:269 src/Module/Admin/Users.php:294
+msgid "Register date"
 msgstr ""
 
-#: mod/display.php:386
-msgid "The feed for this item is unavailable."
+#: src/Module/Admin/Users.php:269 src/Module/Admin/Users.php:294
+msgid "Last login"
 msgstr ""
 
-#: mod/dfrn_request.php:101
-msgid "This introduction has already been accepted."
+#: src/Module/Admin/Users.php:269 src/Module/Admin/Users.php:294
+msgid "Last item"
 msgstr ""
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:357
-msgid "Profile location is not valid or does not contain profile information."
+#: src/Module/Admin/Users.php:269
+msgid "Type"
 msgstr ""
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:361
-msgid "Warning: profile location has no identifiable owner name."
+#: src/Module/Admin/Users.php:276
+msgid "Add User"
 msgstr ""
 
-#: mod/dfrn_request.php:126 mod/dfrn_request.php:364
-msgid "Warning: profile location has no profile photo."
+#: src/Module/Admin/Users.php:278
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/dfrn_request.php:130 mod/dfrn_request.php:368
-#, 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:168
-msgid "Introduction complete."
+#: src/Module/Admin/Users.php:279
+msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/dfrn_request.php:204
-msgid "Unrecoverable protocol error."
+#: src/Module/Admin/Users.php:280
+msgid "Request date"
 msgstr ""
 
-#: mod/dfrn_request.php:231
-msgid "Profile unavailable."
+#: src/Module/Admin/Users.php:281
+msgid "No registrations."
 msgstr ""
 
-#: mod/dfrn_request.php:252
-#, php-format
-msgid "%s has received too many connection requests today."
+#: src/Module/Admin/Users.php:282
+msgid "Note from the user"
 msgstr ""
 
-#: mod/dfrn_request.php:253
-msgid "Spam protection measures have been invoked."
+#: src/Module/Admin/Users.php:284
+msgid "Deny"
 msgstr ""
 
-#: mod/dfrn_request.php:254
-msgid "Friends are advised to please try again in 24 hours."
+#: src/Module/Admin/Users.php:287
+msgid "User blocked"
 msgstr ""
 
-#: mod/dfrn_request.php:278
-msgid "Invalid locator"
+#: src/Module/Admin/Users.php:289
+msgid "Site admin"
 msgstr ""
 
-#: mod/dfrn_request.php:314
-msgid "You have already introduced yourself here."
+#: src/Module/Admin/Users.php:290
+msgid "Account expired"
 msgstr ""
 
-#: mod/dfrn_request.php:317
-#, php-format
-msgid "Apparently you are already friends with %s."
+#: src/Module/Admin/Users.php:293
+msgid "New User"
 msgstr ""
 
-#: mod/dfrn_request.php:337
-msgid "Invalid profile URL."
+#: src/Module/Admin/Users.php:294
+msgid "Permanent deletion"
 msgstr ""
 
-#: mod/dfrn_request.php:436
-msgid "Your introduction has been sent."
+#: src/Module/Admin/Users.php:299
+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/dfrn_request.php:474
+#: src/Module/Admin/Users.php:300
 msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
+"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/dfrn_request.php:490
-msgid "Please login to confirm introduction."
+#: src/Module/Admin/Users.php:310
+msgid "Name of the new user."
 msgstr ""
 
-#: mod/dfrn_request.php:498
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: src/Module/Admin/Users.php:311
+msgid "Nickname"
 msgstr ""
 
-#: mod/dfrn_request.php:512 mod/dfrn_request.php:527
-msgid "Confirm"
+#: src/Module/Admin/Users.php:311
+msgid "Nickname of the new user."
 msgstr ""
 
-#: mod/dfrn_request.php:523
-msgid "Hide this contact"
+#: src/Module/Admin/Users.php:312
+msgid "Email address of the new user."
 msgstr ""
 
-#: mod/dfrn_request.php:525
-#, php-format
-msgid "Welcome home %s."
+#: src/Module/Debug/Babel.php:32
+msgid "Source input"
 msgstr ""
 
-#: mod/dfrn_request.php:526
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
+#: src/Module/Debug/Babel.php:38
+msgid "BBCode::toPlaintext"
 msgstr ""
 
-#: mod/dfrn_request.php:635
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
+#: src/Module/Debug/Babel.php:44
+msgid "BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/dfrn_request.php:637
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a href=\"%s\">follow "
-"this link to find a public Friendica site and join us today</a>."
+#: src/Module/Debug/Babel.php:49
+msgid "BBCode::convert"
 msgstr ""
 
-#: mod/dfrn_request.php:640
-msgid "Friend/Connection Request"
+#: src/Module/Debug/Babel.php:55
+msgid "BBCode::convert => HTML::toBBCode"
 msgstr ""
 
-#: mod/dfrn_request.php:641
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@gnusocial.de"
+#: src/Module/Debug/Babel.php:61
+msgid "BBCode::toMarkdown"
 msgstr ""
 
-#: mod/dfrn_request.php:642 mod/follow.php:161
-msgid "Please answer the following:"
+#: src/Module/Debug/Babel.php:67
+msgid "BBCode::toMarkdown => Markdown::convert (raw HTML)"
 msgstr ""
 
-#: mod/dfrn_request.php:643 mod/follow.php:162
-#, php-format
-msgid "Does %s know you?"
+#: src/Module/Debug/Babel.php:71
+msgid "BBCode::toMarkdown => Markdown::convert"
 msgstr ""
 
-#: mod/dfrn_request.php:644 mod/follow.php:163
-msgid "Add a personal note:"
+#: src/Module/Debug/Babel.php:77
+msgid "BBCode::toMarkdown => Markdown::toBBCode"
 msgstr ""
 
-#: mod/dfrn_request.php:646
-msgid "Friendica"
+#: src/Module/Debug/Babel.php:83
+msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 msgstr ""
 
-#: mod/dfrn_request.php:647
-msgid "GNU Social (Pleroma, Mastodon)"
+#: src/Module/Debug/Babel.php:94
+msgid "Item Body"
 msgstr ""
 
-#: mod/dfrn_request.php:648
-msgid "Diaspora (Socialhome, Hubzilla)"
+#: src/Module/Debug/Babel.php:98
+msgid "Item Tags"
 msgstr ""
 
-#: mod/dfrn_request.php:649
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
+#: src/Module/Debug/Babel.php:105
+msgid "Source input (Diaspora format)"
 msgstr ""
 
-#: mod/dfrn_request.php:650 mod/follow.php:169 mod/unfollow.php:127
-msgid "Your Identity Address:"
+#: src/Module/Debug/Babel.php:111
+msgid "Markdown::convert (raw HTML)"
 msgstr ""
 
-#: mod/dfrn_request.php:652 mod/follow.php:75 mod/unfollow.php:130
-msgid "Submit Request"
+#: src/Module/Debug/Babel.php:116
+msgid "Markdown::convert"
 msgstr ""
 
-#: mod/crepair.php:79
-msgid "Contact settings applied."
+#: src/Module/Debug/Babel.php:122
+msgid "Markdown::toBBCode"
 msgstr ""
 
-#: mod/crepair.php:81
-msgid "Contact update failed."
+#: src/Module/Debug/Babel.php:129
+msgid "Raw HTML input"
 msgstr ""
 
-#: mod/crepair.php:115
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
+#: src/Module/Debug/Babel.php:134
+msgid "HTML Input"
 msgstr ""
 
-#: mod/crepair.php:116
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
+#: src/Module/Debug/Babel.php:140
+msgid "HTML::toBBCode"
 msgstr ""
 
-#: mod/crepair.php:130 mod/crepair.php:132
-msgid "No mirroring"
+#: src/Module/Debug/Babel.php:146
+msgid "HTML::toBBCode => BBCode::convert"
 msgstr ""
 
-#: mod/crepair.php:130
-msgid "Mirror as forwarded posting"
+#: src/Module/Debug/Babel.php:151
+msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/crepair.php:130 mod/crepair.php:132
-msgid "Mirror as my own posting"
+#: src/Module/Debug/Babel.php:157
+msgid "HTML::toBBCode => BBCode::toPlaintext"
 msgstr ""
 
-#: mod/crepair.php:145
-msgid "Return to contact editor"
+#: src/Module/Debug/Babel.php:163
+msgid "HTML::toMarkdown"
 msgstr ""
 
-#: mod/crepair.php:147
-msgid "Refetch contact data"
+#: src/Module/Debug/Babel.php:169
+msgid "HTML::toPlaintext"
 msgstr ""
 
-#: mod/crepair.php:150
-msgid "Remote Self"
+#: src/Module/Debug/Babel.php:175
+msgid "HTML::toPlaintext (compact)"
 msgstr ""
 
-#: mod/crepair.php:153
-msgid "Mirror postings from this contact"
+#: src/Module/Debug/Babel.php:183
+msgid "Source text"
 msgstr ""
 
-#: mod/crepair.php:155
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
+#: src/Module/Debug/Babel.php:184
+msgid "BBCode"
 msgstr ""
 
-#: mod/crepair.php:160
-msgid "Account Nickname"
+#: src/Module/Debug/Babel.php:185
+msgid "Markdown"
 msgstr ""
 
-#: mod/crepair.php:161
-msgid "@Tagname - overrides Name/Nickname"
+#: src/Module/Debug/Babel.php:186
+msgid "HTML"
 msgstr ""
 
-#: mod/crepair.php:162
-msgid "Account URL"
+#: src/Module/Debug/Feed.php:20 src/Module/Filer/SaveTag.php:19
+msgid "You must be logged in to use this module"
 msgstr ""
 
-#: mod/crepair.php:163
-msgid "Account URL Alias"
+#: src/Module/Debug/Feed.php:46
+msgid "Source URL"
 msgstr ""
 
-#: mod/crepair.php:164
-msgid "Friend Request URL"
+#: src/Module/Debug/Localtime.php:30
+msgid "Time Conversion"
 msgstr ""
 
-#: mod/crepair.php:165
-msgid "Friend Confirm URL"
+#: src/Module/Debug/Localtime.php:31
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: mod/crepair.php:166
-msgid "Notification Endpoint URL"
+#: src/Module/Debug/Localtime.php:32
+#, php-format
+msgid "UTC time: %s"
 msgstr ""
 
-#: mod/crepair.php:167
-msgid "Poll/Feed URL"
+#: src/Module/Debug/Localtime.php:35
+#, php-format
+msgid "Current timezone: %s"
 msgstr ""
 
-#: mod/crepair.php:168
-msgid "New photo from this URL"
+#: src/Module/Debug/Localtime.php:39
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: mod/notifications.php:34 mod/notifications.php:174 mod/notifications.php:230
-#: mod/message.php:108
-msgid "Discard"
+#: src/Module/Debug/Localtime.php:43
+msgid "Please select your timezone:"
 msgstr ""
 
-#: mod/notifications.php:91
-msgid "Network Notifications"
+#: src/Module/Debug/Probe.php:19 src/Module/Debug/WebFinger.php:18
+msgid "Only logged in users are permitted to perform a probing."
 msgstr ""
 
-#: mod/notifications.php:96
-msgid "System Notifications"
+#: src/Module/Debug/Probe.php:35
+msgid "Lookup address"
 msgstr ""
 
-#: mod/notifications.php:101
-msgid "Personal Notifications"
+#: src/Module/Filer/SaveTag.php:38
+#, php-format
+msgid "Filetag %s saved to item"
 msgstr ""
 
-#: mod/notifications.php:106
-msgid "Home Notifications"
+#: src/Module/Filer/SaveTag.php:47
+msgid "- select -"
 msgstr ""
 
-#: mod/notifications.php:129
-msgid "Show unread"
+#: src/Module/Item/Compose.php:27
+msgid "Please enter a post body."
 msgstr ""
 
-#: mod/notifications.php:129
-msgid "Show all"
+#: src/Module/Item/Compose.php:40
+msgid "This feature is only available with the frio theme."
 msgstr ""
 
-#: mod/notifications.php:140
-msgid "Show Ignored Requests"
+#: src/Module/Item/Compose.php:67
+msgid "Compose new personal note"
 msgstr ""
 
-#: mod/notifications.php:140
-msgid "Hide Ignored Requests"
+#: src/Module/Item/Compose.php:76
+msgid "Compose new post"
 msgstr ""
 
-#: mod/notifications.php:153 mod/notifications.php:238
-msgid "Notification type:"
+#: src/Module/Item/Compose.php:116
+msgid "Visibility"
 msgstr ""
 
-#: mod/notifications.php:156
-msgid "Suggested by:"
+#: src/Module/Item/Compose.php:137
+msgid "Clear the location"
 msgstr ""
 
-#: mod/notifications.php:190
-msgid "Claims to be known to you: "
+#: src/Module/Item/Compose.php:138
+msgid "Location services are unavailable on your device"
 msgstr ""
 
-#: mod/notifications.php:191
-msgid "yes"
+#: src/Module/Item/Compose.php:139
+msgid ""
+"Location services are disabled. Please check the website's permissions on "
+"your device"
 msgstr ""
 
-#: mod/notifications.php:191
-msgid "no"
+#: src/Module/Profile/Contacts.php:23 src/Module/Profile/Contacts.php:36
+#: src/Module/Register.php:241
+msgid "User not found."
 msgstr ""
 
-#: mod/notifications.php:192 mod/notifications.php:196
-msgid "Shall your connection be bidirectional or not?"
+#: src/Module/Profile/Contacts.php:77
+msgid "No contacts."
 msgstr ""
 
-#: mod/notifications.php:193 mod/notifications.php:197
+#: src/Module/Profile/Contacts.php:92 src/Module/Contact.php:587
+#: src/Module/Contact.php:1030
 #, php-format
-msgid ""
-"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
-"also receive updates from them in your news feed."
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: mod/notifications.php:194
+#: src/Module/Profile/Contacts.php:111
+#, php-format
+msgid "Follower (%s)"
+msgid_plural "Followers (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Module/Profile/Contacts.php:112
+#, php-format
+msgid "Following (%s)"
+msgid_plural "Following (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Module/Profile/Contacts.php:113
 #, php-format
-msgid ""
-"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
-"will not receive updates from them in your news feed."
-msgstr ""
+msgid "Mutual friend (%s)"
+msgid_plural "Mutual friends (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/notifications.php:198
+#: src/Module/Profile/Contacts.php:115
 #, php-format
-msgid ""
-"Accepting %s as a sharer allows them to subscribe to your posts, but you "
-"will not receive updates from them in your news feed."
-msgstr ""
+msgid "Contact (%s)"
+msgid_plural "Contacts (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/notifications.php:209
-msgid "Friend"
+#: src/Module/Profile/Contacts.php:124
+msgid "All contacts"
 msgstr ""
 
-#: mod/notifications.php:210
-msgid "Sharer"
+#: src/Module/Search/Acl.php:37
+msgid "You must be logged in to use this module."
 msgstr ""
 
-#: mod/notifications.php:210
-msgid "Subscriber"
+#: src/Module/Search/Index.php:33
+msgid "Only logged in users are permitted to perform a search."
 msgstr ""
 
-#: mod/notifications.php:275
-msgid "No introductions."
+#: src/Module/Search/Index.php:55
+msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
-#: mod/notifications.php:309
+#: src/Module/Search/Index.php:173
 #, php-format
-msgid "No more %s notifications."
+msgid "Items tagged with: %s"
 msgstr ""
 
-#: mod/wallmessage.php:51 mod/wallmessage.php:114
+#: src/Module/Search/Index.php:175 src/Module/Contact.php:816
 #, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgid "Results for: %s"
 msgstr ""
 
-#: mod/wallmessage.php:59 mod/message.php:68
-msgid "No recipient selected."
+#: src/Module/Search/Saved.php:25
+msgid "Search term successfully saved."
 msgstr ""
 
-#: mod/wallmessage.php:62
-msgid "Unable to check your home location."
+#: src/Module/Search/Saved.php:27
+msgid "Search term already saved."
 msgstr ""
 
-#: mod/wallmessage.php:65 mod/message.php:75
-msgid "Message could not be sent."
+#: src/Module/Search/Saved.php:33
+msgid "Search term successfully removed."
 msgstr ""
 
-#: mod/wallmessage.php:68 mod/message.php:78
-msgid "Message collection failure."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:33
+#: src/Module/Settings/TwoFactor/Recovery.php:31
+#: src/Module/Settings/TwoFactor/Verify.php:37
+msgid "Please enter your password to access this page."
 msgstr ""
 
-#: mod/wallmessage.php:71 mod/message.php:81
-msgid "Message sent."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:51
+msgid "App-specific password generation failed: The description is empty."
 msgstr ""
 
-#: mod/wallmessage.php:88 mod/wallmessage.php:97
-msgid "No recipient."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:54
+msgid ""
+"App-specific password generation failed: This description already exists."
 msgstr ""
 
-#: mod/wallmessage.php:122 mod/message.php:202 mod/message.php:358
-msgid "Please enter a link URL:"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:58
+msgid "New app-specific password generated."
 msgstr ""
 
-#: mod/wallmessage.php:127 mod/message.php:244
-msgid "Send Private Message"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:64
+msgid "App-specific passwords successfully revoked."
 msgstr ""
 
-#: mod/wallmessage.php:128
-#, php-format
+#: src/Module/Settings/TwoFactor/AppSpecific.php:74
+msgid "App-specific password successfully revoked."
+msgstr ""
+
+#: src/Module/Settings/TwoFactor/AppSpecific.php:95
+msgid "Two-factor app-specific passwords"
+msgstr ""
+
+#: src/Module/Settings/TwoFactor/AppSpecific.php:97
 msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
+"<p>App-specific passwords are randomly generated passwords used instead your "
+"regular password to authenticate your account on third-party applications "
+"that don't support two-factor authentication.</p>"
 msgstr ""
 
-#: mod/wallmessage.php:129 mod/message.php:245 mod/message.php:428
-msgid "To:"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:98
+msgid ""
+"Make sure to copy your new app-specific password now. You won’t be able to "
+"see it again!"
 msgstr ""
 
-#: mod/wallmessage.php:130 mod/message.php:249 mod/message.php:430
-msgid "Subject:"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:101
+msgid "Description"
 msgstr ""
 
-#: mod/wallmessage.php:139 mod/editpost.php:77 mod/message.php:257
-#: mod/message.php:438
-msgid "Insert web link"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:102
+msgid "Last Used"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:103
+msgid "Revoke"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:31
-msgid "No contact provided."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:104
+msgid "Revoke All"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:38
-msgid "Couldn't fetch information for contact."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:107
+msgid ""
+"When you generate a new app-specific password, you must use it right away, "
+"it will be shown to you once after you generate it."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:48
-msgid "Couldn't fetch friends for contact."
+#: src/Module/Settings/TwoFactor/AppSpecific.php:108
+msgid "Generate new app-specific password"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:66 mod/repair_ostatus.php:49
-msgid "Done"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:109
+msgid "Friendiqa on my Fairphone 2..."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:80
-msgid "success"
+#: src/Module/Settings/TwoFactor/AppSpecific.php:110
+msgid "Generate"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:82
-msgid "failed"
+#: src/Module/Settings/TwoFactor/Index.php:48
+msgid "Two-factor authentication successfully disabled."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:90 mod/repair_ostatus.php:55
-msgid "Keep this window open until done."
+#: src/Module/Settings/TwoFactor/Index.php:89
+msgid ""
+"<p>Use an application on a mobile device to get two-factor authentication "
+"codes when prompted on login.</p>"
 msgstr ""
 
-#: mod/follow.php:45
-msgid "The contact could not be added."
+#: src/Module/Settings/TwoFactor/Index.php:93
+msgid "Authenticator app"
 msgstr ""
 
-#: mod/follow.php:86
-msgid "You already added this contact."
+#: src/Module/Settings/TwoFactor/Index.php:94
+msgid "Configured"
 msgstr ""
 
-#: mod/follow.php:98
-msgid "Diaspora support isn't enabled. Contact can't be added."
+#: src/Module/Settings/TwoFactor/Index.php:94
+msgid "Not Configured"
 msgstr ""
 
-#: mod/follow.php:105
-msgid "OStatus support is disabled. Contact can't be added."
+#: src/Module/Settings/TwoFactor/Index.php:95
+msgid "<p>You haven't finished configuring your authenticator app.</p>"
 msgstr ""
 
-#: mod/follow.php:112
-msgid "The network type couldn't be detected. Contact can't be added."
+#: src/Module/Settings/TwoFactor/Index.php:96
+msgid "<p>Your authenticator app is correctly configured.</p>"
 msgstr ""
 
-#: mod/fbrowser.php:111 mod/fbrowser.php:140 mod/profile_photo.php:246
-msgid "Upload"
+#: src/Module/Settings/TwoFactor/Index.php:98
+msgid "Recovery codes"
 msgstr ""
 
-#: mod/fbrowser.php:135
-msgid "Files"
+#: src/Module/Settings/TwoFactor/Index.php:99
+msgid "Remaining valid codes"
 msgstr ""
 
-#: mod/network.php:493
-#, php-format
+#: src/Module/Settings/TwoFactor/Index.php:101
 msgid ""
-"Warning: This group contains %s member from a network that doesn't allow non "
-"public messages."
-msgid_plural ""
-"Warning: This group contains %s members from a network that doesn't allow "
-"non public messages."
-msgstr[0] ""
-msgstr[1] ""
+"<p>These one-use codes can replace an authenticator app code in case you "
+"have lost access to it.</p>"
+msgstr ""
 
-#: mod/network.php:496
-msgid "Messages in this group won't be send to these receivers."
+#: src/Module/Settings/TwoFactor/Index.php:103
+msgid "App-specific passwords"
 msgstr ""
 
-#: mod/network.php:563
-msgid "No such group"
+#: src/Module/Settings/TwoFactor/Index.php:104
+msgid "Generated app-specific passwords"
 msgstr ""
 
-#: mod/network.php:588
-#, php-format
-msgid "Group: %s"
+#: src/Module/Settings/TwoFactor/Index.php:106
+msgid ""
+"<p>These randomly generated passwords allow you to authenticate on apps not "
+"supporting two-factor authentication.</p>"
 msgstr ""
 
-#: mod/network.php:614
-msgid "Private messages to this person are at risk of public disclosure."
+#: src/Module/Settings/TwoFactor/Index.php:108 src/Module/Contact.php:632
+msgid "Actions"
 msgstr ""
 
-#: mod/network.php:901
-msgid "Latest Activity"
+#: src/Module/Settings/TwoFactor/Index.php:109
+msgid "Current password:"
 msgstr ""
 
-#: mod/network.php:904
-msgid "Sort by latest activity"
+#: src/Module/Settings/TwoFactor/Index.php:109
+msgid ""
+"You need to provide your current password to change two-factor "
+"authentication settings."
 msgstr ""
 
-#: mod/network.php:909
-msgid "Latest Posts"
+#: src/Module/Settings/TwoFactor/Index.php:110
+msgid "Enable two-factor authentication"
 msgstr ""
 
-#: mod/network.php:912
-msgid "Sort by post received date"
+#: src/Module/Settings/TwoFactor/Index.php:111
+msgid "Disable two-factor authentication"
 msgstr ""
 
-#: mod/network.php:919 mod/profiles.php:577
-msgid "Personal"
+#: src/Module/Settings/TwoFactor/Index.php:112
+msgid "Show recovery codes"
 msgstr ""
 
-#: mod/network.php:922
-msgid "Posts that mention or involve you"
+#: src/Module/Settings/TwoFactor/Index.php:113
+msgid "Manage app-specific passwords"
 msgstr ""
 
-#: mod/network.php:929
-msgid "New"
+#: src/Module/Settings/TwoFactor/Index.php:114
+msgid "Finish app configuration"
 msgstr ""
 
-#: mod/network.php:932
-msgid "Activity Stream - by date"
+#: src/Module/Settings/TwoFactor/Recovery.php:47
+msgid "New recovery codes successfully generated."
 msgstr ""
 
-#: mod/network.php:940
-msgid "Shared Links"
+#: src/Module/Settings/TwoFactor/Recovery.php:73
+msgid "Two-factor recovery codes"
 msgstr ""
 
-#: mod/network.php:943
-msgid "Interesting Links"
+#: src/Module/Settings/TwoFactor/Recovery.php:75
+msgid ""
+"<p>Recovery codes can be used to access your account in the event you lose "
+"access to your device and cannot receive two-factor authentication codes.</"
+"p><p><strong>Put these in a safe spot!</strong> If you lose your device and "
+"don’t have the recovery codes you will lose access to your account.</p>"
 msgstr ""
 
-#: mod/network.php:950
-msgid "Starred"
+#: src/Module/Settings/TwoFactor/Recovery.php:77
+msgid ""
+"When you generate new recovery codes, you must copy the new codes. Your old "
+"codes won’t work anymore."
 msgstr ""
 
-#: mod/network.php:953
-msgid "Favourite Posts"
+#: src/Module/Settings/TwoFactor/Recovery.php:78
+msgid "Generate new recovery codes"
 msgstr ""
 
-#: mod/unfollow.php:35 mod/unfollow.php:91
-msgid "You aren't following this contact."
+#: src/Module/Settings/TwoFactor/Recovery.php:80
+msgid "Next: Verification"
 msgstr ""
 
-#: mod/unfollow.php:45 mod/unfollow.php:97
-msgid "Unfollowing is currently not supported by your network."
+#: src/Module/Settings/TwoFactor/Verify.php:59
+msgid "Two-factor authentication successfully activated."
 msgstr ""
 
-#: mod/unfollow.php:66
-msgid "Contact unfollowed"
+#: src/Module/Settings/TwoFactor/Verify.php:63
+#: src/Module/Security/TwoFactor/Recovery.php:45
+#: src/Module/Security/TwoFactor/Verify.php:42
+msgid "Invalid code, please retry."
 msgstr ""
 
-#: mod/unfollow.php:117
-msgid "Disconnect/Unfollow"
+#: src/Module/Settings/TwoFactor/Verify.php:92
+#, php-format
+msgid ""
+"<p>Or you can submit the authentication settings manually:</p>\n"
+"<dl>\n"
+"\t<dt>Issuer</dt>\n"
+"\t<dd>%s</dd>\n"
+"\t<dt>Account Name</dt>\n"
+"\t<dd>%s</dd>\n"
+"\t<dt>Secret Key</dt>\n"
+"\t<dd>%s</dd>\n"
+"\t<dt>Type</dt>\n"
+"\t<dd>Time-based</dd>\n"
+"\t<dt>Number of digits</dt>\n"
+"\t<dd>6</dd>\n"
+"\t<dt>Hashing algorithm</dt>\n"
+"\t<dd>SHA-1</dd>\n"
+"</dl>"
 msgstr ""
 
-#: mod/profile_photo.php:57
-msgid "Image uploaded but image cropping failed."
+#: src/Module/Settings/TwoFactor/Verify.php:112
+msgid "Two-factor code verification"
 msgstr ""
 
-#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
-#: mod/profile_photo.php:310
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: src/Module/Settings/TwoFactor/Verify.php:114
+msgid ""
+"<p>Please scan this QR Code with your authenticator app and submit the "
+"provided code.</p>"
 msgstr ""
 
-#: mod/profile_photo.php:124
+#: src/Module/Settings/TwoFactor/Verify.php:116
+#, php-format
 msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"<p>Or you can open the following URL in your mobile devicde:</p><p><a href="
+"\"%s\">%s</a></p>"
 msgstr ""
 
-#: mod/profile_photo.php:132
-msgid "Unable to process image"
+#: src/Module/Settings/TwoFactor/Verify.php:122
+#: src/Module/Security/TwoFactor/Verify.php:66
+msgid "Please enter a code from your authentication app"
 msgstr ""
 
-#: mod/profile_photo.php:151 mod/photos.php:670 mod/photos.php:673
-#: mod/photos.php:702 mod/wall_upload.php:185
-#, php-format
-msgid "Image exceeds size limit of %s"
+#: src/Module/Settings/TwoFactor/Verify.php:123
+msgid "Verify code and enable two-factor authentication"
 msgstr ""
 
-#: mod/profile_photo.php:160 mod/photos.php:725 mod/wall_upload.php:199
-msgid "Unable to process image."
+#: src/Module/Settings/Delegation.php:34
+msgid "Delegation successfully granted."
 msgstr ""
 
-#: mod/profile_photo.php:243
-msgid "Upload File:"
+#: src/Module/Settings/Delegation.php:36
+msgid "Parent user not found, unavailable or password doesn't match."
 msgstr ""
 
-#: mod/profile_photo.php:244
-msgid "Select a profile:"
+#: src/Module/Settings/Delegation.php:40
+msgid "Delegation successfully revoked."
 msgstr ""
 
-#: mod/profile_photo.php:249
-msgid "or"
+#: src/Module/Settings/Delegation.php:62 src/Module/Settings/Delegation.php:84
+msgid ""
+"Delegated administrators can view but not change delegation permissions."
 msgstr ""
 
-#: mod/profile_photo.php:250
-msgid "skip this step"
+#: src/Module/Settings/Delegation.php:76
+msgid "Delegate user not found."
 msgstr ""
 
-#: mod/profile_photo.php:250
-msgid "select a photo from your photo albums"
+#: src/Module/Settings/Delegation.php:123
+msgid "No parent user"
 msgstr ""
 
-#: mod/profile_photo.php:263
-msgid "Crop Image"
+#: src/Module/Settings/Delegation.php:134
+#: src/Module/Settings/Delegation.php:145
+msgid "Parent User"
 msgstr ""
 
-#: mod/profile_photo.php:264
-msgid "Please adjust the image cropping for optimum viewing."
+#: src/Module/Settings/Delegation.php:135 src/Module/Register.php:151
+msgid "Parent Password:"
 msgstr ""
 
-#: mod/profile_photo.php:266
-msgid "Done Editing"
+#: src/Module/Settings/Delegation.php:135 src/Module/Register.php:151
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
 msgstr ""
 
-#: mod/profile_photo.php:300
-msgid "Image uploaded successfully."
+#: src/Module/Settings/Delegation.php:142
+msgid "Additional Accounts"
 msgstr ""
 
-#: mod/profile_photo.php:302 mod/photos.php:754 mod/wall_upload.php:238
-msgid "Image upload failed."
+#: src/Module/Settings/Delegation.php:143
+msgid ""
+"Register additional accounts that are automatically connected to your "
+"existing account so you can manage them from this account."
 msgstr ""
 
-#: mod/poke.php:178
-msgid "Poke/Prod"
+#: src/Module/Settings/Delegation.php:144
+msgid "Register an additional account"
 msgstr ""
 
-#: mod/poke.php:179
-msgid "poke, prod or do other things to somebody"
+#: src/Module/Settings/Delegation.php:148
+msgid ""
+"Parent users have total control about this account, including the account "
+"settings. Please double check whom you give this access."
 msgstr ""
 
-#: mod/poke.php:180
-msgid "Recipient"
+#: src/Module/Settings/Delegation.php:151
+msgid "Manage Accounts"
 msgstr ""
 
-#: mod/poke.php:181
-msgid "Choose what you wish to do to recipient"
+#: src/Module/Settings/Delegation.php:152
+msgid "Delegates"
 msgstr ""
 
-#: mod/poke.php:184
-msgid "Make this post private"
+#: src/Module/Settings/Delegation.php:154
+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/photos.php:111 mod/photos.php:1600
-msgid "Recent Photos"
+#: src/Module/Settings/Delegation.php:155
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: mod/photos.php:113 mod/photos.php:1109 mod/photos.php:1602
-msgid "Upload New Photos"
+#: src/Module/Settings/Delegation.php:157
+msgid "Potential Delegates"
 msgstr ""
 
-#: mod/photos.php:168
-msgid "Contact information unavailable"
+#: src/Module/Settings/Delegation.php:160
+msgid "Add"
 msgstr ""
 
-#: mod/photos.php:190
-msgid "Album not found."
+#: src/Module/Settings/Delegation.php:161
+msgid "No entries."
 msgstr ""
 
-#: mod/photos.php:248
-msgid "Album successfully deleted"
+#: src/Module/Settings/UserExport.php:41
+msgid "Export account"
 msgstr ""
 
-#: mod/photos.php:250
-msgid "Album was empty."
+#: src/Module/Settings/UserExport.php:41
+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/photos.php:575
-msgid "a photo"
+#: src/Module/Settings/UserExport.php:42
+msgid "Export all"
 msgstr ""
 
-#: mod/photos.php:575
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
+#: src/Module/Settings/UserExport.php:42
+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/photos.php:676
-msgid "Image upload didn't complete, please try again"
+#: src/Module/Settings/UserExport.php:43
+msgid "Export Contacts to CSV"
 msgstr ""
 
-#: mod/photos.php:679
-msgid "Image file is missing"
+#: src/Module/Settings/UserExport.php:43
+msgid ""
+"Export the list of the accounts you are following as CSV file. Compatible to "
+"e.g. Mastodon."
 msgstr ""
 
-#: mod/photos.php:684
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
+#: src/Module/Special/HTTPException.php:30
+msgid "Bad Request"
 msgstr ""
 
-#: mod/photos.php:710
-msgid "Image file is empty."
+#: src/Module/Special/HTTPException.php:31
+msgid "Unauthorized"
 msgstr ""
 
-#: mod/photos.php:842
-msgid "No photos selected"
+#: src/Module/Special/HTTPException.php:32
+msgid "Forbidden"
 msgstr ""
 
-#: mod/photos.php:908 mod/videos.php:165
-msgid "Access to this item is restricted."
+#: src/Module/Special/HTTPException.php:33
+msgid "Not Found"
 msgstr ""
 
-#: mod/photos.php:962
-msgid "Upload Photos"
+#: src/Module/Special/HTTPException.php:34
+msgid "Internal Server Error"
 msgstr ""
 
-#: mod/photos.php:966 mod/photos.php:1054
-msgid "New album name: "
+#: src/Module/Special/HTTPException.php:35
+msgid "Service Unavailable"
 msgstr ""
 
-#: mod/photos.php:967
-msgid "or select existing album:"
+#: src/Module/Special/HTTPException.php:42
+msgid ""
+"The server cannot or will not process the request due to an apparent client "
+"error."
 msgstr ""
 
-#: mod/photos.php:968
-msgid "Do not show a status post for this upload"
+#: src/Module/Special/HTTPException.php:43
+msgid "Authentication is required and has failed or has not yet been provided."
 msgstr ""
 
-#: mod/photos.php:984 mod/photos.php:1348 mod/settings.php:1209
-msgid "Show to Groups"
+#: src/Module/Special/HTTPException.php:44
+msgid ""
+"The request was valid, but the server is refusing action. The user might not "
+"have the necessary permissions for a resource, or may need an account."
 msgstr ""
 
-#: mod/photos.php:985 mod/photos.php:1349 mod/settings.php:1210
-msgid "Show to Contacts"
+#: src/Module/Special/HTTPException.php:45
+msgid ""
+"The requested resource could not be found but may be available in the future."
 msgstr ""
 
-#: mod/photos.php:1036
-msgid "Do you really want to delete this photo album and all its photos?"
+#: src/Module/Special/HTTPException.php:46
+msgid ""
+"An unexpected condition was encountered and no more specific message is "
+"suitable."
 msgstr ""
 
-#: mod/photos.php:1038 mod/photos.php:1059
-msgid "Delete Album"
+#: src/Module/Special/HTTPException.php:47
+msgid ""
+"The server is currently unavailable (because it is overloaded or down for "
+"maintenance). Please try again later."
 msgstr ""
 
-#: mod/photos.php:1065
-msgid "Edit Album"
+#: src/Module/Special/HTTPException.php:53
+msgid "Go back"
 msgstr ""
 
-#: mod/photos.php:1066
-msgid "Drop Album"
+#: src/Module/HTTPException/MethodNotAllowed.php:13
+msgid "Method Not Allowed."
 msgstr ""
 
-#: mod/photos.php:1071
-msgid "Show Newest First"
+#: src/Module/HTTPException/PageNotFound.php:13 src/App/Router.php:192
+msgid "Page not found."
 msgstr ""
 
-#: mod/photos.php:1073
-msgid "Show Oldest First"
+#: src/Module/AllFriends.php:55
+msgid "No friends to display."
 msgstr ""
 
-#: mod/photos.php:1094 mod/photos.php:1585
-msgid "View Photo"
+#: src/Module/Apps.php:28
+msgid "No installed applications."
 msgstr ""
 
-#: mod/photos.php:1131
-msgid "Permission denied. Access to this item may be restricted."
+#: src/Module/Apps.php:33
+msgid "Applications"
 msgstr ""
 
-#: mod/photos.php:1133
-msgid "Photo not available"
+#: src/Module/Attach.php:35 src/Module/Attach.php:47
+msgid "Item was not found."
 msgstr ""
 
-#: mod/photos.php:1143
-msgid "Do you really want to delete this photo?"
+#: src/Module/BaseAdminModule.php:60
+msgid ""
+"Submanaged account can't access the administation pages. Please log back in "
+"as the master account."
 msgstr ""
 
-#: mod/photos.php:1145 mod/photos.php:1345
-msgid "Delete Photo"
+#: src/Module/BaseAdminModule.php:74
+msgid "Overview"
 msgstr ""
 
-#: mod/photos.php:1236
-msgid "View photo"
+#: src/Module/BaseAdminModule.php:77
+msgid "Configuration"
 msgstr ""
 
-#: mod/photos.php:1238
-msgid "Edit photo"
+#: src/Module/BaseAdminModule.php:85
+msgid "Database"
 msgstr ""
 
-#: mod/photos.php:1239
-msgid "Delete photo"
+#: src/Module/BaseAdminModule.php:86
+msgid "DB updates"
 msgstr ""
 
-#: mod/photos.php:1240
-msgid "Use as profile photo"
+#: src/Module/BaseAdminModule.php:87
+msgid "Inspect Deferred Workers"
 msgstr ""
 
-#: mod/photos.php:1247
-msgid "Private Photo"
+#: src/Module/BaseAdminModule.php:88
+msgid "Inspect worker Queue"
 msgstr ""
 
-#: mod/photos.php:1253
-msgid "View Full Size"
+#: src/Module/BaseAdminModule.php:90
+msgid "Tools"
 msgstr ""
 
-#: mod/photos.php:1313
-msgid "Tags: "
+#: src/Module/BaseAdminModule.php:91
+msgid "Contact Blocklist"
 msgstr ""
 
-#: mod/photos.php:1316
-msgid "[Select tags to remove]"
+#: src/Module/BaseAdminModule.php:92
+msgid "Server Blocklist"
 msgstr ""
 
-#: mod/photos.php:1331
-msgid "New album name"
+#: src/Module/BaseAdminModule.php:99
+msgid "Diagnostics"
 msgstr ""
 
-#: mod/photos.php:1332
-msgid "Caption"
+#: src/Module/BaseAdminModule.php:100
+msgid "PHP Info"
 msgstr ""
 
-#: mod/photos.php:1333
-msgid "Add a Tag"
+#: src/Module/BaseAdminModule.php:101
+msgid "probe address"
 msgstr ""
 
-#: mod/photos.php:1333
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: src/Module/BaseAdminModule.php:102
+msgid "check webfinger"
 msgstr ""
 
-#: mod/photos.php:1334
-msgid "Do not rotate"
+#: src/Module/BaseAdminModule.php:103
+msgid "Item Source"
 msgstr ""
 
-#: mod/photos.php:1335
-msgid "Rotate CW (right)"
+#: src/Module/BaseAdminModule.php:104
+msgid "Babel"
 msgstr ""
 
-#: mod/photos.php:1336
-msgid "Rotate CCW (left)"
+#: src/Module/BaseAdminModule.php:113
+msgid "Addon Features"
 msgstr ""
 
-#: mod/photos.php:1520
-msgid "Map"
+#: src/Module/BaseAdminModule.php:114
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: mod/photos.php:1591 mod/videos.php:242
-msgid "View Album"
+#: src/Module/BaseSearchModule.php:52
+#, php-format
+msgid "People Search - %s"
 msgstr ""
 
-#: mod/profiles.php:41 mod/profiles.php:150 mod/profiles.php:194
-#: mod/profiles.php:509 mod/dfrn_confirm.php:70
-msgid "Profile not found."
+#: src/Module/BaseSearchModule.php:62
+#, php-format
+msgid "Forum Search - %s"
 msgstr ""
 
-#: mod/profiles.php:60
-msgid "Profile deleted."
+#: src/Module/Bookmarklet.php:36
+msgid "This page is missing a url parameter."
 msgstr ""
 
-#: mod/profiles.php:76 mod/profiles.php:112
-msgid "Profile-"
+#: src/Module/Bookmarklet.php:58
+msgid "The post was created"
 msgstr ""
 
-#: mod/profiles.php:95 mod/profiles.php:133
-msgid "New profile created."
-msgstr ""
+#: src/Module/Contact.php:69
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/profiles.php:118
-msgid "Profile unavailable to clone."
+#: src/Module/Contact.php:96
+msgid "Could not access contact record."
 msgstr ""
 
-#: mod/profiles.php:204
-msgid "Profile Name is required."
+#: src/Module/Contact.php:106
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: mod/profiles.php:344
-msgid "Marital Status"
+#: src/Module/Contact.php:138
+msgid "Contact updated."
 msgstr ""
 
-#: mod/profiles.php:347
-msgid "Romantic Partner"
+#: src/Module/Contact.php:373
+msgid "Contact not found"
 msgstr ""
 
-#: mod/profiles.php:356
-msgid "Work/Employment"
+#: src/Module/Contact.php:392
+msgid "Contact has been blocked"
 msgstr ""
 
-#: mod/profiles.php:359
-msgid "Religion"
+#: src/Module/Contact.php:392
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: mod/profiles.php:362
-msgid "Political Views"
+#: src/Module/Contact.php:402
+msgid "Contact has been ignored"
 msgstr ""
 
-#: mod/profiles.php:365
-msgid "Gender"
+#: src/Module/Contact.php:402
+msgid "Contact has been unignored"
 msgstr ""
 
-#: mod/profiles.php:368
-msgid "Sexual Preference"
+#: src/Module/Contact.php:412
+msgid "Contact has been archived"
 msgstr ""
 
-#: mod/profiles.php:371
-msgid "XMPP"
+#: src/Module/Contact.php:412
+msgid "Contact has been unarchived"
 msgstr ""
 
-#: mod/profiles.php:374
-msgid "Homepage"
+#: src/Module/Contact.php:436
+msgid "Drop contact"
 msgstr ""
 
-#: mod/profiles.php:377 mod/profiles.php:576
-msgid "Interests"
+#: src/Module/Contact.php:439 src/Module/Contact.php:820
+msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: mod/profiles.php:380
-msgid "Address"
+#: src/Module/Contact.php:453
+msgid "Contact has been removed."
 msgstr ""
 
-#: mod/profiles.php:387 mod/profiles.php:572
-msgid "Location"
+#: src/Module/Contact.php:483
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: mod/profiles.php:467
-msgid "Profile updated."
+#: src/Module/Contact.php:488
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: mod/profiles.php:521
-msgid "Hide contacts and friends:"
+#: src/Module/Contact.php:493
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: mod/profiles.php:526
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: src/Module/Contact.php:517
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: mod/profiles.php:546
-msgid "Show more profile fields:"
+#: src/Module/Contact.php:519
+msgid "Never"
 msgstr ""
 
-#: mod/profiles.php:558
-msgid "Profile Actions"
+#: src/Module/Contact.php:522
+msgid "(Update was successful)"
 msgstr ""
 
-#: mod/profiles.php:559
-msgid "Edit Profile Details"
+#: src/Module/Contact.php:522
+msgid "(Update was not successful)"
 msgstr ""
 
-#: mod/profiles.php:561
-msgid "Change Profile Photo"
+#: src/Module/Contact.php:524 src/Module/Contact.php:1064
+msgid "Suggest friends"
 msgstr ""
 
-#: mod/profiles.php:563
-msgid "View this profile"
+#: src/Module/Contact.php:528
+#, php-format
+msgid "Network type: %s"
 msgstr ""
 
-#: mod/profiles.php:564
-msgid "View all profiles"
+#: src/Module/Contact.php:533
+msgid "Communications lost with this contact!"
 msgstr ""
 
-#: mod/profiles.php:566
-msgid "Create a new profile using these settings"
+#: src/Module/Contact.php:539
+msgid "Fetch further information for feeds"
 msgstr ""
 
-#: mod/profiles.php:567
-msgid "Clone this profile"
+#: src/Module/Contact.php:541
+msgid ""
+"Fetch information like preview pictures, title and teaser from the feed "
+"item. You can activate this if the feed doesn't contain much text. Keywords "
+"are taken from the meta header in the feed item and are posted as hash tags."
 msgstr ""
 
-#: mod/profiles.php:568
-msgid "Delete this profile"
+#: src/Module/Contact.php:544
+msgid "Fetch information"
 msgstr ""
 
-#: mod/profiles.php:570
-msgid "Basic information"
+#: src/Module/Contact.php:545
+msgid "Fetch keywords"
 msgstr ""
 
-#: mod/profiles.php:571
-msgid "Profile picture"
+#: src/Module/Contact.php:546
+msgid "Fetch information and keywords"
 msgstr ""
 
-#: mod/profiles.php:573
-msgid "Preferences"
+#: src/Module/Contact.php:565
+msgid "Profile Visibility"
 msgstr ""
 
-#: mod/profiles.php:574
-msgid "Status information"
+#: src/Module/Contact.php:566
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: mod/profiles.php:575
-msgid "Additional information"
+#: src/Module/Contact.php:567
+msgid "Contact Settings"
 msgstr ""
 
-#: mod/profiles.php:578
-msgid "Relation"
+#: src/Module/Contact.php:576
+msgid "Contact"
 msgstr ""
 
-#: mod/profiles.php:582
-msgid "Your Gender:"
+#: src/Module/Contact.php:580
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: mod/profiles.php:583
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: src/Module/Contact.php:582
+msgid "Their personal note"
 msgstr ""
 
-#: mod/profiles.php:585
-msgid "Example: fishing photography software"
+#: src/Module/Contact.php:584
+msgid "Edit contact notes"
 msgstr ""
 
-#: mod/profiles.php:590
-msgid "Profile Name:"
+#: src/Module/Contact.php:588
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: mod/profiles.php:592
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: src/Module/Contact.php:589
+msgid "Ignore contact"
 msgstr ""
 
-#: mod/profiles.php:593
-msgid "Your Full Name:"
+#: src/Module/Contact.php:590
+msgid "Repair URL settings"
 msgstr ""
 
-#: mod/profiles.php:594
-msgid "Title/Description:"
+#: src/Module/Contact.php:591
+msgid "View conversations"
 msgstr ""
 
-#: mod/profiles.php:597
-msgid "Street Address:"
+#: src/Module/Contact.php:596
+msgid "Last update:"
 msgstr ""
 
-#: mod/profiles.php:598
-msgid "Locality/City:"
+#: src/Module/Contact.php:598
+msgid "Update public posts"
 msgstr ""
 
-#: mod/profiles.php:599
-msgid "Region/State:"
+#: src/Module/Contact.php:600 src/Module/Contact.php:1074
+msgid "Update now"
 msgstr ""
 
-#: mod/profiles.php:600
-msgid "Postal/Zip Code:"
+#: src/Module/Contact.php:604 src/Module/Contact.php:825
+#: src/Module/Contact.php:1091
+msgid "Unignore"
 msgstr ""
 
-#: mod/profiles.php:601
-msgid "Country:"
+#: src/Module/Contact.php:608
+msgid "Currently blocked"
 msgstr ""
 
-#: mod/profiles.php:605
-msgid "Who: (if applicable)"
+#: src/Module/Contact.php:609
+msgid "Currently ignored"
 msgstr ""
 
-#: mod/profiles.php:605
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: src/Module/Contact.php:610
+msgid "Currently archived"
 msgstr ""
 
-#: mod/profiles.php:606
-msgid "Since [date]:"
+#: src/Module/Contact.php:611
+msgid "Awaiting connection acknowledge"
 msgstr ""
 
-#: mod/profiles.php:608
-msgid "Tell us about yourself..."
+#: src/Module/Contact.php:612
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: mod/profiles.php:609
-msgid "XMPP (Jabber) address:"
+#: src/Module/Contact.php:613
+msgid "Notification for new posts"
 msgstr ""
 
-#: mod/profiles.php:609
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow "
-"you."
+#: src/Module/Contact.php:613
+msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: mod/profiles.php:610
-msgid "Homepage URL:"
+#: src/Module/Contact.php:615
+msgid "Blacklisted keywords"
 msgstr ""
 
-#: mod/profiles.php:613
-msgid "Religious Views:"
+#: src/Module/Contact.php:615
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: mod/profiles.php:614
-msgid "Public Keywords:"
+#: src/Module/Contact.php:685
+msgid "Show all contacts"
 msgstr ""
 
-#: mod/profiles.php:614
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: src/Module/Contact.php:690 src/Module/Contact.php:800
+msgid "Pending"
 msgstr ""
 
-#: mod/profiles.php:615
-msgid "Private Keywords:"
+#: src/Module/Contact.php:693
+msgid "Only show pending contacts"
 msgstr ""
 
-#: mod/profiles.php:615
-msgid "(Used for searching profiles, never shown to others)"
+#: src/Module/Contact.php:698 src/Module/Contact.php:801
+msgid "Blocked"
 msgstr ""
 
-#: mod/profiles.php:618
-msgid "Musical interests"
+#: src/Module/Contact.php:701
+msgid "Only show blocked contacts"
 msgstr ""
 
-#: mod/profiles.php:619
-msgid "Books, literature"
+#: src/Module/Contact.php:706 src/Module/Contact.php:803
+msgid "Ignored"
 msgstr ""
 
-#: mod/profiles.php:620
-msgid "Television"
+#: src/Module/Contact.php:709
+msgid "Only show ignored contacts"
 msgstr ""
 
-#: mod/profiles.php:621
-msgid "Film/dance/culture/entertainment"
+#: src/Module/Contact.php:714 src/Module/Contact.php:804
+msgid "Archived"
 msgstr ""
 
-#: mod/profiles.php:622
-msgid "Hobbies/Interests"
+#: src/Module/Contact.php:717
+msgid "Only show archived contacts"
 msgstr ""
 
-#: mod/profiles.php:623
-msgid "Love/romance"
+#: src/Module/Contact.php:722 src/Module/Contact.php:802
+msgid "Hidden"
 msgstr ""
 
-#: mod/profiles.php:624
-msgid "Work/employment"
+#: src/Module/Contact.php:725
+msgid "Only show hidden contacts"
 msgstr ""
 
-#: mod/profiles.php:625
-msgid "School/education"
+#: src/Module/Contact.php:733
+msgid "Organize your contact groups"
 msgstr ""
 
-#: mod/profiles.php:626
-msgid "Contact information and Social Networks"
+#: src/Module/Contact.php:815
+msgid "Search your contacts"
 msgstr ""
 
-#: mod/profiles.php:666
-msgid "Edit/Manage Profiles"
+#: src/Module/Contact.php:826 src/Module/Contact.php:1100
+msgid "Archive"
 msgstr ""
 
-#: mod/wall_attach.php:26 mod/wall_attach.php:33 mod/wall_attach.php:71
-#: mod/wall_upload.php:42 mod/wall_upload.php:58 mod/wall_upload.php:103
-#: mod/wall_upload.php:154 mod/wall_upload.php:157
-msgid "Invalid request."
+#: src/Module/Contact.php:826 src/Module/Contact.php:1100
+msgid "Unarchive"
 msgstr ""
 
-#: mod/wall_attach.php:89
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+#: src/Module/Contact.php:829
+msgid "Batch Actions"
 msgstr ""
 
-#: mod/wall_attach.php:89
-msgid "Or - did you try to upload an empty file?"
+#: src/Module/Contact.php:856
+msgid "Conversations started by this contact"
 msgstr ""
 
-#: mod/wall_attach.php:100
-#, php-format
-msgid "File exceeds size limit of %s"
+#: src/Module/Contact.php:861
+msgid "Posts and Comments"
 msgstr ""
 
-#: mod/wall_attach.php:115
-msgid "File upload failed."
+#: src/Module/Contact.php:884
+msgid "View all contacts"
 msgstr ""
 
-#: mod/item.php:125
-msgid "Unable to locate original post."
+#: src/Module/Contact.php:895
+msgid "View all common friends"
 msgstr ""
 
-#: mod/item.php:327
-msgid "Empty post discarded."
+#: src/Module/Contact.php:905
+msgid "Advanced Contact Settings"
 msgstr ""
 
-#: mod/item.php:799
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+#: src/Module/Contact.php:988
+msgid "Mutual Friendship"
 msgstr ""
 
-#: mod/item.php:801
-#, php-format
-msgid "You may visit them online at %s"
+#: src/Module/Contact.php:993
+msgid "is a fan of yours"
 msgstr ""
 
-#: mod/item.php:802
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: src/Module/Contact.php:998
+msgid "you are a fan of"
 msgstr ""
 
-#: mod/item.php:806
-#, php-format
-msgid "%s posted an update."
+#: src/Module/Contact.php:1016
+msgid "Pending outgoing contact request"
 msgstr ""
 
-#: mod/oexchange.php:31
-msgid "Post successful."
+#: src/Module/Contact.php:1018
+msgid "Pending incoming contact request"
 msgstr ""
 
-#: mod/regmod.php:49
-msgid "Account approved."
+#: src/Module/Contact.php:1031
+msgid "Edit contact"
 msgstr ""
 
-#: mod/regmod.php:73
-#, php-format
-msgid "Registration revoked for %s"
+#: src/Module/Contact.php:1085
+msgid "Toggle Blocked status"
 msgstr ""
 
-#: mod/regmod.php:80
-msgid "Please login."
+#: src/Module/Contact.php:1093
+msgid "Toggle Ignored status"
 msgstr ""
 
-#: mod/match.php:48
-msgid "No keywords to match. Please add keywords to your default profile."
+#: src/Module/Contact.php:1102
+msgid "Toggle Archive status"
 msgstr ""
 
-#: mod/match.php:134
-msgid "Profile Match"
+#: src/Module/Contact.php:1110
+msgid "Delete contact"
 msgstr ""
 
-#: mod/settings.php:187
-msgid "Missing some important data!"
+#: src/Module/Credits.php:25
+msgid "Credits"
 msgstr ""
 
-#: mod/settings.php:297
-msgid "Failed to connect with email account using the settings provided."
+#: src/Module/Credits.php:26
+msgid ""
+"Friendica is a community project, that would not be possible without the "
+"help of many people. Here is a list of those who have contributed to the "
+"code or the translation of Friendica. Thank you all!"
 msgstr ""
 
-#: mod/settings.php:302
-msgid "Email settings updated."
+#: src/Module/Delegation.php:127
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: mod/settings.php:318
-msgid "Features updated"
+#: src/Module/Delegation.php:128
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: mod/settings.php:379
-msgid "The theme you chose isn't available."
+#: src/Module/Delegation.php:129
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: mod/settings.php:395
-msgid "Contact CSV file upload error"
+#: src/Module/Directory.php:59
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: mod/settings.php:409
-msgid "Importing Contacts done"
+#: src/Module/Directory.php:78
+msgid "Find on this site"
 msgstr ""
 
-#: mod/settings.php:418
-msgid "Relocate message has been send to your contacts"
+#: src/Module/Directory.php:80
+msgid "Results for:"
 msgstr ""
 
-#: mod/settings.php:430
-msgid "Passwords do not match."
+#: src/Module/Directory.php:82
+msgid "Site Directory"
 msgstr ""
 
-#: mod/settings.php:444
-msgid "Password unchanged."
+#: src/Module/Friendica.php:39
+msgid "Installed addons/apps:"
 msgstr ""
 
-#: mod/settings.php:526
-msgid " Please use a shorter name."
+#: src/Module/Friendica.php:44
+msgid "No installed addons/apps"
 msgstr ""
 
-#: mod/settings.php:529
-msgid " Name too short."
+#: src/Module/Friendica.php:49
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr ""
 
-#: mod/settings.php:541
-msgid "Invalid email."
+#: src/Module/Friendica.php:56
+msgid "On this server the following remote servers are blocked."
 msgstr ""
 
-#: mod/settings.php:547
-msgid "Cannot change to that email."
+#: src/Module/Friendica.php:74
+#, php-format
+msgid ""
+"This is Friendica, version %s that is running at the web location %s. The "
+"database version is %s, the post update version is %s."
 msgstr ""
 
-#: mod/settings.php:584
-msgid "Private forum has no privacy permissions. Using default privacy group."
+#: src/Module/Friendica.php:79
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
 msgstr ""
 
-#: mod/settings.php:587
-msgid "Private forum has no privacy permissions and no default privacy group."
+#: src/Module/Friendica.php:80
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: mod/settings.php:663 mod/settings.php:689 mod/settings.php:723
-msgid "Add application"
+#: src/Module/Friendica.php:80
+msgid "the bugtracker at github"
 msgstr ""
 
-#: mod/settings.php:669 mod/settings.php:695
-msgid "Redirect"
+#: src/Module/Friendica.php:81
+msgid ""
+"Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr ""
 
-#: mod/settings.php:670 mod/settings.php:696
-msgid "Icon url"
+#: src/Module/Group.php:40
+msgid "Group created."
 msgstr ""
 
-#: mod/settings.php:681
-msgid "You can't edit this application."
+#: src/Module/Group.php:46
+msgid "Could not create group."
 msgstr ""
 
-#: mod/settings.php:722
-msgid "Connected Apps"
+#: src/Module/Group.php:57 src/Module/Group.php:199 src/Module/Group.php:225
+msgid "Group not found."
 msgstr ""
 
-#: mod/settings.php:726
-msgid "Client key starts with"
+#: src/Module/Group.php:63
+msgid "Group name changed."
 msgstr ""
 
-#: mod/settings.php:727
-msgid "No name"
+#: src/Module/Group.php:85
+msgid "Unknown group."
 msgstr ""
 
-#: mod/settings.php:728
-msgid "Remove authorization"
+#: src/Module/Group.php:94
+msgid "Contact is deleted."
 msgstr ""
 
-#: mod/settings.php:739
-msgid "No Addon settings configured"
+#: src/Module/Group.php:100
+msgid "Unable to add the contact to the group."
 msgstr ""
 
-#: mod/settings.php:769
-msgid "Additional Features"
+#: src/Module/Group.php:103
+msgid "Contact successfully added to group."
 msgstr ""
 
-#: mod/settings.php:794 mod/settings.php:795
-msgid "enabled"
+#: src/Module/Group.php:107
+msgid "Unable to remove the contact from the group."
 msgstr ""
 
-#: mod/settings.php:794 mod/settings.php:795
-msgid "disabled"
+#: src/Module/Group.php:110
+msgid "Contact successfully removed from group."
 msgstr ""
 
-#: mod/settings.php:794 mod/settings.php:795
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
+#: src/Module/Group.php:113
+msgid "Unknown group command."
 msgstr ""
 
-#: mod/settings.php:795
-msgid "GNU Social (OStatus)"
+#: src/Module/Group.php:116
+msgid "Bad request."
 msgstr ""
 
-#: mod/settings.php:826
-msgid "Email access is disabled on this site."
+#: src/Module/Group.php:155
+msgid "Save Group"
 msgstr ""
 
-#: mod/settings.php:831 mod/settings.php:867
-msgid "None"
+#: src/Module/Group.php:156
+msgid "Filter"
 msgstr ""
 
-#: mod/settings.php:842
-msgid "General Social Media Settings"
+#: src/Module/Group.php:162
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: mod/settings.php:843
-msgid "Accept only top level posts by contacts you follow"
+#: src/Module/Group.php:204
+msgid "Group removed."
 msgstr ""
 
-#: mod/settings.php:843
-msgid ""
-"The system does an auto completion of threads when a comment arrives. This "
-"has got the side effect that you can receive posts that had been started by "
-"a non-follower but had been commented by someone you follow. This setting "
-"deactivates this behaviour. When activated, you strictly only will receive "
-"posts from people you really do follow."
+#: src/Module/Group.php:206
+msgid "Unable to remove group."
 msgstr ""
 
-#: mod/settings.php:844
-msgid "Disable Content Warning"
+#: src/Module/Group.php:257
+msgid "Delete Group"
 msgstr ""
 
-#: mod/settings.php:844
-msgid ""
-"Users on networks like Mastodon or Pleroma are able to set a content warning "
-"field which collapse their post by default. This disables the automatic "
-"collapsing and sets the content warning as the post title. Doesn't affect "
-"any other content filtering you eventually set up."
+#: src/Module/Group.php:267
+msgid "Edit Group Name"
 msgstr ""
 
-#: mod/settings.php:845
-msgid "Disable intelligent shortening"
+#: src/Module/Group.php:277
+msgid "Members"
 msgstr ""
 
-#: mod/settings.php:845
-msgid ""
-"Normally the system tries to find the best link to add to shortened posts. "
-"If this option is enabled then every shortened post will always point to the "
-"original friendica post."
+#: src/Module/Group.php:293
+msgid "Remove contact from group"
 msgstr ""
 
-#: mod/settings.php:846
-msgid "Attach the link title"
+#: src/Module/Group.php:327
+msgid "Add contact to group"
 msgstr ""
 
-#: mod/settings.php:846
-msgid ""
-"When activated, the title of the attached link will be added as a title on "
-"posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that "
-"share feed content."
+#: src/Module/Help.php:43
+msgid "Help:"
 msgstr ""
 
-#: mod/settings.php:847
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+#: src/Module/Home.php:35
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: mod/settings.php:847
-msgid ""
-"If you receive a message from an unknown OStatus user, this option decides "
-"what to do. If it is checked, a new contact will be created for every "
-"unknown user."
+#: src/Module/HoverCard.php:30
+msgid "No profile"
 msgstr ""
 
-#: mod/settings.php:848
-msgid "Default group for OStatus contacts"
+#: src/Module/Install.php:158
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: mod/settings.php:849
-msgid "Your legacy GNU Social account"
+#: src/Module/Install.php:169
+msgid "System check"
 msgstr ""
 
-#: mod/settings.php:849
-msgid ""
-"If you enter your old GNU Social/Statusnet account name here (in the format "
-"user@domain.tld), your contacts will be added automatically. The field will "
-"be emptied when done."
+#: src/Module/Install.php:174
+msgid "Check again"
 msgstr ""
 
-#: mod/settings.php:852
-msgid "Repair OStatus subscriptions"
+#: src/Module/Install.php:189
+msgid "Base settings"
 msgstr ""
 
-#: mod/settings.php:856
-msgid "Email/Mailbox Setup"
+#: src/Module/Install.php:196
+msgid "Host name"
 msgstr ""
 
-#: mod/settings.php:857
+#: src/Module/Install.php:198
 msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+"Overwrite this field in case the determinated hostname isn't right, "
+"otherweise leave it as is."
 msgstr ""
 
-#: mod/settings.php:858
-msgid "Last successful email check:"
+#: src/Module/Install.php:201
+msgid "Base path to installation"
 msgstr ""
 
-#: mod/settings.php:860
-msgid "IMAP server name:"
+#: src/Module/Install.php:203
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the "
+"correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
 msgstr ""
 
-#: mod/settings.php:861
-msgid "IMAP port:"
+#: src/Module/Install.php:206
+msgid "Sub path of the URL"
 msgstr ""
 
-#: mod/settings.php:862
-msgid "Security:"
+#: src/Module/Install.php:208
+msgid ""
+"Overwrite this field in case the sub path determination isn't right, "
+"otherwise leave it as is. Leaving this field blank means the installation is "
+"at the base URL without sub path."
 msgstr ""
 
-#: mod/settings.php:863
-msgid "Email login name:"
+#: src/Module/Install.php:219
+msgid "Database connection"
 msgstr ""
 
-#: mod/settings.php:864
-msgid "Email password:"
+#: src/Module/Install.php:220
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: mod/settings.php:865
-msgid "Reply-to address:"
+#: src/Module/Install.php:221
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: mod/settings.php:866
-msgid "Send public posts to all email contacts:"
+#: src/Module/Install.php:222
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: mod/settings.php:867
-msgid "Action after import:"
+#: src/Module/Install.php:229
+msgid "Database Server Name"
 msgstr ""
 
-#: mod/settings.php:867
-msgid "Move to folder"
+#: src/Module/Install.php:234
+msgid "Database Login Name"
 msgstr ""
 
-#: mod/settings.php:868
-msgid "Move to folder:"
+#: src/Module/Install.php:240
+msgid "Database Login Password"
 msgstr ""
 
-#: mod/settings.php:900
-#, php-format
-msgid "%s - (Unsupported)"
+#: src/Module/Install.php:242
+msgid "For security reasons the password must not be empty"
 msgstr ""
 
-#: mod/settings.php:946
-msgid "Display Settings"
+#: src/Module/Install.php:245
+msgid "Database Name"
 msgstr ""
 
-#: mod/settings.php:952
-msgid "Display Theme:"
+#: src/Module/Install.php:249 src/Module/Install.php:278
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: mod/settings.php:953
-msgid "Mobile Theme:"
+#: src/Module/Install.php:263
+msgid "Site settings"
 msgstr ""
 
-#: mod/settings.php:954
-msgid "Suppress warning of insecure networks"
+#: src/Module/Install.php:273
+msgid "Site administrator email address"
 msgstr ""
 
-#: mod/settings.php:954
+#: src/Module/Install.php:275
 msgid ""
-"Should the system suppress the warning that the current group contains "
-"members of networks that can't receive non public postings."
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: mod/settings.php:955
-msgid "Update browser every xx seconds"
+#: src/Module/Install.php:282
+msgid "System Language:"
 msgstr ""
 
-#: mod/settings.php:955
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
+#: src/Module/Install.php:284
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
 msgstr ""
 
-#: mod/settings.php:956
-msgid "Number of items to display per page:"
+#: src/Module/Install.php:296
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: mod/settings.php:956 mod/settings.php:957
-msgid "Maximum of 100 items"
+#: src/Module/Install.php:304
+msgid "Installation finished"
 msgstr ""
 
-#: mod/settings.php:957
-msgid "Number of items to display per page when viewed from mobile device:"
+#: src/Module/Install.php:324
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: mod/settings.php:958
-msgid "Don't show emoticons"
+#: src/Module/Install.php:325
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the worker."
 msgstr ""
 
-#: mod/settings.php:959
-msgid "Calendar"
+#: src/Module/Install.php:328
+#, php-format
+msgid ""
+"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
+"and register as new user. Remember to use the same email you have entered as "
+"administrator email. This will allow you to enter the site admin panel."
 msgstr ""
 
-#: mod/settings.php:960
-msgid "Beginning of week:"
+#: src/Module/Invite.php:36
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: mod/settings.php:961
-msgid "Don't show notices"
+#: src/Module/Invite.php:59
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: mod/settings.php:962
-msgid "Infinite scroll"
+#: src/Module/Invite.php:86
+msgid "Please join us on Friendica"
 msgstr ""
 
-#: mod/settings.php:963
-msgid "Automatic updates only at the top of the network page"
+#: src/Module/Invite.php:95
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: mod/settings.php:963
-msgid ""
-"When disabled, the network page is updated all the time, which could be "
-"confusing while reading."
+#: src/Module/Invite.php:99
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: mod/settings.php:964
-msgid "Bandwidth Saver Mode"
-msgstr ""
+#: src/Module/Invite.php:103
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/settings.php:964
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
+#: src/Module/Invite.php:121
+msgid "You have no more invitations available"
 msgstr ""
 
-#: mod/settings.php:965
-msgid "Disable Smart Threading"
+#: src/Module/Invite.php:128
+#, 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/settings.php:965
-msgid "Disable the automatic suppression of extraneous thread indentation."
+#: src/Module/Invite.php:130
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
-#: mod/settings.php:967
-msgid "General Theme Settings"
+#: src/Module/Invite.php:131
+#, 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/settings.php:968
-msgid "Custom Theme Settings"
+#: src/Module/Invite.php:135
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
 msgstr ""
 
-#: mod/settings.php:969
-msgid "Content Settings"
+#: src/Module/Invite.php:138
+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."
 msgstr ""
 
-#: mod/settings.php:984
-msgid "Unable to find your profile. Please contact your admin."
+#: src/Module/Invite.php:137
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
 msgstr ""
 
-#: mod/settings.php:1023
-msgid "Account Types"
+#: src/Module/Invite.php:145
+msgid "Send invitations"
 msgstr ""
 
-#: mod/settings.php:1024
-msgid "Personal Page Subtypes"
+#: src/Module/Invite.php:146
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: mod/settings.php:1025
-msgid "Community Forum Subtypes"
+#: src/Module/Invite.php:150
+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/settings.php:1033
-msgid "Account for a personal profile."
+#: src/Module/Invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: mod/settings.php:1037
+#: src/Module/Invite.php:152
 msgid ""
-"Account for an organisation that automatically approves contact requests as "
-"\"Followers\"."
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: mod/settings.php:1041
+#: src/Module/Invite.php:154
 msgid ""
-"Account for a news reflector that automatically approves contact requests as "
-"\"Followers\"."
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendi.ca"
 msgstr ""
 
-#: mod/settings.php:1045
-msgid "Account for community discussions."
+#: src/Module/Maintenance.php:27
+msgid "System down for maintenance"
 msgstr ""
 
-#: mod/settings.php:1049
-msgid ""
-"Account for a regular personal profile that requires manual approval of "
-"\"Friends\" and \"Followers\"."
+#: src/Module/Photo.php:86
+#, php-format
+msgid "Invalid photo with id %s."
 msgstr ""
 
-#: mod/settings.php:1053
-msgid ""
-"Account for a public profile that automatically approves contact requests as "
-"\"Followers\"."
+#: src/Module/Register.php:50
+msgid "Only parent users can create additional accounts."
 msgstr ""
 
-#: mod/settings.php:1057
-msgid "Automatically approves all contact requests."
+#: src/Module/Register.php:82
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking \"Register\"."
 msgstr ""
 
-#: mod/settings.php:1061
+#: src/Module/Register.php:83
 msgid ""
-"Account for a popular profile that automatically approves contact requests "
-"as \"Friends\"."
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: mod/settings.php:1064
-msgid "Private Forum [Experimental]"
+#: src/Module/Register.php:84
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/settings.php:1065
-msgid "Requires manual approval of contact requests."
+#: src/Module/Register.php:93
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/settings.php:1076
-msgid "OpenID:"
+#: src/Module/Register.php:116
+msgid "Note for the admin"
 msgstr ""
 
-#: mod/settings.php:1076
-msgid "(Optional) Allow this OpenID to login to this account."
+#: src/Module/Register.php:116
+msgid "Leave a message for the admin, why you want to join this node"
 msgstr ""
 
-#: mod/settings.php:1084
-msgid "Publish your default profile in your local site directory?"
+#: src/Module/Register.php:117
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/settings.php:1084
-#, php-format
-msgid ""
-"Your profile will be published in this node's <a href=\"%s\">local "
-"directory</a>. Your profile details may be publicly visible depending on the "
-"system settings."
+#: src/Module/Register.php:118
+msgid "Your invitation code: "
 msgstr ""
 
-#: mod/settings.php:1090
-msgid "Publish your default profile in the global social directory?"
+#: src/Module/Register.php:126
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/settings.php:1090
-#, php-format
+#: src/Module/Register.php:127
 msgid ""
-"Your profile will be published in the global friendica directories (e.g. <a "
-"href=\"%s\">%s</a>). Your profile will be visible in public."
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
 msgstr ""
 
-#: mod/settings.php:1090
-msgid ""
-"This setting also determines whether Friendica will inform search engines "
-"that your profile should be indexed or not. Third-party search engines may "
-"or may not respect this setting."
+#: src/Module/Register.php:128
+msgid "Please repeat your e-mail address:"
 msgstr ""
 
-#: mod/settings.php:1097
-msgid "Hide your contact/friend list from viewers of your default profile?"
+#: src/Module/Register.php:130
+msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/settings.php:1097
+#: src/Module/Register.php:132
+#, php-format
 msgid ""
-"Your contact list won't be shown in your default profile page. You can "
-"decide to show your contact list separately for each additional profile you "
-"create"
-msgstr ""
-
-#: mod/settings.php:1101
-msgid "Hide your profile details from anonymous viewers?"
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be \"<strong>nickname@%s</strong>\"."
 msgstr ""
 
-#: mod/settings.php:1101
-msgid ""
-"Anonymous visitors will only see your profile picture, your display name and "
-"the nickname you are using on your profile page. Your public posts and "
-"replies will still be accessible by other means."
+#: src/Module/Register.php:133
+msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/settings.php:1105
-msgid "Allow friends to post to your profile page?"
+#: src/Module/Register.php:142
+msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: mod/settings.php:1105
-msgid ""
-"Your contacts may write posts on your profile wall. These posts will be "
-"distributed to your contacts"
+#: src/Module/Register.php:149
+msgid "Note: This node explicitly contains adult content"
 msgstr ""
 
-#: mod/settings.php:1109
-msgid "Allow friends to tag your posts?"
+#: src/Module/Register.php:182
+msgid "Password doesn't match."
 msgstr ""
 
-#: mod/settings.php:1109
-msgid "Your contacts can add additional tags to your posts."
+#: src/Module/Register.php:188
+msgid "Please enter your password."
 msgstr ""
 
-#: mod/settings.php:1113
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: src/Module/Register.php:230
+msgid "You have entered too much information."
 msgstr ""
 
-#: mod/settings.php:1113
-msgid "If you like, Friendica may suggest new members to add you as a contact."
+#: src/Module/Register.php:254
+msgid "Please enter the identical mail address in the second field."
 msgstr ""
 
-#: mod/settings.php:1117
-msgid "Permit unknown people to send you private mail?"
+#: src/Module/Register.php:281
+msgid "The additional account was created."
 msgstr ""
 
-#: mod/settings.php:1117
+#: src/Module/Register.php:306
 msgid ""
-"Friendica network users may send you private messages even if they are not "
-"in your contact list."
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: mod/settings.php:1121
-msgid "Profile is <strong>not published</strong>."
+#: src/Module/Register.php:310
+#, 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/settings.php:1127
-#, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+#: src/Module/Register.php:316
+msgid "Registration successful."
 msgstr ""
 
-#: mod/settings.php:1134
-msgid "Automatically expire posts after this many days:"
+#: src/Module/Register.php:321 src/Module/Register.php:328
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/settings.php:1134
-msgid "If empty, posts will not expire. Expired posts will be deleted"
+#: src/Module/Register.php:327
+msgid "You have to leave a request note for the admin."
 msgstr ""
 
-#: mod/settings.php:1135
-msgid "Advanced expiration settings"
+#: src/Module/Register.php:375
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/settings.php:1136
-msgid "Advanced Expiration"
+#: src/Module/Security/Login.php:88
+msgid "Create a New Account"
 msgstr ""
 
-#: mod/settings.php:1137
-msgid "Expire posts:"
+#: src/Module/Security/Login.php:113
+msgid "Your OpenID: "
 msgstr ""
 
-#: mod/settings.php:1138
-msgid "Expire personal notes:"
+#: src/Module/Security/Login.php:116
+msgid ""
+"Please enter your username and password to add the OpenID to your existing "
+"account."
 msgstr ""
 
-#: mod/settings.php:1139
-msgid "Expire starred posts:"
+#: src/Module/Security/Login.php:118
+msgid "Or login using OpenID: "
 msgstr ""
 
-#: mod/settings.php:1140
-msgid "Expire photos:"
+#: src/Module/Security/Login.php:132
+msgid "Password: "
 msgstr ""
 
-#: mod/settings.php:1141
-msgid "Only expire posts by others:"
+#: src/Module/Security/Login.php:133
+msgid "Remember me"
 msgstr ""
 
-#: mod/settings.php:1171
-msgid "Account Settings"
+#: src/Module/Security/Login.php:142
+msgid "Forgot your password?"
 msgstr ""
 
-#: mod/settings.php:1179
-msgid "Password Settings"
+#: src/Module/Security/Login.php:145
+msgid "Website Terms of Service"
 msgstr ""
 
-#: mod/settings.php:1180
-msgid ""
-"Allowed characters are a-z, A-Z, 0-9 and special characters except white "
-"spaces, accentuated letters and colon (:)."
+#: src/Module/Security/Login.php:146
+msgid "terms of service"
 msgstr ""
 
-#: mod/settings.php:1181
-msgid "Leave password fields blank unless changing"
+#: src/Module/Security/Login.php:148
+msgid "Website Privacy Policy"
 msgstr ""
 
-#: mod/settings.php:1182
-msgid "Current Password:"
+#: src/Module/Security/Login.php:149
+msgid "privacy policy"
 msgstr ""
 
-#: mod/settings.php:1182 mod/settings.php:1183
-msgid "Your current password to confirm the changes"
+#: src/Module/Security/Logout.php:39
+msgid "Logged out."
 msgstr ""
 
-#: mod/settings.php:1183
-msgid "Password:"
+#: src/Module/Security/OpenID.php:35
+msgid "OpenID protocol error. No ID returned"
 msgstr ""
 
-#: mod/settings.php:1186
-msgid "Delete OpenID URL"
+#: src/Module/Security/OpenID.php:73
+msgid ""
+"Account not found. Please login to your existing account to add the OpenID "
+"to it."
 msgstr ""
 
-#: mod/settings.php:1188
-msgid "Basic Settings"
+#: src/Module/Security/OpenID.php:75
+msgid ""
+"Account not found. Please register a new account or login to your existing "
+"account to add the OpenID to it."
 msgstr ""
 
-#: mod/settings.php:1190
-msgid "Email Address:"
+#: src/Module/Security/TwoFactor/Recovery.php:41
+#, php-format
+msgid "Remaining recovery codes: %d"
 msgstr ""
 
-#: mod/settings.php:1191
-msgid "Your Timezone:"
+#: src/Module/Security/TwoFactor/Recovery.php:64
+msgid "Two-factor recovery"
 msgstr ""
 
-#: mod/settings.php:1192
-msgid "Your Language:"
+#: src/Module/Security/TwoFactor/Recovery.php:65
+msgid ""
+"<p>You can enter one of your one-time recovery codes in case you lost access "
+"to your mobile device.</p>"
 msgstr ""
 
-#: mod/settings.php:1192
+#: src/Module/Security/TwoFactor/Recovery.php:66
+#: src/Module/Security/TwoFactor/Verify.php:65
+#, php-format
 msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
+"Don’t have your phone? <a href=\"%s\">Enter a two-factor recovery code</a>"
 msgstr ""
 
-#: mod/settings.php:1193
-msgid "Default Post Location:"
+#: src/Module/Security/TwoFactor/Recovery.php:67
+msgid "Please enter a recovery code"
 msgstr ""
 
-#: mod/settings.php:1194
-msgid "Use Browser Location:"
+#: src/Module/Security/TwoFactor/Recovery.php:68
+msgid "Submit recovery code and complete login"
 msgstr ""
 
-#: mod/settings.php:1197
-msgid "Security and Privacy Settings"
+#: src/Module/Security/TwoFactor/Verify.php:62
+msgid ""
+"<p>Open the two-factor authentication app on your device to get an "
+"authentication code and verify your identity.</p>"
 msgstr ""
 
-#: mod/settings.php:1199
-msgid "Maximum Friend Requests/Day:"
+#: src/Module/Security/TwoFactor/Verify.php:67
+msgid "Verify code and complete login"
 msgstr ""
 
-#: mod/settings.php:1199 mod/settings.php:1228
-msgid "(to prevent spam abuse)"
+#: src/Module/Tos.php:33 src/Module/Tos.php:75
+msgid ""
+"At the time of registration, and for providing communications between the "
+"user account and their contacts, the user has to provide a display name (pen "
+"name), an username (nickname) and a working email address. The names will be "
+"accessible on the profile page of the account by any visitor of the page, "
+"even if other profile details are not displayed. The email address will only "
+"be used to send the user notifications about interactions, but wont be "
+"visibly displayed. The listing of an account in the node's user directory or "
+"the global user directory is optional and can be controlled in the user "
+"settings, it is not necessary for communication."
 msgstr ""
 
-#: mod/settings.php:1200
-msgid "Default Post Permissions"
+#: src/Module/Tos.php:34 src/Module/Tos.php:76
+msgid ""
+"This data is required for communication and is passed on to the nodes of the "
+"communication partners and is stored there. Users can enter additional "
+"private data that may be transmitted to the communication partners accounts."
 msgstr ""
 
-#: mod/settings.php:1201
-msgid "(click to open/close)"
+#: src/Module/Tos.php:35 src/Module/Tos.php:77
+#, php-format
+msgid ""
+"At any point in time a logged in user can export their account data from the "
+"<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants "
+"to delete their account they can do so at <a href=\"%1$s/removeme\">%1$s/"
+"removeme</a>. The deletion of the account will be permanent. Deletion of the "
+"data will also be requested from the nodes of the communication partners."
 msgstr ""
 
-#: mod/settings.php:1211
-msgid "Default Private Post"
+#: src/Module/Tos.php:38 src/Module/Tos.php:74
+msgid "Privacy Statement"
 msgstr ""
 
-#: mod/settings.php:1212
-msgid "Default Public Post"
+#: src/Module/Welcome.php:25
+msgid "Welcome to Friendica"
 msgstr ""
 
-#: mod/settings.php:1216
-msgid "Default Permissions for New Posts"
+#: src/Module/Welcome.php:26
+msgid "New Member Checklist"
 msgstr ""
 
-#: mod/settings.php:1228
-msgid "Maximum private messages per day from unknown people:"
+#: src/Module/Welcome.php:27
+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 ""
 
-#: mod/settings.php:1231
-msgid "Notification Settings"
+#: src/Module/Welcome.php:29
+msgid "Getting Started"
 msgstr ""
 
-#: mod/settings.php:1232
-msgid "Send a notification email when:"
+#: src/Module/Welcome.php:30
+msgid "Friendica Walk-Through"
 msgstr ""
 
-#: mod/settings.php:1233
-msgid "You receive an introduction"
+#: src/Module/Welcome.php:31
+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."
 msgstr ""
 
-#: mod/settings.php:1234
-msgid "Your introductions are confirmed"
+#: src/Module/Welcome.php:34
+msgid "Go to Your Settings"
 msgstr ""
 
-#: mod/settings.php:1235
-msgid "Someone writes on your profile wall"
+#: src/Module/Welcome.php:35
+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 ""
 
-#: mod/settings.php:1236
-msgid "Someone writes a followup comment"
+#: src/Module/Welcome.php:36
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: mod/settings.php:1237
-msgid "You receive a private message"
+#: src/Module/Welcome.php:40
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: mod/settings.php:1238
-msgid "You receive a friend suggestion"
+#: src/Module/Welcome.php:41
+msgid "Edit Your Profile"
 msgstr ""
 
-#: mod/settings.php:1239
-msgid "You are tagged in a post"
+#: src/Module/Welcome.php:42
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: mod/settings.php:1240
-msgid "You are poked/prodded/etc. in a post"
+#: src/Module/Welcome.php:43
+msgid "Profile Keywords"
 msgstr ""
 
-#: mod/settings.php:1242
-msgid "Activate desktop notifications"
+#: src/Module/Welcome.php:44
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: mod/settings.php:1242
-msgid "Show desktop popup on new notifications"
+#: src/Module/Welcome.php:46
+msgid "Connecting"
 msgstr ""
 
-#: mod/settings.php:1244
-msgid "Text-only notification emails"
+#: src/Module/Welcome.php:48
+msgid "Importing Emails"
 msgstr ""
 
-#: mod/settings.php:1246
-msgid "Send text only notification emails, without the html part"
+#: src/Module/Welcome.php:49
+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 ""
 
-#: mod/settings.php:1248
-msgid "Show detailled notifications"
+#: src/Module/Welcome.php:50
+msgid "Go to Your Contacts Page"
 msgstr ""
 
-#: mod/settings.php:1250
+#: src/Module/Welcome.php:51
 msgid ""
-"Per default, notifications are condensed to a single notification per item. "
-"When enabled every notification is displayed."
+"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 ""
 
-#: mod/settings.php:1252
-msgid "Advanced Account/Page Type Settings"
+#: src/Module/Welcome.php:52
+msgid "Go to Your Site's Directory"
 msgstr ""
 
-#: mod/settings.php:1253
-msgid "Change the behaviour of this account for special situations"
+#: src/Module/Welcome.php:53
+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 ""
 
-#: mod/settings.php:1256
-msgid "Import Contacts"
+#: src/Module/Welcome.php:54
+msgid "Finding New People"
 msgstr ""
 
-#: mod/settings.php:1257
+#: src/Module/Welcome.php:55
 msgid ""
-"Upload a CSV file that contains the handle of your followed accounts in the "
-"first column you exported from the old account."
+"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 ""
 
-#: mod/settings.php:1258
-msgid "Upload File"
+#: src/Module/Welcome.php:58
+msgid "Group Your Contacts"
 msgstr ""
 
-#: mod/settings.php:1260
-msgid "Relocate"
+#: src/Module/Welcome.php:59
+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 ""
 
-#: mod/settings.php:1261
+#: src/Module/Welcome.php:61
+msgid "Why Aren't My Posts Public?"
+msgstr ""
+
+#: src/Module/Welcome.php:62
 msgid ""
-"If you have moved this profile from another server, and some of your "
-"contacts don't receive your updates, try pushing this button."
+"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 ""
 
-#: mod/settings.php:1262
-msgid "Resend relocate message to contacts"
+#: src/Module/Welcome.php:64
+msgid "Getting Help"
 msgstr ""
 
-#: mod/suggest.php:27
-msgid "Contact suggestion successfully ignored."
+#: src/Module/Welcome.php:65
+msgid "Go to the Help Section"
 msgstr ""
 
-#: mod/suggest.php:51
+#: src/Module/Welcome.php:66
 msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: mod/suggest.php:70
-msgid "Do you really want to delete this suggestion?"
+#: src/Object/Post.php:131
+msgid "This entry was edited"
 msgstr ""
 
-#: mod/suggest.php:88 mod/suggest.php:108
-msgid "Ignore/Hide"
+#: src/Object/Post.php:154
+msgid "Private Message"
 msgstr ""
 
-#: mod/dfrn_confirm.php:126
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
+#: src/Object/Post.php:193
+msgid "pinned item"
 msgstr ""
 
-#: mod/dfrn_confirm.php:227
-msgid "Response from remote site was not understood."
+#: src/Object/Post.php:198
+msgid "Delete locally"
 msgstr ""
 
-#: mod/dfrn_confirm.php:234 mod/dfrn_confirm.php:240
-msgid "Unexpected response from remote site: "
+#: src/Object/Post.php:201
+msgid "Delete globally"
 msgstr ""
 
-#: mod/dfrn_confirm.php:249
-msgid "Confirmation completed successfully."
+#: src/Object/Post.php:201
+msgid "Remove locally"
 msgstr ""
 
-#: mod/dfrn_confirm.php:261
-msgid "Temporary failure. Please wait and try again."
+#: src/Object/Post.php:215
+msgid "save to folder"
 msgstr ""
 
-#: mod/dfrn_confirm.php:264
-msgid "Introduction failed or was revoked."
+#: src/Object/Post.php:250
+msgid "I will attend"
 msgstr ""
 
-#: mod/dfrn_confirm.php:269
-msgid "Remote site reported: "
+#: src/Object/Post.php:250
+msgid "I will not attend"
 msgstr ""
 
-#: mod/dfrn_confirm.php:374
-#, php-format
-msgid "No user record found for '%s' "
+#: src/Object/Post.php:250
+msgid "I might attend"
 msgstr ""
 
-#: mod/dfrn_confirm.php:384
-msgid "Our site encryption key is apparently messed up."
+#: src/Object/Post.php:278
+msgid "ignore thread"
 msgstr ""
 
-#: mod/dfrn_confirm.php:395
-msgid "Empty site URL was provided or URL could not be decrypted by us."
+#: src/Object/Post.php:279
+msgid "unignore thread"
 msgstr ""
 
-#: mod/dfrn_confirm.php:411
-msgid "Contact record was not found for you on our site."
+#: src/Object/Post.php:280
+msgid "toggle ignore status"
 msgstr ""
 
-#: mod/dfrn_confirm.php:425
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
+#: src/Object/Post.php:292
+msgid "pin"
 msgstr ""
 
-#: mod/dfrn_confirm.php:441
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+#: src/Object/Post.php:293
+msgid "unpin"
 msgstr ""
 
-#: mod/dfrn_confirm.php:452
-msgid "Unable to set your contact credentials on our system."
+#: src/Object/Post.php:294
+msgid "toggle pin status"
 msgstr ""
 
-#: mod/dfrn_confirm.php:508
-msgid "Unable to update your contact profile details on our system"
+#: src/Object/Post.php:297
+msgid "pinned"
 msgstr ""
 
-#: mod/removeme.php:46
-msgid "User deleted their account"
+#: src/Object/Post.php:304
+msgid "add star"
 msgstr ""
 
-#: mod/removeme.php:47
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
+#: src/Object/Post.php:305
+msgid "remove star"
 msgstr ""
 
-#: mod/removeme.php:48
-#, php-format
-msgid "The user id is %d"
+#: src/Object/Post.php:306
+msgid "toggle star status"
 msgstr ""
 
-#: mod/removeme.php:84 mod/removeme.php:87
-msgid "Remove My Account"
+#: src/Object/Post.php:309
+msgid "starred"
 msgstr ""
 
-#: mod/removeme.php:85
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: src/Object/Post.php:313
+msgid "add tag"
 msgstr ""
 
-#: mod/removeme.php:86
-msgid "Please enter your password for verification:"
+#: src/Object/Post.php:324
+msgid "like"
 msgstr ""
 
-#: mod/wall_upload.php:230
-msgid "Wall Photos"
+#: src/Object/Post.php:325
+msgid "dislike"
 msgstr ""
 
-#: mod/editpost.php:29 mod/editpost.php:39
-msgid "Item not found"
+#: src/Object/Post.php:328
+msgid "Share this"
 msgstr ""
 
-#: mod/editpost.php:46
-msgid "Edit post"
+#: src/Object/Post.php:328
+msgid "share"
 msgstr ""
 
-#: mod/editpost.php:78
-msgid "web link"
+#: src/Object/Post.php:377
+#, php-format
+msgid "%s (Received %s)"
 msgstr ""
 
-#: mod/editpost.php:79
-msgid "Insert video link"
+#: src/Object/Post.php:402
+msgid "to"
 msgstr ""
 
-#: mod/editpost.php:80
-msgid "video link"
+#: src/Object/Post.php:403
+msgid "via"
 msgstr ""
 
-#: mod/editpost.php:81
-msgid "Insert audio link"
+#: src/Object/Post.php:404
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: mod/editpost.php:82
-msgid "audio link"
+#: src/Object/Post.php:405
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: mod/subthread.php:107
+#: src/Object/Post.php:441
 #, php-format
-msgid "%1$s is following %2$s's %3$s"
+msgid "Reply to %s"
 msgstr ""
 
-#: mod/message.php:72
-msgid "Unable to locate contact information."
+#: src/Object/Post.php:457
+msgid "Notifier task is pending"
 msgstr ""
 
-#: mod/message.php:146
-msgid "Do you really want to delete this message?"
+#: src/Object/Post.php:458
+msgid "Delivery to remote servers is pending"
 msgstr ""
 
-#: mod/message.php:164
-msgid "Conversation not found."
+#: src/Object/Post.php:459
+msgid "Delivery to remote servers is underway"
 msgstr ""
 
-#: mod/message.php:169
-msgid "Message deleted."
+#: src/Object/Post.php:460
+msgid "Delivery to remote servers is mostly done"
 msgstr ""
 
-#: mod/message.php:174 mod/message.php:188
-msgid "Conversation removed."
+#: src/Object/Post.php:461
+msgid "Delivery to remote servers is done"
 msgstr ""
 
-#: mod/message.php:287
-msgid "No messages."
-msgstr ""
+#: src/Object/Post.php:481
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/message.php:350
-msgid "Message not available."
+#: src/Object/Post.php:482
+msgid "Show more"
 msgstr ""
 
-#: mod/message.php:404
-msgid "Delete message"
+#: src/Object/Post.php:483
+msgid "Show fewer"
 msgstr ""
 
-#: mod/message.php:406 mod/message.php:538
-msgid "D, d M Y - g:i A"
+#: src/App/Authentication.php:195 src/App/Authentication.php:247
+msgid "Login failed."
 msgstr ""
 
-#: mod/message.php:421 mod/message.php:535
-msgid "Delete conversation"
+#: src/App/Authentication.php:258
+msgid "Login failed. Please check your credentials."
 msgstr ""
 
-#: mod/message.php:423
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: src/App/Authentication.php:374
+#, php-format
+msgid "Welcome %s"
 msgstr ""
 
-#: mod/message.php:427
-msgid "Send Reply"
+#: src/App/Authentication.php:375
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: mod/message.php:510
+#: src/App/Authentication.php:378
 #, php-format
-msgid "Unknown sender - %s"
+msgid "Welcome back %s"
 msgstr ""
 
-#: mod/message.php:512
-#, php-format
-msgid "You and %s"
+#: src/App/Module.php:221
+msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: mod/message.php:514
+#: src/App/Page.php:228
+msgid "Delete this item?"
+msgstr ""
+
+#: src/App/Page.php:276
+msgid "toggle mobile"
+msgstr ""
+
+#: src/App/Router.php:190
 #, php-format
-msgid "%s and You"
+msgid "Method not allowed for this module. Allowed method(s): %s"
 msgstr ""
 
-#: mod/message.php:541
+#: src/Console/ArchiveContact.php:86
 #, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr ""
 
-#: mod/repair_ostatus.php:20
-msgid "Resubscribing to OStatus contacts"
+#: src/Console/ArchiveContact.php:89
+msgid "The contact entries have been archived"
 msgstr ""
 
-#: mod/profperm.php:29
-msgid "Permission denied"
+#: src/Console/NewPassword.php:93
+msgid "Enter new password: "
 msgstr ""
 
-#: mod/profperm.php:35 mod/profperm.php:68
-msgid "Invalid profile identifier."
+#: src/Console/PostUpdate.php:73
+#, php-format
+msgid "Post update version number has been set to %s."
 msgstr ""
 
-#: mod/profperm.php:114
-msgid "Profile Visibility Editor"
+#: src/Console/PostUpdate.php:81
+msgid "Check for pending update actions."
 msgstr ""
 
-#: mod/profperm.php:127
-msgid "Visible To"
+#: src/Console/PostUpdate.php:83
+msgid "Done."
 msgstr ""
 
-#: mod/profperm.php:143
-msgid "All Contacts (with secure profile access)"
+#: src/Console/PostUpdate.php:85
+msgid "Execute pending post updates."
 msgstr ""
 
-#: mod/tagrm.php:31
-msgid "Tag(s) removed"
+#: src/Console/PostUpdate.php:91
+msgid "All pending post updates are done."
 msgstr ""
 
-#: mod/tagrm.php:101
-msgid "Remove Item Tag"
+#: src/App.php:333
+msgid "No system theme config value set."
 msgstr ""
 
-#: mod/tagrm.php:103
-msgid "Select a tag to remove: "
+#: src/BaseModule.php:132
+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 ""
 
-#: mod/videos.php:117
-msgid "No videos selected"
+#: src/LegacyModule.php:30
+#, php-format
+msgid "Legacy module file not found: %s"
 msgstr ""
 
-#: mod/videos.php:250
-msgid "Recent Videos"
+#: update.php:217
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
 msgstr ""
 
-#: mod/videos.php:252
-msgid "Upload New Videos"
+#: update.php:272
+#, php-format
+msgid "%s: Updating post-type."
 msgstr ""

diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index a9da4f6118d4c6bfbc3ed12771a354b14d569c6a..babedd6c023a33cdae2347d49c17c25a3bf45f75 100644 (file)
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -1,11 +1,11 @@
 <div id="acl-wrapper">
-       <div class="panel-group" id="visibility-accordion" role="tablist" aria-multiselectable="true">
+       <div class="panel-group" id="visibility-accordion-{{$input_group_id}}" role="tablist" aria-multiselectable="true">
                <div class="panel panel-success">
-                       <label class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}">
-                               <input type="radio" name="visibility" id="visibility-public" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}>
+                       <label class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading-{{$input_group_id}}" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}">
+                               <input type="radio" name="{{$input_names.visibility}}" id="visibility-public-{{$input_group_id}}" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}>
                                <i class="fa fa-globe"></i> {{$public_title}}
                        </label>
-                       <fieldset id="visibility-public-panel" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading" {{if $visibility != 'public'}}disabled{{/if}}>
+                       <fieldset id="visibility-public-panel-{{$input_group_id}}" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading-{{$input_group_id}}" {{if $visibility != 'public'}}disabled{{/if}}>
                                <div class="panel-body">
                                        <p>{{$public_desc}}</p>
                        {{if $for_federation}}
@@ -39,26 +39,26 @@
                        </fieldset>
                </div>
                <div class="panel panel-info">
-                       <label class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}">
-                               <input type="radio" name="visibility" id="visibility-custom" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}>
+                       <label class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading-{{$input_group_id}}" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}">
+                               <input type="radio" name="{{$input_names.visibility}}" id="visibility-custom-{{$input_group_id}}" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}>
                                <i class="fa fa-lock"></i> {{$custom_title}}
                        </label>
-                       <fieldset id="visibility-custom-panel" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading" {{if $visibility != 'custom'}}disabled{{/if}}>
-                               <input type="hidden" name="group_allow" value="{{$group_allow}}"/>
-                               <input type="hidden" name="contact_allow" value="{{$contact_allow}}"/>
-                               <input type="hidden" name="group_deny" value="{{$group_deny}}"/>
-                               <input type="hidden" name="contact_deny" value="{{$contact_deny}}"/>
+                       <fieldset id="visibility-custom-panel-{{$input_group_id}}" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading-{{$input_group_id}}" {{if $visibility != 'custom'}}disabled{{/if}}>
+                               <input type="hidden" name="{{$input_names.group_allow}}" value="{{$group_allow}}"/>
+                               <input type="hidden" name="{{$input_names.contact_allow}}" value="{{$contact_allow}}"/>
+                               <input type="hidden" name="{{$input_names.group_deny}}" value="{{$group_deny}}"/>
+                               <input type="hidden" name="{{$input_names.contact_deny}}" value="{{$contact_deny}}"/>
                                <div class="panel-body">
                                        <p>{{$custom_desc}}</p>
 
                                        <div class="form-group">
-                                               <label for="acl_allow">{{$allow_label}}</label>
-                                               <input type="text" class="form-control input-lg" id="acl_allow">
+                                               <label for="acl_allow-{{$input_group_id}}">{{$allow_label}}</label>
+                                               <input type="text" class="form-control input-lg" id="acl_allow-{{$input_group_id}}">
                                        </div>
 
                                        <div class="form-group">
-                                               <label for="acl_deny">{{$deny_label}}</label>
-                                               <input type="text" class="form-control input-lg" id="acl_deny">
+                                               <label for="acl_deny-{{$input_group_id}}">{{$deny_label}}</label>
+                                               <input type="text" class="form-control input-lg" id="acl_deny-{{$input_group_id}}">
                                        </div>
                                </div>
                        </fieldset>
@@ -68,29 +68,29 @@
 
 {{if $for_federation}}
        <div class="form-group">
-               <label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
-               <input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
+               <label for="profile-jot-email" id="profile-jot-email-label-{{$input_group_id}}">{{$emailcc}}</label>
+               <input type="text" name="{{$input_names.emailcc}}" id="profile-jot-email-{{$input_group_id}}" class="form-control" title="{{$emtitle}}" />
        </div>
-       <div id="profile-jot-email-end"></div>
+       <div id="profile-jot-email-end-{{$input_group_id}}"></div>
 {{/if}}
 </div>
 <script type="text/javascript">
        $(function() {
-               let $acl_allow_input = $('#acl_allow');
-               let $contact_allow_input = $('[name=contact_allow]');
-               let $group_allow_input = $('[name=group_allow]');
-               let $acl_deny_input = $('#acl_deny');
-               let $contact_deny_input = $('[name=contact_deny]');
-               let $group_deny_input = $('[name=group_deny]');
-               let $visibility_public_panel = $('#visibility-public-panel');
-               let $visibility_custom_panel = $('#visibility-custom-panel');
-               let $visibility_public_radio = $('#visibility-public');
-               let $visibility_custom_radio = $('#visibility-custom');
+               let $acl_allow_input = $('#acl_allow-{{$input_group_id}}');
+               let $contact_allow_input = $('[name="{{$input_names.contact_allow}}"]');
+               let $group_allow_input = $('[name="{{$input_names.group_allow}}"]');
+               let $acl_deny_input = $('#acl_deny-{{$input_group_id}}');
+               let $contact_deny_input = $('[name="{{$input_names.contact_deny}}"]');
+               let $group_deny_input = $('[name="{{$input_names.group_deny}}"]');
+               let $visibility_public_panel = $('#visibility-public-panel-{{$input_group_id}}');
+               let $visibility_custom_panel = $('#visibility-custom-panel-{{$input_group_id}}');
+               let $visibility_public_radio = $('#visibility-public-{{$input_group_id}}');
+               let $visibility_custom_radio = $('#visibility-custom-{{$input_group_id}}');
 
                // Frio specific
                if ($.fn.collapse) {
-                       $visibility_public_panel.collapse({parent: '#visibility-accordion', toggle: false});
-                       $visibility_custom_panel.collapse({parent: '#visibility-accordion', toggle: false});
+                       $visibility_public_panel.collapse({parent: '#visibility-accordion-{{$input_group_id}}', toggle: false});
+                       $visibility_custom_panel.collapse({parent: '#visibility-accordion-{{$input_group_id}}', toggle: false});
                }
 
                $visibility_public_radio.on('change', function (e) {
@@ -101,13 +101,13 @@
                        $visibility_public_panel.prop('disabled', false);
                        $visibility_custom_panel.prop('disabled', true);
 
-                       $('.profile-jot-net input[type=checkbox]').each(function() {
+                       $('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input[type=checkbox]').each(function() {
                                // Restores checkbox state if it had been saved
                                if ($(this).attr('data-checked') !== undefined) {
                                        $(this).prop('checked', $(this).attr('data-checked') === 'true');
                                }
                        });
-                       $('.profile-jot-net input').attr('disabled', false);
+                       $('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input').attr('disabled', false);
                });
 
                $visibility_custom_radio.on('change', function(e) {
@@ -118,13 +118,13 @@
                        $visibility_public_panel.prop('disabled', true);
                        $visibility_custom_panel.prop('disabled', false);
 
-                       $('.profile-jot-net input[type=checkbox]').each(function() {
+                       $('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input[type=checkbox]').each(function() {
                                // Saves current checkbox state
                                $(this)
                                        .attr('data-checked', $(this).prop('checked'))
                                        .prop('checked', false);
                        });
-                       $('.profile-jot-net input').attr('disabled', 'disabled');
+                       $('#visibility-public-panel-{{$input_group_id}} .profile-jot-net input').attr('disabled', 'disabled');
                });
 
                // Custom visibility tags inputs
@@ -233,9 +233,11 @@
 
                // Anti-duplicate callback + acl fields value generation
 
-               $acl_allow_input.on('itemAdded', function (event) {
-                       // Removes duplicate in the opposite acl box
-                       $acl_deny_input.tagsinput('remove', event.item);
+               $acl_allow_input.on('itemAdded itemRemoved', function (event) {
+                       if (event.type === 'itemAdded') {
+                               // Removes duplicate in the opposite acl box
+                               $acl_deny_input.tagsinput('remove', event.item);
+                       }
 
                        // Update the real acl field
                        $group_allow_input.val('');
@@ -249,9 +251,11 @@
                        });
                });
 
-               $acl_deny_input.on('itemAdded', function (event) {
-                       // Removes duplicate in the opposite acl box
-                       $acl_allow_input.tagsinput('remove', event.item);
+               $acl_deny_input.on('itemAdded itemRemoved', function (event) {
+                       if (event.type === 'itemAdded') {
+                               // Removes duplicate in the opposite acl box
+                               $acl_allow_input.tagsinput('remove', event.item);
+                       }
 
                        // Update the real acl field
                        $group_deny_input.val('');

diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl
deleted file mode 100644 (file)
index 8378e50..0000000
--- a/view/templates/cropbody.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-       {{$desc nofilter}}
-</p>
-
-<div id="cropimage-wrapper">
-       <img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-
-<div id="cropimage-preview-wrapper" >
-       <div id="previewWrap" class="crop-preview"></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       var image = document.getElementById('croppa');
-       var cropper = new Cropper(image, {
-               aspectRatio: 1 / 1,
-               viewMode: 1,
-               preview: '#profile-photo-wrapper, .crop-preview',
-               crop: function(e) {
-                       $( '#x1' ).val(e.detail.x);
-                       $( '#y1' ).val(e.detail.y);
-                       $( '#x2' ).val(e.detail.x + e.detail.width);
-                       $( '#y2' ).val(e.detail.y + e.detail.height);
-                       $( '#width' ).val(e.detail.scaleX);
-                       $( '#height' ).val(e.detail.scaleY);
-               },
-               ready: function() {
-                       // Add the "crop-preview" class to the preview element ("profile-photo-wrapper").
-                       var cwrapper = document.getElementById("profile-photo-wrapper");
-                       cwrapper.classList.add("crop-preview");
-               }
-       });
-
-</script>
-
-<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
-       <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-       <input type='hidden' name='profile' value='{{$profile}}'>
-       <input type="hidden" name="cropfinal" value="1" />
-       <input type="hidden" name="xstart" id="x1" />
-       <input type="hidden" name="ystart" id="y1" />
-       <input type="hidden" name="xfinal" id="x2" />
-       <input type="hidden" name="yfinal" id="y2" />
-       <input type="hidden" name="height" id="height" />
-       <input type="hidden" name="width"  id="width" />
-
-       <div id="crop-image-submit-wrapper" >
-               <input type="submit" name="submit" value="{{$done}}" />
-       </div>
-
-</form>

diff --git a/view/templates/crophead.tpl b/view/templates/crophead.tpl
deleted file mode 100644 (file)
index 3fd1579..0000000
--- a/view/templates/crophead.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="view/asset/cropperjs/dist/cropper.min.js"></script>
-<link rel="stylesheet" href="view/asset/cropperjs/dist/cropper.min.css" type="text/css" />

diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl
index 6c261689087938201bf1f4bfb3fbeee1e36d02b5..04e9f82c024689510632da0c034b68c3d07a150c 100644 (file)
--- a/view/templates/exception.tpl
+++ b/view/templates/exception.tpl
@@ -2,5 +2,8 @@
     <img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
     <h1>{{$title}}</h1>
     <p>{{$message}}</p>
+{{if $trace}}
+       <pre>{{$trace nofilter}}</pre>
+{{/if}}
        <p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
 </div>

diff --git a/view/templates/http_status.tpl b/view/templates/http_status.tpl
index 6b366d6f045411d69325b17aad61b467c5a271f3..a9c094c4b23194a2857f1f8336767e255142413d 100644 (file)
--- a/view/templates/http_status.tpl
+++ b/view/templates/http_status.tpl
@@ -4,6 +4,9 @@
        </head>
        <body>
                <h1>{{$title}}</h1>
-               <p>{{$description nofilter}}</p>
+               <p>{{$message nofilter}}</p>
+       {{if $trace}}
+               <pre>{{$trace nofilter}}</pre>
+       {{/if}}
        </body>
 </html>

diff --git a/view/templates/profile/advanced.tpl b/view/templates/profile/advanced.tpl
new file mode 100644 (file)
index 0000000..44e763f
--- /dev/null
+++ b/view/templates/profile/advanced.tpl
@@ -0,0 +1,184 @@
+
+{{include file="section_title.tpl"}}
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
+</dl>
+
+{{if $profile.membersince}}
+<dl id="aprofile-membersince" class="aprofile">
+ <dt>{{$profile.membersince.0}}</dt>
+ <dd>{{$profile.membersince.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.gender}}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.birthday}}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.age}}
+<dl id="aprofile-age" class="aprofile">
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.marital}}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.sexual}}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_keywords.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.homepage}}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.hometown}}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.politic}}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.religion}}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.about}}
+<dl id="aprofile-about" class="aprofile">
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.interest}}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.likes}}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.dislikes}}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.contact}}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.music}}
+<dl id="aprofile-music" class="aprofile">
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.book}}
+<dl id="aprofile-book" class="aprofile">
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.tv}}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.film}}
+<dl id="aprofile-film" class="aprofile">
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.romance}}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.work}}
+<dl id="aprofile-work" class="aprofile">
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.education}}
+<dl id="aprofile-education" class="aprofile">
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.forumlist}}
+<dl id="aprofile-forumlist" class="aprofile">
+ <dt>{{$profile.forumlist.0}}</dt>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+

diff --git a/view/templates/profile/publish.tpl b/view/templates/profile/publish.tpl
new file mode 100644 (file)
index 0000000..a62292f
--- /dev/null
+++ b/view/templates/profile/publish.tpl
@@ -0,0 +1,17 @@
+
+<p id="profile-publish-desc-{{$instance}}">
+{{$pubdesc}}
+</p>
+
+               <div id="profile-publish-yes-wrapper-{{$instance}}">
+               <label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+               <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
+
+               <div id="profile-publish-break-{{$instance}}" ></div>   
+               </div>
+               <div id="profile-publish-no-wrapper-{{$instance}}">
+               <label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+               <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
+
+               <div id="profile-publish-end-{{$instance}}"></div>
+               </div>

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
new file mode 100644 (file)
index 0000000..1ee3302
--- /dev/null
+++ b/view/templates/profile/vcard.tpl
@@ -0,0 +1,74 @@
+
+<div class="vcard h-card">
+
+       <div class="fn label p-name">{{$profile.name}}</div>
+       
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+       
+       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+       {{if $profile.picdate}}
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
+       {{else}}
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
+       {{/if}}
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+       {{if $location}}
+               <dl class="location"><dt class="location-label">{{$location}}</dt> 
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+                       <span class="city-state-zip">
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+                       </span>
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+               </dd>
+               </dl>
+       {{/if}}
+
+       {{if $profile.xmpp}}
+               <dl class="xmpp">
+               <dt class="xmpp-label">{{$xmpp}}</dt>
+               <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+               </dl>
+       {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       
+       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+       {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+       {{include file="diaspora_vcard.tpl"}}
+
+       <div id="profile-extra-links">
+               <ul>
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+                       {{/if}}
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
+               </ul>
+       </div>
+</div>
+
+{{$contact_block nofilter}}
+
+

diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl
deleted file mode 100644 (file)
index 44e763f..0000000
--- a/view/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,184 +0,0 @@
-
-{{include file="section_title.tpl"}}
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.membersince}}
-<dl id="aprofile-membersince" class="aprofile">
- <dt>{{$profile.membersince.0}}</dt>
- <dd>{{$profile.membersince.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.marital}}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
- <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.pub_keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.forumlist}}
-<dl id="aprofile-forumlist" class="aprofile">
- <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-

diff --git a/view/templates/profile_photo.tpl b/view/templates/profile_photo.tpl
deleted file mode 100644 (file)
index e7c6b89..0000000
--- a/view/templates/profile_photo.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<h1>{{$title}}</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">{{$lbl_profiles}} </label>
-<select name="profile" id="profile-photo-profiles" />
-{{foreach $profiles as $p}}
-<option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
-{{/foreach}}
-</select>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select nofilter}}
-</div>
\ No newline at end of file

diff --git a/view/templates/profile_publish.tpl b/view/templates/profile_publish.tpl
deleted file mode 100644 (file)
index a62292f..0000000
--- a/view/templates/profile_publish.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<p id="profile-publish-desc-{{$instance}}">
-{{$pubdesc}}
-</p>
-
-               <div id="profile-publish-yes-wrapper-{{$instance}}">
-               <label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-               <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
-
-               <div id="profile-publish-break-{{$instance}}" ></div>   
-               </div>
-               <div id="profile-publish-no-wrapper-{{$instance}}">
-               <label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-               <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
-
-               <div id="profile-publish-end-{{$instance}}"></div>
-               </div>

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
deleted file mode 100644 (file)
index 1ee3302..0000000
--- a/view/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<div class="vcard h-card">
-
-       <div class="fn label p-name">{{$profile.name}}</div>
-       
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-       
-       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-       {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-       {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-       {{/if}}
-       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-       {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
-               </dl>
-       {{/if}}
-
-       {{if $profile.xmpp}}
-               <dl class="xmpp">
-               <dt class="xmpp-label">{{$xmpp}}</dt>
-               <dd class="xmpp-data">{{$profile.xmpp}}</dd>
-               </dl>
-       {{/if}}
-
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-       
-       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-       {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-       {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-       {{include file="diaspora_vcard.tpl"}}
-
-       <div id="profile-extra-links">
-               <ul>
-                       {{if $unfollow_link}}
-                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-                       {{/if}}
-                       {{if $follow_link}}
-                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-                       {{/if}}
-                       {{if $subscribe_feed_link}}
-                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-                       {{/if}}
-               </ul>
-       </div>
-</div>
-
-{{$contact_block nofilter}}
-
-

diff --git a/view/templates/settings/profile/photo/crop.tpl b/view/templates/settings/profile/photo/crop.tpl
new file mode 100644 (file)
index 0000000..679c9d1
--- /dev/null
+++ b/view/templates/settings/profile/photo/crop.tpl
@@ -0,0 +1,55 @@
+<div class="generic-page-wrapper">
+       <h1>{{$title}}</h1>
+       <p id="cropimage-desc">
+               {{$desc nofilter}}
+       </p>
+
+       <div id="cropimage-wrapper">
+               <p><img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}"></p>
+       </div>
+
+       <div id="cropimage-preview-wrapper" >
+               <div id="previewWrap" class="crop-preview"></div>
+       </div>
+
+       <form action="settings/profile/photo/crop/{{$resource}}" id="crop-image-form" method="post">
+               <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+               <input type="hidden" name="xstart" id="x1" />
+               <input type="hidden" name="ystart" id="y1" />
+               <input type="hidden" name="height" id="height" />
+               <input type="hidden" name="width"  id="width" />
+
+               <div id="settings-profile-photo-crop-submit-wrapper" class="pull-right settings-submit-wrapper">
+               {{if $skip}}
+                       <button type="submit" name="action" id="settings-profile-photo-crop-skip" class="btn" value="skip">{{$skip}}</button>
+        {{/if}}
+                       <button type="submit" name="action" id="settings-profile-photo-crop-submit" class="btn btn-primary" value="crop">{{$crop}}</button>
+               </div>
+
+               <div class="clear"></div>
+       </form>
+
+       <script type="text/javascript" language="javascript">
+
+               var image = document.getElementById('croppa');
+               var cropper = new Cropper(image, {
+                       aspectRatio: 1,
+                       viewMode: 1,
+                       preview: '#profile-photo-wrapper, .crop-preview',
+                       crop: function(e) {
+                               $('#x1').val(e.detail.x);
+                               $('#y1').val(e.detail.y);
+                               $('#width').val(e.detail.width);
+                               $('#height').val(e.detail.height);
+                       },
+               });
+
+               var skip_button = document.getElementById('settings-profile-photo-crop-skip');
+
+               skip_button.addEventListener('click', function() {
+                       let image_data = cropper.getImageData();
+                       cropper.setData({x: 0, y: 0, width: image_data.width, height: image_data.height});
+               })
+       </script>
+</div>

diff --git a/view/templates/settings/profile/photo/crop_head.tpl b/view/templates/settings/profile/photo/crop_head.tpl
new file mode 100644 (file)
index 0000000..3fd1579
--- /dev/null
+++ b/view/templates/settings/profile/photo/crop_head.tpl
@@ -0,0 +1,2 @@
+<script type="text/javascript" src="view/asset/cropperjs/dist/cropper.min.js"></script>
+<link rel="stylesheet" href="view/asset/cropperjs/dist/cropper.min.css" type="text/css" />

diff --git a/view/templates/settings/profile/photo/index.tpl b/view/templates/settings/profile/photo/index.tpl
new file mode 100644 (file)
index 0000000..a819e11
--- /dev/null
+++ b/view/templates/settings/profile/photo/index.tpl
@@ -0,0 +1,25 @@
+<div class="generic-page-wrapper">
+       <h1>{{$title}}</h1>
+
+       <h2>{{$current_picture}}</h2>
+       <p><img src="{{$avatar}}" alt="{{$current_picture}}"/></p>
+       <h2>{{$upload_picture}}</h2>
+       <form enctype="multipart/form-data" action="settings/profile/photo" method="post">
+               <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+               <div id="profile-photo-upload-wrapper" class="form-group field input">
+                       <label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_upfile}} </label>
+                       <input class="form-control" name="userfile" type="file" id="profile-photo-upload" size="48">
+                       <div class="clear"></div>
+               </div>
+
+               <div id="profile-photo-submit-wrapper" class="pull-right settings-submit-wrapper">
+                       <button type="submit" name="submit" id="profile-photo-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+               </div>
+               <div class="clear"></div>
+       </form>
+
+       <p id="profile-photo-link-select-wrapper">
+       {{$select nofilter}}
+       </p>
+</div>
\ No newline at end of file

diff --git a/view/templates/welcome.tpl b/view/templates/welcome.tpl
index 9f343efbbbc5a4c5bb5298e01c4b40aa1de718c0..4e0ae7754d6d30d247f31758254e634fccad0111 100644 (file)
--- a/view/templates/welcome.tpl
+++ b/view/templates/welcome.tpl
@@ -22,7 +22,7 @@
                <h4>{{$profile nofilter}}</h4>
                <ul>
                        <li>
-                               <a target="newmember" href="profile_photo">{{$profile_photo_link}}</a><br />
+                               <a target="newmember" href="settings/profile/photo">{{$profile_photo_link}}</a><br />
                                {{$profile_photo_txt nofilter}}
                        </li>
                        <li>

diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
new file mode 100644 (file)
index 0000000..3c933c8
--- /dev/null
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -0,0 +1,60 @@
+
+<div class="vcard h-card">
+
+       <div class="fn label p-name">{{$profile.name}}</div>
+       
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+       
+       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+
+       {{if $location}}
+               <dl class="location"><dt class="location-label">{{$location}}</dt> 
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+                       <span class="city-state-zip">
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+                       </span>
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+               </dd>
+               </dl>
+       {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       
+       {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+       {{include file="diaspora_vcard.tpl"}}
+
+       <div id="profile-vcard-break"></div>
+       <div id="profile-extra-links">
+               <ul>
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+                       {{/if}}
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
+               </ul>
+       </div>
+</div>
+
+{{$contact_block nofilter}}
+
+

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
deleted file mode 100644 (file)
index 3c933c8..0000000
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<div class="vcard h-card">
-
-       <div class="fn label p-name">{{$profile.name}}</div>
-       
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-       
-       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-
-       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-
-       {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
-               </dl>
-       {{/if}}
-
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-       
-       {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-       {{include file="diaspora_vcard.tpl"}}
-
-       <div id="profile-vcard-break"></div>
-       <div id="profile-extra-links">
-               <ul>
-                       {{if $unfollow_link}}
-                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-                       {{/if}}
-                       {{if $follow_link}}
-                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-                       {{/if}}
-                       {{if $subscribe_feed_link}}
-                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-                       {{/if}}
-               </ul>
-       </div>
-</div>
-
-{{$contact_block nofilter}}
-
-

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 94f0edfd7a324c465c091d9971499289ab64dca5..fd99a75fad7032a4d58153ba0861f11c6cf5a223 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2288,7 +2288,7 @@ ul.dropdown-menu li:hover {
  * PAGES
  *********/
 
-.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper,
+.generic-page-wrapper, .videos-content-wrapper,
  .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .delegation-content-wrapper, .notes-content-wrapper,
@@ -2850,21 +2850,15 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
 #profile-listing-new-link-wrapper {
     margin-bottom: 20px;
 }
-.panel-group-settings {
-    margin-left: -15px;
-    margin-right: -15px;
-}
+
 .panel-group-settings > .panel,
 .panel-group-settings > form > .panel {
-    padding-left: 15px;
-    padding-right: 15px;
+    padding-left: 10px;
+    padding-right: 10px;
 }
-.profiles-content-wrapper #profile-photo-upload-section {
+#profile-photo-upload-section {
     display: none;
-    margin-left: -15px;
-    margin-right: -15px;
-    margin-top: 15px;
-    padding: 15px;
+    padding: 10px;
 }
 #profile-photo-upload-close {
     font-size: 14px;
@@ -3537,7 +3531,7 @@ section .profile-match-wrapper {
                right: 10px;
        }
 
-       .generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .delegation-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
+       .generic-page-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .delegation-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
                border-radius: 0;
                padding: 10px;
        }

diff --git a/view/theme/frio/templates/profile/advanced.tpl b/view/theme/frio/templates/profile/advanced.tpl
new file mode 100644 (file)
index 0000000..3ca4000
--- /dev/null
+++ b/view/theme/frio/templates/profile/advanced.tpl
@@ -0,0 +1,234 @@
+<div id="profile-page" class="generic-page-wrapper">
+       <h3 class="">{{$title}}</h3>
+
+       {{* The link to edit the profile*}}
+       {{if $profile.edit}}
+       <ul class="nav nav-pills preferences">
+               <li class="pull-right">
+                       <a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}">
+                               <i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$profile.edit.1}}
+                       </a>
+               </li>
+       </ul>
+       <div class="clear"></div>
+       {{/if}}
+
+       {{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
+       <ul id="profile-menu" class="nav nav-tabs" role="tablist">
+               <li role="presentation" class="active">
+                       <a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
+               </li>
+               <li role="presentation">
+                       <a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
+               </li>
+       </ul>
+
+       <div class="tab-content">
+               <div role="tabpanel" class="tab-pane active" id="profile-content-standard">
+                       <div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
+                       </div>
+
+                       {{if $profile.membersince}}
+                       <div id="aprofile-membersince" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.membersince.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.membersince.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.gender}}
+                       <div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.birthday}}
+                       <div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.age}}
+                       <div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.hometown}}
+                       <div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.marital}}
+                       <div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.homepage}}
+                       <div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.about}}
+                       <div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.pub_keywords}}
+                       <div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
+                       </div>
+                       {{/if}}
+               </div>
+
+               <div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
+                       {{if $profile.sexual}}
+                       <div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.politic}}
+                       <div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.religion}}
+                       <div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.interest}}
+                       <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.likes}}
+                       <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.dislikes}}
+                       <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.contact}}
+                       <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.music}}
+                       <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.book}}
+                       <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.tv}}
+                       <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.film}}
+                       <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.romance}}
+                       <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+
+                       {{if $profile.work}}
+                       <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                       <hr class="profile-separator">
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
+                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.education}}
+                       <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+
+                       {{if $profile.forumlist}}
+                       <div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+                               <hr class="profile-separator">
+                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1 nofilter}}</div>
+                       </div>
+                       {{/if}}
+               </div>
+       </div>
+</div>

diff --git a/view/theme/frio/templates/profile/publish.tpl b/view/theme/frio/templates/profile/publish.tpl
new file mode 100644 (file)
index 0000000..bf14cf5
--- /dev/null
+++ b/view/theme/frio/templates/profile/publish.tpl
@@ -0,0 +1,23 @@
+
+<div id="profile-publish-wrapper">
+       <h5 id="profile-publish-desc-{{$instance}}">
+       {{$pubdesc}}
+       </h5>
+
+       <div id="profile-publish-yes-wrapper-{{$instance}}" class="field radio">
+               <div class="radio">
+                       <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1"/>
+                       <label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+               </div>
+               <div id="profile-publish-break-{{$instance}}"></div>
+       </div>
+
+       <div id="profile-publish-no-wrapper-{{$instance}}" class="field radio">
+               <div class="radio">
+                       <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"/>
+                       <label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+               </div>
+
+               <div id="profile-publish-end-{{$instance}}"></div>
+       </div>
+</div>

diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
new file mode 100644 (file)
index 0000000..1673a9c
--- /dev/null
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -0,0 +1,142 @@
+<div class="vcard h-card widget">
+
+       <div id="profile-photo-wrapper">
+               {{if $profile.picdate}}
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
+               {{else}}
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
+               {{/if}}
+
+               <div class="tool visible-lg visible-md">
+                       {{if $profile.edit}}
+                       <div class="action">
+                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
+                       </div>
+                       {{else}}
+                               {{if $profile.menu}}
+                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+                               {{/if}}
+                       {{/if}}
+               </div>
+
+       </div>
+
+       {{* The short information which will appended to the second navbar by scrollspy *}}
+       <div id="vcard-short-info-wrapper" style="display: none;">
+               <div id="vcard-short-info" class="media" style="display: none">
+                       <div id="vcard-short-photo-wrapper" class="pull-left">
+                               {{if $profile.picdate}}
+                               <img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
+                               {{else}}
+                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
+                               {{/if}}
+                       </div>
+
+                       <div id="vcard-short-desc" class="media-body">
+                               <h4 class="media-heading">{{$profile.name}}</h4>
+                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
+                       </div>
+               </div>
+       </div>
+
+       <div class="panel-body">
+               <div class="profile-header">
+                       <h3 class="fn p-name">{{$profile.name}}</h3>
+
+                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
+
+                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+                       {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
+               </div>
+
+               {{if $follow_link || $unfollow_link || $wallmessage_link}}
+               <div id="profile-extra-links">
+                       {{if $follow_link || $unfollow_link}}
+                       <div id="dfrn-request-link-button">
+                               {{if $unfollow_link}}
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
+                                       <span class=""><i class="fa fa-user-times"></i></span>
+                                       <span class="">{{$unfollow}}</span>
+                               </a>
+                               {{else}}
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
+                                       <span class=""><i class="fa fa-user-plus"></i></span>
+                                       <span class="">{{$follow}}</span>
+                               </a>
+                               {{/if}}
+                       </div>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                       <div id="wallmessage-link-botton">
+                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+                                       <span class=""><i class="fa fa-envelope"></i></span>
+                                       <span class="">{{$wallmessage}}</span>
+                               </button>
+                       </div>
+                       {{/if}}
+               </div>
+               {{/if}}
+
+               <div class="clear"></div>
+
+               {{if $location}}
+               <div class="location detail">
+                       <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
+                       <span class="adr">
+                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
+                               <span class="city-state-zip">
+                                       <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                                       <span class="region p-region">{{$profile.region}}</span>
+                                       <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+                               </span>
+                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+                       </span>
+               </div>
+               {{/if}}
+
+               {{if $profile.xmpp}}
+               <div class="xmpp">
+                       <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
+                       <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
+               </div>
+               {{/if}}
+
+               {{if $gender}}
+               <div class="mf detail">
+                       <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
+                       <span class="p-gender">{{$profile.gender}}</span>
+               </div>
+               {{/if}}
+
+               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+               {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+               {{if $marital}}
+               <div class="marital detail">
+                       <span class="marital-label icon"><i class="fa fa-heart"></i></span>
+                       <span class="marital-text icon">{{$profile.marital}}</span>
+               </div>
+               {{/if}}
+
+               {{if $homepage}}
+               <div class="homepage detail">
+                       <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
+                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
+               </div>
+               {{/if}}
+
+               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+               {{include file="diaspora_vcard.tpl"}}
+       </div>
+</div>
+
+{{if $contact_block}}
+<div class="widget" id="widget-contacts">
+       {{$contact_block nofilter}}
+</div>
+{{/if}}

diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl
deleted file mode 100644 (file)
index 3ca4000..0000000
--- a/view/theme/frio/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,234 +0,0 @@
-<div id="profile-page" class="generic-page-wrapper">
-       <h3 class="">{{$title}}</h3>
-
-       {{* The link to edit the profile*}}
-       {{if $profile.edit}}
-       <ul class="nav nav-pills preferences">
-               <li class="pull-right">
-                       <a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}">
-                               <i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$profile.edit.1}}
-                       </a>
-               </li>
-       </ul>
-       <div class="clear"></div>
-       {{/if}}
-
-       {{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
-       <ul id="profile-menu" class="nav nav-tabs" role="tablist">
-               <li role="presentation" class="active">
-                       <a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
-               </li>
-               <li role="presentation">
-                       <a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
-               </li>
-       </ul>
-
-       <div class="tab-content">
-               <div role="tabpanel" class="tab-pane active" id="profile-content-standard">
-                       <div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
-                       </div>
-
-                       {{if $profile.membersince}}
-                       <div id="aprofile-membersince" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.membersince.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.membersince.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.gender}}
-                       <div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.birthday}}
-                       <div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.age}}
-                       <div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.hometown}}
-                       <div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.marital}}
-                       <div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.homepage}}
-                       <div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.about}}
-                       <div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.pub_keywords}}
-                       <div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
-                       </div>
-                       {{/if}}
-               </div>
-
-               <div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
-                       {{if $profile.sexual}}
-                       <div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.politic}}
-                       <div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.religion}}
-                       <div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.interest}}
-                       <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.likes}}
-                       <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.dislikes}}
-                       <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.contact}}
-                       <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.music}}
-                       <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.book}}
-                       <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.tv}}
-                       <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.film}}
-                       <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.romance}}
-                       <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-
-                       {{if $profile.work}}
-                       <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                       <hr class="profile-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.education}}
-                       <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-
-                       {{if $profile.forumlist}}
-                       <div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-                               <hr class="profile-separator">
-                               <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1 nofilter}}</div>
-                       </div>
-                       {{/if}}
-               </div>
-       </div>
-</div>

diff --git a/view/theme/frio/templates/profile_publish.tpl b/view/theme/frio/templates/profile_publish.tpl
deleted file mode 100644 (file)
index bf14cf5..0000000
--- a/view/theme/frio/templates/profile_publish.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-<div id="profile-publish-wrapper">
-       <h5 id="profile-publish-desc-{{$instance}}">
-       {{$pubdesc}}
-       </h5>
-
-       <div id="profile-publish-yes-wrapper-{{$instance}}" class="field radio">
-               <div class="radio">
-                       <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1"/>
-                       <label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-               </div>
-               <div id="profile-publish-break-{{$instance}}"></div>
-       </div>
-
-       <div id="profile-publish-no-wrapper-{{$instance}}" class="field radio">
-               <div class="radio">
-                       <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"/>
-                       <label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-               </div>
-
-               <div id="profile-publish-end-{{$instance}}"></div>
-       </div>
-</div>

diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
deleted file mode 100644 (file)
index 1673a9c..0000000
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,142 +0,0 @@
-<div class="vcard h-card widget">
-
-       <div id="profile-photo-wrapper">
-               {{if $profile.picdate}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
-               {{else}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
-               {{/if}}
-
-               <div class="tool visible-lg visible-md">
-                       {{if $profile.edit}}
-                       <div class="action">
-                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
-                       </div>
-                       {{else}}
-                               {{if $profile.menu}}
-                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
-                               {{/if}}
-                       {{/if}}
-               </div>
-
-       </div>
-
-       {{* The short information which will appended to the second navbar by scrollspy *}}
-       <div id="vcard-short-info-wrapper" style="display: none;">
-               <div id="vcard-short-info" class="media" style="display: none">
-                       <div id="vcard-short-photo-wrapper" class="pull-left">
-                               {{if $profile.picdate}}
-                               <img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
-                               {{else}}
-                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
-                               {{/if}}
-                       </div>
-
-                       <div id="vcard-short-desc" class="media-body">
-                               <h4 class="media-heading">{{$profile.name}}</h4>
-                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
-                       </div>
-               </div>
-       </div>
-
-       <div class="panel-body">
-               <div class="profile-header">
-                       <h3 class="fn p-name">{{$profile.name}}</h3>
-
-                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
-
-                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-                       {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
-               </div>
-
-               {{if $follow_link || $unfollow_link || $wallmessage_link}}
-               <div id="profile-extra-links">
-                       {{if $follow_link || $unfollow_link}}
-                       <div id="dfrn-request-link-button">
-                               {{if $unfollow_link}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
-                                       <span class=""><i class="fa fa-user-times"></i></span>
-                                       <span class="">{{$unfollow}}</span>
-                               </a>
-                               {{else}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
-                                       <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$follow}}</span>
-                               </a>
-                               {{/if}}
-                       </div>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                       <div id="wallmessage-link-botton">
-                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
-                                       <span class=""><i class="fa fa-envelope"></i></span>
-                                       <span class="">{{$wallmessage}}</span>
-                               </button>
-                       </div>
-                       {{/if}}
-               </div>
-               {{/if}}
-
-               <div class="clear"></div>
-
-               {{if $location}}
-               <div class="location detail">
-                       <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
-                       <span class="adr">
-                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
-                               <span class="city-state-zip">
-                                       <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                                       <span class="region p-region">{{$profile.region}}</span>
-                                       <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                               </span>
-                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-                       </span>
-               </div>
-               {{/if}}
-
-               {{if $profile.xmpp}}
-               <div class="xmpp">
-                       <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-                       <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
-               </div>
-               {{/if}}
-
-               {{if $gender}}
-               <div class="mf detail">
-                       <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-                       <span class="p-gender">{{$profile.gender}}</span>
-               </div>
-               {{/if}}
-
-               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-               {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-               {{if $marital}}
-               <div class="marital detail">
-                       <span class="marital-label icon"><i class="fa fa-heart"></i></span>
-                       <span class="marital-text icon">{{$profile.marital}}</span>
-               </div>
-               {{/if}}
-
-               {{if $homepage}}
-               <div class="homepage detail">
-                       <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
-               </div>
-               {{/if}}
-
-               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-               {{include file="diaspora_vcard.tpl"}}
-       </div>
-</div>
-
-{{if $contact_block}}
-<div class="widget" id="widget-contacts">
-       {{$contact_block nofilter}}
-</div>
-{{/if}}

diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
new file mode 100644 (file)
index 0000000..fd455fb
--- /dev/null
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -0,0 +1,82 @@
+<div class="vcard h-card">
+
+       <div class="tool">
+               <div class="fn label p-name">{{$profile.name}}</div>
+               {{if $profile.edit}}
+                       <div class="action">
+                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+                       <ul id="profiles-menu" class="menu-popup">
+                               <li>
+                                       <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
+                               </li>
+                               <li><a href="settings/profile/photo" >{{$profile.menu.chg_photo}}</a></li>
+                       </ul>
+                       </div>
+               {{/if}}
+       </div>
+
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+
+       {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+
+       {{if $location}}
+               <dl class="location"><dt class="location-label">{{$location}}</dt> 
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+                       <span class="city-state-zip">
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+                       </span>
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+               </dd>
+               </dl>
+       {{/if}}
+
+        {{if $profile.xmpp}}
+                <dl class="xmpp">
+                        <dt class="xmpp-label">{{$xmpp}}</dt>
+                        <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+                </dl>
+        {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       
+       {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+       {{if $homepage}}
+       <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
+               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
+       </dl>
+       {{/if}}
+
+       {{include file="diaspora_vcard.tpl"}}
+
+       <div id="profile-extra-links">
+               <ul>
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+                       {{/if}}
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
+               </ul>
+       </div>
+</div>
+
+{{$contact_block nofilter}}
+
+

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
deleted file mode 100644 (file)
index cd8bd6e..0000000
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div class="vcard h-card">
-
-       <div class="tool">
-               <div class="fn label p-name">{{$profile.name}}</div>
-               {{if $profile.edit}}
-                       <div class="action">
-                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-                       <ul id="profiles-menu" class="menu-popup">
-                       {{if $profile.menu.entries}}
-                               {{foreach $profile.menu.entries as $e}}
-                               <li>
-                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-                               </li>
-                               {{/foreach}}
-                       {{else}}
-                               <li>
-                                       <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
-                               </li>
-                       {{/if}}
-                               <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-                               {{if $profile.menu.cr_new }}
-                               <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-                               {{/if}}
-                       </ul>
-                       </div>
-               {{/if}}
-       </div>
-
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-
-       {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
-
-       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-
-       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-
-       {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
-               </dl>
-       {{/if}}
-
-        {{if $profile.xmpp}}
-                <dl class="xmpp">
-                        <dt class="xmpp-label">{{$xmpp}}</dt>
-                        <dd class="xmpp-data">{{$profile.xmpp}}</dd>
-                </dl>
-        {{/if}}
-
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-       
-       {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-       {{if $homepage}}
-       <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
-               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
-       </dl>
-       {{/if}}
-
-       {{include file="diaspora_vcard.tpl"}}
-
-       <div id="profile-extra-links">
-               <ul>
-                       {{if $unfollow_link}}
-                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-                       {{/if}}
-                       {{if $follow_link}}
-                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-                       {{/if}}
-                       {{if $subscribe_feed_link}}
-                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-                       {{/if}}
-               </ul>
-       </div>
-</div>
-
-{{$contact_block nofilter}}
-
-

diff --git a/view/theme/vier/templates/profile/advanced.tpl b/view/theme/vier/templates/profile/advanced.tpl
new file mode 100644 (file)
index 0000000..20c4e84
--- /dev/null
+++ b/view/theme/vier/templates/profile/advanced.tpl
@@ -0,0 +1,186 @@
+{{if $profile.edit}}
+  <div class="profile-view-actions">
+    <a class="btn" href="{{$profile.edit.0}}" id="profile-view-edit-link" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
+  </div>
+{{/if}}
+
+{{include file="section_title.tpl"}}
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
+</dl>
+
+{{if $profile.membersince}}
+<dl id="aprofile-membersince" class="aprofile">
+ <dt>{{$profile.membersince.0}}</dt>
+ <dd>{{$profile.membersince.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.gender}}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.birthday}}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.age}}
+<dl id="aprofile-age" class="aprofile">
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.marital}}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.sexual}}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_keywords.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.homepage}}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.hometown}}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.politic}}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.religion}}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.about}}
+<dl id="aprofile-about" class="aprofile">
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.interest}}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.likes}}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.dislikes}}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.contact}}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.music}}
+<dl id="aprofile-music" class="aprofile">
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.book}}
+<dl id="aprofile-book" class="aprofile">
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.tv}}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.film}}
+<dl id="aprofile-film" class="aprofile">
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.romance}}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.work}}
+<dl id="aprofile-work" class="aprofile">
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.education}}
+<dl id="aprofile-education" class="aprofile">
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.forumlist}}
+<dl id="aprofile-forumlist" class="aprofile">
+ <dt>{{$profile.forumlist.0}}</dt>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
+</dl>
+{{/if}}

diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
new file mode 100644 (file)
index 0000000..6331e84
--- /dev/null
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -0,0 +1,83 @@
+<div class="vcard h-card">
+
+       <div class="tool">
+               <div class="fn label p-name">{{$profile.name}}</div>
+               {{if $profile.edit}}
+                       <div class="action">
+                               <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+                       </div>
+               {{else}}
+                       {{if $profile.menu}}
+                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+                       {{/if}}
+               {{/if}}
+       </div>
+
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+
+       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+       {{if $profile.picdate}}
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
+       {{else}}
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
+       {{/if}}
+
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+       {{if $location}}
+               <dl class="location"><dt class="location-label">{{$location}}</dt> 
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+                       <span class="city-state-zip">
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+                       </span>
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+               </dd>
+               </dl>
+       {{/if}}
+
+       {{if $profile.xmpp}}
+               <dl class="xmpp">
+                       <dt class="xmpp-label">{{$xmpp}}</dt>
+                       <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+               </dl>
+       {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       
+       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+       {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+       {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+       {{include file="diaspora_vcard.tpl"}}
+
+       <div id="profile-extra-links">
+               <ul>
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+                       {{/if}}
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
+               </ul>
+       </div>
+</div>
+
+{{$contact_block nofilter}}

diff --git a/view/theme/vier/templates/profile_advanced.tpl b/view/theme/vier/templates/profile_advanced.tpl
deleted file mode 100644 (file)
index 20c4e84..0000000
--- a/view/theme/vier/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,186 +0,0 @@
-{{if $profile.edit}}
-  <div class="profile-view-actions">
-    <a class="btn" href="{{$profile.edit.0}}" id="profile-view-edit-link" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
-  </div>
-{{/if}}
-
-{{include file="section_title.tpl"}}
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.membersince}}
-<dl id="aprofile-membersince" class="aprofile">
- <dt>{{$profile.membersince.0}}</dt>
- <dd>{{$profile.membersince.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.marital}}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
- <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.pub_keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.forumlist}}
-<dl id="aprofile-forumlist" class="aprofile">
- <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1 nofilter}}</dd>
-</dl>
-{{/if}}

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
deleted file mode 100644 (file)
index 6331e84..0000000
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,83 +0,0 @@
-<div class="vcard h-card">
-
-       <div class="tool">
-               <div class="fn label p-name">{{$profile.name}}</div>
-               {{if $profile.edit}}
-                       <div class="action">
-                               <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-                       </div>
-               {{else}}
-                       {{if $profile.menu}}
-                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
-                       {{/if}}
-               {{/if}}
-       </div>
-
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-
-       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-       {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-       {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-       {{/if}}
-
-       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-       {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
-               </dl>
-       {{/if}}
-
-       {{if $profile.xmpp}}
-               <dl class="xmpp">
-                       <dt class="xmpp-label">{{$xmpp}}</dt>
-                       <dd class="xmpp-data">{{$profile.xmpp}}</dd>
-               </dl>
-       {{/if}}
-
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-       
-       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-       {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-       {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-       {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-       {{include file="diaspora_vcard.tpl"}}
-
-       <div id="profile-extra-links">
-               <ul>
-                       {{if $unfollow_link}}
-                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-                       {{/if}}
-                       {{if $follow_link}}
-                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-                       {{/if}}
-                       {{if $subscribe_feed_link}}
-                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-                       {{/if}}
-               </ul>
-       </div>
-</div>
-
-{{$contact_block nofilter}}

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index d4bdc6e313545f15132fe38e76be6ca4bc821bd0..9188bcbc99dbfb41b9b21a27a0f314fb96c48e80 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -145,7 +145,7 @@ function vier_community_info()
 
                $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 
-               $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+               $r = q("SELECT `profile`.*, `user`.`nickname`
                                FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                                WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
                        0,
@@ -157,7 +157,7 @@ function vier_community_info()
                        $aside['$lastusers_items'] = [];
 
                        foreach ($r as $rr) {
-                               $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                               $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['uid']);
                                $entry = Renderer::replaceMacros($tpl, [
                                        '$id' => $rr['id'],
                                        '$profile_link' => $profile_link,