Merge branch 'stable' into develop

advancedcontentfilter/lang/it/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
 "Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgstr "Annulla"
 
 #: advancedcontentfilter.php:295
 msgid "This addon requires this node having at least one post"
-msgstr ""
+msgstr "Questo addon richiede che questo nodo abbia almeno un messaggio"
 
 #: advancedcontentfilter.php:325 advancedcontentfilter.php:336
 #: advancedcontentfilter.php:347 advancedcontentfilter.php:383

advancedcontentfilter/lang/it/strings.php

@@ -27,6 +27,7 @@ $a->strings['Add new rule'] = 'Aggiungi nuova regola';
 $a->strings['Rule Name'] = 'Nome Regola';
 $a->strings['Rule Expression'] = 'Espressione Regola';
 $a->strings['Cancel'] = 'Annulla';
+$a->strings['This addon requires this node having at least one post'] = 'Questo addon richiede che questo nodo abbia almeno un messaggio';
 $a->strings['You must be logged in to use this method'] = 'Devi essere autenticato per usare questo metodo';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Token di sicurezza invalido, aggiorna la pagina.';
 $a->strings['The rule name and expression are required.'] = 'Il nome e l\'espressione della regola sono richiesti.';

blockbot/blockbot.php

@@ -15,6 +15,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
@@ -76,6 +77,8 @@ function blockbot_init_1()
 		return;
 	}
 
+	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
+
 	if (blockbot_is_crawler($parts)) {
 		Logger::debug('Crawler found - reject', $logdata);
 		blockbot_reject();
@@ -169,7 +172,7 @@ function blockbot_init_1()
 
 function blockbot_save($database, $userAgent)
 {
-	if (!DI::config()->get('blockbot', 'training') || !function_exists('dba_open')) {
+	if (!DI::config()->get('blockbot', 'logging') || !function_exists('dba_open')) {
 		return;
 	}
 
@@ -181,6 +184,36 @@ function blockbot_save($database, $userAgent)
 	dba_close($resource);
 }
 
+function blockbot_log_activitypub(string $url, string $agent)
+{
+	if (!DI::config()->get('blockbot', 'logging')) {
+		return;
+	}
+
+	$bot = ['/.well-known/nodeinfo', '/nodeinfo/2.0', '/nodeinfo/1.0'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-stats', $agent);
+	}
+
+	$bot = ['/api/v1/instance', '/api/v2/instance', '/api/v1/instance/extended_description',
+		'/api/v1/instance/peers'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-api-stats', $agent);
+	}
+
+	if (substr($url, 0, 6) == '/api/v') {
+		blockbot_save('activitypub-api', $agent);
+	}
+
+	if (($_SERVER['REQUEST_METHOD'] == 'POST') && in_array('inbox', explode('/', parse_url($url, PHP_URL_PATH)))) {
+		blockbot_save('activitypub-inbox-agents', $agent);
+	}
+
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+		blockbot_save('activitypub-signature-agents', $agent);
+	}
+}
+
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
@@ -466,6 +499,7 @@ function blockbot_is_fediverse_client(array $parts): bool
 		'megalodonandroid', 'fedilab', 'mastodonapp', 'toot!', 'intravnews',
 		'pixeldroid', 'greatnews', 'protopage', 'newsfox', 'vienna', 'wp-urldetails', 'husky',
 		'activitypub-go-http-client', 'mobilesafari', 'mastodon-ios', 'mastodonpy', 'techniverse',
+		'relatica',
 	];
 
 	foreach ($parts as $part) {

bluesky/bluesky.php

@@ -68,6 +68,7 @@ const BLUEKSY_STATUS_TOKEN_FAIL = 13;
 const BLUESKY_DIRECTORY = 'https://plc.directory'; // Path to the directory server service to fetch the PDS of a given DID
 const BLUESKY_PDS       = 'https://bsky.social';   // Path to the personal data server service (PDS) to fetch the DID for a given handle
 const BLUESKY_WEB       = 'https://bsky.app';      // Path to the web interface with the user profile and posts
+const BLUESKY_HOSTNAME  = 'bsky.social';           // Host name to be added to the handle if incomplete
 
 function bluesky_install()
 {
@@ -293,9 +294,9 @@ function bluesky_block(array &$hook_data)
 
 	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
+		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
+		if ($ucid) {
-			Contact::remove($cdata['user']);
+			Contact::remove($ucid);
 		}
 		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
@@ -355,8 +356,11 @@ function bluesky_settings(array &$data)
 
 	if (DI::config()->get('bluesky', 'friendica_handles')) {
 		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
-		$handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
+		$host_handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
-		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $handle, $handle)];
+		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $host_handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $host_handle, $host_handle)];
+		if ($custom_handle) {
+			$handle = $host_handle;
+		}
 	} else {
 		$friendica_handle = [];
 	}
@@ -369,7 +373,7 @@ function bluesky_settings(array &$data)
 		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
 		'$custom_handle' => $friendica_handle,
 		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
+		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
 		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
 		'$password'     => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
 		'$status'       => bluesky_get_status($handle, $did, $pds, $token),
@@ -440,7 +444,7 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
 
 	if (!empty($handle)) {
 		$did = bluesky_get_user_did(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
@@ -510,9 +514,10 @@ function bluesky_cron()
 
 	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
-	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'bluesky', 'k' => 'import', 'v' => true]);
+	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(bluesky_get_user_did($pconfig['uid']))) {
+			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
@@ -524,19 +529,27 @@ function bluesky_cron()
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
+		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		bluesky_get_token($pconfig['uid']);
 
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
+		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import')) {
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
-
+		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
+			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed, $last);
 			}
 		}
+		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
+	Logger::notice('Polling done for all users');
+
+	DI::keyValue()->set('bluesky_last_poll', time());
+
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
 		Logger::notice('Start contact cleanup');
@@ -550,8 +563,6 @@ function bluesky_cron()
 	}
 
 	Logger::notice('cron_end');
-
-	DI::keyValue()->set('bluesky_last_poll', time());
 }
 
 function bluesky_hook_fork(array &$b)
@@ -964,6 +975,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 		return null;
 	}
 
+	Item::incrementOutbound(Protocol::BLUESKY);
 	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
