Merge pull request #1283 from annando/notice

Wppost: Fix "PHP Notice:  Undefined index:"

.woodpecker/.continuous-deployment.yml

@@ -1,9 +1,7 @@
-matrix:
+# This prevents executing this pipeline at other servers than ci.friendi.ca
-  include:
+labels:
-    - PHP_MAJOR_VERSION: 7.4
+  location: friendica
-      PHP_VERSION: 7.4.18
+  type: releaser
-
-platform: releaser/release # This prevents executing this pipeline at other servers than ci.friendi.ca
 
 skip_clone: true
 
@@ -36,7 +34,7 @@ pipeline:
     settings:
       backend: "filesystem"
       restore: true
-      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
+      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
       archive_format: "gzip"
       mount:
         - '.composer'
@@ -47,7 +45,7 @@ pipeline:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
+    image: friendicaci/php7.4:php7.4.18
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate
@@ -102,37 +100,12 @@ pipeline:
       repo: friendica/friendica-addons
       branch: [ develop, '*-rc' ]
       event: push
-  upload_artifacts:
+  publish_artifacts:
     image: alpine
-    secrets:
-      - source: sftp_host
-        target: lftp_host
-      - source: sftp_user
-        target: lftp_user
-      - source: ssh_key
-        target: lftp_key
-    environment:
-      LFTP_PORT: "22"
-      LFTP_SOURCE: "build"
-      LFTP_TARGET: "/http"
-    volumes:
-      - /etc/hosts:/etc/hosts
     commands:
-      - apk add lftp openssh openssl
+      - cp -fr build/* /tmp/friendica_files/
-      - touch drone.key
+    volumes:
-      - chmod 400 drone.key
+      - files:/tmp/friendica_files
-      - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key
-      - lftp -c "
-        set net:timeout 5;
-        set net:max-retries 2;
-        set net:reconnect-interval-base 5;
-        set sftp:auto-confirm true;
-        set sftp:connect-program 'ssh -q -a -x -i drone.key';
-        connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT;
-        cd $LFTP_TARGET;
-        mput $LFTP_SOURCE/*;
-        "
-      - rm drone.key
     when:
       repo: friendica/friendica-addons
       branch: [ develop, '*-rc' ]

.woodpecker/.releaser.yml

@@ -1,9 +1,7 @@
-matrix:
+# This prevents executing this pipeline at other servers than ci.friendi.ca
-  include:
+labels:
-    - PHP_MAJOR_VERSION: 7.4
+  location: friendica
-      PHP_VERSION: 7.4.18
+  type: releaser
-
-platform: releaser/release # This prevents executing this pipeline at other servers than ci.friendi.ca
 
 skip_clone: true
 
@@ -15,7 +13,6 @@ pipeline:
       - git checkout $CI_COMMIT_BRANCH
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
   clone_friendica_addon:
     image: alpine/git
@@ -29,14 +26,13 @@ pipeline:
       - git merge $CI_COMMIT_SHA
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:
       backend: "filesystem"
       restore: true
-      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
+      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
       archive_format: "gzip"
       mount:
         - '.composer'
@@ -44,17 +40,15 @@ pipeline:
       - /tmp/drone-cache:/tmp/cache
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
   composer_install:
-    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
+    image: friendicaci/php7.4:php7.4.18
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate
       - composer install --no-dev --optimize-autoloader
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
     volumes:
       - /etc/hosts:/etc/hosts
@@ -84,7 +78,6 @@ pipeline:
       - sha256sum "$ARTIFACT"
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
   sign_artifacts:
     image: plugins/gpgsign
@@ -100,40 +93,13 @@ pipeline:
       detach_sign: true
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag
-  upload_artifacts:
+  publish_artifacts:
     image: alpine
-    secrets:
-      - source: sftp_host
-        target: lftp_host
-      - source: sftp_user
-        target: lftp_user
-      - source: ssh_key
-        target: lftp_key
-    environment:
-      LFTP_PORT: "22"
-      LFTP_SOURCE: "build"
-      LFTP_TARGET: "/http"
-    volumes:
-      - /etc/hosts:/etc/hosts
     commands:
-      - apk add lftp openssh openssl
+      - cp -fr build/* /tmp/friendica_files/
-      - touch drone.key
+    volumes:
-      - chmod 400 drone.key
+      - files:/tmp/friendica_files
-      - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key
-      - lftp -c "
-        set net:timeout 5;
-        set net:max-retries 2;
-        set net:reconnect-interval-base 5;
-        set sftp:auto-confirm true;
-        set sftp:connect-program 'ssh -q -a -x -i drone.key';
-        connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT;
-        cd $LFTP_TARGET;
-        mput $LFTP_SOURCE/*;
-        "
-      - rm drone.key
     when:
       repo: friendica/friendica-addons
-      branch: stable
       event: tag

advancedcontentfilter/advancedcontentfilter.php

@@ -64,7 +64,7 @@ function advancedcontentfilter_install(App $a)
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	Logger::notice("installed advancedcontentfilter");
+	Logger::notice('installed advancedcontentfilter');
 }
 
 /*
@@ -73,24 +73,28 @@ function advancedcontentfilter_install(App $a)
 
 function advancedcontentfilter_dbstructure_definition(App $a, &$database)
 {
-	$database["advancedcontentfilter_rules"] = [
+	$database['advancedcontentfilter_rules'] = [
-		"comment" => "Advancedcontentfilter addon rules",
+		'comment' => 'Advancedcontentfilter addon rules',
-		"fields" => [
+		'fields' => [
-			"id"         => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Auto incremented rule id"],
+			'id'         => ['type' => 'int unsigned', 'not null' => '1', 'extra' => 'auto_increment', 'primary' => '1', 'comment' => 'Auto incremented rule id'],
-			"uid"        => ["type" => "int unsigned", "not null" => "1", "comment" => "Owner user id"],
+			'uid'        => ['type' => 'int unsigned', 'not null' => '1', 'comment' => 'Owner user id'],
-			"name"       => ["type" => "varchar(255)", "not null" => "1", "comment" => "Rule name"],
+			'name'       => ['type' => 'varchar(255)', 'not null' => '1', 'comment' => 'Rule name'],
-			"expression" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Expression text"],
+			'expression' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Expression text'],
-			"serialized" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Serialized parsed expression"],
+			'serialized' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Serialized parsed expression'],
-			"active"     => ["type" => "boolean"     , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"],
+			'active'     => ['type' => 'boolean'     , 'not null' => '1', 'default' => '1', 'comment' => 'Whether the rule is active or not'],
-			"created"    => ["type" => "datetime"    , "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
+			'created'    => ['type' => 'datetime'    , 'not null' => '1', 'default' => DBA::NULL_DATETIME, 'comment' => 'Creation date'],
 		],
-		"indexes" => [
+		'indexes' => [
-			"PRIMARY" => ["id"],
+			'PRIMARY' => ['id'],
-			"uid_active" => ["uid", "active"],
+			'uid_active' => ['uid', 'active'],
 		]
 	];
 }
 
+/**
+ * @param array $item Prepared by either Model\Item::prepareBody or advancedcontentfilter_prepare_item_row
+ * @return array
+ */
 function advancedcontentfilter_get_filter_fields(array $item)
 {
 	$vars = [];
@@ -176,6 +180,11 @@ function advancedcontentfilter_addon_settings(App $a, array &$data)
  * Module
  */
 
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function advancedcontentfilter_module() {}
 
 function advancedcontentfilter_init(App $a)
@@ -262,30 +271,20 @@ function advancedcontentfilter_build_fields($data)
 	}
 
 	if (!empty($data['expression'])) {
-		$allowed_keys = [
+		// Using a dummy item to validate the field existence
-			'author_id', 'author_link', 'author_name', 'author_avatar',
+		$condition = ["(`uid` = ? OR `uid` = 0)", local_user()];
-			'owner_id', 'owner_link', 'owner_name', 'owner_avatar',
+		$params = ['order' => ['uid' => true]];
-			'contact_id', 'uid', 'id', 'parent', 'uri',
+		$item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
-			'thr_parent', 'parent_uri',
+
-			'content_warning',
+		if (!DBA::isResult($item_row)) {
-			'commented', 'created', 'edited', 'received',
+			throw new HTTPException\NotFoundException(DI::l10n()->t('This addon requires this node having at least one post'));
-			'verb', 'object_type', 'postopts', 'plink', 'guid', 'wall', 'private', 'starred',
+		}
-			'title', 'body',
-			'file', 'event_id', 'location', 'coord', 'app', 'attach',
-			'rendered_hash', 'rendered_html', 'object',
-			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-			'item_id', 'item_network', 'author_thumb', 'owner_thumb',
-			'network', 'url', 'name', 'writable', 'self',
-			'cid', 'alias',
-			'event_created', 'event_edited', 'event_start', 'event_finish', 'event_summary',
-			'event_desc', 'event_location', 'event_type', 'event_nofinish', 'event_ignore',
-			'children', 'pagedrop', 'tags', 'hashtags', 'mentions',
-			'attachments',
-		];
 
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
-
+		$parsedExpression = $expressionLanguage->parse(
-		$parsedExpression = $expressionLanguage->parse($data['expression'], $allowed_keys);
+			$data['expression'],
+			array_keys(advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row)))
+		);
 
 		$serialized = serialize($parsedExpression->getNodes());
 
@@ -430,23 +429,33 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 
 	$condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()];
 	$params = ['order' => ['uid' => true]];
-	$item = Post::selectFirstForUser(local_user(), [], $condition, $params);
+	$item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
 
-	if (!DBA::isResult($item)) {
+	if (!DBA::isResult($item_row)) {
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
 	}
 
-	$tags = Tag::populateFromItem($item);
+	$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
-
-	$item['tags'] = $tags['tags'];
-	$item['hashtags'] = $tags['hashtags'];
-	$item['mentions'] = $tags['mentions'];
-
-	$attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '');
-
-	$item['attachments'] = $attachments;
-
-	$return = advancedcontentfilter_get_filter_fields($item);
 
 	return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
 }
+
+/**
+ * This mimimcs the processing performed in Model\Item::prepareBody
+ *
+ * @param array $item_row
+ * @return array
+ * @throws HTTPException\InternalServerErrorException
+ * @throws ImagickException
+ */
+function advancedcontentfilter_prepare_item_row(array $item_row): array
+{
+	$tags = Tag::populateFromItem($item_row);
+
+	$item_row['tags'] = $tags['tags'];
+	$item_row['hashtags'] = $tags['hashtags'];
+	$item_row['mentions'] = $tags['mentions'];
+	$item_row['attachments'] = Post\Media::splitAttachments($item_row['uri-id'], $item_row['guid'] ?? '');
+
+	return $item_row;
+}

advancedcontentfilter/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\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"
@@ -112,42 +112,46 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:323
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:334 advancedcontentfilter.php:370
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:401 advancedcontentfilter.php:424
+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:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:405
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr ""
 
-#: advancedcontentfilter.php:350
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr ""
 
-#: advancedcontentfilter.php:364
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr ""
 
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr ""
 
-#: advancedcontentfilter.php:395
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr ""
 
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr ""
 
-#: advancedcontentfilter.php:428
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr ""
 
-#: advancedcontentfilter.php:436
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr ""

advancedcontentfilter/lang/da-dk/messages.po

@@ -0,0 +1,157 @@
+# 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: 2021-11-21 19:13-0500\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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:312 advancedcontentfilter.php:323
+#: advancedcontentfilter.php:334 advancedcontentfilter.php:370
+#: advancedcontentfilter.php:401 advancedcontentfilter.php:424
+msgid "You must be logged in to use this method"
+msgstr ""
+
+#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:405
+msgid "Invalid form security token, please refresh the page."
+msgstr ""
+
+#: advancedcontentfilter.php:350
+msgid "The rule name and expression are required."
+msgstr ""
+
+#: advancedcontentfilter.php:364
+msgid "Rule successfully added"
+msgstr ""
+
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr ""
+
+#: advancedcontentfilter.php:395
+msgid "Rule successfully updated"
+msgstr ""
+
+#: advancedcontentfilter.php:418
+msgid "Rule successfully deleted"
+msgstr ""
+
+#: advancedcontentfilter.php:428
+msgid "Missing argument: guid."
+msgstr ""
+
+#: advancedcontentfilter.php:436
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr ""
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""

advancedcontentfilter/lang/da-dk/strings.php

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

advancedcontentfilter/lang/de/messages.po

@@ -5,16 +5,16 @@
 # 
 # Translators:
 # Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
 "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,32 +22,28 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/middlewares.php:49
+#: advancedcontentfilter.php:154
-msgid "Method not found"
-msgstr "Methode nicht gefunden"
-
-#: advancedcontentfilter.php:136
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Nach dieser Regel gefiltert: %s"
 
-#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
 msgid "Advanced Content Filter"
 msgstr "Erweiterter Inhaltsfilter"
 
-#: advancedcontentfilter.php:206
+#: advancedcontentfilter.php:224
 msgid "Back to Addon Settings"
 msgstr "Zurück zu den Addon Einstellungen"
 
-#: advancedcontentfilter.php:208
+#: advancedcontentfilter.php:226
 msgid "Add a Rule"
 msgstr "Eine Regel hinzufügen"
 
-#: advancedcontentfilter.php:209
+#: advancedcontentfilter.php:227
 msgid "Help"
 msgstr "Hilfe"
 
-#: advancedcontentfilter.php:210
+#: 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. "
@@ -60,11 +56,11 @@ msgstr ""
 "gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für "
 "die Filter, wirf bitte einen Blick auf die Hilfsseite des Addons."
 
-#: advancedcontentfilter.php:211
+#: advancedcontentfilter.php:229
 msgid "Your rules"
 msgstr "Deine Regeln"
 
