Welcome version 2025.02-dev!

# Conflicts: # CHANGELOG # VERSION # database.sql # src/App.php # view/lang/C/messages.po
2025-01-08 20:04:43 +00:00 · 2025-01-01 12:16:35 -05:00 · 2025-01-01 12:16:35 -05:00 · 8b47378720
commit 8b47378720
parent acf98cc6d4 22732678cd
52 changed files with 18753 additions and 18556 deletions
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: CC0-1.0

+# The code standard check is just triggered for PRs and pushes to non-stable branches of Friendica
+when:
+  branch:
+    exclude: [ stable ]
+  event: [ pull_request, push ]
+
 steps:
  restore_cache:
    image: meltwater/drone-cache:dev
@ -31,12 +37,19 @@ steps:
    volumes:
      - /tmp/drone-cache:/tmp/cache
  check:
-    image: friendicaci/php-cs
+    image: php:8.3
    commands:
+      - apt-get update -q
+      - DEBIAN_FRONTEND=noninteractive apt-get install -q -y git
      - if [ ! -z "$${CI_COMMIT_PULL_REQUEST}" ]; then
          git fetch --no-tags origin ${CI_COMMIT_TARGET_BRANCH};
-          export CHANGED_FILES="$(git diff --name-status $(git merge-base FETCH_HEAD origin/${CI_COMMIT_TARGET_BRANCH})..${CI_COMMIT_SHA} | grep ^A | cut -f2)";
+          CHANGED_FILES="$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base FETCH_HEAD origin/${CI_COMMIT_TARGET_BRANCH})..${CI_COMMIT_SHA})";
        else
-          export CHANGED_FILES="$(git diff --name-status ${CI_COMMIT_SHA} | grep ^A | cut -f2)";
+          CHANGED_FILES="$(git diff --name-only --diff-filter=ACMRTUXB ${CI_COMMIT_SHA})";
        fi
-      - /check-php-cs.sh
+      - if ! echo "$${CHANGED_FILES}" | grep -qE "^(\\.php-cs-fixer(\\.dist)?\\.php|composer\\.lock)$"; then
+          EXTRA_ARGS=$(printf -- '--path-mode=intersection\n--\n%s' "$${CHANGED_FILES}");
+        else
+          EXTRA_ARGS='';
+        fi
+      - ./bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer check --config=.php-cs-fixer.dist.php -v --diff --using-cache=no $${EXTRA_ARGS}
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@ -13,6 +13,12 @@ labels:
  location: friendica
  type: releaser

+# CD is triggered after pushing new code to the develop or *-rc branch, excluding the stable branch
+when:
+  repo: friendica/friendica
+  branch: [ develop, '*-rc' ]
+  event: push
+
 skip_clone: true

 steps:
@ -23,10 +29,6 @@ steps:
      - git checkout $CI_COMMIT_BRANCH
      - git fetch origin $CI_COMMIT_REF
      - git merge $CI_COMMIT_SHA
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
  restore_cache:
    image: meltwater/drone-cache:dev
    settings:
@ -38,10 +40,6 @@ steps:
        - '.composer'
    volumes:
      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
  composer_install:
    image: friendicaci/php8.2:php8.2.16
    commands:
@ -51,10 +49,6 @@ steps:
      - composer install --no-dev --optimize-autoloader
    volumes:
      - /etc/hosts:/etc/hosts
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
  create_artifacts:
    image: debian
    commands:
@ -75,10 +69,6 @@ steps:
      - ls -lh
      - cat "$ARTIFACT.sum256"
      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
  sign_artifacts:
    image: plugins/gpgsign
    settings:
