[v2.4.2] Bump version number for release

Reviewed-on: #103

VERSION

@@ -1 +1 @@
-2.3.0
+2.4.2

bin/cron.php

@@ -15,9 +15,9 @@ require __DIR__ . '/../src/dependencies.php';
 
 (new \Friendica\Directory\Controllers\Cron(
 	$container->get('atlas'),
-	$container->get('\Friendica\Directory\Pollers\Profile'),
-	$container->get('\Friendica\Directory\Pollers\Server'),
-	$container->get('\Friendica\Directory\Pollers\Directory'),
+	$container->get(\Friendica\Directory\Pollers\Profile::class),
+	$container->get(\Friendica\Directory\Pollers\Server::class),
+	$container->get(\Friendica\Directory\Pollers\Directory::class),
 	$container->get('logger')
 ))->execute();
 

composer.json

@@ -16,18 +16,20 @@
         "ext-curl": "*",
         "ext-gd": "*",
         "ext-json": "*",
+        "ext-pdo": "*",
         "asika/simple-console": "^1.0",
         "atlas/pdo": "^1.1",
         "boronczyk/localization-middleware": "^1.4",
         "byjg/migration": "^4.0",
         "byjg/uri": "^1.0.4",
-        "byjg/webrequest": "^1.0",
         "gettext/gettext": "^4.6",
-        "gofabian/negotiation-middleware": "^0.1.3",
+        "gofabian/negotiation-middleware": "dev-master",
+        "guzzlehttp/guzzle": "^6.5",
         "laminas/laminas-escaper": "^2.6",
+        "laminas/laminas-zendframework-bridge": "^1.4",
         "masterminds/html5": "^2.3",
         "monolog/monolog": "^1.17",
-        "mrpetovan/net_ping": "^1.0",
+        "mrpetovan/net_ping": "^1.2",
         "sarahman/simple-filesystem-cache": "^1.0",
         "seld/cli-prompt": "^1.0",
         "slim/slim": "^3.1",
@@ -54,7 +56,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.1.0"
+            "php": "7.3.0"
         },
         "process-timeout" : 0,
         "autoloader-suffix": "FriendicaDirectory",

docs/Protocol.md

@@ -11,14 +11,16 @@ Redirects to the base URL of a random server with open registration policy and a
 ## Search
 
 ```
-GET /search[/account_type]?q=...
+GET /search[/account_type]?q=...[&page=...][&limit=...]
 Accept: application/json
 ```
 
-Parameters:
+URI Parameter:
+- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `group`. Default is `all`.
+Query parameters:
 - `q`: The search query.
-- `account_type` (optional): An arbitrary account type string. Currently supported are `all`, `people` and `forum`. Default is `all`.
 - `page` (optional): The page number, default is 1.
+- `limit` (optional): The page size, default is 20, max is 100.
 
 Returns a JSON structure containing a paginated list profiles matching the search query and the optional account type.
 
@@ -42,10 +44,11 @@ Example:
                   "region": "New York",
                   "country": "USA",
                   "profile_url": "https://friendica.mrpetovan.com/profile/hypolite",
-                  "dfrn_request": "https://friendica.mrpetovan.com/dfrn_request/hypolite",
                   "photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1541567135",
                   "tags": "videogame gaming boardgame politics philosophy development programming php",
-                  "last_activity": "2018-45"
+                  "last_activity": "2018-45",
+                  "remote_follow": "https://friendica.mrpetovan.com/remote_follow/hypolite",
+                  "subscribe": null
             },
             ...
       ]

src/classes/Controllers/Api/MatchSearch.php

@@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface;
  */
 class MatchSearch
 {
-	/**
-	 * @var \Atlas\Pdo\Connection
-	 */
-	private $atlas;
 	/**
 	 * @var \Friendica\Directory\Models\Profile
 	 */
@@ -25,12 +21,10 @@ class MatchSearch
 	private $l10n;
 
 	public function __construct(
-		\Atlas\Pdo\Connection $atlas,
 		\Friendica\Directory\Models\Profile $profileModel,
 		\Gettext\TranslatorInterface $l10n
 	)
 	{
-		$this->atlas = $atlas;
 		$this->profileModel = $profileModel;
 		$this->l10n = $l10n;
 	}
@@ -48,10 +42,18 @@ class MatchSearch
 		$pager->setPage(filter_input(INPUT_POST, 'p', FILTER_SANITIZE_NUMBER_INT));
 
 		$sql_where = "MATCH (p.`tags`) AGAINST (:query)";
+		// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
+		$query = str_replace('@', ' ', $query);
 
 		$values = ['query' => $query];
 
-		$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values);
+		$profiles = $this->profileModel->getListForDisplay(
+			null,
+			$pager->getItemsPerPage(),
+			$pager->getStart(),
+			$sql_where,
+			$values,
+		);
 
 		$results = [];
 		foreach ($profiles as $profile) {

src/classes/Controllers/Api/Photo.php

@@ -14,12 +14,18 @@ class Photo
 	 * @var \Atlas\Pdo\Connection
 	 */
 	private $atlas;
+	/**
+	 * @var string
+	 */
+	private $defaultProfilePictureSmallPath;
 
 	public function __construct(
-		\Atlas\Pdo\Connection $atlas
+		\Atlas\Pdo\Connection $atlas,
+		string $defaultProfilePictureSmallPath
 	)
 	{
 		$this->atlas = $atlas;
+		$this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath;
 	}
 
 	public function render(Request $request, Response $response, array $args): Response
@@ -30,7 +36,7 @@ class Photo
 		);
 
 		if (!$data) {
-			$data = file_get_contents('public/images/default-profile-sm.jpg');
+			$data = file_get_contents($this->defaultProfilePictureSmallPath);
 		}
 
 		//Try and cache our result.

src/classes/Controllers/Api/Search.php

@@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface;
  */
 class Search
 {
-	/**
-	 * @var \Atlas\Pdo\Connection
-	 */
-	private $atlas;
 	/**
 	 * @var \Friendica\Directory\Models\Profile
 	 */
@@ -25,19 +21,19 @@ class Search
 	private $l10n;
 
 	public function __construct(
-		\Atlas\Pdo\Connection $atlas,
 		\Friendica\Directory\Models\Profile $profileModel,
 		\Gettext\TranslatorInterface $l10n
 	)
 	{
-		$this->atlas = $atlas;
 		$this->profileModel = $profileModel;
 		$this->l10n = $l10n;
 	}
 
 	public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
 	{
-		$pager = new Pager($this->l10n, $request, 20);
+		$limit = min(100, filter_input(INPUT_GET, 'limit', FILTER_SANITIZE_NUMBER_INT) ?: 20);
+
+		$pager = new Pager($this->l10n, $request, $limit);
 
 		$originalQuery = $query = filter_input(INPUT_GET, 'q');
 
@@ -47,8 +43,10 @@ class Search
 			$query .= '%';
 			$sql_where = '`' . $field . '` LIKE :query';
 		} else {
-			$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`profile_url`, p.`locality`, p.`region`, p.`country`, p.`tags` )
+			$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`username`, p.`locality`, p.`region`, p.`country`, p.`tags` )
 AGAINST (:query IN BOOLEAN MODE)";
+			// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
+			$query = str_replace('@', ' ', $query);
 		}
 
 		$values = ['query' => $query];
@@ -60,7 +58,13 @@ AND `account_type` = :account_type';
 			$values['account_type'] = $account_type;
 		}
 
-		$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values);
+		$profiles = $this->profileModel->getListForDisplay(
+			null,
+			$pager->getItemsPerPage(),
+			$pager->getStart(),
+			$sql_where,
+			$values,
+		);
 
 		$count = $this->profileModel->getCountForDisplay($sql_where, $values);
 

src/classes/Controllers/Console/Install.php

@@ -31,9 +31,9 @@ class Install extends \Asika\SimpleConsole\Console
 	protected function getHelp()
 	{
 		$help = <<<HELP
-console install - Install directory
+console install - Install wizard
 Usage
-	bin/console install <server_url> [-h|--help|-?] [-v]
+	bin/console install [-h|--help|-?] [-v]
 
 Description
 	Install directory

src/classes/Controllers/Console/UpdateDb.php

@@ -37,12 +37,14 @@ class UpdateDb extends \Asika\SimpleConsole\Console
 		$help = <<<HELP
 console updatedb - Update database schema
 Usage
-	bin/console updatedb <server_url> [-h|--help|-?] [-v]
+	bin/console updatedb [<version>] [-h|--help|-?] [-v]
 
 Description
 	Update database schema
 
 Options
+    <version>    Optional target version number, default is the latest version.
+                 Do not use this parameter if you're not sure what you're doing, it will result in data loss!
     -h|--help|-? Show help information
     -v           Show more debug information.
 HELP;
@@ -56,16 +58,38 @@ HELP;
 			return 0;
 		}
 
-		if (count($this->args) > 1) {
+		if (count($this->args) > 2) {
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		$this->out('Updating database schema to latest version...');
+		$currentVersion = $this->migration->getCurrentVersion()['version'];
 
-		$this->migration->up();
+		$this->out('Database schema currently in version ' . $currentVersion);
 
-		$this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']);
+		if (count($this->args) == 1) {
+			$this->out('Updating database schema to latest version...');
+			$this->migration->up();
+			$this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']);
+			return 0;
+		}
 
+		$target = $this->getArgument(1);
+
+		if ($target > $currentVersion) {
+			$this->out('Updating database schema to version ' . $target);
+			$this->migration->up($target);
+			$this->out('Database schema migrated up to version ' . $this->migration->getCurrentVersion()['version']);
+			return 0;
+		}
+
+		if ($target < $currentVersion) {
+			$this->out('Downgrading database schema to version ' . $target);
+			$this->migration->down($target);
+			$this->out('Database schema migrated down to version ' . $this->migration->getCurrentVersion()['version']);
+			return 0;
+		}
+
+		$this->out('Target version equal to current version, exiting.');
 		return 0;
 	}
 }

src/classes/Controllers/Web/Directory.php

@@ -4,7 +4,7 @@ namespace Friendica\Directory\Controllers\Web;
 
 use Friendica\Directory\Content\Pager;
 use Friendica\Directory\Views\Widget\PopularCountries;
-use Friendica\Directory\Views\Widget\PopularLanguages;
+use Friendica\Directory\Views\Widget\PopularProfileLanguages;
 use Friendica\Directory\Views\Widget\PopularTags;
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -18,6 +18,10 @@ class Directory extends BaseController
 	 * @var \Atlas\Pdo\Connection
 	 */
 	private $atlas;
+	/**
+	 * @var \Friendica\Directory\Models\Server
+	 */
+	private $serverModel;
 	/**
 	 * @var \Friendica\Directory\Models\Profile
 	 */
@@ -37,6 +41,7 @@ class Directory extends BaseController
 
 	public function __construct(
 		\Atlas\Pdo\Connection $atlas,
+		\Friendica\Directory\Models\Server $serverModel,
 		\Friendica\Directory\Models\Profile $profileModel,
 		\Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs,
 		\Friendica\Directory\Views\PhpRenderer $renderer,
@@ -44,6 +49,7 @@ class Directory extends BaseController
 	)
 	{
 		$this->atlas = $atlas;
+		$this->serverModel = $serverModel;
 		$this->profileModel = $profileModel;
 		$this->accountTypeTabs = $accountTypeTabs;
 		$this->renderer = $renderer;
@@ -54,20 +60,26 @@ class Directory extends BaseController
 	{
 		$popularTags = new PopularTags($this->atlas, $this->renderer);
 		$popularCountries = new PopularCountries($this->atlas, $this->renderer);
-		$popularLanguages = new PopularLanguages($this->atlas, $this->renderer);
+		$popularLanguages = new PopularProfileLanguages($this->atlas, $this->renderer);
 
 		$pager = new Pager($this->l10n, $request, 20);
 
-		$condition = '';
+		$sql_where = '';
 		$values = [];
 		if (!empty($args['account_type'])) {
-			$condition = '`account_type` = :account_type';
+			$sql_where = '`account_type` = :account_type';
 			$values = ['account_type' => $args['account_type']];
 		}
 
-		$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $condition, $values);
+		$profiles = $this->profileModel->getListForDisplay(
+			$this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')),
+			$pager->getItemsPerPage(),
+			$pager->getStart(),
+			$sql_where,
+			$values,
+		);
 
-		$count = $this->profileModel->getCountForDisplay($condition, $values);
+		$count = $this->profileModel->getCountForDisplay($sql_where, $values);
 
 		$vars = [
 			'title' => $this->l10n->gettext('People'),
@@ -82,7 +94,6 @@ class Directory extends BaseController
 
 		$content = $this->renderer->fetch('directory.phtml', $vars);
 
-		// Render index view
 		return ['content' => $content];
 	}
 }

src/classes/Controllers/Web/Search.php

@@ -13,6 +13,10 @@ class Search extends BaseController
 	 * @var \Atlas\Pdo\Connection
 	 */
 	private $atlas;
+	/**
+	 * @var \Friendica\Directory\Models\Server
+	 */
+	private $serverModel;
 	/**
 	 * @var \Friendica\Directory\Models\Profile
 	 */
@@ -32,6 +36,7 @@ class Search extends BaseController
 
 	public function __construct(
 		\Atlas\Pdo\Connection $atlas,
+		\Friendica\Directory\Models\Server $serverModel,
 		\Friendica\Directory\Models\Profile $profileModel,
 		\Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs,
 		\Friendica\Directory\Views\PhpRenderer $renderer,
@@ -39,6 +44,7 @@ class Search extends BaseController
 	)
 	{
 		$this->atlas = $atlas;
+		$this->serverModel = $serverModel;
 		$this->profileModel = $profileModel;
 		$this->accountTypeTabs = $accountTypeTabs;
 		$this->renderer = $renderer;
@@ -47,7 +53,9 @@ class Search extends BaseController
 
 	public function render(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): array
 	{
-		$pager = new Pager($this->l10n, $request, 20);
+		$limit = min(100, filter_input(INPUT_GET, 'limit', FILTER_SANITIZE_NUMBER_INT) ?: 20);
+
+		$pager = new Pager($this->l10n, $request, $limit);
 
 		$originalQuery = $query = $request->getParam('q', '');
 		$field = $request->getParam('field', '');
@@ -69,8 +77,10 @@ class Search extends BaseController
 			}
 
 		} else {
-			$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`profile_url`, p.`locality`, p.`region`, p.`country`, p.`tags` )
+			$sql_where = "MATCH (p.`name`, p.`pdesc`, p.`username`, p.`locality`, p.`region`, p.`country`, p.`tags` )
 AGAINST (:query IN BOOLEAN MODE)";
+			// At sign (@) is a reserved symbol in InnoDB full-text search, it can't be escaped
+			$query = str_replace('@', ' ', $query);
 		}
 
 		$values = ['query' => $query];
@@ -85,7 +95,13 @@ AND `account_type` = :account_type';
 			$values['account_type'] = $account_type;
 		}
 
-		$profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values);
+		$profiles = $this->profileModel->getListForDisplay(
+			$this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')),
+			$pager->getItemsPerPage(),
+			$pager->getStart(),
+			$sql_where,
+			$values,
+		);
 
 		$count = $this->profileModel->getCountForDisplay($sql_where, $values);
 
@@ -102,7 +118,6 @@ AND `account_type` = :account_type';
 
 		$content = $this->renderer->fetch('search.phtml', $vars);
 
-		// Render index view
 		return ['content' => $content, 'noNavSearch' => true];
 	}
 }

src/classes/Controllers/Web/Servers.php

@@ -2,7 +2,8 @@
 
 namespace Friendica\Directory\Controllers\Web;
 
-use \Friendica\Directory\Content\Pager;
+use Friendica\Directory\Content\Pager;
+use Friendica\Directory\Views\Widget\PopularServerLanguages;
 use PDO;
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -58,19 +59,32 @@ class Servers extends BaseController
 
 		$rc_version = str_replace('-dev', '-rc', $dev_version);
 
+		$popularLanguages = new PopularServerLanguages($this->atlas, $this->renderer);
+
 		$pager = new Pager($this->l10n, $request, 20);
 
+		$sql_where = '';
+		$values = [];
+
+		if (!empty($args['language'])) {
+			$sql_where .= '
+AND LEFT(`language`, 2) = LEFT(:language, 2)';
+			$values['language'] = $args['language'];
+		}
+
 		$stmt = 'SELECT *
 FROM `server` s
 WHERE `reg_policy` != "REGISTER_CLOSED"
 AND `available`
 AND NOT `hidden`
+' . $sql_where . '
 ORDER BY `health_score` DESC, `ssl_state` DESC, `info` != "" DESC, `last_seen` DESC
 LIMIT :start, :limit';
-		$servers = $this->atlas->fetchAll($stmt, [
+		$listValues = array_merge($values, [
 			'start' => [$pager->getStart(), PDO::PARAM_INT],
 			'limit' => [$pager->getItemsPerPage(), PDO::PARAM_INT]
 		]);
+		$servers = $this->atlas->fetchAll($stmt, $listValues);
 
 		foreach ($servers as $key => $server) {
 			$servers[$key]['user_count'] = $this->atlas->fetchValue(
@@ -83,16 +97,20 @@ LIMIT :start, :limit';
 FROM `server` s
 WHERE `reg_policy` != "REGISTER_CLOSED"
 AND `available`
-AND NOT `hidden`';
-		$count = $this->atlas->fetchValue($stmt);
+AND NOT `hidden`
+' . $sql_where;
+		$count = $this->atlas->fetchValue($stmt, $values);
 
 		$vars = [
 			'title' => $this->l10n->gettext('Public Servers'),
+			'total' => $count,
+			'language' => $args['language'] ?? null,
 			'servers' => $servers,
 			'pager' => $pager->renderFull($count),
 			'stable_version' => $stable_version,
 			'rc_version' => $rc_version,
 			'dev_version' => $dev_version,
+			'popularLanguages' => $popularLanguages->render(),
 		];
 
 		$content = $this->renderer->fetch('servers.phtml', $vars);

src/classes/Models/Profile.php

@@ -7,6 +7,13 @@ namespace Friendica\Directory\Models;
  */
 class Profile extends \Friendica\Directory\Model
 {
+	const ACCOUNT_TYPE_PERSON       =   0;
+	const ACCOUNT_TYPE_ORGANISATION =   1;
+	const ACCOUNT_TYPE_NEWS         =   2;
+	const ACCOUNT_TYPE_COMMUNITY    =   3;
+	const ACCOUNT_TYPE_RELAY        =   4;
+	const ACCOUNT_TYPE_DELETED      = 127;
+
 	public function deleteById(int $profile_id): bool
 	{
 		$this->atlas->perform('DELETE FROM `photo` WHERE `profile_id` = :profile_id',
@@ -74,7 +81,7 @@ class Profile extends \Friendica\Directory\Model
 		];
 	}
 
-	public function getListForDisplay(int $limit = 30, int $start = 0, string $condition = '', array $values = []): array
+	public function getListForDisplay(string $subscribeUrl = null, int $limit = 30, int $start = 0, string $condition = '', array $values = []): array
 	{
 		if ($condition) {
 			$condition = 'AND ' . $condition;
@@ -86,8 +93,8 @@ class Profile extends \Friendica\Directory\Model
 		]);
 
 		$stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`language`,
-				p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`dfrn_request`,
-				p.`photo`, p.`tags`, p.`last_activity`
+				p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`,
+				p.`photo`, p.`tags`, p.`last_activity`, s.`version`
 			FROM `profile` p
 			JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden`
 			WHERE p.`available`
@@ -98,6 +105,12 @@ class Profile extends \Friendica\Directory\Model
 			LIMIT :start, :limit';
 		$profiles = $this->atlas->fetchAll($stmt, $values);
 
+		array_walk($profiles, function (array &$profile) use ($subscribeUrl) {
+			$profile['remote_follow'] = version_compare($profile['version'], '2020.03', '>=') ? str_replace('/profile/', '/remote_follow/', $profile['profile_url']) : null;
+			$profile['subscribe'] = $subscribeUrl ? str_replace('{uri}', urlencode($profile['profile_url']), $subscribeUrl): null;
+			unset($profile['version']);
+		});
+
 		return $profiles;
 	}
 

src/classes/Models/Server.php

@@ -33,10 +33,28 @@ class Server extends \Friendica\Directory\Model
 			SET `server_id` = :server_id,
 				`alias` = :alias,
 				`timestamp` = NOW()
-			ON DUPLICATE KEY UPDATE `timestamp` = NOW()',
+			ON DUPLICATE KEY UPDATE 
+				`server_id` = :server_id,
+				`timestamp` = NOW()',
 			[
 				'server_id' => $server_id,
 				'alias' => strtolower($server_alias)
 			]);
 	}
+
+	/**
+	 * Returns the complete subscribe URL of the given profile URL if we have it for the related server
+	 *
+	 * @param string $profile_url
+	 * @return mixed|null
+	 */
+	public function getSubscribeUrlByProfile(string $profile_url)
+	{
+		if (preg_match('#^(.+)/profile/#', $profile_url, $matches)) {
+			$server = $this->getByUrlAlias($matches[1]);
+			return $server['subscribe_url'] ?? null;
+		}
+
+		return null;
+	}
 }

src/classes/Pollers/Directory.php

@@ -2,15 +2,17 @@
 
 namespace Friendica\Directory\Pollers;
 
+use Friendica\Directory\Utils\Network;
+
 /**
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Directory
 {
 	/**
-	 * @var \Atlas\Pdo\Connection
+	 * @var \GuzzleHttp\ClientInterface
 	 */
-	private $atlas;
+	private $http;
 	/**
 	 * @var \Friendica\Directory\Models\ProfilePollQueue
 	 */
@@ -28,12 +30,12 @@ class Directory
 	];
 
 	public function __construct(
-		\Atlas\Pdo\Connection $atlas,
+		\GuzzleHttp\ClientInterface $http,
 		\Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel,
 		\Psr\Log\LoggerInterface $logger,
 		array $settings)
 	{
-		$this->atlas = $atlas;
+		$this->http = $http;
 		$this->profilePollQueueModel = $profilePollQueueModel;
 		$this->logger = $logger;
 		$this->settings = array_merge($this->settings, $settings);
@@ -80,35 +82,7 @@ class Directory
 			$path = '/sync/pull/since/' . $last_polled;
 		}
 