@@ -1037,8 +1049,8 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
 	if (Item::insert($item)) {
-		$cdata = Contact::getPublicAndUserContactID($contact['id'], $uid);
+		$pcid = Contact::getPublicContactId($contact['id'], $uid);
-		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $cdata['public']], ['uri' => $uri, 'uid' => $uid]);
+		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $pcid], ['uri' => $uri, 'uid' => $uid]);
 	}
 }
 
@@ -1217,7 +1229,11 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		'source'        => json_encode($post),
 	];
 
+	$account = Contact::selectFirstAccountUser(['pid'], ['id' => $contact['id']]);
+
+	$item['author-id'] = $account['pid'];
 	$item['uri-id']       = ItemURI::getIdByURI($uri);
+	$item['owner-id']     = $item['author-id'];
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
@@ -1522,8 +1538,7 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 	Logger::debug('Reply count', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
 
 	if ($causer != 0) {
-		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
+		$causer = Contact::getPublicContactId($causer, $uid);
-		$causer = $cdata['public'] ?? 0;
 	}
 
 	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
@@ -1592,7 +1607,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 
 function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 {
-	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'url' => $author->did];
+	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'nurl' => $author->did];
 	$contact = Contact::selectFirst(['id', 'updated'], $condition);
 
 	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
@@ -1610,7 +1625,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 	}
 
 	if ($uid != 0) {
-		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'url' => $author->did];
+		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'nurl' => $author->did];
 
 		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
 		if (!isset($fields['rel']) && isset($contact['rel'])) {
@@ -1705,6 +1720,9 @@ function bluesky_get_feeds(int $uid): array
 {
 	$type = '$type';
 	$preferences = bluesky_get_preferences($uid);
+	if (empty($preferences) || empty($preferences->preferences)) {
+		return [];
+	}
 	foreach ($preferences->preferences as $preference) {
 		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
 			return $preference->pinned ?? [];
@@ -1713,7 +1731,7 @@ function bluesky_get_feeds(int $uid): array
 	return [];
 }
 
-function bluesky_get_preferences(int $uid): stdClass
+function bluesky_get_preferences(int $uid): ?stdClass
 {
 	$cachekey = 'bluesky:preferences:' . $uid;
 	$data = DI::cache()->get($cachekey);
@@ -1722,6 +1740,9 @@ function bluesky_get_preferences(int $uid): stdClass
 	}
 
 	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getPreferences');
+	if (empty($data)) {
+		return null;
+	}
 
 	DI::cache()->set($cachekey, $data, Duration::HOUR);
 	return $data;
@@ -1764,6 +1785,14 @@ function bluesky_get_did_by_dns(string $handle): string
 
 function bluesky_get_did(string $handle): string
 {
+	if ($handle == '') {
+		return '';
+	}
+
+	if (strpos($handle, '.') === false) {
+		$handle .= '.' . BLUESKY_HOSTNAME;
+	}
+
 	// Deactivated at the moment, since it isn't reliable by now
 	//$did = bluesky_get_did_by_dns($handle);
 	//if ($did != '') {
@@ -1907,7 +1936,11 @@ function bluesky_create_token(int $uid, string $password): string
 
 function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
 {
-	return bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	$data = bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	if (!empty($data)) {
+		Item::incrementOutbound(Protocol::BLUESKY);
+	}
+	return $data;
 }
 
 function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
@@ -1965,5 +1998,6 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 		return null;
 	}
 
+	Item::incrementInbound(Protocol::BLUESKY);
 	return json_decode($curlResult->getBodyString());
 }

catavatar/lang/it/messages.po

@@ -6,55 +6,55 @@
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
 # Davide Pesenti <mrjive@mrjive.it>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-29 00:53+0000\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: catavatar.php:48
-msgid "Use Cat as Avatar"
-msgstr "Usa il Gatto come avatar"
-
-#: catavatar.php:49
-msgid "More Random Cat!"
-msgstr "Altro Gatto a caso!"
-
-#: catavatar.php:50
-msgid "Reset to email Cat"
-msgstr "Reimposta Gatto"
-
-#: catavatar.php:52
-msgid "Cat Avatar Settings"
-msgstr "Impostazioni Avatar Gatto"
-
-#: catavatar.php:53
 msgid "Set default profile avatar or randomize the cat."
 msgstr "Imposta l'immagine di profilo predefinita o crea un gatto casuale."
 
-#: catavatar.php:78
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr "Impostazioni Avatar Gatto"
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr "Usa il Gatto come avatar"
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr "Un altro Gatto casuale!"
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr "Reimposta Gatto"
+
+#: catavatar.php:77
 msgid "The cat hadn't found itself."
 msgstr "Il gatto non ha trovato sé stesso."
 
-#: catavatar.php:87
+#: catavatar.php:86
 msgid "There was an error, the cat ran away."
 msgstr "Si è verificato un errore, il gatto è scappato."
 
-#: catavatar.php:93
+#: catavatar.php:92
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: catavatar.php:108
+#: catavatar.php:102
 msgid "Meow!"
 msgstr "Miao!"

catavatar/lang/it/strings.php

@@ -3,13 +3,13 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
-$a->strings['More Random Cat!'] = 'Altro Gatto a caso!';
-$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
-$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
 $a->strings['Set default profile avatar or randomize the cat.'] = 'Imposta l\'immagine di profilo predefinita o crea un gatto casuale.';
+$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
+$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
+$a->strings['Another random Cat!'] = 'Un altro Gatto casuale!';
+$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
 $a->strings['The cat hadn\'t found itself.'] = 'Il gatto non ha trovato sé stesso.';
 $a->strings['There was an error, the cat ran away.'] = 'Si è verificato un errore, il gatto è scappato.';
 $a->strings['Profile Photos'] = 'Foto del profilo';

curweather/curweather.php

@@ -152,7 +152,7 @@ function curweather_network_mod_init(string &$body)
 
 function curweather_addon_settings_post($post)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-settings-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-submit'])) {
 		return;
 	}
 

curweather/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
@@ -15,8 +16,8 @@ msgstr ""
 "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: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -45,7 +46,7 @@ msgstr "Vent"
 
 #: curweather.php:140
 msgid "Last Updated"
-msgstr "Dernière mise-à-jour"
+msgstr "Dernière mise à jour"
 
 #: curweather.php:141
 msgid "Data by"

curweather/lang/fr/strings.php

@@ -10,7 +10,7 @@ $a->strings['Current Weather'] = 'Météo actuelle';
 $a->strings['Relative Humidity'] = 'Humidité relative';
 $a->strings['Pressure'] = 'Pression';
 $a->strings['Wind'] = 'Vent';
