26 changed files with 490 additions and 692 deletions
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@ -91,10 +91,6 @@ function advancedcontentfilter_dbstructure_definition(App $a, &$database)
 	];
 }

-/**
- * @param array $item Prepared by either Model\Item::prepareBody or advancedcontentfilter_prepare_item_row
- * @return array
- */
 function advancedcontentfilter_get_filter_fields(array $item)
 {
 	$vars = [];
@ -266,20 +262,30 @@ function advancedcontentfilter_build_fields($data)
 	}

 	if (!empty($data['expression'])) {
-		// Using a dummy item to validate the field existence
-		$condition = ["(`uid` = ? OR `uid` = 0)", local_user()];
-		$params = ['order' => ['uid' => true]];
-		$item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
-
-		if (!DBA::isResult($item_row)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('This addon requires this node having at least one post'));
-		}
+		$allowed_keys = [
+			'author_id', 'author_link', 'author_name', 'author_avatar',
+			'owner_id', 'owner_link', 'owner_name', 'owner_avatar',
+			'contact_id', 'uid', 'id', 'parent', 'uri',
+			'thr_parent', 'parent_uri',
+			'content_warning',
+			'commented', 'created', 'edited', 'received',
+			'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(
-			$data['expression'],
-			array_keys(advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row)))
-		);
+
+		$parsedExpression = $expressionLanguage->parse($data['expression'], $allowed_keys);

 		$serialized = serialize($parsedExpression->getNodes());

@ -424,36 +430,23 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques

 	$condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()];
 	$params = ['order' => ['uid' => true]];
-	$item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
+	$item = Post::selectFirstForUser(local_user(), [], $condition, $params);

-	if (!DBA::isResult($item_row)) {
+	if (!DBA::isResult($item)) {
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
 	}

-	$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
+	$tags = Tag::populateFromItem($item);
+
+	$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'];
-
-	$attachments = Post\Media::splitAttachments($item_row['uri-id'], $item_row['guid'] ?? '');
-
-	$item_row['attachments'] = $attachments;
-
-	return $item_row;
-}
--- a/advancedcontentfilter/lang/C/messages.po
+++ b/advancedcontentfilter/lang/C/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\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,46 +112,42 @@ msgstr ""
 msgid "Cancel"
 msgstr ""

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: 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:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:405
 msgid "Invalid form security token, please refresh the page."
 msgstr ""

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:350
 msgid "The rule name and expression are required."
 msgstr ""

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:364
 msgid "Rule successfully added"
 msgstr ""

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr ""

-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:395
 msgid "Rule successfully updated"
 msgstr ""

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:418
 msgid "Rule successfully deleted"
 msgstr ""

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:428
 msgid "Missing argument: guid."
 msgstr ""

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:436
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr ""
--- a/advancedcontentfilter/lang/de/messages.po
+++ b/advancedcontentfilter/lang/de/messages.po
@ -5,16 +5,16 @@
 # 
 # Translators:
 # Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\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,28 +22,32 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: advancedcontentfilter.php:154
+#: src/middlewares.php:49
+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:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
 msgid "Advanced Content Filter"
 msgstr "Erweiterter Inhaltsfilter"

-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:206
 msgid "Back to Addon Settings"
 msgstr "Zurück zu den Addon Einstellungen"

-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:208
 msgid "Add a Rule"
 msgstr "Eine Regel hinzufügen"

-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:209
 msgid "Help"
 msgstr "Hilfe"

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:210
 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. "
@ -56,11 +60,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:229
+#: advancedcontentfilter.php:211
 msgid "Your rules"
 msgstr "Deine Regeln"

-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:212
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@ -68,108 +72,98 @@ msgstr ""
 "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen,"
 " verwende bitte den Button neben dem Titel."

-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:213
 msgid "Disabled"
 msgstr "Deaktiviert"

-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:214
 msgid "Enabled"
 msgstr "Aktiv"

-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:215
 msgid "Disable this rule"
 msgstr "Diese Regel deaktivieren"

-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:216
 msgid "Enable this rule"
 msgstr "Diese Regel aktivieren"

-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:217
 msgid "Edit this rule"
 msgstr "Diese Regel bearbeiten"

-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:218
 msgid "Edit the rule"
 msgstr "Die Regel bearbeiten"

-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:219
 msgid "Save this rule"
 msgstr "Regel speichern"

-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:220
 msgid "Delete this rule"
 msgstr "Diese Regel löschen"

-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:221
 msgid "Rule"
 msgstr "Regel"

-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:222
 msgid "Close"
 msgstr "Schließen"

-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:223
 msgid "Add new rule"
 msgstr "Neue Regel hinzufügen"

-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:224
 msgid "Rule Name"
 msgstr "Name der Regel"

-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:225
 msgid "Rule Expression"
 msgstr "Ausdruck der Regel"

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:226
 msgid "Cancel"
 msgstr "Abbrechen"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-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
+#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
+#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
 msgid "You must be logged in to use this method"
 msgstr "Du musst angemeldet sein, um diese Methode verwenden zu können "

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
+#: advancedcontentfilter.php:382
 msgid "Invalid form security token, please refresh the page."
 msgstr "Ungültiges Sciherheitstoken, bitte die Seite neu laden."

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:331
 msgid "The rule name and expression are required."
 msgstr "Der Name der Regel und der Ausdruck sind erforderlich."

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:343
 msgid "Rule successfully added"
 msgstr "Regel erfolgreich hinzugefügt."

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
 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:408
+#: advancedcontentfilter.php:372
 msgid "Rule successfully updated"
 msgstr "Regel wurde erfolgreich aktualisiert."

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:393
 msgid "Rule successfully deleted"
 msgstr "Regel erfolgreich gelöscht."

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:403
 msgid "Missing argument: guid."
 msgstr "Fehlendes Argument: guid."

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:411
 #, 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"
--- a/advancedcontentfilter/lang/de/strings.php
+++ b/advancedcontentfilter/lang/de/strings.php
@ -5,6 +5,7 @@ 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';
@ -27,7 +28,6 @@ $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,4 +37,3 @@ $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';
--- a/advancedcontentfilter/lang/hu/messages.po
+++ b/advancedcontentfilter/lang/hu/messages.po
@ -4,16 +4,16 @@
 # 
 # 
 # Translators:
-# Balázs Úr, 2022
+# Balázs Úr, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Balázs Úr, 2022\n"
+"Last-Translator: Balázs Úr, 2021\n"
 "Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -122,48 +122,42 @@ msgstr "Szabály kifejezése"
 msgid "Cancel"
 msgstr "Mégse"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-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