-#: advancedcontentfilter.php:212
+#: advancedcontentfilter.php:230
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -72,98 +68,108 @@ msgstr ""
 "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen,"
 " verwende bitte den Button neben dem Titel."
 
-#: advancedcontentfilter.php:213
+#: advancedcontentfilter.php:231
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: advancedcontentfilter.php:214
+#: advancedcontentfilter.php:232
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: advancedcontentfilter.php:215
+#: advancedcontentfilter.php:233
 msgid "Disable this rule"
 msgstr "Diese Regel deaktivieren"
 
-#: advancedcontentfilter.php:216
+#: advancedcontentfilter.php:234
 msgid "Enable this rule"
 msgstr "Diese Regel aktivieren"
 
-#: advancedcontentfilter.php:217
+#: advancedcontentfilter.php:235
 msgid "Edit this rule"
 msgstr "Diese Regel bearbeiten"
 
-#: advancedcontentfilter.php:218
+#: advancedcontentfilter.php:236
 msgid "Edit the rule"
 msgstr "Die Regel bearbeiten"
 
-#: advancedcontentfilter.php:219
+#: advancedcontentfilter.php:237
 msgid "Save this rule"
 msgstr "Regel speichern"
 
-#: advancedcontentfilter.php:220
+#: advancedcontentfilter.php:238
 msgid "Delete this rule"
 msgstr "Diese Regel löschen"
 
-#: advancedcontentfilter.php:221
+#: advancedcontentfilter.php:239
 msgid "Rule"
 msgstr "Regel"
 
-#: advancedcontentfilter.php:222
+#: advancedcontentfilter.php:240
 msgid "Close"
 msgstr "Schließen"
 
-#: advancedcontentfilter.php:223
+#: advancedcontentfilter.php:241
 msgid "Add new rule"
 msgstr "Neue Regel hinzufügen"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:242
 msgid "Rule Name"
 msgstr "Name der Regel"
 
-#: advancedcontentfilter.php:225
+#: advancedcontentfilter.php:243
 msgid "Rule Expression"
 msgstr "Ausdruck der Regel"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:244
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
+msgstr ""
+"Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag"
+" existiert."
+
+#: 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 "Du musst angemeldet sein, um diese Methode verwenden zu können "
 
-#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:382
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Ungültiges Sciherheitstoken, bitte die Seite neu laden."
 
-#: advancedcontentfilter.php:331
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "Der Name der Regel und der Ausdruck sind erforderlich."
 
-#: advancedcontentfilter.php:343
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "Regel erfolgreich hinzugefügt."
 
-#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Entweder existiert die Regel nicht, oder sie gehört dir nicht."
 
-#: advancedcontentfilter.php:372
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "Regel wurde erfolgreich aktualisiert."
 
-#: advancedcontentfilter.php:393
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "Regel erfolgreich gelöscht."
 
-#: advancedcontentfilter.php:403
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Fehlendes Argument: guid."
 
-#: advancedcontentfilter.php:411
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Unbekannter Beitrag mit der guid: %s"
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr "Methode nicht gefunden"

advancedcontentfilter/lang/de/strings.php

@@ -5,7 +5,6 @@ function string_plural_select_de($n){
 	$n = intval($n);
 	return intval($n != 1);
 }}
-$a->strings['Method not found'] = 'Methode nicht gefunden';
 $a->strings['Filtered by rule: %s'] = 'Nach dieser Regel gefiltert: %s';
 $a->strings['Advanced Content Filter'] = 'Erweiterter Inhaltsfilter';
 $a->strings['Back to Addon Settings'] = 'Zurück zu den Addon Einstellungen';
@@ -28,6 +27,7 @@ $a->strings['Add new rule'] = 'Neue Regel hinzufügen';
 $a->strings['Rule Name'] = 'Name der Regel';
 $a->strings['Rule Expression'] = 'Ausdruck der Regel';
 $a->strings['Cancel'] = 'Abbrechen';
+$a->strings['This addon requires this node having at least one post'] = 'Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag existiert.';
 $a->strings['You must be logged in to use this method'] = 'Du musst angemeldet sein, um diese Methode verwenden zu können ';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Ungültiges Sciherheitstoken, bitte die Seite neu laden.';
 $a->strings['The rule name and expression are required.'] = 'Der Name der Regel und der Ausdruck sind erforderlich.';
@@ -37,3 +37,4 @@ $a->strings['Rule successfully updated'] = 'Regel wurde erfolgreich aktualisiert
 $a->strings['Rule successfully deleted'] = 'Regel erfolgreich gelöscht.';
 $a->strings['Missing argument: guid.'] = 'Fehlendes Argument: guid.';
 $a->strings['Unknown post with guid: %s'] = 'Unbekannter Beitrag mit der guid: %s';
+$a->strings['Method not found'] = 'Methode nicht gefunden';

advancedcontentfilter/lang/fr/messages.po

@@ -8,48 +8,45 @@
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 # Phigger Phigger <automates@lepouete.fr>, 2019
 # Wil Tur <wiltur@yargl.com>, 2021
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Wil Tur <wiltur@yargl.com>, 2021\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/middlewares.php:49
+#: advancedcontentfilter.php:154
-msgid "Method not found"
-msgstr "Méthode non trouvée"
-
-#: advancedcontentfilter.php:136
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtré par règle:%s"
 
-#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
 msgid "Advanced Content Filter"
 msgstr "Filtre avancé de contenu"
 
-#: advancedcontentfilter.php:206
+#: advancedcontentfilter.php:224
 msgid "Back to Addon Settings"
 msgstr "Retour aux paramètres de l'extension"
 
-#: advancedcontentfilter.php:208
+#: advancedcontentfilter.php:226
 msgid "Add a Rule"
 msgstr "Ajouter une règle"
 
-#: advancedcontentfilter.php:209
+#: advancedcontentfilter.php:227
 msgid "Help"
 msgstr "Aide"
 
-#: advancedcontentfilter.php:210
+#: 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. "
@@ -61,11 +58,11 @@ msgstr ""
 "comparée aux données des messages. Pour une référence complète des "
 "opérations et variables disponibles, consultez la page d'aide."
 
-#: advancedcontentfilter.php:211
+#: advancedcontentfilter.php:229
 msgid "Your rules"
 msgstr "Vos règles"
 
-#: advancedcontentfilter.php:212
+#: advancedcontentfilter.php:230
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -73,98 +70,108 @@ msgstr ""
 "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-"
 "dessus près du titre"
 
-#: advancedcontentfilter.php:213
+#: advancedcontentfilter.php:231
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: advancedcontentfilter.php:214
+#: advancedcontentfilter.php:232
 msgid "Enabled"
 msgstr "Activé"
 
-#: advancedcontentfilter.php:215
+#: advancedcontentfilter.php:233
 msgid "Disable this rule"
 msgstr "Désactiver cette règle"
 
-#: advancedcontentfilter.php:216
+#: advancedcontentfilter.php:234
 msgid "Enable this rule"
 msgstr "Activer cette règle"
 
-#: advancedcontentfilter.php:217
+#: advancedcontentfilter.php:235
 msgid "Edit this rule"
 msgstr "Modifier cette règle"
 
-#: advancedcontentfilter.php:218
+#: advancedcontentfilter.php:236
 msgid "Edit the rule"
 msgstr "Modifier la règle"
 
-#: advancedcontentfilter.php:219
+#: advancedcontentfilter.php:237
 msgid "Save this rule"
 msgstr "Enregistrer cette règle"
 
-#: advancedcontentfilter.php:220
+#: advancedcontentfilter.php:238
 msgid "Delete this rule"
 msgstr "Supprimer cette règle"
 
-#: advancedcontentfilter.php:221
+#: advancedcontentfilter.php:239
 msgid "Rule"
 msgstr "Règle"
 
-#: advancedcontentfilter.php:222
+#: advancedcontentfilter.php:240
 msgid "Close"
 msgstr "Fermer"
 
-#: advancedcontentfilter.php:223
+#: advancedcontentfilter.php:241
 msgid "Add new rule"
 msgstr "Ajouter nouvelle règle"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:242
 msgid "Rule Name"
 msgstr "Nommer règle"
 
-#: advancedcontentfilter.php:225
+#: advancedcontentfilter.php:243
 msgid "Rule Expression"
 msgstr "Expression de règle"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:244
 msgid "Cancel"
 msgstr "Annuler"
 
-#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
+msgstr ""
+"Cette extension requiert au moins une publication sur ce serveur pour "
+"fonctionner"
+
+#: 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 "Vous devez être connecté pour utiliser cette méthode"
 
-#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:382
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Formulaire token de sécurité invalide, rafraîchissez la page"
 
-#: advancedcontentfilter.php:331
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "Le nom et l'expression de cette règle sont requis"
 
-#: advancedcontentfilter.php:343
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "Règle bien ajoutée"
 
-#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Cette règle n'existe pas ou ne vous appartient pas"
 
-#: advancedcontentfilter.php:372
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "Règle bien mise à jour"
 
-#: advancedcontentfilter.php:393
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "Règle bien supprimée"
 
-#: advancedcontentfilter.php:403
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Argument manquant: "
 
-#: advancedcontentfilter.php:411
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Post inconnu avec guid : %s"
+
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr "Méthode non trouvée"

advancedcontentfilter/lang/fr/strings.php

@@ -3,9 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Method not found'] = 'Méthode non trouvée';
 $a->strings['Filtered by rule: %s'] = 'Filtré par règle:%s';
 $a->strings['Advanced Content Filter'] = 'Filtre avancé de contenu';
 $a->strings['Back to Addon Settings'] = 'Retour aux paramètres de l\'extension';
@@ -28,6 +27,7 @@ $a->strings['Add new rule'] = 'Ajouter nouvelle règle';
 $a->strings['Rule Name'] = 'Nommer règle';
 $a->strings['Rule Expression'] = 'Expression de règle';
 $a->strings['Cancel'] = 'Annuler';
+$a->strings['This addon requires this node having at least one post'] = 'Cette extension requiert au moins une publication sur ce serveur pour fonctionner';
 $a->strings['You must be logged in to use this method'] = 'Vous devez être connecté pour utiliser cette méthode';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Formulaire token de sécurité invalide, rafraîchissez la page';
 $a->strings['The rule name and expression are required.'] = 'Le nom et l\'expression de cette règle sont requis';
@@ -37,3 +37,4 @@ $a->strings['Rule successfully updated'] = 'Règle bien mise à jour';
 $a->strings['Rule successfully deleted'] = 'Règle bien supprimée';
 $a->strings['Missing argument: guid.'] = 'Argument manquant: ';
 $a->strings['Unknown post with guid: %s'] = 'Post inconnu avec guid : %s';
+$a->strings['Method not found'] = 'Méthode non trouvée';

advancedcontentfilter/lang/hu/messages.po

@@ -4,16 +4,16 @@
 # 
 # 
 # Translators:
-# Balázs Úr, 2021
+# Balázs Úr, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
+"Last-Translator: Balázs Úr, 2022\n"
 "Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,42 +122,48 @@ msgstr "Szabály kifejezése"
 msgid "Cancel"
 msgstr "Mégse"
 
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:323
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:334 advancedcontentfilter.php:370
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:401 advancedcontentfilter.php:424
+msgstr ""
+"Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy "
+"bejegyzése legyen"
+
+#: 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 "Bejelentkezve kell lennie a módszer használatához"
 
-#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:405
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Érvénytelen űrlap biztonsági token. Frissítse az oldalt."
 
-#: advancedcontentfilter.php:350
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "A szabály neve és kifejezése kötelező."
 
-#: advancedcontentfilter.php:364
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "A szabály sikeresen hozzáadva"
 
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "A szabály nem létezik vagy nem Önhöz tatozik."
 
-#: advancedcontentfilter.php:395
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "A szabály sikeresen frissítve"
 
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "A szabály sikeresen törölve"
 
-#: advancedcontentfilter.php:428
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Hiányzó argumentum: guid."
 
-#: advancedcontentfilter.php:436
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Ismeretlen bejegyzés a következő guid azonosítóval: %s"

advancedcontentfilter/lang/hu/strings.php

@@ -27,6 +27,7 @@ $a->strings['Add new rule'] = 'Új szabály hozzáadása';
 $a->strings['Rule Name'] = 'Szabály neve';
 $a->strings['Rule Expression'] = 'Szabály kifejezése';
 $a->strings['Cancel'] = 'Mégse';
+$a->strings['This addon requires this node having at least one post'] = 'Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy bejegyzése legyen';
 $a->strings['You must be logged in to use this method'] = 'Bejelentkezve kell lennie a módszer használatához';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Érvénytelen űrlap biztonsági token. Frissítse az oldalt.';
 $a->strings['The rule name and expression are required.'] = 'A szabály neve és kifejezése kötelező.';

advancedcontentfilter/lang/pl/messages.po

@@ -6,15 +6,16 @@
 # Translators:
 # Waldemar Stoczkowski, 2018
 # Joe Doe, 2021
+# Piotr Strębski <strebski@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Joe Doe, 2021\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,28 +23,28 @@ msgstr ""
 "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"
 
-#: advancedcontentfilter.php:153
+#: advancedcontentfilter.php:154
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr " Filtruj według reguły: %s"
 
-#: advancedcontentfilter.php:167 advancedcontentfilter.php:224
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
 msgid "Advanced Content Filter"
 msgstr "Zaawansowany filtr zawartości"
 
-#: advancedcontentfilter.php:223
+#: advancedcontentfilter.php:224
 msgid "Back to Addon Settings"
 msgstr "Powrót do ustawień dodatków"
 
-#: advancedcontentfilter.php:225
+#: advancedcontentfilter.php:226
 msgid "Add a Rule"
 msgstr "Dodaj regułę"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:227
 msgid "Help"
 msgstr "Pomoc"
 