-$a->strings['Last Updated'] = 'Dernière mise-à-jour';
+$a->strings['Last Updated'] = 'Dernière mise à jour';
 $a->strings['Data by'] = 'Données de';
 $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';

curweather/lang/it/messages.po

@@ -5,27 +5,27 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 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-02-16 12:57+0000\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: curweather.php:47
 msgid "Error fetching weather data. Error was: "
 msgstr "Errore durante il recupero dei dati meteo. L'errore è stato:"
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:130
 msgid "Current Weather"
 msgstr "Meteo"
 
@@ -61,66 +61,66 @@ msgstr "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"
 msgid "at OpenWeatherMap"
 msgstr "a OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:178
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "APPID non trovata, contatta il tuo amministratore per averne una."
 
-#: curweather.php:191 curweather.php:229
+#: curweather.php:188
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: curweather.php:192
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: curweather.php:194
 msgid "Enter either the name of your location or the zip code."
 msgstr "Inserisci il nome della tua posizione o il CAP"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid "Your Location"
 msgstr "La tua Posizione"
 
-#: 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 "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>."
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "Units"
 msgstr "Unità"
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "scegli se la temperatura deve essere mostrata in °C o in °F"
 
-#: curweather.php:197
+#: curweather.php:191
 msgid "Show weather data"
 msgstr "Mostra dati meteo"
 
-#: curweather.php:232
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr "Impostazioni Meteo"
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: curweather.php:230
 msgid "Caching Interval"
 msgstr "Intervallo di cache"
 
-#: curweather.php:234
+#: curweather.php:232
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:233
 msgid "no cache"
 msgstr "nessuna 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 "minuti"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your APPID"
 msgstr "Il tuo APPID"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "La tua chiave API da OpenWeatherMap"

curweather/lang/it/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Error fetching weather data. Error was: '] = 'Errore durante il recupero dei dati meteo. L\'errore è stato:';
 $a->strings['Current Weather'] = 'Meteo';
@@ -16,14 +16,14 @@ $a->strings['Show on map'] = 'Mostra sulla mappa';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'C\'è stato un problema accedendo ai dati meteo, ma dai un\'occhiata';
 $a->strings['at OpenWeatherMap'] = 'a OpenWeatherMap';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'APPID non trovata, contatta il tuo amministratore per averne una.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Settings'] = 'Impostazioni';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Inserisci il nome della tua posizione o il CAP';
 $a->strings['Your Location'] = 'La tua Posizione';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.';
 $a->strings['Units'] = 'Unità';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'scegli se la temperatura deve essere mostrata in °C o in °F';
 $a->strings['Show weather data'] = 'Mostra dati meteo';
+$a->strings['Current Weather Settings'] = 'Impostazioni Meteo';
+$a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Caching Interval'] = 'Intervallo di cache';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap.';
 $a->strings['no cache'] = 'nessuna cache';

dwpost/lang/it/messages.po

@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
+# Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023
 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-02-16 12:55+0000\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: dwpost.php:41
+#: dwpost.php:43
 msgid "Post to Dreamwidth"
 msgstr "Invia a Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
+#: dwpost.php:63
-msgid "Dreamwidth Export"
+msgid "Enable Dreamwidth Post Addon"
-msgstr "Esporta Dreamwidth"
+msgstr "Abilita il componente aggiuntivo di pubblicazione Dreamwidth"
 
-#: dwpost.php:80
+#: dwpost.php:64
-msgid "Enable dreamwidth Post Addon"
+msgid "Dreamwidth username"
-msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
-
-#: dwpost.php:85
-msgid "dreamwidth username"
 msgstr "Nome utente Dreamwidth"
 
-#: dwpost.php:90
+#: dwpost.php:65
-msgid "dreamwidth password"
+msgid "Dreamwidth password"
-msgstr "password Dreamwidth"
+msgstr "Password Dreamwidth"
 
-#: dwpost.php:95
+#: dwpost.php:66
-msgid "Post to dreamwidth by default"
+msgid "Post to Dreamwidth by default"
-msgstr "Invia sempre a Dreamwidth"
+msgstr "Pubblica su dreamwidth per impostazione predefinita"
 
-#: dwpost.php:100
+#: dwpost.php:71
-msgid "Save Settings"
+msgid "Dreamwidth Export"
-msgstr "Salva Impostazioni"
+msgstr "Esporta Dreamwidth"

dwpost/lang/it/strings.php