+#: 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 "Bejelentkezve kell lennie a módszer használatához"

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:405
 msgid "Invalid form security token, please refresh the page."
 msgstr "Érvénytelen űrlap biztonsági token. Frissítse az oldalt."

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:350
 msgid "The rule name and expression are required."
 msgstr "A szabály neve és kifejezése kötelező."

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:364
 msgid "Rule successfully added"
 msgstr "A szabály sikeresen hozzáadva"

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
 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:408
+#: advancedcontentfilter.php:395
 msgid "Rule successfully updated"
 msgstr "A szabály sikeresen frissítve"

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:418
 msgid "Rule successfully deleted"
 msgstr "A szabály sikeresen törölve"

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:428
 msgid "Missing argument: guid."
 msgstr "Hiányzó argumentum: guid."

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:436
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Ismeretlen bejegyzés a következő guid azonosítóval: %s"
--- a/advancedcontentfilter/lang/hu/strings.php
+++ b/advancedcontentfilter/lang/hu/strings.php
@ -27,7 +27,6 @@ $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ő.';
--- a/advancedcontentfilter/lang/pl/messages.po
+++ b/advancedcontentfilter/lang/pl/messages.po
@ -6,16 +6,15 @@
 # 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: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2021-11-21 19:13-0500\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"Last-Translator: Joe Doe, 2021\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"
@ -124,46 +123,42 @@ msgstr "Wyrażanie reguły"
 msgid "Cancel"
 msgstr "Anuluj"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: 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 "Musisz być zalogowany, aby skorzystać z tej metody"

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
+#: advancedcontentfilter.php:405
 msgid "Invalid form security token, please refresh the page."
 msgstr "Nieprawidłowy token zabezpieczający formularz, odśwież stronę."

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:350
 msgid "The rule name and expression are required."
 msgstr "Nazwa reguły i wyrażenie są wymagane."

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:364
 msgid "Rule successfully added"
 msgstr "Reguła została pomyślnie dodana"

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Reguła nie istnieje lub nie należy do ciebie."

-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:395
 msgid "Rule successfully updated"
 msgstr "Reguła została pomyślnie zaktualizowana"

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:418
 msgid "Rule successfully deleted"
 msgstr "Reguła została pomyślnie usunięta"

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:428
 msgid "Missing argument: guid."
 msgstr "Brakujący argument: guid."

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:436
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Nieznany post z guid:%s"
--- a/advancedcontentfilter/lang/pl/strings.php
+++ b/advancedcontentfilter/lang/pl/strings.php
@ -27,7 +27,6 @@ $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.';
--- a/langfilter/lang/fr/messages.po
+++ b/langfilter/lang/fr/messages.po
@ -4,7 +4,6 @@
 # 
 # 
 # Translators:
-# Nicolas Derive, 2022
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
 # Wil Tur <wiltur@yargl.com>, 2021
@ -12,68 +11,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2021-03-21 17:12+0000\n"
+"Last-Translator: Wil Tur <wiltur@yargl.com>\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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: langfilter.php:49
+#: langfilter.php:50
+msgid "Language Filter"
+msgstr "Filtre de langues"
+
+#: langfilter.php:51
 msgid ""
 "This addon tries to identify the language posts are written in. If it does "
 "not match any language specified below, posts will be hidden by collapsing "
 "them."
-msgstr "Cette extension tente d'identifier la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune des langues spécifiées ci-dessous, les publications seront repliées afin d'être cachées."
+msgstr "Cette extension essaie de reconnaître la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune de la liste donnée plus bas, les publications seront réduites."

-#: langfilter.php:50
+#: langfilter.php:52
 msgid "Use the language filter"
 msgstr "Utiliser le filtre de langues"

-#: langfilter.php:51
+#: langfilter.php:53
 msgid "Able to read"
 msgstr "Peut lire"

-#: langfilter.php:51
+#: langfilter.php:53
 msgid ""
 "List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
 "separated. For example \"de,it\"."
 msgstr "Liste des abréviations (codes ISO 639-1) des langues que vous parlez, séparées par des virgules.\nPar exemple \"de,it\"."

-#: langfilter.php:52
+#: langfilter.php:54
 msgid "Minimum confidence in language detection"
 msgstr "Confiance minimale dans la détection de langues"

-#: langfilter.php:52
+#: langfilter.php:54
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Seuil de confiance minimal pour la détection des langues, de 0 à 100. Une publication ne sera pas filtrée si elle est détectée avec une confiance moindre."

-#: langfilter.php:53
+#: langfilter.php:55
 msgid "Minimum length of message body"
 msgstr "Longueur minimale du corps de message."

-#: langfilter.php:53
+#: langfilter.php:55
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Nombre minimal de signes dans le corps de message pour déclencher le filtre. Une publication plus courte ne sera pas filtrée. Remarque: la détection de langue n'est pas fiable pour du contenu court (<200 signes)."

-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Filtre de langues"
-
-#: langfilter.php:60
+#: langfilter.php:56
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"

-#: langfilter.php:193
+#: langfilter.php:187
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Langues filtrées: %s"
--- a/langfilter/lang/fr/strings.php
+++ b/langfilter/lang/fr/strings.php
@ -3,9 +3,10 @@
 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; }
+	return intval($n > 1);
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Cette extension tente d\'identifier la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune des langues spécifiées ci-dessous, les publications seront repliées afin d\'être cachées.';
+$a->strings['Language Filter'] = 'Filtre de langues';
+$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Cette extension essaie de reconnaître la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune de la liste donnée plus bas, les publications seront réduites.';
 $a->strings['Use the language filter'] = 'Utiliser le filtre de langues';
 $a->strings['Able to read'] = 'Peut lire';
 $a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Liste des abréviations (codes ISO 639-1) des langues que vous parlez, séparées par des virgules.
@ -14,6 +15,5 @@ $a->strings['Minimum confidence in language detection'] = 'Confiance minimale da
 $a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Seuil de confiance minimal pour la détection des langues, de 0 à 100. Une publication ne sera pas filtrée si elle est détectée avec une confiance moindre.';
 $a->strings['Minimum length of message body'] = 'Longueur minimale du corps de message.';
 $a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Nombre minimal de signes dans le corps de message pour déclencher le filtre. Une publication plus courte ne sera pas filtrée. Remarque: la détection de langue n\'est pas fiable pour du contenu court (<200 signes).';
-$a->strings['Language Filter'] = 'Filtre de langues';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Filtered language: %s'] = 'Langues filtrées: %s';
--- a/langfilter/lang/zh-cn/messages.po
+++ b/langfilter/lang/zh-cn/messages.po
@ -6,15 +6,14 @@
 # Translators:
 # Asher Pen <asherpen@gmail.com>, 2019
 # 朱陈锬 <tangenters@outlook.com>, 2018