-#: advancedcontentfilter.php:227
+#: 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. "
@@ -55,11 +56,11 @@ msgstr ""
 "przyrównywane będą posty. Aby uzyskć więcej informacji na temat dostępnych "
 "opracji oraz zmiennych, zapoznaj się ze stronę pomocy."
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:229
 msgid "Your rules"
 msgstr "Twoje zasady"
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:230
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -67,98 +68,102 @@ msgstr ""
 "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk "
 "znajdujący się nad tytułem."
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:231
 msgid "Disabled"
 msgstr "Wyłącz"
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:232
 msgid "Enabled"
 msgstr "Włącz"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:233
 msgid "Disable this rule"
 msgstr "Wyłącz tę regułę"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:234
 msgid "Enable this rule"
 msgstr "Włącz tę regułę"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:235
 msgid "Edit this rule"
 msgstr "Edytuj tę regułę"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:236
 msgid "Edit the rule"
 msgstr "Edytuj regułę"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:237
 msgid "Save this rule"
 msgstr "Zapisz tę regułę"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:238
 msgid "Delete this rule"
 msgstr "Usuń tę regułę"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:239
 msgid "Rule"
 msgstr "Reguła"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:240
 msgid "Close"
 msgstr "Zamknij"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:241
 msgid "Add new rule"
 msgstr "Dodaj nową regułę"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:242
 msgid "Rule Name"
 msgstr "Nazwa reguły"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:243
 msgid "Rule Expression"
 msgstr "Wyrażanie reguły"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:244
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: advancedcontentfilter.php:310 advancedcontentfilter.php:321
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:332 advancedcontentfilter.php:366
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:395 advancedcontentfilter.php:416
+msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
+
+#: 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 "Musisz być zalogowany, aby skorzystać z tej metody"
 
-#: advancedcontentfilter.php:336 advancedcontentfilter.php:370
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:399
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Nieprawidłowy token zabezpieczający formularz, odśwież stronę."
 
-#: advancedcontentfilter.php:348
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "Nazwa reguły i wyrażenie są wymagane."
 
-#: advancedcontentfilter.php:360
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "Reguła została pomyślnie dodana"
 
-#: advancedcontentfilter.php:374 advancedcontentfilter.php:403
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Reguła nie istnieje lub nie należy do ciebie."
 
-#: advancedcontentfilter.php:389
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "Reguła została pomyślnie zaktualizowana"
 
-#: advancedcontentfilter.php:410
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "Reguła została pomyślnie usunięta"
 
-#: advancedcontentfilter.php:420
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Brakujący argument: guid."
 
-#: advancedcontentfilter.php:428
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Nieznany post z guid:%s"

advancedcontentfilter/lang/pl/strings.php