@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Dreamwidth'] = 'Invia a Dreamwidth';
+$a->strings['Enable Dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di pubblicazione Dreamwidth';
+$a->strings['Dreamwidth username'] = 'Nome utente Dreamwidth';
+$a->strings['Dreamwidth password'] = 'Password Dreamwidth';
+$a->strings['Post to Dreamwidth by default'] = 'Pubblica su dreamwidth per impostazione predefinita';
 $a->strings['Dreamwidth Export'] = 'Esporta Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di invio a Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nome utente Dreamwidth';
-$a->strings['dreamwidth password'] = 'password Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Invia sempre a Dreamwidth';
-$a->strings['Save Settings'] = 'Salva Impostazioni';

geonames/lang/fr/messages.po

@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -29,7 +30,7 @@ msgstr "Remplacer les coordonnées par le nom de la localité la plus proche dan
 
 #: geonames.php:136
 msgid "Enable Geonames Addon"
-msgstr "Activer l'application complémentaire Geonames"
+msgstr "Activer l'extension Geonames"
 
 #: geonames.php:141
 msgid "Geonames Settings"

geonames/lang/fr/strings.php

@@ -6,5 +6,5 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Remplacer les coordonnées par le nom de la localité la plus proche dans votre publication.';
-$a->strings['Enable Geonames Addon'] = 'Activer l\'application complémentaire Geonames';
+$a->strings['Enable Geonames Addon'] = 'Activer l\'extension Geonames';
 $a->strings['Geonames Settings'] = 'Paramètres Geonames';

gnot/lang/fr/messages.po

@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -29,7 +30,7 @@ msgstr "Permettre le filtrage des notifications de commentaires par courriel sur
 
 #: gnot.php:64
 msgid "Enable this addon?"
-msgstr "Activer cette application complémentaire ?"
+msgstr "Activer cette extension ?"
 
 #: gnot.php:69
 msgid "Gnot Settings"

gnot/lang/fr/strings.php

@@ -6,6 +6,6 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permettre le filtrage des notifications de commentaires par courriel sur Gmail et l\'anonymisation de l\'objet.';
-$a->strings['Enable this addon?'] = 'Activer cette application complémentaire ?';
+$a->strings['Enable this addon?'] = 'Activer cette extension ?';
 $a->strings['Gnot Settings'] = 'Paramètres Gnot';
 $a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Commentaire vers conversation #%d';

gravatar/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Marie Olive <lacellule101@gmail.com>, 2018
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 msgid ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -50,7 +51,7 @@ msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "L'application complémentaire Libravatar est aussi installée. Merci de désactiver l'application complémentaire Libravatar ou cette application complémentaire Gravatar. L'application complémentaire se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
+msgstr "L'extension Libravatar est aussi installée. Merci de désactiver l'extension Libravatar ou cette extension Gravatar. L'extension se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
 
 #: gravatar.php:102
 msgid "Save Settings"

gravatar/lang/fr/strings.php

@@ -11,7 +11,7 @@ $a->strings['monster face'] = 'Face de monstre';
 $a->strings['computer generated face'] = 'visage généré par ordinateur';
 $a->strings['retro arcade style face'] = 'Face style retro arcade';
 $a->strings['Information'] = 'Information';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'application complémentaire Libravatar est aussi installée. Merci de désactiver l\'application complémentaire Libravatar ou cette application complémentaire Gravatar. L\'application complémentaire se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
+$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'extension Libravatar est aussi installée. Merci de désactiver l\'extension Libravatar ou cette extension Gravatar. L\'extension se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres.';
 $a->strings['Default avatar image'] = 'Image par défaut d\'avatar';
 $a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Sélectionner l\'avatar par défaut, si aucun n\'est trouvé sur Gravatar. Voir Lisezmoi.';

ijpost/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -12,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
 "PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -26,7 +27,7 @@ msgstr "Publier sur Insanejournal"
 
 #: ijpost.php:61
 msgid "Enable InsaneJournal Post Addon"
-msgstr "Activer l'application complémentaire InsaneJournalPost"
+msgstr "Activer l'extension InsaneJournal"
 
 #: ijpost.php:62
 msgid "InsaneJournal username"

ijpost/lang/fr/strings.php

@@ -6,7 +6,7 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Insanejournal'] = 'Publier sur Insanejournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'application complémentaire InsaneJournalPost';
+$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'extension InsaneJournal';
 $a->strings['InsaneJournal username'] = 'Identifiant du InsaneJournal';
 $a->strings['InsaneJournal password'] = 'Mot de passe du InsaneJournal';
 $a->strings['Post to InsaneJournal by default'] = 'Publier sur le InsaneJournal par défaut';

js_upload/js_upload.php

@@ -50,7 +50,11 @@ function js_upload_post_init(array &$b)
 	// list of valid extensions
 	$allowedExtensions = [];
 	foreach (Images::IMAGETYPES as $type) {
-		$allowedExtensions[] = image_type_to_extension($type, false);
+		$extension = image_type_to_extension($type, false);
+		if ($extension == 'jpeg') {
+			$allowedExtensions[] = 'jpg';
+		}
+		$allowedExtensions[] = $extension;
 	}
 
 	// max file size in bytes
@@ -216,9 +220,9 @@ class qqFileUploader
 			return ['error' => DI::l10n()->t('Uploaded file is empty')];
 		}
 
-//		if ($size > $this->sizeLimit) {
+		//		if ($size > $this->sizeLimit) {
-//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
+		//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
-//		}
+		//		}
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 

krynn/lang/fr/messages.po

@@ -5,14 +5,15 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 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: 2015-07-07 15:14+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: cracrayol, 2024\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Language-Team: French (http://app.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"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: krynn.php:127
 msgid "Enable Krynn Addon"
-msgstr "Activer l'application complémentaire Krynn"
+msgstr "Activer l'extension Krynn"
 
 #: krynn.php:132
 msgid "Krynn Settings"

krynn/lang/fr/strings.php

@@ -5,5 +5,5 @@ 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 Krynn Addon'] = 'Activer l\'application complémentaire Krynn';
+$a->strings['Enable Krynn Addon'] = 'Activer l\'extension Krynn';
 $a->strings['Krynn Settings'] = 'Paramètres de Krynn';

libertree/lang/it/messages.po

@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 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: 2023-06-03 15:49-0400\n"
-"PO-Revision-Date: 2021-02-16 12:47+0000\n"
+"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: libertree.php:37
+#: libertree.php:39
 msgid "Post to libertree"
 msgstr "Invia a Libertree"
 
-#: libertree.php:71 libertree.php:75
+#: libertree.php:59
-msgid "libertree Export"
-msgstr "Esporta libertree"
-
-#: libertree.php:79
 msgid "Enable Libertree Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Libertree"
 
-#: libertree.php:84
+#: libertree.php:60
-msgid "Libertree API token"
-msgstr "Token API Libertree"
-
-#: libertree.php:89
 msgid "Libertree site URL"
 msgstr "Indirizzo sito Libertree"
 
-#: libertree.php:94
+#: libertree.php:61
+msgid "Libertree API token"
+msgstr "Token API Libertree"
+
+#: libertree.php:62
 msgid "Post to Libertree by default"
 msgstr "Invia sempre a Libertree"
 
-#: libertree.php:100
+#: libertree.php:67
-msgid "Save Settings"
+msgid "Libertree Export"
-msgstr "Salva Impostazioni"
+msgstr "Esporta Libertree"

libertree/lang/it/strings.php

@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to libertree'] = 'Invia a Libertree';
-$a->strings['libertree Export'] = 'Esporta libertree';
 $a->strings['Enable Libertree Post Addon'] = 'Abilita il componente aggiuntivo di invio a Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Libertree site URL'] = 'Indirizzo sito Libertree';
+$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Post to Libertree by default'] = 'Invia sempre a Libertree';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+$a->strings['Libertree Export'] = 'Esporta Libertree';

mailstream/lang/de/messages.po

@@ -5,16 +5,18 @@
 # 
 # Translators:
 # Andreas H., 2014
+# foss <oss@disr.it>, 2022
+# Raroun, 2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 19:13+0100\n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2019-02-18 15:05+0000\n"
+"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
+"Last-Translator: Raroun, 2023\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,72 +31,76 @@ msgstr "Absender"
 msgid "Email address that stream items will appear to be from."
 msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
 
