Friendica/friendica-addons
Friendica/friendica-addons
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-06-07 09:54:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Tobias Diekershoff 2024-08-17 16:55:10 +02:00
commit cd95ca1a0a
48 changed files with 582 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

50
mailstream/lang/de/messages.po
View file

@ -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"
"PO-Revision-Date: 2019-02-18 15:05+0000\n"
"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
"POT-Creation-Date: 2021-11-21 19:15-0500\n"
"PO-Revision-Date: 2014-06-23 09:54+0000\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"
"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"

3
mailstream/lang/de/strings.php
View file

@ -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';

5
mailstream/mailstream.php
View file

@ -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;