@@ -27,6 +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['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/lang/ru/messages.po

@@ -6,15 +6,16 @@
 # Translators:
 # Alexey Adamov <2077@tutanota.com>, 2019
 # Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
+# Alexander An <ravnina@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
 "Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,44 +23,44 @@ msgstr ""
 "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"
 
-#: advancedcontentfilter.php:134
+#: advancedcontentfilter.php:154
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Отфильтровано по правилу: %s"
 
-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
 msgid "Advanced Content Filter"
 msgstr "Расширенный фильтр содержимого"
 
-#: advancedcontentfilter.php:203
+#: advancedcontentfilter.php:224
 msgid "Back to Addon Settings"
 msgstr "Вернуться к настройкам дополнений"
 
-#: advancedcontentfilter.php:205
+#: advancedcontentfilter.php:226
 msgid "Add a Rule"
 msgstr "Добавить правило"
 
-#: advancedcontentfilter.php:206
+#: advancedcontentfilter.php:227
 msgid "Help"
 msgstr "Помощь"
 
-#: advancedcontentfilter.php:207
+#: 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 <a href=\"advancedcontentfilter/help\">help page</a>."
+"the help page."
 msgstr ""
 "Добавляйте и управляйте своими собственными фильтрами на этой странице. У "
 "правил есть имя и произвольное выражение, которое будет сопоставляться с "
 "данными поста. Для полной ссылки на доступные операции и переменные, "
-"посмотрите <a href=\"advancedcontentfilter/help\">страницу справки</a>."
+"посмотрите страницу справки."
 
-#: advancedcontentfilter.php:208
+#: advancedcontentfilter.php:229
 msgid "Your rules"
 msgstr "Ваши правила"
 
-#: advancedcontentfilter.php:209
+#: advancedcontentfilter.php:230
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -67,110 +68,106 @@ msgstr ""
 "У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку "
 "выше, рядом с названием."
 
-#: advancedcontentfilter.php:210
+#: advancedcontentfilter.php:231
 msgid "Disabled"
 msgstr "Отключено"
 
-#: advancedcontentfilter.php:211
+#: advancedcontentfilter.php:232
 msgid "Enabled"
 msgstr "Включено"
 
-#: advancedcontentfilter.php:212
+#: advancedcontentfilter.php:233
 msgid "Disable this rule"
 msgstr "Отключить это правило"
 
-#: advancedcontentfilter.php:213
+#: advancedcontentfilter.php:234
 msgid "Enable this rule"
 msgstr "Включить это правило"
 
-#: advancedcontentfilter.php:214
+#: advancedcontentfilter.php:235
 msgid "Edit this rule"
 msgstr "Изменить это правило"
 
-#: advancedcontentfilter.php:215
+#: advancedcontentfilter.php:236
 msgid "Edit the rule"
 msgstr "Изменить правило"
 
-#: advancedcontentfilter.php:216
+#: advancedcontentfilter.php:237
 msgid "Save this rule"
 msgstr "Сохранить это правило"
 
-#: advancedcontentfilter.php:217
+#: advancedcontentfilter.php:238
 msgid "Delete this rule"
 msgstr "Удалить это правило"
 
-#: advancedcontentfilter.php:218
+#: advancedcontentfilter.php:239
 msgid "Rule"
 msgstr "Правило"
 
-#: advancedcontentfilter.php:219
+#: advancedcontentfilter.php:240
 msgid "Close"
 msgstr "Закрыть"
 
-#: advancedcontentfilter.php:220
+#: advancedcontentfilter.php:241
 msgid "Add new rule"
 msgstr "Добавить новое правило"
 
-#: advancedcontentfilter.php:221
+#: advancedcontentfilter.php:242
 msgid "Rule Name"
 msgstr "Название правила"
 
-#: advancedcontentfilter.php:222
+#: advancedcontentfilter.php:243
 msgid "Rule Expression"
 msgstr "Содержание правила"
 
-#: advancedcontentfilter.php:223
+#: advancedcontentfilter.php:244
-msgid ""
-"<p>Examples:</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
-msgstr ""
-"<p>Примеры:</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
-
-#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Отмена"
 
-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:295
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+msgid "This addon requires this node having at least one post"
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
+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:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:379
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Неверный ключ, пожалуйста, перезагрузите страницу"
 
-#: advancedcontentfilter.php:328
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "Требуется ввести название и значение правила."
 
-#: advancedcontentfilter.php:340
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "Правило успешно добавлено"
 
-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Правило не найдено или доступ к нему закрыт"
 
-#: advancedcontentfilter.php:369
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "Правило успешно обновлено"
 
-#: advancedcontentfilter.php:390
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "Правило успешно удалено"
 
-#: advancedcontentfilter.php:400
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Отсутствующий аргумент: guid."
 
-#: advancedcontentfilter.php:406
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Неизвестный пост в ID: %s"
 
-#: src/middlewares.php:28
+#: src/middlewares.php:49
 msgid "Method not found"
 msgstr "Метод не найден"

advancedcontentfilter/lang/ru/strings.php

@@ -10,7 +10,7 @@ $a->strings['Advanced Content Filter'] = 'Расширенный фильтр с
 $a->strings['Back to Addon Settings'] = 'Вернуться к настройкам дополнений';
 $a->strings['Add a Rule'] = 'Добавить правило';
 $a->strings['Help'] = 'Помощь';
-$a->strings['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 <a href="advancedcontentfilter/help">help page</a>.'] = 'Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите <a href="advancedcontentfilter/help">страницу справки</a>.';
+$a->strings['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.'] = 'Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите страницу справки.';
 $a->strings['Your rules'] = 'Ваши правила';
 $a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку выше, рядом с названием.';
 $a->strings['Disabled'] = 'Отключено';
@@ -26,8 +26,8 @@ $a->strings['Close'] = 'Закрыть';
 $a->strings['Add new rule'] = 'Добавить новое правило';
 $a->strings['Rule Name'] = 'Название правила';
 $a->strings['Rule Expression'] = 'Содержание правила';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Примеры:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
 $a->strings['Cancel'] = 'Отмена';
+$a->strings['This addon requires this node having at least one post'] = 'Это дополнение требует наличия хотя бы одной записи на этом узле.';
 $a->strings['You must be logged in to use this method'] = 'Вы должны авторизоваться для использования этого метода';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Неверный ключ, пожалуйста, перезагрузите страницу';
 $a->strings['The rule name and expression are required.'] = 'Требуется ввести название и значение правила.';

birdavatar/birdavatar.php

@@ -117,7 +117,7 @@ function birdavatar_addon_settings_post(App $a, &$s)
  * @param $a array
  * @param &$b array
  */
-function birdavatar_lookup(App $a, &$b)
+function birdavatar_lookup(App $a, array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
@@ -136,9 +136,12 @@ function birdavatar_lookup(App $a, &$b)
 	$b['success'] = true;
 }
 
-function birdavatar_module()
+/**
-{
+ * This is a statement rather than an actual function definition. The simple
-}
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function birdavatar_module() {}
 
 /**
  * Returns image for user id

blackout/blackout.php

@@ -44,6 +44,7 @@
  * THE SOFTWARE.
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -54,7 +55,8 @@ function blackout_install() {
 	Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 
-function blackout_redirect ($a, $b) {
+function blackout_redirect (App $a, $b)
+{
 	// if we have a logged in user, don't throw her out
 	if (local_user()) {
 		return true;
@@ -67,32 +69,34 @@ function blackout_redirect ($a, $b) {
 	$now = time();
 	$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
 	$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
-	if ( $date1 && $date2 ) {
+	if ($date1 && $date2) {
 		$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart)->format('U');
 		$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend)->format('U');
 	} else {
-		   $date1 = 0;
+		$date1 = 0;
-		   $date2 = 0;
+		$date2 = 0;
 	}
+
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
 		Logger::notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }
 
-function blackout_addon_admin(&$a, &$o) {
+function blackout_addon_admin(App $a, string &$o)
+{
 	$mystart = DI::config()->get('blackout','begindate');
-	if (! is_string($mystart)) { $mystart = "YYYY-MM-DD hh:mm"; }
+	if (! is_string($mystart)) { $mystart = 'YYYY-MM-DD hh:mm'; }
 	$myend   = DI::config()->get('blackout','enddate');
-	if (! is_string($myend)) { $myend = "YYYY-MM-DD hh:mm"; }
+	if (! is_string($myend)) { $myend = 'YYYY-MM-DD hh:mm'; }
 	$myurl   = DI::config()->get('blackout','url');
-	if (! is_string($myurl)) { $myurl = "https://www.example.com"; }
+	if (! is_string($myurl)) { $myurl = 'https://www.example.com'; }
-	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/blackout/" );
+	$t = Renderer::getMarkupTemplate( 'admin.tpl', 'addon/blackout/' );
 
 	$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
 	$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
 	// a note for the admin
-	$adminnote = "";
+	$adminnote = '';
 	if ($date2 < $date1) {
 		$adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this.");
 	} else {
@@ -100,18 +104,17 @@ function blackout_addon_admin(&$a, &$o) {
 	}
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
-		'$rurl' => ["rurl", DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("All your visitors from the web will be redirected to this URL."), "", "", "url"],
+		'$rurl' => ['rurl', DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("All your visitors from the web will be redirected to this URL."), '', '', 'url'],
-		'$startdate' => ["startdate", DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("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.")],
+		'$startdate' => ['startdate', DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("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.")],
-		'$enddate' => ["enddate", DI::l10n()->t("End of the Blackout"), $myend, ""],
+		'$enddate' => ['enddate', DI::l10n()->t("End of the Blackout"), $myend, ''],
 		'$adminnote' => $adminnote,
 		'$aboutredirect' => DI::l10n()->t("<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."),
 	]);
 }
-function blackout_addon_admin_post (&$a) {
+
-	$begindate = trim($_POST['startdate']);
+function blackout_addon_admin_post (App $a)
-	$enddate = trim($_POST['enddate']);
+{
-	$url = trim($_POST['rurl']);
+	DI::config()->set('blackout', 'begindate', trim($_POST['startdate']));
-	DI::config()->set('blackout','begindate',$begindate);
+	DI::config()->set('blackout', 'enddate', trim($_POST['enddate']));
-	DI::config()->set('blackout','enddate',$enddate);
+	DI::config()->set('blackout', 'url', trim($_POST['rurl']));
-	DI::config()->set('blackout','url',$url);
 }

blackout/lang/da-dk/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: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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/da-dk/strings.php

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

blackout/lang/fr/messages.po

@@ -14,14 +14,14 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-03-22 08:14+0000\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>\n"
+"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: blackout.php:97
 msgid ""

blackout/lang/fr/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'La date de fin est antérieure à la date de début du blackout, vous devriez changer ça.';
 $a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'S\'il vous plaît, vérifiez à nouveau les réglages actuels du blackout. Il commencera à  <strong>%s</strong> finira à <strong>%s</strong>.';

blackout/lang/pl/messages.po

@@ -4,15 +4,16 @@
 # 
 # 
 # Translators:
+# Piotr Strębski <strebski@gmail.com>, 2022
 # Waldemar Stoczkowski, 2018-2020
 # Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2020-04-09 11:01+0000\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: Waldemar Stoczkowski\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,48 +21,49 @@ msgstr ""
 "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"
 
-#: blackout.php:101
+#: blackout.php:97
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix this"
+"The end-date is prior to the start-date of the blackout, you should fix "
-msgstr "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić"
+"this."
+msgstr "Data końcowa jest wcześniejsza niż data rozpoczęcia blackoutu, powinieneś to naprawić."
 
-#: blackout.php:103
+#: blackout.php:99
 #, php-format
 msgid ""
-"Please double check that the current settings for the blackout. Begin will "
+"Please double check the current settings for the blackout. It will begin on "
-"be <strong>%s</strong> and it will end <strong>%s</strong>."
+"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Sprawdź dokładnie, czy aktualne ustawienia zaciemnienia. Rozpocznie się <strong>%s</strong> i zakończy się <strong>%s</strong>."
+msgstr "Proszę dokładnie sprawdzić aktualne ustawienia blackoutu. Zacznie się o <strong>%s</strong> i zakończy o <strong>%s</strong>."
 
-#: blackout.php:106
+#: blackout.php:102
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: blackout.php:107
+#: blackout.php:103
 msgid "Redirect URL"
 msgstr "Przekierowanie URL"
 
-#: blackout.php:107
+#: blackout.php:103
-msgid "all your visitors from the web will be redirected to this URL"
+msgid "All your visitors from the web will be redirected to this URL."
-msgstr "wszyscy Twoi goście z internetu zostaną przekierowani na ten adres URL"
+msgstr "Wszyscy Twoi goście z Internetu zostaną przekierowani na ten adres URL."
 
-#: blackout.php:108
+#: blackout.php:104
 msgid "Begin of the Blackout"
-msgstr "Rozpocznij Blackout"
+msgstr "Rozpocznij blackout"
 
-#: blackout.php:108
+#: 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 "Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta."
 
-#: blackout.php:109
+#: blackout.php:105
 msgid "End of the Blackout"
-msgstr "Koniec Blackout"
+msgstr "Koniec blackoutu"
 
-#: blackout.php:111
+#: 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 should the blackout is "
+"thrown out but can't login again after logging out while the blackout is "
 "still in place."
-msgstr "<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli zaciemnienie będzie nadal obowiązywać."
+msgstr "<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli blackout będzie nadal obowiązywać."

blackout/lang/pl/strings.php

@@ -5,12 +5,12 @@ function string_plural_select_pl($n){
 	$n = intval($n);
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = 'Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić';
+$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'Data końcowa jest wcześniejsza niż data rozpoczęcia blackoutu, powinieneś to naprawić.';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = 'Sprawdź dokładnie, czy aktualne ustawienia zaciemnienia. Rozpocznie się <strong>%s</strong> i zakończy się <strong>%s</strong>.';
+$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Proszę dokładnie sprawdzić aktualne ustawienia blackoutu. Zacznie się o <strong>%s</strong> i zakończy o <strong>%s</strong>.';
 $a->strings['Save Settings'] = 'Zapisz ustawienia';
 $a->strings['Redirect URL'] = 'Przekierowanie URL';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'wszyscy Twoi goście z internetu zostaną przekierowani na ten adres URL';
+$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Wszyscy Twoi goście z Internetu zostaną przekierowani na ten adres URL.';
-$a->strings['Begin of the Blackout'] = 'Rozpocznij Blackout';
+$a->strings['Begin of the Blackout'] = 'Rozpocznij blackout';
 $a->strings['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.'] = 'Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta.';
-$a->strings['End of the Blackout'] = 'Koniec Blackout';
+$a->strings['End of the Blackout'] = 'Koniec blackoutu';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli zaciemnienie będzie nadal obowiązywać.';
+$a->strings['<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.'] = '<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli blackout będzie nadal obowiązywać.';

blockbot/blockbot.php

@@ -19,12 +19,14 @@ use Friendica\Network\HTTPException\ForbiddenException;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-function blockbot_install() {
+function blockbot_install()
+{
 	Hook::register('init_1', __FILE__, 'blockbot_init_1');
 }
 
-function blockbot_addon_admin(&$a, &$o) {
+function blockbot_addon_admin(App $a, string &$o)
-	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/blockbot/');
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
@@ -34,13 +36,15 @@ function blockbot_addon_admin(&$a, &$o) {
 	]);
 }
 
-function blockbot_addon_admin_post(&$a) {
+function blockbot_addon_admin_post(App $a)
+{
 	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
 
-function blockbot_init_1(App $a) {
+function blockbot_init_1(App $a)
+{
 	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		return;
 	}

blockem/blockem.php

@@ -186,9 +186,12 @@ function blockem_item_photo_menu(App $a, array &$b)
 	}
 }
 
-function blockem_module()
+/**
-{
+ * This is a statement rather than an actual function definition. The simple
-}
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function blockem_module() {}
 
 function blockem_init(App $a)
 {

blockem/lang/da-dk/messages.po

@@ -0,0 +1,47 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\n"
+"PO-Revision-Date: 2014-06-22 11:20+0000\n"
+"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:39
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Skjul brugers indhold ved at kollapse deres opslag. Erstatter også deres avatar med et generisk billede."
+
+#: blockem.php:40
+msgid "Comma separated profile URLS:"
+msgstr "Kommasepareret liste over profil-URL's:"
+
+#: blockem.php:45
+msgid "Blockem"
+msgstr "Blokdem"
+
+#: blockem.php:120
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Filtreret bruger: %s"
+
+#: blockem.php:183
+msgid "Unblock Author"
+msgstr "Fjern blokering af forfatter"
+
+#: blockem.php:185
+msgid "Block Author"
+msgstr "Blokér forfatter"

blockem/lang/da-dk/strings.php

@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Skjul brugers indhold ved at kollapse deres opslag. Erstatter også deres avatar med et generisk billede.';
+$a->strings['Comma separated profile URLS:'] = 'Kommasepareret liste over profil-URL\'s:';
+$a->strings['Blockem'] = 'Blokdem';
+$a->strings['Filtered user: %s'] = 'Filtreret bruger: %s';
+$a->strings['Unblock Author'] = 'Fjern blokering af forfatter';
+$a->strings['Block Author'] = 'Blokér forfatter';

blockem/lang/fr/messages.po

@@ -7,56 +7,44 @@
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # Marie Olive <lacellule101@gmail.com>, 2018
 # StefOfficiel <pichard.stephane@free.fr>, 2015
-# vladimir N <lapoubelle111@gmail.com>, 2018
+# Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2018-12-30 12:33+0000\n"
+"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: vladimir N <lapoubelle111@gmail.com>\n"
+"Last-Translator: Vladimir Núñez <lapoubelle111@gmail.com>, 2018\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: blockem.php:54 blockem.php:58
+#: blockem.php:39
-msgid "Blockem"
-msgstr "Bloquez-les"
-
-#: blockem.php:62
 msgid ""
 "Hides user's content by collapsing posts. Also replaces their avatar with "
 "generic image."
 msgstr "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique."
 
-#: blockem.php:63
+#: blockem.php:40
 msgid "Comma separated profile URLS:"
 msgstr "URLs de profil séparées par des virgules:"
 
-#: blockem.php:67
+#: blockem.php:45
-msgid "Save Settings"
+msgid "Blockem"
-msgstr "Sauvegarder les paramètres"
+msgstr "Bloquez-les"
 
-#: blockem.php:81
+#: blockem.php:120
-msgid "BLOCKEM Settings saved."
-msgstr "Paramètres Bloquez-les sauvegardés."
-
-#: blockem.php:143
 #, php-format
 msgid "Filtered user: %s"
 msgstr "Utilisateur filtré:%s"
 
-#: blockem.php:202
+#: blockem.php:183
 msgid "Unblock Author"
 msgstr "Débloquer l'Auteur"
 
-#: blockem.php:204
+#: blockem.php:185
 msgid "Block Author"
 msgstr "Bloquer l'Auteur"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "Réglages Blockem mis à jour."

blockem/lang/fr/strings.php

@@ -3,14 +3,11 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Blockem'] = 'Bloquez-les';
 $a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Cache le contenu de l\'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique.';
 $a->strings['Comma separated profile URLS:'] = 'URLs de profil séparées par des virgules:';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
+$a->strings['Blockem'] = 'Bloquez-les';
-$a->strings['BLOCKEM Settings saved.'] = 'Paramètres Bloquez-les sauvegardés.';
 $a->strings['Filtered user: %s'] = 'Utilisateur filtré:%s';
 $a->strings['Unblock Author'] = 'Débloquer l\'Auteur';
 $a->strings['Block Author'] = 'Bloquer l\'Auteur';
-$a->strings['blockem settings updated'] = 'Réglages Blockem mis à jour.';

blockem/lang/pl/messages.po

@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+# Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2018-08-20 13:44+0000\n"
+"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Last-Translator: Waldemar Stoczkowski, 2018\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,41 +19,29 @@ msgstr ""
 "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"
 
-#: blockem.php:54 blockem.php:58
+#: blockem.php:39
-msgid "Blockem"
-msgstr "Zablokowanie"
-
-#: blockem.php:62
 msgid ""
 "Hides user's content by collapsing posts. Also replaces their avatar with "
 "generic image."
 msgstr "Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem."
 
-#: blockem.php:63
+#: blockem.php:40
 msgid "Comma separated profile URLS:"
 msgstr "Rozdzielone przecinkami adresy URL profilu:"
 
-#: blockem.php:67
+#: blockem.php:45
-msgid "Save Settings"
+msgid "Blockem"
-msgstr "Zapisz ustawienia"
+msgstr "Zablokowanie"
 
-#: blockem.php:81
+#: blockem.php:120
-msgid "BLOCKEM Settings saved."
-msgstr "BLOCKEM Ustawienia zapisane."
-
-#: blockem.php:143
 #, php-format
 msgid "Filtered user: %s"
 msgstr "Użytkownik filtrowany: %s"
 
-#: blockem.php:202
+#: blockem.php:183
 msgid "Unblock Author"
 msgstr "Odblokuj autora"
 
-#: blockem.php:204
+#: blockem.php:185
 msgid "Block Author"
 msgstr "Zablokuj autora"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "ustawienia blockem zostały zaktualizowane"

blockem/lang/pl/strings.php

@@ -5,12 +5,9 @@ function string_plural_select_pl($n){
 	$n = intval($n);
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
-$a->strings['Blockem'] = 'Zablokowanie';
 $a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem.';
 $a->strings['Comma separated profile URLS:'] = 'Rozdzielone przecinkami adresy URL profilu:';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
+$a->strings['Blockem'] = 'Zablokowanie';
-$a->strings['BLOCKEM Settings saved.'] = 'BLOCKEM Ustawienia zapisane.';
 $a->strings['Filtered user: %s'] = 'Użytkownik filtrowany: %s';
 $a->strings['Unblock Author'] = 'Odblokuj autora';
 $a->strings['Block Author'] = 'Zablokuj autora';
-$a->strings['blockem settings updated'] = 'ustawienia blockem zostały zaktualizowane';

buglink/buglink.php

@@ -15,7 +15,7 @@ function buglink_install()
 	Hook::register('page_end', 'addon/buglink/buglink.php', 'buglink_active');
 }
 
-function buglink_active(App $a, &$b)
+function buglink_active(App $a, string &$b)
 {
 	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" rel="noopener noreferrer" title="' . DI::l10n()->t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . DI::l10n()->t('Report Bug') . '" /></a></div>';
 }

buglink/lang/da-dk/messages.po

@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+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: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:20
+msgid "Report Bug"
+msgstr "Rapportér fejl"

buglink/lang/da-dk/strings.php

@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Report Bug'] = 'Rapportér fejl';

buglink/lang/fr/strings.php

@@ -1,3 +1,8 @@
-<?php
+<?php
-
+
-$a->strings["Report Bug"] = "Signaler un bug";
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+}}
+$a->strings['Report Bug'] = 'Signaler un Bug';

buglink/lang/gd/messages.po

@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# GunChleoc, 2022
+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: GunChleoc, 2022\n"
+"Language-Team: Gaelic, Scottish (http://www.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"
+
+#: buglink.php:20
+msgid "Report Bug"
+msgstr "Dèan aithris air buga"

buglink/lang/gd/strings.php

@@ -0,0 +1,8 @@
+<?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; }
+}}
+$a->strings['Report Bug'] = 'Dèan aithris air buga';

buglink/lang/pl/messages.po

@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+# Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2018-03-30 17:07+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,6 @@ msgstr ""
 "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"
 
-#: buglink.php:15
+#: buglink.php:20
 msgid "Report Bug"
 msgstr "Zgłoś błąd"

calc/calc.php

@@ -5,6 +5,8 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -12,19 +14,21 @@ function calc_install() {
 	Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
 }
 
-function calc_app_menu($a,&$b) {
+function calc_app_menu(App $a, array &$b)
+{
 	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
 }
 
-
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function calc_module() {}
 
-
+function calc_init(App $a)
-
+{
-
+	$x = <<< EOT
-function calc_init($a) {
-
-$x = <<< EOT
 
 <script language="JavaScript">
 /**************************************
@@ -354,6 +358,5 @@ $o .=  <<< EOT
 </td></tr></tbody></table>
 
 EOT;
-return $o;
+	return $o;
-
 }

catavatar/catavatar.php

@@ -118,7 +118,7 @@ function catavatar_addon_settings_post(App $a, &$s)
  * @param $a array
  * @param &$b array
  */
-function catavatar_lookup(App $a, &$b)
+function catavatar_lookup(App $a, array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
@@ -137,6 +137,11 @@ function catavatar_lookup(App $a, &$b)
 	$b['success'] = true;
 }
 
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function catavatar_module() {}
 
 /**

catavatar/lang/da-dk/messages.po

@@ -0,0 +1,58 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+# 
+#, 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"
+"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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 "Katten havde ikke fundet sig selv."
+
+#: 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/da-dk/strings.php

@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['The cat hadn\'t found itself.'] = 'Katten havde ikke fundet sig selv.';

catavatar/lang/fr/messages.po

@@ -6,54 +6,55 @@
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
 # Walter Bulbazor, 2021
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:16+0000\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Walter Bulbazor, 2021\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: catavatar.php:49
+#: catavatar.php:48
-msgid "Use Cat as Avatar"
+msgid "Set default profile avatar or randomize the cat."
-msgstr "Utiliser Chat comme avatar"
+msgstr "Mettre l'avatar par défaut ou tirer au sort le Chat."
-
-#: catavatar.php:50
-msgid "More Random Cat!"
-msgstr "Autres Chats au hasard"
-
-#: catavatar.php:51
-msgid "Reset to email Cat"
-msgstr "Réinitialiser à Chat courriel"
 
 #: catavatar.php:53
 msgid "Cat Avatar Settings"
 msgstr "Paramètres de Chat avatar"
 
-#: catavatar.php:54
+#: catavatar.php:56
-msgid "Set default profile avatar or randomize the cat."
+msgid "Use Cat as Avatar"
-msgstr "Mettre l'avatar par défaut ou tirer au sort le Chat."
+msgstr "Utiliser Chat comme avatar"
 
-#: catavatar.php:72
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr "Un autre chat aléatoire !"
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr "Réinitialiser à Chat courriel"
+
+#: catavatar.php:77
 msgid "The cat hadn't found itself."
 msgstr "Le Chat ne s'y est pas retrouvé"
 
-#: catavatar.php:81
+#: catavatar.php:86
 msgid "There was an error, the cat ran away."
 msgstr "Il y a eu une erreur et le chat s'est enfui"
 
-#: catavatar.php:87
+#: catavatar.php:92
 msgid "Profile Photos"
 msgstr "Photos de profil"
 
-#: catavatar.php:97
+#: catavatar.php:102
 msgid "Meow!"
 msgstr "Miaou !"

catavatar/lang/fr/strings.php

@@ -3,13 +3,13 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Use Cat as Avatar'] = 'Utiliser Chat comme avatar';
-$a->strings['More Random Cat!'] = 'Autres Chats au hasard';
-$a->strings['Reset to email Cat'] = 'Réinitialiser à Chat courriel';
-$a->strings['Cat Avatar Settings'] = 'Paramètres de Chat avatar';
 $a->strings['Set default profile avatar or randomize the cat.'] = 'Mettre l\'avatar par défaut ou tirer au sort le Chat.';
+$a->strings['Cat Avatar Settings'] = 'Paramètres de Chat avatar';
+$a->strings['Use Cat as Avatar'] = 'Utiliser Chat comme avatar';
+$a->strings['Another random Cat!'] = 'Un autre chat aléatoire !';
+$a->strings['Reset to email Cat'] = 'Réinitialiser à Chat courriel';
 $a->strings['The cat hadn\'t found itself.'] = 'Le Chat ne s\'y est pas retrouvé';
 $a->strings['There was an error, the cat ran away.'] = 'Il y a eu une erreur et le chat s\'est enfui';
 $a->strings['Profile Photos'] = 'Photos de profil';

catavatar/lang/pl/messages.po

@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the Friendica catavatar addon package.
 # 
 # 
+# Translators:
+# Waldemar Stoczkowski, 2018
+# Piotr Strębski <strebski@gmail.com>, 2022
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +22,38 @@ msgstr ""
 "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"
 
-#: catavatar.php:60
+#: catavatar.php:48
-msgid "Use Cat as Avatar"
+msgid "Set default profile avatar or randomize the cat."
-msgstr "Użyj kota jako awatara"
+msgstr "Ustaw domyślny awatar profilu lub użyj losowego kota."
 
-#: catavatar.php:61
+#: catavatar.php:53
-msgid "More Random Cat!"
-msgstr "Więcej losowych kotów!"
-
-#: catavatar.php:62
-msgid "Reset to email Cat"
-msgstr "Resetuj na e-mail Kot"
-
-#: catavatar.php:64
 msgid "Cat Avatar Settings"
 msgstr "Ustawienia Kot Avatar"
 
-#: catavatar.php:100
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr "Użyj kota jako awatara"
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr "Inny losowy kot!"
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr "Resetuj Kota na e-mail"
+
+#: catavatar.php:77
 msgid "The cat hadn't found itself."
 msgstr "Kot się nie znalazł."
 
-#: catavatar.php:109
+#: catavatar.php:86
 msgid "There was an error, the cat ran away."
 msgstr "Wystąpił błąd, kot uciekł."
 
-#: catavatar.php:115
+#: catavatar.php:92
 msgid "Profile Photos"
 msgstr "Zdjęcie profilowe"
 
-#: catavatar.php:130
+#: catavatar.php:102
 msgid "Meow!"
 msgstr "Miau!"

catavatar/lang/pl/strings.php

@@ -5,10 +5,11 @@ function string_plural_select_pl($n){
 	$n = intval($n);
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
-$a->strings['Use Cat as Avatar'] = 'Użyj kota jako awatara';
+$a->strings['Set default profile avatar or randomize the cat.'] = 'Ustaw domyślny awatar profilu lub użyj losowego kota.';
-$a->strings['More Random Cat!'] = 'Więcej losowych kotów!';
-$a->strings['Reset to email Cat'] = 'Resetuj na e-mail Kot';
 $a->strings['Cat Avatar Settings'] = 'Ustawienia Kot Avatar';
+$a->strings['Use Cat as Avatar'] = 'Użyj kota jako awatara';
+$a->strings['Another random Cat!'] = 'Inny losowy kot!';
+$a->strings['Reset to email Cat'] = 'Resetuj Kota na e-mail';
 $a->strings['The cat hadn\'t found itself.'] = 'Kot się nie znalazł.';
 $a->strings['There was an error, the cat ran away.'] = 'Wystąpił błąd, kot uciekł.';
 $a->strings['Profile Photos'] = 'Zdjęcie profilowe';

convert/convert.php

@@ -5,212 +5,207 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+
+use Friendica\App;
 use Friendica\Core\Hook;
 
 function convert_install() {
 	Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu');
 }
 
-function convert_app_menu($a,&$b) {
+function convert_app_menu(App $a, array &$b)
+{
 	$b['app_menu'][] = '<div class="app-title"><a href="convert">Units Conversion</a></div>';
 }
 
 
 function convert_module() {}
 
+function convert_content(App $a) {
+	// @TODO UnitConverter uses a deprecated constructor with the class' name
+	// @TODO Let's one day rewrite this to a modern composer package
+	include 'UnitConvertor.php';
 
-
+	class TP_Converter extends UnitConvertor
-
-
-
-
-function convert_content($app) {
-
-include("UnitConvertor.php");
-
- class TP_Converter extends UnitConvertor {
-	function TP_Converter($lang = "en")
 	{
-		if ($lang != 'en' ) {
+		public function __construct(string $lang = 'en')
-			$dec_point = '.'; $thousand_sep = "'";
+		{
-		} else {
+			if ($lang == 'en' ) {
-			$dec_point = '.'; $thousand_sep = ",";
+				$dec_point = '.';
+				$thousand_sep = ',';
+			} else {
+				$dec_point = '.';
+				$thousand_sep = "'";
+			}
+
+			parent::UnitConvertor($dec_point, $thousand_sep );
 		}
 
-		$this->UnitConvertor($dec_point , $thousand_sep );
+		private function findBaseUnit($from, $to)
-
+		{
-	} // end func UnitConvertor
+			while (list($skey, $sval) = each($this->bases)) {
-
+				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
-	function find_base_unit($from,$to) {
-		while (list($skey,$sval) = each($this->bases)) {
-				if ($skey == $from || $to == $skey || in_array($to,$sval) || in_array($from,$sval)) {
 					return $skey;
 				}
+			}
+
+			return false;
 		}
-		return false;
-	}
 
-	function getTable($value, $from_unit, $to_unit, $precision) {
+		public function getTable(int $value, $from_unit, $to_unit, $precision): string
+		{
+			$string = '';
 
-		if ($base_unit = $this->find_base_unit($from_unit,$to_unit)) {
+			if ($base_unit = $this->findBaseUnit($from_unit, $to_unit)) {
-
+				// A baseunit was found now lets convert from -> $base_unit
-			// A baseunit was found now lets convert from -> $base_unit
+				$cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision) . ' ' . $base_unit;
-
+				$cell ['class'] = ($base_unit == $from_unit || $base_unit == $to_unit) ? 'framedred' : '';
-				$cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision)." ".$base_unit;
-				$cell ['class']	= ($base_unit == $from_unit || $base_unit == $to_unit) ? "framedred": "";
 				$cells[] = $cell;
-			// We now have the base unit and value now lets produce the table;
-			while (list($key,$val) = each($this->bases[$base_unit])) {
-				$cell ['value'] = $this->convert($value, $from_unit, $val, $precision)." ".$val;
-				$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? "framedred": "";
-				$cells[] = $cell;
-			}
 
-			$cc = count($cells);
+				// We now have the base unit and value now lets produce the table;
-			$string = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
+				while (list($key, $val) = each($this->bases[$base_unit])) {
-			$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
+					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
-			$i=0;
+					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
-			foreach ($cells as $cell) {
+					$cells[] = $cell;
-				if ($i==0) {
-					$string .= "<td class=\"".$cell['class']."\">".$cell['value']."</td>";
-					$i++;
-				} else {
-					$string .= "</tr><tr><td class=\"".$cell['class']."\">".$cell['value']."</td>";
 				}
+
+				$cc = count($cells);
+				$string = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
+				$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
+				$i = 0;
+				foreach ($cells as $cell) {
+					if ($i == 0) {
+						$string .= "<td class=\"" . $cell['class'] . "\">" . $cell['value'] . "</td>";
+						$i++;
+					} else {
+						$string .= "</tr><tr><td class=\"" . $cell['class'] . "\">" . $cell['value'] . "</td>";
+					}
+				}
+				$string .= "</tr></table>";
 			}
-			$string .= "</tr></table>";
+
 			return $string;
 		}
-
 	}
-}
 
+	$conv = new TP_Converter('en');
 
-$conv = new TP_Converter('en');
+	$conversions = [
+		'Temperature' => ['base'  => 'Celsius',
+			'conv' => [
+				'Fahrenheit' => ['ratio' => 1.8, 'offset' => 32],
+				'Kelvin' => ['ratio' => 1, 'offset' => 273],
+				'Reaumur' => 0.8
+			]
+		],
+		'Weight'  =>  ['base'  => 'kg',
+			'conv' => [
+				'g' => 1000,
+				'mg' => 1000000,
+				't' => 0.001,
+				'grain' => 15432,
+				'oz' => 35.274,
+				'lb' => 2.2046,
+				'cwt(UK)'	 =>  0.019684,
+				'cwt(US)'	 =>  0.022046,
+				'ton (US)'	 =>  0.0011023,
+				'ton (UK)'	 =>  0.0009842
+			]
+		],
+		'Distance'  =>  ['base'  => 'km',
+			'conv' => [
+				'm' => 1000,
+				'dm' => 10000,
+				'cm' => 100000,
+				'mm' => 1000000,
+		 		'mile' => 0.62137,
+				'naut.mile' => 0.53996,
+		 		'inch(es)' => 39370,
+				'ft' => 3280.8,
+				'yd' => 1093.6,
+				'furlong' => 4.970969537898672,
+				'fathom' => 546.8066491688539
+			]
+		],
+		'Area'  =>  ['base'  => 'km 2',
+			'conv' => [
+				'ha' => 100,
+				'acre' => 247.105,
+				'm 2' => pow(1000,2),
+				'dm 2' => pow(10000,2),
+				'cm 2' => pow(100000,2),
+				'mm 2' => pow(1000000,2),
+				'mile 2' => pow(0.62137,2),
+				'naut.miles 2' => pow(0.53996,2),
+		 		'in 2' => pow(39370,2),
+				'ft 2' => pow(3280.8,2),
+				'yd 2' => pow(1093.6,2),
+			]
+		],
+		'Volume'  =>  ['base'  => 'm 3',
+			'conv' => [
+				'in 3' => 61023.6,
+				'ft 3' => 35.315,
+				'cm 3' => pow(10,6),
+		 		'dm 3' => 1000,
+				'litre' => 1000,
+				'hl' => 10,
+				'yd 3' => 1.30795,
+		 		'gal(US)' => 264.172,
+				'gal(UK)' => 219.969,
+				'pint'  =>  2113.376,
+				'quart'  =>  1056.688,
+				'cup'  =>  4266.753,
+				'fl oz'  =>  33814.02,
+				'tablespoon'  =>  67628.04,
+				'teaspoon'  =>  202884.1,
+				'pt (UK)' => 1000/0.56826,
+				'barrel petroleum' => 1000/158.99,
+				'Register Tons' => 2.832,
+				'Ocean Tons' => 1.1327
+			]
+		],
+		'Speed'	 => ['base'  => 'kmph',
+			'conv' => [
+				'mps' => 0.0001726031,
+				'milesph' => 0.62137,
+				'knots' => 0.53996,
+				'mach STP' => 0.0008380431,
+				'c (warp)' => 9.265669e-10
+			]
+		]
+	];
 
-
+	while (list($key, $val) = each($conversions)) {
-$conversions = [
+		$conv->addConversion($val['base'], $val['conv']);
-	'Temperature'=>['base' =>'Celsius',
+		$list[$key][] = $val['base'];
-		'conv'=>[
+		while (list($ukey, $uval) = each($val['conv'])) {
-			'Fahrenheit'=>['ratio'=>1.8, 'offset'=>32],
+			$list[$key][] = $ukey;
-			'Kelvin'=>['ratio'=>1, 'offset'=>273],
+		}
-			'Reaumur'=>0.8
-		]
-	],
-	'Weight' => ['base' =>'kg',
-		'conv'=>[
-			'g'=>1000,
-			'mg'=>1000000,
-			't'=>0.001,
-			'grain'=>15432,
-			'oz'=>35.274,
-			'lb'=>2.2046,
-			'cwt(UK)'	=> 0.019684,
-			'cwt(US)'	=> 0.022046,
-			'ton (US)'	=> 0.0011023,
-			'ton (UK)'	=> 0.0009842
-		]
-	],
-	'Distance' => ['base' =>'km',
-		'conv'=>[
-			'm'=>1000,
-			'dm'=>10000,
-			'cm'=>100000,
-			'mm'=>1000000,
-	 		'mile'=>0.62137,
-			'naut.mile'=>0.53996,
-	 		'inch(es)'=>39370,
-			'ft'=>3280.8,
-			'yd'=>1093.6,
-			'furlong'=>4.970969537898672,
-			'fathom'=>546.8066491688539
-		]
-	],
-	'Area' => ['base' =>'km 2',
-		'conv'=>[
-			'ha'=>100,
-			'acre'=>247.105,
-			'm 2'=>pow(1000,2),
-			'dm 2'=>pow(10000,2),
-			'cm 2'=>pow(100000,2),
-			'mm 2'=>pow(1000000,2),
-			'mile 2'=>pow(0.62137,2),
-			'naut.miles 2'=>pow(0.53996,2),
-	 		'in 2'=>pow(39370,2),
-			'ft 2'=>pow(3280.8,2),
-			'yd 2'=>pow(1093.6,2),
-		]
-	],
-	'Volume' => ['base' =>'m 3',
-		'conv'=>[
-			'in 3'=>61023.6,
-			'ft 3'=>35.315,
-			'cm 3'=>pow(10,6),
-	 		'dm 3'=>1000,
-			'litre'=>1000,
-			'hl'=>10,
-			'yd 3'=>1.30795,
-	 		'gal(US)'=>264.172,
-			'gal(UK)'=>219.969,
-			'pint' => 2113.376,
-			'quart' => 1056.688,
-			'cup' => 4266.753,
-			'fl oz' => 33814.02,
-			'tablespoon' => 67628.04,
-			'teaspoon' => 202884.1,
-			'pt (UK)'=>1000/0.56826,
-			'barrel petroleum'=>1000/158.99,
-			'Register Tons'=>2.832,
-			'Ocean Tons'=>1.1327
-		]
-	],
-	'Speed'	=>['base' =>'kmph',
-		'conv'=>[
-			'mps'=>0.0001726031,
-			'milesph'=>0.62137,
-			'knots'=>0.53996,
-			'mach STP'=>0.0008380431,
-			'c (warp)'=>9.265669e-10
-		]
-	]
-];
-
-
-while (list($key,$val) = each($conversions)) {
-	$conv->addConversion($val['base'], $val['conv']);
-	$list[$key][] = $val['base'];
-	while (list($ukey,$uval) = each($val['conv'])) {
-		$list[$key][] = $ukey;
 	}
-}
-
-  $o .= '<h3>Unit Conversions</h3>';
 
+	$o .= '<h3>Unit Conversions</h3>';
 
 	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
-    	$_POST['value'] = $_POST['value'] + 0;
+		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
-
-
-		$o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5))."</p>";
 	} else {
-		$o .= "<p>Select:</p>";
+		$o .= '<p>Select:</p>';
 	}
 
-	if(isset($_POST['value']))
+	if (isset($_POST['value'])) {
 		$value = $_POST['value'];
-	else
+	} else {
 		$value = '';
+	}
 
 	$o .= '<form action="convert" method="post" name="conversion">';
-    $o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
+	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
-    $o .= '<select name="from_unit" size="12">';
+	$o .= '<select name="from_unit" size="12">';
-
-
 
 	reset($list);
-	while(list($key,$val) = each($list)) {
+	while(list($key, $val) = each($list)) {
 		$o .=  "\n\t<optgroup label=\"$key\">";
-		while(list($ukey,$uval) = each($val)) {
+		while(list($ukey, $uval) = each($val)) {
 			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
 			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
 		}
@@ -218,8 +213,7 @@ while (list($key,$val) = each($conversions)) {
 	}
 
 	$o .= '</select>';
-
+	$o .= '<input type="submit" name="Submit" value="Submit" /></form>';
-    $o .= '<input type="submit" name="Submit" value="Submit" /></form>';
 
 	return $o;
 }

cookienotice/cookienotice.php

@@ -58,7 +58,6 @@ function cookienotice_addon_admin(App $a, &$s)
  * handles the post request from the admin panel
  *
  * @param App    $a
- *
  * @return void
  */
 function cookienotice_addon_admin_post(App $a)
@@ -83,7 +82,7 @@ function cookienotice_addon_admin_post(App $a)
  *
  * @return void
  */
-function cookienotice_page_content_top(App $a, &$b)
+function cookienotice_page_content_top(App $a, string &$b)
 {
 	DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css');
 	DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js');
@@ -99,7 +98,7 @@ function cookienotice_page_content_top(App $a, &$b)
  *
  * @return void
  */
-function cookienotice_page_end(App $a, &$b)
+function cookienotice_page_end(App $a, string &$b)
 {
 	$text = (string)DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'));
 	$oktext = (string)DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));

cookienotice/lang/da-dk/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: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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/da-dk/strings.php

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

cookienotice/lang/fr/messages.po

@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: cookienotice.php:42
 msgid ""

cookienotice/lang/fr/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Ce site utilise des cookies. Si vous poursuivez sur ce site, vous acceptez l\'utilisation de ces cookies.';
 $a->strings['OK'] = 'Ok';

cookienotice/lang/pl/messages.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 10:48+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
 "Last-Translator: Waldemar Stoczkowski, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "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"
 
-#: cookienotice.php:63
+#: cookienotice.php:42
 msgid ""
 "This website uses cookies. If you continue browsing this website, you agree "
 "to the usage of cookies."
@@ -29,15 +29,11 @@ msgstr ""
 "Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej "
 "strony, zgadzasz się na użycie plików cookie."
 
-#: cookienotice.php:64 cookienotice.php:133
+#: cookienotice.php:43 cookienotice.php:108
 msgid "OK"
 msgstr "OK"
 
-#: cookienotice.php:68
+#: cookienotice.php:47
-msgid "\"cookienotice\" Settings"
-msgstr "Ustawienia \"plików cookie\""
-
-#: cookienotice.php:69
 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 "
@@ -47,31 +43,19 @@ msgstr ""
 "prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o "
 "ile użytkownik nie potwierdził, klikając przycisk OK."
 
-#: cookienotice.php:70
+#: cookienotice.php:48
 msgid "Cookie Usage Notice"
 msgstr "Użyciu plików cookie"
 
-#: cookienotice.php:70
+#: cookienotice.php:49
-msgid "The cookie usage notice"
-msgstr "Powiadomienie o użyciu plików cookie"
-
-#: cookienotice.php:71
 msgid "OK Button Text"
 msgstr "Tekst przycisku OK"
 
-#: cookienotice.php:71
+#: cookienotice.php:50
-msgid "The OK Button text"
-msgstr "Tekst przycisku OK"
-
-#: cookienotice.php:72
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: cookienotice.php:97
+#: cookienotice.php:107
-msgid "cookienotice Settings saved."
-msgstr "Zapisano stawienia plików cookie."
-
-#: cookienotice.php:132
 msgid ""
 "This website uses cookies to recognize revisiting and logged in users. You "
 "accept the usage of these cookies by continue browsing this website."

cookienotice/lang/pl/strings.php

@@ -7,12 +7,8 @@ function string_plural_select_pl($n){
 }}
 $a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej strony, zgadzasz się na użycie plików cookie.';
 $a->strings['OK'] = 'OK';
