Merge pull request 'AT-Protocol: Configurable web frontend' (#1644) from heluecht/friendica-addons:atproto2 into develop

Reviewed-on: friendica/friendica-addons#1644

.woodpecker/.code_standards_check.yml

@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -56,6 +56,10 @@ pipeline:
       - /tmp/drone-cache:/tmp/cache
     when:
       event: pull_request
+  phpstan:
+    image: friendicaci/php8.3:php8.3.3
+    commands:
+      - ./bin/composer.phar run phpstan;
   check:
     image: friendicaci/php-cs
     commands:

.woodpecker/.continuous-deployment-allinone.yml

@@ -0,0 +1,115 @@
+# This prevents executing this pipeline at other servers than ci.friendi.ca
+labels:
+  location: friendica
+  type: releaser
+
+skip_clone: true
+
+steps:
+  clone_friendica_base:
+    image: alpine/git
+    commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
+      - git clone https://github.com/friendica/friendica.git .
+      - git checkout $CI_COMMIT_BRANCH
+    when:
+      repo: friendica/friendica-addons
+      branch: [ develop, '*-rc' ]
+      event: push
+  clone_friendica_addon:
+    image: alpine/git
+    commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git clone $CI_REPO_CLONE_URL addon
+      - cd addon/
+      - git checkout $CI_COMMIT_BRANCH
+      - git fetch origin $CI_COMMIT_REF
+      - git merge $CI_COMMIT_SHA
+    when:
+      repo: friendica/friendica-addons
+      branch: [ develop, '*-rc' ]
+      event: push
+  restore_cache:
+    image: meltwater/drone-cache:dev
+    settings:
+      backend: "filesystem"
+      restore: true
+      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
+      archive_format: "gzip"
+      mount:
+        - '.composer'
+    volumes:
+      - /tmp/drone-cache:/tmp/cache
+    when:
+      repo: friendica/friendica-addons
+      branch: [ develop, '*-rc' ]
+      event: push
+  composer_install:
+    image: friendicaci/php8.2:php8.2.28
+    commands:
+      - export COMPOSER_HOME=.composer
+      - composer validate
+      - composer install --no-dev --optimize-autoloader
+    volumes:
+      - /etc/hosts:/etc/hosts
+    when:
+      repo: friendica/friendica-addons
+      branch: [ develop, '*-rc' ]
+      event: push
+  create_artifacts:
+    image: debian
+    commands:
+      - apt-get update
+      - apt-get install bzip2
+      - mkdir ./build
+      - export VERSION="$(cat VERSION)"
+      - export RELEASE="friendica-all-in-one-$VERSION"
+      - export ARTIFACT="$RELEASE.tar.gz"
+      - tar
+        --exclude='.tx'
+        --exclude='.git'
+        --exclude='.editorconfig'
+        --exclude='.gitattributes'
+        --exclude='.gitignore'
+        --exclude='.woodpecker'
+        --exclude='**/*/messages.po'
+        -cvzf ./build/$ARTIFACT /
+      - cd ./build
+      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
+      - chmod 664 ./*
+      - ls -lh
+      - cat "$ARTIFACT.sum256"
+      - sha256sum "$ARTIFACT"
+    when:
+      repo: friendica/friendica-addons
+      branch: [ develop, '*-rc' ]
+      event: push
+  sign_artifacts:
+    image: plugins/gpgsign
+    settings:
+      key:
+        from_secret: gpg_key
+      passphrase:
+        from_secret: gpg_password
+      files:
+        - build/*
+      exclude:
+        - build/*.sum256
+      detach_sign: true
+    when:
+      repo: friendica/friendica-addons
+      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-addons
+      branch: [ develop, '*-rc' ]
+      event: push

.woodpecker/.continuous-deployment.yml

@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -48,7 +48,7 @@ pipeline:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

.woodpecker/.messages.po_check.yml

@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:

.woodpecker/.phpunit.yml

@@ -5,11 +5,13 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.27
+      PHP_VERSION: 8.1.31
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
+      PHP_VERSION: 8.2.28
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.3
+      PHP_VERSION: 8.3.17
+    - PHP_MAJOR_VERSION: 8.4
+      PHP_VERSION: 8.4.5
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
@@ -17,7 +19,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:

.woodpecker/.releaser.yml

@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
@@ -45,7 +45,7 @@ pipeline:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

README.md

@@ -24,6 +24,6 @@ See the [documentation](https://github.com/friendica/friendica/blob/stable/doc/A
 ## Translation
 
 Addons can be translated like any other part of Friendica.
-Translation for addons is done at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).
+Translation for addons is done at [the Transifex Friendica page](https://app.transifex.com/Friendica/friendica/dashboard/).
 
 Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/stable/doc/translations.md#addon).

advancedcontentfilter/advancedcontentfilter.php

@@ -33,16 +33,13 @@
  *
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -64,7 +61,7 @@ function advancedcontentfilter_install()
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	Logger::notice('installed advancedcontentfilter');
+	DI::logger()->notice('installed advancedcontentfilter');
 }
 
 /*
@@ -123,21 +120,22 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	if (!DI::userSession()->getLocalUserId()) {
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
+	if (!$uid) {
 		return;
 	}
 
 	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
+	$rules = DI::cache()->get('rules_' . $uid);
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
+			['uid' => $uid, 'active' => true]
 		));
 
-		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
+		DI::cache()->set('rules_' . $uid, $rules);
 	}
 
 	if ($rules) {
@@ -192,9 +190,30 @@ function advancedcontentfilter_init()
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
 		$slim = \Slim\Factory\AppFactory::create();
 
-		require __DIR__ . '/src/middlewares.php';
+		/**
+		 * The routing middleware should be added before the ErrorMiddleware
+		 * Otherwise exceptions thrown from it will not be handled
+		 */
+		$slim->addRoutingMiddleware();
+
+		$slim->addErrorMiddleware(true, true, true, DI::logger());
+
+		// register routes
+		$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
+			$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
+				$app->get('', 'advancedcontentfilter_get_rules');
+				$app->post('', 'advancedcontentfilter_post_rules');
+
+				$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
+				$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
+				$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+			});
+
+			$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
+				$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+			});
+		});
 
-		require __DIR__ . '/src/routes.php';
 		$slim->run();
 
 		exit;
@@ -252,7 +271,7 @@ function advancedcontentfilter_content()
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
+			'$current_theme' => DI::appHelper()->getCurrentTheme(),
 			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);

advancedcontentfilter/lang/bg/messages.po

@@ -0,0 +1,161 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: advancedcontentfilter.php:154
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr ""
+
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+msgid "Advanced Content Filter"
+msgstr ""
+
+#: advancedcontentfilter.php:224
+msgid "Back to Addon Settings"
+msgstr ""
+
+#: advancedcontentfilter.php:226
+msgid "Add a Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:227
+msgid "Help"
+msgstr ""
+
+#: advancedcontentfilter.php:228
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the help page."
+msgstr ""
+
+#: advancedcontentfilter.php:229
+msgid "Your rules"
+msgstr ""
+
+#: advancedcontentfilter.php:230
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+
+#: advancedcontentfilter.php:231
+msgid "Disabled"
+msgstr ""
+
+#: advancedcontentfilter.php:232
+msgid "Enabled"
+msgstr ""
+
+#: advancedcontentfilter.php:233
+msgid "Disable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:234
+msgid "Enable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:235
+msgid "Edit this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:236
+msgid "Edit the rule"
+msgstr ""
+
+#: advancedcontentfilter.php:237
+msgid "Save this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:238
+msgid "Delete this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:239
+msgid "Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:240
+msgid "Close"
+msgstr ""
+
+#: advancedcontentfilter.php:241
+msgid "Add new rule"
+msgstr ""
+
+#: advancedcontentfilter.php:242
+msgid "Rule Name"
+msgstr ""
+
+#: advancedcontentfilter.php:243
+msgid "Rule Expression"
+msgstr ""
+
+#: advancedcontentfilter.php:244
+msgid "Cancel"
+msgstr ""
+
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:363
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:377
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:408
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:431
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:441
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:449
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

advancedcontentfilter/lang/eo/messages.po

@@ -0,0 +1,161 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: advancedcontentfilter.php:154
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr ""
+
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+msgid "Advanced Content Filter"
+msgstr ""
+
+#: advancedcontentfilter.php:224
+msgid "Back to Addon Settings"
+msgstr ""
+
+#: advancedcontentfilter.php:226
+msgid "Add a Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:227
+msgid "Help"
+msgstr ""
+
+#: advancedcontentfilter.php:228
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the help page."
+msgstr ""
+
+#: advancedcontentfilter.php:229
+msgid "Your rules"
+msgstr ""
+
+#: advancedcontentfilter.php:230
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+
+#: advancedcontentfilter.php:231
+msgid "Disabled"
+msgstr ""
+
+#: advancedcontentfilter.php:232
+msgid "Enabled"
+msgstr ""
+
+#: advancedcontentfilter.php:233
+msgid "Disable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:234
+msgid "Enable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:235
+msgid "Edit this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:236
+msgid "Edit the rule"
+msgstr ""
+
+#: advancedcontentfilter.php:237
+msgid "Save this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:238
+msgid "Delete this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:239
+msgid "Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:240
+msgid "Close"
+msgstr ""
+
+#: advancedcontentfilter.php:241
+msgid "Add new rule"
+msgstr ""
+
+#: advancedcontentfilter.php:242
+msgid "Rule Name"
+msgstr ""
+
+#: advancedcontentfilter.php:243
+msgid "Rule Expression"
+msgstr ""
+
+#: advancedcontentfilter.php:244
+msgid "Cancel"
+msgstr ""
+
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:363
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:377
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:408
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:431
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:441
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:449
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/eo/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

advancedcontentfilter/lang/et/messages.po

@@ -0,0 +1,161 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Estonian (https://app.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"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: advancedcontentfilter.php:154
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr ""
+
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+msgid "Advanced Content Filter"
+msgstr ""
+
+#: advancedcontentfilter.php:224
+msgid "Back to Addon Settings"
+msgstr ""
+
+#: advancedcontentfilter.php:226
+msgid "Add a Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:227
+msgid "Help"
+msgstr ""
+
+#: advancedcontentfilter.php:228
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the help page."
+msgstr ""
+
+#: advancedcontentfilter.php:229
+msgid "Your rules"
+msgstr ""
+
+#: advancedcontentfilter.php:230
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+
+#: advancedcontentfilter.php:231
+msgid "Disabled"
+msgstr ""
+
+#: advancedcontentfilter.php:232
+msgid "Enabled"
+msgstr ""
+
+#: advancedcontentfilter.php:233
+msgid "Disable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:234
+msgid "Enable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:235
+msgid "Edit this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:236
+msgid "Edit the rule"
+msgstr ""
+
+#: advancedcontentfilter.php:237
+msgid "Save this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:238
+msgid "Delete this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:239
+msgid "Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:240
+msgid "Close"
+msgstr ""
+
+#: advancedcontentfilter.php:241
+msgid "Add new rule"
+msgstr ""
+
+#: advancedcontentfilter.php:242
+msgid "Rule Name"
+msgstr ""
+
+#: advancedcontentfilter.php:243
+msgid "Rule Expression"
+msgstr ""
+
+#: advancedcontentfilter.php:244
+msgid "Cancel"
+msgstr ""
+
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:363
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:377
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:408
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:431
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:441
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:449
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

advancedcontentfilter/lang/gd/messages.po

@@ -0,0 +1,161 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Gaelic, Scottish (https://app.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"
+"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"
+
+#: advancedcontentfilter.php:154
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr ""
+
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+msgid "Advanced Content Filter"
+msgstr ""
+
+#: advancedcontentfilter.php:224
+msgid "Back to Addon Settings"
+msgstr ""
+
+#: advancedcontentfilter.php:226
+msgid "Add a Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:227
+msgid "Help"
+msgstr ""
+
+#: advancedcontentfilter.php:228
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the help page."
+msgstr ""
+
+#: advancedcontentfilter.php:229
+msgid "Your rules"
+msgstr ""
+
+#: advancedcontentfilter.php:230
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+
+#: advancedcontentfilter.php:231
+msgid "Disabled"
+msgstr ""
+
+#: advancedcontentfilter.php:232
+msgid "Enabled"
+msgstr ""
+
+#: advancedcontentfilter.php:233
+msgid "Disable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:234
+msgid "Enable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:235
+msgid "Edit this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:236
+msgid "Edit the rule"
+msgstr ""
+
+#: advancedcontentfilter.php:237
+msgid "Save this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:238
+msgid "Delete this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:239
+msgid "Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:240
+msgid "Close"
+msgstr ""
+
+#: advancedcontentfilter.php:241
+msgid "Add new rule"
+msgstr ""
+
+#: advancedcontentfilter.php:242
+msgid "Rule Name"
+msgstr ""
+
+#: advancedcontentfilter.php:243
+msgid "Rule Expression"
+msgstr ""
+
+#: advancedcontentfilter.php:244
+msgid "Cancel"
+msgstr ""
+
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:363
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:377
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:408
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:431
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:441
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:449
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

advancedcontentfilter/lang/is/messages.po

@@ -0,0 +1,161 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: advancedcontentfilter.php:154
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr ""
+
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+msgid "Advanced Content Filter"
+msgstr ""
+
+#: advancedcontentfilter.php:224
+msgid "Back to Addon Settings"
+msgstr ""
+
+#: advancedcontentfilter.php:226
+msgid "Add a Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:227
+msgid "Help"
+msgstr ""
+
+#: advancedcontentfilter.php:228
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the help page."
+msgstr ""
+
+#: advancedcontentfilter.php:229
+msgid "Your rules"
+msgstr ""
+
+#: advancedcontentfilter.php:230
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+
+#: advancedcontentfilter.php:231
+msgid "Disabled"
+msgstr ""
+
+#: advancedcontentfilter.php:232
+msgid "Enabled"
+msgstr ""
+
+#: advancedcontentfilter.php:233
+msgid "Disable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:234
+msgid "Enable this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:235
+msgid "Edit this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:236
+msgid "Edit the rule"
+msgstr ""
+
+#: advancedcontentfilter.php:237
+msgid "Save this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:238
+msgid "Delete this rule"
+msgstr ""
+
+#: advancedcontentfilter.php:239
+msgid "Rule"
+msgstr ""
+
+#: advancedcontentfilter.php:240
+msgid "Close"
+msgstr ""
+
+#: advancedcontentfilter.php:241
+msgid "Add new rule"
+msgstr ""
+
+#: advancedcontentfilter.php:242
+msgid "Rule Name"
+msgstr ""
+
+#: advancedcontentfilter.php:243
+msgid "Rule Expression"
+msgstr ""
+
+#: advancedcontentfilter.php:244
+msgid "Cancel"
+msgstr ""
+
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:363
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:377
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:408
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:431
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:441
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:449
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/is/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

advancedcontentfilter/lang/pl/messages.po

@@ -6,7 +6,7 @@
 # Translators:
 # Waldemar Stoczkowski, 2018
 # Joe Doe, 2021
-# Piotr Strębski <strebski@gmail.com>, 2022
+# Bartosz Kozień, 2025
 # 
 #, fuzzy
 msgid ""
@@ -15,8 +15,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
+"Last-Translator: Bartosz Kozień, 2025\n"
+"Language-Team: Polish (https://app.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"
@@ -126,7 +126,7 @@ msgstr "Anuluj"
 
 #: advancedcontentfilter.php:295
 msgid "This addon requires this node having at least one post"
-msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
+msgstr "Ten dodatek wymaga, aby ta instancja miała co najmniej jeden wpis"
 
 #: advancedcontentfilter.php:325 advancedcontentfilter.php:336
 #: advancedcontentfilter.php:347 advancedcontentfilter.php:383

advancedcontentfilter/lang/pl/strings.php

@@ -27,7 +27,7 @@ $a->strings['Add new rule'] = 'Dodaj nową regułę';
 $a->strings['Rule Name'] = 'Nazwa reguły';
 $a->strings['Rule Expression'] = 'Wyrażanie reguły';
 $a->strings['Cancel'] = 'Anuluj';
-$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis';
+$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ta instancja miała co najmniej jeden wpis';
 $a->strings['You must be logged in to use this method'] = 'Musisz być zalogowany, aby skorzystać z tej metody';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Nieprawidłowy token zabezpieczający formularz, odśwież stronę.';
 $a->strings['The rule name and expression are required.'] = 'Nazwa reguły i wyrażenie są wymagane.';

advancedcontentfilter/src/middlewares.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-use Friendica\DI;
-
-/** @var $slim \Slim\App */
-
-/**
- * The routing middleware should be added before the ErrorMiddleware
- * Otherwise exceptions thrown from it will not be handled
- */
-$slim->addRoutingMiddleware();
-
-$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());

advancedcontentfilter/src/routes.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/* @var $slim Slim\App */
-$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
-	$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('', 'advancedcontentfilter_get_rules');
-		$app->post('', 'advancedcontentfilter_post_rules');
-
-		$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
-		$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
-		$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
-	});
-
-	$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
-	});
-});