-#: mailstream.php:82 mailstream.php:380
+#: mailstream.php:82
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: mailstream.php:223
+#: mailstream.php:311
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:231
+#: mailstream.php:324 mailstream.php:327
 msgid "Friendica post"
 msgstr "Friendica-Veröffentlichung"
 
-#: mailstream.php:234
+#: mailstream.php:330
 msgid "Diaspora post"
 msgstr "Diaspora-Veröffentlichung"
 
-#: mailstream.php:244
+#: mailstream.php:340
 msgid "Feed item"
 msgstr "Artikel-Feed"
 
-#: mailstream.php:247
+#: mailstream.php:343
 msgid "Email"
 msgstr "E-Mail"
 
-#: mailstream.php:249
+#: mailstream.php:345
 msgid "Friendica Item"
 msgstr "Friendica-Artikel"
 
-#: mailstream.php:293
+#: mailstream.php:419
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:294
+#: mailstream.php:420
+msgid "URI"
+msgstr "URI"
+
+#: mailstream.php:421
 msgid "Local"
 msgstr "Lokal"
 
-#: mailstream.php:362
+#: mailstream.php:499
 msgid "Enabled"
-msgstr "eingeschaltet"
+msgstr "Aktiv"
 
-#: mailstream.php:366
+#: mailstream.php:504
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: mailstream.php:368
+#: mailstream.php:506
 msgid "Leave blank to use your account email address"
 msgstr "Leer lassen für deine Konto-E-Mail-Addresse"
 
-#: mailstream.php:371
+#: mailstream.php:510
 msgid "Exclude Likes"
 msgstr "Likes ignorieren"
 
-#: mailstream.php:373
+#: mailstream.php:512
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Diese Option verhindert das Versenden von \"Like\"-Benachrichtigungen per E-Mail."
 
-#: mailstream.php:376
+#: mailstream.php:516
 msgid "Attach Images"
 msgstr "Bilder anhängen"
 
-#: mailstream.php:378
+#: mailstream.php:518
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr "Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?"
 
-#: mailstream.php:379
+#: mailstream.php:525
 msgid "Mail Stream Settings"
 msgstr "Mail-Nachrichten-Einstellungen"

mailstream/lang/de/strings.php

@@ -15,8 +15,9 @@ $a->strings['Feed item'] = 'Artikel-Feed';
 $a->strings['Email'] = 'E-Mail';
 $a->strings['Friendica Item'] = 'Friendica-Artikel';
 $a->strings['Upstream'] = 'Upstream';
+$a->strings['URI'] = 'URI';
 $a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'eingeschaltet';
+$a->strings['Enabled'] = 'Aktiv';
 $a->strings['Email Address'] = 'E-Mail-Adresse';
 $a->strings['Leave blank to use your account email address'] = 'Leer lassen für deine Konto-E-Mail-Addresse';
 $a->strings['Exclude Likes'] = 'Likes ignorieren';

mailstream/mailstream.php

@@ -199,6 +199,11 @@ function mailstream_do_images(array &$item, array &$attachments)
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
 			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+			if (!$curlResult->isSuccess()) {
+				Logger::debug('mailstream: fetch image url failed', [
+					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+				continue;
+			}
 		} catch (InvalidArgumentException $e) {
 			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;

nsfw/lang/fr/messages.po

@@ -4,7 +4,7 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
+# cracrayol, 2023-2024
 # Nicolas Derive, 2022-2023
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-10 14:42-0500\n"
 "PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2023-2024\n"
 "Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Liste de mots-clés - séparés par des virgules - à cacher"
 msgid ""
 "Use /expression/ to provide regular expressions, #tag to specfically match "
 "hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)"
+msgstr "Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)"
 
 #: nsfw.php:72
 msgid "Content Filter (NSFW and more)"

nsfw/lang/fr/strings.php

@@ -8,7 +8,7 @@ function string_plural_select_fr($n){
 $a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Cette extension recherche des mots/textes spécifiés dans les publications et les masque. Elle peut être utilisée pour filtrer le contenu étiqueté par exemple avec #NSFW qui peut être considéré comme inapproprié à certains moments ou endroits, comme par exemple au travail. Elle est aussi utile pour cacher du contenu non pertinent ou ennuyeux d\'une vue directe.';
 $a->strings['Enable Content filter'] = 'Activer le filtrage de contenu';
 $a->strings['Comma separated list of keywords to hide'] = 'Liste de mots-clés - séparés par des virgules - à cacher';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)';
+$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)';
 $a->strings['Content Filter (NSFW and more)'] = 'Filtre de contenu (NSFW et autres)';
 $a->strings['Regular expression "%s" fails to compile'] = 'La compilation de l\'expression régulière "%s" a échoué';
 $a->strings['Filtered tag: %s'] = 'Tag filtré : %s';

securemail/lang/fr/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Florent C., 2023
+# cracrayol, 2024
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:16-0500\n"
 "PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2024\n"
 "Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: securemail.php:50
 msgid "Enable Secure Mail"
-msgstr "Activer l'extension des emails sécurisés"
+msgstr "Activer l'extension des courriels sécurisés"
 
 #: securemail.php:51
 msgid "Public key"
@@ -36,7 +36,7 @@ msgstr "Votre clé publique PGP formatée compatible ASCII"
 
 #: securemail.php:56
 msgid "\"Secure Mail\" Settings"
-msgstr "Paramètres des emails sécurisés"
+msgstr "Paramètres des courriels sécurisés"
 
 #: securemail.php:59
 msgid "Save Settings"

securemail/lang/fr/strings.php

@@ -5,10 +5,10 @@ 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 Secure Mail'] = 'Activer l\'extension des emails sécurisés';
+$a->strings['Enable Secure Mail'] = 'Activer l\'extension des courriels sécurisés';
 $a->strings['Public key'] = 'Clé publique';
 $a->strings['Your public PGP key, ascii armored format'] = 'Votre clé publique PGP formatée compatible ASCII';
-$a->strings['"Secure Mail" Settings'] = 'Paramètres des emails sécurisés';
+$a->strings['"Secure Mail" Settings'] = 'Paramètres des courriels sécurisés';
 $a->strings['Save Settings'] = 'Enregistrer les paramètres';
 $a->strings['Save and send test'] = 'Enregistrer et envoyer un message de test';
 $a->strings['Test email sent'] = 'Courriel de test envoyé avec succès';

tumblr/lang/ar/messages.po

@@ -8,64 +8,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2021-02-20 00:23+0000\n"
+"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
+"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: tumblr.php:40
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "الطلب مرفوض."
 
-#: tumblr.php:70 tumblr.php:284
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Save Settings"
 
-#: tumblr.php:72
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:73
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:178
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
 msgstr ""
 
-#: tumblr.php:179
+#: tumblr.php:299
-msgid "return to the connector page"
+msgid ""
-msgstr "الرجوع إلى صفحة الموصل"
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-
+"feature."
-#: tumblr.php:195
-msgid "Post to Tumblr"
 msgstr ""
 
-#: tumblr.php:225 tumblr.php:229
+#: tumblr.php:336
-msgid "Tumblr Export"
-msgstr ""
-
-#: tumblr.php:233
-msgid "(Re-)Authenticate your tumblr page"
-msgstr ""
-
-#: tumblr.php:237
-msgid "Enable Tumblr Post Addon"
-msgstr ""
-
-#: tumblr.php:243
-msgid "Post to Tumblr by default"
-msgstr ""
-
-#: tumblr.php:264
 msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:278
+#: tumblr.php:342
+msgid "(Re-)Authenticate your tumblr page"
+msgstr ""
+
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr ""
+
+#: tumblr.php:348
+msgid "Enable Tumblr Post Addon"
+msgstr ""
+
+#: tumblr.php:349
+msgid "Post to Tumblr by default"
+msgstr ""
+
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr ""

tumblr/lang/ar/strings.php

@@ -7,4 +7,3 @@ function string_plural_select_ar($n){
 }}
 $a->strings['Permission denied.'] = 'الطلب مرفوض.';
 $a->strings['Save Settings'] = 'Save Settings';