-$a->strings['"cookienotice" Settings'] = 'Ustawienia "plików cookie"';
 $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>Skonfiguruj zawiadomienie o użyciu plików cookie.</b> Powinien to być po prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o ile użytkownik nie potwierdził, klikając przycisk OK.';
 $a->strings['Cookie Usage Notice'] = 'Użyciu plików cookie';
-$a->strings['The cookie usage notice'] = 'Powiadomienie o użyciu plików cookie';
 $a->strings['OK Button Text'] = 'Tekst przycisku OK';
-$a->strings['The OK Button text'] = 'Tekst przycisku OK';
 $a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['cookienotice Settings saved.'] = 'Zapisano stawienia plików cookie.';
 $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.'] = 'Ta strona używa plików cookie do rozpoznawania ponownych odwiedzin i zalogowanych użytkowników. Akceptujesz użycie tych plików cookie, kontynuując przeglądanie tej witryny.';

curweather/curweather.php

@@ -87,7 +87,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	return $r;
 }
 
-function curweather_network_mod_init(App $a, &$b)
+function curweather_network_mod_init(App $a, string &$body)
 {
 	if (!intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable'))) {
 		return;
@@ -112,7 +112,7 @@ function curweather_network_mod_init(App $a, &$b)
 	$appid = DI::config()->get('curweather', 'appid');
 	$cachetime = intval(DI::config()->get('curweather', 'cachetime'));
 
-	if ($units === "") {
+	if ($units === '') {
 		$units = 'metric';
 	}
 
@@ -212,7 +212,7 @@ function curweather_addon_admin_post(App $a)
 	}
 }
 
-function curweather_addon_admin(App $a, &$o)
+function curweather_addon_admin(App $a, string &$o)
 {
 	if (!$a->isSiteAdmin()) {
 		return;
@@ -221,7 +221,7 @@ function curweather_addon_admin(App $a, &$o)
 	$appid = DI::config()->get('curweather', 'appid');
 	$cachetime = DI::config()->get('curweather', 'cachetime');
 
-	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/curweather/" );
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/curweather/' );
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),

curweather/lang/da-dk/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: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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/da-dk/strings.php

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

curweather/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
@@ -12,21 +13,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2021-03-22 08:24+0000\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: curweather.php:47
 msgid "Error fetching weather data. Error was: "
 msgstr "Erreur de récupération des données météo. L'erreur était :"
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:130
 msgid "Current Weather"
 msgstr "Météo actuelle"
 
@@ -62,66 +63,66 @@ msgstr "Une erreur est survenue lors de l'accès aux données météo. Vous pouv
 msgid "at OpenWeatherMap"
 msgstr "à OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:178
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "Pas d'APPID trouvé, merci de contacter votre administrateur pour en obtenir un."
 
-#: curweather.php:191 curweather.php:229
+#: curweather.php:188
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: curweather.php:192
-msgid "Settings"
-msgstr "Paramètres"
-
-#: curweather.php:194
 msgid "Enter either the name of your location or the zip code."
 msgstr "Entrez le nom de votre emplacement ou votre code postal."
 
-#: curweather.php:195
+#: curweather.php:189
 msgid "Your Location"
 msgstr "Votre position"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifiant de votre emplacement (nom ou code postal), par exemple <em>Paris 08, Fr</em> ou <em>75008, FR</em>."
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "Units"
 msgstr "Unités"
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "Sélectionner si la température devrait être affichée en °C ou en °F"
 
-#: curweather.php:197
+#: curweather.php:191
 msgid "Show weather data"
 msgstr "Montrer les données météos"
 
-#: curweather.php:232
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr "Paramètres de Météo"
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: curweather.php:230
 msgid "Caching Interval"
 msgstr "Intervalle de mise en cache."
 
-#: curweather.php:234
+#: curweather.php:232
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:233
 msgid "no cache"
 msgstr "pas de cache"
 
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
 msgid "minutes"
 msgstr "minutes"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your APPID"
 msgstr "Votre APPID"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Votre clé pour l'API de OpenWeatherMap"

curweather/lang/fr/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Error fetching weather data. Error was: '] = 'Erreur de récupération des données météo. L\'erreur était :';
 $a->strings['Current Weather'] = 'Météo actuelle';
@@ -16,14 +16,14 @@ $a->strings['Show on map'] = 'Montrer sur la carte';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'Une erreur est survenue lors de l\'accès aux données météo. Vous pouvez quand même jeter un oeil';
 $a->strings['at OpenWeatherMap'] = 'à OpenWeatherMap';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'Pas d\'APPID trouvé, merci de contacter votre administrateur pour en obtenir un.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Settings'] = 'Paramètres';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Entrez le nom de votre emplacement ou votre code postal.';
 $a->strings['Your Location'] = 'Votre position';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identifiant de votre emplacement (nom ou code postal), par exemple <em>Paris 08, Fr</em> ou <em>75008, FR</em>.';
 $a->strings['Units'] = 'Unités';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'Sélectionner si la température devrait être affichée en °C ou en °F';
 $a->strings['Show weather data'] = 'Montrer les données météos';
+$a->strings['Current Weather Settings'] = 'Paramètres de Météo';
+$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Caching Interval'] = 'Intervalle de mise en cache.';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap.';
 $a->strings['no cache'] = 'pas de cache';

curweather/lang/pl/messages.po

@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+# Piotr Strębski <strebski@gmail.com>, 2022
+# Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-08-04 12:10+0000\n"
+"PO-Revision-Date: 2022-03-08 14:06+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,114 +20,106 @@ msgstr ""
 "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"
 
-#: curweather.php:31
+#: curweather.php:47
-msgid "Error fetching weather data.\\nError was: "
+msgid "Error fetching weather data. Error was: "
-msgstr "Błąd podczas pobierania danych pogodowych. \\nError był:"
+msgstr "Błąd podczas pobierania danych pogodowych. Wystąpił błąd:"
 
-#: curweather.php:111 curweather.php:172
+#: curweather.php:130
 msgid "Current Weather"
 msgstr "Obecna pogoda"
 
-#: curweather.php:118
+#: curweather.php:137
 msgid "Relative Humidity"
 msgstr "Względna wilgotność"
 
-#: curweather.php:119
+#: curweather.php:138
 msgid "Pressure"
 msgstr "Ciśnienie"
 
-#: curweather.php:120
+#: curweather.php:139
 msgid "Wind"
 msgstr "Wiatr"
 
-#: curweather.php:121
+#: curweather.php:140
 msgid "Last Updated"
 msgstr "Ostatnio zaktualizowano"
 
-#: curweather.php:122
+#: curweather.php:141
 msgid "Data by"
 msgstr "Dane wg"
 
-#: curweather.php:123
+#: curweather.php:142
 msgid "Show on map"
 msgstr "Pokaż na mapie"
 
-#: curweather.php:128
+#: curweather.php:147
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Wystąpił problem z dostępem do danych pogodowych. Ale spójrz"
 
-#: curweather.php:130
+#: curweather.php:149
 msgid "at OpenWeatherMap"
 msgstr "w OpenWeatherMap"
 
-#: curweather.php:146
+#: curweather.php:178
-msgid "Current Weather settings updated."
-msgstr "Zaktualizowano bieżące ustawienia pogody."
-
-#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "Nie znaleziono APPID, skontaktuj się z administratorem, aby go uzyskać."
 
-#: curweather.php:171 curweather.php:200
+#: curweather.php:188
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: curweather.php:172
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Wprowadź nazwę swojej lokalizacji lub kod pocztowy."
 
-#: curweather.php:175
+#: curweather.php:189
 msgid "Your Location"
 msgstr "Twoja lokalizacja"
 
-#: curweather.php:175
+#: curweather.php:189
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identyfikator Twojej lokalizacji (nazwa lub kod pocztowy), np. <em>Lublin, LU</em> lub <em>20001, LU</em>."
 
-#: curweather.php:176
+#: curweather.php:190
 msgid "Units"
 msgstr "Jednostka"
 
-#: curweather.php:176
+#: curweather.php:190
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "wybierz, czy temperatura powinna być wyświetlana w &deg;C lub &deg;F"
 
-#: curweather.php:177
+#: curweather.php:191
 msgid "Show weather data"
 msgstr "Pokaż dane pogodowe"
 
-#: curweather.php:190
+#: curweather.php:196
-msgid "Curweather settings saved."
+msgid "Current Weather Settings"
-msgstr "Ustawienia pogodowe zostały zapisane."
+msgstr "Bieżące ustawienia pogody"
 
-#: curweather.php:201
+#: curweather.php:227
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: curweather.php:230
 msgid "Caching Interval"
 msgstr "Interwał buforowania"
 
-#: curweather.php:201
+#: curweather.php:232
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Od jak dawna powinny być buforowane dane pogodowe? Wybierz zgodnie z typem konta OpenWeatherMap."
 
-#: curweather.php:201
+#: curweather.php:233
 msgid "no cache"
 msgstr "Brak pamięci podręcznej"
 
-#: curweather.php:201
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
 msgid "minutes"
 msgstr "minut"
 
-#: curweather.php:202
+#: curweather.php:240
 msgid "Your APPID"
 msgstr "Twój APPID"
 
-#: curweather.php:202
+#: curweather.php:240
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Twój klucz API dostarczony przez OpenWeatherMap"

curweather/lang/pl/strings.php

@@ -5,7 +5,7 @@ function string_plural_select_pl($n){
 	$n = intval($n);
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
-$a->strings['Error fetching weather data.\nError was: '] = 'Błąd podczas pobierania danych pogodowych. \nError był:';
+$a->strings['Error fetching weather data. Error was: '] = 'Błąd podczas pobierania danych pogodowych. Wystąpił błąd:';
 $a->strings['Current Weather'] = 'Obecna pogoda';
 $a->strings['Relative Humidity'] = 'Względna wilgotność';
 $a->strings['Pressure'] = 'Ciśnienie';
@@ -15,17 +15,15 @@ $a->strings['Data by'] = 'Dane wg';
 $a->strings['Show on map'] = 'Pokaż na mapie';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'Wystąpił problem z dostępem do danych pogodowych. Ale spójrz';
 $a->strings['at OpenWeatherMap'] = 'w OpenWeatherMap';
-$a->strings['Current Weather settings updated.'] = 'Zaktualizowano bieżące ustawienia pogody.';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'Nie znaleziono APPID, skontaktuj się z administratorem, aby go uzyskać.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Settings'] = 'Ustawienia';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Wprowadź nazwę swojej lokalizacji lub kod pocztowy.';
 $a->strings['Your Location'] = 'Twoja lokalizacja';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identyfikator Twojej lokalizacji (nazwa lub kod pocztowy), np. <em>Lublin, LU</em> lub <em>20001, LU</em>.';
 $a->strings['Units'] = 'Jednostka';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'wybierz, czy temperatura powinna być wyświetlana w &deg;C lub &deg;F';
 $a->strings['Show weather data'] = 'Pokaż dane pogodowe';
-$a->strings['Curweather settings saved.'] = 'Ustawienia pogodowe zostały zapisane.';
+$a->strings['Current Weather Settings'] = 'Bieżące ustawienia pogody';
+$a->strings['Save Settings'] = 'Zapisz ustawienia';
 $a->strings['Caching Interval'] = 'Interwał buforowania';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Od jak dawna powinny być buforowane dane pogodowe? Wybierz zgodnie z typem konta OpenWeatherMap.';
 $a->strings['no cache'] = 'Brak pamięci podręcznej';

curweather/lang/ru/messages.po

@@ -0,0 +1,124 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2022
+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: Alexander An <ravnina@gmail.com>, 2022\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/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"
+
+#: 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 "OpenWeatherMap"
+
+#: curweather.php:178
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr "Не найден APPID, свяжитесь с вашим администратором, чтобы получить его."
+
+#: 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 "Ваше местоположение (имя или индекс), например <em>Berlin,DE</em> или <em>14476,DE</em>."
+
+#: curweather.php:190
+msgid "Units"
+msgstr "Единицы"
+
+#: curweather.php:190
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr "выберите как должна отображаться температура - в &deg;C или &deg;F"
+
+#: 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 "Как долго кэшировать данные о погоде? Выберите в соответствии с типом вашей учётной записи OpenWeatherMap."
+
+#: 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 "Ваш APPID"
+
+#: curweather.php:240
+msgid "Your API key provided by OpenWeatherMap"
+msgstr "Ваш ключ API, полученный у OpenWeatherMap"

curweather/lang/ru/strings.php

@@ -1,3 +1,32 @@
-<?php
+<?php
-
+
-$a->strings["Submit"] = "Подтвердить";
+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; }
+}}
+$a->strings['Error fetching weather data. Error was: '] = 'Ошибка получения данных о погоде. Ошибка:';
+$a->strings['Current Weather'] = 'Погода сейчас';
+$a->strings['Relative Humidity'] = 'Относительная влажность';
+$a->strings['Pressure'] = 'Давление';
+$a->strings['Wind'] = 'Ветер';
+$a->strings['Last Updated'] = 'Обновлено';
+$a->strings['Data by'] = 'Данные из';
+$a->strings['Show on map'] = 'Показать на карте';
+$a->strings['There was a problem accessing the weather data. But have a look'] = 'Не получилось получить данные о погоде. Но вы можете посмотреть';
+$a->strings['at OpenWeatherMap'] = 'OpenWeatherMap';
+$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Не найден APPID, свяжитесь с вашим администратором, чтобы получить его.';
+$a->strings['Enter either the name of your location or the zip code.'] = 'Введите ваше местоположение или индекс.';
+$a->strings['Your Location'] = 'Ваше местонахождение';
+$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Ваше местоположение (имя или индекс), например <em>Berlin,DE</em> или <em>14476,DE</em>.';
+$a->strings['Units'] = 'Единицы';
+$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'выберите как должна отображаться температура - в &deg;C или &deg;F';
+$a->strings['Show weather data'] = 'Показать данные о погоде';
+$a->strings['Current Weather Settings'] = 'Текущие настройки';
+$a->strings['Save Settings'] = 'Сохранить настройки';
+$a->strings['Caching Interval'] = 'Интервал кэширования';
+$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Как долго кэшировать данные о погоде? Выберите в соответствии с типом вашей учётной записи OpenWeatherMap.';
+$a->strings['no cache'] = 'не кэшировать';
+$a->strings['minutes'] = 'мин.';
+$a->strings['Your APPID'] = 'Ваш APPID';
+$a->strings['Your API key provided by OpenWeatherMap'] = 'Ваш ключ API, полученный у OpenWeatherMap';