audon/audon.php

@@ -6,6 +6,7 @@
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
+ * Status: Unsupported
  */
 
 use Friendica\Core\Hook;

birdavatar/birdavatar.php

@@ -6,9 +6,7 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -28,7 +26,7 @@ function birdavatar_install()
 	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-	Logger::info('registered birdavatar');
+	DI::logger()->info('registered birdavatar');
 }
 
 /**

blackout/blackout.php

@@ -44,9 +44,7 @@
  * THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -78,7 +76,7 @@ function blackout_redirect ($b)
 	}
 
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		Logger::notice('redirecting user to blackout page');
+		DI::logger()->notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }

blackout/lang/bg/messages.po

@@ -0,0 +1,66 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:97
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr ""
+
+#: blackout.php:99
+#, php-format
+msgid ""
+"Please double check the current settings for the blackout. It will begin on "
+"<strong>%s</strong> and end on <strong>%s</strong>."
+msgstr ""
+
+#: blackout.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: blackout.php:103
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:103
+msgid "All your visitors from the web will be redirected to this URL."
+msgstr ""
+
+#: blackout.php:104
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:104
+msgid ""
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr ""
+
+#: blackout.php:105
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:107
+msgid ""
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out while the blackout is "
+"still in place."
+msgstr ""

blackout/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

blackout/lang/eo/messages.po

@@ -0,0 +1,66 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:97
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr ""
+
+#: blackout.php:99
+#, php-format
+msgid ""
+"Please double check the current settings for the blackout. It will begin on "
+"<strong>%s</strong> and end on <strong>%s</strong>."
+msgstr ""
+
+#: blackout.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: blackout.php:103
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:103
+msgid "All your visitors from the web will be redirected to this URL."
+msgstr ""
+
+#: blackout.php:104
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:104
+msgid ""
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr ""
+
+#: blackout.php:105
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:107
+msgid ""
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out while the blackout is "
+"still in place."
+msgstr ""

blackout/lang/eo/strings.php

@@ -1,3 +1,7 @@
-<?php
-
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

blackout/lang/et/messages.po

@@ -0,0 +1,66 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:97
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr ""
+
+#: blackout.php:99
+#, php-format
+msgid ""
+"Please double check the current settings for the blackout. It will begin on "
+"<strong>%s</strong> and end on <strong>%s</strong>."
+msgstr ""
+
+#: blackout.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: blackout.php:103
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:103
+msgid "All your visitors from the web will be redirected to this URL."
+msgstr ""
+
+#: blackout.php:104
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:104
+msgid ""
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr ""
+
+#: blackout.php:105
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:107
+msgid ""
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out while the blackout is "
+"still in place."
+msgstr ""

blackout/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

blackout/lang/gd/messages.po

@@ -0,0 +1,66 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: blackout.php:97
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr ""
+
+#: blackout.php:99
+#, php-format
+msgid ""
+"Please double check the current settings for the blackout. It will begin on "
+"<strong>%s</strong> and end on <strong>%s</strong>."
+msgstr ""
+
+#: blackout.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: blackout.php:103
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:103
+msgid "All your visitors from the web will be redirected to this URL."
+msgstr ""
+
+#: blackout.php:104
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:104
+msgid ""
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr ""
+
+#: blackout.php:105
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:107
+msgid ""
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out while the blackout is "
+"still in place."
+msgstr ""

blackout/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

blockbot/blockbot.php

@@ -11,7 +11,6 @@
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -70,7 +69,7 @@ function blockbot_init_1()
 	}
 
 	if (empty($parts)) {
-		Logger::debug('Known frontend found - accept', $logdata);
+		DI::logger()->debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -80,66 +79,66 @@ function blockbot_init_1()
 	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
 	if (blockbot_is_crawler($parts)) {
-		Logger::debug('Crawler found - reject', $logdata);
+		DI::logger()->debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		Logger::debug('Search bot found - reject', $logdata);
+		DI::logger()->debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
+		DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
 		if (!DI::config()->get('blockbot', 'security_checker')) {
-			Logger::debug('Security checker found - reject', $logdata);
+			DI::logger()->debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('Security checker found - accept', $logdata);
+		DI::logger()->debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		Logger::debug('Social media service found - accept', $logdata);
+		DI::logger()->debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		Logger::debug('Fediverse client found - accept', $logdata);
+		DI::logger()->debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		Logger::debug('Feed reader found - accept', $logdata);
+		DI::logger()->debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		Logger::debug('Fediverse tool found - accept', $logdata);
+		DI::logger()->debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		Logger::debug('Service agent found - accept', $logdata);
+		DI::logger()->debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		Logger::debug('Monitoring service found - accept', $logdata);
+		DI::logger()->debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		Logger::debug('Validation service found - accept', $logdata);
+		DI::logger()->debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		Logger::debug('Uncategorized helpful service found - accept', $logdata);
+		DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
@@ -147,10 +146,10 @@ function blockbot_init_1()
 	if (blockbot_is_http_library($parts)) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 		if (!DI::config()->get('blockbot', 'http_libraries')) {
-			Logger::debug('HTTP Library found - reject', $logdata);
+			DI::logger()->debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('HTTP Library found - accept', $logdata);
+		DI::logger()->debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -161,12 +160,12 @@ function blockbot_init_1()
 
 	if (!$isCrawler) {
 		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
-		Logger::debug('Non-bot user agent detected', $logdata);
+		DI::logger()->debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	Logger::notice('Possible bot found - reject', $logdata);
+	DI::logger()->notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -209,7 +208,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 		blockbot_save('activitypub-inbox-agents', $agent);
 	}
 
-	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER, false))) {
 		blockbot_save('activitypub-signature-agents', $agent);
 	}
 }
@@ -217,7 +216,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
-		Logger::debug('Login attempt detected - reject', $logdata);
+		DI::logger()->debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -443,7 +442,7 @@ function blockbot_is_monitor(array $parts): bool
 }
 
 /**
- * Services in the centralized and decentralized social media environment 
+ * Services in the centralized and decentralized social media environment
  *
  * @param array $parts
  * @return boolean

bluesky/bluesky.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Name: Bluesky Connector
- * Description: Post to Bluesky, import timelines and feeds
+ * Name: AT Protocol Connector (Bluesky, Eurosky, Blacksky, ...)
+ * Description: Post via AT Protocol, import timelines and feeds
  * Version: 1.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
@@ -30,7 +30,6 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -47,6 +46,7 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\ATProtocol;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
 
 const BLUESKY_DEFAULT_POLL_INTERVAL = 10; // given in minutes
@@ -73,7 +73,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)
@@ -82,6 +82,8 @@ function bluesky_check_item_notification(array &$notification_data)
 		return;
 	}
 
+	DI::atProtocol()->setApiForUser($notification_data['uid']);
+		
 	$did = DI::atProtocol()->getUserDid($notification_data['uid']);
 	if (empty($did)) {
 		return;
@@ -97,25 +99,17 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (substr($hookData['uri'], 0, 5) != 'at://') {
-		if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-			return;
-		}
+	DI::atProtocol()->setApiForUser($hookData['uid']);
 
-		$did = DI::atProtocol()->getDid($matches[1]);
-		if (empty($did)) {
-			return;
-		}
-	
-		Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-	
-		$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
+	if (!str_starts_with($hookData['uri'], 'at://')) {
+		$data = ParseUrl::getSiteinfoCached($hookData['uri']);
+		$uri = $data['atprotocol']['uri'] ?? '';
 	} else {
 		$uri = $hookData['uri'];
 	}
 
-	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	Logger::debug('Got post', ['uri' => $uri]);
+	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0, '', false, Conversation::PARCEL_CONNECTOR);
+	DI::logger()->debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -126,20 +120,22 @@ function bluesky_item_by_link(array &$hookData)
 
 function bluesky_support_follow(array &$data)
 {
-	if ($data['protocol'] == Protocol::BLUESKY) {
+	if ($data['protocol'] == Protocol::ATPROTO) {
 		$data['result'] = true;
 	}
 }
 
 function bluesky_follow(array &$hook_data)
 {
+	DI::atProtocol()->setApiForUser($hook_data['uid']);
+
 	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
 
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
-	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
+	DI::logger()->debug('Check if contact is AT Protocol', ['data' => $hook_data]);
+	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::ATPROTO, 'nurl' => Strings::normaliseLink($hook_data['url']), 'uid' => [0, $hook_data['uid']]]);
 	if (empty($contact)) {
 		return;
 	}
@@ -159,18 +155,20 @@ function bluesky_follow(array &$hook_data)
 	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$hook_data['contact'] = $contact;
-		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
 	}
 }
 
 function bluesky_unfollow(array &$hook_data)
 {
+	DI::atProtocol()->setApiForUser($hook_data['uid']);
+
 	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
 
-	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
+	if ($hook_data['contact']['network'] != Protocol::ATPROTO) {
 		return;
 	}
 
@@ -186,12 +184,14 @@ function bluesky_unfollow(array &$hook_data)
 
 function bluesky_block(array &$hook_data)
 {
+	DI::atProtocol()->setApiForUser($hook_data['uid']);
+
 	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
 
-	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
+	if ($hook_data['contact']['network'] != Protocol::ATPROTO) {
 		return;
 	}
 
@@ -213,18 +213,20 @@ function bluesky_block(array &$hook_data)
 		if ($ucid) {
 			Contact::remove($ucid);
 		}
-		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
 }
 
 function bluesky_unblock(array &$hook_data)
 {
+	DI::atProtocol()->setApiForUser($hook_data['uid']);
+
 	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
 
-	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
+	if ($hook_data['contact']['network'] != Protocol::ATPROTO) {
 		return;
 	}
 
@@ -244,7 +246,7 @@ function bluesky_addon_admin(string &$o)
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
-		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
+		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their AT Protocol handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
 	]);
 }
 
@@ -259,10 +261,13 @@ function bluesky_settings(array &$data)
 		return;
 	}
 
+	DI::atProtocol()->setApiForUser(DI::userSession()->getLocalUserId());
+
 	$enabled          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
 	$def_enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
 	$pds              = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
 	$handle           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
+	$web              = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'web');
 	$did              = DI::atProtocol()->getUserDid(DI::userSession()->getLocalUserId());
 	$token            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
 	$import           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
@@ -273,7 +278,7 @@ function bluesky_settings(array &$data)
 	if (DI::config()->get('bluesky', 'friendica_handles')) {
 		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
 		$host_handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
-		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $host_handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $host_handle, $host_handle)];
+		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your AT Protocol handle.', $host_handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your AT Protocol handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $host_handle, $host_handle)];
 		if ($custom_handle) {
 			$handle = $host_handle;
 		}
@@ -281,25 +286,31 @@ function bluesky_settings(array &$data)
 		$friendica_handle = [];
 	}
 
+	$web_frontend = ['' => 'System Default'];
+	foreach (DI::config()->get('atprotocol', 'frontends') as $key => $frontend) {
+		$web_frontend[$key] = $frontend[0];
+	}
+
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
 	$html = Renderer::replaceMacros($t, [
-		'$enable'           => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled],
-		'$bydefault'        => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
+		'$enable'           => ['bluesky', DI::l10n()->t('Enable AT Protocol Addon'), $enabled],
+		'$bydefault'        => ['bluesky_bydefault', DI::l10n()->t('Post via AT Protocol by default'), $def_enabled],
 		'$import'           => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
-		'$import_feeds'     => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
+		'$import_feeds'     => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in AT Protocol.')],
 		'$complete_threads' => ['bluesky_complete_threads', DI::l10n()->t('Complete the threads'), $complete_threads, DI::l10n()->t('When activated, the system fetches additional replies for the posts in the timeline. This leads to more complete threads.')],
 		'$custom_handle'    => $friendica_handle,
 		'$pds'              => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'           => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
-		'$did'              => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
-		'$password'         => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
+		'$handle'           => ['bluesky_handle', DI::l10n()->t('AT Protocol handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
+		'$did'              => ['bluesky_did', DI::l10n()->t('AT Protocol DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
+		'$password'         => ['bluesky_password', DI::l10n()->t('AT Protocol app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the settings of your AT Protocol system.")],
+		'$web'              => ['bluesky_web', DI::l10n()->t('Web front end'), $web, DI::l10n()->t('Choose your preferred external web front end for displaying posts and profiles.'), $web_frontend, ''],
 		'$status'           => bluesky_get_status($handle, $did, $pds, $token),
 	]);
 
 	$data = [
 		'connector' => 'bluesky',
-		'title'     => DI::l10n()->t('Bluesky Import/Export'),
-		'image'     => 'images/bluesky.jpg',
+		'title'     => DI::l10n()->t('AT Protocol (Bluesky, Eurosky, Blacksky, ...) Import/Export'),
+		'image'     => 'images/500px-AT_Protocol_logo.png',
 		'enabled'   => $enabled,
 		'html'      => $html,
 	];
@@ -329,7 +340,7 @@ function bluesky_get_status(string $handle = null, string $did = null, string $p
 
 	switch ($status) {
 		case ATProtocol::STATUS_TOKEN_OK:
-			return DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.");
+			return DI::l10n()->t("You are authenticated to the AT Protocol PDS. For security reasons the password isn't stored.");
 		case ATProtocol::STATUS_SUCCESS:
 			return DI::l10n()->t('The communication with the personal data server service (PDS) is established.');
 		case ATProtocol::STATUS_API_FAIL;
@@ -351,6 +362,8 @@ function bluesky_settings_post(array &$b)
 		return;
 	}
 
+	DI::atProtocol()->setApiForUser(DI::userSession()->getLocalUserId());
+
 	$old_pds    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
 	$old_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
 	$old_did    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
@@ -364,6 +377,11 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'complete_threads', intval($_POST['bluesky_complete_threads']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
+	if ($_POST['bluesky_web'] <> '') {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'web', $_POST['bluesky_web']);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'web');
+	}
 
 	if (!empty($handle)) {
 		$did = DI::atProtocol()->getUserDid(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
@@ -402,7 +420,7 @@ function bluesky_jot_nets(array &$jotnets_fields)
 			'type'  => 'checkbox',
 			'field' => [
 				'bluesky_enable',
-				DI::l10n()->t('Post to Bluesky'),
+				DI::l10n()->t('Post via the AT Protocol'),
 				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default')
 			]
 		];
@@ -421,11 +439,11 @@ function bluesky_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('poll interval not reached');
+			DI::logger()->notice('poll interval not reached');
 			return;
 		}
 	}
-	Logger::notice('cron_start');
+	DI::logger()->notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -436,20 +454,22 @@ function bluesky_cron()
 
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
+		DI::atProtocol()->setApiForUser($pconfig['uid']);
+
 		if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
-			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			DI::logger()->debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		DI::atProtocol()->getUserToken($pconfig['uid']);
 
 		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -463,32 +483,32 @@ function bluesky_cron()
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+			DI::logger()->debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
 			}
 		}
-		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
-	Logger::notice('Polling done for all users');
+	DI::logger()->notice('Polling done for all users');
 
 	DI::keyValue()->set('bluesky_last_poll', time());
 
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
-		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
+		DI::logger()->notice('Start contact cleanup');
+		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::ATPROTO, 0, Contact::NOTHING]);
 		while ($contact = DBA::fetch($contacts)) {
 			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
 		}
 		DBA::close($contacts);
 		DI::keyValue()->set('bluesky_last_clean', time());
-		Logger::notice('Contact cleanup done');
+		DI::logger()->notice('Contact cleanup done');
 	}
 
-	Logger::notice('cron_end');
+	DI::logger()->notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -506,9 +526,9 @@ function bluesky_hook_fork(array &$b)
 	}
 
 	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
-		// Don't post if it isn't a reply to a bluesky post
-		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
+		// Don't post if it isn't a reply to an AT Protocol post
+		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::ATPROTO])) {
+			DI::logger()->notice('No AT Protocol parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -550,17 +570,23 @@ function bluesky_post_local(array &$b)
 
 function bluesky_send(array &$b)
 {
+	DI::atProtocol()->setApiForUser($b['uid']);
+
 	if (($b['created'] !== $b['edited']) && !$b['deleted']) {
 		return;
 	}
 
+	if (Item::isGroupPost($b['uri-id'])) {
+		return;
+	}
+
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+		DI::logger()->debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
 			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
-				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
+				DI::logger()->debug('Not an AT Protocol post', ['uri' => $b['uri']]);
 				return;
 			}
 			bluesky_delete_post($b['uri'], $b['uid']);
@@ -571,12 +597,12 @@ function bluesky_send(array &$b)
 		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
-			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+			DI::logger()->debug('No AT Protocol post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+			DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
 			bluesky_create_post($b, $root, $parent);
 			return;
 		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -590,9 +616,11 @@ function bluesky_send(array &$b)
 	bluesky_create_post($b);
 }
 
-function bluesky_create_activity(array $item, stdClass $parent = null)
+function bluesky_create_activity(array $item, ?stdClass $parent = null)
 {
 	$uid = $item['uid'];
+	DI::atProtocol()->setApiForUser($uid);
+
 	$token = DI::atProtocol()->getUserToken($uid);
 	if (empty($token)) {
 		return;
@@ -603,6 +631,8 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
+	$post = [];
+
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,
@@ -633,15 +663,17 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	if (empty($activity->uri)) {
 		return;
 	}
-	Logger::debug('Activity done', ['return' => $activity]);
+	DI::logger()->debug('Activity done', ['return' => $activity]);
 	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+	DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
 {
 	$uid = $item['uid'];
+	DI::atProtocol()->setApiForUser($uid);
+
 	$token = DI::atProtocol()->getUserToken($uid);
 	if (empty($token)) {
 		return;
@@ -671,10 +703,12 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		}
 	}
 
+	$item['body'] = bluesky_set_mentions($item['body']);
+
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
-	$msg = Plaintext::getPost($item, 300, false, BBCode::BLUESKY);
+	$msg = Plaintext::getPost($item, 300, false, BBCode::ATPROTOCOL);
 	foreach ($msg['parts'] as $key => $part) {
 
 		$facets = bluesky_get_facets($part, $urls['urls']);
@@ -720,26 +754,53 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 			return;
 		}
-		Logger::debug('Posting done', ['return' => $parent]);
+		DI::logger()->debug('Posting done', ['return' => $parent]);
 		if (empty($root)) {
 			$root = $parent;
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
 			$uri = DI::atpProcessor()->getUri($parent);
 			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+			DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
 }
 
-function bluesky_get_urls(string $body): array
+function bluesky_set_mentions(string $body): string
 {
-	// Remove all hashtag and mention links
+	// Remove all url based mention links
 	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
 
+	if (!preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
+		return $body;
+	}
+
+	foreach ($matches as $match) {
+		$contact = Contact::selectFirst(['addr'], ['nurl' => $match[1]]);
+		if (!empty($contact['addr'])) {
+			$body = str_replace($match[0], '@[url=' . $match[1] . ']' . $contact['addr'] . '[/url]', $body);
+		} else {
+			$body = str_replace($match[0], '@' . $match[2], $body);
+		}
+	}
+
+	return $body;
+}
+
+function bluesky_get_urls(string $body): array
+{
 	$body = BBCode::expandVideoLinks($body);
 	$urls = [];
 
+	// Search for Mentions
+	if (preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
+		foreach ($matches as $match) {
+			$text = '@' . $match[2];
+			$urls[strpos($body, $match[0])] = ['mention' => $match[1], 'text' => $text, 'hash' => $text];
+			$body = str_replace($match[0], $text, $body);
+		}
+	}
+
 	// Search for hash tags
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
@@ -824,6 +885,9 @@ function bluesky_get_facets(string $body, array $urls): array
 		} elseif (!empty($url['url'])) {
 			$feature->uri = $url['url'];
 			$feature->$type = 'app.bsky.richtext.facet#link';
+		} elseif (!empty($url['mention'])) {
+			$feature->did = $url['mention'];
+			$feature->$type = 'app.bsky.richtext.facet#mention';
 		} else {
 			continue;
 		}
@@ -897,20 +961,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$new_size   = strlen($content);
 
 	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-		Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		$content = Photo::getImageForPhoto($photo);
 	} else {
-		Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	}
 
 	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
-		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
 	}
 
-	Item::incrementOutbound(Protocol::BLUESKY);
-	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	Item::incrementOutbound(Protocol::ATPROTO);
+	DI::logger()->debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
 
@@ -918,15 +982,17 @@ function bluesky_delete_post(string $uri, int $uid)
 {
 	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
-		Logger::debug('No uri delected', ['uri' => $uri]);
+		DI::logger()->debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
 	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-	Logger::debug('Deleted', ['parts' => $parts]);
+	DI::logger()->debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
 {
+	DI::atProtocol()->setApiForUser($uid);
+
 	$data = DI::atProtocol()->XRPCGet('app.bsky.feed.getTimeline', [], $uid);
 	if (empty($data)) {
 		return;
@@ -983,7 +1049,7 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 	$contact = DI::atpActor()->getContactByDID($reason->by->did, $uid, 0);
 
 	$item = [
-		'network'       => Protocol::BLUESKY,
+		'network'       => Protocol::ATPROTO,
 		'protocol'      => Conversation::PARCEL_CONNECTOR,
 		'uid'           => $uid,
 		'wall'          => false,
@@ -1004,6 +1070,10 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		return;
 	}
 
+	if (Post::exists(['uid' => $item['uid'], 'thr-parent' => $item['thr-parent'], 'verb' => $item['verb'], 'contact-id' => $item['contact-id']])) {
+		return;
+	}
+
 	$item['guid']         = Item::guidFromUri($item['uri'], $contact['alias']);
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
@@ -1016,6 +1086,8 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 
 function bluesky_fetch_notifications(int $uid)
 {
+	DI::atProtocol()->setApiForUser($uid);
+
 	$data = DI::atProtocol()->XRPCGet('app.bsky.notification.listNotifications', [], $uid);
 	if (empty($data->notifications)) {
 		return;
@@ -1024,10 +1096,10 @@ function bluesky_fetch_notifications(int $uid)
 	foreach ($data->notifications as $notification) {
 		$uri = DI::atpProcessor()->getUri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+			DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
 		}
-		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+		DI::logger()->debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
 				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
@@ -1037,9 +1109,9 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
@@ -1051,37 +1123,37 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
 			case 'follow':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
-				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+				DI::logger()->debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
 				break;
 
 			case 'mention':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
-				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
-				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
-				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
-				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+				DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
 				break;
 		}
 	}
@@ -1089,6 +1161,8 @@ function bluesky_fetch_notifications(int $uid)
 
 function bluesky_fetch_feed(int $uid, string $feed)
 {
+	DI::atProtocol()->setApiForUser($uid);
+
 	$data = DI::atProtocol()->XRPCGet('app.bsky.feed.getFeed', ['feed' => $feed], $uid);
 	if (empty($data)) {
 		return;
@@ -1112,16 +1186,16 @@ function bluesky_fetch_feed(int $uid, string $feed)
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+			DI::logger()->debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
 		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
 		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
 		} else {
-			Logger::notice('Post not found', ['entry' => $entry]);
+			DI::logger()->notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
@@ -1137,8 +1211,14 @@ function bluesky_get_feeds(int $uid): array
 		return [];
 	}
 	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
-			return $preference->pinned ?? [];
+		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPrefV2') {
+			$pinned = [];
+			foreach ($preference->items as $item) {
+				if (($item->type == 'feed') && $item->pinned) {
+					$pinned[] = $item->value;
+				}
+			}
+			return $pinned;
 		}
 	}
 	return [];

bluesky/bluesky_feed.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
 		return;
 	}
 
-	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
 	bluesky_fetch_feed($argv[1], $argv[2]);
-	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }

bluesky/bluesky_notifications.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
 	bluesky_fetch_notifications($argv[1]);
-	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
 }

bluesky/bluesky_timeline.php

@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
 	bluesky_fetch_timeline($argv[1]);
-	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
 }

bluesky/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-29 18:16+0000\n"
+"POT-Creation-Date: 2026-03-18 13:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,117 +17,126 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bluesky.php:335
+#: bluesky.php:248
 msgid "Save Settings"
 msgstr ""
 
-#: bluesky.php:336
-msgid "Allow your users to use your hostname for their Bluesky handles"
+#: bluesky.php:249
+msgid "Allow your users to use your hostname for their AT Protocol handles"
 msgstr ""
 
-#: bluesky.php:336
+#: bluesky.php:249
 #, php-format
 msgid "Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your HTTP configuration. You don't need to change the HTTPS configuration."
 msgstr ""
 
-#: bluesky.php:365
+#: bluesky.php:281
 #, php-format
-msgid "Allow to use %s as your Bluesky handle."
+msgid "Allow to use %s as your AT Protocol handle."
 msgstr ""
 
-#: bluesky.php:365
+#: bluesky.php:281
 #, php-format
-msgid "When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select \"No DNS Panel\". Then select \"Verify Text File\"."
+msgid "When enabled, you can use %s as your AT Protocol handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select \"No DNS Panel\". Then select \"Verify Text File\"."
 msgstr ""
 
-#: bluesky.php:375
-msgid "Enable Bluesky Post Addon"
+#: bluesky.php:298
+msgid "Enable AT Protocol Addon"
 msgstr ""
 
-#: bluesky.php:376
-msgid "Post to Bluesky by default"
+#: bluesky.php:299
+msgid "Post via AT Protocol by default"
 msgstr ""
 
-#: bluesky.php:377
+#: bluesky.php:300
 msgid "Import the remote timeline"
 msgstr ""
 
-#: bluesky.php:378
+#: bluesky.php:301
 msgid "Import the pinned feeds"
 msgstr ""
 
-#: bluesky.php:378
-msgid "When activated, Posts will be imported from all the feeds that you pinned in Bluesky."
+#: bluesky.php:301
+msgid "When activated, Posts will be imported from all the feeds that you pinned in AT Protocol."
 msgstr ""
 
-#: bluesky.php:379
+#: bluesky.php:302
 msgid "Complete the threads"
 msgstr ""
 
-#: bluesky.php:379
+#: bluesky.php:302
 msgid "When activated, the system fetches additional replies for the posts in the timeline. This leads to more complete threads."
 msgstr ""
 
-#: bluesky.php:381
+#: bluesky.php:304
 msgid "Personal Data Server"
 msgstr ""
 
-#: bluesky.php:381
+#: bluesky.php:304
 msgid "The personal data server (PDS) is the system that hosts your profile."
 msgstr ""
 
-#: bluesky.php:382
-msgid "Bluesky handle"
+#: bluesky.php:305
+msgid "AT Protocol handle"
 msgstr ""
 
-#: bluesky.php:383
-msgid "Bluesky DID"
+#: bluesky.php:306
+msgid "AT Protocol DID"
 msgstr ""
 
-#: bluesky.php:383
+#: bluesky.php:306
 msgid "This is the unique identifier. It will be fetched automatically, when the handle is entered."
 msgstr ""
 
-#: bluesky.php:384
-msgid "Bluesky app password"
+#: bluesky.php:307
+msgid "AT Protocol app password"
 msgstr ""
 
-#: bluesky.php:384
-msgid "Please don't add your real password here, but instead create a specific app password in the Bluesky settings."
+#: bluesky.php:307
+msgid "Please don't add your real password here, but instead create a specific app password in the settings of your AT Protocol system."
 msgstr ""
 
-#: bluesky.php:390
-msgid "Bluesky Import/Export"
+#: bluesky.php:308
+msgid "Web front end"
 msgstr ""
 
-#: bluesky.php:400
+#: bluesky.php:308
+msgid "Choose your preferred external web front end for displaying posts and profiles."
+msgstr ""
+
+#: bluesky.php:314
+msgid "AT Protocol (Bluesky, Eurosky, Blacksky, ...) Import/Export"
+msgstr ""
+
+#: bluesky.php:324
 msgid "You are not authenticated. Please enter your handle and the app password."
 msgstr ""
 
-#: bluesky.php:420
-msgid "You are authenticated to Bluesky. For security reasons the password isn't stored."
+#: bluesky.php:345
+msgid "You are authenticated to the AT Protocol PDS. For security reasons the password isn't stored."
 msgstr ""
 
-#: bluesky.php:422
+#: bluesky.php:347
 msgid "The communication with the personal data server service (PDS) is established."
 msgstr ""
 
-#: bluesky.php:424
-msgid "Communication issues with the personal data server service (PDS)."
+#: bluesky.php:349
+#, php-format
+msgid "Communication issues with the personal data server service (PDS): %s"
 msgstr ""
 
-#: bluesky.php:426
+#: bluesky.php:351
 msgid "The DID for the provided handle could not be detected. Please check if you entered the correct handle."
 msgstr ""
 
-#: bluesky.php:428
+#: bluesky.php:353
 msgid "The personal data server service (PDS) could not be detected."
 msgstr ""
 
-#: bluesky.php:430
+#: bluesky.php:355
 msgid "The authentication with the provided handle and password failed. Please check if you entered the correct password."
 msgstr ""
 
-#: bluesky.php:492
-msgid "Post to Bluesky"
+#: bluesky.php:425
+msgid "Post via the AT Protocol"
 msgstr ""

bluesky/templates/connector_settings.tpl

@@ -10,4 +10,5 @@
 {{include file="field_input.tpl" field=$pds}}
 {{include file="field_input.tpl" field=$handle}}
 {{include file="field_input.tpl" field=$did}}
-{{include file="field_input.tpl" field=$password}}
+{{include file="field_input.tpl" field=$password}}
+{{include file="field_select.tpl" field=$web}}

buglink/buglink.php

@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

buglink/lang/bg/messages.po

@@ -0,0 +1,23 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:20
+msgid "Report Bug"
+msgstr ""

buglink/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

buglink/lang/eo/messages.po

@@ -0,0 +1,23 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:20
+msgid "Report Bug"
+msgstr ""

buglink/lang/eo/strings.php

@@ -1,3 +1,7 @@
-<?php
-
-$a->strings["Report Bug"] = "Skribi cimraporton";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

buglink/lang/et/messages.po

@@ -0,0 +1,23 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:20
+msgid "Report Bug"
+msgstr ""

buglink/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

calc/calc.php

@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -16,7 +15,7 @@ function calc_install() {
 
 function calc_app_menu(array &$b)
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>';
 }
 
 /**
@@ -296,7 +295,7 @@ $o .=  <<< EOT
 <h3>Calculator</h3>
 <br /><br />
 <table>
-<tbody><tr><td> 
+<tbody><tr><td>
 <table bgcolor="#af9999" border="1">
 <tbody><tr><td>
 <table border="1" cellpadding="2" cellspacing="2">
@@ -323,7 +322,7 @@ $o .=  <<< EOT
 	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
 	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
-	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
+	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td>
 	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
 	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
@@ -345,13 +344,13 @@ $o .=  <<< EOT
 </form>
 
 	<!--
-	<TD VALIGN=top> 
+	<TD VALIGN=top>
 		<B>NOTE:</B> All sine and cosine calculations are
 		<br>done in radians. Remember to convert first
 		<br>if using degrees.
 	</TD>
 	-->
-	
+
 </td></tr></tbody></table>
 
 

catavatar/catavatar.php

@@ -6,11 +6,8 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -29,7 +26,7 @@ function catavatar_install()
 	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-	Logger::notice('registered catavatar');
+	DI::logger()->notice('registered catavatar');
 }
 
 /**

catavatar/lang/bg/messages.po

@@ -0,0 +1,54 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
+"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: catavatar.php:48
+msgid "Set default profile avatar or randomize the cat."
+msgstr ""
+
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr ""
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr ""
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr ""
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr ""
+
+#: catavatar.php:77
+msgid "The cat hadn't found itself."
+msgstr ""
+
+#: catavatar.php:86
+msgid "There was an error, the cat ran away."
+msgstr ""
+
+#: catavatar.php:92
+msgid "Profile Photos"
+msgstr ""
+
+#: catavatar.php:102
+msgid "Meow!"
+msgstr ""

catavatar/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

catavatar/lang/eo/messages.po

@@ -0,0 +1,54 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
+"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: catavatar.php:48
+msgid "Set default profile avatar or randomize the cat."
+msgstr ""
+
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr ""
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr ""
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr ""
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr ""
+
+#: catavatar.php:77
+msgid "The cat hadn't found itself."
+msgstr ""
+
+#: catavatar.php:86
+msgid "There was an error, the cat ran away."
+msgstr ""
+
+#: catavatar.php:92
+msgid "Profile Photos"
+msgstr ""
+
+#: catavatar.php:102
+msgid "Meow!"
+msgstr ""

catavatar/lang/eo/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

catavatar/lang/et/messages.po

@@ -0,0 +1,54 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
+"Language-Team: Estonian (https://app.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"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: catavatar.php:48
+msgid "Set default profile avatar or randomize the cat."
+msgstr ""
+
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr ""
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr ""
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr ""
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr ""
+
+#: catavatar.php:77
+msgid "The cat hadn't found itself."
+msgstr ""
+
+#: catavatar.php:86
+msgid "There was an error, the cat ran away."
+msgstr ""
+
+#: catavatar.php:92
+msgid "Profile Photos"
+msgstr ""
+
+#: catavatar.php:102
+msgid "Meow!"
+msgstr ""

catavatar/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

catavatar/lang/gd/messages.po

@@ -0,0 +1,54 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
+"Language-Team: Gaelic, Scottish (https://app.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"
+"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"
+
+#: catavatar.php:48
+msgid "Set default profile avatar or randomize the cat."
+msgstr ""
+
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr ""
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr ""
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr ""
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr ""
+
+#: catavatar.php:77
+msgid "The cat hadn't found itself."
+msgstr ""
+
+#: catavatar.php:86
+msgid "There was an error, the cat ran away."
+msgstr ""
+
+#: catavatar.php:92
+msgid "Profile Photos"
+msgstr ""
+
+#: catavatar.php:102
+msgid "Meow!"
+msgstr ""

catavatar/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

cld/cld.php

@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 function cld_install()
@@ -18,7 +17,17 @@ function cld_install()
 function cld_detect_languages(array &$data)
 {
 	if (!in_array('cld2', get_loaded_extensions())) {
-		Logger::warning('CLD2 is not installed.');
+		DI::logger()->warning('CLD2 is not installed.');
+		return;
+	}
+
+	if (!class_exists('CLD2Detector')) {
+		DI::logger()->warning('CLD2Detector class does not exist.');
+		return;
+	}
+
+	if (!class_exists('CLD2Encoding')) {
+		DI::logger()->warning('CLD2Encoding class does not exist.');
 		return;
 	}
 
@@ -43,7 +52,7 @@ function cld_detect_languages(array &$data)
 	}
 
 	if (!$result['is_reliable']) {
-		Logger::debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		if (($original == $detected) && ($data['detected'][$original] < $result['language_probability'] / 100)) {
 			$data['detected'][$original] = $result['language_probability'] / 100;
 		}
@@ -53,12 +62,12 @@ function cld_detect_languages(array &$data)
 	$available = array_keys(DI::l10n()->getLanguageCodes());
 
 	if (!in_array($detected, $available)) {
-		Logger::debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		return;
 	}
 
 	if ($original != $detected) {
-		Logger::debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 	}
 
 	$length = count($data['detected']);

convert/UnitConvertor.php

@@ -169,7 +169,6 @@ class UnitConvertor
 	* @param    string    name of the source unit from which to convert
     * @param    string    name of the target unit to which we are converting
     * @param    integer   double precision of the end result
-    * @return   void
     * @access   public
     */
 	function convert($value, $from_unit, $to_unit, $precision)