-# gudzpoz <GuDzpoz@live.com>, 2022
 # 朱陈锬 <tangenters@outlook.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: gudzpoz <GuDzpoz@live.com>, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-03-25 02:01+0000\n"
+"Last-Translator: Asher Pen <asherpen@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -22,58 +21,62 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: langfilter.php:49
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "语言过滤器"
+
+#: langfilter.php:59
 msgid ""
 "This addon tries to identify the language posts are written in. If it does "
 "not match any language specified below, posts will be hidden by collapsing "
 "them."
-msgstr "此插件试图辨别文章的写作语言。如果语言与下面给定的均不符合，则文章会被折叠隐藏起来。"
+msgstr "这个插件将尝试识别帖子所用的语言。如果不符合以下列出的语言，帖子将被折叠以隐藏。"

-#: langfilter.php:50
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "使用语言过滤器"

-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "想要显示的语言"

-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "语言列表（ISO 639-1 缩写代码），使用英文逗号分隔。例如：“de,it,zh”"
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "您使用的语言缩写 (iso2 codes) 列表，逗号分隔。例如 \"zh,en\"。"

-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "语言识别阈值"

-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "语言识别阈值（0－100）。语言识别结果低于该阈值的帖子将不会被折叠。"

-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "语言过滤帖子所需最小字符个数"

-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "语言过滤帖子所需最小字符个数。低于该数字的帖子将不会被过滤。注意：对于字符个数小于200的帖子，语言检测功能将不够稳定。"

-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "语言过滤器"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "保存设置"

-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "语言过滤器设置已保存。"
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "已过滤的语言：%s"
--- a/langfilter/lang/zh-cn/strings.php
+++ b/langfilter/lang/zh-cn/strings.php
@ -5,14 +5,15 @@ function string_plural_select_zh_cn($n){
 	$n = intval($n);
 	return intval(0);
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = '此插件试图辨别文章的写作语言。如果语言与下面给定的均不符合，则文章会被折叠隐藏起来。';
+$a->strings['Language Filter'] = '语言过滤器';
+$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = '这个插件将尝试识别帖子所用的语言。如果不符合以下列出的语言，帖子将被折叠以隐藏。';
 $a->strings['Use the language filter'] = '使用语言过滤器';
 $a->strings['Able to read'] = '想要显示的语言';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = '语言列表（ISO 639-1 缩写代码），使用英文逗号分隔。例如：“de,it,zh”';
+$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = '您使用的语言缩写 (iso2 codes) 列表，逗号分隔。例如 "zh,en"。';
 $a->strings['Minimum confidence in language detection'] = '语言识别阈值';
 $a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = '语言识别阈值（0－100）。语言识别结果低于该阈值的帖子将不会被折叠。';
 $a->strings['Minimum length of message body'] = '语言过滤帖子所需最小字符个数';
 $a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = '语言过滤帖子所需最小字符个数。低于该数字的帖子将不会被过滤。注意：对于字符个数小于200的帖子，语言检测功能将不够稳定。';
-$a->strings['Language Filter'] = '语言过滤器';
 $a->strings['Save Settings'] = '保存设置';
+$a->strings['Language Filter Settings saved.'] = '语言过滤器设置已保存。';
 $a->strings['Filtered language: %s'] = '已过滤的语言：%s';
--- a/mailstream/lang/fr/messages.po
+++ b/mailstream/lang/fr/messages.po
@ -4,97 +4,78 @@
 # 
 # 
 # Translators:
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2015-07-27 18:23+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: mailstream.php:77
+#: mailstream.php:55
 msgid "From Address"
 msgstr "Depuis l'adresse"

-#: mailstream.php:79
+#: mailstream.php:57
 msgid "Email address that stream items will appear to be from."
-msgstr "Adresse de courriel de laquelle les éléments du flux sembleront provenir."
+msgstr ""

-#: mailstream.php:82
+#: mailstream.php:60 mailstream.php:282
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"

-#: mailstream.php:301
+#: mailstream.php:165
 msgid "Re:"
 msgstr "Re :"

-#: mailstream.php:314 mailstream.php:317
+#: mailstream.php:173
 msgid "Friendica post"
 msgstr "Message Friendica"

-#: mailstream.php:320
+#: mailstream.php:176
 msgid "Diaspora post"
 msgstr "Message Diaspora"

-#: mailstream.php:330
+#: mailstream.php:183
 msgid "Feed item"
-msgstr "Élément du flux"
+msgstr ""

-#: mailstream.php:333
+#: mailstream.php:186
 msgid "Email"
 msgstr "Courriel"

-#: mailstream.php:335
+#: mailstream.php:188
 msgid "Friendica Item"
 msgstr "Élément de Friendica"

-#: mailstream.php:404
+#: mailstream.php:229
 msgid "Upstream"
-msgstr "En amont"
+msgstr ""

-#: mailstream.php:405
+#: mailstream.php:230
 msgid "Local"
 msgstr "Local"

-#: mailstream.php:481
-msgid "Enabled"
-msgstr "Activer"
-
-#: mailstream.php:486
+#: mailstream.php:274
 msgid "Email Address"
 msgstr "Adresse de courriel"

-#: mailstream.php:488
+#: mailstream.php:276
 msgid "Leave blank to use your account email address"
-msgstr "Laissez vide pour utiliser l'adresse de courriel de votre compte"
+msgstr ""

-#: mailstream.php:492
-msgid "Exclude Likes"
-msgstr "Exclure les \"j'aime\""
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Activer"

-#: mailstream.php:494
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Cochez ceci pour éviter d'envoyer les notifications des \"J'aime\""
-
-#: mailstream.php:498
-msgid "Attach Images"
-msgstr "Attacher les images"
-
-#: mailstream.php:500
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Télécharger les images des messages et les attacher au courriel. Utile pour les les courriels hors-ligne."
-
-#: mailstream.php:507
+#: mailstream.php:281
 msgid "Mail Stream Settings"
 msgstr "Paramètres de Mail Stream"
--- a/mailstream/lang/fr/strings.php
+++ b/mailstream/lang/fr/strings.php
@ -3,24 +3,16 @@
 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; }
+	return intval($n > 1);
 }}
 $a->strings['From Address'] = 'Depuis l\'adresse';
-$a->strings['Email address that stream items will appear to be from.'] = 'Adresse de courriel de laquelle les éléments du flux sembleront provenir.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Re:'] = 'Re :';
 $a->strings['Friendica post'] = 'Message Friendica';
 $a->strings['Diaspora post'] = 'Message Diaspora';
-$a->strings['Feed item'] = 'Élément du flux';
 $a->strings['Email'] = 'Courriel';
 $a->strings['Friendica Item'] = 'Élément de Friendica';
-$a->strings['Upstream'] = 'En amont';
 $a->strings['Local'] = 'Local';