diaspora/diasphp.php

@@ -110,4 +110,3 @@ class Diasphp {
 		return true;
 	}
 }
-?>

diaspora/diaspora.php

@@ -118,7 +118,7 @@ function diaspora_settings(App $a, array &$data)
 }
 
 
-function diaspora_settings_post(App $a, &$b)
+function diaspora_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['diaspora-submit'])) {
 		DI::pConfig()->set(local_user(),'diaspora', 'post'           , intval($_POST['enabled']));
@@ -137,7 +137,7 @@ function diaspora_settings_post(App $a, &$b)
 	}
 }
 
-function diaspora_hook_fork(&$a, &$b)
+function diaspora_hook_fork(App $a, array &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;

diaspora/lang/da-dk/messages.po

@@ -0,0 +1,102 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+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:39+0000\n"
+"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:44
+msgid "Post to Diaspora"
+msgstr "Læg op på Diaspora"
+
+#: diaspora.php:67
+#, php-format
+msgid ""
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr "Husk på: Du kan altid kontaktes fra Diaspora med dit Friendica handle <strong>%s</strong>. "
+
+#: diaspora.php:68
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr ""
+
+#: diaspora.php:69
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:79
+msgid "All aspects"
+msgstr "Alle aspekter"
+
+#: diaspora.php:80
+msgid "Public"
+msgstr "Offentlig"
+
+#: diaspora.php:86
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:87
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr "Forbundet til din Diaspora-konto <strong>%s</strong>"
+
+#: diaspora.php:90
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:97
+msgid "Information"
+msgstr "Information"
+
+#: diaspora.php:98
+msgid "Error"
+msgstr "Fejl"
+
+#: diaspora.php:104
+msgid "Enable Diaspora Post Addon"
+msgstr "Aktiver Diaspora-tilføjelsen"
+
+#: diaspora.php:105
+msgid "Diaspora handle"
+msgstr "Diaspora handle"
+
+#: diaspora.php:106
+msgid "Diaspora password"
+msgstr "Diaspora adgangskode"
+
+#: diaspora.php:106
+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:108
+msgid "Post to Diaspora by default"
+msgstr "Læg op på Diaspora som standard"
+
+#: diaspora.php:113
+msgid "Diaspora Export"
+msgstr ""

diaspora/lang/da-dk/strings.php

@@ -0,0 +1,18 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Post to Diaspora'] = 'Læg op på Diaspora';
+$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Husk på: Du kan altid kontaktes fra Diaspora med dit Friendica handle <strong>%s</strong>. ';
+$a->strings['All aspects'] = 'Alle aspekter';
+$a->strings['Public'] = 'Offentlig';
+$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Forbundet til din Diaspora-konto <strong>%s</strong>';
+$a->strings['Information'] = 'Information';
+$a->strings['Error'] = 'Fejl';
+$a->strings['Enable Diaspora Post Addon'] = 'Aktiver Diaspora-tilføjelsen';
+$a->strings['Diaspora handle'] = 'Diaspora handle';
+$a->strings['Diaspora password'] = 'Diaspora adgangskode';
+$a->strings['Post to Diaspora by default'] = 'Læg op på Diaspora som standard';

diaspora/lang/fr/messages.po

@@ -12,98 +12,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2021-03-22 09:09+0000\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>\n"
+"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: diaspora.php:43
+#: diaspora.php:44
 msgid "Post to Diaspora"
 msgstr "Publier sur Diaspora"
 
-#: diaspora.php:68
+#: diaspora.php:67
 #, php-format
 msgid ""
 "Please remember: You can always be reached from Diaspora with your Friendica"
 " handle <strong>%s</strong>. "
 msgstr "Attention : vous pouvez toujours être joint par Diaspora avec votre identifiant Friendica <strong>%s</strong>. "
 
-#: diaspora.php:69
+#: diaspora.php:68
 msgid ""
 "This connector is only meant if you still want to use your old Diaspora "
 "account for some time. "
 msgstr "Ce connecteur ne doit être utilisé que si vous souhaitez encore utiliser votre ancien compte Diaspora."
 
-#: diaspora.php:70
+#: diaspora.php:69
 #, php-format
 msgid ""
 "However, it is preferred that you tell your Diaspora contacts the new handle"
 " <strong>%s</strong> instead."
 msgstr "Quoi qu'il en soit, il est préférable de communiquer son nouvel identifiant à ses contacts Diaspora <strong>%s</strong>."
 
-#: diaspora.php:80
+#: diaspora.php:79
 msgid "All aspects"
 msgstr "Tous les aspects"
 
-#: diaspora.php:81
+#: diaspora.php:80
 msgid "Public"
 msgstr "Public"
 
-#: diaspora.php:87
+#: diaspora.php:86
 msgid "Post to aspect:"
 msgstr "Publier avec l'aspect:"
 
-#: diaspora.php:88
+#: diaspora.php:87
 #, php-format
 msgid "Connected with your Diaspora account <strong>%s</strong>"
 msgstr "Connecté avec votre compte Diaspora <strong>%s</strong>"
 
-#: diaspora.php:91
+#: diaspora.php:90
 msgid ""
 "Can't login to your Diaspora account. Please check handle (in the format "
 "user@domain.tld) and password."
 msgstr "Connexion impossible à votre compte Diaspora. Merci de vérifier votre identifiant (au format user@domain.tld) et votre mot de passe."
 
-#: diaspora.php:99
+#: diaspora.php:97
-msgid "Diaspora Export"
-msgstr "Export Diaspora"
-
-#: diaspora.php:100
 msgid "Information"
 msgstr "Information"
 
-#: diaspora.php:101
+#: diaspora.php:98
 msgid "Error"
 msgstr "Erreur"
 
-#: diaspora.php:102
+#: diaspora.php:104
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: diaspora.php:106
 msgid "Enable Diaspora Post Addon"
 msgstr "Activer l’extension « Publier sur Diaspora »"
 
-#: diaspora.php:107
+#: diaspora.php:105
 msgid "Diaspora handle"
 msgstr "Identifiant Diaspora"
 
-#: diaspora.php:108
+#: diaspora.php:106
 msgid "Diaspora password"
 msgstr "Mot de passe Diaspora"
 
-#: diaspora.php:108
+#: diaspora.php:106
 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 "Vie privée : Votre mot de passe Diaspora sera stocké sans encryption pour vous identifier sur votre pod. Cela signifie que l’administrateur de votre pod Diaspora peut y avoir accès."
 
-#: diaspora.php:110
+#: diaspora.php:108
 msgid "Post to Diaspora by default"
 msgstr "Publier sur Diaspora par défaut"
+
+#: diaspora.php:113
+msgid "Diaspora Export"
+msgstr "Export Diaspora"

diaspora/lang/fr/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Diaspora'] = 'Publier sur Diaspora';
 $a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Attention : vous pouvez toujours être joint par Diaspora avec votre identifiant Friendica <strong>%s</strong>. ';
@@ -14,12 +14,11 @@ $a->strings['Public'] = 'Public';
 $a->strings['Post to aspect:'] = 'Publier avec l\'aspect:';
 $a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Connecté avec votre compte Diaspora <strong>%s</strong>';
 $a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Connexion impossible à votre compte Diaspora. Merci de vérifier votre identifiant (au format user@domain.tld) et votre mot de passe.';
-$a->strings['Diaspora Export'] = 'Export Diaspora';
 $a->strings['Information'] = 'Information';
 $a->strings['Error'] = 'Erreur';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Enable Diaspora Post Addon'] = 'Activer l’extension « Publier sur Diaspora »';
 $a->strings['Diaspora handle'] = 'Identifiant Diaspora';
 $a->strings['Diaspora password'] = 'Mot de passe 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.'] = 'Vie privée : Votre mot de passe Diaspora sera stocké sans encryption pour vous identifier sur votre pod. Cela signifie que l’administrateur de votre pod Diaspora peut y avoir accès.';
 $a->strings['Post to Diaspora by default'] = 'Publier sur Diaspora par défaut';