@ -91,17 +81,9 @@ steps:
      exclude:
        - build/*.sum256
      detach_sign: true
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
  publish_artifacts:
    image: alpine
    commands:
      - cp -fr build/* /tmp/friendica_files/
    volumes:
      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica
-      branch: [ develop, '*-rc' ]
-      event: push
--- a/.woodpecker/.database_checks.yml
+++ b/.woodpecker/.database_checks.yml
@ -8,8 +8,9 @@ matrix:
      PHP_VERSION: 8.2.16

 when:
-  - branch:
-      exclude: [ stable ]
+  branch:
+    exclude: [ stable ]
+  event: [ pull_request, push ]

 # This forces CI executions at the "opensocial" labeled location (because of much more power...)
 labels:
--- a/.woodpecker/.license_check.yml
+++ b/.woodpecker/.license_check.yml
@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: CC0-1.0

+when:
+  branch:
+    exclude: [ stable ]
+  event: [ pull_request, push ]
+
 steps:
  check:
    image: fsfe/reuse:latest
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@ -2,6 +2,11 @@
 #
 # SPDX-License-Identifier: CC0-1.0

+when:
+  branch:
+    exclude: [ stable ]
+  event: [ pull_request, push ]
+
 steps:
  build_xgettext:
    image: friendicaci/transifex
@ -11,7 +16,3 @@ steps:
    image: friendicaci/transifex
    commands:
      - /check-messages.sh
-
-when:
-  - branch:
-      exclude: [ stable ]
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@ -19,6 +19,11 @@ matrix:
 labels:
  location: opensocial

+when:
+  branch:
+    exclude: [ stable ]
+  event: [ pull_request, push ]
+
 steps:
  php-lint:
    image: php:${PHP_MAJOR_VERSION}
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@ -13,6 +13,11 @@ labels:

 skip_clone: true

+when:
+  repo: friendica/friendica
+  branch: stable
+  event: tag
+
 steps:
  clone:
    image: alpine/git
@ -21,10 +26,7 @@ steps:
      - git checkout $CI_COMMIT_BRANCH
      - git fetch origin $CI_COMMIT_REF
      - git merge $CI_COMMIT_SHA
-    when:
-      repo: friendica/friendica
-      branch: stable
-      event: tag
+
  restore_cache:
    image: meltwater/drone-cache:dev
    settings:
@ -36,10 +38,6 @@ steps:
        - '.composer'
    volumes:
      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica
-      branch: stable
-      event: tag
  composer_install:
    image: friendicaci/php8.2:php8.2.16
    commands:
@ -47,10 +45,6 @@ steps:
      - export COMPOSER_HOME=.composer
      - composer validate
      - composer install --no-dev --optimize-autoloader
-    when:
-      repo: friendica/friendica
-      branch: stable
-      event: tag
    volumes:
      - /etc/hosts:/etc/hosts
  create_artifacts:
@ -73,10 +67,6 @@ steps:
      - ls -lh
      - cat "$ARTIFACT.sum256"
      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica
-      branch: stable
-      event: tag
  sign_artifacts:
    image: plugins/gpgsign
    settings:
@ -99,7 +89,3 @@ steps:
      - cp -fr build/* /tmp/friendica_files/
    volumes:
      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica
-      branch: stable
-      event: tag
--- a/62
+++ b/62
@ -1,16 +1,74 @@
-Version 2024.12 (unreleased)
+Version 2025.02 (unreleased)
  Friendica Core

  Friendica Addons

  Closed Issues

-Version 2024.09 (unreleased)
+Version 2024.12 (2024-12-31)
  Friendica Core
+    Updates to the translations AR, BG, CA, CS, DE, EO, ES, ET, FR, GD, HU, IS, IT, JA, NL, PL, RU, SV
+    Updates to the documentation [annando, bmillwood, tobiasd]
+    Updates to the themes (frio) [haheute]
+    Friendica Core is now REUSE compliant [tobiasd]
+    General code cleanup [annando, nupplaphil, mexon]
+    Improved federation with Bluesky, Hubzilla, Peertube, threads, Wordpress [annando]
+    Improved the API [annando]
+    Improved display of contact connection state [annando]
+    Improved handling of bad webfinger requests [annando, mexon, zotanmew]
+    Improved the order of actions on the 2FA settings page [tobiasd]
+    Improved server type detection [annando]
+    Improved content negotiation [annando]
+    Improved expiration [annando]
+    Improved contact archiving [annando]
+    Improved delivery of content [annando]
+    Improved displayed project icons [annando]
+    Improved splitting of long postings via connectors [annando]
+    Improved contact import [annando]
+    Improved URL detection in searches [annando]
+    Improved handling of blocked users [annando]
+    Fixed a bug in creating app specific passwords [nupplaphil]
+    Fixed a bug in importing some notes from Mastodon [annando]
+    Fixed a bug with postings from buffer including images [annando]
+    Fixed a apache2 problem with unsafe URLs [annando]
+    Fixed a bug in the contact settings [annando]
+    Fixed a bug with latin1 encoded databases [annando]
+    Fixed a bug while uploading server blocklists [ne20002]
+    Fixed a bug while parsing events [annando]
+    Fixed a bug in the initial registry settings [annando]
+    Fixed a bug in 0Auth with buffer [annando]
+    Fixed a problem with rich HTML content [annando]
+    Fixed a bug with private comments [annando]
+    Fixed a bug in gettext [tobiasd]
+    Fixed a bug in the installation process [tobiasd]
+    Fixed schema.org issue [annando]
+    Added admin info to stats module [nupplaphil]
+    Added an option to exclude postings with images without ALT text [annando]
+    Added an option to hide custom emojis [annando]
+    Added support for HLS [annando]
+    Added devcontainer for Friendica [ne20002]
+    Added jetstream support for AT protocol [annando]
+    Added native probe support for AT protocol [annando]
+    Removed custom emojis from contact names [annando]
+    Removed OStatus support [annando]

  Friendica Addons
+    bluesky
+      Added block functionality [annando]
+      Added option to complete threads [annando]
+      Fixed issue with blocking contacts [annando]
+      Improved handling of startersets [annando]
+      Improved fetching of postings [annando]
+    invidious [loma-one]
+    unicode_smileys [loma-one]
+    fancybox
+      Deprecated the addon [tobiasd]

  Closed Issues
+    13270, 13943, 14121, 14126, 14145, 14174, 14212, 14244, 14281,
+    14292, 14294, 14303, 14307, 14344, 14368, 14370, 14373, 14377,
+    14381, 14413, 14421, 14525, 14450, 14451, 14464, 14487, 14488,
+    14491, 14495, 14512, 14587, 14609, 14630

 Version 2024.08 (2024-08-17)
  Friendica Core
--- a/CREDITS.txt
+++ b/CREDITS.txt
@ -23,6 +23,7 @@ Andi Stadler
 Andreas H.
 Andreas Neustifter
 Andrej Stieben
+Andrey Esin
 André Alves
 André Lohan
 Andy
@ -46,6 +47,7 @@ beardyunixer
 Beatriz Vital
 Beluga
 Ben
+Ben Millwood
 Ben Roberts
 ben-utzer
 Beringer Zsolt
@ -72,6 +74,7 @@ Christian Wiwie
 Cohan Robinson
 Colby Sollars
 Copiis
+cracrayol
 CrystalStiletto
 csolisr
 Cyboulette
@ -91,9 +94,11 @@ Dean Townsley
 Denis Chenu
 dependabot[bot]
 Devlon Duthie
+dew-git
 Diego Souza
 Domovoy
 Doru  DEACONU
+Dr. Tobias Quathamer
 Dylan Thiedeke
 Développeur égaré
 eddy2508
@ -188,8 +193,10 @@ Kris
 Kristoffer Grundström
 ktlinux
 KulikAlex
+Laura Hausmann
 Lea1995polish
 Leberwurscht
+Leonard
 Leonard Lausen
 Lionel Triay
 loma-one
@ -227,9 +234,11 @@ Mike Macgirvin
 miqrogroove
 Morgan McMillian
 mpanhans
+MrPetovan
 mytbk
 nathilia-peirce
 Nicola Spanti
+ne20002
 Nicolas Derive
 nnsrymni
 nobody
@ -308,7 +317,6 @@ snajafov
 softmetz
 soko1
 Spencer Dub
-SpencerDub
 St John Karp
 Stanislav N.
 Steffen K9
@ -340,6 +348,7 @@ Tom
 Tom Aurlund
 Tom Hu
 tomamplius
+tommy tomson
 tomtom84
 Tony Baldwin
 Torbjörn Andersson
@ -370,6 +379,7 @@ Wanting Chen
 Wil Tur
 Wladimir Palant
 Wouter Broers
+www-data
 Xiaofei Xu
 XMPPはいいぞ
 xundeenergie
@ -382,6 +392,7 @@ Zered
 zotlabs
 zottel
 Zvi ben Yaakov (a.k.a rdc)
+Éibhear Ó hAnluain
 Михаил
 Олексій Замковий
 朱陈锬
--- a/2
+++ b/2
@ -1 +1 @@
-2024.12-dev
+2025.02-dev
--- a/2
+++ b/2
@ -7,7 +7,7 @@ public_folder = "/vagrant"

 Vagrant.configure(2) do |config|
  # Set server to Debian 11 / Bullseye 64bit
-  config.vm.box = "debian/bullseye64"
+  config.vm.box = "debian/bookworm64"

  # Disable automatic box update checking. If you disable this, then
  # boxes will only be checked for updates when the user runs
--- a/bin/dev/vagrant_provision.sh
+++ b/bin/dev/vagrant_provision.sh
@ -42,6 +42,18 @@ openssl genrsa -out "$SSL_DIR/xip.io.key" 4096
 openssl req -new -subj "$(echo -n "$SUBJ" | tr "\n" "/")" -key "$SSL_DIR/xip.io.key" -out "$SSL_DIR/xip.io.csr" -passin pass:$PASSPHRASE
 openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xip.io.key" -out "$SSL_DIR/xip.io.crt"

+#Install php
+echo ">>> Add PHP repository"
+apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg
+echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list
+wget -qO - https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/php.gpg
+apt update
+
+echo ">>> Installing PHP8"
+apt-get install -qq php libapache2-mod-php php8.3-cli php8.3-mysql php8.3-curl php8.3-gd php8.3-mbstring php8.3-xml imagemagick php8.3-imagick php8.3-zip php8.3-gmp php8.3-intl
+
+echo ">>> Installing PHP7"
+apt-get install -qq php7.4 php7.4-cli php7.4-mysql php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-imagick php7.4-zip php7.4-gmp php7.4-intl

 #Install apache2
 echo ">>> Installing Apache2 webserver"
@ -53,19 +65,6 @@ vhost -s 192.168.56.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friend
 a2dissite 000-default
 service apache2 restart

-#Install php
-echo ">>> Installing PHP7"
-apt-get install -qq php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip php-gmp
-systemctl restart apache2
-
-echo ">>> Installing PHP8"
-apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg
-echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list
-wget -qO - https://packages.sury.org/php/apt.gpg | sudo apt-key add -
-apt update
-apt-get install -qq php8.0 php8.0-cli php8.0-mysql php8.0-curl php8.0-gd php8.0-mbstring php8.0-xml php8.0-imagick php8.0-zip php8.0-gmp
-systemctl restart apache2
-
 #Install mysql
 echo ">>> Installing Mysql"
 debconf-set-selections <<< "mariadb-server mariadb-server/root_password password root"
--- a/database.sql
+++ b/database.sql
@ -1,5 +1,5 @@
 -- ------------------------------------------
-- Friendica 2024.12-dev (Yellow Archangel)
+-- Friendica 2025.02-dev (Interrupted Fern)
 -- DB_UPDATE_VERSION 1576
 -- ------------------------------------------

--- a/src/App.php
+++ b/src/App.php
@ -63,8 +63,8 @@ use Psr\Log\LoggerInterface;
 class App
 {
 	const PLATFORM = 'Friendica';
-	const CODENAME = 'Yellow Archangel';
-	const VERSION  = '2024.12-dev';
+	const CODENAME = 'Interrupted Fern';
+	const VERSION  = '2025.02-dev';

 	public static function fromDice(Dice $dice): self
 	{
--- a/src/Model/User.php
+++ b/src/Model/User.php
@ -677,11 +677,12 @@ class User
 	 * @param mixed  $user_info
 	 * @param string $password
 	 * @param bool   $third_party
+	 * @param bool   $with_blocked
 	 * @return int User Id if authentication is successful
 	 * @throws HTTPException\ForbiddenException
 	 * @throws HTTPException\NotFoundException
 	 */