-$a->strings['Enabled'] = 'Activer';
 $a->strings['Email Address'] = 'Adresse de courriel';
-$a->strings['Leave blank to use your account email address'] = 'Laissez vide pour utiliser l\'adresse de courriel de votre compte';
-$a->strings['Exclude Likes'] = 'Exclure les "j\'aime"';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Cochez ceci pour éviter d\'envoyer les notifications des "J\'aime"';
-$a->strings['Attach Images'] = 'Attacher les images';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Télécharger les images des messages et les attacher au courriel. Utile pour les les courriels hors-ligne.';
+$a->strings['Enabled'] = 'Activer';
 $a->strings['Mail Stream Settings'] = 'Paramètres de Mail Stream';
--- a/markdown/lang/fr/messages.po
+++ b/markdown/lang/fr/messages.po
@ -1,36 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Nicolas Derive, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Nicolas Derive, 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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: markdown.php:30
-msgid "Enable Markdown parsing"
-msgstr "Activer l'interprétation Markdown"
-
-#: markdown.php:30
-msgid "If enabled, adds Markdown support to the Compose Post form."
-msgstr ""
-"Si activé, ajoute le support de Markdown au formulaire de création d'une "
-"publication."
-
-#: markdown.php:35
-msgid "Markdown Settings"
-msgstr "Paramètres de Markdown"
--- a/markdown/lang/fr/strings.php
+++ b/markdown/lang/fr/strings.php
@ -1,10 +0,0 @@
-<?php
-
-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['Enable Markdown parsing'] = 'Activer l\'interprétation Markdown';
-$a->strings['If enabled, adds Markdown support to the Compose Post form.'] = 'Si activé, ajoute le support de Markdown au formulaire de création d\'une publication.';
-$a->strings['Markdown Settings'] = 'Paramètres de Markdown';
--- a/morechoice/lang/fr/messages.po
+++ b/morechoice/lang/fr/messages.po
@ -5,339 +5,338 @@
 # 
 # Translators:
 # Marie Olive <lacellule101@gmail.com>, 2018
-# Nicolas Derive, 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: 2018-08-07 15:04+0200\n"
 "PO-Revision-Date: 2018-08-07 18:18+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: morechoice.php:22
+#: morechoice.php:34
 msgid "Androgyne"
 msgstr "Androgyne"

-#: morechoice.php:23
+#: morechoice.php:35
 msgid "Bear"
 msgstr "Ours"

-#: morechoice.php:24
+#: morechoice.php:36
 msgid "Bigender"
 msgstr "Bigenre"

-#: morechoice.php:25
+#: morechoice.php:37
 msgid "Cross dresser"
 msgstr ""

-#: morechoice.php:26
+#: morechoice.php:38
 msgid "Drag queen"
 msgstr "drag queen"

-#: morechoice.php:27
+#: morechoice.php:39
 msgid "Eunuch"
 msgstr "eunuque"

-#: morechoice.php:28
+#: morechoice.php:40
 msgid "Faux queen"
 msgstr ""

-#: morechoice.php:29
+#: morechoice.php:41
 msgid "Gender fluid"
 msgstr "genre fluide"

-#: morechoice.php:30
+#: morechoice.php:42
 msgid "Kathoey"
 msgstr ""

-#: morechoice.php:31
+#: morechoice.php:43
 msgid "Lady"
 msgstr ""

-#: morechoice.php:32
+#: morechoice.php:44
 msgid "Lipstick lesbian"
 msgstr ""

-#: morechoice.php:33
+#: morechoice.php:45
 msgid "Metrosexual"
 msgstr "métrosexuel"

-#: morechoice.php:34
+#: morechoice.php:46
 msgid "Monk"
 msgstr "moine"

-#: morechoice.php:35
+#: morechoice.php:47
 msgid "Nun"
 msgstr "religieuse"

-#: morechoice.php:36
+#: morechoice.php:48
 msgid "Soft butch"
 msgstr ""

-#: morechoice.php:37
+#: morechoice.php:49
 msgid "Stone femme"
 msgstr ""

-#: morechoice.php:38
+#: morechoice.php:50
 msgid "Tomboy"
 msgstr ""

-#: morechoice.php:39
+#: morechoice.php:51
 msgid "Transman"
 msgstr "homme trans"

-#: morechoice.php:40
+#: morechoice.php:52
 msgid "Transwoman"
 msgstr "femme trans"

-#: morechoice.php:41
+#: morechoice.php:53
 msgid "Transvesti"
 msgstr "travesti"

-#: morechoice.php:42
+#: morechoice.php:54
 msgid "Trigender"
 msgstr "trigenre"

-#: morechoice.php:43
+#: morechoice.php:55
 msgid "Can't remember"
 msgstr "Ne se rappelle pas"

-#: morechoice.php:44
+#: morechoice.php:56
 msgid "Hard to tell these days"
 msgstr "Difficile à dire en ce moment"

-#: morechoice.php:48
+#: morechoice.php:60
 msgid "Girls with big tits"
 msgstr "Filles à gros seins"

-#: morechoice.php:49
+#: morechoice.php:61
 msgid "Millionaires"
 msgstr "Millionnaires"

-#: morechoice.php:50
+#: morechoice.php:62
 msgid "Guys with big schlongs"
 msgstr ""

-#: morechoice.php:51
+#: morechoice.php:63
 msgid "Easy women"
 msgstr "Femmes faciles"

-#: morechoice.php:52
+#: morechoice.php:64
 msgid "People with impaired mobility"
 msgstr "Personnes à mobilité réduite"

-#: morechoice.php:53
+#: morechoice.php:65
 msgid "Amputees"
 msgstr "Amputés"

-#: morechoice.php:54
+#: morechoice.php:66
 msgid "Statues, mannequins and immobility"
-msgstr "Statues, mannequins et immobilité"
+msgstr ""

-#: morechoice.php:55
+#: morechoice.php:67
 msgid "Pain"
 msgstr "Douleur"

-#: morechoice.php:56
+#: morechoice.php:68
 msgid "Trans men"
 msgstr "Hommes trans"

-#: morechoice.php:57
+#: morechoice.php:69
 msgid "Older women"
-msgstr "Femmes plus âgées"
+msgstr ""

-#: morechoice.php:58
+#: morechoice.php:70
 msgid "Asphyxiation"
-msgstr "Asphyxie"
+msgstr ""

-#: morechoice.php:59
+#: morechoice.php:71
 msgid "In public"
-msgstr "En public"
+msgstr ""

-#: morechoice.php:60
+#: morechoice.php:72
 msgid "In danger"
-msgstr "En danger"
+msgstr ""

-#: morechoice.php:61
+#: morechoice.php:73
 msgid "Pretending to be male"
-msgstr "Prétendant être homme"
+msgstr ""