+$a->strings['Diaspora Export'] = 'Export Diaspora';

diaspora/lang/pl/messages.po

@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
+# Piotr Strębski <strebski@gmail.com>, 2022
 # Waldemar Stoczkowski, 2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2020-06-17 19:25+0000\n"
+"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Waldemar Stoczkowski\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,96 +20,84 @@ msgstr ""
 "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:53
+#: diaspora.php:44
 msgid "Post to Diaspora"
 msgstr "Napisz do Diaspory"
 
-#: diaspora.php:78
+#: diaspora.php:67
 #, php-format
 msgid ""
 "Please remember: You can always be reached from Diaspora with your Friendica"
 " handle <strong>%s</strong>. "
-msgstr ""
+msgstr "Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. "
 
-#: diaspora.php:79
+#: diaspora.php:68
 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:80
+#: diaspora.php:69
 #, php-format
 msgid ""
 "However, it is preferred that you tell your Diaspora contacts the new handle"
 " <strong>%s</strong> instead."
-msgstr ""
+msgstr "Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>."
 
-#: diaspora.php:90
+#: diaspora.php:79
 msgid "All aspects"
 msgstr "Wszystkie aspekty"
 
-#: diaspora.php:91
+#: diaspora.php:80
 msgid "Public"
 msgstr "Publiczny"
 