-		//Prepare the CURL call.
-		$handle = curl_init();
-		$options = array(
-			//Timeouts
-			CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout.
-			CURLOPT_CONNECTTIMEOUT => 1,
-			//Redirecting
-			CURLOPT_FOLLOWLOCATION => true,
-			CURLOPT_MAXREDIRS => 8,
-			//SSL
-			CURLOPT_SSL_VERIFYPEER => true,
-			// CURLOPT_VERBOSE => true,
-			// CURLOPT_CERTINFO => true,
-			CURLOPT_SSL_VERIFYHOST => 2,
-			CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
-			//Basic request
-			CURLOPT_USERAGENT => 'friendica-directory-probe-1.0',
-			CURLOPT_RETURNTRANSFER => true,
-			CURLOPT_URL => $directory_url . $path
-		);
-		curl_setopt_array($handle, $options);
-
-		$this->logger->info('Pulling profiles from directory URL: ' . $directory_url . $path);
-
-		//Probe the site.
-		$pull_data = curl_exec($handle);
-
-		//Done with CURL now.
-		curl_close($handle);
+		$pull_data = $this->http->get($directory_url . $path, ['timeout' => max($this->settings['probe_timeout'], 1)])->getBody()->getContents();
 
 		$data = json_decode($pull_data, true);
 

src/classes/Pollers/Profile.php

@@ -2,13 +2,18 @@
 
 namespace Friendica\Directory\Pollers;
 
-use Friendica\Directory\Utils\Network;
+use Friendica\Directory\Models;
+use Friendica\Directory\Utils;
+use GuzzleHttp\Exception\RequestException;
 
 /**
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Profile
 {
+	const PROFILE_MISSING_CONFIRM = 2;
+	const PROFILE_MISSING_NOTIFY = 4;
+	const PROFILE_MISSING_POLL = 8;
 
 	/**
 	 * @var \Atlas\Pdo\Connection
@@ -16,12 +21,17 @@ class Profile
 	private $atlas;
 
 	/**
-	 * @var \Friendica\Directory\Models\Server
+	 * @var \GuzzleHttp\ClientInterface
+	 */
+	private $http;
+
+	/**
+	 * @var Models\Server
 	 */
 	private $serverModel;
 
 	/**
-	 * @var \Friendica\Directory\Models\Profile
+	 * @var Models\Profile
 	 */
 	private $profileModel;
 
@@ -40,13 +50,15 @@ class Profile
 
 	public function __construct(
 		\Atlas\Pdo\Connection $atlas,
-		\Friendica\Directory\Models\Server $serverModel,
-		\Friendica\Directory\Models\Profile $profileModel,
+		\GuzzleHttp\ClientInterface $http,
+		Models\Server $serverModel,
+		Models\Profile $profileModel,
 		\Psr\Log\LoggerInterface $logger,
 		array $settings
 	)
 	{
 		$this->atlas = $atlas;
+		$this->http = $http;
 		$this->serverModel = $serverModel;
 		$this->profileModel = $profileModel;
 		$this->logger = $logger;
@@ -71,12 +83,12 @@ class Profile
 			return false;
 		}
 
-		if (!\Friendica\Directory\Utils\Network::isPublicHost($host)) {
+		if (!Utils\Network::isPublicHost($host)) {
 			$this->logger->warning('Private/reserved IP in polled profile URL: ' . $profile_uri);
 			return false;
 		}
 
-		$profileUriInfo = \Friendica\Directory\Models\Profile::extractInfoFromProfileUrl($profile_uri);
+		$profileUriInfo = Models\Profile::extractInfoFromProfileUrl($profile_uri);
 		if (!$profileUriInfo) {
 			$this->logger->warning('Profile URI invalid');
 			return false;
@@ -119,29 +131,42 @@ class Profile
 			);
 		}
 
-		//Skip the profile scrape?
-		$noscrape = $server['noscrape_url'];
+		$available = false;
 
 		$params = [];
-		if ($noscrape) {
+
+		//Skip the profile scrape?
+		if ($server['noscrape_url']) {
 			$this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username);
-			$params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($server['noscrape_url'] . '/' . $username);
-			$noscrape = !!$params; //If the result was false, do a scrape after all.
+			try {
+				$params = Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username);
+			} catch (RequestException $e) {
+				$this->logger->info('Request failed with error code ' . $e->getCode());
+			} catch (\Throwable $e) {
+				$this->logger->warning('Request failed with exception ' . get_class($e));
+				$this->logger->warning(var_export($e, true));
+			}
+
+			$available = !!$params; //If the result was false, do a scrape after all.
 		}
 
-		$available = true;
-
-		if ($noscrape) {
-			$available = Network::testURL($profile_uri);
-			$this->logger->debug('Testing ' . $profile_uri . ': ' . ($available?'Success':'Failure'));
-		} else {
-			$this->logger->notice('Parsing profile page ' . $profile_uri);
-			$params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($profile_uri);
+		if (!$available) {
+			$this->logger->info('Parsing profile page ' . $profile_uri);
+			try {
+				$params = Utils\Scrape::retrieveProfileData($this->http, $profile_uri);
+			} catch (RequestException $e) {
+				$this->logger->info('Request failed with error code ' . $e->getCode());
+			} catch (\Throwable $e) {
+				$this->logger->warning('Request failed with exception ' . get_class($e));
+				$this->logger->warning(var_export($e, true));
+			}
 			$params['language'] = $server['language'];
+
+			$available = !empty($params['fn']);
 		}
 
 		// Empty result is due to an offline site.
-		if (count($params) < 2) {
+		if (empty($params) || count($params) < 2) {
 			//But for sites that are already in bad status. Do a cleanup now.
 			if ($profile_id && $server['health_score'] < $this->settings['remove_profile_health_threshold']) {
 				$this->profileModel->deleteById($profile_id);
@@ -171,14 +196,37 @@ class Profile
 		}
 
 		// This is most likely a problem with the site configuration. Ignore.
-		if (self::validateParams($params)) {
+		if ($error = self::validateParams($params)) {
 			$this->logger->warning('Poll aborted, parameters invalid.', ['params' => $params]);
+			if ($error & Profile::PROFILE_MISSING_CONFIRM) {
+				$this->logger->notice('dfrn-confirm parameter is empty.');
+			}
+			if ($error & Profile::PROFILE_MISSING_NOTIFY) {
+				$this->logger->notice('dfrn-notify parameter is empty.');
+			}
+			if ($error & Profile::PROFILE_MISSING_POLL) {
+				$this->logger->notice('dfrn-poll parameter is empty.');
+			}
+
 			return false;
 		}
 
-		$account_type = 'People';
-		if (!empty($params['comm'])) {
-			$account_type = 'Forum';
+		switch ($params['account-type'] ?? Models\Profile::ACCOUNT_TYPE_PERSON) {
+			case Models\Profile::ACCOUNT_TYPE_ORGANISATION: $account_type = 'Organization'; break;
+			case Models\Profile::ACCOUNT_TYPE_NEWS        : $account_type = 'News'; break;
+			case Models\Profile::ACCOUNT_TYPE_COMMUNITY   : $account_type = 'Group'; break;
+			case Models\Profile::ACCOUNT_TYPE_RELAY       : $account_type = 'Relay'; break;
+			case Models\Profile::ACCOUNT_TYPE_DELETED     : $account_type = 'Deleted'; break;
+
+			case Models\Profile::ACCOUNT_TYPE_PERSON: {
+				$account_type = 'People';
+				if (!empty($params['comm'])) {
+					$account_type = 'Group';
+				}
+				break;
+			}
+
+			default: $account_type = 'Unknown'; break;
 		}
 
 		$tags = [];
@@ -208,7 +256,6 @@ class Profile
 			'region'       => $params['region'] ?? '',
 			'country'      => $params['country-name'] ?? '',
 			'profile_url'  => $profile_uri,
-			'dfrn_request' => $params['dfrn-request'] ?? null,
 			'photo'        => $params['photo'],
 			'tags'         => implode(' ', $tags),
 			'addr'         => $addr,
@@ -216,7 +263,7 @@ class Profile
 			'language'     => $params['language'] ?? null,
 			'filled_fields'=> $filled_fields,
 			'last_activity'=> $params['last-activity'] ?? null,
-			'available'    => $available,
+			'available'    => [$available, \PDO::PARAM_BOOL],
 		];
 
 		$this->logger->debug(var_export($values, true));
@@ -230,7 +277,6 @@ class Profile
 			`region`        = :region,
 			`country`       = :country,
 			`profile_url`   = :profile_url,
-			`dfrn_request`  = :dfrn_request,
 			`photo`         = :photo,
 			`tags`          = :tags,
 			`addr`          = :addr,
@@ -250,7 +296,6 @@ class Profile
 			`region`        = :region,
 			`country`       = :country,
 			`profile_url`   = :profile_url,
-			`dfrn_request`  = :dfrn_request,
 			`photo`         = :photo,
 			`tags`          = :tags,
 			`addr`          = :addr,
@@ -284,23 +329,27 @@ class Profile
 		$status = false;
 
 		if ($profile_id) {
-			$img_str = \Friendica\Directory\Utils\Network::fetchURL($params['photo'], true);
-			$img = new \Friendica\Directory\Utils\Photo($img_str);
-			if ($img->getImage()) {
-				$img->scaleImageSquare(80);
+			try {
+				$img_str = $this->http->get($params['photo'])->getBody()->getContents();
+				$img     = new Utils\Photo($img_str);
+				if ($img->getImage()) {
+					$img->scaleImageSquare(80);
 
-				$this->atlas->perform('INSERT INTO `photo` SET
-					`profile_id` = :profile_id,
-					`data` = :data
-					ON DUPLICATE KEY UPDATE
-					`data` = :data',
-					[
-						'profile_id' => $profile_id,
-						'data' => $img->imageString()
-					]
-				);
+					$this->atlas->perform('INSERT INTO `photo` SET
+						`profile_id` = :profile_id,
+						`data` = :data
+						ON DUPLICATE KEY UPDATE
+						`data` = :data',
+						[
+							'profile_id' => $profile_id,
+							'data'       => $img->imageString()
+						]
+					);
+				}
+				$status = true;
+			} catch (RequestException $e) {
+				$this->logger->info('Photo retrieval unsuccessful', ['url' => $params['photo'], 'code' => $e->getCode()]);
 			}
-			$status = true;
 		}
 
 		$submit_end = microtime(true);
@@ -330,23 +379,21 @@ class Profile
 		return true;
 	}
 
+	/**
+	 * @param array $params
+	 * @return int
+	 */
 	private static function validateParams(array $params): int
 	{
 		$errors = 0;
-		if (empty($params['key'])) {
-			$errors++;
-		}
-		if (empty($params['dfrn-request'])) {
-			$errors++;
-		}
 		if (empty($params['dfrn-confirm'])) {
-			$errors++;
+			$errors &= self::PROFILE_MISSING_CONFIRM;
 		}
 		if (empty($params['dfrn-notify'])) {
-			$errors++;
+			$errors &= self::PROFILE_MISSING_NOTIFY;
 		}
 		if (empty($params['dfrn-poll'])) {
-			$errors++;
+			$errors &= self::PROFILE_MISSING_POLL;
 		}
 
 		return $errors;

src/classes/Pollers/Server.php

@@ -2,7 +2,9 @@
 
 namespace Friendica\Directory\Pollers;
 
-use ByJG\Util\WebRequest;
+use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\TransferStats;
 
 /**
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
@@ -13,6 +15,10 @@ class Server
 	 * @var \Atlas\Pdo\Connection
 	 */
 	private $atlas;
+	/**
+	 * @var \GuzzleHttp\ClientInterface
+	 */
+	private $http;
 	/**
 	 * @var \Friendica\Directory\Models\ProfilePollQueue
 	 */
@@ -40,6 +46,7 @@ class Server
 
 	public function __construct(
 		\Atlas\Pdo\Connection $atlas,
+		\GuzzleHttp\ClientInterface $http,
 		\Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel,
 		\Friendica\Directory\Models\Server $serverModel,
 		\Psr\SimpleCache\CacheInterface $simplecache,
@@ -47,6 +54,7 @@ class Server
 		array $settings)
 	{
 		$this->atlas = $atlas;
+		$this->http = $http;
 		$this->profilePollQueueModel = $profilePollQueueModel;
 		$this->serverModel = $serverModel;
 		$this->simplecache = $simplecache;
@@ -89,6 +97,8 @@ class Server
 
 		$parse_success = !empty($probe_result['data']['url']);
 
+		$avg_ping = null;
+
 		if ($parse_success) {
 			$base_url = $probe_result['data']['url'];
 
@@ -144,6 +154,10 @@ class Server
 				$addons = $probe_result['data']['plugins'];
 			}
 
+			if (!empty($probe_result['data']['admin']['profile'])) {
+				$subscribe = $this->getSubscribeUrl($probe_result['data']['url'], $probe_result['data']['admin']['profile']);
+			}
+
 			$this->atlas->perform(
 				'UPDATE `server`
 				SET `available`     = 1,
@@ -158,20 +172,22 @@ class Server
 					`admin_name`    = :admin_name,
 					`admin_profile` = :admin_profile,
 					`noscrape_url`  = :noscrape_url,
+					`subscribe_url` = :subscribe_url,
 					`ssl_state`     = :ssl_state
 				WHERE `id` = :server_id',
 				[
 					'server_id'     => $server['id'],
 					'base_url'      => strtolower($probe_result['data']['url']),
-					'name'          => $probe_result['data']['site_name'],
+					'name'          => substr($probe_result['data']['site_name'], 0, 255),
 					'language'      => $probe_result['data']['language'] ?? null,
 					'version'       => $probe_result['data']['version'],
 					'addons'        => implode(',', $addons),
 					'reg_policy'    => $probe_result['data']['register_policy'],
 					'info'          => $probe_result['data']['info'],
-					'admin_name'    => $probe_result['data']['admin']['name'],
-					'admin_profile' => $probe_result['data']['admin']['profile'],
+					'admin_name'    => $probe_result['data']['admin']['name'] ?? null,
+					'admin_profile' => $probe_result['data']['admin']['profile'] ?? null,
 					'noscrape_url'  => $probe_result['data']['no_scrape_url'] ?? null,
+					'subscribe_url' => $subscribe ?? null,
 					'ssl_state'     => $probe_result['ssl_state']
 				]
 			);
@@ -183,12 +199,22 @@ class Server
 			}
 
 			$this->discoverPoco($base_url);
+		} else {
+			$this->logger->debug('Parse unsuccessful', ['$polled_url' => $polled_url, '$probe_result' => $probe_result]);
 		}
 
 		if ($server) {
 			//Get the new health.
 			$version = $parse_success ? $probe_result['data']['version'] : '';
-			$health_score = $this->computeHealthScore($server['health_score'], $parse_success, $probe_result['time'], $version, $probe_result['ssl_state']);
+			$health_score = $this->computeHealthScore(
+				$server['health_score'],
+				$parse_success,
+				$probe_result['time'],
+				$version,
+				$probe_result['ssl_state'],
+				$avg_ping,
+				$probe_result['data']['info'] ?? null
+			);
 
 			$this->atlas->perform(
 				'UPDATE `server` SET `health_score` = :health_score WHERE `id` = :server_id',
@@ -228,65 +254,50 @@ class Server
 
 	private function getProbeResult(string $base_url): array
 	{
-		//Prepare the CURL call.
-		$handle = curl_init();
-		$options = array(
-			//Timeouts
-			CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout.
-			CURLOPT_CONNECTTIMEOUT => 1,
-			//Redirecting
-			CURLOPT_FOLLOWLOCATION => true,
-			CURLOPT_MAXREDIRS => 8,
-			//SSL
-			CURLOPT_SSL_VERIFYPEER => true,
-			// CURLOPT_VERBOSE => true,
-			// CURLOPT_CERTINFO => true,
-			CURLOPT_SSL_VERIFYHOST => 2,
-			CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
-			//Basic request
-			CURLOPT_USERAGENT => 'friendica-directory-probe-1.0',
-			CURLOPT_RETURNTRANSFER => true,
-			CURLOPT_URL => $base_url . '/friendica/json'
-		);
-		curl_setopt_array($handle, $options);
+		$curl_info = null;
+
+		$options = [
+			'timeout' => max($this->settings['probe_timeout'], 1),
+			'on_stats' => function (TransferStats $transferStats) use (&$curl_info) {
+				$curl_info = $transferStats->getHandlerStats();
+			}
+		];
+
+		$sslcert_issues = false;
 
-		//Probe the site.
 		$probe_start = microtime(true);
-		$probe_data = curl_exec($handle);
-		$probe_end = microtime(true);
+		$probe_data = null;
+		try {
+			//Probe the site.
+			$probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents();
+		} catch (RequestException $e) {
+			if (in_array($e->getHandlerContext()['errno'] ?? 0, [
+				60, //Could not authenticate certificate with known CA's
+				83  //Issuer check failed
+			])) {
+				$sslcert_issues = true;
 
-		//Check for SSL problems.
-		$curl_statuscode = curl_errno($handle);
-		$sslcert_issues = in_array($curl_statuscode, array(
-			60, //Could not authenticate certificate with known CA's
-			83  //Issuer check failed
-		));
+				//When it's the certificate that doesn't work, we probe again without strict SSL.
+				$options['verify'] = false;
 
-		//When it's the certificate that doesn't work.
-		if ($sslcert_issues) {
-			//Probe again, without strict SSL.
-			$options[CURLOPT_SSL_VERIFYPEER] = false;
-
-			//Replace the handle.
-			curl_close($handle);
-			$handle = curl_init();
-			curl_setopt_array($handle, $options);
-
-			//Probe.
-			$probe_start = microtime(true);
-			$probe_data = curl_exec($handle);
-			$probe_end = microtime(true);
-
-			//Store new status.
-			$curl_statuscode = curl_errno($handle);
+				$probe_start = microtime(true);
+				try {
+					$probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents();
+				} catch(RequestException $e) {
+					// Collects 404, 500 errors
+					$this->logger->info('SSL-non-verified URL probe failed with error code: ' . $e->getCode());
+				}
+			} else {
+				$this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode());
+			}
+		} catch (\InvalidArgumentException $e) {
+			$this->logger->error('Invalid argument provided to HTTP client', ['base_url' => $base_url, 'exception' => $e]);
+			return ['data' => false, 'time' => 0, 'curl_info' => [], 'ssl_state' => null];
 		}
 
-		//Gather more meta.
-		$time = round(($probe_end - $probe_start) * 1000);
-		$curl_info = curl_getinfo($handle);
+		$probe_end = microtime(true);
 
-		//Done with CURL now.
-		curl_close($handle);
+		$time = round(($probe_end - $probe_start) * 1000);
 
 		try {
 			$data = json_decode($probe_data, true);
@@ -306,7 +317,15 @@ class Server
 		return ['data' => $data, 'time' => $time, 'curl_info' => $curl_info, 'ssl_state' => $ssl_state];
 	}
 
-	private function computeHealthScore(int $original_health, bool $probe_success, int $time = null, string $version = null, int $ssl_state = null): int
+	private function computeHealthScore(
+		int $original_health,
+		bool $probe_success,
+		?int $time,
+		?string $version,
+		?int $ssl_state,
+		?float $avg_ping,
+		?string $description
+	): int
 	{
 		//Probe failed, costs you 30 points.
 		if (!$probe_success) {
@@ -368,39 +387,48 @@ class Server
 				$rc_version = str_replace('-dev', '-rc', $dev_version);
 
 				if ($version == $dev_version || $version == $rc_version) {
-					$max_health = 95; //Develop/RC can be unstable
+					$old_max_health = $max_health;
+					$new_max_health = 95; //Develop/RC can be unstable
+					$max_health = min($old_max_health, $new_max_health);
 				} elseif ($version !== $stable_version) {
 					$delta = min($delta, 0) - 10; // Losing score as time passes if node isn't updated
 				}
 			}
 		}
 
+		// No description available penalty
+		if (!$description) {
+			$max_health = min(75, $max_health);
+		}
+
+		// No ping penalty
+		if (!$avg_ping) {
+			$max_health -= 5;
+		}
+
 		return max(min($max_health, $original_health + $delta), -100);
 	}
 
 	function discoverPoco($base_url): void
 	{
-		$pocoUrl = $base_url . '/poco';
+		$uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]);
 
-		$webrequest = new WebRequest($pocoUrl);
-		$pocoJsonData = $webrequest->get(['fields' => 'urls', 'count' => 1000]);
-
-		$this->logger->debug('WebRequest: ' . $webrequest->getLastFetchedUrl() . ' Status: ' . $webrequest->getLastStatus());
-
-		if ($webrequest->getLastStatus() != 200) {
-			$this->logger->info('Unsuccessful poco request: ' . $webrequest->getLastFetchedUrl());
+		try {
+			$response = $this->http->request('GET', $uri);
+		} catch (RequestException $e) {
+			$this->logger->info('Unsuccessful poco request: ' . $uri);
 			return;
 		}
 
 		try {
-			$pocoFetchData = json_decode($pocoJsonData);
+			$pocoFetchData = json_decode($response->getBody()->getContents());
 		} catch (\Throwable $e) {
-			$this->logger->notice('Invalid JSON string for PoCo URL: ' . $webrequest->getLastFetchedUrl());
+			$this->logger->notice('Invalid JSON string for PoCo URL: ' . $uri);
 			return;
 		}
 
 		if (!isset($pocoFetchData->entry)) {
-			$this->logger->notice('Invalid JSON structure for PoCo URL: ' . $webrequest->getLastFetchedUrl());
+			$this->logger->notice('Invalid JSON structure for PoCo URL: ' . $uri);
 			return;
 		}
 
@@ -419,4 +447,45 @@ class Server
 			}
 		}
 	}
+
+	public function getSubscribeUrl($base_url, $profile)
+	{
+		$uri = Uri::withQueryValues(new Uri($base_url . '/xrd'), ['uri' => $profile]);
+
+		try {
+			$response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]);
+		} catch (RequestException $e) {
+			$this->logger->info('Unsuccessful xrd request: ' . $uri);
+			return null;
+		}
+
+		$xrdJsonData = $response->getBody()->getContents();
+
+		$this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode());
+
+		if ($response->getStatusCode() != 200) {
+			$this->logger->info('Unsuccessful XRD request: ' . $uri);
+			return null;
+		}
+
+		try {
+			$xrdData = json_decode($xrdJsonData);
+		} catch (\Throwable $e) {
+			$this->logger->notice('Invalid JSON string for XRD URL: ' . $uri);
+			return null;
+		}
+
+		if (!isset($xrdData->links)) {
+			$this->logger->notice('Invalid JSON structure for XRD URL: ' . $uri);
+			return null;
+		}
+
+		foreach ($xrdData->links as $link) {
+			if ($link->rel == 'http://ostatus.org/schema/1.0/subscribe') {
+				return $link->template ?? null;
+			}
+		}
+
+		return null;
+	}
 }