-#: morechoice.php:62
+#: morechoice.php:74
 msgid "Pretending to be female"
-msgstr "Prétendant être femme"
+msgstr ""

-#: morechoice.php:63
+#: morechoice.php:75
 msgid "Breats"
 msgstr ""

-#: morechoice.php:64
+#: morechoice.php:76
 msgid "Scat"
 msgstr ""

-#: morechoice.php:65
-msgid "Crying"
-msgstr "Pleurant"
-
-#: morechoice.php:66
-msgid "Nappies/Diapers"
-msgstr "Couches/Changes"
-
-#: morechoice.php:67
-msgid "Trees"
-msgstr "Arbres"
-
-#: morechoice.php:68
-msgid "Vomit"
-msgstr "Vomi"
-
-#: morechoice.php:69
-msgid "Murder"
-msgstr "Meurtre"
-
-#: morechoice.php:70
-msgid "Fat people"
-msgstr "Personnes en surpoids"
-
-#: morechoice.php:71
-msgid "Feet"
-msgstr "Pieds"
-
-#: morechoice.php:72
-msgid "Covered in insects"
-msgstr "Couvert d'insectes"
-
-#: morechoice.php:73
-msgid "Turning a human being into furniture"
-msgstr "Transforme un être humain en produit"
-
-#: morechoice.php:74
-msgid "Elderly people"
-msgstr "Personnes âgées"
-
-#: morechoice.php:75
-msgid "Transgender people"
-msgstr "Personnes transgenre"
-
-#: morechoice.php:76
-msgid "Criminals"
-msgstr "Criminels"
-
 #: morechoice.php:77
-msgid "Stealing"
-msgstr "Volant"
+msgid "Crying"
+msgstr ""

 #: morechoice.php:78
-msgid "Breast milk"
-msgstr "Allaitement"
+msgid "Nappies/Diapers"
+msgstr ""

 #: morechoice.php:79
-msgid "Immersing genitals in liquids"
+msgid "Trees"
 msgstr ""

 #: morechoice.php:80
-msgid "Giants"
-msgstr "Géants"
+msgid "Vomit"
+msgstr ""

 #: morechoice.php:81
-msgid "Masochism"
-msgstr "Masochisme"
+msgid "Murder"
+msgstr ""

 #: morechoice.php:82
-msgid "Cars"
-msgstr "Voitures"
+msgid "Fat people"
+msgstr ""

 #: morechoice.php:83
-msgid "Menstruation"
-msgstr "Menstruations"
+msgid "Feet"
+msgstr ""

 #: morechoice.php:84
-msgid "Mucus"
-msgstr "Mucus"
+msgid "Covered in insects"
+msgstr ""

 #: morechoice.php:85
-msgid "Obscene language"
-msgstr "Langage obscène"
+msgid "Turning a human being into furniture"
+msgstr ""

 #: morechoice.php:86
-msgid "Noses"
-msgstr "Nez"
+msgid "Elderly people"
+msgstr ""

 #: morechoice.php:87
-msgid "Navels"
+msgid "Transgender people"
 msgstr ""

 #: morechoice.php:88
-msgid "Corpses"
-msgstr "Corps"
+msgid "Criminals"
+msgstr ""

 #: morechoice.php:89
-msgid "Smells"
-msgstr "Odeurs"
+msgid "Stealing"
+msgstr ""

 #: morechoice.php:90
-msgid "Buttocks"
-msgstr "Fesses"
+msgid "Breast milk"
+msgstr ""

 #: morechoice.php:91
-msgid "Nonliving objects"
-msgstr "Objets inertes"
+msgid "Immersing genitals in liquids"
+msgstr ""

 #: morechoice.php:92
-msgid "Sleeping people"
-msgstr "Personnes qui dorment"
+msgid "Giants"
+msgstr ""

 #: morechoice.php:93
-msgid "Urination"
-msgstr "Urine"
+msgid "Masochism"
+msgstr ""

 #: morechoice.php:94
-msgid "Eating people"
-msgstr "Mangeant des personnes"
+msgid "Cars"
+msgstr ""

 #: morechoice.php:95
-msgid "Being eaten"
-msgstr "Étant mangé"
+msgid "Menstruation"
+msgstr ""

 #: morechoice.php:96
-msgid "Animals"
-msgstr "Animaux"
+msgid "Mucus"
+msgstr ""

 #: morechoice.php:97
-msgid "I'd rather just have some chocolate"
-msgstr "Je préférerais juste avoir du chocolat"
+msgid "Obscene language"
+msgstr ""
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr ""
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr ""
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr ""

 #: morechoice.php:101
-msgid "Married to my job"
-msgstr "Marié à mon travail"
+msgid "Smells"
+msgstr ""

 #: morechoice.php:102
-msgid "Polygamist"
-msgstr "Polygame"
+msgid "Buttocks"
+msgstr ""

 #: morechoice.php:103
-msgid "Half married"
-msgstr "A demi-marié"
+msgid "Nonliving objects"
+msgstr ""

 #: morechoice.php:104
-msgid "Living in the past"
-msgstr "Vivant dans le passé"
+msgid "Sleeping people"
+msgstr ""

 #: morechoice.php:105
-msgid "Pretending to be over my ex"
-msgstr "Prétendant avoir oublié mon ex"
+msgid "Urination"
+msgstr ""

 #: morechoice.php:106
-msgid "Hurt in the past"
+msgid "Eating people"
 msgstr ""

 #: morechoice.php:107
+msgid "Being eaten"
+msgstr ""
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr ""
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr ""
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr ""
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr ""
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr ""
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr ""
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr ""
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr ""
+
+#: morechoice.php:119
 msgid "Wallowing in self-pity"
-msgstr "S'apitoyant sur son sort"
+msgstr ""
--- a/morechoice/lang/fr/strings.php
+++ b/morechoice/lang/fr/strings.php
@ -3,7 +3,7 @@
 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; }
+	return intval($n > 1);
 }}
 $a->strings['Androgyne'] = 'Androgyne';
 $a->strings['Bear'] = 'Ours';
@ -25,49 +25,5 @@ $a->strings['Millionaires'] = 'Millionnaires';
 $a->strings['Easy women'] = 'Femmes faciles';
 $a->strings['People with impaired mobility'] = 'Personnes à mobilité réduite';
 $a->strings['Amputees'] = 'Amputés';
-$a->strings['Statues, mannequins and immobility'] = 'Statues, mannequins et immobilité';
 $a->strings['Pain'] = 'Douleur';
 $a->strings['Trans men'] = 'Hommes trans';