-	public static function getIdFromPasswordAuthentication($user_info, string $password, bool $third_party = false): int
+	public static function getIdFromPasswordAuthentication($user_info, string $password, bool $third_party = false, bool $with_blocked = false): int
 	{
 		// Addons registered with the "authenticate" hook may create the user on the
 		// fly. `getAuthenticationInfo` will fail if the user doesn't exist yet. If
@ -689,7 +690,7 @@ class User
 		// user in our database, if applicable, before re-throwing the exception if
 		// they fail.
 		try {
-			$user = self::getAuthenticationInfo($user_info);
+			$user = self::getAuthenticationInfo($user_info, $with_blocked);
 		} catch (Exception $e) {
 			$username = (is_string($user_info) ? $user_info : $user_info['nickname'] ?? '');

@ -782,10 +783,11 @@ class User
 	 * - User array with at least the uid and the hashed password
 	 *
 	 * @param mixed $user_info
+	 * @param bool  $with_blocked
 	 * @return array|null Null if not found/determined
 	 * @throws HTTPException\NotFoundException
 	 */
-	public static function getAuthenticationInfo($user_info)
+	public static function getAuthenticationInfo($user_info, bool $with_blocked = false)
 	{
 		$user = null;

@ -804,25 +806,27 @@ class User
 				throw new Exception(DI::l10n()->t('Not enough information to authenticate'));
 			}
 		} elseif (is_int($user_info) || is_string($user_info)) {
+			$fields = ['uid', 'nickname', 'password', 'legacy_password'];
 			if (is_int($user_info)) {
-				$user = DBA::selectFirst(
-					'user',
-					['uid', 'nickname', 'password', 'legacy_password'],
-					[
-						'uid' => $user_info,
-						'blocked' => 0,
-						'account_expired' => 0,
-						'account_removed' => 0,
-						'verified' => 1
-					]
-				);
+				$condition = 					[
+					'uid' => $user_info,
+					'account_expired' => false,
+					'account_removed' => false,
+					'verified' => true
+				];
+				if (!$with_blocked) {
+					$condition = DBA::mergeConditions($condition, ['blocked' => false]);
+				}
+				$user = DBA::selectFirst('user', $fields, $condition);
 			} else {
-				$fields = ['uid', 'nickname', 'password', 'legacy_password'];
 				$condition = [
 					"(`email` = ? OR `username` = ? OR `nickname` = ?)
-					AND `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`",
+					AND `verified` AND NOT `account_removed` AND NOT `account_expired`",
 					$user_info, $user_info, $user_info
 				];
+				if (!$with_blocked) {
+					$condition = DBA::mergeConditions($condition, ['blocked' => false]);
+				}
 				$user = DBA::selectFirst('user', $fields, $condition);
 			}

--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@ -273,7 +273,7 @@ class Index extends BaseSearch
 	 */
 	private static function tryRedirectToPost(string $search)
 	{
-		if (parse_url($search, PHP_URL_SCHEME) == '') {
+		if (!parse_url($search, PHP_URL_SCHEME) && !preg_match('=^[a-z]+://=', $search)) {
 			return;
 		}

--- a/src/Protocol/ATProtocol.php
+++ b/src/Protocol/ATProtocol.php
@ -291,10 +291,6 @@ final class ATProtocol
 	 */
 	public function getUserDid(int $uid, bool $refresh = false): ?string
 	{
-		if (!$this->pConfig->get($uid, 'bluesky', 'post')) {
-			return null;
-		}
-
 		if (!$refresh) {
 			$did = $this->pConfig->get($uid, 'bluesky', 'did');
 			if (!empty($did)) {
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@ -254,7 +254,7 @@ class Authentication
 			$record = $this->dba->selectFirst(
 				'user',
 				[],
-				['uid' => User::getIdFromPasswordAuthentication($username, $password)]
+				['uid' => User::getIdFromPasswordAuthentication($username, $password, false, true)]
 			);
 		} catch (Exception $e) {
 			$this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => $username, 'ip' => $this->remoteAddress]);
@ -262,6 +262,12 @@ class Authentication
 			$this->baseUrl->redirect();
 		}

+		if ($record['blocked']) {
+			$this->logger->warning('authenticate: user is blocked', ['action' => 'login', 'username' => $username, 'ip' => $this->remoteAddress]);
+			DI::sysmsg()->addNotice($this->l10n->t('Login failed because your account is blocked.'));
+			$this->baseUrl->redirect();
+		}
+
 		if (!$remember) {
 			$trusted = $this->cookie->get('2fa_cookie_hash') ?? null;
 			$this->cookie->clear();
--- a/src/Security/OAuth.php
+++ b/src/Security/OAuth.php
@ -189,7 +189,7 @@ class OAuth
 			'created_at'     => DateTimeFormat::utcNow()
 		];

-		foreach ([BaseApi::SCOPE_READ, BaseApi::SCOPE_WRITE, BaseApi::SCOPE_WRITE, BaseApi::SCOPE_PUSH] as $scope) {
+		foreach ([BaseApi::SCOPE_READ, BaseApi::SCOPE_WRITE, BaseApi::SCOPE_FOLLOW, BaseApi::SCOPE_PUSH] as $scope) {
 			if ($fields[$scope] && !$application[$scope]) {
 				Logger::warning('Requested token scope is not allowed for the application', ['token' => $fields, 'application' => $application]);
 			}
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@ -227,6 +227,11 @@ class JsonLD
 				Logger::debug('schema.org path fixed');
 				$value = 'http://schema.org#';
 			}
+			// Issue 14630: Wordpress Event Bridge uses a URL that cannot be retrieved
+			if (is_int($key) && $value == 'https://schema.org/') {
+				Logger::debug('https schema.org path fixed');
+				$value = 'https://schema.org/docs/jsonldcontext.json#';
+			}
 		});

 		// Bookwyrm transmits "id" fields with "null", which isn't allowed.
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
--- a/view/lang/ar/messages.po
+++ b/view/lang/ar/messages.po
--- a/view/lang/ar/strings.php
+++ b/view/lang/ar/strings.php
@ -1106,6 +1106,7 @@ $a->strings['Display'] = 'العرض';
 $a->strings['Social Networks'] = 'الشبكات الاجتماعية';
 $a->strings['Manage Accounts'] = 'إدارة الحسابات';
 $a->strings['Connected apps'] = 'التطبيقات المتصلة';
+$a->strings['Import Contacts'] = 'استيراد متراسلين';
 $a->strings['Export personal data'] = 'تصدير البيانات الشخصية';
 $a->strings['Remove account'] = 'أزل الحساب';
 $a->strings['This page is missing a url parameter.'] = 'هذه الصفحة تفتقد معطى للرابط.';
@ -1768,8 +1769,6 @@ $a->strings['Wrong Password.'] = 'كلمة المرور خاطئة.';
 $a->strings['Invalid email.'] = 'البريد الإلكتروني غير صالح.';
 $a->strings['Cannot change to that email.'] = 'لا يمكن التغيير إلى هذا البريد الإلكتروني.';
 $a->strings['Settings were not updated.'] = 'لم تُحدث الإعدادات.';
-$a->strings['Contact CSV file upload error'] = 'خطأ أثناء رفع ملف CSV';
-$a->strings['Importing Contacts done'] = 'أُستورد المتراسلون';
 $a->strings['Relocate message has been send to your contacts'] = 'أُرسلت رسالة تنبيه بانتقالك إلى متراسليك';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'تعذر العثور على ملفك الشخصي. من فضلك اتصال بالمدير.';
 $a->strings['Personal Page Subtypes'] = 'الأنواع الفرعية للصفحة الشخصية';
@ -1851,9 +1850,6 @@ $a->strings['Show notifications of ignored contacts'] = 'أظهر تنبيهات
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'أنت لا ترى مشاركات المتراسلين المتجاهلين. لكن لا يزال بإمكانك رؤية تعليقاتهم. هذا الإعداد يتحكم إذا كنت ترغب في الاستمرار في تلقي تنبيهات سببها المتراسلون المتجاهلون.';
 $a->strings['Advanced Account/Page Type Settings'] = 'الإعدادات المتقدمة للحساب/للصفحة';
 $a->strings['Change the behaviour of this account for special situations'] = 'غيّر سلوك هذا الحساب للحالات الخاصة';
-$a->strings['Import Contacts'] = 'استيراد متراسلين';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'ارفع ملف CSV معرفات المتراسلين لحسابك القديم، معرفات المتابَعين تكون في العمود الأول.';
-$a->strings['Upload File'] = 'ارفع ملفًا';
 $a->strings['Relocate'] = 'الانتقال';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'إذا كنت قد نقلت هذا الملف الشخصي من خادم آخر، وبعض المتراسلين لا يتلقون تحديثاتك، أنقر هذا الزر.';
 $a->strings['Resend relocate message to contacts'] = 'أعد إرسال رسالة الانتقال للمتراسلين';
@ -1875,8 +1871,6 @@ $a->strings['Normally the system tries to find the best link to add to shortened
 $a->strings['Enable simple text shortening'] = 'فعّل اختصار النصوص';
 $a->strings['Attach the link title'] = 'أرفق عنوان الرابط';
 $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'عند تفعيله سيتم إرفاق عنوان الصفحة بمنشور دياسبورا. هذا مفيد بشكل أساسي مع المتراسلين "الذاتيين" الذين يشاركون تغذيات Rss / Atom.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'حساب GNU Social\ActivityPub القديم';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'إذا قمت بإدخال اسم حساب ActivityPub/GNU Social/Statusnet القديم هنا (بنسق user@domain.tld)، سيضاف المتراسلون في هذا الحساب تلقائيا. سيصفر الحقل عند الانتهاء.';
 $a->strings['Email/Mailbox Setup'] = 'إعداد بريد الكتروني/صندوق بريد';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'إذا كنت ترغب في التواصل مع متراسلي البريد الإلكتروني باستخدام هذه الخدمة (اختيارية)، من فضلك حدد كيفية الاتصال بصندوق بريدك.';
 $a->strings['Last successful email check:'] = 'آخر تحقق ناجح للبريد الإلكتروني:';
@ -1890,6 +1884,12 @@ $a->strings['Send public posts to all email contacts:'] = 'أرسل المشار
 $a->strings['Action after import:'] = 'الإجراء بعد الاستيراد:';
 $a->strings['Move to folder'] = 'انقل إلى مجلد';
 $a->strings['Move to folder:'] = 'انقل إلى المجلد:';
+$a->strings['Contact CSV file upload error'] = 'خطأ أثناء رفع ملف CSV';
+$a->strings['Importing Contacts done'] = 'أُستورد المتراسلون';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'ارفع ملف CSV معرفات المتراسلين لحسابك القديم، معرفات المتابَعين تكون في العمود الأول.';
+$a->strings['Upload File'] = 'ارفع ملفًا';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'حساب GNU Social\ActivityPub القديم';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'إذا قمت بإدخال اسم حساب ActivityPub/GNU Social/Statusnet القديم هنا (بنسق user@domain.tld)، سيضاف المتراسلون في هذا الحساب تلقائيا. سيصفر الحقل عند الانتهاء.';
 $a->strings['Delegation successfully granted.'] = 'منح التفويض بنجاح.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'لم يُعثر على الولي أو هو غير متوفر أو كلمة مرور غير صحيحة.';
 $a->strings['Delegation successfully revoked.'] = 'نجح إبطال التفويض.';
--- a/view/lang/bg/messages.po
+++ b/view/lang/bg/messages.po
--- a/view/lang/ca/messages.po
+++ b/view/lang/ca/messages.po
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@ -1606,6 +1606,7 @@ $a->strings['Social Networks'] = 'Soziale Netzwerke';
 $a->strings['Manage Accounts'] = 'Accounts Verwalten';
 $a->strings['Connected apps'] = 'Verbundene Programme';
 $a->strings['Remote servers'] = 'Remote Instanzen';
+$a->strings['Import Contacts'] = 'Kontakte Importieren';
 $a->strings['Export personal data'] = 'Persönliche Daten exportieren';
 $a->strings['Remove account'] = 'Konto löschen';
 $a->strings['This page is missing a url parameter.'] = 'Der Seite fehlt ein URL Parameter.';
@ -2439,8 +2440,6 @@ $a->strings['Wrong Password.'] = 'Falsches Passwort';
 $a->strings['Invalid email.'] = 'Ungültige E-Mail-Adresse.';
 $a->strings['Cannot change to that email.'] = 'Ändern der E-Mail nicht möglich. ';
 $a->strings['Settings were not updated.'] = 'Einstellungen nicht aktualisiert';
-$a->strings['Contact CSV file upload error'] = 'Fehler beim Hochladen der Kontakt CSV Datei';
-$a->strings['Importing Contacts done'] = 'Kontakte wurden importiert.';
 $a->strings['Relocate message has been send to your contacts'] = 'Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet.';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Konnte dein Profil nicht finden. Bitte kontaktiere den Admin.';
 $a->strings['Account for a service that automatically shares content based on user defined channels.'] = 'Konto für einen Dienst, der automatisch Inhalte basierend auf vom Benutzer definierten Kanälen teilt.';
@ -2536,9 +2535,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Zeige Benachrichtigunge
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Beiträge von ignorierten Kontakten werden dir nicht angezeigt. Aber du siehst immer noch ihre Kommentare. Diese Einstellung legt fest, ob du dazu weiterhin Benachrichtigungen erhalten willst oder ob diese einfach verworfen werden sollen.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Erweiterte Konto-/Seitentyp-Einstellungen';
 $a->strings['Change the behaviour of this account for special situations'] = 'Verhalten dieses Kontos in bestimmten Situationen:';
-$a->strings['Import Contacts'] = 'Kontakte Importieren';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Lade eine CSV Datei hoch, die das Handle der Kontakte deines alten Nutzerkontos in der ersten Spalte enthält.';
-$a->strings['Upload File'] = 'Datei hochladen';
 $a->strings['Relocate'] = 'Umziehen';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button.';
 $a->strings['Resend relocate message to contacts'] = 'Umzugsbenachrichtigung erneut an Kontakte senden';
@ -2606,8 +2602,6 @@ $a->strings['API: Automatically links at the end of the post as attached posts']
 $a->strings['When activated, added links at the end of the post react the same way as added links in the web interface.'] = 'Wenn dies aktiviert ist, reagieren hinzugefügte Links am Ende des Beitrags genauso wie hinzugefügte Links in der Weboberfläche.';
 $a->strings['Article Mode'] = 'Artikel Modus';
 $a->strings['Controls how posts with titles are transmitted. Mastodon and its forks don\'t display the content of these posts if the post is created in the correct (default) way.'] = 'Kontrolliert wie Beiträge mit Titeln übermittel werden. Mastodon und dessen Forks stellen den Inhalt dieser Beiträge nicht dar, wenn sie an sich korrekt in den Grundeinstellungen übertragen werden.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Dein alter ActivityPub/GNU Social-Account';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.';
 $a->strings['Email/Mailbox Setup'] = 'E-Mail/Postfach-Einstellungen';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an.';
 $a->strings['Last successful email check:'] = 'Letzter erfolgreicher E-Mail-Check';
@ -2621,6 +2615,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Sende öffentliche Be
 $a->strings['Action after import:'] = 'Aktion nach Import:';
 $a->strings['Move to folder'] = 'In einen Ordner verschieben';
 $a->strings['Move to folder:'] = 'In diesen Ordner verschieben:';
+$a->strings['Contact CSV file upload error'] = 'Fehler beim Hochladen der Kontakt CSV Datei';
+$a->strings['Importing Contacts done'] = 'Kontakte wurden importiert.';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Lade eine CSV Datei hoch, die das Handle der Kontakte deines alten Nutzerkontos in der ersten Spalte enthält.';
+$a->strings['Upload File'] = 'Datei hochladen';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Dein alter ActivityPub/GNU Social-Account';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.';
 $a->strings['Delegation successfully granted.'] = 'Delegierung erfolgreich eingerichtet.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Der angegebene Nutzer konnte nicht gefunden werden, ist nicht verfügbar oder das angegebene Passwort ist nicht richtig.';
 $a->strings['Delegation successfully revoked.'] = 'Delegation erfolgreich aufgehoben.';
@ -3037,7 +3037,7 @@ $a->strings['Delete globally'] = 'Global löschen';
 $a->strings['Remove locally'] = 'Lokal entfernen';
 $a->strings['Block %s'] = 'Blockiere %s';
 $a->strings['Ignore %s'] = 'Ignoriere %s';
-$a->strings['Collapse %s'] = 'Verberge %s';
+$a->strings['Collapse %s'] = 'Klappe %s zu';
 $a->strings['Report post'] = 'Beitrag melden';
 $a->strings['Save to folder'] = 'In Ordner speichern';
 $a->strings['I will attend'] = 'Ich werde teilnehmen';
--- a/view/lang/eo/messages.po
+++ b/view/lang/eo/messages.po
--- a/view/lang/es/messages.po
+++ b/view/lang/es/messages.po
--- a/view/lang/es/strings.php
+++ b/view/lang/es/strings.php
@ -1073,6 +1073,7 @@ $a->strings['Display'] = 'Interfaz del usuario';
 $a->strings['Social Networks'] = 'Redes sociales';
 $a->strings['Manage Accounts'] = 'Gestionar cuentas';
 $a->strings['Connected apps'] = 'Aplicaciones conectadas';
+$a->strings['Import Contacts'] = 'Importar contactos';
 $a->strings['Export personal data'] = 'Exportación de datos personales';
 $a->strings['Remove account'] = 'Eliminar cuenta';
 $a->strings['This page is missing a url parameter.'] = 'A la página le falta URL.';
@ -1686,8 +1687,6 @@ $a->strings['Wrong Password.'] = 'Password erróneo';
 $a->strings['Invalid email.'] = 'Corréo no válido.';
 $a->strings['Cannot change to that email.'] = 'Imposible cambiar a ese correo.';
 $a->strings['Settings were not updated.'] = 'Configuración no actualizada';
-$a->strings['Contact CSV file upload error'] = 'Error al subir archivo CSV';
-$a->strings['Importing Contacts done'] = 'Importación del contacto completada';
 $a->strings['Relocate message has been send to your contacts'] = 'Mensaje de reubicación enviado a sus contactos.';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'No se encontró tu perfil. Contacta al Administrador.';
 $a->strings['Personal Page Subtypes'] = 'Subtipos de Página Personal';
@ -1766,9 +1765,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Mostrar notificación d
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'No ves publicaciones de contactos ignorados. Pero todavía ves sus comentarios. Esta configuración controla si aún desea recibir notificaciones regulares causadas por contactos ignorados o no.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Configuración avanzada de tipo de Cuenta/Página';
 $a->strings['Change the behaviour of this account for special situations'] = 'Cambiar el comportamiento de esta cuenta para situaciones especiales';
-$a->strings['Import Contacts'] = 'Importar contactos';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Subir archivo CSV que contenga identificador de tus cuentas seguidas en elprimera columna que exportó desde la cuenta anterior.';
-$a->strings['Upload File'] = 'Subir archivo';
 $a->strings['Relocate'] = 'Relocalizar';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Si migró este perfil desde otro servidor y algunos contactos no reciben sus publicaciones intente oprimiendo esta opción.';
 $a->strings['Resend relocate message to contacts'] = 'Reenviar mensaje de relocalización a contactos';
@ -1796,6 +1792,10 @@ $a->strings['Send public posts to all email contacts:'] = 'Enviar notificaciones
 $a->strings['Action after import:'] = 'Acción al importar:';
 $a->strings['Move to folder'] = 'Mover a un folder';
 $a->strings['Move to folder:'] = 'Mover al folder:';
+$a->strings['Contact CSV file upload error'] = 'Error al subir archivo CSV';
+$a->strings['Importing Contacts done'] = 'Importación del contacto completada';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Subir archivo CSV que contenga identificador de tus cuentas seguidas en elprimera columna que exportó desde la cuenta anterior.';
+$a->strings['Upload File'] = 'Subir archivo';
 $a->strings['Delegation successfully granted.'] = 'Se autorizó delegación.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Usuario padre no encontrado, o no coincide contraseña.';
 $a->strings['Delegation successfully revoked.'] = 'Delegación revocada con éxito.';
--- a/view/lang/et/messages.po
+++ b/view/lang/et/messages.po
--- a/view/lang/et/strings.php
+++ b/view/lang/et/strings.php
@ -729,7 +729,6 @@ $a->strings['Text-only notification emails'] = 'Ainult tekstipõhised teavitusme
 $a->strings['Send text only notification emails, without the html part'] = 'Saada ainut tekstimeile ilma html-ita';
 $a->strings['Show detailled notifications'] = 'Kuva detailseid teavitusi';
 $a->strings['Advanced Account/Page Type Settings'] = 'Konto/Lehetüübi sätted edasijõudnutele';
-$a->strings['Upload File'] = 'Lae fail üles';
 $a->strings['Addon Settings'] = 'Lisade sätted';
 $a->strings['Add'] = 'Lisa';
 $a->strings['Failed to connect with email account using the settings provided.'] = 'E-posti kontoga ei õnnestu antud sätetega ühendust saada.';
@ -740,6 +739,7 @@ $a->strings['Last successful email check:'] = 'Viimane õnnestunud meilikontroll
 $a->strings['Action after import:'] = 'Tegevus peale inporti:';
 $a->strings['Move to folder'] = 'Liiguta kausta';
 $a->strings['Move to folder:'] = 'Liiguta kausta:';
+$a->strings['Upload File'] = 'Lae fail üles';
 $a->strings['No parent user'] = 'Vanemkasutajad ei ole';
 $a->strings['Parent User'] = 'Vanemkasutaja';
 $a->strings['Additional Accounts'] = 'Lisakontod';
--- a/view/lang/fr/messages.po
+++ b/view/lang/fr/messages.po
--- a/view/lang/fr/strings.php
+++ b/view/lang/fr/strings.php
@ -1639,6 +1639,7 @@ $a->strings['Social Networks'] = 'Réseaux sociaux';
 $a->strings['Manage Accounts'] = 'Gérer vos comptes';
 $a->strings['Connected apps'] = 'Applications connectées';
 $a->strings['Remote servers'] = 'Serveurs distants';
+$a->strings['Import Contacts'] = 'Importer des contacts';
 $a->strings['Export personal data'] = 'Exporter';
 $a->strings['Remove account'] = 'Supprimer le compte';
 $a->strings['This page is missing a url parameter.'] = 'Il manque un paramètre d\'URL à cette adresse.';
@ -2489,8 +2490,6 @@ $a->strings['Wrong Password.'] = 'Mot de passe erroné.';
 $a->strings['Invalid email.'] = 'Courriel invalide.';
 $a->strings['Cannot change to that email.'] = 'Ne peut pas changer vers ce courriel.';
 $a->strings['Settings were not updated.'] = 'Les paramètres n\'ont pas été mis à jour.';
-$a->strings['Contact CSV file upload error'] = 'Erreur de téléversement du fichier de contact CSV';
-$a->strings['Importing Contacts done'] = 'Import des contacts effectué';
 $a->strings['Relocate message has been send to your contacts'] = 'Un message de relocalisation a été envoyé à vos contacts.';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Impossible de trouver votre profile. Merci de contacter votre administrateur.';
 $a->strings['Account for a service that automatically shares content based on user defined channels.'] = 'Compte de service qui partage automatiquement du contenu basés les chaînes de l\'utilisateur';
@ -2586,9 +2585,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Montrer les notificatio
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Par défaut les notifications de vos contacts ignorés sont également ignorées.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Paramètres avancés de compte/page';
 $a->strings['Change the behaviour of this account for special situations'] = 'Modifier le comportement de ce compte dans certaines situations';
-$a->strings['Import Contacts'] = 'Importer des contacts';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Téléversez un fichier CSV contenant des identifiants de contacts dans la première colonne.';
-$a->strings['Upload File'] = 'Téléverser le fichier';
 $a->strings['Relocate'] = 'Relocaliser';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Si vous avez migré ce profil depuis un autre serveur et que vos contacts ne reçoivent plus vos mises à jour, essayez ce bouton.';
 $a->strings['Resend relocate message to contacts'] = 'Renvoyer un message de relocalisation aux contacts.';
@ -2656,8 +2652,6 @@ $a->strings['API: Automatically links at the end of the post as attached posts']
 $a->strings['When activated, added links at the end of the post react the same way as added links in the web interface.'] = 'Quand activé, les liens ajoutés à la fin d\'une publication fonctionnent de la même manière que les liens ajoutés dans l\'interface web.';
 $a->strings['Article Mode'] = 'Mode Article';
 $a->strings['Controls how posts with titles are transmitted. Mastodon and its forks don\'t display the content of these posts if the post is created in the correct (default) way.'] = 'Contrôle la façon dont les publications avec des titres sont transmises. Mastodon et ses forks n\'affichent pas le contenu de ces publications si la publication est créée de la bonne manière (par défaut).';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Votre ancient compte ActivityPub/GNU Social';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Si vous saisissez votre adresse de compte précédente d\'un réseau basé sur ActivityPub ou GNU Social/Statusnet (au format utilisateur@domaine.tld), vos contacts seront ajoutés autoamtiquement. Le champ sera vidé quand l\'opération sera terminé.';
 $a->strings['Email/Mailbox Setup'] = 'Réglages de courriel/boîte à lettre';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Si vous souhaitez communiquer avec vos contacts "courriel" (facultatif), merci de nous indiquer comment vous connecter à votre boîte.';
 $a->strings['Last successful email check:'] = 'Dernière vérification réussie des courriels :';
@ -2671,6 +2665,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Envoyer les publicati
 $a->strings['Action after import:'] = 'Action après import :';
 $a->strings['Move to folder'] = 'Déplacer vers';
 $a->strings['Move to folder:'] = 'Déplacer vers :';
+$a->strings['Contact CSV file upload error'] = 'Erreur de téléversement du fichier de contact CSV';
+$a->strings['Importing Contacts done'] = 'Import des contacts effectué';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Téléversez un fichier CSV contenant des identifiants de contacts dans la première colonne.';
+$a->strings['Upload File'] = 'Téléverser le fichier';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Votre ancient compte ActivityPub/GNU Social';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Si vous saisissez votre adresse de compte précédente d\'un réseau basé sur ActivityPub ou GNU Social/Statusnet (au format utilisateur@domaine.tld), vos contacts seront ajoutés autoamtiquement. Le champ sera vidé quand l\'opération sera terminé.';
 $a->strings['Delegation successfully granted.'] = 'Délégation accordée avec succès.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Utilisateur parent introuvable, indisponible ou mot de passe incorrect.';
 $a->strings['Delegation successfully revoked.'] = 'Délégation retirée avec succès.';
--- a/view/lang/gd/messages.po
+++ b/view/lang/gd/messages.po
--- a/view/lang/gd/strings.php
+++ b/view/lang/gd/strings.php
@ -2208,8 +2208,6 @@ $a->strings['Normally the system shortens posts at the next line feed. If this o
 $a->strings['Attach the link title'] = 'Cuir tiotal a’ cheangail ris';
 $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Nuair a bhios seo an gnìomh, thèid tiotal a’ cheangail a chur ris mar tiotal air postaichean gu diaspora*. Tha seo as fheumaile dhan luchd-aithne “remote-self” a cho-roinneas susbaint inbhir.';
 $a->strings['When activated, added links at the end of the post react the same way as added links in the web interface.'] = 'Nuair a bhios seo an gnìomh, bidh an t-aon ghiùlan aig ceanglaichean a thèid a chur ri bonn puist ’s a tha aig ceanglaichean a thèid a chur ris san eadar-aghaidh-lìn.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'An cunntas ActivityPub/GNU Social dìleabach agad';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Ma chuireas tu ainm seann-chunntais ris o shiostam stèidhichte air ActivityPub no ainm do chunntais GNU Social/Statusnet an-seo (san fhòrmat cleachdaiche@àrainn.tld), thèid an luchd-aithne agad a chur ris gu fèin-obrachail. Thèid an raon fhalamhachadh nuair a bhios sin deiseil.';
 $a->strings['Email/Mailbox Setup'] = 'Suidheachadh a’ phuist-d/a’ bhogsa-phuist';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Ma tha thu airson an t-seirbheis seo a chleachdadh airson conaltradh le luchd-aithne air a’ post-d (gu roghainneil), sònraich an dòigh air a nì thu ceangal leis a’ bhogsa-phuist agad.';
 $a->strings['Last successful email check:'] = 'An turas mu dheireadh a chaidh leinn sùil a thoirt air a’ phost-d:';
@ -2223,6 +2221,8 @@ $a->strings['Send public posts to all email contacts:'] = 'Cuir postaichean pobl
 $a->strings['Action after import:'] = 'Gnìomh às dèid an ion-phortaidh:';
 $a->strings['Move to folder'] = 'Gluais gu pasgan';
 $a->strings['Move to folder:'] = 'Gluais gu pasgan:';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'An cunntas ActivityPub/GNU Social dìleabach agad';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Ma chuireas tu ainm seann-chunntais ris o shiostam stèidhichte air ActivityPub no ainm do chunntais GNU Social/Statusnet an-seo (san fhòrmat cleachdaiche@àrainn.tld), thèid an luchd-aithne agad a chur ris gu fèin-obrachail. Thèid an raon fhalamhachadh nuair a bhios sin deiseil.';
 $a->strings['Delegation successfully granted.'] = 'Chaidh neach-ionaid a dhèanamh dheth.';
 $a->strings['Delegation successfully revoked.'] = 'Chaidh ceadan neach-ionaid a thoirt air falbh.';
 $a->strings['Delegated administrators can view but not change delegation permissions.'] = 'Chì rianairean a tha ’nan luchd-ionaid na ceadan ach chan urrainn dhaibh an atharrachadh.';
--- a/view/lang/hu/messages.po
+++ b/view/lang/hu/messages.po
--- a/view/lang/hu/strings.php
+++ b/view/lang/hu/strings.php
@ -1618,6 +1618,7 @@ $a->strings['Social Networks'] = 'Közösségi hálózatok';
 $a->strings['Manage Accounts'] = 'Fiókok kezelése';
 $a->strings['Connected apps'] = 'Kapcsolt alkalmazások';
 $a->strings['Remote servers'] = 'Távoli kiszolgálók';
+$a->strings['Import Contacts'] = 'Partnerek importálása';
 $a->strings['Export personal data'] = 'Személyes adatok exportálása';
 $a->strings['Remove account'] = 'Fiók eltávolítása';
 $a->strings['This page is missing a url parameter.'] = 'Erről az oldalról hiányzik egy URL paraméter.';
@ -2446,8 +2447,6 @@ $a->strings['Wrong Password.'] = 'Hibás jelszó.';
 $a->strings['Invalid email.'] = 'Érvénytelen e-mail-cím.';
 $a->strings['Cannot change to that email.'] = 'Nem lehet megváltoztatni arra az e-mail-címre.';
 $a->strings['Settings were not updated.'] = 'A beállítások nem lettek frissítve.';
-$a->strings['Contact CSV file upload error'] = 'Partner CSV-fájl feltöltési hiba';
-$a->strings['Importing Contacts done'] = 'A partnerek importálása kész';
 $a->strings['Relocate message has been send to your contacts'] = 'Az áthelyezési üzenet el lett küldve a partnereknek';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Nem található a profilja. Vegye fel a kapcsolatot a rendszergazdával.';
 $a->strings['Account for a service that automatically shares content based on user defined channels.'] = 'Fiók egy olyan szolgáltatáshoz, amely automatikusan megosztja a tartalmat a felhasználó által meghatározott csatornák alapján.';
@ -2543,9 +2542,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Mellőzött partnerek
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Nem látja a mellőzött partnerektől érkező bejegyzéseket. Viszont továbbra is látja a hozzászólásaikat. Ez a beállítás azt vezérli, hogy továbbra is szeretne-e olyan normál értesítéseket kapni vagy sem, amelyeket mellőzött partnerek okoznak.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Speciális fióktípus vagy oldaltípus beállítások';
 $a->strings['Change the behaviour of this account for special situations'] = 'A fiók viselkedésének megváltoztatása bizonyos helyzetekre.';
-$a->strings['Import Contacts'] = 'Partnerek importálása';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Töltsön fel egy olyan CSV-fájlt, amely a követett fiókok kezelőjét tartalmazza az első oszlopban, ahogy a régi fiókból exportálta.';
-$a->strings['Upload File'] = 'Fájl feltöltése';
 $a->strings['Relocate'] = 'Áthelyezés';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Ha áthelyezte ezt a profilt egy másik kiszolgálóról, és néhány partnere nem kapta meg a frissítéseket, akkor próbálja meg megnyomni ezt a gombot.';
 $a->strings['Resend relocate message to contacts'] = 'Áthelyezési üzenet küldése a partnereknek';
@ -2613,8 +2609,6 @@ $a->strings['API: Automatically links at the end of the post as attached posts']
 $a->strings['When activated, added links at the end of the post react the same way as added links in the web interface.'] = 'Ha aktiválva van, akkor a bejegyzés végéhez hozzáadott hivatkozások ugyanúgy reagálnak, mint a webes felületen hozzáadott hivatkozások.';
 $a->strings['Article Mode'] = 'Cikk mód';
 $a->strings['Controls how posts with titles are transmitted. Mastodon and its forks don\'t display the content of these posts if the post is created in the correct (default) way.'] = 'Azt vezérli, hogy a címekkel rendelkező bejegyzések hogyan kerülnek továbbításra. A Mastodon és elágaztatásai nem jelenítik meg ezeknek a bejegyzéseknek a tartalmát, ha a bejegyzést a megfelelő (alapértelmezett) módon hozták létre.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Az örökölt ActivityPub/GNU Social fiókja';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Ha megadja itt a régi, egy ActivityPub alapú rendszerből származó fiókja nevét, illetve a GNU Social vagy Statusnet fiókja nevét (felhasználó@tartomány.tld formátumban), akkor a partnerei automatikusan hozzá lesznek adva. A mező ki lesz ürítve, ha elkészült.';
 $a->strings['Email/Mailbox Setup'] = 'E-mail vagy postafiók-beállítások';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Ha e-mailes partnerekkel szeretne kommunikálni ezen szolgáltatás használatával (opcionális), akkor adja meg, hogy hogyan kell kapcsolódni a postafiókjához.';
 $a->strings['Last successful email check:'] = 'Legutóbbi sikeres e-mail-ellenőrzés:';
@ -2628,6 +2622,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Nyilvános bejegyzés
 $a->strings['Action after import:'] = 'Importálás utáni művelet:';
 $a->strings['Move to folder'] = 'Áthelyezés mappába';
 $a->strings['Move to folder:'] = 'Áthelyezés mappába:';
+$a->strings['Contact CSV file upload error'] = 'Partner CSV-fájl feltöltési hiba';
+$a->strings['Importing Contacts done'] = 'A partnerek importálása kész';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Töltsön fel egy olyan CSV-fájlt, amely a követett fiókok kezelőjét tartalmazza az első oszlopban, ahogy a régi fiókból exportálta.';
+$a->strings['Upload File'] = 'Fájl feltöltése';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Az örökölt ActivityPub/GNU Social fiókja';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Ha megadja itt a régi, egy ActivityPub alapú rendszerből származó fiókja nevét, illetve a GNU Social vagy Statusnet fiókja nevét (felhasználó@tartomány.tld formátumban), akkor a partnerei automatikusan hozzá lesznek adva. A mező ki lesz ürítve, ha elkészült.';
 $a->strings['Delegation successfully granted.'] = 'A meghatalmazás sikeresen megadva.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'A fölérendelt felhasználó nem található, nem érhető el vagy a jelszó nem egyezik.';
 $a->strings['Delegation successfully revoked.'] = 'A meghatalmazás sikeresen visszavonva.';
--- a/view/lang/is/messages.po
+++ b/view/lang/is/messages.po
--- a/view/lang/it/messages.po
+++ b/view/lang/it/messages.po
--- a/view/lang/it/strings.php
+++ b/view/lang/it/strings.php
@ -1121,6 +1121,7 @@ $a->strings['Display'] = 'Visualizzazione';
 $a->strings['Social Networks'] = 'Social Networks';
 $a->strings['Manage Accounts'] = 'Gestisci Account';
 $a->strings['Connected apps'] = 'Applicazioni collegate';
+$a->strings['Import Contacts'] = 'Importa Contatti';
 $a->strings['Export personal data'] = 'Esporta dati personali';
 $a->strings['Remove account'] = 'Rimuovi account';
 $a->strings['This page is missing a url parameter.'] = 'A questa pagina manca il parametro url.';
@ -1785,8 +1786,6 @@ $a->strings['Wrong Password.'] = 'Password Sbagliata.';
 $a->strings['Invalid email.'] = 'Email non valida.';
 $a->strings['Cannot change to that email.'] = 'Non puoi usare quella email.';
 $a->strings['Settings were not updated.'] = 'Le impostazioni non sono state aggiornate.';
-$a->strings['Contact CSV file upload error'] = 'Errore nel caricamento del file CSV dei contatti';
-$a->strings['Importing Contacts done'] = 'Importazione dei Contatti riuscita';
 $a->strings['Relocate message has been send to your contacts'] = 'Il messaggio di trasloco è stato inviato ai tuoi contatti';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Impossibile trovare il tuo profilo. Contatta il tuo amministratore.';
 $a->strings['Personal Page Subtypes'] = 'Sottotipi di Pagine Personali';
@ -1868,9 +1867,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Mostra notifiche dai co
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Non vedi i messaggi da contatti ignorati. Ma puoi ancora vedere i loro commenti. Questa impostazione controlla se vuoi o meno continuare a ricevere notifiche regolari che sono causate dai contatti ignorati.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Impostazioni avanzate Account/Tipo di pagina';
 $a->strings['Change the behaviour of this account for special situations'] = 'Modifica il comportamento di questo account in situazioni speciali';
-$a->strings['Import Contacts'] = 'Importa Contatti';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Carica un file CSV che contiene gli indirizzi dei tuoi account seguiti nella prima colonna che hai esportato dal vecchio account.';
-$a->strings['Upload File'] = 'Carica File';
 $a->strings['Relocate'] = 'Trasloca';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Se hai spostato questo profilo da un\'altro server, e alcuni dei tuoi contatti non ricevono i tuoi aggiornamenti, prova a premere questo bottone.';
 $a->strings['Resend relocate message to contacts'] = 'Invia nuovamente il messaggio di trasloco ai contatti';
@ -1889,8 +1885,6 @@ $a->strings['Enable simple text shortening'] = 'Abilita accorciamento semplice d
 $a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Normalmente il sistema accorcia i messaggi alla successiva interruzione di linea. Se questa opzione è abilitata il sistema accorcerà il testo al raggiungimento del limite massimo di caratteri.';
 $a->strings['Attach the link title'] = 'Allega il titolo del collegamento';
 $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Quando attivato, il titolo del collegamento allegato sarà aggiunto come titolo dei messaggi su Diaspora. Questo è più che altro utile con i contatti "remoti di sè stessi" che condividono il contenuto del flusso.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Il tuo vecchio account ActivityPub/GNU Social ';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Se inserisci il nome del tuo vecchio account su un sistema basato su ActivityPub o del tuo vecchio account GNU Social/Statusnet (nel formato utente@dominio.tld), i tuoi contatti verranno importati automaticamente. Il campo verrà svuotato una volta terminata l\'operazione.';
 $a->strings['Email/Mailbox Setup'] = 'Impostazioni email';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Se vuoi comunicare con i contatti email usando questo servizio, specifica come collegarti alla tua casella di posta. (opzionale)';
 $a->strings['Last successful email check:'] = 'Ultimo controllo email eseguito con successo:';
@ -1904,6 +1898,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Invia i messaggi pubb
 $a->strings['Action after import:'] = 'Azione dopo importazione:';
 $a->strings['Move to folder'] = 'Sposta nella cartella';
 $a->strings['Move to folder:'] = 'Sposta nella cartella:';
+$a->strings['Contact CSV file upload error'] = 'Errore nel caricamento del file CSV dei contatti';
+$a->strings['Importing Contacts done'] = 'Importazione dei Contatti riuscita';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Carica un file CSV che contiene gli indirizzi dei tuoi account seguiti nella prima colonna che hai esportato dal vecchio account.';
+$a->strings['Upload File'] = 'Carica File';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Il tuo vecchio account ActivityPub/GNU Social ';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Se inserisci il nome del tuo vecchio account su un sistema basato su ActivityPub o del tuo vecchio account GNU Social/Statusnet (nel formato utente@dominio.tld), i tuoi contatti verranno importati automaticamente. Il campo verrà svuotato una volta terminata l\'operazione.';
 $a->strings['Delegation successfully granted.'] = 'Delega concessa con successo.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Utente principale non trovato, non disponibile o la password non corrisponde.';
 $a->strings['Delegation successfully revoked.'] = 'Delega revocata con successo.';
--- a/view/lang/ja/messages.po
+++ b/view/lang/ja/messages.po
--- a/view/lang/ja/strings.php
+++ b/view/lang/ja/strings.php
@ -969,6 +969,7 @@ $a->strings['Display'] = '表示';
 $a->strings['Social Networks'] = 'ソーシャルネットワーク';
 $a->strings['Manage Accounts'] = 'アカウントの管理';
 $a->strings['Connected apps'] = '接続されたアプリ';
+$a->strings['Import Contacts'] = 'コンタクトをインポートする';
 $a->strings['Export personal data'] = '個人データのエクスポート';
 $a->strings['Remove account'] = 'アカウントを削除';
 $a->strings['This page is missing a url parameter.'] = 'このページにはurlパラメーターがありません。';
@ -1482,8 +1483,6 @@ $a->strings['Wrong Password.'] = 'パスワードが間違っています。';
 $a->strings['Invalid email.'] = '無効なメール。';
 $a->strings['Cannot change to that email.'] = 'そのメールに変更できません。';
 $a->strings['Settings were not updated.'] = '設定が更新されませんでした。';
-$a->strings['Contact CSV file upload error'] = 'アップロードエラー：コンタクトCSVファイル';
-$a->strings['Importing Contacts done'] = 'コンタクトのインポートが完了しました';
 $a->strings['Relocate message has been send to your contacts'] = '再配置メッセージがコンタクトに送信されました';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'プロフィールが見つかりません。管理者に連絡してください。';
 $a->strings['Personal Page Subtypes'] = '個人ページのサブタイプ';
@ -1562,9 +1561,6 @@ $a->strings['Show notifications of ignored contacts'] = '無視されたコン
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = '無視されたコンタクトからの投稿は表示されません。しかし、相手のコメントは表示されます。この設定では、無視されたコンタクトからの通知を定期的に受け取るかどうかを設定します。';
 $a->strings['Advanced Account/Page Type Settings'] = 'アカウント/ページタイプの詳細設定';
 $a->strings['Change the behaviour of this account for special situations'] = '特別な状況でこのアカウントの動作を変更する';
-$a->strings['Import Contacts'] = 'コンタクトをインポートする';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = '古いアカウントからエクスポートしたCSVファイルをアップロードします。これは最初の列に、フォローしているアカウントのハンドルを含みます。';
-$a->strings['Upload File'] = 'ファイルをアップロード';
 $a->strings['Relocate'] = '再配置';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'このプロフィールを別のサーバーから移動し、コンタクトの一部が更新を受信しない場合は、このボタンを押してみてください。';
 $a->strings['Resend relocate message to contacts'] = '再配置メッセージをコンタクトに再送信する';
@ -1592,6 +1588,10 @@ $a->strings['Send public posts to all email contacts:'] = 'すべてのメール
 $a->strings['Action after import:'] = 'インポート後のアクション：';
 $a->strings['Move to folder'] = 'フォルダへ移動';
 $a->strings['Move to folder:'] = 'フォルダへ移動：';
+$a->strings['Contact CSV file upload error'] = 'アップロードエラー：コンタクトCSVファイル';
+$a->strings['Importing Contacts done'] = 'コンタクトのインポートが完了しました';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = '古いアカウントからエクスポートしたCSVファイルをアップロードします。これは最初の列に、フォローしているアカウントのハンドルを含みます。';
+$a->strings['Upload File'] = 'ファイルをアップロード';
 $a->strings['Delegation successfully granted.'] = '委任が正常に許可されました。';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = '親ユーザーが見つからないか、利用できないか、パスワードが一致しません。';
 $a->strings['Delegation successfully revoked.'] = '委任が正常に取り消されました。';
--- a/view/lang/nl/messages.po
+++ b/view/lang/nl/messages.po
--- a/view/lang/nl/strings.php
+++ b/view/lang/nl/strings.php
@ -966,6 +966,7 @@ $a->strings['Display'] = 'Weergave';
 $a->strings['Social Networks'] = 'Sociale netwerken';
 $a->strings['Manage Accounts'] = 'Beheer Gebruikers';
 $a->strings['Connected apps'] = 'Verbonden applicaties';
+$a->strings['Import Contacts'] = 'Importeer contacten';
 $a->strings['Export personal data'] = 'Persoonlijke gegevens exporteren';
 $a->strings['Remove account'] = 'Account verwijderen';
 $a->strings['This page is missing a url parameter.'] = 'Deze pagina mist een url-parameter.';
@ -1462,7 +1463,6 @@ $a->strings['Wrong Password.'] = 'Verkeerd wachtwoord.';
 $a->strings['Invalid email.'] = 'Ongeldig email adres.';
 $a->strings['Cannot change to that email.'] = 'Kan niet naar dat email adres veranderen.';
 $a->strings['Settings were not updated.'] = 'Wijziging instellingen is niet opgeslagen.';
-$a->strings['Importing Contacts done'] = 'Importeren Contacten voltooid';
 $a->strings['Relocate message has been send to your contacts'] = 'Verhuis boodschap is verzonden naar je contacten';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Kan je profiel niet vinden. Contacteer alsjeblieft je beheerder.';
 $a->strings['Personal Page Subtypes'] = 'Persoonlijke Pagina Subtypes';
@ -1539,9 +1539,6 @@ $a->strings['Show detailled notifications'] = 'Toon gedetailleerde notificaties'
 $a->strings['Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.'] = 'Standaard worden notificaties samengevoegd in een enkele notificatie per item. Als je deze parameter activeert wordt elke notificatie getoond.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Geavanceerde Account/Pagina Type Instellingen';
 $a->strings['Change the behaviour of this account for special situations'] = 'Pas het gedrag van dit account aan voor speciale situaties';
-$a->strings['Import Contacts'] = 'Importeer contacten';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Upload een CSV-bestand met de handle van uw gevolgde gebruikers in de eerste kolom die u uit de oude gebruiker hebt geëxporteerd.';
-$a->strings['Upload File'] = 'Upload bestand';
 $a->strings['Relocate'] = 'Verhuis';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Als je je profiel van een andere server hebt verhuisd, en er zijn contacten die geen updates van je ontvangen, probeer dan eens deze knop.';
 $a->strings['Resend relocate message to contacts'] = 'Stuur verhuis boodschap naar contacten';
@ -1569,6 +1566,9 @@ $a->strings['Send public posts to all email contacts:'] = 'Openbare posts naar a
 $a->strings['Action after import:'] = 'Actie na importeren:';
 $a->strings['Move to folder'] = 'Naar map verplaatsen';
 $a->strings['Move to folder:'] = 'Verplaatsen naar map:';
+$a->strings['Importing Contacts done'] = 'Importeren Contacten voltooid';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Upload een CSV-bestand met de handle van uw gevolgde gebruikers in de eerste kolom die u uit de oude gebruiker hebt geëxporteerd.';
+$a->strings['Upload File'] = 'Upload bestand';
 $a->strings['Delegation successfully granted.'] = 'Delegatie met succes verleend.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Brongebruiker niet gevonden, niet beschikbaar of wachtwoord komt niet overeen.';
 $a->strings['Delegation successfully revoked.'] = 'Delegatie is ingetrokken.';
--- a/view/lang/pl/messages.po
+++ b/view/lang/pl/messages.po
--- a/view/lang/pl/strings.php
+++ b/view/lang/pl/strings.php
@ -1209,6 +1209,7 @@ $a->strings['Display'] = 'Wygląd';
 $a->strings['Social Networks'] = 'Portale społecznościowe';
 $a->strings['Manage Accounts'] = 'Zarządzanie kontami';
 $a->strings['Connected apps'] = 'Powiązane aplikacje';
+$a->strings['Import Contacts'] = 'Import kontaktów';
 $a->strings['Export personal data'] = 'Eksportuj dane osobiste';
 $a->strings['Remove account'] = 'Usuń konto';
 $a->strings['This page is missing a url parameter.'] = 'Na tej stronie brakuje parametru url.';
@ -1917,8 +1918,6 @@ $a->strings['Wrong Password.'] = 'Nieprawidłowe hasło.';
 $a->strings['Invalid email.'] = 'Niepoprawny e-mail.';
 $a->strings['Cannot change to that email.'] = 'Nie można zmienić tego e-maila.';
 $a->strings['Settings were not updated.'] = 'Ustawienia nie zostały zaktualizowane.';
-$a->strings['Contact CSV file upload error'] = 'Kontakt z plikiem CSV błąd przekazywania plików';
-$a->strings['Importing Contacts done'] = 'Importowanie kontaktów zakończone';
 $a->strings['Relocate message has been send to your contacts'] = 'Przeniesienie wiadomości zostało wysłane do Twoich kontaktów';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Nie można znaleźć Twojego profilu. Skontaktuj się z administratorem.';
 $a->strings['Personal Page Subtypes'] = 'Podtypy osobistych stron';
@ -2006,9 +2005,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Pokaż powiadomienia o
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Nie widzisz wpisów od ignorowanych kontaktów. Ale nadal widzisz ich komentarze. To ustawienie określa, czy chcesz nadal otrzymywać regularne powiadomienia, które są powodowane przez ignorowane kontakty, czy nie.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Zaawansowane ustawienia konta/rodzaju strony';
 $a->strings['Change the behaviour of this account for special situations'] = 'Zmień zachowanie tego konta w sytuacjach specjalnych';
-$a->strings['Import Contacts'] = 'Import kontaktów';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Prześlij plik CSV zawierający obsługę obserwowanych kont w pierwszej kolumnie wyeksportowanej ze starego konta.';
-$a->strings['Upload File'] = 'Prześlij plik';
 $a->strings['Relocate'] = 'Przeniesienie';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Jeśli ten profil został przeniesiony z innego serwera, a niektóre z Twoich kontaktów nie otrzymają aktualizacji, spróbuj nacisnąć ten przycisk.';
 $a->strings['Resend relocate message to contacts'] = 'Wyślij ponownie przenieść wiadomości do kontaktów';
@ -2032,8 +2028,6 @@ $a->strings['Enable simple text shortening'] = 'Włącz proste skracanie tekstu'
 $a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Zwykle system skraca wpisy przy następnym wysunięciu wiersza. Jeśli ta opcja jest włączona, system skróci tekst do maksymalnego limitu znaków.';
 $a->strings['Attach the link title'] = 'Dołącz tytuł linku';
 $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Po aktywacji tytuł dołączonego linku zostanie dodany jako tytuł postów do Diaspory. Jest to szczególnie pomocne w przypadku kontaktów „zdalnych”, które udostępniają treść kanału.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Twoje stare konto ActivityPub/GNU Social';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Jeśli wprowadzisz tutaj swoją starą nazwę konta z systemu opartego na ActivityPub lub nazwę konta GNU Social/Statusnet (w formacie użytkownik@domena.tld), Twoje kontakty zostaną dodane automatycznie. Po zakończeniu pole zostanie opróżnione.';
 $a->strings['Email/Mailbox Setup'] = 'Ustawienia  emaila/skrzynki mailowej';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Jeśli chcesz komunikować się z kontaktami e-mail za pomocą tej usługi (opcjonalnie), określ sposób łączenia się ze skrzynką pocztową.';
 $a->strings['Last successful email check:'] = 'Ostatni sprawdzony e-mail:';
@ -2047,6 +2041,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Wyślij publiczny wpi
 $a->strings['Action after import:'] = 'Akcja po zaimportowaniu:';
 $a->strings['Move to folder'] = 'Przenieś do katalogu';
 $a->strings['Move to folder:'] = 'Przenieś do katalogu:';
+$a->strings['Contact CSV file upload error'] = 'Kontakt z plikiem CSV błąd przekazywania plików';
+$a->strings['Importing Contacts done'] = 'Importowanie kontaktów zakończone';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Prześlij plik CSV zawierający obsługę obserwowanych kont w pierwszej kolumnie wyeksportowanej ze starego konta.';
+$a->strings['Upload File'] = 'Prześlij plik';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Twoje stare konto ActivityPub/GNU Social';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Jeśli wprowadzisz tutaj swoją starą nazwę konta z systemu opartego na ActivityPub lub nazwę konta GNU Social/Statusnet (w formacie użytkownik@domena.tld), Twoje kontakty zostaną dodane automatycznie. Po zakończeniu pole zostanie opróżnione.';
 $a->strings['Delegation successfully granted.'] = 'Delegacja została pomyślnie przyznana.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Nie znaleziono użytkownika nadrzędnego, jest on niedostępny lub hasło nie pasuje.';
 $a->strings['Delegation successfully revoked.'] = 'Delegacja została pomyślnie odwołana.';
--- a/view/lang/ru/messages.po
+++ b/view/lang/ru/messages.po
--- a/view/lang/ru/strings.php
+++ b/view/lang/ru/strings.php
@ -1444,6 +1444,7 @@ $a->strings['Social Networks'] = 'Социальные сети';
 $a->strings['Manage Accounts'] = 'Управление учётными записями';
 $a->strings['Connected apps'] = 'Подключенные приложения';
 $a->strings['Remote servers'] = 'Другие серверы';
+$a->strings['Import Contacts'] = 'Импорт контактов';
 $a->strings['Export personal data'] = 'Экспорт личных данных';
 $a->strings['Remove account'] = 'Удалить аккаунт';
 $a->strings['The post was created'] = 'Запись создана';
@ -2250,8 +2251,6 @@ $a->strings['Wrong Password.'] = 'Неправильный пароль';
 $a->strings['Invalid email.'] = 'Неправильный адрес почты';
 $a->strings['Cannot change to that email.'] = 'Нельзя установить этот адрес почты';
 $a->strings['Settings were not updated.'] = 'Настройки не были изменены.';
-$a->strings['Contact CSV file upload error'] = 'Ошибка загрузки CSV с контактами';
-$a->strings['Importing Contacts done'] = 'Импорт контактов завершён';
 $a->strings['Relocate message has been send to your contacts'] = 'Перемещённое сообщение было отправлено списку контактов';
 $a->strings['Unable to find your profile. Please contact your admin.'] = 'Не получается найти ваш профиль. Пожалуйста свяжитесь с администратором.';
 $a->strings['Account for a service that automatically shares content based on user defined channels.'] = 'Учётная запись, которая автоматически публикует контент из каналов, созданных пользователем.';
@ -2347,9 +2346,6 @@ $a->strings['Show notifications of ignored contacts'] = 'Показывать у
 $a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'Вы не видите записи от игнорируемых контактов, но вы видите их комментарии. Эта настройка определяет, хотите ли вы получать уведомления от действий игнорируемых контактов или нет.';
 $a->strings['Advanced Account/Page Type Settings'] = 'Расширенные настройки учётной записи';
 $a->strings['Change the behaviour of this account for special situations'] = 'Измените поведение этого аккаунта в специальных ситуациях';
-$a->strings['Import Contacts'] = 'Импорт контактов';
-$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Загрузите файл CSV, который содержит адреса ваших контактов в первой колонке. Вы можете экспортировать его из вашей старой учётной записи.';
-$a->strings['Upload File'] = 'Загрузить файл';
 $a->strings['Relocate'] = 'Перемещение';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Если вы переместили эту анкету с другого сервера, и некоторые из ваших контактов не получили ваши обновления, попробуйте нажать эту кнопку.';
 $a->strings['Resend relocate message to contacts'] = 'Отправить перемещённые сообщения контактам';
@ -2417,8 +2413,6 @@ $a->strings['API: Automatically links at the end of the post as attached posts']
 $a->strings['When activated, added links at the end of the post react the same way as added links in the web interface.'] = 'Если включено, ссылки в конце записей будут обрабатываться так же, как ссылки, добавленные через веб-интерфейс.';
 $a->strings['Article Mode'] = 'Режим статей';
 $a->strings['Controls how posts with titles are transmitted. Mastodon and its forks don\'t display the content of these posts if the post is created in the correct (default) way.'] = 'Как будут передаваться записи, у которых указан заголовок. Mastodon и похожие платформы не показывают содержимое таких записей, если они созданы в обычном формате (по-умолчанию), оставляя лишь ссылку на них.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Ваша старая учётная запись ActivityPub/GNU Social';
-$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Если вы введете тут вашу старую учетную запись от платформы совместимой с ActivityPub или GNU Social/Statusnet (в виде пользователь@домен), ваши контакты оттуда будут автоматически добавлены. Поле будет очищено когда все контакты будут добавлены.';
 $a->strings['Email/Mailbox Setup'] = 'Настройка эл. почты / почтового ящика';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Если вы хотите общаться с Email контактами, используя этот сервис (по желанию), пожалуйста, уточните, как подключиться к вашему почтовому ящику.';
 $a->strings['Last successful email check:'] = 'Последняя успешная проверка электронной почты:';
@ -2432,6 +2426,12 @@ $a->strings['Send public posts to all email contacts:'] = 'Отправлять
 $a->strings['Action after import:'] = 'Действие после импорта:';
 $a->strings['Move to folder'] = 'Переместить в папку';
 $a->strings['Move to folder:'] = 'Переместить в папку:';
+$a->strings['Contact CSV file upload error'] = 'Ошибка загрузки CSV с контактами';
+$a->strings['Importing Contacts done'] = 'Импорт контактов завершён';
+$a->strings['Upload a CSV file that contains the handle of your followed accounts in the first column you exported from the old account.'] = 'Загрузите файл CSV, который содержит адреса ваших контактов в первой колонке. Вы можете экспортировать его из вашей старой учётной записи.';
+$a->strings['Upload File'] = 'Загрузить файл';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Ваша старая учётная запись ActivityPub/GNU Social';
+$a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Если вы введете тут вашу старую учетную запись от платформы совместимой с ActivityPub или GNU Social/Statusnet (в виде пользователь@домен), ваши контакты оттуда будут автоматически добавлены. Поле будет очищено когда все контакты будут добавлены.';
 $a->strings['Delegation successfully granted.'] = 'Делегирование успешно предоставлено.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Родительский пользователь не найден, недоступен или пароль не совпадает.';
 $a->strings['Delegation successfully revoked.'] = 'Делегирование успешно отменено.';
--- a/view/lang/sv/messages.po
+++ b/view/lang/sv/messages.po
--- a/view/lang/sv/strings.php
+++ b/view/lang/sv/strings.php
@ -730,6 +730,7 @@ $a->strings['Account'] = 'Konto';
 $a->strings['Display'] = 'Skärm';
 $a->strings['Social Networks'] = 'Sociala nätverk';
 $a->strings['Connected apps'] = 'Anslutna appar';
+$a->strings['Import Contacts'] = 'Importera kontakter';
 $a->strings['Export personal data'] = 'Exporter personlig data';
 $a->strings['Remove account'] = 'Ta bort konto';
 $a->strings['The post was created'] = 'Inlägget skapades';
@ -1079,8 +1080,6 @@ $a->strings['Someone liked your content'] = 'Någon gillade ditt innehåll';
 $a->strings['Someone shared your content'] = 'Någon delade ditt innehåll';
 $a->strings['Activate desktop notifications'] = 'Aktivera skrivbordsaviseringar';
 $a->strings['Show detailled notifications'] = 'Visa detaljerade aviseringar';
-$a->strings['Import Contacts'] = 'Importera kontakter';
-$a->strings['Upload File'] = 'Ladda upp fil';
 $a->strings['Relocate'] = 'Omlokalisera';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Om du har flyttat den här profilen från en annan server och några av dina kontakter inte får dina uppdateringar, försök att trycka på den här knappen.';
 $a->strings['Addon Settings'] = 'Inställningar för Tillägg';
@ -1103,6 +1102,7 @@ $a->strings['Send public posts to all email contacts:'] = 'Skicka publika inläg
 $a->strings['Action after import:'] = 'Åtgärd efter importering:';
 $a->strings['Move to folder'] = 'Flytta till mapp';
 $a->strings['Move to folder:'] = 'Flytta till mapp:';
+$a->strings['Upload File'] = 'Ladda upp fil';
 $a->strings['Potential Delegates'] = 'Potentiella delegater';
 $a->strings['No entries.'] = 'Inga poster.';
 $a->strings['Display Settings'] = 'Skärm-inställningar';
 @ -1 +1 @@
 .12-dev
 .02-dev