src/classes/Routes/Console/DirectoryPoll.php

@@ -11,7 +11,7 @@ class DirectoryPoll extends BaseRoute
 	{
 		return (new \Friendica\Directory\Controllers\Console\DirectoryPoll(
 			$this->container->get('atlas'),
-			$this->container->get('\Friendica\Directory\Pollers\Directory'),
+			$this->container->get(\Friendica\Directory\Pollers\Directory::class),
 			$args
 		));
 	}

src/classes/Routes/Console/ProfileAdd.php

@@ -10,7 +10,7 @@ class ProfileAdd extends BaseRoute
 	public function __invoke(array $args)
 	{
 		return (new \Friendica\Directory\Controllers\Console\ProfileAdd(
-			$this->container->get('\Friendica\Directory\Models\ProfilePollQueue'),
+			$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
 			$args
 		));
 	}

src/classes/Routes/Console/ProfilePoll.php

@@ -10,7 +10,7 @@ class ProfilePoll extends BaseRoute
 	public function __invoke(array $args)
 	{
 		return (new \Friendica\Directory\Controllers\Console\ProfilePoll(
-			$this->container->get('\Friendica\Directory\Pollers\Profile'),
+			$this->container->get(\Friendica\Directory\Pollers\Profile::class),
 			$args
 		));
 	}

src/classes/Routes/Console/ServerHide.php

@@ -11,7 +11,7 @@ class ServerHide extends BaseRoute
 	{
 		return (new \Friendica\Directory\Controllers\Console\ServerHide(
 			$this->container->get('atlas'),
-			$this->container->get('\Friendica\Directory\Models\Server'),
+			$this->container->get(\Friendica\Directory\Models\Server::class),
 			$args
 		));
 	}

src/classes/Routes/Console/ServerPoll.php

@@ -11,7 +11,7 @@ class ServerPoll extends BaseRoute
 	{
 		return (new \Friendica\Directory\Controllers\Console\ServerPoll(
 			$this->container->get('atlas'),
-			$this->container->get('\Friendica\Directory\Pollers\Server'),
+			$this->container->get(\Friendica\Directory\Pollers\Server::class),
 			$args
 		));
 	}

src/classes/Routes/Http/MatchSearch.php

@@ -10,8 +10,7 @@ class MatchSearch extends BaseRoute
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
 	{
 		return (new \Friendica\Directory\Controllers\Api\MatchSearch(
-			$this->container->atlas,
-			$this->container->get('\Friendica\Directory\Models\Profile'),
+			$this->container->get(\Friendica\Directory\Models\Profile::class),
 			$this->container->l10n
 		))->render($request, $response, $args);
 	}

src/classes/Routes/Http/Photo.php

@@ -10,7 +10,8 @@ class Photo extends BaseRoute
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
 	{
 		return (new \Friendica\Directory\Controllers\Api\Photo(
-			$this->container->atlas
+			$this->container->atlas,
+			$this->container->get('defaultProfilePictureSmallPath')
 		))->render($request, $response, $args);
 	}
 }

src/classes/Routes/Http/Search.php

@@ -10,8 +10,7 @@ class Search extends BaseRoute
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
 	{
 		return (new \Friendica\Directory\Controllers\Api\Search(
-			$this->container->atlas,
-			$this->container->get('\Friendica\Directory\Models\Profile'),
+			$this->container->get(\Friendica\Directory\Models\Profile::class),
 			$this->container->l10n
 		))->render($request, $response, $args);
 	}

src/classes/Routes/Http/Submit.php

@@ -11,7 +11,7 @@ class Submit extends BaseRoute
 	{
 		return (new \Friendica\Directory\Controllers\Api\Submit(
 			$this->container->atlas,
-			$this->container->get('\Friendica\Directory\Models\ProfilePollQueue'),
+			$this->container->get(\Friendica\Directory\Models\ProfilePollQueue::class),
 			$this->container->logger
 		))->execute($request, $response);
 	}

src/classes/Routes/Web/Directory.php

@@ -13,8 +13,9 @@ class Directory extends BaseRoute
 
 		$this->controller = new \Friendica\Directory\Controllers\Web\Directory(
 			$this->container->atlas,
-			$this->container->get('\Friendica\Directory\Models\Profile'),
-			$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
+			$this->container->get(\Friendica\Directory\Models\Server::class),
+			$this->container->get(\Friendica\Directory\Models\Profile::class),
+			$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
 			$this->container->renderer,
 			$this->container->l10n
 		);

src/classes/Routes/Web/Search.php

@@ -13,8 +13,9 @@ class Search extends BaseRoute
 
 		$this->controller = new \Friendica\Directory\Controllers\Web\Search(
 			$this->container->atlas,
-			$this->container->get('\Friendica\Directory\Models\Profile'),
-			$this->container->get('\Friendica\Directory\Views\Widget\AccountTypeTabs'),
+			$this->container->get(\Friendica\Directory\Models\Server::class),
+			$this->container->get(\Friendica\Directory\Models\Profile::class),
+			$this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class),
 			$this->container->renderer,
 			$this->container->l10n
 		);

src/classes/Utils/L10n.php

@@ -165,12 +165,12 @@ class L10n
 				$foundLang = $language;
 			}
 			if (strtolower($key) == strtolower(str_replace('-', '_', $locale))) {
-				$foundLocale = true;
+				$foundLocale = $language;
 				break;
 			}
 		}
 
-		return $foundLocale ? $language : $foundLang ?: $locale;
+		return $foundLocale ?: $foundLang ?: $locale;
 	}
 
 	/**

src/classes/Utils/Network.php

@@ -15,52 +15,6 @@ namespace Friendica\Directory\Utils;
  */
 class Network
 {
-	public static function fetchURL(string $url, bool $binary = false, int $timeout = 20): string
-	{
-		$ch = curl_init($url);
-		if (!$ch) {
-			return false;
-		}
-
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_TIMEOUT, max($timeout, 1)); //Minimum of 1 second timeout.
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_MAXREDIRS, 8);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($binary) {
-			curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
-		}
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		$s = curl_exec($ch);
-		curl_close($ch);
-		return $s;
-	}
-
-	public static function testURL(string $url, int $timeout = 20): bool
-	{
-		$ch = curl_init($url);
-		if (!$ch) {
-			return false;
-		}
-
-		curl_setopt($ch, CURLOPT_HEADER        , 0);
-		curl_setopt($ch, CURLOPT_TIMEOUT       , max($timeout, 1)); //Minimum of 1 second timeout.
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_MAXREDIRS     , 8);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-		curl_setopt($ch, CURLOPT_NOBODY        , true);
-
-		curl_exec($ch);
-
-		$responseCode = intval(curl_getinfo($ch, CURLINFO_RESPONSE_CODE));
-
-		$testSuccess = curl_errno($ch) === 0 && $responseCode < 400;
-
-		curl_close($ch);
-
-		return $testSuccess;
-	}
-
 	/**
 	 * Check if a hostname is public and non-reserved
 	 *

src/classes/Utils/Scrape.php

@@ -2,6 +2,8 @@
 
 namespace Friendica\Directory\Utils;
 
+use GuzzleHttp\ClientInterface;
+
 /**
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
@@ -12,10 +14,10 @@ class Scrape
 	 * @param string $url
 	 * @return array|false
 	 */