-$a->strings['Older women'] = 'Femmes plus âgées';
-$a->strings['Asphyxiation'] = 'Asphyxie';
-$a->strings['In public'] = 'En public';
-$a->strings['In danger'] = 'En danger';
-$a->strings['Pretending to be male'] = 'Prétendant être homme';
-$a->strings['Pretending to be female'] = 'Prétendant être femme';
-$a->strings['Crying'] = 'Pleurant';
-$a->strings['Nappies/Diapers'] = 'Couches/Changes';
-$a->strings['Trees'] = 'Arbres';
-$a->strings['Vomit'] = 'Vomi';
-$a->strings['Murder'] = 'Meurtre';
-$a->strings['Fat people'] = 'Personnes en surpoids';
-$a->strings['Feet'] = 'Pieds';
-$a->strings['Covered in insects'] = 'Couvert d\'insectes';
-$a->strings['Turning a human being into furniture'] = 'Transforme un être humain en produit';
-$a->strings['Elderly people'] = 'Personnes âgées';
-$a->strings['Transgender people'] = 'Personnes transgenre';
-$a->strings['Criminals'] = 'Criminels';
-$a->strings['Stealing'] = 'Volant';
-$a->strings['Breast milk'] = 'Allaitement';
-$a->strings['Giants'] = 'Géants';
-$a->strings['Masochism'] = 'Masochisme';
-$a->strings['Cars'] = 'Voitures';
-$a->strings['Menstruation'] = 'Menstruations';
-$a->strings['Mucus'] = 'Mucus';
-$a->strings['Obscene language'] = 'Langage obscène';
-$a->strings['Noses'] = 'Nez';
-$a->strings['Corpses'] = 'Corps';
-$a->strings['Smells'] = 'Odeurs';
-$a->strings['Buttocks'] = 'Fesses';
-$a->strings['Nonliving objects'] = 'Objets inertes';
-$a->strings['Sleeping people'] = 'Personnes qui dorment';
-$a->strings['Urination'] = 'Urine';
-$a->strings['Eating people'] = 'Mangeant des personnes';
-$a->strings['Being eaten'] = 'Étant mangé';
-$a->strings['Animals'] = 'Animaux';
-$a->strings['I\'d rather just have some chocolate'] = 'Je préférerais juste avoir du chocolat';
-$a->strings['Married to my job'] = 'Marié à mon travail';
-$a->strings['Polygamist'] = 'Polygame';
-$a->strings['Half married'] = 'A demi-marié';
-$a->strings['Living in the past'] = 'Vivant dans le passé';
-$a->strings['Pretending to be over my ex'] = 'Prétendant avoir oublié mon ex';
-$a->strings['Wallowing in self-pity'] = 'S\'apitoyant sur son sort';
--- a/notifyall/lang/fr/messages.po
+++ b/notifyall/lang/fr/messages.po
@ -3,59 +3,55 @@
 # This file is distributed under the same license as the Friendica notifyall addon package.
 # 
 # 
-# Translators:
-# Thecross, 2017
-# Nicolas Derive, 2022
-# 
 #, 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: 2016-08-14 19:29+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Thecross <louis1302@hotmail.fr>, 2017\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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr "L'administrateur de %s"
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "L'administrateur de %1$s, %2$s."
-
-#: notifyall.php:22
+#: notifyall.php:26
 msgid "Send email to all members"
 msgstr "Envoyer un courriel à tous les membres"

-#: notifyall.php:49
+#: notifyall.php:42
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: notifyall.php:44
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr ""
+
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr "Aucun destinataire trouvé."

-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr "Courriels envoyés"

-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
 msgstr "Envoyer un courriel à tous les membres de cet instance Friendica."

-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr "Objet du message"

-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
 msgstr "Mode test (envoyer uniquement à l'administrateur)"

-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr "Envoyer"
--- a/notifyall/lang/fr/strings.php
+++ b/notifyall/lang/fr/strings.php
@ -3,10 +3,8 @@
 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; }
+	return intval($n > 1);
 }}
-$a->strings['%s Administrator'] = 'L\'administrateur de %s';
-$a->strings['%1$s, %2$s Administrator'] = 'L\'administrateur de %1$s, %2$s.';
 $a->strings['Send email to all members'] = 'Envoyer un courriel à tous les membres';
 $a->strings['No recipients found.'] = 'Aucun destinataire trouvé.';
 $a->strings['Emails sent'] = 'Courriels envoyés';
--- a/tictac/lang/fr/messages.po
+++ b/tictac/lang/fr/messages.po
@ -5,71 +5,70 @@
 # 
 # Translators:
 # ButterflyOfFire, 2020
-# Nicolas Derive, 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-23 12:57+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2020-02-27 22:16+0000\n"
+"Last-Translator: ButterflyOfFire\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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Morpion tri-dimensionnel"
+msgstr ""

-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
-msgstr "Morpion 3D"
+msgstr ""

-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
-msgstr "Nouvelle partie"
+msgstr ""

-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
-msgstr "Nouvelle partie avec handicap"
+msgstr ""

-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
-msgstr "Le morpion tri-dimensionnel est comme le jeu traditionnel, si ce n'est qu'il se joue sur plusieurs niveaux simultanément."
+msgstr ""

-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
-msgstr "Dans ce cas, il y a trois niveaux. Vous pouvez gagner en alignant trois signes à la suite sur n'importe quel niveau, aussi bien vers le haut, vers le bas, qu'en diagonale à travers les différents niveaux."
+msgstr ""

-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
-msgstr "Le jeu avec handicap désactive la position centrale du niveau du milieu car le joueur occupant cette case a souvent un avantage disproportionné."
+msgstr ""

-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
-msgstr "Vous commencez..."
+msgstr ""

-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
-msgstr "Je commence cette fois-ci..."
+msgstr ""

-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
 msgstr "Vous avez gagné !"

-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
-msgstr "Match nul !"
+msgstr ""

-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr "J’ai gagné !"
--- a/tictac/lang/fr/strings.php
+++ b/tictac/lang/fr/strings.php
@ -3,17 +3,7 @@
 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; }
+	return intval($n > 1);
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Morpion tri-dimensionnel';
-$a->strings['3D Tic-Tac-Toe'] = 'Morpion 3D';
-$a->strings['New game'] = 'Nouvelle partie';
-$a->strings['New game with handicap'] = 'Nouvelle partie avec handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Le morpion tri-dimensionnel est comme le jeu traditionnel, si ce n\'est qu\'il se joue sur plusieurs niveaux simultanément.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Dans ce cas, il y a trois niveaux. Vous pouvez gagner en alignant trois signes à la suite sur n\'importe quel niveau, aussi bien vers le haut, vers le bas, qu\'en diagonale à travers les différents niveaux.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Le jeu avec handicap désactive la position centrale du niveau du milieu car le joueur occupant cette case a souvent un avantage disproportionné.';
-$a->strings['You go first...'] = 'Vous commencez...';
-$a->strings['I\'m going first this time...'] = 'Je commence cette fois-ci...';
 $a->strings['You won!'] = 'Vous avez gagné !';