-$a->strings['return to the connector page'] = 'الرجوع إلى صفحة الموصل';

tumblr/lang/cs/messages.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Aditoo, 2018\n"
 "Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
@@ -21,54 +21,71 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr ""
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:177
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
-msgstr "Nyní jste přihlášen/a k Tumblr."
+msgstr ""
 
-#: tumblr.php:178
+#: tumblr.php:299
-msgid "return to the connector page"
+msgid ""
-msgstr "návrat ke stránce konektor"
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
+#: tumblr.php:336
-msgid "Post to Tumblr"
-msgstr "Posílat na Tumblr"
-
-#: tumblr.php:225
 msgid "Post to page:"
 msgstr "Posílat na stránku:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Znovu) přihlásit k Vaší stránce Tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Nyní nejste přihlášen/a k Tumblr."
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Povolit doplněk Tumblr Post"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Ve výchozím stavu posílat příspěvky na Tumblr"
 
-#: tumblr.php:244
+#: tumblr.php:350
-msgid "Tumblr Export"
+msgid "Import the remote timeline"
 msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Posílat na Tumblr"

tumblr/lang/cs/strings.php

@@ -6,11 +6,9 @@ function string_plural_select_cs($n){
 	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 $a->strings['Permission denied.'] = 'Přístup odmítnut.';
-$a->strings['You are now authenticated to tumblr.'] = 'Nyní jste přihlášen/a k Tumblr.';
-$a->strings['return to the connector page'] = 'návrat ke stránce konektor';
-$a->strings['Post to Tumblr'] = 'Posílat na Tumblr';
 $a->strings['Post to page:'] = 'Posílat na stránku:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Znovu) přihlásit k Vaší stránce Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Nyní nejste přihlášen/a k Tumblr.';
 $a->strings['Enable Tumblr Post Addon'] = 'Povolit doplněk Tumblr Post';
 $a->strings['Post to Tumblr by default'] = 'Ve výchozím stavu posílat příspěvky na Tumblr';
+$a->strings['Post to Tumblr'] = 'Posílat na Tumblr';

tumblr/lang/de/messages.po

@@ -4,6 +4,8 @@
 # 
 # 
 # Translators:
+# Raroun, 2023
+# Raroun, 2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
 # Ulf Rompe <transifex.com@rompe.org>, 2019
@@ -11,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Raroun, 2023\n"
 "Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,54 +23,71 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: tumblr.php:177
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
-msgstr "Du bist nun auf tumblr authentifiziert."
+msgstr "Maximale Anzahl an Tags"
 
-#: tumblr.php:178
+#: tumblr.php:299
-msgid "return to the connector page"
+msgid ""
-msgstr "zurück zur Connector-Seite"
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr "Maximale Anzahl von Tags, die ein Benutzer verfolgen kann. Geben Sie 0 ein, um die Funktion zu deaktivieren."
 
-#: tumblr.php:194
+#: tumblr.php:336
-msgid "Post to Tumblr"
-msgstr "Auf Tumblr veröffentlichen"
-
-#: tumblr.php:225
 msgid "Post to page:"
 msgstr "Auf tumblr veröffentlichen"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-)Authentifizierung deiner tumblr-Seite"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Du bist gegenüber tumblr nicht authentifiziert"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Tumblr-Post-Addon aktivieren"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Standardmäßig bei Tumblr veröffentlichen"
 
-#: tumblr.php:244
+#: tumblr.php:350
-msgid "Tumblr Export"
+msgid "Import the remote timeline"
-msgstr "Tumblr Export"
+msgstr "Importiere die entfernte Timeline"
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr "Abonnierte Tags"
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr "Durch Kommata getrennte Liste von bis zu  %d Tags, die zusätzlich in die Timeline importiert werden sollen"
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr "Tumblr Import/Export"
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Auf Tumblr veröffentlichen"

tumblr/lang/de/strings.php

@@ -9,12 +9,15 @@ $a->strings['Permission denied.'] = 'Zugriff verweigert.';
 $a->strings['Save Settings'] = 'Einstellungen speichern';
 $a->strings['Consumer Key'] = 'Consumer Key';
 $a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Du bist nun auf tumblr authentifiziert.';