@@ -280,4 +279,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
+?>

convert/convert.php

@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 
 function convert_install() {
@@ -26,7 +25,7 @@ function convert_content() {
 	// @TODO Let's one day rewrite this to a modern composer package
 	include 'UnitConvertor.php';
 
-	class TP_Converter extends UnitConvertor
+	$conv = new class('en') extends UnitConvertor
 	{
 		public function __construct(string $lang = 'en')
 		{
@@ -43,7 +42,7 @@ function convert_content() {
 
 		private function findBaseUnit($from, $to)
 		{
-			while (list($skey, $sval) = each($this->bases)) {
+			foreach ($this->bases as $skey => $sval) {
 				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
 					return $skey;
 				}
@@ -63,7 +62,7 @@ function convert_content() {
 				$cells[] = $cell;
 
 				// We now have the base unit and value now lets produce the table;
-				while (list($key, $val) = each($this->bases[$base_unit])) {
+				foreach ($this->bases[$base_unit] as $val) {
 					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
 					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
 					$cells[] = $cell;
@@ -86,9 +85,7 @@ function convert_content() {
 
 			return $string;
 		}
-	}
-
-	$conv = new TP_Converter('en');
+	};
 
 	$conversions = [
 		'Temperature' => ['base'  => 'Celsius',
@@ -176,15 +173,15 @@ function convert_content() {
 		]
 	];
 
-	while (list($key, $val) = each($conversions)) {
+	foreach ($conversions as $key => $val) {
 		$conv->addConversion($val['base'], $val['conv']);
 		$list[$key][] = $val['base'];
-		while (list($ukey, $uval) = each($val['conv'])) {
+		foreach ($val['conv'] as $ukey => $uval) {
 			$list[$key][] = $ukey;
 		}
 	}
 
-	$o .= '<h3>Unit Conversions</h3>';
+	$o = '<h3>Unit Conversions</h3>';
 
 	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
 		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
@@ -202,10 +199,9 @@ function convert_content() {
 	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
 	$o .= '<select name="from_unit" size="12">';
 
-	reset($list);
-	while(list($key, $val) = each($list)) {
+	foreach ($list as $key => $val) {
 		$o .=  "\n\t<optgroup label=\"$key\">";
-		while(list($ukey, $uval) = each($val)) {
+		foreach ($val as $ukey => $uval) {
 			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
 			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
 		}

cookienotice/cookienotice.php

@@ -7,7 +7,6 @@
  * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

cookienotice/lang/bg/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

cookienotice/lang/eo/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/eo/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

cookienotice/lang/et/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Estonian (https://app.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"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

cookienotice/lang/fr/messages.po

@@ -6,6 +6,7 @@
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2025
 # 
 #, fuzzy
 msgid ""
@@ -14,8 +15,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
+"Last-Translator: cracrayol, 2025\n"
+"Language-Team: French (https://app.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"
@@ -55,7 +56,7 @@ msgstr "Bouton OK Texte "
 
 #: cookienotice.php:50
 msgid "Save Settings"
-msgstr "Sauvegarder les réglages"
+msgstr "Sauvegarder les paramètres "
 
 #: cookienotice.php:107
 msgid ""
@@ -63,5 +64,5 @@ msgid ""
 "accept the usage of these cookies by continue browsing this website."
 msgstr ""
 "Ce site utilise des cookies pour reconnaître les visiteurs et les "
-"utilisateurs connectés. Vous accepter l'utilisation de ces cookies en "
+"utilisateurs connectés. Vous acceptez l'utilisation de ces cookies en "
 "continuant sur ce site."

cookienotice/lang/fr/strings.php

@@ -10,5 +10,5 @@ $a->strings['OK'] = 'Ok';
 $a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configurez votre politique d\'utilisation des cookies.</b> Cela devrait juste être un avertissement, signalant l\'utilisation de cookies par le site. Cela sera affiché tant que l\'utilisateur n\'aura pas confirmé en cliquant sur le bouton OK.';
 $a->strings['Cookie Usage Notice'] = 'Politique d\'utilisation des cookies.';
 $a->strings['OK Button Text'] = 'Bouton OK Texte ';
-$a->strings['Save Settings'] = 'Sauvegarder les réglages';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ce site utilise des cookies pour reconnaître les visiteurs et les utilisateurs connectés. Vous accepter l\'utilisation de ces cookies en continuant sur ce site.';
+$a->strings['Save Settings'] = 'Sauvegarder les paramètres ';
+$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ce site utilise des cookies pour reconnaître les visiteurs et les utilisateurs connectés. Vous acceptez l\'utilisation de ces cookies en continuant sur ce site.';

cookienotice/lang/gd/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Gaelic, Scottish (https://app.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"
+"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"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

cookienotice/lang/is/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/is/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

cookienotice/lang/ru/messages.po

@@ -0,0 +1,53 @@
+# ADDON cookienotice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cookienotice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2019-01-23 16:01+0000\n"
+"Language-Team: Russian (https://app.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"
+"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"
+
+#: cookienotice.php:42
+msgid ""
+"This website uses cookies. If you continue browsing this website, you agree "
+"to the usage of cookies."
+msgstr ""
+
+#: cookienotice.php:43 cookienotice.php:108
+msgid "OK"
+msgstr ""
+
+#: cookienotice.php:47
+msgid ""
+"<b>Configure your cookie usage notice.</b> It should just be a notice, "
+"saying that the website uses cookies. It is shown as long as a user didnt "
+"confirm clicking the OK button."
+msgstr ""
+
+#: cookienotice.php:48
+msgid "Cookie Usage Notice"
+msgstr ""
+
+#: cookienotice.php:49
+msgid "OK Button Text"
+msgstr ""
+
+#: cookienotice.php:50
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:107
+msgid ""
+"This website uses cookies to recognize revisiting and logged in users. You "
+"accept the usage of these cookies by continue browsing this website."
+msgstr ""

cookienotice/lang/ru/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+}}

curweather/curweather.php

@@ -29,10 +29,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	$now = new DateTime();
 
 	if (!is_null($cached)) {
-		$cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
+		$cdate = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
 		$cached = unserialize($cached);
 
-		if ($cdate + $cachetime > $now->getTimestamp()) {
+		if ($cdate + (int) $cachetime > $now->getTimestamp()) {
 			return $cached;
 		}
 	}

curweather/lang/bg/messages.po

@@ -0,0 +1,123 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
+msgstr ""
+
+#: curweather.php:130
+msgid "Current Weather"
+msgstr ""
+
+#: curweather.php:137
+msgid "Relative Humidity"
+msgstr ""
+
+#: curweather.php:138
+msgid "Pressure"
+msgstr ""
+
+#: curweather.php:139
+msgid "Wind"
+msgstr ""
+
+#: curweather.php:140
+msgid "Last Updated"
+msgstr ""
+
+#: curweather.php:141
+msgid "Data by"
+msgstr ""
+
+#: curweather.php:142
+msgid "Show on map"
+msgstr ""
+
+#: curweather.php:147
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr ""
+
+#: curweather.php:149
+msgid "at OpenWeatherMap"
+msgstr ""
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr ""
+
+#: curweather.php:188
+msgid "Enter either the name of your location or the zip code."
+msgstr ""
+
+#: curweather.php:189
+msgid "Your Location"
+msgstr ""
+
+#: curweather.php:189
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr ""
+
+#: curweather.php:190
+msgid "Units"
+msgstr ""
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr ""
+
+#: curweather.php:191
+msgid "Show weather data"
+msgstr ""
+
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr ""
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:230
+msgid "Caching Interval"
+msgstr ""
+
+#: curweather.php:232
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr ""
+
+#: curweather.php:233
+msgid "no cache"
+msgstr ""
+
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+msgid "minutes"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your APPID"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr ""

curweather/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

curweather/lang/eo/messages.po

@@ -0,0 +1,123 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
+msgstr ""
+
+#: curweather.php:130
+msgid "Current Weather"
+msgstr ""
+
+#: curweather.php:137
+msgid "Relative Humidity"
+msgstr ""
+
+#: curweather.php:138
+msgid "Pressure"
+msgstr ""
+
+#: curweather.php:139
+msgid "Wind"
+msgstr ""
+
+#: curweather.php:140
+msgid "Last Updated"
+msgstr ""
+
+#: curweather.php:141
+msgid "Data by"
+msgstr ""
+
+#: curweather.php:142
+msgid "Show on map"
+msgstr ""
+
+#: curweather.php:147
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr ""
+
+#: curweather.php:149
+msgid "at OpenWeatherMap"
+msgstr ""
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr ""
+
+#: curweather.php:188
+msgid "Enter either the name of your location or the zip code."
+msgstr ""
+
+#: curweather.php:189
+msgid "Your Location"
+msgstr ""
+
+#: curweather.php:189
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr ""
+
+#: curweather.php:190
+msgid "Units"
+msgstr ""
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr ""
+
+#: curweather.php:191
+msgid "Show weather data"
+msgstr ""
+
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr ""
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:230
+msgid "Caching Interval"
+msgstr ""
+
+#: curweather.php:232
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr ""
+
+#: curweather.php:233
+msgid "no cache"
+msgstr ""
+
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+msgid "minutes"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your APPID"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr ""

curweather/lang/eo/strings.php

@@ -1,3 +1,7 @@
-<?php
-
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

curweather/lang/et/messages.po

@@ -0,0 +1,123 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
+msgstr ""
+
+#: curweather.php:130
+msgid "Current Weather"
+msgstr ""
+
+#: curweather.php:137
+msgid "Relative Humidity"
+msgstr ""
+
+#: curweather.php:138
+msgid "Pressure"
+msgstr ""
+
+#: curweather.php:139
+msgid "Wind"
+msgstr ""
+
+#: curweather.php:140
+msgid "Last Updated"
+msgstr ""
+
+#: curweather.php:141
+msgid "Data by"
+msgstr ""
+
+#: curweather.php:142
+msgid "Show on map"
+msgstr ""
+
+#: curweather.php:147
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr ""
+
+#: curweather.php:149
+msgid "at OpenWeatherMap"
+msgstr ""
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr ""
+
+#: curweather.php:188
+msgid "Enter either the name of your location or the zip code."
+msgstr ""
+
+#: curweather.php:189
+msgid "Your Location"
+msgstr ""
+
+#: curweather.php:189
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr ""
+
+#: curweather.php:190
+msgid "Units"
+msgstr ""
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr ""
+
+#: curweather.php:191
+msgid "Show weather data"
+msgstr ""
+
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr ""
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:230
+msgid "Caching Interval"
+msgstr ""
+
+#: curweather.php:232
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr ""
+
+#: curweather.php:233
+msgid "no cache"
+msgstr ""
+
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+msgid "minutes"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your APPID"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr ""

curweather/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

curweather/lang/gd/messages.po

@@ -0,0 +1,123 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
+msgstr ""
+
+#: curweather.php:130
+msgid "Current Weather"
+msgstr ""
+
+#: curweather.php:137
+msgid "Relative Humidity"
+msgstr ""
+
+#: curweather.php:138
+msgid "Pressure"
+msgstr ""
+
+#: curweather.php:139
+msgid "Wind"
+msgstr ""
+
+#: curweather.php:140
+msgid "Last Updated"
+msgstr ""
+
+#: curweather.php:141
+msgid "Data by"
+msgstr ""
+
+#: curweather.php:142
+msgid "Show on map"
+msgstr ""
+
+#: curweather.php:147
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr ""
+
+#: curweather.php:149
+msgid "at OpenWeatherMap"
+msgstr ""
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr ""
+
+#: curweather.php:188
+msgid "Enter either the name of your location or the zip code."
+msgstr ""
+
+#: curweather.php:189
+msgid "Your Location"
+msgstr ""
+
+#: curweather.php:189
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr ""
+
+#: curweather.php:190
+msgid "Units"
+msgstr ""
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr ""
+
+#: curweather.php:191
+msgid "Show weather data"
+msgstr ""
+
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr ""
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:230
+msgid "Caching Interval"
+msgstr ""
+
+#: curweather.php:232
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr ""
+
+#: curweather.php:233
+msgid "no cache"
+msgstr ""
+
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+msgid "minutes"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your APPID"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr ""

curweather/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

curweather/lang/is/messages.po

@@ -0,0 +1,123 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
+msgstr ""
+
+#: curweather.php:130
+msgid "Current Weather"
+msgstr ""
+
+#: curweather.php:137
+msgid "Relative Humidity"
+msgstr ""
+
+#: curweather.php:138
+msgid "Pressure"
+msgstr ""
+
+#: curweather.php:139
+msgid "Wind"
+msgstr ""
+
+#: curweather.php:140
+msgid "Last Updated"
+msgstr ""
+
+#: curweather.php:141
+msgid "Data by"
+msgstr ""
+
+#: curweather.php:142
+msgid "Show on map"
+msgstr ""
+
+#: curweather.php:147
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr ""
+
+#: curweather.php:149
+msgid "at OpenWeatherMap"
+msgstr ""
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr ""
+
+#: curweather.php:188
+msgid "Enter either the name of your location or the zip code."
+msgstr ""
+
+#: curweather.php:189
+msgid "Your Location"
+msgstr ""
+
+#: curweather.php:189
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr ""
+
+#: curweather.php:190
+msgid "Units"
+msgstr ""
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr ""
+
+#: curweather.php:191
+msgid "Show weather data"
+msgstr ""
+
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr ""
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:230
+msgid "Caching Interval"
+msgstr ""
+
+#: curweather.php:232
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr ""
+
+#: curweather.php:233
+msgid "no cache"
+msgstr ""
+
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+msgid "minutes"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your APPID"
+msgstr ""
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr ""

curweather/lang/is/strings.php

@@ -1,3 +1,7 @@
-<?php
-
-$a->strings["Submit"] = "Senda inn";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

diaspora/Diaspora_Connection.php

@@ -33,7 +33,6 @@ class Diaspora_Connection {
 		}
 
 		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
-		return $this;
 	}
 
 	public function __destruct() {

diaspora/diasphp.php

@@ -9,6 +9,8 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
+	private $token_regex;
+	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

diaspora/diaspora.php

@@ -9,10 +9,8 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
@@ -187,7 +185,7 @@ function diaspora_send(array &$b)
 {
 	$hostname = DI::baseUrl()->getHost();
 
-	Logger::notice('diaspora_send: invoked');
+	DI::logger()->notice('diaspora_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -197,6 +195,10 @@ function diaspora_send(array &$b)
 		return;
 	}
 
+	if (Item::isGroupPost($b['uri-id'])) {
+		return;
+	}
+
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -211,14 +213,14 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	Logger::info('diaspora_send: prepare posting');
+	DI::logger()->info('diaspora_send: prepare posting');
 
 	$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
 	$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
 	$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
 
 	if ($handle && $password) {
-		Logger::info('diaspora_send: all values seem to be okay');
+		DI::logger()->info('diaspora_send: all values seem to be okay');
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -249,20 +251,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			Logger::info('diaspora_send: prepare');
+			DI::logger()->info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			Logger::info('diaspora_send: try to log in ' . $handle);
+			DI::logger()->info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			Logger::info('diaspora_send: try to send ' . $body);
+			DI::logger()->info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			Logger::notice('diaspora_send: success');
+			DI::logger()->notice('diaspora_send: success');
 		} catch (Exception $e) {
-			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			DI::logger()->notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			Logger::info('diaspora_send: requeueing ' . $b['uid']);
+			DI::logger()->info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}

diaspora/lang/bg/messages.po

@@ -0,0 +1,101 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:43
+msgid "Post to Diaspora"
+msgstr ""
+
+#: diaspora.php:66
+#, php-format
+msgid ""
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr ""
+
+#: diaspora.php:67
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr ""
+
+#: diaspora.php:68
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:78
+msgid "All aspects"
+msgstr ""
+
+#: diaspora.php:79
+msgid "Public"
+msgstr ""
+
+#: diaspora.php:85
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:86
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr ""
+
+#: diaspora.php:89
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:96
+msgid "Information"
+msgstr ""
+
+#: diaspora.php:97
+msgid "Error"
+msgstr ""
+
+#: diaspora.php:103
+msgid "Enable Diaspora Post Addon"
+msgstr ""
+
+#: diaspora.php:104
+msgid "Diaspora handle"
+msgstr ""
+
+#: diaspora.php:105
+msgid "Diaspora password"
+msgstr ""
+
+#: diaspora.php:105
+msgid ""
+"Privacy notice: Your Diaspora password will be stored unencrypted to "
+"authenticate you with your Diaspora pod. This means your Friendica node "
+"administrator can have access to it."
+msgstr ""
+
+#: diaspora.php:107
+msgid "Post to Diaspora by default"
+msgstr ""
+
+#: diaspora.php:112
+msgid "Diaspora Export"
+msgstr ""

diaspora/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

diaspora/lang/eo/messages.po

@@ -0,0 +1,101 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:43
+msgid "Post to Diaspora"
+msgstr ""
+
+#: diaspora.php:66
+#, php-format
+msgid ""
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr ""
+
+#: diaspora.php:67
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr ""
+
+#: diaspora.php:68
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:78
+msgid "All aspects"
+msgstr ""
+
+#: diaspora.php:79
+msgid "Public"
+msgstr ""
+
+#: diaspora.php:85
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:86
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr ""
+
+#: diaspora.php:89
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:96
+msgid "Information"
+msgstr ""
+
+#: diaspora.php:97
+msgid "Error"
+msgstr ""
+
+#: diaspora.php:103
+msgid "Enable Diaspora Post Addon"
+msgstr ""
+
+#: diaspora.php:104
+msgid "Diaspora handle"
+msgstr ""
+
+#: diaspora.php:105
+msgid "Diaspora password"
+msgstr ""
+
+#: diaspora.php:105
+msgid ""
+"Privacy notice: Your Diaspora password will be stored unencrypted to "
+"authenticate you with your Diaspora pod. This means your Friendica node "
+"administrator can have access to it."
+msgstr ""
+
+#: diaspora.php:107
+msgid "Post to Diaspora by default"
+msgstr ""
+
+#: diaspora.php:112
+msgid "Diaspora Export"
+msgstr ""

diaspora/lang/eo/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

diaspora/lang/et/messages.po

@@ -0,0 +1,101 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:43
+msgid "Post to Diaspora"
+msgstr ""
+
+#: diaspora.php:66
+#, php-format
+msgid ""
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr ""
+
+#: diaspora.php:67
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr ""
+
+#: diaspora.php:68
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:78
+msgid "All aspects"
+msgstr ""
+
+#: diaspora.php:79
+msgid "Public"
+msgstr ""
+
+#: diaspora.php:85
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:86
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr ""
+
+#: diaspora.php:89
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:96
+msgid "Information"
+msgstr ""
+
+#: diaspora.php:97
+msgid "Error"
+msgstr ""
+
+#: diaspora.php:103
+msgid "Enable Diaspora Post Addon"
+msgstr ""
+
+#: diaspora.php:104
+msgid "Diaspora handle"
+msgstr ""
+
+#: diaspora.php:105
+msgid "Diaspora password"
+msgstr ""
+
+#: diaspora.php:105
+msgid ""
+"Privacy notice: Your Diaspora password will be stored unencrypted to "
+"authenticate you with your Diaspora pod. This means your Friendica node "
+"administrator can have access to it."
+msgstr ""
+
+#: diaspora.php:107
+msgid "Post to Diaspora by default"
+msgstr ""
+
+#: diaspora.php:112
+msgid "Diaspora Export"
+msgstr ""

diaspora/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

diaspora/lang/gd/messages.po

@@ -0,0 +1,101 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: diaspora.php:43
+msgid "Post to Diaspora"
+msgstr ""
+
+#: diaspora.php:66
+#, php-format
+msgid ""
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr ""
+
+#: diaspora.php:67
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr ""
+
+#: diaspora.php:68
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:78
+msgid "All aspects"
+msgstr ""
+
+#: diaspora.php:79
+msgid "Public"
+msgstr ""
+
+#: diaspora.php:85
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:86
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr ""
+
+#: diaspora.php:89
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:96
+msgid "Information"
+msgstr ""
+
+#: diaspora.php:97
+msgid "Error"
+msgstr ""
+
+#: diaspora.php:103
+msgid "Enable Diaspora Post Addon"
+msgstr ""
+
+#: diaspora.php:104
+msgid "Diaspora handle"
+msgstr ""
+
+#: diaspora.php:105
+msgid "Diaspora password"
+msgstr ""
+
+#: diaspora.php:105
+msgid ""
+"Privacy notice: Your Diaspora password will be stored unencrypted to "
+"authenticate you with your Diaspora pod. This means your Friendica node "
+"administrator can have access to it."
+msgstr ""
+
+#: diaspora.php:107
+msgid "Post to Diaspora by default"
+msgstr ""
+
+#: diaspora.php:112
+msgid "Diaspora Export"
+msgstr ""

diaspora/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

diaspora/lang/pl/messages.po

@@ -4,100 +4,101 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
+# Bartosz Kozień, 2025
+# Piotr Strebski <strebski@gmail.com>, 2022
 # Waldemar Stoczkowski, 2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
 "PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"Last-Translator: Bartosz Kozień, 2025\n"
+"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 
-#: diaspora.php:44
+#: diaspora.php:43
 msgid "Post to Diaspora"
 msgstr "Napisz do Diaspory"
 
-#: diaspora.php:67
+#: diaspora.php:66
 #, php-format
 msgid ""
 "Please remember: You can always be reached from Diaspora with your Friendica"
 " handle <strong>%s</strong>. "
 msgstr "Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. "
 
-#: diaspora.php:68
+#: diaspora.php:67
 msgid ""
 "This connector is only meant if you still want to use your old Diaspora "
 "account for some time. "
 msgstr "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas."
 
-#: diaspora.php:69
+#: diaspora.php:68
 #, php-format
 msgid ""
 "However, it is preferred that you tell your Diaspora contacts the new handle"
 " <strong>%s</strong> instead."
 msgstr "Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>."
 
-#: diaspora.php:79
+#: diaspora.php:78
 msgid "All aspects"
 msgstr "Wszystkie aspekty"
 
-#: diaspora.php:80
+#: diaspora.php:79
 msgid "Public"
 msgstr "Publiczny"
 
-#: diaspora.php:86
+#: diaspora.php:85
 msgid "Post to aspect:"
 msgstr "Napisz do aspektu:"
 
-#: diaspora.php:87
+#: diaspora.php:86
 #, php-format
 msgid "Connected with your Diaspora account <strong>%s</strong>"
 msgstr "Połączony ze swoim kontem Diaspora <strong>%s</strong>"
 
-#: diaspora.php:90
+#: diaspora.php:89
 msgid ""
 "Can't login to your Diaspora account. Please check handle (in the format "
 "user@domain.tld) and password."
 msgstr "Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło."
 
-#: diaspora.php:97
+#: diaspora.php:96
 msgid "Information"
 msgstr "Informacja"
 
-#: diaspora.php:98
+#: diaspora.php:97
 msgid "Error"
 msgstr "Błąd"
 
-#: diaspora.php:104
+#: diaspora.php:103
 msgid "Enable Diaspora Post Addon"
 msgstr "Włącz dodatek Diaspora"
 
-#: diaspora.php:105
+#: diaspora.php:104
 msgid "Diaspora handle"
 msgstr "Uchwyt Diaspory"
 
-#: diaspora.php:106
+#: diaspora.php:105
 msgid "Diaspora password"
 msgstr "Hasło Diaspora"
 
-#: diaspora.php:106
+#: diaspora.php:105
 msgid ""
 "Privacy notice: Your Diaspora password will be stored unencrypted to "
 "authenticate you with your Diaspora pod. This means your Friendica node "
 "administrator can have access to it."
-msgstr "Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp."
+msgstr "Informacja o prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika w instancji Diaspora. Oznacza to, że administrator instancji Friendica może mieć do niego dostęp."
 
-#: diaspora.php:108
+#: diaspora.php:107
 msgid "Post to Diaspora by default"
 msgstr "Wyślij domyślnie do Diaspory"
 
-#: diaspora.php:113
+#: diaspora.php:112
 msgid "Diaspora Export"
 msgstr "Eksportuj do Diaspory"

diaspora/lang/pl/strings.php

@@ -19,6 +19,6 @@ $a->strings['Error'] = 'Błąd';
 $a->strings['Enable Diaspora Post Addon'] = 'Włącz dodatek Diaspora';
 $a->strings['Diaspora handle'] = 'Uchwyt Diaspory';
 $a->strings['Diaspora password'] = 'Hasło Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp.';
+$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Informacja o prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika w instancji Diaspora. Oznacza to, że administrator instancji Friendica może mieć do niego dostęp.';
 $a->strings['Post to Diaspora by default'] = 'Wyślij domyślnie do Diaspory';
 $a->strings['Diaspora Export'] = 'Eksportuj do Diaspory';

discourse/discourse.php

@@ -8,10 +8,8 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -80,13 +78,13 @@ function discourse_email_getmessage(&$message)
 	// We do assume that all Discourse servers are running with SSL
 	if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_post_from_api($message, $matches[2], $matches[3])) {
-		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
+		DI::logger()->info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
 		return;
 	}
 
 	if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) {
-		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
+		DI::logger()->info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
 		return;
 	}
 
@@ -96,16 +94,16 @@ function discourse_email_getmessage(&$message)
 	}
 
 	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		Logger::info('This is no Discourse post');
+		DI::logger()->info('This is no Discourse post');
 		return;
 	}
 
 	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
+		DI::logger()->info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
 		return;
 	}
 
-	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
+	DI::logger()->info('Fallback mode', ['plink' => $message['item']['plink']]);
 	// Search in the HTML part for the discourse entry and the author profile
 	if (!empty($message['html'])) {
 		$message = discourse_get_html($message);
@@ -122,7 +120,7 @@ function discourse_fetch_post($host, $topic, $pid)
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
 	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
-		Logger::info('No success', ['url' => $url]);
+		DI::logger()->info('No success', ['url' => $url]);
 		return false;
 	}
 
@@ -134,11 +132,11 @@ function discourse_fetch_post($host, $topic, $pid)
 			/// @todo Possibly fetch missing posts here
 			continue;
 		}
-		Logger::info('Got post data from topic', $post);
+		DI::logger()->info('Got post data from topic', $post);
 		return $post;
 	}
 
-	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
+	DI::logger()->info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
 	return false;
 }
 
@@ -170,7 +168,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 
 	$message = discourse_process_post($message, $data, $hostaddr);
 
-	Logger::info('Got API data', $message);
+	DI::logger()->info('Got API data', $message);
 	return true;
 }
 
@@ -203,7 +201,7 @@ function discourse_get_user($post, $hostaddr)
 	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
-	Logger::info('Contact', $contact);
+	DI::logger()->info('Contact', $contact);
 	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
@@ -269,11 +267,11 @@ function discourse_get_html($message)
 	$div = $doc2->importNode($result->item(0), true);
 	$doc2->appendChild($div);
 	$message['html'] = $doc2->saveHTML();
-	Logger::info('Found html body', ['html' => $message['html']]);
+	DI::logger()->info('Found html body', ['html' => $message['html']]);
 
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
-		Logger::info('Found profile', $profile);
+		DI::logger()->info('Found profile', $profile);
 		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
 		$message['item']['author-link'] = $profile['url'];
 		$message['item']['author-name'] = $profile['name'];
@@ -289,21 +287,21 @@ function discourse_get_text($message)
 	$text = str_replace("\r", '', $text);
 	$pos = strpos($text, "\n---\n");
 	if ($pos == 0) {
-		Logger::info('No separator found', ['text' => $text]);
+		DI::logger()->info('No separator found', ['text' => $text]);
 		return $message;
 	}
 
 	$message['text'] = trim(substr($text, 0, $pos));
 
-	Logger::info('Found text body', ['text' => $message['text']]);
+	DI::logger()->info('Found text body', ['text' => $message['text']]);
 
 	$message['text'] = Markdown::toBBCode($message['text']);
 
 	$text = substr($text, $pos);
-	Logger::info('Found footer', ['text' => $text]);
+	DI::logger()->info('Found footer', ['text' => $text]);
 	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
 		$message['item']['plink'] = $link[1];
-		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
+		DI::logger()->info('Found plink', ['plink' => $message['item']['plink']]);
 	}
 	return $message;
 }

dwpost/dwpost.php

@@ -8,10 +8,8 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -127,6 +125,10 @@ function dwpost_send(array &$b)
 		return;
 	}
 
+	if (Item::isGroupPost($b['uri-id'])) {
+		return;
+	}
+
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -186,12 +188,12 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('dwpost: data: ' . $xml);
+		DI::logger()->debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
 			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
+		DI::logger()->info('posted to dreamwidth: ' . ($x) ? $x : '');
 	}
 }

dwpost/lang/bg/messages.po

@@ -0,0 +1,43 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dwpost.php:43
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:64
+msgid "Dreamwidth username"
+msgstr ""
+
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr ""
+
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr ""

dwpost/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

dwpost/lang/eo/messages.po

@@ -0,0 +1,43 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dwpost.php:43
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:64
+msgid "Dreamwidth username"
+msgstr ""
+
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr ""
+
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr ""

dwpost/lang/eo/strings.php

@@ -1,9 +1,7 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth";
-$a->strings["Enable dreamwidth Post Addon"] = "Ŝalti la Dreamwidth Kromprogramon";
-$a->strings["dreamwidth username"] = "Dreamwidth salutnomo";
-$a->strings["dreamwidth password"] = "Dreamwidth pasvorto";
-$a->strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth";
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

dwpost/lang/et/messages.po

@@ -0,0 +1,44 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: Rain Hawk, 2020\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dwpost.php:43
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:64
+msgid "Dreamwidth username"
+msgstr ""
+
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr ""
+
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr ""

dwpost/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

dwpost/lang/gd/messages.po

@@ -0,0 +1,43 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: dwpost.php:43
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:64
+msgid "Dreamwidth username"
+msgstr ""
+
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr ""
+
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr ""

dwpost/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

dwpost/lang/is/messages.po

@@ -0,0 +1,43 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: dwpost.php:43
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:64
+msgid "Dreamwidth username"
+msgstr ""
+
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr ""
+
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr ""

dwpost/lang/is/strings.php

@@ -1,9 +1,7 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "";
-$a->strings["Dreamwidth Post Settings"] = "";
-$a->strings["Enable dreamwidth Post Addon"] = "";
-$a->strings["dreamwidth username"] = "";
-$a->strings["dreamwidth password"] = "";
-$a->strings["Post to dreamwidth by default"] = "";
-$a->strings["Submit"] = "Senda inn";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

fancybox/fancybox.php

@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -40,7 +39,7 @@ function fancybox_render(array &$b){
 		function ($text) use ($gallery) {
 			// This processes images inlined in posts
 			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-			//if (!in_array(DI::app()->getCurrentTheme(),['vier','frio']))
+			//if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
 			$text = preg_replace(
 				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
 				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',

forumdirectory/lang/bg/messages.po

@@ -0,0 +1,47 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr ""
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr ""
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr ""
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr ""
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr ""
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr ""

forumdirectory/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

forumdirectory/lang/eo/messages.po

@@ -0,0 +1,47 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr ""
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr ""
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr ""
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr ""
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr ""
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr ""

forumdirectory/lang/eo/strings.php

@@ -1,16 +1,7 @@
-<?php
-
-$a->strings["Public access denied."] = "Publika atingo ne permesita.";
-$a->strings["Global Directory"] = "Tutmonda Katalogo";
-$a->strings["Find on this site"] = "Trovi en ĉi retejo";
-$a->strings["Finding: "] = "Trovata:";
-$a->strings["Site Directory"] = "Reteja Katalogo";
-$a->strings["Find"] = "Trovi";
-$a->strings["Age: "] = "Aĝo:";
-$a->strings["Gender: "] = "Sekso:";
-$a->strings["Location:"] = "Loko:";
-$a->strings["Gender:"] = "Sekso:";
-$a->strings["Status:"] = "Stato:";
-$a->strings["Homepage:"] = "Hejmpaĝo:";
-$a->strings["About:"] = "Pri:";
-$a->strings["No entries (some entries may be hidden)."] = "Neniom da afiŝoj (kelkaj afiŝoj eble ne estas videbla).";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

forumdirectory/lang/et/messages.po

@@ -0,0 +1,47 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr ""
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr ""
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr ""
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr ""
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr ""
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr ""

forumdirectory/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

forumdirectory/lang/gd/messages.po

@@ -0,0 +1,47 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr ""
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr ""
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr ""
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr ""
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr ""
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr ""

forumdirectory/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

forumdirectory/lang/is/messages.po

@@ -0,0 +1,47 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr ""
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr ""
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr ""
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr ""
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr ""
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr ""

forumdirectory/lang/is/strings.php

@@ -1,16 +1,7 @@
-<?php
-
-$a->strings["Public access denied."] = "Alemennings aðgangur ekki veittur.";
-$a->strings["Global Directory"] = "Heims tengiliða skrá";
-$a->strings["Find on this site"] = "Leita á þessum vef";
-$a->strings["Finding: "] = "Niðurstöður:";
-$a->strings["Site Directory"] = "Vef tengiliða skrá";
-$a->strings["Find"] = "Finna";
-$a->strings["Age: "] = "Aldur:";
-$a->strings["Gender: "] = "Kyn:";
-$a->strings["Location:"] = "Staðsetning:";
-$a->strings["Gender:"] = "Kyn:";
-$a->strings["Status:"] = "Staða:";
-$a->strings["Homepage:"] = "Heimasíða:";
-$a->strings["About:"] = "Um:";
-$a->strings["No entries (some entries may be hidden)."] = "Engar færslur (sumar geta verið faldar).";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

fromapp/fromapp.php

@@ -7,9 +7,7 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -18,7 +16,7 @@ function fromapp_install()
 	Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	Logger::notice("installed fromapp");
+	DI::logger()->notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)
@@ -76,6 +74,6 @@ function fromapp_post_hook(&$item)
 
 	$apps = explode(',', $app);
 	$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-	
+
 	return;
 }

fromapp/lang/bg/messages.po

@@ -0,0 +1,34 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromapp.php:45
+msgid ""
+"The application name you would like to show your posts originating from. "
+"Separate different app names with a comma. A random one will then be "
+"selected for every posting."
+msgstr ""
+
+#: fromapp.php:46
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: fromapp.php:51
+msgid "FromApp Settings"
+msgstr ""

fromapp/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

fromapp/lang/eo/messages.po

@@ -0,0 +1,34 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromapp.php:45
+msgid ""
+"The application name you would like to show your posts originating from. "
+"Separate different app names with a comma. A random one will then be "
+"selected for every posting."
+msgstr ""
+
+#: fromapp.php:46
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: fromapp.php:51
+msgid "FromApp Settings"
+msgstr ""

fromapp/lang/eo/strings.php

@@ -1,7 +1,7 @@
-<?php
-
-$a->strings["Fromapp settings updated."] = "";
-$a->strings["FromApp Settings"] = "";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

fromapp/lang/et/messages.po

@@ -0,0 +1,34 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromapp.php:45
+msgid ""
+"The application name you would like to show your posts originating from. "
+"Separate different app names with a comma. A random one will then be "
+"selected for every posting."
+msgstr ""
+
+#: fromapp.php:46
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: fromapp.php:51
+msgid "FromApp Settings"
+msgstr ""

fromapp/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

fromapp/lang/gd/messages.po

@@ -0,0 +1,34 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: fromapp.php:45
+msgid ""
+"The application name you would like to show your posts originating from. "
+"Separate different app names with a comma. A random one will then be "
+"selected for every posting."
+msgstr ""
+
+#: fromapp.php:46
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: fromapp.php:51
+msgid "FromApp Settings"
+msgstr ""

fromapp/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

fromapp/lang/is/messages.po

@@ -0,0 +1,34 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: fromapp.php:45
+msgid ""
+"The application name you would like to show your posts originating from. "
+"Separate different app names with a comma. A random one will then be "
+"selected for every posting."
+msgstr ""
+
+#: fromapp.php:46
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: fromapp.php:51
+msgid "FromApp Settings"
+msgstr ""

fromapp/lang/is/strings.php

@@ -1,7 +1,7 @@
-<?php
-
-$a->strings["Fromapp settings updated."] = "";
-$a->strings["FromApp Settings"] = "";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
-$a->strings["Submit"] = "Senda inn";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

geocoordinates/geocoordinates.php

@@ -6,9 +6,7 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -52,25 +50,25 @@ function geocoordinates_resolve_item(array &$item)
 	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
 
 	if (!$s) {
-		Logger::info('API could not be queried');
+		DI::logger()->info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != '200') {
-		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+		DI::logger()->info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		Logger::info('No results found for coordinates ' . $item['coord']);
+		DI::logger()->info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
 	$item['location'] = $data->results[0]->formatted;
 
-	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	DI::logger()->info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
 
 	if ($item['location'] != '') {
 		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);

geonames/geonames.php

@@ -6,9 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -35,7 +33,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)
@@ -46,7 +44,7 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	Logger::notice('geonames invoked');
+	 DI::logger()->notice('geonames invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
 		return;

geonames/lang/bg/messages.po

@@ -0,0 +1,33 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:135
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your"
+" posts."
+msgstr ""
+
+#: geonames.php:136
+msgid "Enable Geonames Addon"
+msgstr ""
+
+#: geonames.php:141
+msgid "Geonames Settings"
+msgstr ""

geonames/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

geonames/lang/ca/messages.po

@@ -0,0 +1,34 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+# Rafael Garau, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"Last-Translator: Rafael Garau, 2018\n"
+"Language-Team: Catalan (http://app.transifex.com/Friendica/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:135
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your"
+" posts."
+msgstr ""
+
+#: geonames.php:136
+msgid "Enable Geonames Addon"
+msgstr "Activa els Ajustos de Geonoms"
+
+#: geonames.php:141
+msgid "Geonames Settings"
+msgstr "Ajustos de Geonoms"

geonames/lang/ca/strings.php

@@ -1,6 +1,9 @@
-<?php
-
-$a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames.";
-$a->strings["Geonames Settings"] = "Configuració de Geonames";
-$a->strings["Enable Geonames Addon"] = "Habilitar Addon de Geonames";
-$a->strings["Submit"] = "Enviar";
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Enable Geonames Addon'] = 'Activa els Ajustos de Geonoms';
+$a->strings['Geonames Settings'] = 'Ajustos de Geonoms';

geonames/lang/eo/messages.po

@@ -0,0 +1,33 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:135
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your"
+" posts."
+msgstr ""
+
+#: geonames.php:136
+msgid "Enable Geonames Addon"
+msgstr ""
+
+#: geonames.php:141
+msgid "Geonames Settings"
+msgstr ""

geonames/lang/eo/strings.php

@@ -1,6 +1,7 @@
-<?php
-
-$a->strings["Geonames settings updated."] = "Ĝidatigis la Geonames agordojn.";
-$a->strings["Geonames Settings"] = "Geonames Agordoj";
-$a->strings["Enable Geonames Addon"] = "Ŝalti la Geonames Kromprogramon";
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

geonames/lang/et/messages.po

@@ -0,0 +1,33 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:135
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your"
+" posts."
+msgstr ""
+
+#: geonames.php:136
+msgid "Enable Geonames Addon"
+msgstr ""
+
+#: geonames.php:141
+msgid "Geonames Settings"
+msgstr ""

geonames/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

geonames/lang/gd/messages.po

@@ -0,0 +1,33 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: geonames.php:135
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your"
+" posts."
+msgstr ""
+
+#: geonames.php:136
+msgid "Enable Geonames Addon"
+msgstr ""
+
+#: geonames.php:141
+msgid "Geonames Settings"
+msgstr ""

geonames/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

gnot/gnot.php

@@ -4,13 +4,11 @@
  * Description: Thread email comment notifications on Gmail and anonymise them
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -21,7 +19,7 @@ function gnot_install()
 	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	Logger::notice("installed gnot");
+	DI::logger()->notice("installed gnot");
 }
 
 /**
@@ -38,7 +36,7 @@ function gnot_settings_post($post) {
 }
 
 /**
- * Called from the Addon Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  */
 function gnot_settings(array &$data)

gnot/lang/bg/messages.po

@@ -0,0 +1,38 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnot.php:63
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr ""
+
+#: gnot.php:64
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:69
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:79
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""

gnot/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gnot/lang/eo/messages.po

@@ -0,0 +1,38 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnot.php:63
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr ""
+
+#: gnot.php:64
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:69
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:79
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""

gnot/lang/eo/strings.php

@@ -1,8 +1,7 @@
-<?php
-
-$a->strings["Gnot settings updated."] = "Ĝisdatigis Gnot agordojn.";
-$a->strings["Gnot Settings"] = "Agordoj por Gnot";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permesas la ĉenadon de retpoŝtaj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio.";
-$a->strings["Enable this addon?"] = "Ŝalti tiun kromprogramon?";
-$a->strings["Submit"] = "Sendi";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Atentigo] Komento pri konversacio #%d";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gnot/lang/et/messages.po

@@ -0,0 +1,39 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"Last-Translator: Rain Hawk, 2020\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnot.php:63
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr ""
+
+#: gnot.php:64
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:69
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:79
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""

gnot/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gnot/lang/gd/messages.po

@@ -0,0 +1,38 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: gnot.php:63
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr ""
+
+#: gnot.php:64
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:69
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:79
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""

gnot/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

gnot/lang/is/messages.po

@@ -0,0 +1,38 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: gnot.php:63
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr ""
+
+#: gnot.php:64
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:69
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:79
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""

gnot/lang/is/strings.php

@@ -1,8 +1,7 @@
-<?php
-
-$a->strings["Gnot settings updated."] = "";
-$a->strings["Gnot Settings"] = "";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
-$a->strings["Enable this addon?"] = "";
-$a->strings["Submit"] = "Senda inn";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

googlemaps/googlemaps.php

@@ -7,15 +7,14 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	Logger::notice('installed googlemaps');
+	DI::logger()->notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)

gravatar/gravatar.php

@@ -6,15 +6,11 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -23,12 +19,12 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	Logger::notice("registered gravatar in avatar_lookup hook");
+	DI::logger()->notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

gravatar/lang/bg/messages.po

@@ -0,0 +1,70 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gravatar.php:78
+msgid "generic profile image"
+msgstr ""
+
+#: gravatar.php:79
+msgid "random geometric pattern"
+msgstr ""
+
+#: gravatar.php:80
+msgid "monster face"
+msgstr ""
+
+#: gravatar.php:81
+msgid "computer generated face"
+msgstr ""
+
+#: gravatar.php:82
+msgid "retro arcade style face"
+msgstr ""
+
+#: gravatar.php:96
+msgid "Information"
+msgstr ""
+
+#: gravatar.php:96
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: gravatar.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Default avatar image"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Rating of images"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""

gravatar/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gravatar/lang/eo/messages.po

@@ -0,0 +1,70 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gravatar.php:78
+msgid "generic profile image"
+msgstr ""
+
+#: gravatar.php:79
+msgid "random geometric pattern"
+msgstr ""
+
+#: gravatar.php:80
+msgid "monster face"
+msgstr ""
+
+#: gravatar.php:81
+msgid "computer generated face"
+msgstr ""
+
+#: gravatar.php:82
+msgid "retro arcade style face"
+msgstr ""
+
+#: gravatar.php:96
+msgid "Information"
+msgstr ""
+
+#: gravatar.php:96
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: gravatar.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Default avatar image"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Rating of images"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""

gravatar/lang/eo/strings.php

@@ -1,15 +1,7 @@
-<?php
-
-$a->strings["generic profile image"] = "komuna profilbildo";
-$a->strings["random geometric pattern"] = "loteca geometria skemo";
-$a->strings["monster face"] = "monstrobildo";
-$a->strings["computer generated face"] = "komputita vizaĝo";
-$a->strings["retro arcade style face"] = "retrostila videoludstila vizaĝo";
-$a->strings["Information"] = "Informo";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "La Libravatar kromprogramo estas ankaŭ instaltga. Bonvolu malŝalti la Libravatar kromprogramon.<br>La Libravatar kromprogramo retropaŝos al Gravatar se neniu troveblis ĉe Libravatar.";
-$a->strings["Submit"] = "Sendi";
-$a->strings["Default avatar image"] = "Defaŭlta avatarbildo";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Elektu defaŭltan avatarbildon se neniu troviĝis ĉe Gravatar. Vidu README.";
-$a->strings["Rating of images"] = "Pritakso de bildoj";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Elektu la ĝustan pritakson de via avataro por via retejo. Vidu README.";
-$a->strings["Gravatar settings updated."] = "Gravatar agordoj ĝisdatigitaj.";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gravatar/lang/et/messages.po

@@ -0,0 +1,71 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"Last-Translator: Rain Hawk, 2020\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gravatar.php:78
+msgid "generic profile image"
+msgstr ""
+
+#: gravatar.php:79
+msgid "random geometric pattern"
+msgstr ""
+
+#: gravatar.php:80
+msgid "monster face"
+msgstr ""
+
+#: gravatar.php:81
+msgid "computer generated face"
+msgstr ""
+
+#: gravatar.php:82
+msgid "retro arcade style face"
+msgstr ""
+
+#: gravatar.php:96
+msgid "Information"
+msgstr ""
+
+#: gravatar.php:96
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: gravatar.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Default avatar image"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Rating of images"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""

gravatar/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

gravatar/lang/gd/messages.po

@@ -0,0 +1,70 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: gravatar.php:78
+msgid "generic profile image"
+msgstr ""
+
+#: gravatar.php:79
+msgid "random geometric pattern"
+msgstr ""
+
+#: gravatar.php:80
+msgid "monster face"
+msgstr ""
+
+#: gravatar.php:81
+msgid "computer generated face"
+msgstr ""
+
+#: gravatar.php:82
+msgid "retro arcade style face"
+msgstr ""
+
+#: gravatar.php:96
+msgid "Information"
+msgstr ""
+
+#: gravatar.php:96
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: gravatar.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Default avatar image"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Rating of images"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""

gravatar/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

gravatar/lang/is/messages.po

@@ -0,0 +1,70 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: gravatar.php:78
+msgid "generic profile image"
+msgstr ""
+
+#: gravatar.php:79
+msgid "random geometric pattern"
+msgstr ""
+
+#: gravatar.php:80
+msgid "monster face"
+msgstr ""
+
+#: gravatar.php:81
+msgid "computer generated face"
+msgstr ""
+
+#: gravatar.php:82
+msgid "retro arcade style face"
+msgstr ""
+
+#: gravatar.php:96
+msgid "Information"
+msgstr ""
+
+#: gravatar.php:96
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: gravatar.php:102
+msgid "Save Settings"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Default avatar image"
+msgstr ""
+
+#: gravatar.php:103
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Rating of images"
+msgstr ""
+
+#: gravatar.php:104
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""

gravatar/lang/is/strings.php

@@ -1,15 +1,7 @@
-<?php
-
-$a->strings["generic profile image"] = "";
-$a->strings["random geometric pattern"] = "";
-$a->strings["monster face"] = "";
-$a->strings["computer generated face"] = "";
-$a->strings["retro arcade style face"] = "";
-$a->strings["Information"] = "";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
-$a->strings["Submit"] = "Senda inn";
-$a->strings["Default avatar image"] = "";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
-$a->strings["Rating of images"] = "";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
-$a->strings["Gravatar settings updated."] = "";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

group_text/group_text.php

@@ -8,9 +8,7 @@
  * Note: Please use Circle Text instead
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

group_text/lang/bg/messages.po

@@ -0,0 +1,27 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian (http://app.transifex.com/Friendica/friendica/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr ""

group_text/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

group_text/lang/eo/messages.po

@@ -0,0 +1,27 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto (http://app.transifex.com/Friendica/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr ""

group_text/lang/eo/strings.php

@@ -1,5 +1,7 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Sendi";
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

group_text/lang/et/messages.po

@@ -0,0 +1,28 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: Rain Hawk, 2020\n"
+"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr ""

group_text/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

group_text/lang/gd/messages.po

@@ -0,0 +1,27 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gaelic, Scottish (http://app.transifex.com/Friendica/friendica/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr ""

group_text/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

group_text/lang/is/messages.po

@@ -0,0 +1,27 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr ""

group_text/lang/is/strings.php

@@ -1,5 +1,7 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Senda inn";
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

highlightjs/highlightjs.php

@@ -6,7 +6,6 @@
  * Author: Hypolite Petovan <hypolite@mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -18,7 +17,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';

ifttt/ifttt.php

@@ -6,10 +6,8 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\App;
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -87,16 +85,16 @@ function ifttt_post()
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		Logger::info('User ' . $nickname . ' not found.');
+		DI::logger()->info('User ' . $nickname . ' not found.');
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	DI::logger()->info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
 
 	if (!isset($_REQUEST['key'])) {
-		Logger::notice('No key found.');
+		DI::logger()->notice('No key found.');
 		return;
 	}
 
@@ -104,7 +102,7 @@ function ifttt_post()
 
 	// Check the key
 	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		Logger::info('Invalid key for user ' . $uid);
+		DI::logger()->info('Invalid key for user ' . $uid);
 		return;
 	}
 
@@ -115,7 +113,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		Logger::info('Unknown item type ' . $item['type']);
+		DI::logger()->info('Unknown item type ' . $item['type']);
 		return;
 	}
 

ifttt/lang/bg/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Bulgarian (https://app.transifex.com/Friendica/teams/12172/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/bg/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_bg")) {
+function string_plural_select_bg($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

ifttt/lang/ca/messages.po

@@ -0,0 +1,66 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+# Translators:
+# Rafael Garau, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Last-Translator: Rafael Garau, 2018\n"
+"Language-Team: Catalan (https://app.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"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+"Crear un compte en <a href=\"http://www.ifttt.com\">IFTTT</a>. Crear tres "
+"fórmules per Facebook que estiguin connectades amb <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (de la següent forma \"si "
+"Facebook llavors Maker\") amb els següents paràmetres:"
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr "Cos pel \"nou missatge de estatus\""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr "Cos per la \"nova foto pujada\""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr "Cos pel \"nou enllaç de l'enviament\""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr "Espill IFTTT"
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr "Generar nova clau"

ifttt/lang/ca/strings.php

@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Crear un compte en <a href="http://www.ifttt.com">IFTTT</a>. Crear tres fórmules per Facebook que estiguin connectades amb <a href="https://ifttt.com/maker">Maker</a> (de la següent forma "si Facebook llavors Maker") amb els següents paràmetres:';
+$a->strings['Body for "new status message"'] = 'Cos pel "nou missatge de estatus"';
+$a->strings['Body for "new photo upload"'] = 'Cos per la "nova foto pujada"';
+$a->strings['Body for "new link post"'] = 'Cos pel "nou enllaç de l\'enviament"';
+$a->strings['IFTTT Mirror'] = 'Espill IFTTT';
+$a->strings['Generate new key'] = 'Generar nova clau';

ifttt/lang/eo/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Esperanto (https://app.transifex.com/Friendica/teams/12172/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/eo/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_eo")) {
+function string_plural_select_eo($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

ifttt/lang/et/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Estonian (https://app.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"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/et/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}

ifttt/lang/gd/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Gaelic, Scottish (https://app.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"
+"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"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/gd/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_gd")) {
+function string_plural_select_gd($n){
+	$n = intval($n);
+	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
+}}

ifttt/lang/is/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Icelandic (https://app.transifex.com/Friendica/teams/12172/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/is/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return intval($n % 10 != 1 || $n % 100 == 11);
+}}

ifttt/lang/it/messages.po

@@ -0,0 +1,67 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2018
+# Sylke Vicious <silkevicious@gmail.com>, 2023
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
+"Language-Team: Italian (https://app.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"
+"Language: it\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+"Crea un accout su <a href=\"http://www.ifttt.com\">IFTTT</a>. Crea tre "
+"ricette Facebook  collegate con <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (del tipo \"if Facebook then "
+"Maker\") con i seguenti parametri:"
+
+#: ifttt.php:53
+msgid "URL"
+msgstr "URL"
+
+#: ifttt.php:54
+msgid "Method"
+msgstr "Metodo"
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr "Tipo di Contenuto"
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr "Contenuto per \"nuovo messaggio di stato\""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr "Contenuto per \"nuova foto caricata\""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr "Contenuto per \"nuovo collegamento\""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr "Mirror IFTTT"
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr "Genera una nuova chiave"

ifttt/lang/it/strings.php

@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	$n = intval($n);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+}}
+$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Crea un accout su <a href="http://www.ifttt.com">IFTTT</a>. Crea tre ricette Facebook  collegate con <a href="https://ifttt.com/maker">Maker</a> (del tipo "if Facebook then Maker") con i seguenti parametri:';
+$a->strings['URL'] = 'URL';
+$a->strings['Method'] = 'Metodo';
+$a->strings['Content Type'] = 'Tipo di Contenuto';
+$a->strings['Body for "new status message"'] = 'Contenuto per "nuovo messaggio di stato"';
+$a->strings['Body for "new photo upload"'] = 'Contenuto per "nuova foto caricata"';
+$a->strings['Body for "new link post"'] = 'Contenuto per "nuovo collegamento"';
+$a->strings['IFTTT Mirror'] = 'Mirror IFTTT';
+$a->strings['Generate new key'] = 'Genera una nuova chiave';

ifttt/lang/nl/messages.po

@@ -0,0 +1,62 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
+"Language-Team: Dutch (https://app.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"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr "IFTTT Mirror"
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/nl/strings.php

@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['IFTTT Mirror'] = 'IFTTT Mirror';

ifttt/lang/ru/messages.po

@@ -0,0 +1,58 @@
+# ADDON ifttt
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ifttt addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2017-11-27 10:37+0000\n"
+"Language-Team: Russian (https://app.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"
+"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"
+
+#: ifttt.php:52
+msgid ""
+"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
+"three Facebook recipes that are connected with <a "
+"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
+"Maker\") with the following parameters:"
+msgstr ""
+
+#: ifttt.php:53
+msgid "URL"
+msgstr ""
+
+#: ifttt.php:54
+msgid "Method"
+msgstr ""
+
+#: ifttt.php:55
+msgid "Content Type"
+msgstr ""
+
+#: ifttt.php:56
+msgid "Body for \"new status message\""
+msgstr ""
+
+#: ifttt.php:57
+msgid "Body for \"new photo upload\""
+msgstr ""
+
+#: ifttt.php:58
+msgid "Body for \"new link post\""
+msgstr ""
+
+#: ifttt.php:68
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:71
+msgid "Generate new key"
+msgstr ""

ifttt/lang/ru/strings.php

@@ -0,0 +1,7 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+}}

ijpost/ijpost.php

@@ -8,10 +8,8 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -124,6 +122,10 @@ function ijpost_send(array &$b)
 		return;
 	}
 
+	if (Item::isGroupPost($b['uri-id'])) {
+		return;
+	}
+
 	if ($b['parent'] != $b['id']) {
 		return;
 	}
@@ -179,11 +181,11 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('ijpost: data: ' . $xml);
+		DI::logger()->debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
 			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
-		Logger::info('posted to insanejournal: ' . $x ? $x : '');
+		DI::logger()->info('posted to insanejournal: ' . $x ? $x : '');
 	}
 }