-#: diaspora.php:97
+#: diaspora.php:86
 msgid "Post to aspect:"
-msgstr ""
+msgstr "Napisz do aspektu:"
 
-#: diaspora.php:98
+#: diaspora.php:87
 #, php-format
 msgid "Connected with your Diaspora account <strong>%s</strong>"
 msgstr "Połączony ze swoim kontem Diaspora <strong>%s</strong>"
 
-#: diaspora.php:101
+#: diaspora.php:90
 msgid ""
 "Can't login to your Diaspora account. Please check handle (in the format "
 "user@domain.tld) and password."
-msgstr ""
+msgstr "Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło."
 
-#: diaspora.php:109
+#: diaspora.php:97
-msgid "Diaspora Export"
-msgstr "Eksportuj do Diaspory"
-
-#: diaspora.php:110
 msgid "Information"
 msgstr "Informacja"
 
-#: diaspora.php:111
+#: diaspora.php:98
 msgid "Error"
 msgstr "Błąd"
 
-#: diaspora.php:112
+#: diaspora.php:104
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: diaspora.php:116
 msgid "Enable Diaspora Post Addon"
 msgstr "Włącz dodatek Diaspora"
 
-#: diaspora.php:117
+#: diaspora.php:105
 msgid "Diaspora handle"
-msgstr ""
+msgstr "Uchwyt Diaspory"
 
-#: diaspora.php:118
+#: diaspora.php:106
 msgid "Diaspora password"
 msgstr "Hasło Diaspora"
 
-#: diaspora.php:118
+#: diaspora.php:106
 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."
 
-#: diaspora.php:120
+#: diaspora.php:108
 msgid "Post to Diaspora by default"
 msgstr "Wyślij domyślnie do Diaspory"
 
-#: diaspora.php:138
+#: diaspora.php:113
-msgid "Diaspora settings updated."
+msgid "Diaspora Export"
-msgstr "Zaktualizowano ustawienia Diaspora."
+msgstr "Eksportuj do Diaspory"
-
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr "Połączenie z Diaspora wyłączone."

diaspora/lang/pl/strings.php

@@ -6,17 +6,19 @@ function string_plural_select_pl($n){
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 $a->strings['Post to Diaspora'] = 'Napisz do Diaspory';
+$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. ';
 $a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas.';
+$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>.';
 $a->strings['All aspects'] = 'Wszystkie aspekty';
 $a->strings['Public'] = 'Publiczny';
+$a->strings['Post to aspect:'] = 'Napisz do aspektu:';
 $a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Połączony ze swoim kontem Diaspora <strong>%s</strong>';
-$a->strings['Diaspora Export'] = 'Eksportuj do Diaspory';
+$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło.';
 $a->strings['Information'] = 'Informacja';
 $a->strings['Error'] = 'Błąd';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
 $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['Post to Diaspora by default'] = 'Wyślij domyślnie do Diaspory';
-$a->strings['Diaspora settings updated.'] = 'Zaktualizowano ustawienia Diaspora.';
+$a->strings['Diaspora Export'] = 'Eksportuj do Diaspory';
-$a->strings['Diaspora connector disabled.'] = 'Połączenie z Diaspora wyłączone.';

dwpost/lang/da-dk/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: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\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/da-dk/strings.php

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

dwpost/lang/fr/messages.po

@@ -5,46 +5,43 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2021-03-22 09:11+0000\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: dwpost.php:41
+#: dwpost.php:43
 msgid "Post to Dreamwidth"
 msgstr "Publier sur Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
+#: dwpost.php:63
-msgid "Dreamwidth Export"
+msgid "Enable Dreamwidth Post Addon"
-msgstr "Export Dreamwidth"
+msgstr "Activer l'extension Dreamwidth"
 
-#: dwpost.php:80
+#: dwpost.php:64
-msgid "Enable dreamwidth Post Addon"
+msgid "Dreamwidth username"
-msgstr "Activer l'application complémentaire de publication Dreamwidth."
-
-#: dwpost.php:85
-msgid "dreamwidth username"
 msgstr "Nom d'utilisateur Dreamwidth"
 
-#: dwpost.php:90
+#: dwpost.php:65
-msgid "dreamwidth password"
+msgid "Dreamwidth password"
-msgstr "Mot de passe dreamwidth"
+msgstr "Mot de passe Dreamwidth"
 
-#: dwpost.php:95
+#: dwpost.php:66
-msgid "Post to dreamwidth by default"
+msgid "Post to Dreamwidth by default"
-msgstr "Poster sur Dreamwidth par défaut"
+msgstr "Publier sur Dreamwidth par défaut"
 
-#: dwpost.php:100
+#: dwpost.php:71
-msgid "Save Settings"
+msgid "Dreamwidth Export"
-msgstr "Sauvegarder les paramètres"
+msgstr "Export Dreamwidth"

dwpost/lang/fr/strings.php

@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Dreamwidth'] = 'Publier sur Dreamwidth';
+$a->strings['Enable Dreamwidth Post Addon'] = 'Activer l\'extension Dreamwidth';
+$a->strings['Dreamwidth username'] = 'Nom d\'utilisateur Dreamwidth';
+$a->strings['Dreamwidth password'] = 'Mot de passe Dreamwidth';
+$a->strings['Post to Dreamwidth by default'] = 'Publier sur Dreamwidth par défaut';
 $a->strings['Dreamwidth Export'] = 'Export Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Activer l\'application complémentaire de publication Dreamwidth.';
-$a->strings['dreamwidth username'] = 'Nom d\'utilisateur Dreamwidth';
-$a->strings['dreamwidth password'] = 'Mot de passe dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Poster sur Dreamwidth par défaut';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';

dwpost/lang/pl/messages.po

@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+# Piotr Strębski <strebski@gmail.com>, 2022
+# Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2018-08-04 10:46+0000\n"
+"PO-Revision-Date: 2022-03-08 14:14+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +20,26 @@ msgstr ""
 "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"
 
-#: dwpost.php:39
+#: dwpost.php:43
 msgid "Post to Dreamwidth"
 msgstr "Opublikuj w Dreamwidth"
 
-#: dwpost.php:70
+#: dwpost.php:63
-msgid "Dreamwidth Post Settings"
+msgid "Enable Dreamwidth Post Addon"
-msgstr "Ustawienia postów w Dreamwerze"
+msgstr "Włącz dodatek Dreamwidth Post"
 
-#: dwpost.php:72
+#: dwpost.php:64
-msgid "Enable dreamwidth Post Addon"
+msgid "Dreamwidth username"
-msgstr "Włącz dodatek dreamwidth Post"
+msgstr "Nazwa użytkownika Dreamwidth"
 
-#: dwpost.php:77
+#: dwpost.php:65
-msgid "dreamwidth username"
+msgid "Dreamwidth password"
-msgstr "nazwa użytkownika dreamwidth"
+msgstr "Hasło Dreamwidth"
 
-#: dwpost.php:82
+#: dwpost.php:66
-msgid "dreamwidth password"
+msgid "Post to Dreamwidth by default"
-msgstr "hasło dreamwidth"
+msgstr "Publikuj domyślnie w serwisie Dreamwidth"
 
-#: dwpost.php:87
+#: dwpost.php:71
-msgid "Post to dreamwidth by default"
+msgid "Dreamwidth Export"
-msgstr "Opublikuj domyślnie w serwisie dreamwidth"
+msgstr "Eksport do Dreamwidth"
-
-#: dwpost.php:93
-msgid "Submit"
-msgstr "Wyślij"

dwpost/lang/pl/strings.php

@@ -6,9 +6,8 @@ function string_plural_select_pl($n){
 	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 $a->strings['Post to Dreamwidth'] = 'Opublikuj w Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Ustawienia postów w Dreamwerze';
+$a->strings['Enable Dreamwidth Post Addon'] = 'Włącz dodatek Dreamwidth Post';
-$a->strings['Enable dreamwidth Post Addon'] = 'Włącz dodatek dreamwidth Post';
+$a->strings['Dreamwidth username'] = 'Nazwa użytkownika Dreamwidth';
-$a->strings['dreamwidth username'] = 'nazwa użytkownika dreamwidth';
+$a->strings['Dreamwidth password'] = 'Hasło Dreamwidth';
-$a->strings['dreamwidth password'] = 'hasło dreamwidth';
+$a->strings['Post to Dreamwidth by default'] = 'Publikuj domyślnie w serwisie Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Opublikuj domyślnie w serwisie dreamwidth';
+$a->strings['Dreamwidth Export'] = 'Eksport do Dreamwidth';
-$a->strings['Submit'] = 'Wyślij';

forumdirectory/forumdirectory.php

@@ -25,10 +25,17 @@ function forumdirectory_install()
 	Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-function forumdirectory_module()
+/**
-{
+ * This is a statement rather than an actual function definition. The simple
-	return;
+ * existence of this method is checked to figure out if the addon offers a
-}
+ * module.
+ */
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function forumdirectory_module() {}
 
 function forumdirectory_app_menu(App $a, array &$b)
 {

forumdirectory/lang/da-dk/messages.po

@@ -0,0 +1,48 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+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: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:33 forumdirectory.php:137
+msgid "Forum Directory"
+msgstr "Forum adressebog"
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr "Offentlig adgang nægtet."
+
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr "Ingen poster (nogle poster er måske skjulte)."
+
+#: forumdirectory.php:131
+msgid "Global Directory"
+msgstr "Global adressebog"
+
+#: forumdirectory.php:133
+msgid "Find on this site"
+msgstr "Find på denne side"
+
+#: forumdirectory.php:135
+msgid "Results for:"
+msgstr "Resultater for:"
+
+#: forumdirectory.php:139
+msgid "Find"
+msgstr "Find"

forumdirectory/lang/da-dk/strings.php

@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Forum Directory'] = 'Forum adressebog';
+$a->strings['Public access denied.'] = 'Offentlig adgang nægtet.';
+$a->strings['No entries (some entries may be hidden).'] = 'Ingen poster (nogle poster er måske skjulte).';
+$a->strings['Global Directory'] = 'Global adressebog';
+$a->strings['Find on this site'] = 'Find på denne side';
+$a->strings['Results for:'] = 'Resultater for:';
+$a->strings['Find'] = 'Find';