+$a->strings['Maximum tags'] = 'Maximale Anzahl an Tags';
-$a->strings['return to the connector page'] = 'zurück zur Connector-Seite';
+$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Maximale Anzahl von Tags, die ein Benutzer verfolgen kann. Geben Sie 0 ein, um die Funktion zu deaktivieren.';
-$a->strings['Post to Tumblr'] = 'Auf Tumblr veröffentlichen';
 $a->strings['Post to page:'] = 'Auf tumblr veröffentlichen';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Re-)Authentifizierung deiner tumblr-Seite';
 $a->strings['You are not authenticated to tumblr'] = 'Du bist gegenüber tumblr nicht authentifiziert';
 $a->strings['Enable Tumblr Post Addon'] = 'Tumblr-Post-Addon aktivieren';
 $a->strings['Post to Tumblr by default'] = 'Standardmäßig bei Tumblr veröffentlichen';
-$a->strings['Tumblr Export'] = 'Tumblr Export';
+$a->strings['Import the remote timeline'] = 'Importiere die entfernte Timeline';
+$a->strings['Subscribed tags'] = 'Abonnierte Tags';
+$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Durch Kommata getrennte Liste von bis zu  %d Tags, die zusätzlich in die Timeline importiert werden sollen';
+$a->strings['Tumblr Import/Export'] = 'Tumblr Import/Export';
+$a->strings['Post to Tumblr'] = 'Auf Tumblr veröffentlichen';

tumblr/lang/fr/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
-# Florent C., 2023
+# cracrayol, 2023-2024
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2023-2024\n"
 "Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,13 +39,13 @@ msgstr "Secret utilisateur"
 
 #: tumblr.php:299
 msgid "Maximum tags"
-msgstr "Tags maximum"
+msgstr "Étiquettes maximum"
 
 #: tumblr.php:299
 msgid ""
 "Maximum number of tags that a user can follow. Enter 0 to deactivate the "
 "feature."
-msgstr "Nombre maximum de tags qu'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité."
+msgstr "Nombre maximum d'étiquettes qu'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité."
 
 #: tumblr.php:336
 msgid "Post to page:"
@@ -73,14 +73,14 @@ msgstr "Importer le flux distant"
 
 #: tumblr.php:351
 msgid "Subscribed tags"
-msgstr "Tags suivis"
+msgstr "Étiquettes suivies"
 
 #: tumblr.php:351
 #, php-format
 msgid ""
 "Comma separated list of up to %d tags that will be imported additionally to "
 "the timeline"
-msgstr "Liste séparée par des virgules contenant jusqu'à %d tags qui seront importés dans le flux"
+msgstr "Liste contenant jusqu'à %d étiquettes, séparées par des virgules, qui seront importées dans le flux"
 
 #: tumblr.php:357
 msgid "Tumblr Import/Export"

tumblr/lang/fr/strings.php

@@ -9,15 +9,15 @@ $a->strings['Permission denied.'] = 'Permission refusée.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Consumer Key'] = 'Clé utilisateur';
 $a->strings['Consumer Secret'] = 'Secret utilisateur';
-$a->strings['Maximum tags'] = 'Tags maximum';
+$a->strings['Maximum tags'] = 'Étiquettes maximum';
-$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Nombre maximum de tags qu\'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité.';
+$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Nombre maximum d\'étiquettes qu\'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité.';
 $a->strings['Post to page:'] = 'Publier sur la page :';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(re)Authentifiez votre page Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Vous n\'êtes pas identifié sur Tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Activez l\'extension de publication Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Publier sur Tumblr par défaut';
 $a->strings['Import the remote timeline'] = 'Importer le flux distant';
-$a->strings['Subscribed tags'] = 'Tags suivis';
+$a->strings['Subscribed tags'] = 'Étiquettes suivies';
-$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Liste séparée par des virgules contenant jusqu\'à %d tags qui seront importés dans le flux';
+$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Liste contenant jusqu\'à %d étiquettes, séparées par des virgules, qui seront importées dans le flux';
 $a->strings['Tumblr Import/Export'] = 'Import/Export Tumblr';
 $a->strings['Post to Tumblr'] = 'Publier vers Tumblr';

tumblr/lang/it/messages.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
 "Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
@@ -20,54 +20,71 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: tumblr.php:177
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
-msgstr "Sei autenticato su Tumblr."
+msgstr ""
 
-#: tumblr.php:178
+#: tumblr.php:299
-msgid "return to the connector page"
+msgid ""
-msgstr "ritorna alla pagina del connettore"
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
+#: tumblr.php:336
-msgid "Post to Tumblr"
-msgstr "Invia a Tumblr"
-
-#: tumblr.php:225
 msgid "Post to page:"
 msgstr "Invia alla pagina:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Ri)Autenticati con la tua pagina Tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Non sei autenticato su Tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Abilita componente aggiuntivo di invio a Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Invia sempre a Tumblr"
 
-#: tumblr.php:244
+#: tumblr.php:350
-msgid "Tumblr Export"
+msgid "Import the remote timeline"
-msgstr "Esporta Tumblr"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Invia a Tumblr"

tumblr/lang/it/strings.php

@@ -9,12 +9,9 @@ $a->strings['Permission denied.'] = 'Permesso negato.';
 $a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Consumer Key'] = 'Consumer Key';
 $a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Sei autenticato su Tumblr.';
-$a->strings['return to the connector page'] = 'ritorna alla pagina del connettore';
-$a->strings['Post to Tumblr'] = 'Invia a Tumblr';
 $a->strings['Post to page:'] = 'Invia alla pagina:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Ri)Autenticati con la tua pagina Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Non sei autenticato su Tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Abilita componente aggiuntivo di invio a Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Invia sempre a Tumblr';
-$a->strings['Tumblr Export'] = 'Esporta Tumblr';
+$a->strings['Post to Tumblr'] = 'Invia a Tumblr';

tumblr/lang/pl/messages.po

@@ -10,64 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Klucz klienta"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Tajny klucz klienta"
 
-#: tumblr.php:177
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
-msgstr "Jesteś teraz uwierzytelniony na tumblr."
+msgstr ""
 
-#: tumblr.php:178
+#: tumblr.php:299
-msgid "return to the connector page"
+msgid ""
-msgstr "powrót do strony łącza"
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
+#: tumblr.php:336
-msgid "Post to Tumblr"
-msgstr "Opublikuj w Tumblr"
-
-#: tumblr.php:225
 msgid "Post to page:"
 msgstr "Opublikuj na stronie:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-) Uwierzytelnij swoją stronę tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Nie jesteś uwierzytelniony w tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Włącz dodatek Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Wyślij domyślnie do Tumblr"
 