-	public static function retrieveNoScrapeData(string $url)
+	public static function retrieveNoScrapeData(ClientInterface $http, string $url)
 	{
 		$submit_noscrape_start = microtime(true);
-		$data = Network::fetchURL($url);
+		$data = $http->get($url)->getBody()->getContents();
 		$submit_noscrape_request_end = microtime(true);
 
 		if (empty($data)) {
@@ -23,7 +25,7 @@ class Scrape
 		}
 
 		$params = json_decode($data, true);
-		if (!$params || !count($params)) {
+		if (empty($params) || !is_array($params)) {
 			return false;
 		}
 
@@ -42,7 +44,7 @@ class Scrape
 		return $params;
 	}
 
-	public static function retrieveProfileData(string $url, int $max_nodes = 3500): array
+	public static function retrieveProfileData(ClientInterface $http, string $url, int $max_nodes = 3500): array
 	{
 
 		$minNodes = 100; //Lets do at least 100 nodes per type.
@@ -56,7 +58,7 @@ class Scrape
 		$scrape_start = microtime(true);
 
 		$params = [];
-		$html = Network::fetchURL($url, false, $timeout);
+		$html = $http->get($url, ['timeout' => $timeout])->getBody()->getContents();;
 
 		$scrape_fetch_end = microtime(true);
 
@@ -129,7 +131,7 @@ class Scrape
 
 		$nodes_left = max(intval($max_nodes), $minNodes);
 		$items = $dom->getElementsByTagName('*');
-		$targets = array('fn', 'pdesc', 'photo', 'key', 'locality', 'region', 'postal-code', 'country-name');
+		$targets = array('fn', 'pdesc', 'photo', 'locality', 'region', 'postal-code', 'country-name');
 		$targets_left = count($targets);
 		foreach ($items as $item) {
 			if (self::attributeContains($item->getAttribute('class'), 'vcard')) {
@@ -147,10 +149,6 @@ class Scrape
 						$params['photo'] = $vcard_element->getAttribute('src');
 						$targets_left = self::popScrapeTarget($targets, 'photo');
 					}
-					if (self::attributeContains($vcard_element->getAttribute('class'), 'key')) {
-						$params['key'] = $vcard_element->textContent;
-						$targets_left = self::popScrapeTarget($targets, 'key');
-					}
 					if (self::attributeContains($vcard_element->getAttribute('class'), 'locality')) {
 						$params['locality'] = $vcard_element->textContent;
 						$targets_left = self::popScrapeTarget($targets, 'locality');

src/classes/Views/PhpRenderer.php

@@ -206,7 +206,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer
 	{
 		if ($this->getAttribute('zrl')) {
 			$uri = new \ByJG\Util\Uri($url);
-			$uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'));
+			$uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'), false);
 			$url = $uri->__toString();
 		}
 

src/classes/Views/Widget/AccountTypeTabs.php

@@ -53,8 +53,12 @@ class AccountTypeTabs
 
 		foreach ($account_types as $account_type) {
 			switch ($account_type['account_type']) {
-				case 'People': $title = $this->renderer->np__('account-type', 'People (%d)', 'People (%d)', $account_type['count']); break;
-				case 'Forum' : $title = $this->renderer->np__('account-type', 'Forum (%d)', 'Forums (%d)', $account_type['count']); break;
+				case 'People'      : $title = $this->renderer->np__('account-type', 'People (%d)'      , 'People (%d)'       , $account_type['count']); break;
+				case 'News'        : $title = $this->renderer->np__('account-type', 'News (%d)'        , 'News (%d)'         , $account_type['count']); break;
+				case 'Organization': $title = $this->renderer->np__('account-type', 'Organization (%d)', 'Organizations (%d)', $account_type['count']); break;
+				// Kept for backward compatibility
+				case 'Forum'       :
+				case 'Group'       : $title = $this->renderer->np__('account-type', 'Group (%d)'       , 'Groups (%d)'       , $account_type['count']); break;
 				default: $title = $this->renderer->np__('account-type', $account_type['account_type']. ' (%d)', $account_type['account_type']. ' (%d)', $account_type['count']);
 			}
 

src/classes/Views/Widget/PopularProfileLanguages.php

@@ -5,7 +5,7 @@ namespace Friendica\Directory\Views\Widget;
 /**
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class PopularLanguages
+class PopularProfileLanguages
 {
 	/**
 	 * @var \Atlas\Pdo\Connection
@@ -36,6 +36,6 @@ class PopularLanguages
 			'languages' => $languages
 		];
 
-		return $this->renderer->fetch('widget/popularlanguages.phtml', $vars);
+		return $this->renderer->fetch('widget/popularprofilelanguages.phtml', $vars);
 	}
 }

src/classes/Views/Widget/PopularServerLanguages.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Friendica\Directory\Views\Widget;
+
+/**
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PopularServerLanguages
+{
+	/**
+	 * @var \Atlas\Pdo\Connection
+	 */
+	private $connection;
+	/**
+	 * @var \Friendica\Directory\Views\PhpRenderer
+	 */
+	private $renderer;
+
+	public function __construct(\Atlas\Pdo\Connection $connection, \Friendica\Directory\Views\PhpRenderer $renderer)
+	{
+		$this->connection = $connection;
+		$this->renderer = $renderer;
+	}
+
+	public function render(): string
+	{
+		$stmt = 'SELECT LEFT(`language`, 2) AS `language`, COUNT(*) AS `total`
+			FROM `server`
+			WHERE `reg_policy` != "REGISTER_CLOSED"
+			AND `available`
+			AND NOT `hidden`
+			AND `language` IS NOT NULL
+			GROUP BY LEFT(`language`, 2)
+			ORDER BY `total` DESC
+			LIMIT 10';
+		$languages = $this->connection->fetchAll($stmt);
+
+		$vars = [
+			'languages' => $languages
+		];
+
+		return $this->renderer->fetch('widget/popularserverlanguages.phtml', $vars);
+	}
+}

src/dependencies.php

@@ -89,54 +89,68 @@ $container['migration'] = function (ContainerInterface $c): ByJG\DbMigration\Mig
 	return $migration;
 };
 
+$container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterface {
+	$version = file_get_contents(__DIR__ . '/../VERSION');
+
+	if (!$version || !preg_match('/^\s*\d\.\d\.\d\s*$/', $version)) {
+		$version = '0.0.0';
+	}
+
+	return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]);
+};
+
+$container['defaultProfilePictureSmallPath'] = __DIR__ . '/../public/assets/images/default-profile-sm.jpg';
+
 // Internal Dependency Injection
 
-$container['\Friendica\Directory\Models\Profile'] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {
+$container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {
 	return new Friendica\Directory\Models\Profile($c->get('atlas'));
 };
 
-$container['\Friendica\Directory\Models\ProfilePollQueue'] = function (ContainerInterface $c): Friendica\Directory\Models\ProfilePollQueue {
+$container[\Friendica\Directory\Models\ProfilePollQueue::class] = function (ContainerInterface $c): Friendica\Directory\Models\ProfilePollQueue {
 	return new Friendica\Directory\Models\ProfilePollQueue($c->get('atlas'));
 };
 
-$container['\Friendica\Directory\Models\Server'] = function (ContainerInterface $c): Friendica\Directory\Models\Server {
+$container[\Friendica\Directory\Models\Server::class] = function (ContainerInterface $c): Friendica\Directory\Models\Server {
 	return new Friendica\Directory\Models\Server($c->get('atlas'));
 };
 
-$container['\Friendica\Directory\Pollers\Directory'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory {
+$container[\Friendica\Directory\Pollers\Directory::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory {
 	$settings = $c->get('settings')['poller'];
 	return new Friendica\Directory\Pollers\Directory(
-		$c->get('atlas'),
-		$c->get('\Friendica\Directory\Models\ProfilePollQueue'),
+		$c->get('http'),
+		$c->get(\Friendica\Directory\Models\ProfilePollQueue::class),
 		$c->get('logger'),
 		$settings ?: []
 	);
 };
 
-$container['\Friendica\Directory\Pollers\Profile'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Profile {
+$container[\Friendica\Directory\Pollers\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Profile {
 	$settings = $c->get('settings')['poller'];
 	return new Friendica\Directory\Pollers\Profile(
 		$c->get('atlas'),
-		$c->get('\Friendica\Directory\Models\Server'),
-		$c->get('\Friendica\Directory\Models\Profile'),
+		$c->get('http'),
+		$c->get(\Friendica\Directory\Models\Server::class),
+		$c->get(\Friendica\Directory\Models\Profile::class),
 		$c->get('logger'),
 		$settings ?: []
 	);
 };
 
-$container['\Friendica\Directory\Pollers\Server'] = function (ContainerInterface $c): Friendica\Directory\Pollers\Server {
+$container[\Friendica\Directory\Pollers\Server::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Server {
 	$settings = $c->get('settings')['poller'];
 	return new Friendica\Directory\Pollers\Server(
 		$c->get('atlas'),
-		$c->get('\Friendica\Directory\Models\ProfilePollQueue'),
-		$c->get('\Friendica\Directory\Models\Server'),
+		$c->get('http'),
+		$c->get(\Friendica\Directory\Models\ProfilePollQueue::class),
+		$c->get(\Friendica\Directory\Models\Server::class),
 		$c->get('simplecache'),
 		$c->get('logger'),
 		$settings ?: []
 	);
 };
 
-$container['\Friendica\Directory\Views\Widget\AccountTypeTabs'] = function (ContainerInterface $c): Friendica\Directory\Views\Widget\AccountTypeTabs {
+$container[\Friendica\Directory\Views\Widget\AccountTypeTabs::class] = function (ContainerInterface $c): Friendica\Directory\Views\Widget\AccountTypeTabs {
 	return new Friendica\Directory\Views\Widget\AccountTypeTabs(
 		$c->get('atlas'),
 		$c->get('renderer'),

src/lang/ar/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# ButterflyOfFire, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
-"Last-Translator: ButterflyOfFire, 2019\n"
+"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "السابقة"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "التالية"
 
@@ -33,63 +31,69 @@ msgstr "الأولى"
 msgid "Last"
 msgstr "الأخيرة"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "أشخاص"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "اللغة"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
-msgstr ""
-
-#: src\classes\Controllers\Web\Search.php:66
-msgctxt "field"
-msgid "Region"
 msgstr "المنطقة"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:74
+msgctxt "field"
+msgid "Region"
+msgstr "الإقليم"
+
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "البلد"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "الخوادم العمومية"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
-msgstr ""
+msgstr "دليل فرنديكا"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
-msgstr ""
+msgstr "مصطلحات البحث"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
-msgstr "البحث"
+msgstr "ابحث"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
-msgstr "البحث"
+msgstr "ابحث"
 
 #: src\templates\layout.phtml:33
 msgid "Toggle navigation"
-msgstr ""
+msgstr "بدل التصفح"
 
 #: src\templates\layout.phtml:55
 msgid "Directory"
-msgstr ""
+msgstr "الدليل"
 
 #: src\templates\layout.phtml:60
 msgid "Public servers"
@@ -98,87 +102,95 @@ msgstr "الخوادم العمومية"
 #: src\templates\search.phtml:19
 msgid "%d result for \"%s\""
 msgid_plural "%d results for \"%s\""
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "%d نتائج لـ \"%s\""
+msgstr[1] "نتيجة %d لـ \"%s\""
+msgstr[2] "نتيجتان %d لـ \"%s\""
+msgstr[3] "%d نتائج لـ \"%s\""
+msgstr[4] "%d نتيجة لـ \"%s\""
+msgstr[5] "%dنتيجة لـ \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
 #: src\templates\sub\profile.phtml:5
 msgid "Filter by locality"
-msgstr ""
+msgstr "رشح حسب المنطقة"
 
 #: src\templates\sub\profile.phtml:11
 msgid "Filter by region"
-msgstr "تصفية حسب المنطقة"
+msgstr "رشح حسب الإقليم"
 
 #: src\templates\sub\profile.phtml:17
 msgid "Filter by country"
-msgstr "تصفية حسب الدولة"
+msgstr "رشح حسب الدولة"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
-msgstr "اتبع"
+msgstr "تابع"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "اللغة"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
-msgstr "تصفية حسب اللغة"
+msgstr "رشح حسب اللغة"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
-msgstr ""
+msgstr "الموقع"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
-msgstr ""
+msgstr "ابحث عن وسم"
 
 #: src\templates\sub\profiles.phtml:1
 msgid "Account type tabs"
-msgstr ""
+msgstr "ألسنة نوع الحساب"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
-msgstr "إصدار ثابت"
+msgstr "الإصدار المستقر"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
-msgstr "إصدار قيد التطوير"
+msgstr "الإصدار الاختباري"
 
 #: src\templates\sub\server.phtml:19
 msgid "Outdated Version"
 msgstr "إصدار قديم"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "المدير"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
-msgstr "لم يتم تقديم أي وصف"
+msgstr "لم يقدم أي وصف"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "زُر الخادم"
 
@@ -186,7 +198,7 @@ msgstr "زُر الخادم"
 msgid "Popular Countries"
 msgstr "البلدان الشائعة"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "اللغات الشائعة"
 
@@ -194,7 +206,8 @@ msgstr "اللغات الشائعة"
 msgid "Popular Tags"
 msgstr "الوسوم الشائعة"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "اللغة الافتراضية"
 
@@ -211,23 +224,12 @@ msgstr "الكل"
 msgctxt "account-type"
 msgid "People (%d)"
 msgid_plural "People (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "أشخاص (%d)"
+msgstr[1] "أشخاص (%d)"
+msgstr[2] "أشخاص (%d)"
+msgstr[3] "أشخاص (%d)"
+msgstr[4] "أشخاص (%d)"
+msgstr[5] "أشخاص (%d)"
 
 #: src\templates\layout.phtml:97
 msgid "Stats"
@@ -235,50 +237,44 @@ msgstr "الإحصائيات"
 
 #: src\templates\statistics.phtml:4
 msgid "Directory statistics"
-msgstr "إحصائيات السِجِل"
+msgstr "إحصائيات الدليل"
 
 #: src\templates\statistics.phtml:5
 msgid "Profiles"
 msgstr "الملفات الشخصية"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "اللغات"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
-msgstr ""
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "من بين <strong>%s</strong> ملفا شخصيا عرف عن لغته هناك:"
 
 #: src\templates\statistics.phtml:27
 msgid "Servers"
 msgstr "الخوادم"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
-msgstr ""
+msgstr "من بين هؤلاء هناك:"
 
 #: src\templates\statistics.phtml:47
 msgid "Out of <strong>%s</strong> servers reporting their language there are:"
-msgstr ""
+msgstr "من بين <strong>%s</strong> خادما عرف عن لغته هناك:"
 
 #: src\templates\statistics.phtml:57
 msgid "Versions"
@@ -286,34 +282,100 @@ msgstr "الإصدارات"
 
 #: src\templates\statistics.phtml:58
 msgid "Out of <strong>%s</strong> servers reporting their version there are:"
-msgstr ""
+msgstr "من بين <strong>%s</strong> خادما عرف عن إصداره هناك:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
-msgstr ""
+msgstr "<strong>%s خادم متوفر  (%s)</strong>"
 
 #: src\templates\layout.phtml:91
 msgid "Friendica Directory version %s"
-msgstr ""
-
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "الشفرة المصدرية على غيت هب"
+msgstr "إصدار دليل فرنديكا %s"
 
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "يوجد <strong>%s خادم عمومي (%s)</strong> مفتوح للستجيل. <a href=\"%s\">ألق نظرة عليهم!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "أخبار (%d)"
+msgstr[1] "أخبار (%d)"
+msgstr[2] "أخبار (%d)"
+msgstr[3] "أخبار (%d)"
+msgstr[4] "أخبار (%d)"
+msgstr[5] "أخبار (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "منظمات (%d)"
+msgstr[1] "منظمات (%d)"
+msgstr[2] "منظمات (%d)"
+msgstr[3] "منظمات (%d)"
+msgstr[4] "منظمات (%d)"
+msgstr[5] "منظمات (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr "تقييم الصحة"
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "لا مستخدمين %s"
+msgstr[1] "مستخدم %s"
+msgstr[2] "مستخدمان %s"
+msgstr[3] "%s مستخدمين"
+msgstr[4] "%s مستخدما"
+msgstr[5] "%s مستخدم"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "لا شيء"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "سياسة التسجيل"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "يحتاج الموافقة"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "مفتوح"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/ca/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Joan Bar <friendica@tutanota.com>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Joan Bar <friendica@tutanota.com>, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/Friendica/teams/12172/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "prèvia"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "següent"
 
@@ -33,51 +31,57 @@ msgstr "Primer"
 msgid "Last"
 msgstr "Ultim"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "gent"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Llengua"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Localitat"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Regió"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "País"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Servidors públics"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Directori de Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Termes de cerca"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Buscar"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Paginació dels servidors principals"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Paginació dels servidors principals"
 
@@ -122,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filtra per País"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "seguir"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Llenguatge "
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr ""
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Localitat"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Etiqueta de cerca"
 
@@ -146,19 +154,23 @@ msgstr "Etiqueta de cerca"
 msgid "Account type tabs"
 msgstr "Pestanyes tipus compte"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Superior%s Paginació"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr ""
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Desenvolupar la versió"
 
@@ -166,15 +178,15 @@ msgstr "Desenvolupar la versió"
 msgid "Outdated Version"
 msgstr "Versió obsoleta"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Administrador"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "No es proporciona cap descripció"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Visita servidor"
 
@@ -182,7 +194,7 @@ msgstr "Visita servidor"
 msgid "Popular Countries"
 msgstr "Països populars"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Idiomes populars"
 
@@ -190,7 +202,8 @@ msgstr "Idiomes populars"
 msgid "Popular Tags"
 msgstr "Etiquetes populars"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Idioma per defecte"
 
@@ -210,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Estadístiques"
@@ -230,39 +236,29 @@ msgid "Profiles"
 msgstr "perfil"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr "Aquest directori en sap <strong>%s URL de perfil diferents</strong>."
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Idiomes"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
-msgstr ""
-"Fora de<strong>%s</strong> Els perfils que informen el seu idioma hi ha:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "Fora de<strong>%s</strong> Els perfils que informen el seu idioma hi ha:"
 
 #: src\templates\statistics.phtml:27
 msgid "Servers"
 msgstr "Servidors"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"Aquest directori en sap <strong>%s URL de servidor diferents</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Aquest directori en sap <strong>%s URL de servidor diferents</strong>."
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"D’aquests, n’hi ha <strong>%s dominis (%s)</strong> que han estat un "
-"servidor Friendica com a mínim una vegada."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "D’aquests, n’hi ha <strong>%s dominis (%s)</strong> que han estat un servidor Friendica com a mínim una vegada."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -270,8 +266,7 @@ msgstr "D'aquests, hi ha:"
 
 #: src\templates\statistics.phtml:47
 msgid "Out of <strong>%s</strong> servers reporting their language there are:"
-msgstr ""
-"Fora de <strong>%s</strong> hi ha servidors que informen del seu idioma:"
+msgstr "Fora de <strong>%s</strong> hi ha servidors que informen del seu idioma:"
 
 #: src\templates\statistics.phtml:57
 msgid "Versions"
@@ -279,16 +274,11 @@ msgstr "Versions"
 
 #: src\templates\statistics.phtml:58
 msgid "Out of <strong>%s</strong> servers reporting their version there are:"
-msgstr ""
-"Fora de<strong>%s</strong> Hi ha servidors que informen de la seva versió:"
+msgstr "Fora de<strong>%s</strong> Hi ha servidors que informen de la seva versió:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"D’aquests, n’hi ha <strong>%s perfil (%s)</strong> que va optar al directori"
-" públic almenys una vegada."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "D’aquests, n’hi ha <strong>%s perfil (%s)</strong> que va optar al directori públic almenys una vegada."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -298,18 +288,70 @@ msgstr "<strong>%s servidors disponibles (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Versió del directori Friendica"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Codi font a GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/cs/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Aditoo, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Aditoo, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Další"
 
@@ -33,51 +31,57 @@ msgstr "První"
 msgid "Last"
 msgstr "Poslední"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Lidé"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Jazyk"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Poloha"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Region/kraj"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Země"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Veřejné servery"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Adresář Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Termíny vyhledávání"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Hledání"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -103,11 +107,11 @@ msgstr[1] "%d výsledky pro „%s“"
 msgstr[2] "%d výsledku pro „%s“"
 msgstr[3] "%d výsledků pro „%s“"
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Horní stránkování serverů"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Spodní stránkování serverů"
 
@@ -124,23 +128,27 @@ msgid "Filter by country"
 msgstr "Filtrovat dle země"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Sledovat"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Jazyk"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filtrovat dle jazyka"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Poloha"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Hledat podle štítku"
 
@@ -148,19 +156,23 @@ msgstr "Hledat podle štítku"
 msgid "Account type tabs"
 msgstr "Záložky typů účtů"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Horní stránkování %s"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "Spodní stránkování %s"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Stabilní verze"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Vývojová verze"
 
@@ -168,15 +180,15 @@ msgstr "Vývojová verze"
 msgid "Outdated Version"
 msgstr "Neaktuální verze"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Administrátor"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Není zadán žádný popis"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Navštívit server"
 
@@ -184,7 +196,7 @@ msgstr "Navštívit server"
 msgid "Popular Countries"
 msgstr "Populární země"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Populární jazyky"
 
@@ -192,7 +204,8 @@ msgstr "Populární jazyky"
 msgid "Popular Tags"
 msgstr "Populární štítky"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Výchozí jazyk"
 
@@ -214,15 +227,6 @@ msgstr[1] "Lidé (%d)"
 msgstr[2] "Lidé (%d)"
 msgstr[3] "Lidé (%d)"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Fóra (%d)"
-msgstr[1] "Fóra (%d)"
-msgstr[2] "Fóra (%d)"
-msgstr[3] "Fóra (%d)"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Statistika"
@@ -236,20 +240,16 @@ msgid "Profiles"
 msgstr "Profily"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
-msgstr ""
-"Tento adresář ví o <strong>%s zřetelných potenciálních profilových URL "
-"adresách</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Tento adresář ví o <strong>%s zřetelných potenciálních profilových URL adresách</strong>."
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Jazyky"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "Ze všech <strong>%s</strong> profilů hlásících svůj jazyk je tu:"
 
 #: src\templates\statistics.phtml:27
@@ -257,20 +257,12 @@ msgid "Servers"
 msgstr "Servery"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"Tento adresář ví o <strong>%s zřetelných potenciálních serverových URL "
-"adresách</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Tento adresář ví o <strong>%s zřetelných potenciálních serverových URL adresách</strong>."
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"Z těch je tu <strong>%s domén (%s)</strong>, které byly alespoň jednou "
-"serverem Friendica."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Z těch je tu <strong>%s domén (%s)</strong>, které byly alespoň jednou serverem Friendica."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -289,12 +281,8 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "Ze všech <strong>%s</strong> serverů hlásících svou verzi je tu:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"Z těch je tu <strong>%s profilů (%s)</strong>, které byly alespoň jednou "
-"publikovány ve veřejném adresáři."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Z těch je tu <strong>%s profilů (%s)</strong>, které byly alespoň jednou publikovány ve veřejném adresáři."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -304,18 +292,78 @@ msgstr "<strong>%s dostupných serverů (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Adresář Friendica, verze %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Zdrojový kód na GitHubu"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/da_DK/LC_MESSAGES/strings.po

@@ -0,0 +1,357 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2\n"
+
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
+msgid "Previous"
+msgstr "Forrige"
+
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
+msgid "Next"
+msgstr "Næste"
+
+#: src\classes\Content\Pager.php:211
+msgid "First"
+msgstr "Første"
+
+#: src\classes\Content\Pager.php:278
+msgid "Last"
+msgstr "Sidste"
+
+#: src\classes\Controllers\Web\Directory.php:85
+msgid "People"
+msgstr "Mennesker"
+
+#: src\classes\Controllers\Web\Search.php:72
+msgctxt "field"
+msgid "Language"
+msgstr "Sprog"
+
+#: src\classes\Controllers\Web\Search.php:73
+msgctxt "field"
+msgid "Locality"
+msgstr "Lokalitet"
+
+#: src\classes\Controllers\Web\Search.php:74
+msgctxt "field"
+msgid "Region"
+msgstr "Region"
+
+#: src\classes\Controllers\Web\Search.php:75
+msgctxt "field"
+msgid "Country"
+msgstr "Land"
+
+#: src\classes\Controllers\Web\Servers.php:105
+msgid "Public Servers"
+msgstr "Offentlige servere"
+
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
+msgid "Friendica Directory"
+msgstr "Friendica adressebog"
+
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
+msgid "Search terms"
+msgstr "Søgetermer"
+
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:11
+msgctxt "noun"
+msgid "Search"
+msgstr "Søg"
+
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
+#: src\templates\search.phtml:14
+msgctxt "verb"
+msgid "Search"
+msgstr "Søg"
+
+#: src\templates\layout.phtml:33
+msgid "Toggle navigation"
+msgstr "Skift navigation"
+
+#: src\templates\layout.phtml:55
+msgid "Directory"
+msgstr "Adressebog"
+
+#: src\templates\layout.phtml:60
+msgid "Public servers"
+msgstr "Offentlige servere"
+
+#: src\templates\search.phtml:19
+msgid "%d result for \"%s\""
+msgid_plural "%d results for \"%s\""
+msgstr[0] "%d resultat for \"%s\""
+msgstr[1] "%d resultater for \"%s\""
+
+#: src\templates\servers.phtml:7
+msgid "Top servers pagination"
+msgstr "Top servere sideopdeling"
+
+#: src\templates\servers.phtml:17
+msgid "Bottom servers pagination"
+msgstr "Bundservere sideopdeling"
+
+#: src\templates\sub\profile.phtml:5
+msgid "Filter by locality"
+msgstr "Filtrer efter lokalitet"
+
+#: src\templates\sub\profile.phtml:11
+msgid "Filter by region"
+msgstr "Filtrer efter region"
+
+#: src\templates\sub\profile.phtml:17
+msgid "Filter by country"
+msgstr "Filtrer efter land"
+
+#: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
+msgctxt "verb"
+msgid "Follow"
+msgstr "Følg"
+
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
+msgid "Language"
+msgstr "Sprog"
+
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
+msgid "Filter by language"
+msgstr "Filtrer efter sprog"
+
+#: src\templates\sub\profile.phtml:66
+msgid "Location"
+msgstr "Placering"
+
+#: src\templates\sub\profile.phtml:79
+msgid "Search Tag"
+msgstr "Søgetag"
+
+#: src\templates\sub\profiles.phtml:1
+msgid "Account type tabs"
+msgstr "Kontotypefaner"
+
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
+msgid "Top %s pagination"
+msgstr "Top %s sideopdeling"
+
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
+msgid "Bottom %s pagination"
+msgstr "Bund %s sideopdeling"
+
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
+msgid "Stable Version"
+msgstr "Stabil version"
+
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
+msgid "Develop Version"
+msgstr "Udviklingsversion"
+
+#: src\templates\sub\server.phtml:19
+msgid "Outdated Version"
+msgstr "Forældet version"
+
+#: src\templates\sub\server.phtml:69
+msgid "Admin"
+msgstr "Admin"
+
+#: src\templates\sub\server.phtml:76
+msgid "No description provided"
+msgstr "Ingen beskrivelse givet"
+
+#: src\templates\sub\server.phtml:79
+msgid "Visit Server"
+msgstr "Besøg server"
+
+#: src\templates\widget\popularcountries.phtml:2
+msgid "Popular Countries"
+msgstr "Populære lande"
+
+#: src\templates\widget\popularprofilelanguages.phtml:2
+msgid "Popular Languages"
+msgstr "Populære sprog"
+
+#: src\templates\widget\populartags.phtml:2
+msgid "Popular Tags"
+msgstr "Populære tags"
+
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
+msgid "Default Language"
+msgstr "Standard sprog"
+
+#: src\templates\sub\server.phtml:49
+msgid "Known Users"
+msgstr "Kendte brugere"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:48
+msgctxt "account-type"
+msgid "All"
+msgstr "Alle"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:56
+msgctxt "account-type"
+msgid "People (%d)"
+msgid_plural "People (%d)"
+msgstr[0] "Mennesker (%d)"
+msgstr[1] "Mennesker (%d)"
+
+#: src\templates\layout.phtml:97
+msgid "Stats"
+msgstr "Statistik"
+
+#: src\templates\statistics.phtml:4
+msgid "Directory statistics"
+msgstr "Adressebog statistik"
+
+#: src\templates\statistics.phtml:5
+msgid "Profiles"
+msgstr "Profiler"
+
+#: src\templates\statistics.phtml:6
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Denne adressebog kender til <strong>%s særskilte potentielle profil-URL'er</strong>."
+
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
+msgid "Languages"
+msgstr "Sprog"
+
+#: src\templates\statistics.phtml:17
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "Ud af <strong>%s</strong> profiler som rapporterer deres sprog, er der:"
+
+#: src\templates\statistics.phtml:27
+msgid "Servers"
+msgstr "Servere"
+
+#: src\templates\statistics.phtml:28
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Denne adressebog kender til <strong>%s særskilte potentielle server-URL'er</strong>."
+
+#: src\templates\statistics.phtml:29
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Ud af dem er der <strong>%s domæner (%s)</strong> som har været en Friendica server mindst én gang."
+
+#: src\templates\statistics.phtml:33
+msgid "Out of those, there are:"
+msgstr "Ud af dem er der:"
+
+#: src\templates\statistics.phtml:47
+msgid "Out of <strong>%s</strong> servers reporting their language there are:"
+msgstr "Ud af <strong>%s</strong> servere som rapporterer deres sprog, er der:"
+
+#: src\templates\statistics.phtml:57
+msgid "Versions"
+msgstr "Versioner"
+
+#: src\templates\statistics.phtml:58
+msgid "Out of <strong>%s</strong> servers reporting their version there are:"
+msgstr "Ud af <strong>%s</strong> servere som rapporterer deres version, er der:"
+
+#: src\templates\statistics.phtml:7
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Ud af dem er der <strong>%s profiler (%s)</strong> som tilvalgte den offentlige adressebog mindst én gang."
+
+#: src\templates\statistics.phtml:35
+msgid "<strong>%s available servers (%s)</strong>"
+msgstr "<strong>%s tilgængelige servere (%s)</strong>"
+
+#: src\templates\layout.phtml:91
+msgid "Friendica Directory version %s"
+msgstr "Friendica adressebogsversion %s"
+
+#: src\templates\statistics.phtml:11
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Ud af dem er der i øjeblikket <strong>%s tilgængelige profiler (%s)</strong>. <a href=\"%s\">Tjek dem ud!</a>"
+
+#: src\templates\statistics.phtml:39
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s offentlige servere (%s)</strong> åben for registrering lige nu. <a href=\"%s\">Tjek dem ud!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "Nyheder (%d)"
+msgstr[1] "Nyheder (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "Organisationer (%d)"
+msgstr[1] "Organisationer (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr "Sundhedsscore"
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "%s bruger"
+msgstr[1] "%s brugere"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "Ingen"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "Registreringspolitik"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "Ved godkendelse"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "Åben"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
+msgstr ""

src/lang/de/LC_MESSAGES/strings.po

@@ -1,29 +1,25 @@
-# 
-# Translators:
-# Andreas H., 2018
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020\n"
 "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Vorherige"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Nächste"
 
@@ -35,51 +31,57 @@ msgstr "Erste"
 msgid "Last"
 msgstr "Letzte"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Leute"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Sprache"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Wohnort"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Region"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Land"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Öffentlicher Server"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica Verzeichnis"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Suchbegriff"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Suche"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -103,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] "%d Ergebnisse für \"%s\""
 msgstr[1] "%d Ergebnisse für \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Höchste Serverwertung"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Niedrigste Serverwertung"
 
@@ -124,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filter nach Land"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Folge"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Sprache"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filter nach Sprache"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Ort"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Suchbegriff"
 
@@ -148,19 +154,23 @@ msgstr "Suchbegriff"
 msgid "Account type tabs"
 msgstr "Konto-Typ Register"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Top %s pagination"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "Bottom %s pagination"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Stabile Version"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Entwickler Version"
 
@@ -168,15 +178,15 @@ msgstr "Entwickler Version"
 msgid "Outdated Version"
 msgstr "Abgelaufene Version"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Admin"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Keine Beschreibung angeboten"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Besuche den Server"
 
@@ -184,7 +194,7 @@ msgstr "Besuche den Server"
 msgid "Popular Countries"
 msgstr "Häufige Länder"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Häufige Sprachen"
 
@@ -192,7 +202,8 @@ msgstr "Häufige Sprachen"
 msgid "Popular Tags"
 msgstr "Beliebte Tags"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Standard Sprache"
 
@@ -212,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] "Personen (%d)"
 msgstr[1] "Personen (%d)"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Foren (%d)"
-msgstr[1] "Foren (%d)"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Statistik"
@@ -232,20 +236,16 @@ msgid "Profiles"
 msgstr "Profile"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
-msgstr ""
-"Dieses Verzeichnis kennt <strong>%s unterschiedliche, potentielle Profil "
-"URLs</strong>"
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Dieses Verzeichnis kennt <strong>%s unterschiedliche, potentielle Profil URLs</strong>"
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Sprachen"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "Von den <strong>%s</strong> Profilen, die ihre Sprache angeben, sind:"
 
 #: src\templates\statistics.phtml:27
@@ -253,20 +253,12 @@ msgid "Servers"
 msgstr "Server"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"Dieses Verzeichnis kennt <strong>%s unterschiedliche, potentielle Server "
-"URLs</strong>"
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Dieses Verzeichnis kennt <strong>%s unterschiedliche, potentielle Server URLs</strong>"
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"Von diesen gibt es <strong>%sDomänen(%s)</strong>, die zumindest einmal "
-"Friendica Knoten gewesen sind."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Von diesen gibt es <strong>%sDomänen(%s)</strong>, die zumindest einmal Friendica Knoten gewesen sind."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -274,9 +266,7 @@ msgstr "Von diesen sind:"
 
 #: src\templates\statistics.phtml:47
 msgid "Out of <strong>%s</strong> servers reporting their language there are:"
-msgstr ""
-"Von den <strong>%s</strong> Servern, die ihre Spracheinstellung angeben, "
-"sind:"
+msgstr "Von den <strong>%s</strong> Servern, die ihre Spracheinstellung angeben, sind:"
 
 #: src\templates\statistics.phtml:57
 msgid "Versions"
@@ -287,12 +277,8 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "Von den <strong>%s</strong> Servern, die ihre Version angeben, sind:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"Von diesen gibt es <strong>%sProfile (%s)</strong> die sich, zumindest "
-"einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Von diesen gibt es <strong>%sProfile (%s)</strong> die sich, zumindest einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -302,22 +288,70 @@ msgstr "<strong>%sverfügbare Server (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Friendica Verzeichnis Version %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Quellcode auf GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
-msgstr ""
-"Von diesen sind derzeit <strong>%sverfügbare Profile (%s)</strong>. <a "
-"href=\"%s\">Schaue sie dir an!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Von diesen sind derzeit <strong>%sverfügbare Profile (%s)</strong>. <a href=\"%s\">Schaue sie dir an!</a>"
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s öffentliche Server (%s)</strong> erlauben derzeit die Anmeldung. <a href=\"%s\">Schau sie dir an!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""
-"<strong>%s öffentliche Server (%s)</strong> erlauben derzeit die Anmeldung. "
-"<a href=\"%s\">Schau sie dir an!</a>"

src/lang/en/LC_MESSAGES/strings.po

@@ -31,31 +31,31 @@ msgstr ""
 msgid "Last"
 msgstr ""
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr ""
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
@@ -126,24 +126,27 @@ msgid "Filter by country"
 msgstr ""
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr ""
 
 #: src\templates\layout.phtml:65
-#: src\templates\sub\profile.phtml:47
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr ""
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr ""
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr ""
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr ""
 
@@ -175,15 +178,15 @@ msgstr ""
 msgid "Outdated Version"
 msgstr ""
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr ""
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr ""
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr ""
 
@@ -191,7 +194,7 @@ msgstr ""
 msgid "Popular Countries"
 msgstr ""
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr ""
 
@@ -220,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr ""
@@ -292,10 +288,6 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr ""
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr ""
-
 #: src\templates\statistics.phtml:11
 msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
@@ -303,3 +295,63 @@ msgstr ""
 #: src\templates\statistics.phtml:39
 msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
 msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
+msgstr ""

src/lang/en_GB/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Andy H3 <andy@hubup.pro>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
-"Last-Translator: Andy H3 <andy@hubup.pro>, 2019\n"
+"Last-Translator: Andy H3 <andy@hubup.pro>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Previous"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Next"
 
@@ -33,51 +31,57 @@ msgstr "First"
 msgid "Last"
 msgstr "Last"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "People"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Language"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Locality"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Region"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Country"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Public servers"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica directory"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Search terms"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Search"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] "%d result for \"%s\""
 msgstr[1] "%d results for \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Top servers pagination"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Bottom servers pagination"
 
@@ -122,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filter by country"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Follow"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Language"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filter by language"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Location"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Search tag"
 
@@ -146,19 +154,23 @@ msgstr "Search tag"
 msgid "Account type tabs"
 msgstr "Account type tabs"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Top %s pagination"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "Bottom %s pagination"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Stable version"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Develop version"
 
@@ -166,15 +178,15 @@ msgstr "Develop version"
 msgid "Outdated Version"
 msgstr "Outdated version"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Admin"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "No description provided"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Visit server"
 
@@ -182,7 +194,7 @@ msgstr "Visit server"
 msgid "Popular Countries"
 msgstr "Popular countries"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Popular languages"
 
@@ -190,7 +202,8 @@ msgstr "Popular languages"
 msgid "Popular Tags"
 msgstr "Popular tags"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Default language"
 
@@ -210,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] "People (%d)"
 msgstr[1] "People (%d)"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Forum (%d)"
-msgstr[1] "Forums (%d)"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Stats"
@@ -230,42 +236,29 @@ msgid "Profiles"
 msgstr "Profiles"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
-msgstr ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Languages"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
-msgstr ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "Out of <strong>%s</strong> profiles reporting their language there are:"
 
 #: src\templates\statistics.phtml:27
 msgid "Servers"
 msgstr "Servers"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "This directory knows about <strong>%s distinct potential server URLs</strong>."
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -273,8 +266,7 @@ msgstr "Out of those, there are:"
 
 #: src\templates\statistics.phtml:47
 msgid "Out of <strong>%s</strong> servers reporting their language there are:"
-msgstr ""
-"Out of <strong>%s</strong> servers reporting their language there are:"
+msgstr "Out of <strong>%s</strong> servers reporting their language there are:"
 
 #: src\templates\statistics.phtml:57
 msgid "Versions"
@@ -285,12 +277,8 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "Out of <strong>%s</strong> servers reporting their version there are:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -300,18 +288,70 @@ msgstr "<strong>%s available servers (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Friendica directory version %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Source code on GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
-msgstr ""
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/et/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Rain Hawk, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Rain Hawk, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/Friendica/teams/12172/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Eelmine"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Järgmine"
 
@@ -33,51 +31,57 @@ msgstr "Esimene"
 msgid "Last"
 msgstr "Viimane"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Inimesed"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Keel"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Asukoht"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Regioon"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Riik"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Avalikud serverid"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica Kataloog"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Otsingu tingimused"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Otsi"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
@@ -122,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filtreeri riigi järgi"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Järgi"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Keel"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filtreeri keele järgi"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Asukoht"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Otsingu tag"
 
@@ -146,19 +154,23 @@ msgstr "Otsingu tag"
 msgid "Account type tabs"
 msgstr "Konto tüübi sakid"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Stabiilne versioon"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Arendusversioon"
 
@@ -166,15 +178,15 @@ msgstr "Arendusversioon"
 msgid "Outdated Version"
 msgstr "Aegunud versioon"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Adminn"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Kirjeldus pole saadaval"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Külasta serverit"
 
@@ -182,7 +194,7 @@ msgstr "Külasta serverit"
 msgid "Popular Countries"
 msgstr "Populaarsed riigid"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Populaarsed keeled"
 
@@ -190,7 +202,8 @@ msgstr "Populaarsed keeled"
 msgid "Popular Tags"
 msgstr "Polulaarsed tag`id"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Peamine keel"
 
@@ -210,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] "Inimesed ( %d )"
 msgstr[1] "Inimesed (%d)"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Foorumid ( %d ) "
-msgstr[1] "Foorumid ( %d )"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Statistika"
@@ -230,18 +236,16 @@ msgid "Profiles"
 msgstr "Profiilid"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Keeled"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:27
@@ -249,15 +253,11 @@ msgid "Servers"
 msgstr "Serverid"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -277,9 +277,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -290,18 +288,70 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr ""
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr ""
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/fr/LC_MESSAGES/strings.po

@@ -1,28 +1,25 @@
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
-# Vladimir Núñez <lapoubelle111@gmail.com>, 2018
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Vladimir Núñez <lapoubelle111@gmail.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Précédent"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Suivant"
 
@@ -34,51 +31,57 @@ msgstr "Début"
 msgid "Last"
 msgstr "Fin"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Utilisateurs"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Langue"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Localité"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Région"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Pays"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Serveurs publics"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Répertoire Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Mots-clés"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Recherche"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -102,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] "%d résultat pour \"%s\""
 msgstr[1] "%d résultats pour \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Pagination des serveurs haute"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Pagination des serveurs basse"
 
@@ -123,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filtrer par pays"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Suivre"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Langue"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filtrer par langue"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Localisation"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Rechercher ce tag"
 
@@ -147,19 +154,23 @@ msgstr "Rechercher ce tag"
 msgid "Account type tabs"
 msgstr "Onglets de type de compte"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Pagination %s haute"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "Pagination %s basse"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Version stable"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Version instable"
 
@@ -167,15 +178,15 @@ msgstr "Version instable"
 msgid "Outdated Version"
 msgstr "Version périmée"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Administrateur"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Pas de description fournie"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Visiter ce serveur"
 
@@ -183,7 +194,7 @@ msgstr "Visiter ce serveur"
 msgid "Popular Countries"
 msgstr "Pays populaires"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Language populaires"
 
@@ -191,7 +202,8 @@ msgstr "Language populaires"
 msgid "Popular Tags"
 msgstr "Tags populaires"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Langage de base"
 
@@ -211,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Statistiques"
@@ -231,18 +236,16 @@ msgid "Profiles"
 msgstr "Profils"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Langages"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "parmi <strong>%s</strong>profil mentionnant leur langage il y a:"
 
 #: src\templates\statistics.phtml:27
@@ -250,15 +253,11 @@ msgid "Servers"
 msgstr "Serveurs"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -278,9 +277,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "Parmi <strong>%s</strong> serveurs mentionnant leur version il y a:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -291,18 +288,70 @@ msgstr "<strong>%sserveurs disponibles(%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Friendica Annuaire version %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Code source sur GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/gd/LC_MESSAGES/strings.po

@@ -0,0 +1,369 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: GunChleoc, 2021\n"
+"Language-Team: Gaelic, Scottish (https://www.transifex.com/Friendica/teams/12172/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
+"Language: gd\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
+"X-Generator: Poedit 2.2\n"
+
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
+msgid "Previous"
+msgstr "Air ais"
+
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
+msgid "Next"
+msgstr "Air adhart"
+
+#: src\classes\Content\Pager.php:211
+msgid "First"
+msgstr "Toiseach"
+
+#: src\classes\Content\Pager.php:278
+msgid "Last"
+msgstr "Deireadh"
+
+#: src\classes\Controllers\Web\Directory.php:85
+msgid "People"
+msgstr "Daoine"
+
+#: src\classes\Controllers\Web\Search.php:72
+msgctxt "field"
+msgid "Language"
+msgstr "Cànan"
+
+#: src\classes\Controllers\Web\Search.php:73
+msgctxt "field"
+msgid "Locality"
+msgstr "Ionad"
+
+#: src\classes\Controllers\Web\Search.php:74
+msgctxt "field"
+msgid "Region"
+msgstr "Sgìre"
+
+#: src\classes\Controllers\Web\Search.php:75
+msgctxt "field"
+msgid "Country"
+msgstr "Dùthaich"
+
+#: src\classes\Controllers\Web\Servers.php:105
+msgid "Public Servers"
+msgstr "Frithealaichean poblach"
+
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
+msgid "Friendica Directory"
+msgstr "Eòlaire Friendica"
+
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
+msgid "Search terms"
+msgstr "Faclan-luirg"
+
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:11
+msgctxt "noun"
+msgid "Search"
+msgstr "Lorg"
+
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
+#: src\templates\search.phtml:14
+msgctxt "verb"
+msgid "Search"
+msgstr "Lorg"
+
+#: src\templates\layout.phtml:33
+msgid "Toggle navigation"
+msgstr "Toglaich an t-seòladaireachd"
+
+#: src\templates\layout.phtml:55
+msgid "Directory"
+msgstr "Eòlaire"
+
+#: src\templates\layout.phtml:60
+msgid "Public servers"
+msgstr "Frithealaichean poblach"
+
+#: src\templates\search.phtml:19
+msgid "%d result for \"%s\""
+msgid_plural "%d results for \"%s\""
+msgstr[0] "%d toradh airson “%s”"
+msgstr[1] "%d thoradh airson “%s”"
+msgstr[2] "%d thoraidhean airson “%s”"
+msgstr[3] "%d toradh airson “%s”"
+
+#: src\templates\servers.phtml:7
+msgid "Top servers pagination"
+msgstr "Duilleagachadh fhrithealaichean aig a’ bhàrr"
+
+#: src\templates\servers.phtml:17
+msgid "Bottom servers pagination"
+msgstr "Duilleagachadh fhrithealaichean aig a’ bhonn"
+
+#: src\templates\sub\profile.phtml:5
+msgid "Filter by locality"
+msgstr "Criathraich a-rèir ionaid"
+
+#: src\templates\sub\profile.phtml:11
+msgid "Filter by region"
+msgstr "Criathraich a-rèir sgìre"
+
+#: src\templates\sub\profile.phtml:17
+msgid "Filter by country"
+msgstr "Criathraich a-rèir dùthcha"
+
+#: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
+msgctxt "verb"
+msgid "Follow"
+msgstr "Lean air"
+
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
+msgid "Language"
+msgstr "Cànan"
+
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
+msgid "Filter by language"
+msgstr "Criathraich a-rèir cànain"
+
+#: src\templates\sub\profile.phtml:66
+msgid "Location"
+msgstr "Ionad"
+
+#: src\templates\sub\profile.phtml:79
+msgid "Search Tag"
+msgstr "Taga luirg"
+
+#: src\templates\sub\profiles.phtml:1
+msgid "Account type tabs"
+msgstr "Tabaichean seòrsa a’ chunntais"
+
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
+msgid "Top %s pagination"
+msgstr "Duilleagachadh %s aig a’ bhàrr"
+
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
+msgid "Bottom %s pagination"
+msgstr "Duilleagachadh %s aig a’ bhonn"
+
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
+msgid "Stable Version"
+msgstr "Tionndadh seasmhach"
+
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
+msgid "Develop Version"
+msgstr "Tionndadh leasachaidh"
+
+#: src\templates\sub\server.phtml:19
+msgid "Outdated Version"
+msgstr "Seann-tionndadh"
+
+#: src\templates\sub\server.phtml:69
+msgid "Admin"
+msgstr "Rianaire"
+
+#: src\templates\sub\server.phtml:76
+msgid "No description provided"
+msgstr "Cha deach tuairisgeul a sholarachadh"
+
+#: src\templates\sub\server.phtml:79
+msgid "Visit Server"
+msgstr "Tadhail air frithealaiche"
+
+#: src\templates\widget\popularcountries.phtml:2
+msgid "Popular Countries"
+msgstr "Dùthchannan fèillmhor"
+
+#: src\templates\widget\popularprofilelanguages.phtml:2
+msgid "Popular Languages"
+msgstr "Cànanan fèillmhor"
+
+#: src\templates\widget\populartags.phtml:2
+msgid "Popular Tags"
+msgstr "Tagaichean fèillmhor"
+
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
+msgid "Default Language"
+msgstr "An cànan tùsail"
+
+#: src\templates\sub\server.phtml:49
+msgid "Known Users"
+msgstr "Cleachdaichean as aithne"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:48
+msgctxt "account-type"
+msgid "All"
+msgstr "Na h-uile"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:56
+msgctxt "account-type"
+msgid "People (%d)"
+msgid_plural "People (%d)"
+msgstr[0] "Daoine (%d)"
+msgstr[1] "Daoine (%d)"
+msgstr[2] "Daoine (%d)"
+msgstr[3] "Daoine (%d)"
+
+#: src\templates\layout.phtml:97
+msgid "Stats"
+msgstr "Stadastaireachd"
+
+#: src\templates\statistics.phtml:4
+msgid "Directory statistics"
+msgstr "Staitistearachd an eòlaire"
+
+#: src\templates\statistics.phtml:5
+msgid "Profiles"
+msgstr "Pròifilean"
+
+#: src\templates\statistics.phtml:6
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Fhuair an t-eòlaire lorg air <strong>%s URL gu pròifilean fa leth</strong>."
+
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
+msgid "Languages"
+msgstr "Cànanan"
+
+#: src\templates\statistics.phtml:17
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "Am measg <strong>%s</strong> pròifil a dh’innseas an cànan, tha:"
+
+#: src\templates\statistics.phtml:27
+msgid "Servers"
+msgstr "Frithealaichean"
+
+#: src\templates\statistics.phtml:28
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Fhuair an t-eòlaire lorg air <strong>%s URL gu frithealaichean fa leth</strong>."
+
+#: src\templates\statistics.phtml:29
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Tha <strong>%s àrainn (%s)</strong> ’nam measg a tha ’nam frithealaichean Friendica no a bha uair."
+
+#: src\templates\statistics.phtml:33
+msgid "Out of those, there are:"
+msgstr "Am measg an fheadhainn sin, tha:"
+
+#: src\templates\statistics.phtml:47
+msgid "Out of <strong>%s</strong> servers reporting their language there are:"
+msgstr "Am measg <strong>%s</strong> frithealaiche a dh’innseas an cànan, tha:"
+
+#: src\templates\statistics.phtml:57
+msgid "Versions"
+msgstr "Tionndaidhean"
+
+#: src\templates\statistics.phtml:58
+msgid "Out of <strong>%s</strong> servers reporting their version there are:"
+msgstr "Am measg <strong>%s</strong> frithealaiche a dh’innseas an tionndadh, tha:"
+
+#: src\templates\statistics.phtml:7
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Am measg an fhadhainn sin, tha <strong>%s pròifil (%s)</strong> a tha ag aontachadh ri gabhail a-steach dhan eòlaire poblach no a dh’aontaich ris uair."
+
+#: src\templates\statistics.phtml:35
+msgid "<strong>%s available servers (%s)</strong>"
+msgstr "<strong>%s frithealaiche ri fhaighinn (%s)</strong>"
+
+#: src\templates\layout.phtml:91
+msgid "Friendica Directory version %s"
+msgstr "Eòlaire Friendica tionndadh %s"
+
+#: src\templates\statistics.phtml:11
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Am measg an fheadhainn sin, tha <strong>%s pròifilean rim faighinn (%s)</strong>. <a href=\"%s\">Nach doir thu sùil orra?</a>"
+
+#: src\templates\statistics.phtml:39
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "Tha <strong>%s frithealaichean poblach (%s)</strong> fosgailte airson clàradh. <a href=\"%s\">Nach doir thu sùil orra?</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "Naidheachdan (%d)"
+msgstr[1] "Naidheachdan (%d)"
+msgstr[2] "Naidheachdan (%d)"
+msgstr[3] "Naidheachdan (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "Buidhnean (%d)"
+msgstr[1] "Buidhnean (%d)"
+msgstr[2] "Buidhnean (%d)"
+msgstr[3] "Buidhnean (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr "Sgòr slàinte"
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "%s chleachdaiche"
+msgstr[1] "%s chleachdaiche"
+msgstr[2] "%s cleachdaichean"
+msgstr[3] "%s cleachdaiche"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "Chan eil gin"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "Poileasaidh clàraidh"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "Le aontachadh"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "Fosgailte"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
+msgstr ""

src/lang/hu/LC_MESSAGES/strings.po

@@ -0,0 +1,357 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Balázs Úr, 2021\n"
+"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2\n"
+
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
+msgid "Previous"
+msgstr "Előző"
+
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
+msgid "Next"
+msgstr "Következő"
+
+#: src\classes\Content\Pager.php:211
+msgid "First"
+msgstr "Első"
+
+#: src\classes\Content\Pager.php:278
+msgid "Last"
+msgstr "Utolsó"
+
+#: src\classes\Controllers\Web\Directory.php:85
+msgid "People"
+msgstr "Emberek"
+
+#: src\classes\Controllers\Web\Search.php:72
+msgctxt "field"
+msgid "Language"
+msgstr "Nyelv"
+
+#: src\classes\Controllers\Web\Search.php:73
+msgctxt "field"
+msgid "Locality"
+msgstr "Helység"
+
+#: src\classes\Controllers\Web\Search.php:74
+msgctxt "field"
+msgid "Region"
+msgstr "Régió"
+
+#: src\classes\Controllers\Web\Search.php:75
+msgctxt "field"
+msgid "Country"
+msgstr "Ország"
+
+#: src\classes\Controllers\Web\Servers.php:105
+msgid "Public Servers"
+msgstr "Nyilvános kiszolgálók"
+
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
+msgid "Friendica Directory"
+msgstr "Friendica könyvtár"
+
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
+msgid "Search terms"
+msgstr "Kifejezések keresése"
+
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:11
+msgctxt "noun"
+msgid "Search"
+msgstr "Keresés"
+
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
+#: src\templates\search.phtml:14
+msgctxt "verb"
+msgid "Search"
+msgstr "Keresés"
+
+#: src\templates\layout.phtml:33
+msgid "Toggle navigation"
+msgstr "Navigáció ki- és bekapcsolása"
+
+#: src\templates\layout.phtml:55
+msgid "Directory"
+msgstr "Könyvtár"
+
+#: src\templates\layout.phtml:60
+msgid "Public servers"
+msgstr "Nyilvános kiszolgálók"
+
+#: src\templates\search.phtml:19
+msgid "%d result for \"%s\""
+msgid_plural "%d results for \"%s\""
+msgstr[0] "%d találat erre: „%s”"
+msgstr[1] "%d találat erre: „%s”"
+
+#: src\templates\servers.phtml:7
+msgid "Top servers pagination"
+msgstr "Kiszolgálók lapszámozása felül"
+
+#: src\templates\servers.phtml:17
+msgid "Bottom servers pagination"
+msgstr "Kiszolgálók lapszámozása alul"
+
+#: src\templates\sub\profile.phtml:5
+msgid "Filter by locality"
+msgstr "Szűrés helység szerint"
+
+#: src\templates\sub\profile.phtml:11
+msgid "Filter by region"
+msgstr "Szűrés régió szerint"
+
+#: src\templates\sub\profile.phtml:17
+msgid "Filter by country"
+msgstr "Szűrés ország szerint"
+
+#: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
+msgctxt "verb"
+msgid "Follow"
+msgstr "Követés"
+
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
+msgid "Language"
+msgstr "Nyelv"
+
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
+msgid "Filter by language"
+msgstr "Szűrés nyelv szerint"
+
+#: src\templates\sub\profile.phtml:66
+msgid "Location"
+msgstr "Hely"
+
+#: src\templates\sub\profile.phtml:79
+msgid "Search Tag"
+msgstr "Címke keresése"
+
+#: src\templates\sub\profiles.phtml:1
+msgid "Account type tabs"
+msgstr "Fióktípus lapok"
+
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
+msgid "Top %s pagination"
+msgstr "%s lapszámozása felül"
+
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
+msgid "Bottom %s pagination"
+msgstr "%s lapszámozása alul"
+
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
+msgid "Stable Version"
+msgstr "Stabil verzió"
+
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
+msgid "Develop Version"
+msgstr "Fejlesztői verzió"
+
+#: src\templates\sub\server.phtml:19
+msgid "Outdated Version"
+msgstr "Elavult verzió"
+
+#: src\templates\sub\server.phtml:69
+msgid "Admin"
+msgstr "Adminisztrátor"
+
+#: src\templates\sub\server.phtml:76
+msgid "No description provided"
+msgstr "Nincs leírás megadva"
+
+#: src\templates\sub\server.phtml:79
+msgid "Visit Server"
+msgstr "Kiszolgáló meglátogatása"
+
+#: src\templates\widget\popularcountries.phtml:2
+msgid "Popular Countries"
+msgstr "Népszerű országok"
+
+#: src\templates\widget\popularprofilelanguages.phtml:2
+msgid "Popular Languages"
+msgstr "Népszerű nyelvek"
+
+#: src\templates\widget\populartags.phtml:2
+msgid "Popular Tags"
+msgstr "Népszerű címkék"
+
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
+msgid "Default Language"
+msgstr "Alapértelmezett nyelv"
+
+#: src\templates\sub\server.phtml:49
+msgid "Known Users"
+msgstr "Ismert felhasználók"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:48
+msgctxt "account-type"
+msgid "All"
+msgstr "Összes"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:56
+msgctxt "account-type"
+msgid "People (%d)"
+msgid_plural "People (%d)"
+msgstr[0] "Emberek (%d)"
+msgstr[1] "Emberek (%d)"
+
+#: src\templates\layout.phtml:97
+msgid "Stats"
+msgstr "Statisztikák"
+
+#: src\templates\statistics.phtml:4
+msgid "Directory statistics"
+msgstr "Könyvtárstatisztikák"
+
+#: src\templates\statistics.phtml:5
+msgid "Profiles"
+msgstr "Profilok"
+
+#: src\templates\statistics.phtml:6
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Ez a könyvtár körülbelül <strong>%s különböző lehetséges profil URL-t</strong> ismer."
+
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
+msgid "Languages"
+msgstr "Nyelvek"
+
+#: src\templates\statistics.phtml:17
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr "A nyelvüket jelentő <strong>%s</strong> profil közül ezek az alábbiak:"
+
+#: src\templates\statistics.phtml:27
+msgid "Servers"
+msgstr "Kiszolgálók"
+
+#: src\templates\statistics.phtml:28
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Ez a könyvtár körülbelül <strong>%s különböző lehetséges kiszolgáló URL-t</strong> ismer."
+
+#: src\templates\statistics.phtml:29
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Ezek közül <strong>%s tartomány (%s)</strong> van, amelyek legalább egyszer Friendica kiszolgálók voltak."
+
+#: src\templates\statistics.phtml:33
+msgid "Out of those, there are:"
+msgstr "Ezek közül ezek az alábbiak:"
+
+#: src\templates\statistics.phtml:47
+msgid "Out of <strong>%s</strong> servers reporting their language there are:"
+msgstr "A nyelvüket jelentő <strong>%s</strong> kiszolgáló közül ezek az alábbiak:"
+
+#: src\templates\statistics.phtml:57
+msgid "Versions"
+msgstr "Verziók"
+
+#: src\templates\statistics.phtml:58
+msgid "Out of <strong>%s</strong> servers reporting their version there are:"
+msgstr "A verziójukat jelentő <strong>%s</strong> kiszolgáló közül ezek az alábbiak:"
+
+#: src\templates\statistics.phtml:7
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Ezek közül <strong>%s profil (%s)</strong> van, amelyek legalább egyszer beléptek a nyilvános könyvtárba."
+
+#: src\templates\statistics.phtml:35
+msgid "<strong>%s available servers (%s)</strong>"
+msgstr "<strong>%s elérhető kiszolgáló (%s)</strong>"
+
+#: src\templates\layout.phtml:91
+msgid "Friendica Directory version %s"
+msgstr "Friendica könyvtár verzió: %s"
+
+#: src\templates\statistics.phtml:11
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Ezek közül jelenleg <strong>%s elérhető profil (%s)</strong> van. <a href=\"%s\">Nézze meg őket!</a>"
+
+#: src\templates\statistics.phtml:39
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s nyilvános kiszolgáló (%s)</strong> jelenleg nyitott a regisztrációra. <a href=\"%s\">Nézze meg azokat!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "Hírek (%d)"
+msgstr[1] "Hírek (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "Szervezet (%d)"
+msgstr[1] "Szervezetek (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr "Egészségpont"
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "%s felhasználó"
+msgstr[1] "%s felhasználó"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "Nincs"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "Regisztrációs irányelv"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "Jóváhagyás által"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "Nyitott"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
+msgstr ""

src/lang/it/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2019\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Precedente"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Successivo"
 
@@ -33,51 +31,57 @@ msgstr "Primo"
 msgid "Last"
 msgstr "Ultimo"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Persone"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Lingua"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Località"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Regione"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Nazione"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Server Pubblici"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Directory Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Termini di ricerca"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Cerca"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] "%drisultato per \"%s\""
 msgstr[1] "%d risultati per \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Paginazione superiore server"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Paginazione inferiore server"
 
@@ -122,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filtra per nazioen"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Segui"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Lingua"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filtra per lingua"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Posizione"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Cerca Tag"
 
@@ -146,19 +154,23 @@ msgstr "Cerca Tag"
 msgid "Account type tabs"
 msgstr "Tab tipo account"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "Paginazione superiore %s"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "Paginazione inferiore %s"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Versione Stabile"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Versione di Sviluppo"
 
@@ -166,15 +178,15 @@ msgstr "Versione di Sviluppo"
 msgid "Outdated Version"
 msgstr "Versione Obsoleta"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Amministratore"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Nessuna descrizione fornita"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Visita il Server"
 
@@ -182,7 +194,7 @@ msgstr "Visita il Server"
 msgid "Popular Countries"
 msgstr "Nazioni Popolari"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Lingue Popolari"
 
@@ -190,7 +202,8 @@ msgstr "Lingue Popolari"
 msgid "Popular Tags"
 msgstr "Tag Popolari"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Lingua di Default"
 
@@ -210,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] "Persona (%d)"
 msgstr[1] "Persone (%d)"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Forum (%d)"
-msgstr[1] "Forum (%d)"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "Statistiche"
@@ -230,20 +236,16 @@ msgid "Profiles"
 msgstr "Profili"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
-msgstr ""
-"Questa directory conosce <strong> %s distinti URL profili "
-"potenziali</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Questa directory conosce <strong> %s distinti URL profili potenziali</strong>."
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Lingue"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "Di <strong>%s</strong> profili che riportano la loro lingua, ci sono:"
 
 #: src\templates\statistics.phtml:27
@@ -251,20 +253,12 @@ msgid "Servers"
 msgstr "Server"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"Questa directory conosce <strong>%s distinti URL di server "
-"potenziali</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Questa directory conosce <strong>%s distinti URL di server potenziali</strong>."
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"Di questi, ci sono <strong>%s domini (%s)</strong> che sono stati un server "
-"Friendica almeno una volta."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Di questi, ci sono <strong>%s domini (%s)</strong> che sono stati un server Friendica almeno una volta."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -280,16 +274,11 @@ msgstr "Versioni"
 
 #: src\templates\statistics.phtml:58
 msgid "Out of <strong>%s</strong> servers reporting their version there are:"
-msgstr ""
-"Di <strong>%s</strong> server che riportano la loro versione, ci sono:"
+msgstr "Di <strong>%s</strong> server che riportano la loro versione, ci sono:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"Di questi, ci sono <strong>%s profili (%s</strong> che hanno deciso di venir"
-" pubblicati nella directory pubblica almeno una volta."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Di questi, ci sono <strong>%s profili (%s</strong> che hanno deciso di venir pubblicati nella directory pubblica almeno una volta."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -299,18 +288,70 @@ msgstr "<strong>%s server disponibili (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Friendica Directory versione %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Codice Sorgente su GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
-msgstr ""
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Di questi, ci sono <strong>%s profili disponibili (%s)</strong>. <a href=\"%s\">Dacci un'occhiata!</a>"
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s server pubblici (%s)</strong> attualmente con registrazione libera. <a href=\"%s\">Dacci un'occhiata!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/ja/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# ozero dien <rgfx0020+misc@gmail.com>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: ozero dien <rgfx0020+misc@gmail.com>, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/Friendica/teams/12172/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "前"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "次"
 
@@ -33,51 +31,57 @@ msgstr "最初"
 msgid "Last"
 msgstr "最終"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "人"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "言語"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "局所性"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "地域"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "国"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "パブリックサーバー"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendicaディレクトリ"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "検索ワード"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "サーチ"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -100,11 +104,11 @@ msgid "%d result for \"%s\""
 msgid_plural "%d results for \"%s\""
 msgstr[0] " \"%s\" : %d 件の結果"
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "トップサーバーのページネーション"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "下部サーバーのページネーション"
 
@@ -121,23 +125,27 @@ msgid "Filter by country"
 msgstr "国で絞り込む"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "フォロー"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "言語"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "言語でフィルター"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "ロケーション"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "検索タグ"
 
@@ -145,19 +153,23 @@ msgstr "検索タグ"
 msgid "Account type tabs"
 msgstr "アカウントタイプタブ"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "トップ %s のページネーション"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "下位 %s のページネーション"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "安定版"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "バージョンを開発"
 
@@ -165,15 +177,15 @@ msgstr "バージョンを開発"
 msgid "Outdated Version"
 msgstr "古いバージョン"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "管理者"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "説明なし"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "サーバーにアクセス"
 
@@ -181,7 +193,7 @@ msgstr "サーバーにアクセス"
 msgid "Popular Countries"
 msgstr "人気の国"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "人気のある言語"
 
@@ -189,7 +201,8 @@ msgstr "人気のある言語"
 msgid "Popular Tags"
 msgstr "人気のタグ"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "既定の言語"
 
@@ -208,12 +221,6 @@ msgid "People (%d)"
 msgid_plural "People (%d)"
 msgstr[0] "個人（ %d ）"
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "フォーラム（ %d ）"
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr "統計"
@@ -227,18 +234,16 @@ msgid "Profiles"
 msgstr "プロフィール"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr "このディレクトリは、<strong> %s の異なる潜在的なプロファイルURL </strong>を認識しています。"
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "言語"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "<strong> %s </strong>の言語を報告するプロフィールには、次のものがあります。"
 
 #: src\templates\statistics.phtml:27
@@ -246,17 +251,12 @@ msgid "Servers"
 msgstr "サーバー"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr "このディレクトリは、<strong> %s の異なる潜在的なサーバーURL </strong>を認識しています。"
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"それらのうち、少なくとも一度はFriendicaサーバーであった<strong> %s のドメイン（ %s ）</strong>があります。"
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "それらのうち、少なくとも一度はFriendicaサーバーであった<strong> %s のドメイン（ %s ）</strong>があります。"
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -275,11 +275,8 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "バージョンを報告している<strong> %s </strong>のサーバーのうち、次のものがあります。"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"これらのうち、<strong> %s のプロファイル（ %s ）</strong>があり、パブリックディレクトリで少なくとも1回選択しました。"
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "これらのうち、<strong> %s のプロファイル（ %s ）</strong>があり、パブリックディレクトリで少なくとも1回選択しました。"
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -289,18 +286,66 @@ msgstr "<strong> %s のサーバが利用可能（ %s ）</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Friendica Directory バージョン %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "GitHubのソースコード"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/nl/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Jeroen De Meerleer <me@jeroened.be>, 2018
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Vorige"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Volgende"
 
@@ -33,51 +31,57 @@ msgstr "Eerste"
 msgid "Last"
 msgstr "Laatste"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Mensen"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Taal"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Stad"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Regio"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Land"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Publieke servers"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica gids"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Zoektermen"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Zoeken"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\""
 msgstr[0] "%d resultaten voor \"%s\""
 msgstr[1] "%d resultaten voor \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr "Server pagina boven"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr "Server paginatie beneden"
 
@@ -122,23 +126,27 @@ msgid "Filter by country"
 msgstr "Filter op land"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Volg"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Taal"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filter op taal"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Locatie"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "Zoekwoord"
 
@@ -146,19 +154,23 @@ msgstr "Zoekwoord"
 msgid "Account type tabs"
 msgstr "Accounttype tabs"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr "%s paginatie boven"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr "%s paginatie beneden"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Stabiele versie"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "Ontwikkelingsversie"
 
@@ -166,15 +178,15 @@ msgstr "Ontwikkelingsversie"
 msgid "Outdated Version"
 msgstr "Oude versie"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "Administrator"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Geen omschrijving toegevoegd"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Bezoek server"
 
@@ -182,7 +194,7 @@ msgstr "Bezoek server"
 msgid "Popular Countries"
 msgstr "Populaire landen"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Populaire talen"
 
@@ -190,7 +202,8 @@ msgstr "Populaire talen"
 msgid "Popular Tags"
 msgstr "Populaire tags"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "Standaard taal"
 
@@ -210,13 +223,6 @@ msgid_plural "People (%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr ""
@@ -230,18 +236,16 @@ msgid "Profiles"
 msgstr ""
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr ""
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:27
@@ -249,15 +253,11 @@ msgid "Servers"
 msgstr ""
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -277,9 +277,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -290,18 +288,70 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr ""
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr ""
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/pl/LC_MESSAGES/strings.po

@@ -1,84 +1,87 @@
-# 
-# Translators:
-# Karol Kosek, 2018
-# Waldemar Stoczkowski, 2018
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
-msgstr "Poprzedni"
+msgstr "Poprzednia"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
-msgstr "Następny"
+msgstr "Następna"
 
 #: src\classes\Content\Pager.php:211
 msgid "First"
-msgstr "Pierwszy"
+msgstr "Pierwsza"
 
 #: src\classes\Content\Pager.php:278
 msgid "Last"
-msgstr "Ostatni"
+msgstr "Ostatnia"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
-msgstr "Przyjaciele"
+msgstr "Ludzie"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Język"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Miejscowość"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Region"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Kraj"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Serwery publiczne"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Katalog Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
-msgstr "Wyszukiwane hasła"
+msgstr "Wyszukiwanie hasła"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Szukaj"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -90,7 +93,7 @@ msgstr "Przełącz nawigację"
 
 #: src\templates\layout.phtml:55
 msgid "Directory"
-msgstr "Katalogi"
+msgstr "Katalog"
 
 #: src\templates\layout.phtml:60
 msgid "Public servers"
@@ -104,17 +107,17 @@ msgstr[1] "%d wyniki dla \"%s\""
 msgstr[2] "%d wyników dla \"%s\""
 msgstr[3] "%d wyników dla \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
-msgstr "Topowa paginacja serwerów"
+msgstr "Górna paginacja serwerów"
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
-msgstr "Dolny podział na serwery"
+msgstr "Dolna paginacja serwerów"
 
 #: src\templates\sub\profile.phtml:5
 msgid "Filter by locality"
-msgstr "Filtruj według lokalizacji"
+msgstr "Filtruj według położenia"
 
 #: src\templates\sub\profile.phtml:11
 msgid "Filter by region"
@@ -125,59 +128,67 @@ msgid "Filter by country"
 msgstr "Filtruj według kraju"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
-msgstr "Śledzenie"
+msgstr "Obserwuj"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Język"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Filtruj według języka"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
-msgstr "Lokalizacja"
+msgstr "Położenie"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
-msgstr "Wyszukaj tag"
+msgstr "Wyszukaj znacznik"
 
 #: src\templates\sub\profiles.phtml:1
 msgid "Account type tabs"
-msgstr "Konta typu karty"
+msgstr "Karty rodzajów kont"
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
-msgstr "Górna %s paginacja"
+msgstr "Górna paginacja %s"
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
-msgstr "Dolna %s paginacja"
+msgstr "Dolna paginacja %s"
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "Wersja stabilna"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
-msgstr "Rozwój wersji"
+msgstr "Wersja rozwojowa"
 
 #: src\templates\sub\server.phtml:19
 msgid "Outdated Version"
 msgstr "Przestarzała wersja"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrator"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "Nie podano opisu"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "Odwiedź serwer"
 
@@ -185,17 +196,18 @@ msgstr "Odwiedź serwer"
 msgid "Popular Countries"
 msgstr "Popularne kraje"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "Popularne języki"
 
 #: src\templates\widget\populartags.phtml:2
 msgid "Popular Tags"
-msgstr "Popularne tagi"
+msgstr "Popularne znaczniki"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
-msgstr "Domyślny Język"
+msgstr "Domyślny język"
 
 #: src\templates\sub\server.phtml:49
 msgid "Known Users"
@@ -210,19 +222,10 @@ msgstr "Wszystko"
 msgctxt "account-type"
 msgid "People (%d)"
 msgid_plural "People (%d)"
-msgstr[0] "(%d) Osoba"
-msgstr[1] " (%d) Osoby"
-msgstr[2] "(%d) Osób"
-msgstr[3] "(%d) Osób"
-
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] "Forum (%d)"
-msgstr[1] "Fora (%d)"
-msgstr[2] "Forum (%d)"
-msgstr[3] "Forów (%d)"
+msgstr[0] "Osoba (%d)"
+msgstr[1] "Osoby (%d)"
+msgstr[2] "Osób (%d)"
+msgstr[3] "Osób (%d)"
 
 #: src\templates\layout.phtml:97
 msgid "Stats"
@@ -237,19 +240,16 @@ msgid "Profiles"
 msgstr "Profile"
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
-msgstr ""
-"Ten katalog zna <strong>%s różne adresy URL potencjalnych adresów</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr "Ten katalog zna <strong>%s różne adresy URL potencjalnych profilów</strong>."
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "Języki"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr "Poza <strong>%s</strong> profilami zgłaszającymi swój język są:"
 
 #: src\templates\statistics.phtml:27
@@ -257,20 +257,12 @@ msgid "Servers"
 msgstr "Serwery"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
-msgstr ""
-"Ten katalog wie o <strong>%s różnych potencjalnych adresach URL "
-"serwera</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr "Ten katalog wie o <strong>%s różnych potencjalnych adresach URL serwera</strong>."
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
-msgstr ""
-"Spośród nich są <strong>%s domeny (%s)</strong> które były serwerem "
-"Friendica co najmniej raz."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr "Spośród nich są <strong>%s domeny (%s)</strong>, które były serwerem Friendica co najmniej raz."
 
 #: src\templates\statistics.phtml:33
 msgid "Out of those, there are:"
@@ -289,12 +281,8 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr "Poza <strong>%s</strong> serwerami raportującymi ich wersję są:"
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
-msgstr ""
-"Spośród nich są <strong>%s profile (%s)</strong> które wybrały katalog "
-"publiczny co najmniej raz."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr "Spośród nich są <strong>%s profile (%s)</strong> które wybrały katalog publiczny co najmniej raz."
 
 #: src\templates\statistics.phtml:35
 msgid "<strong>%s available servers (%s)</strong>"
@@ -304,18 +292,78 @@ msgstr "<strong>%s dostępne serwery (%s)</strong>"
 msgid "Friendica Directory version %s"
 msgstr "Katalog Friendica wersja %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "Kod źródłowy na GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
-msgstr ""
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr "Spośród nich obecnie są <strong>%s dostępne profile (%s)</strong>. <a href=\"%s\">Sprawdź je!</a>"
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr "<strong>%s serwery publiczne (%s)</strong> obecnie otwarte do rejestracji. <a href=\"%s\">Sprawdź je!</a>"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "Wiadomość (%d)"
+msgstr[1] "Wiadomości (%d)"
+msgstr[2] "Wiadomości (%d)"
+msgstr[3] "Wiadomości (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "Organizacja (%d)"
+msgstr[1] "Organizacje (%d)"
+msgstr[2] "Organizacji (%d)"
+msgstr[3] "Organizacji (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr "Ocena zdrowia"
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "%s użytkownik"
+msgstr[1] "%s użytkowników"
+msgstr[2] "%s użytkowników"
+msgstr[3] "%s użytkowników"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "Brak"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "Polityka rejestracji"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "Przez zatwierdzenie"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "Otwarta"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/ru/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "Назад"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "Вперёд"
 
@@ -33,51 +31,57 @@ msgstr "Начало"
 msgid "Last"
 msgstr "Конец"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "Люди"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "Язык"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "Область"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "Регион"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "Страна"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "Публичные серверы"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Каталог Friendica"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "Искать записи"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "Искать"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -103,11 +107,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
@@ -124,23 +128,27 @@ msgid "Filter by country"
 msgstr "Фильтр по стране"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "Подписаться"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "Язык"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "Фильтр по языку"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "Расположение"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr ""
 
@@ -148,19 +156,23 @@ msgstr ""
 msgid "Account type tabs"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr ""
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr ""
 
@@ -168,15 +180,15 @@ msgstr ""
 msgid "Outdated Version"
 msgstr ""
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr ""
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr ""
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr ""
 
@@ -184,7 +196,7 @@ msgstr ""
 msgid "Popular Countries"
 msgstr ""
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr ""
 
@@ -192,7 +204,8 @@ msgstr ""
 msgid "Popular Tags"
 msgstr ""
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr ""
 
@@ -214,15 +227,6 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr ""
@@ -236,18 +240,16 @@ msgid "Profiles"
 msgstr ""
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr ""
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:27
@@ -255,15 +257,11 @@ msgid "Servers"
 msgstr ""
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -283,9 +281,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -296,18 +292,78 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr ""
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr ""
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/sv/LC_MESSAGES/strings.po

@@ -0,0 +1,357 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
+"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2\n"
+
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
+msgid "Previous"
+msgstr "Föregående"
+
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
+msgid "Next"
+msgstr "Nästa"
+
+#: src\classes\Content\Pager.php:211
+msgid "First"
+msgstr "Första"
+
+#: src\classes\Content\Pager.php:278
+msgid "Last"
+msgstr "Sista"
+
+#: src\classes\Controllers\Web\Directory.php:85
+msgid "People"
+msgstr "Personer"
+
+#: src\classes\Controllers\Web\Search.php:72
+msgctxt "field"
+msgid "Language"
+msgstr "Språk"
+
+#: src\classes\Controllers\Web\Search.php:73
+msgctxt "field"
+msgid "Locality"
+msgstr ""
+
+#: src\classes\Controllers\Web\Search.php:74
+msgctxt "field"
+msgid "Region"
+msgstr "Region"
+
+#: src\classes\Controllers\Web\Search.php:75
+msgctxt "field"
+msgid "Country"
+msgstr "Land"
+
+#: src\classes\Controllers\Web\Servers.php:105
+msgid "Public Servers"
+msgstr "Publika servrar"
+
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
+msgid "Friendica Directory"
+msgstr "Friendica-mapp"
+
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
+msgid "Search terms"
+msgstr ""
+
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:11
+msgctxt "noun"
+msgid "Search"
+msgstr "Sök"
+
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
+#: src\templates\search.phtml:14
+msgctxt "verb"
+msgid "Search"
+msgstr "Sök"
+
+#: src\templates\layout.phtml:33
+msgid "Toggle navigation"
+msgstr "Växla navigering"
+
+#: src\templates\layout.phtml:55
+msgid "Directory"
+msgstr "Mapp"
+
+#: src\templates\layout.phtml:60
+msgid "Public servers"
+msgstr "Publika servrar"
+
+#: src\templates\search.phtml:19
+msgid "%d result for \"%s\""
+msgid_plural "%d results for \"%s\""
+msgstr[0] "%d resultat för \"%s\""
+msgstr[1] "%d resultat för \"%s\""
+
+#: src\templates\servers.phtml:7
+msgid "Top servers pagination"
+msgstr ""
+
+#: src\templates\servers.phtml:17
+msgid "Bottom servers pagination"
+msgstr ""
+
+#: src\templates\sub\profile.phtml:5
+msgid "Filter by locality"
+msgstr ""
+
+#: src\templates\sub\profile.phtml:11
+msgid "Filter by region"
+msgstr "Filtrera efter region"
+
+#: src\templates\sub\profile.phtml:17
+msgid "Filter by country"
+msgstr "Filtrera efter land"
+
+#: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
+msgctxt "verb"
+msgid "Follow"
+msgstr "Följ"
+
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
+msgid "Language"
+msgstr "Språk"
+
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
+msgid "Filter by language"
+msgstr "Filtrera efter språk"
+
+#: src\templates\sub\profile.phtml:66
+msgid "Location"
+msgstr "Plats"
+
+#: src\templates\sub\profile.phtml:79
+msgid "Search Tag"
+msgstr "Söktagg"
+
+#: src\templates\sub\profiles.phtml:1
+msgid "Account type tabs"
+msgstr ""
+
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
+msgid "Top %s pagination"
+msgstr ""
+
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
+msgid "Bottom %s pagination"
+msgstr ""
+
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
+msgid "Stable Version"
+msgstr "Stabil version"
+
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
+msgid "Develop Version"
+msgstr "Utvecklarversion"
+
+#: src\templates\sub\server.phtml:19
+msgid "Outdated Version"
+msgstr "Utdaterad version"
+
+#: src\templates\sub\server.phtml:69
+msgid "Admin"
+msgstr "Admin"
+
+#: src\templates\sub\server.phtml:76
+msgid "No description provided"
+msgstr "Ingen beskrivning tillhandahölls"
+
+#: src\templates\sub\server.phtml:79
+msgid "Visit Server"
+msgstr "Besök servern"
+
+#: src\templates\widget\popularcountries.phtml:2
+msgid "Popular Countries"
+msgstr "Populära länder"
+
+#: src\templates\widget\popularprofilelanguages.phtml:2
+msgid "Popular Languages"
+msgstr "Populära språk"
+
+#: src\templates\widget\populartags.phtml:2
+msgid "Popular Tags"
+msgstr "Populära taggar"
+
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
+msgid "Default Language"
+msgstr "Standardspråk"
+
+#: src\templates\sub\server.phtml:49
+msgid "Known Users"
+msgstr "Kända användare"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:48
+msgctxt "account-type"
+msgid "All"
+msgstr "Alla"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:56
+msgctxt "account-type"
+msgid "People (%d)"
+msgid_plural "People (%d)"
+msgstr[0] "Person (%d)"
+msgstr[1] "Personer (%d)"
+
+#: src\templates\layout.phtml:97
+msgid "Stats"
+msgstr "Statistik"
+
+#: src\templates\statistics.phtml:4
+msgid "Directory statistics"
+msgstr ""
+
+#: src\templates\statistics.phtml:5
+msgid "Profiles"
+msgstr "Profiler"
+
+#: src\templates\statistics.phtml:6
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
+msgstr ""
+
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
+msgid "Languages"
+msgstr "Språk"
+
+#: src\templates\statistics.phtml:17
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
+msgstr ""
+
+#: src\templates\statistics.phtml:27
+msgid "Servers"
+msgstr "Servrar"
+
+#: src\templates\statistics.phtml:28
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
+msgstr ""
+
+#: src\templates\statistics.phtml:29
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
+msgstr ""
+
+#: src\templates\statistics.phtml:33
+msgid "Out of those, there are:"
+msgstr "Utav dessa så finns det:"
+
+#: src\templates\statistics.phtml:47
+msgid "Out of <strong>%s</strong> servers reporting their language there are:"
+msgstr ""
+
+#: src\templates\statistics.phtml:57
+msgid "Versions"
+msgstr "Versioner"
+
+#: src\templates\statistics.phtml:58
+msgid "Out of <strong>%s</strong> servers reporting their version there are:"
+msgstr ""
+
+#: src\templates\statistics.phtml:7
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
+msgstr ""
+
+#: src\templates\statistics.phtml:35
+msgid "<strong>%s available servers (%s)</strong>"
+msgstr "<strong>%s tillgängliga servrar (%s)</strong>"
+
+#: src\templates\layout.phtml:91
+msgid "Friendica Directory version %s"
+msgstr ""
+
+#: src\templates\statistics.phtml:11
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\templates\statistics.phtml:39
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] "Nyhet (%d)"
+msgstr[1] "Nyheterna (%d)"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] "Organisation (%d)"
+msgstr[1] "Organisationer (%d)"
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] "%s Användare"
+msgstr[1] "%s Användare"
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr "Ingen"
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr "Registreringspolicy"
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr "Genom godkännande"
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr "Öppna"
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
+msgstr ""

src/lang/th/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# Andy H3 <andy@hubup.pro>, 2018
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: Andy H3 <andy@hubup.pro>, 2018\n"
 "Language-Team: Thai (Thailand) (https://www.transifex.com/Friendica/teams/12172/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -33,51 +31,57 @@ msgstr "แรก"
 msgid "Last"
 msgstr "สุดท้าย"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr "คน"
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "ภาษา"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr "สถาน"
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "แดน"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "ประเทศ"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "เซอร์เวอร์เปิด"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica ทำเนียบ"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr "ค้น หา"
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "ค้น"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -100,11 +104,11 @@ msgid "%d result for \"%s\""
 msgid_plural "%d results for \"%s\""
 msgstr[0] "%d ผลลัพธ์สำหรับ \"%s\""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
@@ -121,23 +125,27 @@ msgid "Filter by country"
 msgstr "กรองตามประเทศ"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr "ตาม"
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "ภาษา"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "กรองตามภาษา"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr "สถาน"
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "ค้นหาด้วยแท็ก"
 
@@ -145,19 +153,23 @@ msgstr "ค้นหาด้วยแท็ก"
 msgid "Account type tabs"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "เวอร์ชันเสถียร"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "เวอร์ชันพัฒนา"
 
@@ -165,15 +177,15 @@ msgstr "เวอร์ชันพัฒนา"
 msgid "Outdated Version"
 msgstr "เวอร์ชันล้าสมัย"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "ผู้ดูแลระบบ"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "ไม่มีคำอธิบาย"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "ไปที่เซิร์ฟเวอร์"
 
@@ -181,7 +193,7 @@ msgstr "ไปที่เซิร์ฟเวอร์"
 msgid "Popular Countries"
 msgstr "ประเทศยอดนิยม"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "ภาษายอดนิยม"
 
@@ -189,7 +201,8 @@ msgstr "ภาษายอดนิยม"
 msgid "Popular Tags"
 msgstr "แท็กยอดนิยม"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "ภาษาเริ่มต้น"
 
@@ -208,12 +221,6 @@ msgid "People (%d)"
 msgid_plural "People (%d)"
 msgstr[0] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr ""
@@ -227,18 +234,16 @@ msgid "Profiles"
 msgstr ""
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr ""
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:27
@@ -246,15 +251,11 @@ msgid "Servers"
 msgstr ""
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -274,9 +275,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -287,18 +286,66 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr ""
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr ""
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/lang/zh_CN/LC_MESSAGES/strings.po

@@ -1,27 +1,25 @@
-# 
-# Translators:
-# 朱陈锬 <tangenters@outlook.com>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
-"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Last-Translator: 朱陈锬 <tangenters@outlook.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n"
+"PO-Revision-Date: 2018-11-16 20:30+0000\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216
+#: src\classes\Content\Pager.php:168
+#: src\classes\Content\Pager.php:216
 msgid "Previous"
 msgstr "上一页"
 
-#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273
+#: src\classes\Content\Pager.php:173
+#: src\classes\Content\Pager.php:273
 msgid "Next"
 msgstr "下一页"
 
@@ -33,51 +31,57 @@ msgstr "第一页"
 msgid "Last"
 msgstr "最后一页"
 
-#: src\classes\Controllers\Web\Directory.php:73
+#: src\classes\Controllers\Web\Directory.php:85
 msgid "People"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:64
+#: src\classes\Controllers\Web\Search.php:72
 msgctxt "field"
 msgid "Language"
 msgstr "语言"
 
-#: src\classes\Controllers\Web\Search.php:65
+#: src\classes\Controllers\Web\Search.php:73
 msgctxt "field"
 msgid "Locality"
 msgstr ""
 
-#: src\classes\Controllers\Web\Search.php:66
+#: src\classes\Controllers\Web\Search.php:74
 msgctxt "field"
 msgid "Region"
 msgstr "地区"
 
-#: src\classes\Controllers\Web\Search.php:67
+#: src\classes\Controllers\Web\Search.php:75
 msgctxt "field"
 msgid "Country"
 msgstr "国家"
 
-#: src\classes\Controllers\Web\Servers.php:90
+#: src\classes\Controllers\Web\Servers.php:105
 msgid "Public Servers"
 msgstr "公共服务器"
 
-#: src\templates\layout.phtml:4 src\templates\layout.phtml:18
+#: src\templates\layout.phtml:4
+#: src\templates\layout.phtml:18
 msgid "Friendica Directory"
 msgstr "Friendica 目录"
 
-#: src\templates\layout.phtml:23 src\templates\layout.phtml:25
-#: src\templates\layout.phtml:43 src\templates\layout.phtml:45
-#: src\templates\search.phtml:4 src\templates\search.phtml:12
+#: src\templates\layout.phtml:23
+#: src\templates\layout.phtml:25
+#: src\templates\layout.phtml:43
+#: src\templates\layout.phtml:45
+#: src\templates\search.phtml:4
+#: src\templates\search.phtml:12
 msgid "Search terms"
 msgstr ""
 
-#: src\templates\layout.phtml:24 src\templates\layout.phtml:45
+#: src\templates\layout.phtml:24
+#: src\templates\layout.phtml:45
 #: src\templates\search.phtml:11
 msgctxt "noun"
 msgid "Search"
 msgstr "搜索"
 
-#: src\templates\layout.phtml:27 src\templates\layout.phtml:47
+#: src\templates\layout.phtml:27
+#: src\templates\layout.phtml:47
 #: src\templates\search.phtml:14
 msgctxt "verb"
 msgid "Search"
@@ -100,11 +104,11 @@ msgid "%d result for \"%s\""
 msgid_plural "%d results for \"%s\""
 msgstr[0] ""
 
-#: src\templates\servers.phtml:2
+#: src\templates\servers.phtml:7
 msgid "Top servers pagination"
 msgstr ""
 
-#: src\templates\servers.phtml:12
+#: src\templates\servers.phtml:17
 msgid "Bottom servers pagination"
 msgstr ""
 
@@ -121,23 +125,27 @@ msgid "Filter by country"
 msgstr "按国家筛选"
 
 #: src\templates\sub\profile.phtml:31
+#: src\templates\sub\profile.phtml:35
+#: src\templates\sub\profile.phtml:39
 msgctxt "verb"
 msgid "Follow"
 msgstr ""
 
-#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47
+#: src\templates\layout.phtml:65
+#: src\templates\sub\profile.phtml:57
 msgid "Language"
 msgstr "语言"
 
-#: src\templates\sub\profile.phtml:50
+#: src\templates\sub\profile.phtml:60
+#: src\templates\widget\popularserverlanguages.phtml:2
 msgid "Filter by language"
 msgstr "按语言筛选"
 
-#: src\templates\sub\profile.phtml:56
+#: src\templates\sub\profile.phtml:66
 msgid "Location"
 msgstr ""
 
-#: src\templates\sub\profile.phtml:69
+#: src\templates\sub\profile.phtml:79
 msgid "Search Tag"
 msgstr "搜索标签"
 
@@ -145,19 +153,23 @@ msgstr "搜索标签"
 msgid "Account type tabs"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7
+#: src\templates\sub\profiles.phtml:4
+#: src\templates\sub\profiles.phtml:7
 msgid "Top %s pagination"
 msgstr ""
 
-#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16
+#: src\templates\sub\profiles.phtml:13
+#: src\templates\sub\profiles.phtml:16
 msgid "Bottom %s pagination"
 msgstr ""
 
-#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15
+#: src\templates\statistics.phtml:66
+#: src\templates\sub\server.phtml:15
 msgid "Stable Version"
 msgstr "稳定版"
 
-#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17
+#: src\templates\statistics.phtml:68
+#: src\templates\sub\server.phtml:17
 msgid "Develop Version"
 msgstr "开发版"
 
@@ -165,15 +177,15 @@ msgstr "开发版"
 msgid "Outdated Version"
 msgstr "旧稳定版"
 
-#: src\templates\sub\server.phtml:55
+#: src\templates\sub\server.phtml:69
 msgid "Admin"
 msgstr "管理员"
 
-#: src\templates\sub\server.phtml:62
+#: src\templates\sub\server.phtml:76
 msgid "No description provided"
 msgstr "没有提供说明"
 
-#: src\templates\sub\server.phtml:65
+#: src\templates\sub\server.phtml:79
 msgid "Visit Server"
 msgstr "访问服务"
 
@@ -181,7 +193,7 @@ msgstr "访问服务"
 msgid "Popular Countries"
 msgstr "热门国家"
 
-#: src\templates\widget\popularlanguages.phtml:2
+#: src\templates\widget\popularprofilelanguages.phtml:2
 msgid "Popular Languages"
 msgstr "热门语言"
 
@@ -189,7 +201,8 @@ msgstr "热门语言"
 msgid "Popular Tags"
 msgstr "热门标签"
 
-#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45
+#: src\templates\sub\server.phtml:44
+#: src\templates\sub\server.phtml:45
 msgid "Default Language"
 msgstr "默认语言"
 
@@ -208,12 +221,6 @@ msgid "People (%d)"
 msgid_plural "People (%d)"
 msgstr[0] ""
 
-#: src\classes\Views\Widget\AccountTypeTabs.php:57
-msgctxt "account-type"
-msgid "Forum (%d)"
-msgid_plural "Forums (%d)"
-msgstr[0] ""
-
 #: src\templates\layout.phtml:97
 msgid "Stats"
 msgstr ""
@@ -227,18 +234,16 @@ msgid "Profiles"
 msgstr ""
 
 #: src\templates\statistics.phtml:6
-msgid ""
-"This directory knows about <strong>%s distinct potential profile "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential profile URLs</strong>."
 msgstr ""
 
-#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46
+#: src\templates\statistics.phtml:16
+#: src\templates\statistics.phtml:46
 msgid "Languages"
 msgstr "语言"
 
 #: src\templates\statistics.phtml:17
-msgid ""
-"Out of <strong>%s</strong> profiles reporting their language there are:"
+msgid "Out of <strong>%s</strong> profiles reporting their language there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:27
@@ -246,15 +251,11 @@ msgid "Servers"
 msgstr "服务器"
 
 #: src\templates\statistics.phtml:28
-msgid ""
-"This directory knows about <strong>%s distinct potential server "
-"URLs</strong>."
+msgid "This directory knows about <strong>%s distinct potential server URLs</strong>."
 msgstr ""
 
 #: src\templates\statistics.phtml:29
-msgid ""
-"Out of those, there are <strong>%s domains (%s)</strong> that have been a "
-"Friendica server at least once."
+msgid "Out of those, there are <strong>%s domains (%s)</strong> that have been a Friendica server at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:33
@@ -274,9 +275,7 @@ msgid "Out of <strong>%s</strong> servers reporting their version there are:"
 msgstr ""
 
 #: src\templates\statistics.phtml:7
-msgid ""
-"Out of those, there are <strong>%s profiles (%s)</strong> that opted in the "
-"public directory at least once."
+msgid "Out of those, there are <strong>%s profiles (%s)</strong> that opted in the public directory at least once."
 msgstr ""
 
 #: src\templates\statistics.phtml:35
@@ -287,18 +286,66 @@ msgstr ""
 msgid "Friendica Directory version %s"
 msgstr "Friendica 目录版本 %s"
 
-#: src\templates\layout.phtml:94
-msgid "Source Code on GitHub"
-msgstr "源码托管于 GitHub"
-
 #: src\templates\statistics.phtml:11
-msgid ""
-"Out of those, there currently are <strong>%s available profiles "
-"(%s)</strong>. <a href=\"%s\">Check them out!</a>"
+msgid "Out of those, there currently are <strong>%s available profiles (%s)</strong>. <a href=\"%s\">Check them out!</a>"
 msgstr ""
 
 #: src\templates\statistics.phtml:39
-msgid ""
-"<strong>%s public servers (%s)</strong> currently open for registration. <a "
-"href=\"%s\">Check them out!</a>"
+msgid "<strong>%s public servers (%s)</strong> currently open for registration. <a href=\"%s\">Check them out!</a>"
+msgstr ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:57
+msgctxt "account-type"
+msgid "News (%d)"
+msgid_plural "News (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:58
+msgctxt "account-type"
+msgid "Organization (%d)"
+msgid_plural "Organizations (%d)"
+msgstr[0] ""
+
+#: src\classes\Views\Widget\AccountTypeTabs.php:61
+msgctxt "account-type"
+msgid "Group (%d)"
+msgid_plural "Groups (%d)"
+msgstr[0] ""
+
+#: src\templates\servers.phtml:3
+msgid "Filtered by language:"
+msgstr ""
+
+#: src\templates\servers.phtml:3
+msgid "Clear language filter"
+msgstr ""
+
+#: src\templates\sub\server.phtml:40
+msgid "Health Score"
+msgstr ""
+
+#: src\templates\sub\server.phtml:52
+msgid "%s User"
+msgid_plural "%s Users"
+msgstr[0] ""
+
+#: src\templates\sub\server.phtml:54
+msgid "None"
+msgstr ""
+
+#: src\templates\sub\server.phtml:58
+#: src\templates\sub\server.phtml:62
+msgid "Registration Policy"
+msgstr ""
+
+#: src\templates\sub\server.phtml:59
+msgid "By Approval"
+msgstr ""
+
+#: src\templates\sub\server.phtml:63
+msgid "Open"
+msgstr ""
+
+#: src\templates\layout.phtml:94
+msgid "Source Code on Friendica's Forgejo"
 msgstr ""

src/routes.php

@@ -10,7 +10,7 @@ use Slim\Http\Response;
  */
 
 $app->get('/servers/surprise', \Friendica\Directory\Routes\Http\Surprise::class);
-$app->get('/servers', \Friendica\Directory\Routes\Web\Servers::class)->setName('servers');
+$app->get('/servers[/{language}]', \Friendica\Directory\Routes\Web\Servers::class)->setName('servers');
 
 $app->get('/search[/{account_type}]', function (Request $request, Response $response, $args) {
 	if ($request->getAttribute('negotiation')->getMediaType() == 'application/json') {

src/settings.php

@@ -19,7 +19,7 @@ $settings = [
 	'displayErrorDetails' => false, // set to false in production
 	'addContentLengthHeader' => false, // Allow the web server to send the content-length header
 	'i18n' => [
-		'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar'],
+		'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu', 'sv', 'da_DK'],
 		'default' => 'en_US',
 		'path' => __DIR__ . '/lang'
 	],

src/sql/migrations/down/0001.sql

@@ -0,0 +1,2 @@
+BEGIN;
+COMMIT;

src/sql/migrations/down/0005.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `server` ADD `path` varchar(190) NOT NULL DEFAULT '' AFTER `base_url`;
+COMMIT;

src/sql/migrations/down/0006.sql

@@ -0,0 +1,2 @@
+BEGIN;
+COMMIT;

src/sql/migrations/down/0007.sql

@@ -0,0 +1,4 @@
+BEGIN;
+ALTER TABLE `profile` DROP KEY `profile-ft`;
+ALTER TABLE `profile` ADD FULLTEXT KEY `profile-ft` (`name`, `pdesc`, `profile_url`, `locality`, `region`, `country`, `tags`);
+COMMIT;

src/sql/migrations/down/0008.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `server` DROP `subscribe_url`;
+COMMIT;

src/sql/migrations/down/0009.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `profile` ADD `dfrn_request` VARCHAR(250) DEFAULT NULL AFTER `profile_url`;
+COMMIT;

src/sql/migrations/up/0006.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `server` DROP COLUMN `path`;
+COMMIT;

src/sql/migrations/up/0007.sql

@@ -0,0 +1,6 @@
+BEGIN;
+CREATE TABLE temp_server_alias AS SELECT * FROM server_alias GROUP BY alias;
+DROP TABLE server_alias;
+RENAME TABLE temp_server_alias TO server_alias;
+CREATE UNIQUE INDEX server_alias_alias_uindex ON server_alias (alias);
+COMMIT;

src/sql/migrations/up/0008.sql

@@ -0,0 +1,4 @@
+BEGIN;
+ALTER TABLE `profile` DROP KEY `profile-ft`;
+ALTER TABLE `profile` ADD FULLTEXT KEY `profile-ft` (`name`, `pdesc`, `username`, `locality`, `region`, `country`, `tags`);
+COMMIT;

src/sql/migrations/up/0009.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `server` ADD `subscribe_url` VARCHAR(250) NULL AFTER `noscrape_url`;
+COMMIT;

src/sql/migrations/up/0010.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE `profile` DROP `dfrn_request`;
+COMMIT;

src/templates/layout.phtml

@@ -91,7 +91,7 @@
                 <span class="nav-link disabled"><?php echo $this->__('Friendica Directory version %s', $version)?></span>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="https://github.com/friendica/friendica-directory"><?php echo $this->__('Source Code on GitHub')?> <i class="fa fa-external-link-alt"></i></a>
+                <a class="nav-link" href="https://git.friendi.ca/friendica/friendica-directory"><?php echo $this->__("Source Code on Friendica's Forgejo")?> <i class="fa fa-external-link-alt"></i></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="<?php echo $this->escapeHtmlAttr($this->r('stats'))?>"><i class="fa fa-clipboard-list"></i> <?php echo $this->__('Stats')?></a>

src/templates/servers.phtml

@@ -1,4 +1,9 @@
-<h1><?php echo $this->e($title) ?></h1>
+<h1><?php echo $this->e($title) ?> (<?php echo $this->e($total)?>)</h1>
+<?php if ($language):?>
+	<p><?php echo $this->__('Filtered by language:')?> <span class="badge badge-secondary"><?php echo $this->e(\Friendica\Directory\Utils\L10n::localeToLanguageString($language)) ?></span> <a href="<?php echo $this->r('servers')?>"><?php echo $this->__('Clear language filter')?></a></p>
+<?php else:?>
+<?php echo $popularLanguages?>
+<?php endif;?>
 <nav aria-label="<?php echo $this->__('Top servers pagination')?>">
 	<?php echo $this->fetch('sub/pager_full.phtml', $pager) ?>
 </nav>

src/templates/statistics.phtml

@@ -65,7 +65,7 @@ use \Friendica\Directory\Utils\L10n;
             <?php if ($version['version'] == $stable_version):?>
             <span class="badge badge-success"><i class="fa fa-smile"></i> <?php echo $this->__('Stable Version')?></span>
             <?php elseif ($version['version'] == $dev_version || $version['version'] == $rc_version):?>
-            <span class="badge badge-secondary"><i class="fa fa-poo"></i> <?php echo $this->__('Develop Version')?></span>
+            <span class="badge badge-secondary"><i class="fa fa-bug"></i> <?php echo $this->__('Develop Version')?></span>
             <?php endif;?>
         </li>
 	<?php endforeach;?>

src/templates/sub/profile.phtml

@@ -26,12 +26,22 @@ if (!empty($profile['country'])) {
         </a>
         <div class="media-body">
             <h5 class="name">
-				<?php if ($profile['dfrn_request']): ?>
-                    <a href="<?php echo $this->escapeHtmlAttr($this->u($profile['dfrn_request'])); ?>" class="card-link btn btn-primary float-right">
+                <?php if ($profile['subscribe']): ?>
+                    <a href="<?php echo $this->escapeHtmlAttr($profile['subscribe']); ?>" class="card-link btn btn-primary float-right" target="_blank" rel="noopener noreferrer">
                         <i class="fa fa-external-link-alt"></i> <?php echo $this->p__('verb', 'Follow')?>
                     </a>
-				<?php endif; ?>
-				<?php echo $this->escapeHtml($profile['name']) ?>
+                <?php elseif ($profile['remote_follow']): ?>
+                    <a href="<?php echo $this->escapeHtmlAttr($this->u($profile['remote_follow'])); ?>" class="card-link btn btn-primary float-right" target="_blank" rel="noopener noreferrer">
+                        <i class="fa fa-external-link-alt"></i> <?php echo $this->p__('verb', 'Follow')?>
+                    </a>
+                <?php else: ?>
+                    <a href="<?php echo $this->escapeHtmlAttr($this->u($profile['profile_url'])); ?>" class="card-link btn btn-primary float-right" target="_blank" rel="noopener noreferrer">
+                        <i class="fa fa-external-link-alt"></i> <?php echo $this->p__('verb', 'Follow')?>
+                    </a>
+                <?php endif; ?>
+                <a href="<?php echo $this->escapeHtmlAttr($profile['profile_url']) ?>">
+                    <?php echo $this->escapeHtml($profile['name']) ?>
+                </a>
             </h5>
             <p class="url">
                 <a href="<?php echo $this->escapeHtmlAttr($this->u($profile['profile_url'])) ?>">
@@ -42,7 +52,7 @@ if (!empty($profile['country'])) {
         </div>
     </div>
     <p class="description d-md-none"><?php echo $this->escapeHtml($profile['pdesc']) ?></p>
-	<?php if ($profile['language']):?>
+    <?php if ($profile['language']):?>
     <div class="language">
         <i class="fa fa-language" alt="<?php echo $this->__('Language')?>" title="<?php echo $this->__('Language')?>"></i>
         <?php echo $this->e(Friendica\Directory\Utils\L10n::localeToLanguageString($profile['language'])) ?>
@@ -50,26 +60,26 @@ if (!empty($profile['country'])) {
             <i class="fa fa-filter" title="<?php echo $this->__('Filter by language')?>"></i>
         </a>
     </div>
-	<?php endif;?>
+    <?php endif;?>
     <div class="location">
-		<?php if (count($parts)): ?>
+        <?php if (count($parts)): ?>
             <i class="fa fa-globe" alt="<?php echo $this->__('Location')?>" title="<?php echo $this->__('Location')?>"></i>
-			<?php echo implode(', ', $parts); ?>
-		<?php endif ?>
+            <?php echo implode(', ', $parts); ?>
+        <?php endif ?>
     </div>
 
-	<?php if ($profile['tags']): ?>
+    <?php if ($profile['tags']): ?>
         <div class="tags">
-			<?php
-			$tags = array_map('trim', explode(' ', $profile['tags']));
-			foreach ($tags as $tag):?>
+            <?php
+            $tags = array_map('trim', explode(' ', $profile['tags']));
+            foreach ($tags as $tag):?>
                 <span class="badge">
                     <?php echo $this->escapeHtml($tag) ?>
                     <a href="<?php echo $this->escapeHtmlAttr($this->r('search', [], ['q' => $tag])) ?>">
                         <i class="fa fa-tag" title="<?php echo $this->__('Search Tag')?>"></i>
                     </a>
                 </span>
-			<?php endforeach; ?>
+            <?php endforeach; ?>
         </div>
-	<?php endif; ?>
+    <?php endif; ?>
 </figure>

src/templates/sub/server.phtml

@@ -14,7 +14,7 @@ if ($server['health_score'] <= 0) {
 if ($server['version'] == $stable_version) {
 	$version_badge = '<span class="badge badge-success"><i class="fa fa-smile"></i> ' . $this->__('Stable Version') . '</span>';
 } elseif ($server['version'] == $dev_version || $server['version'] == $rc_version) {
-	$version_badge = '<span class="badge badge-secondary"><i class="fa fa-poo"></i> ' . $this->__('Develop Version') . '</span>';
+	$version_badge = '<span class="badge badge-secondary"><i class="fa fa-bug"></i> ' . $this->__('Develop Version') . '</span>';
 } else {
 	$version_badge = '<span class="badge badge-warning"><i class="fa fa-frown"></i> ' . $this->__('Outdated Version') . '</span>';
 }
@@ -26,7 +26,10 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
     <div class="card mr-2 mb-2 bg-light" id="server-card-<?php echo $server['id'] ?>">
         <div class="card-body">
             <h5 class="card-title">
-				<?php echo $this->e($server['name']); ?>
+                <a href="<?php echo $this->escapeHtmlAttr($this->u($base_url)); ?>" target="_blank" title="<?php echo $this->__('Visit Server')?>">
+                    <?php echo $this->e($server['name']); ?>
+                    <i class="fa fa-external-link-alt"></i>
+                </a>
             </h5>
             <h6 class="card-subtitle mb-2 text-muted">
 				<?php if ($server['ssl_state']): ?>
@@ -37,18 +40,32 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
                 <a href="<?php echo $this->escapeHtmlAttr($this->u($base_url)); ?>"><?php echo $this->e($base_url_display); ?></a>
             </h6>
             <p class="card-text">
-                <span class="badge <?php echo $badge_class ?>">
+                <span class="badge <?php echo $badge_class ?>" title="<?php echo $this->__('Health Score')?>">
                     <i class="fa fa-heartbeat"></i> <?php echo $server['health_score'] ?>
                 </span>
             <?php if ($server['language']):?>
-                <span class="badge badge-secondary" title="<?php echo $this->__('Default Language')?>">
+                <a href="<?php echo $this->r('servers', ['language' => $server['language']])?>" class="badge badge-secondary" title="<?php echo $this->__('Default Language')?>">
                     <i class="fa fa-language" alt="<?php echo $this->__('Default Language')?>"></i>
                     <?php echo $this->e(Friendica\Directory\Utils\L10n::localeToLanguageString($server['language'])) ?>
-                </span>
+                </a>
             <?php endif;?>
-                <span class="badge badge-secondary" title="<?php echo $this->__('Known Users')?>">
-                    <i class="fa fa-user"></i> <?php echo $this->e($server['user_count'] ?: '~'); ?> Users
+	            <span class="badge badge-secondary" title="<?php echo $this->__('Known Users')?>">
+                    <i class="fa fa-user"></i>
+		        <?php if ($server['user_count']):?>
+			        <?php echo $this->n__('%s User', '%s Users', $server['user_count'])?>
+		        <?php else: ?>
+			        <?php echo $this->__('None');?>
+		        <?php endif; ?>
                 </span>
+	        <?php if ($server['reg_policy'] == 'REGISTER_APPROVE'):?>
+	            <span class="badge badge-primary" title="<?php echo $this->__('Registration Policy')?>">
+					<i class="fa fa-stamp"></i> <?php echo $this->__('By Approval')?>
+	            </span>
+			<?php else:?>
+	            <span class="badge badge-success" title="<?php echo $this->__('Registration Policy')?>">
+                    <i class="fa fa-door-open"></i> <?php echo $this->__('Open')?>
+	            </span>
+			<?php endif;?>
 				<?php echo $version_badge; ?>
             <?php if ($server['admin_profile'] && $server['admin_name']): ?>
                 <a href="<?php echo $this->escapeHtmlAttr($this->u($server['admin_profile'])); ?>" class="badge badge-primary">
@@ -61,8 +78,6 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
 			<?php else: ?>
                 <p class="card-text text-muted">&lt;<?php echo $this->__('No description provided')?>&gt;</p>
 			<?php endif; ?>
-            <a href="<?php echo $this->escapeHtmlAttr($this->u($base_url)); ?>" class="card-link btn btn-primary"><i class="fa fa-external-link-alt"></i>
-	            <?php echo $this->__('Visit Server')?></a>
         </div>
     </div>
 <?php /*

src/templates/widget/popularserverlanguages.phtml

@@ -0,0 +1,13 @@
+<div>
+    <h3><?php echo $this->__('Filter by language')?></h3>
+    <ul>
+		<?php foreach ($languages as $language): ?>
+            <li>
+                <a href="<?php echo $this->escapeHtmlAttr($this->r('servers', ['language' => $language['language']])) ?>">
+					<?php echo $this->e(Friendica\Directory\Utils\L10n::localeToLanguageString($language['language'])) ?>
+	                (<?php echo $this->e($language['total'])?>)
+                </a>
+            </li>
+		<?php endforeach; ?>
+    </ul>
+</div>