-$a->strings['"Cat" game!'] = 'Match nul !';
 $a->strings['I won!'] = 'J’ai gagné !';
--- a/twitter/lang/fr/messages.po
+++ b/twitter/lang/fr/messages.po
@ -4,145 +4,121 @@
 # 
 # 
 # Translators:
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-27 10:25-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:24+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\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=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: twitter.php:213
+#: twitter.php:77
 msgid "Post to Twitter"
 msgstr "Publier sur Twitter"

-#: twitter.php:258
-msgid ""
-"You submitted an empty PIN, please Sign In with Twitter again to get a new "
-"one."
-msgstr "Vous avez envoyé un PIN vide, veuillez vous connecter à Twitter à nouveau pour en avoir un autre."
+#: twitter.php:129
+msgid "Twitter settings updated."
+msgstr "Paramètres Twitter mis à jour."

-#: twitter.php:321
+#: twitter.php:157
+msgid "Twitter Posting Settings"
+msgstr "Paramètres Twitter de publication"
+
+#: twitter.php:164
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
-msgstr "Aucune clé d'application pour Twitter n'a été trouvée. Merci de contacter l'administrateur de votre site."
+msgstr ""

-#: twitter.php:334
+#: twitter.php:183
 msgid ""
 "At this Friendica instance the Twitter addon was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
 "button below to get a PIN from Twitter which you have to copy into the input"
 " box below and submit the form. Only your <strong>public</strong> posts will"
 " be posted to Twitter."
-msgstr "Sur cette instance de Friendica, le connecteur Twitter a été activé, mais vous n'avez pas encore connecté votre compte local à votre compte Twitter. Pour ce faire, cliquer sur le bouton ci-dessous. Vous obtiendrez alors un 'PIN' de Twitter, que vous devrez copier dans le champ ci-dessous, puis soumettre le formulaire. Seules vos publications <strong>publiques</strong> seront transmises à Twitter."
+msgstr ""

-#: twitter.php:335
+#: twitter.php:184
 msgid "Log in with Twitter"
 msgstr "Se connecter avec Twitter"

-#: twitter.php:337
+#: twitter.php:186
 msgid "Copy the PIN from Twitter here"
 msgstr "Copier le PIN de Twitter ici"

-#: twitter.php:345 twitter.php:388
-msgid "An error occured: "
-msgstr "Une erreur est survenue :"
+#: twitter.php:191 twitter.php:229 twitter.php:556
+msgid "Submit"
+msgstr "Soumettre"

-#: twitter.php:359
-#, php-format
-msgid ""
-"Currently connected to: <a href=\"https://twitter.com/%1$s\" "
-"target=\"_twitter\">%1$s</a>"
-msgstr "Actuellement connecté à : <a href=\"https://twitter.com/%1$s\" target=\"_twitter\">%1$s</a>"
+#: twitter.php:200
+msgid "Currently connected to: "
+msgstr "Actuellement connecté à :"

-#: twitter.php:365
-msgid ""
-"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "<strong>Note</strong>: Du fait de vos paramètres de vie privée (<em>Cacher les détails de votre profil des visiteurs inconnus?</em>), le lien potentiellement inclus dans les publications publiques relayées vers Twitter conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint."
-
-#: twitter.php:372
-msgid "Invalid Twitter info"
-msgstr "Informations Twitter invalides"
-
-#: twitter.php:373
-msgid "Disconnect"
-msgstr "Se déconnecter"
-
-#: twitter.php:378
-msgid "Allow posting to Twitter"
-msgstr "Autoriser la publication sur Twitter"
-
-#: twitter.php:378
+#: twitter.php:201
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
-msgstr "En cas d'activation, toutes vos publications <strong>publiques</strong> seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque publication séparément lors de sa rédaction."
+msgstr ""

-#: twitter.php:379
+#: twitter.php:203
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: twitter.php:206
+msgid "Allow posting to Twitter"
+msgstr "Autoriser la publication sur Twitter"
+
+#: twitter.php:209
 msgid "Send public postings to Twitter by default"
-msgstr "Envoyer par défaut les publications publiques sur Twitter"
+msgstr "Envoyer par défaut les messages publics sur Twitter"

-#: twitter.php:380
-msgid "Mirror all posts from twitter that are no replies"
-msgstr "Synchroniser toutes les publications de Twitter qui ne sont pas des réponses"
+#: twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr ""

-#: twitter.php:381
-msgid "Import the remote timeline"
-msgstr "Importer la Timeline distante"
+#: twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr ""

-#: twitter.php:382
-msgid "Automatically create contacts"
-msgstr "Créer automatiquement les contacts"
+#: twitter.php:221
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr ""

-#: twitter.php:382
-msgid ""
-"This will automatically create a contact in Friendica as soon as you receive"
-" a message from an existing contact via the Twitter network. If you do not "
-"enable this, you need to manually add those Twitter contacts in Friendica "
-"from whom you would like to see posts here."
-msgstr "Cela va automatiquement créer un contact dans Friendica dès qu'une publication d'un contact existant est reçue de Twitter. Si vous n'activez pas ceci, vous devrez ajouter manuellement ces contacts dans Friendica afin d'y voir leurs publications."
+#: twitter.php:226
+msgid "Clear OAuth configuration"
+msgstr ""

-#: twitter.php:395
-msgid "Twitter Import/Export/Mirror"
-msgstr "Importation/Exportation/Synchronisation avec Twitter"
+#: twitter.php:550
+msgid "Settings updated."
+msgstr "Paramètres mis à jour."

-#: twitter.php:547
-msgid ""
-"Please connect a Twitter account in your Social Network settings to import "
-"Twitter posts."
-msgstr "Merci de connecter un compte Twitter depuis vos Paramètres de réseaux sociaux afin d'importer les publications Twitter."
-
-#: twitter.php:554
-msgid "Twitter post not found."
-msgstr "Publication Twitter non trouvée."
-
-#: twitter.php:914
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: twitter.php:916
+#: twitter.php:558
 msgid "Consumer key"
-msgstr "Consumer key"
+msgstr ""

-#: twitter.php:917
+#: twitter.php:559
 msgid "Consumer secret"
-msgstr "Consumer secret"
+msgstr ""

-#: twitter.php:1113
-#, php-format
-msgid "%s on Twitter"
-msgstr "%s sur Twitter"
+#: twitter.php:560
+msgid "Name of the Twitter Application"
+msgstr "Nom de l'application Twitter"
+
+#: twitter.php:560
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr ""
--- a/twitter/lang/fr/strings.php
+++ b/twitter/lang/fr/strings.php
@ -3,30 +3,16 @@
 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; }