-#: tumblr.php:244
+#: tumblr.php:350
-msgid "Tumblr Export"
+msgid "Import the remote timeline"
-msgstr "Eksportuj do Tumblr"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Opublikuj w Tumblr"

tumblr/lang/pl/strings.php

@@ -9,12 +9,9 @@ $a->strings['Permission denied.'] = 'Odmowa dostępu.';
 $a->strings['Save Settings'] = 'Zapisz ustawienia';
 $a->strings['Consumer Key'] = 'Klucz klienta';
 $a->strings['Consumer Secret'] = 'Tajny klucz klienta';
-$a->strings['You are now authenticated to tumblr.'] = 'Jesteś teraz uwierzytelniony na tumblr.';
-$a->strings['return to the connector page'] = 'powrót do strony łącza';
-$a->strings['Post to Tumblr'] = 'Opublikuj w Tumblr';
 $a->strings['Post to page:'] = 'Opublikuj na stronie:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Re-) Uwierzytelnij swoją stronę tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Nie jesteś uwierzytelniony w tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Włącz dodatek Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Wyślij domyślnie do Tumblr';
-$a->strings['Tumblr Export'] = 'Eksportuj do Tumblr';
+$a->strings['Post to Tumblr'] = 'Opublikuj w Tumblr';

tumblr/lang/sv/messages.po

@@ -10,64 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2022-01-16 00:55+0000\n"
+"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
+"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"Language-Team: Swedish (http://app.transifex.com/Friendica/friendica/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Åtkomst nekad."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr ""
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:177
+#: tumblr.php:299
-msgid "You are now authenticated to tumblr."
+msgid "Maximum tags"
-msgstr "Du är nu autentiserad till tumblr."
-
-#: tumblr.php:178
-msgid "return to the connector page"
 msgstr ""
 
-#: tumblr.php:194
+#: tumblr.php:299
-msgid "Post to Tumblr"
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
 msgstr ""
 
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr ""
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Du är inte autentiserad till tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr ""
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr ""
 
-#: tumblr.php:244
+#: tumblr.php:350
-msgid "Tumblr Export"
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
 msgstr ""

tumblr/lang/sv/strings.php

@@ -6,5 +6,4 @@ function string_plural_select_sv($n){
 	return intval($n != 1);
 }}
 $a->strings['Permission denied.'] = 'Åtkomst nekad.';
-$a->strings['You are now authenticated to tumblr.'] = 'Du är nu autentiserad till tumblr.';
 $a->strings['You are not authenticated to tumblr'] = 'Du är inte autentiserad till tumblr';

tumblr/tumblr.php

@@ -133,6 +133,7 @@ function tumblr_item_by_link(array &$hookData)
 	Logger::debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
 	if (!empty($result->response->posts)) {
 		$hookData['item_id'] = tumblr_process_post($result->response->posts[0], $hookData['uid'], Item::PR_FETCHED);
+		Item::incrementInbound(Protocol::TUMBLR);
 	}
 }
 
@@ -203,9 +204,9 @@ function tumblr_block(array &$hook_data)
 	$hook_data['result'] = ($result->meta->status <= 399);
 
 	if ($hook_data['result']) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
+		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
+		if ($ucid) {
-			Contact::remove($cdata['user']);
+			Contact::remove($ucid);
 		}
 	}
 }
@@ -238,9 +239,7 @@ function tumblr_get_contact_uuid(array $contact): string
  * existence of this method is checked to figure out if the addon offers a
  * module.
  */
-function tumblr_module()
+function tumblr_module() {}
-{
-}
 
 function tumblr_content()
 {
@@ -608,6 +607,15 @@ function tumblr_send_legacy(array $b)
 	$body = BBCode::removeShareInformation($b['body']);
 	$body = Post\Media::removeFromEndOfBody($body);
 
+	if (!empty($b['quote-uri-id'])) {
+		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $b['quote-uri-id']]);
+		if (!empty($quote)) {
+			if ((strpos($body, $quote['plink'] ?: $quote['uri']) === false) && (strpos($body, $quote['uri']) === false)) {
+				$body .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
+			}
+		}
+	}
+
 	if ($photo !== false) {
 		$params['type'] = 'photo';
 		$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
@@ -648,7 +656,7 @@ function tumblr_send_legacy(array $b)
 	} else {
 		$params['type']  = 'text';
 		$params['title'] = $title;
-		$params['body']  = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$params['body']  = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
 	}
 
 	if (isset($params['caption']) && (trim($title) != '')) {
@@ -747,6 +755,7 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 				$post = Post::selectFirst(['uri-id'], ['id' => $id]);
 				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $tag);
 				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
+				Item::incrementInbound(Protocol::TUMBLR);
 			}
 		}
 	}
@@ -786,6 +795,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 		Logger::debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
 
 		tumblr_process_post($post, $uid, Item::PR_NONE, $last_poll);
+		Item::incrementInbound(Protocol::TUMBLR);
 
 		DI::pConfig()->set($uid, 'tumblr', 'last_id', $last);
 	}
@@ -1158,6 +1168,7 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
 		return $fields;
 	}
+	Item::incrementInbound(Protocol::TUMBLR);
 
 	$avatar = $info->response->blog->avatar;
 	if (!empty($avatar)) {
@@ -1222,6 +1233,8 @@ function tumblr_get_blogs(int $uid): array
 		return [];
 	}
 
+	Item::incrementInbound(Protocol::TUMBLR);
+
 	$blogs = [];
 	foreach ($userinfo->response->user->blogs as $blog) {
 		$blogs[$blog->uuid] = $blog->name;
@@ -1278,10 +1291,11 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
 	if ($info->meta->status > 399) {
 		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
 		return null;
-	} else {
-		Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
 	}
 
+	Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
+	Item::incrementInbound(Protocol::TUMBLR);
+
 	$baseurl = 'https://tumblr.com';
 	$url     = $baseurl . '/' . $info->response->blog->name;
 
@@ -1346,6 +1360,7 @@ function tumblr_get(int $uid, string $url, array $parameters = []): stdClass
  */
 function tumblr_post(int $uid, string $url, array $parameters): stdClass
 {
+	Item::incrementOutbound(Protocol::TUMBLR);
 	$url = 'https://api.tumblr.com/v2/' . $url;
 
 	$curlResult = DI::httpClient()->post($url, $parameters, ['Authorization' => ['Bearer ' . tumblr_get_token($uid)]]);