+	return intval($n > 1);
 }}
 $a->strings['Post to Twitter'] = 'Publier sur Twitter';
-$a->strings['You submitted an empty PIN, please Sign In with Twitter again to get a new one.'] = 'Vous avez envoyé un PIN vide, veuillez vous connecter à Twitter à nouveau pour en avoir un autre.';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'Aucune clé d\'application pour Twitter n\'a été trouvée. Merci de contacter l\'administrateur de votre site.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'Sur cette instance de Friendica, le connecteur Twitter a été activé, mais vous n\'avez pas encore connecté votre compte local à votre compte Twitter. Pour ce faire, cliquer sur le bouton ci-dessous. Vous obtiendrez alors un \'PIN\' de Twitter, que vous devrez copier dans le champ ci-dessous, puis soumettre le formulaire. Seules vos publications <strong>publiques</strong> seront transmises à Twitter.';
+$a->strings['Twitter settings updated.'] = 'Paramètres Twitter mis à jour.';
+$a->strings['Twitter Posting Settings'] = 'Paramètres Twitter de publication';
 $a->strings['Log in with Twitter'] = 'Se connecter avec Twitter';
 $a->strings['Copy the PIN from Twitter here'] = 'Copier le PIN de Twitter ici';
-$a->strings['An error occured: '] = 'Une erreur est survenue :';
-$a->strings['Currently connected to: <a href="https://twitter.com/%1$s" target="_twitter">%1$s</a>'] = 'Actuellement connecté à : <a href="https://twitter.com/%1$s" target="_twitter">%1$s</a>';
-$a->strings['<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Note</strong>: Du fait de vos paramètres de vie privée (<em>Cacher les détails de votre profil des visiteurs inconnus?</em>), le lien potentiellement inclus dans les publications publiques relayées vers Twitter conduira les visiteurs vers une page blanche les informant que leur accès à votre profil a été restreint.';
-$a->strings['Invalid Twitter info'] = 'Informations Twitter invalides';
-$a->strings['Disconnect'] = 'Se déconnecter';
+$a->strings['Submit'] = 'Soumettre';
+$a->strings['Currently connected to: '] = 'Actuellement connecté à :';
 $a->strings['Allow posting to Twitter'] = 'Autoriser la publication sur Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'En cas d\'activation, toutes vos publications <strong>publiques</strong> seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque publication séparément lors de sa rédaction.';
-$a->strings['Send public postings to Twitter by default'] = 'Envoyer par défaut les publications publiques sur Twitter';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Synchroniser toutes les publications de Twitter qui ne sont pas des réponses';
-$a->strings['Import the remote timeline'] = 'Importer la Timeline distante';
-$a->strings['Automatically create contacts'] = 'Créer automatiquement les contacts';
-$a->strings['This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here.'] = 'Cela va automatiquement créer un contact dans Friendica dès qu\'une publication d\'un contact existant est reçue de Twitter. Si vous n\'activez pas ceci, vous devrez ajouter manuellement ces contacts dans Friendica afin d\'y voir leurs publications.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Importation/Exportation/Synchronisation avec Twitter';
-$a->strings['Please connect a Twitter account in your Social Network settings to import Twitter posts.'] = 'Merci de connecter un compte Twitter depuis vos Paramètres de réseaux sociaux afin d\'importer les publications Twitter.';
-$a->strings['Twitter post not found.'] = 'Publication Twitter non trouvée.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Consumer key'] = 'Consumer key';
-$a->strings['Consumer secret'] = 'Consumer secret';
-$a->strings['%s on Twitter'] = '%s sur Twitter';
+$a->strings['Send public postings to Twitter by default'] = 'Envoyer par défaut les messages publics sur Twitter';
+$a->strings['Settings updated.'] = 'Paramètres mis à jour.';
+$a->strings['Name of the Twitter Application'] = 'Nom de l\'application Twitter';
--- a/webrtc/lang/pl/messages.po
+++ b/webrtc/lang/pl/messages.po
@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# 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: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
+"PO-Revision-Date: 2021-02-01 20:17+0000\n"
+"Last-Translator: Transifex Bot <>\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,36 +19,36 @@ 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"

-#: webrtc.php:18
+#: webrtc.php:19
 msgid "WebRTC Videochat"
 msgstr "Videochat WebRTC"

-#: webrtc.php:24
+#: webrtc.php:25
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"

-#: webrtc.php:25
+#: webrtc.php:26
 msgid "WebRTC Base URL"
 msgstr "Podstawowy adres URL WebRTC"

-#: webrtc.php:25
+#: webrtc.php:26
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
 msgstr "Strona Twoich użytkowników utworzą pokój czatu WebRTC. Na przykład możesz użyć https://live.mayfirst.org."

-#: webrtc.php:44
+#: webrtc.php:45
 msgid "Video Chat"
 msgstr "Czat wideo"

-#: webrtc.php:45
+#: webrtc.php:46
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC to narzędzie do obsługi konferencji wideo i dźwiękowych, które działa we wszystkich nowoczesnych przeglądarkach. Po prostu utwórz nowy pokój rozmów i wyślij odnośnik do osoby, z którą chcesz porozmawiać."
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC to narzędzie do wideokonferencji, które działa z przeglądarką Firefox (wersja 21 i nowsze) oraz Chrome/Chromium (wersja 25 i nowsze). Utwórz nowy pokój czatu i wyślij link do kogoś, z kim chcesz porozmawiać."

-#: webrtc.php:47
+#: webrtc.php:48
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
--- a/webrtc/lang/pl/strings.php
+++ b/webrtc/lang/pl/strings.php
@ -10,5 +10,5 @@ $a->strings['Save Settings'] = 'Zapisz ustawienia';
 $a->strings['WebRTC Base URL'] = 'Podstawowy adres URL WebRTC';
 $a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Strona Twoich użytkowników utworzą pokój czatu WebRTC. Na przykład możesz użyć https://live.mayfirst.org.';
 $a->strings['Video Chat'] = 'Czat wideo';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC to narzędzie do obsługi konferencji wideo i dźwiękowych, które działa we wszystkich nowoczesnych przeglądarkach. Po prostu utwórz nowy pokój rozmów i wyślij odnośnik do osoby, z którą chcesz porozmawiać.';
+$a->strings['WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC to narzędzie do wideokonferencji, które działa z przeglądarką Firefox (wersja 21 i nowsze) oraz Chrome/Chromium (wersja 25 i nowsze). Utwórz nowy pokój czatu i wyślij link do kogoś, z kim chcesz porozmawiać.';
 $a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Skontaktuj się z administratorem friendica i wyślij przypomnienie, aby skonfigurować dodatek WebRTC.';