add more code & doc

.editorconfig

@@ -6,24 +6,5 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+trim_trailing_whitespaces = true
 indent_style = tab
-trim_trailing_whitespace = true
-insert_final_newline = true
-quote_type = single
-max_line_length = off
-
-[*.js]
-quote_type = double
-ij_javascript_use_double_quotes = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2

.tx/config

@@ -1,399 +1,399 @@
 [main]
-host = https://api.transifex.com
+host = https://www.transifex.com
 
-[o:Friendica:p:friendica:r:addon_advancedcontentfilter_messagespo]
+[friendica.addon_advancedcontentfilter_messagespo]
 file_filter = advancedcontentfilter/lang/<lang>/messages.po
 source_file = advancedcontentfilter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blackout_messagespo]
+[friendica.addon_blackout_messagespo]
 file_filter = blackout/lang/<lang>/messages.po
 source_file = blackout/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blockem_messagespo]
+[friendica.addon_blockem_messagespo]
 file_filter = blockem/lang/<lang>/messages.po
 source_file = blockem/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blogger_messagespo]
+[friendica.addon_blogger_messagespo]
 file_filter = blogger/lang/<lang>/messages.po
 source_file = blogger/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_buffer_messagespo]
+[friendica.addon_buffer_messagespo]
 file_filter = buffer/lang/<lang>/messages.po
 source_file = buffer/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_buglink_messagespo]
+[friendica.addon_buglink_messagespo]
 file_filter = buglink/lang/<lang>/messages.po
 source_file = buglink/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_catavatar_messagespo]
+[friendica.addon_catavatar_messagespo]
 file_filter = catavatar/lang/<lang>/messages.po
 source_file = catavatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_cookienotice_messagespo]
+[friendica.addon_cookienotice_messagespo]
 file_filter = cookienotice/lang/<lang>/messages.po
 source_file = cookienotice/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_curweather_messagespo]
+[friendica.addon_curweather_messagespo]
 file_filter = curweather/lang/<lang>/messages.po
 source_file = curweather/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_diaspora_messagespo]
+[friendica.addon_diaspora_messagespo]
 file_filter = diaspora/lang/<lang>/messages.po
 source_file = diaspora/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_dwpost_messagespo]
+[friendica.addon_dwpost_messagespo]
 file_filter = dwpost/lang/<lang>/messages.po
 source_file = dwpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_forumdirectory_messagespo]
+[friendica.addon_forumdirectory_messagespo]
 file_filter = forumdirectory/lang/<lang>/messages.po
 source_file = forumdirectory/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_fromapp_messagespo]
+[friendica.addon_fromapp_messagespo]
 file_filter = fromapp/lang/<lang>/messages.po
 source_file = fromapp/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_fromgplus_messagespo]
+[friendica.addon_fromgplus_messagespo]
 file_filter = fromgplus/lang/<lang>/messages.po
 source_file = fromgplus/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_geonames_messagespo]
+[friendica.addon_geonames_messagespo]
 file_filter = geonames/lang/<lang>/messages.po
 source_file = geonames/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_gnot_messagespo]
+[friendica.addon_gnot_messagespo]
 file_filter = gnot/lang/<lang>/messages.po
 source_file = gnot/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_gravatar_messagespo]
+[friendica.addon_gravatar_messagespo]
 file_filter = gravatar/lang/<lang>/messages.po
 source_file = gravatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_group_text_messagespo]
+[friendica.addon_group_text_messagespo]
 file_filter = group_text/lang/<lang>/messages.po
 source_file = group_text/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ifttt_messagespo]
+[friendica.addon_ifttt_messagespo]
 file_filter = ifttt/lang/<lang>/messages.po
 source_file = ifttt/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ijpost_messagespo]
+[friendica.addon_ijpost_messagespo]
 file_filter = ijpost/lang/<lang>/messages.po
 source_file = ijpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_impressum_messagespo]
+[friendica.addon_impressum_messagespo]
 file_filter = impressum/lang/<lang>/messages.po
 source_file = impressum/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_infiniteimprobabilitydrive_messagespo]
+[friendica.addon_infiniteimprobabilitydrive_messagespo]
 file_filter = infiniteimprobabilitydrive/lang/<lang>/messages.po
 source_file = infiniteimprobabilitydrive/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_irc_messagespo]
+[friendica.addon_irc_messagespo]
 file_filter = irc/lang/<lang>/messages.po
 source_file = irc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_jappixmini_messagespo]
+[friendica.addon_jappixmini_messagespo]
 file_filter = jappixmini/lang/<lang>/messages.po
 source_file = jappixmini/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_js_upload_messagespo]
+[friendica.addon_js_upload_messagespo]
 file_filter = js_upload/lang/<lang>/messages.po
 source_file = js_upload/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_krynn_messagespo]
+[friendica.addon_krynn_messagespo]
 file_filter = krynn/lang/<lang>/messages.po
 source_file = krynn/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_langfilter_messagespo]
+[friendica.addon_langfilter_messagespo]
 file_filter = langfilter/lang/<lang>/messages.po
 source_file = langfilter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_libertree_messagespo]
+[friendica.addon_libertree_messagespo]
 file_filter = libertree/lang/<lang>/messages.po
 source_file = libertree/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_libravatar_messagespo]
+[friendica.addon_libravatar_messagespo]
 file_filter = libravatar/lang/<lang>/messages.po
 source_file = libravatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ljpost_messagespo]
+[friendica.addon_ljpost_messagespo]
 file_filter = ljpost/lang/<lang>/messages.po
 source_file = ljpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_mailstream_messagespo]
+[friendica.addon_mailstream_messagespo]
 file_filter = mailstream/lang/<lang>/messages.po
 source_file = mailstream/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_mathjax_messagespo]
+[friendica.addon_mathjax_messagespo]
 file_filter = mathjax/lang/<lang>/messages.po
 source_file = mathjax/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_membersince_messagespo]
+[friendica.addon_membersince_messagespo]
 file_filter = membersince/lang/<lang>/messages.po
 source_file = membersince/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_morechoice_messagespo]
+[friendica.addon_morechoice_messagespo]
 file_filter = morechoice/lang/<lang>/messages.po
 source_file = morechoice/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_morepokes_messagespo]
+[friendica.addon_morepokes_messagespo]
 file_filter = morepokes/lang/<lang>/messages.po
 source_file = morepokes/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_newmemberwidget_messagespo]
+[friendica.addon_newmemberwidget_messagespo]
 file_filter = newmemberwidget/lang/<lang>/messages.po
 source_file = newmemberwidget/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_notifyall_messagespo]
+[friendica.addon_notifyall_messagespo]
 file_filter = notifyall/lang/<lang>/messages.po
 source_file = notifyall/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_notimeline_messagespo]
+[friendica.addon_notimeline_messagespo]
 file_filter = notimeline/lang/<lang>/messages.po
 source_file = notimeline/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_nsfw_messagespo]
+[friendica.addon_nsfw_messagespo]
 file_filter = nsfw/lang/<lang>/messages.po
 source_file = nsfw/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_numfriends_messagespo]
+[friendica.addon_numfriends_messagespo]
 file_filter = numfriends/lang/<lang>/messages.po
 source_file = numfriends/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_openstreetmap_messagespo]
+[friendica.addon_openstreetmap_messagespo]
 file_filter = openstreetmap/lang/<lang>/messages.po
 source_file = openstreetmap/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_pageheader_messagespo]
+[friendica.addon_pageheader_messagespo]
 file_filter = pageheader/lang/<lang>/messages.po
 source_file = pageheader/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_piwik_messagespo]
+[friendica.addon_piwik_messagespo]
 file_filter = piwik/lang/<lang>/messages.po
 source_file = piwik/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_planets_messagespo]
+[friendica.addon_planets_messagespo]
 file_filter = planets/lang/<lang>/messages.po
 source_file = planets/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_public_server_messagespo]
+[friendica.addon_public_server_messagespo]
 file_filter = public_server/lang/<lang>/messages.po
 source_file = public_server/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_pumpio_messagespo]
+[friendica.addon_pumpio_messagespo]
 file_filter = pumpio/lang/<lang>/messages.po
 source_file = pumpio/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_qcomment_messagespo]
+[friendica.addon_qcomment_messagespo]
 file_filter = qcomment/lang/<lang>/messages.po
 source_file = qcomment/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_randplace_messagespo]
+[friendica.addon_randplace_messagespo]
 file_filter = randplace/lang/<lang>/messages.po
 source_file = randplace/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_remote_permissions_messagespo]
+[friendica.addon_remote_permissions_messagespo]
 file_filter = remote_permissions/lang/<lang>/messages.po
 source_file = remote_permissions/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_rendertime_messagespo]
+[friendica.addon_rendertime_messagespo]
 file_filter = rendertime/lang/<lang>/messages.po
 source_file = rendertime/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_securemail_messagespo]
+[friendica.addon_securemail_messagespo]
 file_filter = securemail/lang/<lang>/messages.po
 source_file = securemail/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_showmore_messagespo]
+[friendica.addon_showmore_messagespo]
 file_filter = showmore/lang/<lang>/messages.po
 source_file = showmore/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_smileybutton_messagespo]
+[friendica.addon_smileybutton_messagespo]
 file_filter = smileybutton/lang/<lang>/messages.po
 source_file = smileybutton/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_startpage_messagespo]
+[friendica.addon_startpage_messagespo]
 file_filter = startpage/lang/<lang>/messages.po
 source_file = startpage/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_statusnet_messagespo]
+[friendica.addon_statusnet_messagespo]
 file_filter = statusnet/lang/<lang>/messages.po
 source_file = statusnet/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_superblock_messagespo]
+[friendica.addon_superblock_messagespo]
 file_filter = superblock/lang/<lang>/messages.po
 source_file = superblock/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_testdrive_messagespo]
+[friendica.addon_testdrive_messagespo]
 file_filter = testdrive/lang/<lang>/messages.po
 source_file = testdrive/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_tictac_messagespo]
+[friendica.addon_tictac_messagespo]
 file_filter = tictac/lang/<lang>/messages.po
 source_file = tictac/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_tumblr_messagespo]
+[friendica.addon_tumblr_messagespo]
 file_filter = tumblr/lang/<lang>/messages.po
 source_file = tumblr/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_twitter_messagespo]
+[friendica.addon_twitter_messagespo]
 file_filter = twitter/lang/<lang>/messages.po
 source_file = twitter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_viewsrc_messagespo]
+[friendica.addon_viewsrc_messagespo]
 file_filter = viewsrc/lang/<lang>/messages.po
 source_file = viewsrc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_webrtc_messagespo]
+[friendica.addon_webrtc_messagespo]
 file_filter = webrtc/lang/<lang>/messages.po
 source_file = webrtc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_widgets_messagespo]
+[friendica.addon_widgets_messagespo]
 file_filter = widgets/lang/<lang>/messages.po
 source_file = widgets/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_windowsphonepush_messagespo]
+[friendica.addon_windowsphonepush_messagespo]
 file_filter = windowsphonepush/lang/<lang>/messages.po
 source_file = windowsphonepush/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_wppost_messagespo]
+[friendica.addon_wppost_messagespo]
 file_filter = wppost/lang/<lang>/messages.po
 source_file = wppost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_xmpp_messagespo]
+[friendica.addon_xmpp_messagespo]
 file_filter = xmpp/lang/<lang>/messages.po
 source_file = xmpp/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 

advancedcontentfilter/lang/de/messages.po

@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\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"
 "Content-Transfer-Encoding: 8bit\n"

advancedcontentfilter/lang/it/messages.po

@@ -3,63 +3,60 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 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: 2018-04-17 04:04+0200\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtrato dalla regola: %s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Filtro Avanzato Contenuti"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Torna alle impostazioni del componente aggiuntivo"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Aggiungi una regola"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Aiuto"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Aggiungi e gestisci le tue regole personali di filtro contenuti in questa "
 "schermata. Le regole hanno un nome e un'espressione arbitraria che sarà "
 "confrontata con i dati del messaggio. Per un elenco completo delle "
-"operazioni e variabili disponibili, controlla la pagina di aiuto."
+"operazioni disponibili, controlla la <a "
+"href=\"advancedcontentfilter/help\">pagina di aiuto</a>."
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Le tue regole"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -67,106 +64,110 @@ msgstr ""
 "Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui "
 "sopra a fianco al titolo."
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Diabilita questa regola"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Abilita questa regola"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Modifica questa regola"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Modifica la regola"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Salva questa regola"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Elimina questa regola"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Regola"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Chiudi"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Aggiungi nuova regola"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nome Regola"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Espressione Regola"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Esempi:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Annulla"
 
-#: advancedcontentfilter.php:295
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-msgid "This addon requires this node having at least one post"
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-msgstr ""
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
 msgid "You must be logged in to use this method"
 msgstr "Devi essere autenticato per usare questo metodo"
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Token di sicurezza invalido, aggiorna la pagina."
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Il nome e l'espressione della regola sono richiesti."
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Regola aggiunta con successo"
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "La regola non esiste o non ti appartiene."
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Regola aggiornata con successo"
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Regola eliminata con successo"
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argomento mancante: guid."
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Messaggio con guid %s sconosciuto"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Metodo non trovato"

advancedcontentfilter/lang/it/strings.php

@@ -3,14 +3,14 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
 $a->strings['Filtered by rule: %s'] = 'Filtrato dalla regola: %s';
 $a->strings['Advanced Content Filter'] = 'Filtro Avanzato Contenuti';
 $a->strings['Back to Addon Settings'] = 'Torna alle impostazioni del componente aggiuntivo';
 $a->strings['Add a Rule'] = 'Aggiungi una regola';
 $a->strings['Help'] = 'Aiuto';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un\'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni e variabili disponibili, controlla la pagina di aiuto.';
+$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = 'Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un\'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni disponibili, controlla la <a href="advancedcontentfilter/help">pagina di aiuto</a>.';
 $a->strings['Your rules'] = 'Le tue regole';
 $a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui sopra a fianco al titolo.';
 $a->strings['Disabled'] = 'Disabilitato';
@@ -26,6 +26,7 @@ $a->strings['Close'] = 'Chiudi';
 $a->strings['Add new rule'] = 'Aggiungi nuova regola';
 $a->strings['Rule Name'] = 'Nome Regola';
 $a->strings['Rule Expression'] = 'Espressione Regola';
+$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Esempi:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
 $a->strings['Cancel'] = 'Annulla';
 $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.';

birdavatar/birdavatar.php

@@ -69,7 +69,7 @@ function birdavatar_addon_settings_post(&$s)
 	}
 
 	if (!empty($_POST['birdavatar-usebird'])) {
-		$url = DI::baseUrl() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
+		$url = DI::baseUrl()->get() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
 
 		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
 		if (!DBA::isResult($self)) {
@@ -120,9 +120,9 @@ function birdavatar_lookup(array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
-		$url = DI::baseUrl() . '/birdavatar/' . $user['uid'];
+		$url = DI::baseUrl()->get() . '/birdavatar/' . $user['uid'];
 	} else {
-		$url = DI::baseUrl() . '/birdavatar/' . md5(trim(strtolower($b['email'])));
+		$url = DI::baseUrl()->get() . '/birdavatar/' . md5(trim(strtolower($b['email'])));
 	}
 
 	switch ($b['size']) {

blackout/lang/de/messages.po

@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"PO-Revision-Date: 2021-05-23 19:26+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
+"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

blockbot/blockbot.php

@@ -8,7 +8,9 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\System;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
@@ -50,15 +52,12 @@ function blockbot_init_1()
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
 
 	// List of "good" crawlers
-	$good_agents = [
+	$good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
 		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/'
+		'PTST/', 'Zabbix', 'Poduptime/'];
-	];
 
 	// List of known crawlers.
-	$agents = [
+	$agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
 		'Diffbot/', 'Twitterbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
 		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
 		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
@@ -80,8 +79,7 @@ function blockbot_init_1()
 		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
 		'SkypeUriPreview Preview/', 'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;',
 		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/'
+		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/'];
-	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
 		$agents = array_merge($agents, $good_agents);
@@ -116,8 +114,7 @@ function blockbot_init_1()
 	}
 
 	// List of false positives' strings of known "good" agents.
-	$agents = [
+	$agents = ['curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
-		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
 		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
 		'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
 		'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma',
@@ -125,8 +122,7 @@ function blockbot_init_1()
 		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
 		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
 		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding'
+		'Slackbot-LinkExpanding'];
-	];
 
 	if (DI::config()->get('blockbot', 'good_crawlers')) {
 		$agents = array_merge($agents, $good_agents);
@@ -134,11 +130,11 @@ function blockbot_init_1()
 
 	foreach ($agents as $agent) {
 		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			logger::info('False positive', $logdata);
+			logger::notice('False positive', $logdata);
 			return;
 		}
 	}
 
-	logger::notice('Blocked bot', $logdata);
+	logger::info('Blocked bot', $logdata);
 	throw new ForbiddenException('Bots are not allowed');
 }

blockem/blockem.php

@@ -125,7 +125,7 @@ function blockem_prepare_body_content_filter(array &$hook_data)
 function blockem_display_item(array &$b = null)
 {
 	if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) {
-		$b['output']['thumb'] = DI::baseUrl() . "/images/person-80.jpg";
+		$b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg";
 	}
 }
 

buglink/lang/cs/messages.po

@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 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: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"PO-Revision-Date: 2014-07-07 18:27+0000\n"
-"Last-Translator: michal_s <msupler@gmail.com>, 2014\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
 msgstr "Nahlásit chybu"

buglink/lang/cs/strings.php

@@ -3,6 +3,6 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 $a->strings['Report Bug'] = 'Nahlásit chybu';

buglink/lang/de/messages.po

@@ -10,16 +10,16 @@ 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: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"PO-Revision-Date: 2019-11-10 20:12+0000\n"
-"Last-Translator: René Wagner <apollo@rw-net.de>, 2019\n"
+"Last-Translator: René Wagner <apollo@rw-net.de>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
 msgstr "Fehler melden"

catavatar/catavatar.php

@@ -70,7 +70,7 @@ function catavatar_addon_settings_post(&$s)
 	}
 
 	if (!empty($_POST['catavatar-usecat'])) {
-		$url = DI::baseUrl() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
+		$url = DI::baseUrl()->get() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
 
 		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
 		if (!DBA::isResult($self)) {
@@ -121,9 +121,9 @@ function catavatar_lookup(array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
-		$url = DI::baseUrl() . '/catavatar/' . $user['uid'];
+		$url = DI::baseUrl()->get() . '/catavatar/' . $user['uid'];
 	} else {
-		$url = DI::baseUrl() . '/catavatar/' . md5(trim(strtolower($b['email'])));
+		$url = DI::baseUrl()->get() . '/catavatar/' . md5(trim(strtolower($b['email'])));
 	}
 
 	switch($b['size']) {

catavatar/lang/de/messages.po

@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\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"
 "Content-Transfer-Encoding: 8bit\n"

cookienotice/lang/de/messages.po

@@ -6,7 +6,7 @@
 # Translators:
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019
 # Ulf Rompe <transifex.com@rompe.org>, 2019
-# foss <oss@disr.it>, 2020
+# foss <foss@openmailbox.org>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -15,8 +15,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: foss <oss@disr.it>, 2020\n"
+"Last-Translator: foss <foss@openmailbox.org>, 2020\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\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"
 "Content-Transfer-Encoding: 8bit\n"

curweather/curweather.php

@@ -92,7 +92,7 @@ function curweather_network_mod_init(string &$body)
 		return;
 	}
 
-	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
 
 	// $rpt value is needed for location
 	// $lang will be taken from the browser session to honour user settings

curweather/lang/cs/messages.po

@@ -11,116 +11,124 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"PO-Revision-Date: 2018-07-05 17:03+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Aditoo\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: curweather.php:47
+#: curweather.php:31
-msgid "Error fetching weather data. Error was: "
+msgid "Error fetching weather data.\\nError was: "
-msgstr ""
+msgstr "Chyba při získávání dat o počasí.\\nChyba:"
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Aktuální počasí"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Relativní vlhkost vzduchu"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Tlak"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Vítr"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Naposledy aktualizováno"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Data podle"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Ukázat na mapě"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Při získávání dat o počasí nastala chyba. Podívejte se ale"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "na OpenWeatherMap"
 
-#: curweather.php:178
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Nastavení pro Aktuální počasí aktualizováno."
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "Žádné APPID nebylo nalezeno, prosím kontaktujte svého administrátora pro získání APPID."
 
-#: curweather.php:188
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Nastavení"
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Zadejte buď název místa, kde se nacházíte, nebo PSČ."
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Vaše poloha"
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifikátor vaší polohy (název nebo PSČ), např. <em>Praha,CZ</em> nebo <em>11000,CZ</em>."
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr "Jednotky"
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "vyberte, jestli by se teplota měla zobrazovat v &deg;C či &deg;F"
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Ukázat data o počasí"
 
-#: curweather.php:196
+#: curweather.php:190
-msgid "Current Weather Settings"
+msgid "Curweather settings saved."
-msgstr ""
+msgstr "Nastavení Curwather uložena."
 
-#: curweather.php:227
+#: curweather.php:201
-msgid "Save Settings"
-msgstr "Uložit nastavení"
-
-#: curweather.php:230
 msgid "Caching Interval"
-msgstr "Interval mezipaměti"
+msgstr "Ukládám interval do mezipaměti"
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Na jak dlouho by vaše data o počasí měla být uložena v mezipaměti? Vyberte podle typu vašeho účtu na OpenWeatherMap."
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr "žádná mezipaměť"
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr "minut"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Vaše APPID"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Váš API klíč poskytnutý OpenWetherMap"

curweather/lang/cs/strings.php

@@ -5,6 +5,7 @@ function string_plural_select_cs($n){
 	$n = intval($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['Error fetching weather data.\nError was: '] = 'Chyba při získávání dat o počasí.\nChyba:';
 $a->strings['Current Weather'] = 'Aktuální počasí';
 $a->strings['Relative Humidity'] = 'Relativní vlhkost vzduchu';
 $a->strings['Pressure'] = 'Tlak';
@@ -14,15 +15,18 @@ $a->strings['Data by'] = 'Data podle';
 $a->strings['Show on map'] = 'Ukázat na mapě';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'Při získávání dat o počasí nastala chyba. Podívejte se ale';
 $a->strings['at OpenWeatherMap'] = 'na OpenWeatherMap';
+$a->strings['Current Weather settings updated.'] = 'Nastavení pro Aktuální počasí aktualizováno.';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'Žádné APPID nebylo nalezeno, prosím kontaktujte svého administrátora pro získání APPID.';
+$a->strings['Save Settings'] = 'Uložit nastavení';
+$a->strings['Settings'] = 'Nastavení';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Zadejte buď název místa, kde se nacházíte, nebo PSČ.';
 $a->strings['Your Location'] = 'Vaše poloha';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identifikátor vaší polohy (název nebo PSČ), např. <em>Praha,CZ</em> nebo <em>11000,CZ</em>.';
 $a->strings['Units'] = 'Jednotky';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'vyberte, jestli by se teplota měla zobrazovat v &deg;C či &deg;F';
 $a->strings['Show weather data'] = 'Ukázat data o počasí';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+$a->strings['Curweather settings saved.'] = 'Nastavení Curwather uložena.';
-$a->strings['Caching Interval'] = 'Interval mezipaměti';
+$a->strings['Caching Interval'] = 'Ukládám interval do mezipaměti';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Na jak dlouho by vaše data o počasí měla být uložena v mezipaměti? Vyberte podle typu vašeho účtu na OpenWeatherMap.';
 $a->strings['no cache'] = 'žádná mezipaměť';
 $a->strings['minutes'] = 'minut';

curweather/lang/de/messages.po

@@ -15,9 +15,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"PO-Revision-Date: 2022-01-22 17:28+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016,2021-2022\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

diaspora/diaspora.php

@@ -186,7 +186,7 @@ function diaspora_post_local(array &$b)
 
 function diaspora_send(array &$b)
 {
-	$hostname = DI::baseUrl()->getHost();
+	$hostname = DI::baseUrl()->getHostname();
 
 	Logger::notice('diaspora_send: invoked');
 

diaspora/lang/de/messages.po

@@ -4,7 +4,7 @@
 # 
 # 
 # Translators:
-# foss <oss@disr.it>, 2020
+# foss <foss@openmailbox.org>, 2020
 # Till Mohr <tmtrfx@till-mohr.de>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2020
@@ -14,9 +14,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
+"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

dwpost/lang/cs/messages.po

@@ -10,36 +10,40 @@ 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: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"PO-Revision-Date: 2018-06-14 10:13+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Aditoo\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
-msgstr "Odeslat na Dreamwidth"
+msgstr "Poslat na Dreamwidth"
 
-#: dwpost.php:63
+#: dwpost.php:70
-msgid "Enable Dreamwidth Post Addon"
+msgid "Dreamwidth Post Settings"
-msgstr ""
+msgstr "Nastavení Dreamwidth Post"
 
-#: dwpost.php:64
+#: dwpost.php:72
-msgid "Dreamwidth username"
+msgid "Enable dreamwidth Post Addon"
-msgstr ""
+msgstr "Povolit doplněk Dreamwidth Post"
 
-#: dwpost.php:65
+#: dwpost.php:77
-msgid "Dreamwidth password"
+msgid "dreamwidth username"
-msgstr ""
+msgstr "dreamwidth uživatelské jméno"
 
-#: dwpost.php:66
+#: dwpost.php:82
-msgid "Post to Dreamwidth by default"
+msgid "dreamwidth password"
-msgstr ""
+msgstr "dreamwidth heslo"
 
-#: dwpost.php:71
+#: dwpost.php:87
-msgid "Dreamwidth Export"
+msgid "Post to dreamwidth by default"
-msgstr ""
+msgstr "Ve výchozím stavu posílat na dreamwidth"
+
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Odeslat"

dwpost/lang/cs/strings.php

@@ -5,4 +5,10 @@ function string_plural_select_cs($n){
 	$n = intval($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['Post to Dreamwidth'] = 'Odeslat na Dreamwidth';
+$a->strings['Post to Dreamwidth'] = 'Poslat na Dreamwidth';
+$a->strings['Dreamwidth Post Settings'] = 'Nastavení Dreamwidth Post';
+$a->strings['Enable dreamwidth Post Addon'] = 'Povolit doplněk Dreamwidth Post';
+$a->strings['dreamwidth username'] = 'dreamwidth uživatelské jméno';
+$a->strings['dreamwidth password'] = 'dreamwidth heslo';
+$a->strings['Post to dreamwidth by default'] = 'Ve výchozím stavu posílat na dreamwidth';
+$a->strings['Submit'] = 'Odeslat';

dwpost/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"PO-Revision-Date: 2022-01-22 17:33+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

forumdirectory/lang/de/messages.po

@@ -11,9 +11,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
+"PO-Revision-Date: 2021-02-06 16:55+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

fromapp/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
+"PO-Revision-Date: 2021-12-22 15:15+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

geonames/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
+"PO-Revision-Date: 2021-12-22 17:23+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

gnot/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
+"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

gravatar/lang/cs/messages.po

@@ -4,69 +4,72 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
+# Michal Šupler <msupler@gmail.com>, 2014-2015
-# michal_s <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"PO-Revision-Date: 2015-02-11 19:41+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "generický profilový obrázek"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "náhodný geometrický vzor"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "tvář příšery"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "počítačově generovaná tvář"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr "tvář v retro arkádovém stylu"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Informace"
 
-#: gravatar.php:96
+#: gravatar.php:89
 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 "Doplněk Libravatar je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno."
+msgstr "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno."
 
-#: gravatar.php:102
+#: gravatar.php:95
-msgid "Save Settings"
+msgid "Submit"
-msgstr ""
+msgstr "Odeslat"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
-msgstr "Výchozí avatarový obrázek"
+msgstr "Defaultní obrázek avataru"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Nastavte výchozí avatarový obrázek, pokud ho již nemáte na Gravataru. Více viz. soubor README."
+msgstr "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README."
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Hodnocení obrázků"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Zadejte příslušné ohodnocení avataru pro vaši stránku. Viz README."
+msgstr "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Nastavení Gravatar aktualizováno."

gravatar/lang/cs/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 $a->strings['generic profile image'] = 'generický profilový obrázek';
 $a->strings['random geometric pattern'] = 'náhodný geometrický vzor';
@@ -11,8 +11,10 @@ $a->strings['monster face'] = 'tvář příšery';
 $a->strings['computer generated face'] = 'počítačově generovaná tvář';
 $a->strings['retro arcade style face'] = 'tvář v retro arkádovém stylu';
 $a->strings['Information'] = 'Informace';
-$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.'] = 'Doplněk Libravatar je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno.';
+$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.'] = 'Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.';
-$a->strings['Default avatar image'] = 'Výchozí avatarový obrázek';
+$a->strings['Submit'] = 'Odeslat';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Nastavte výchozí avatarový obrázek, pokud ho již nemáte na Gravataru. Více viz. soubor README.';
+$a->strings['Default avatar image'] = 'Defaultní obrázek avataru';
+$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README.';
 $a->strings['Rating of images'] = 'Hodnocení obrázků';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Zadejte příslušné ohodnocení avataru pro vaši stránku. Viz README.';
+$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README.';
+$a->strings['Gravatar settings updated.'] = 'Nastavení Gravatar aktualizováno.';

gravatar/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
+"PO-Revision-Date: 2021-02-06 17:01+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

group_text/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

ifttt/ifttt.php

@@ -55,7 +55,7 @@ function ifttt_settings(array &$data)
 			'new_photo_upload_body'   => DI::l10n()->t('Body for "new photo upload"'),
 			'new_link_post_body'      => DI::l10n()->t('Body for "new link post"'),
 		],
-		'$url'                     => DI::baseUrl() . '/ifttt/' . DI::userSession()->getLocalUserNickname(),
+		'$url'                     => DI::baseUrl()->get() . '/ifttt/' . DI::userSession()->getLocalUserNickname(),
 		'$new_status_message_body' => 'key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>',
 		'$new_photo_upload_body'   => 'key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',
 		'$new_link_post_body'      => 'key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',

ifttt/lang/de/messages.po

@@ -16,7 +16,7 @@ msgstr ""
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
 "PO-Revision-Date: 2017-11-27 10:37+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\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"
 "Content-Transfer-Encoding: 8bit\n"

ijpost/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
+"PO-Revision-Date: 2021-12-22 16:19+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

impressum/impressum.php

@@ -48,7 +48,7 @@ function impressum_footer(string &$body)
 	$text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'footer_text')));
 
 	if ($text != '') {
-		DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl() . '/addon/impressum/impressum.css" media="all" />';
+		DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/impressum/impressum.css" media="all" />';
 		$body .= '<div class="clear"></div>';
 		$body .= '<div id="impressum_footer">' . $text . '</div>';
 	}

impressum/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
+"PO-Revision-Date: 2021-03-29 05:29+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

infiniteimprobabilitydrive/infiniteimprobabilitydrive.php

@@ -30,12 +30,13 @@ function infiniteimprobabilitydrive_module() {}
 
 function infiniteimprobabilitydrive_content()
 {
+	$baseurl = DI::baseUrl()->get() . '/addon/infiniteimprobabilitydrive';
 	$o = '';
 
-	DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
+	DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
 
 
-	$baseurl = (string)DI::baseUrl();
+	$baseurl = DI::baseUrl()->get();
 
 	$o .= <<< EOT
 

infiniteimprobabilitydrive/lang/cs/messages.po

@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 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: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2014-07-07 19:12+0000\n"
-"Last-Translator: michal_s <msupler@gmail.com>, 2014\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Infinite Improbability Drive"

infiniteimprobabilitydrive/lang/cs/strings.php

@@ -3,6 +3,6 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 $a->strings['Infinite Improbability Drive'] = 'Infinite Improbability Drive';

infiniteimprobabilitydrive/lang/de/messages.po

@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 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: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2014-07-06 12:15+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Infinite Improbability Drive"

infiniteimprobabilitydrive/lang/it/messages.po

@@ -9,16 +9,16 @@ 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: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2014\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Motore ad Improbabilità Infinita"

infiniteimprobabilitydrive/lang/it/strings.php

@@ -3,6 +3,6 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
 $a->strings['Infinite Improbability Drive'] = 'Motore ad Improbabilità Infinita';

irc/irc.php

@@ -73,7 +73,7 @@ function irc_module() {}
 
 function irc_content()
 {
-	$baseurl = DI::baseUrl() . '/addon/irc';
+	$baseurl = DI::baseUrl()->get() . '/addon/irc';
 	$o = '';
 
 	/* set the list of popular channels */
@@ -95,7 +95,7 @@ function irc_content()
 
 	DI::page()['aside'] .= '<div class="widget"><h3>' . DI::l10n()->t('Popular Channels') . '</h3><ul>';
 	foreach ($chats as $chat) {
-		DI::page()['aside'] .= '<li><a href="' . DI::baseUrl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+		DI::page()['aside'] .= '<li><a href="' . DI::baseUrl()->get() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
 	}
 	DI::page()['aside'] .= '</ul></div>';
 

irc/lang/cs/messages.po

@@ -11,55 +11,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2018-06-14 14:36+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Aditoo\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Nastavení IRC"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
-msgstr "Zde můžete změnit systémová nastavení pro kanály pro automatické spojení a přístup přes postranní lištu. Mějte na paměti, že změny, které zde provedete, ovlivní výběr kanálů pouze, pokud jste přihlášen/a."
+msgstr ""
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr "Kanál(y) pro automatické připojení (oddělené čárkami)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr "Seznam kanálů, které budou při spuštění aplikace automaticky připojeny."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Populární kanály (oddělené čárkami)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr "Seznam populárních kanálů, bude zobrazen na straně a bude obsahovat odkazy pro snadné připojení."
 
-#: irc.php:39
+#: irc.php:57 irc.php:128
-msgid "IRC Settings"
+msgid "IRC settings saved."
-msgstr "Nastavení IRC"
+msgstr "IRC Nastavení uloženo."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr "IRC Místnost"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Populární kanály"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Uložit nastavení"

irc/lang/cs/strings.php

@@ -5,12 +5,12 @@ function string_plural_select_cs($n){
 	$n = intval($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['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Zde můžete změnit systémová nastavení pro kanály pro automatické spojení a přístup přes postranní lištu. Mějte na paměti, že změny, které zde provedete, ovlivní výběr kanálů pouze, pokud jste přihlášen/a.';
+$a->strings['IRC Settings'] = 'Nastavení IRC';
+$a->strings['Save Settings'] = 'Uložit nastavení';
 $a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanál(y) pro automatické připojení (oddělené čárkami)';
 $a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Seznam kanálů, které budou při spuštění aplikace automaticky připojeny.';
 $a->strings['Popular Channels (comma separated)'] = 'Populární kanály (oddělené čárkami)';
 $a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Seznam populárních kanálů, bude zobrazen na straně a bude obsahovat odkazy pro snadné připojení.';
-$a->strings['IRC Settings'] = 'Nastavení IRC';
+$a->strings['IRC settings saved.'] = 'IRC Nastavení uloženo.';
 $a->strings['IRC Chatroom'] = 'IRC Místnost';
 $a->strings['Popular Channels'] = 'Populární kanály';
-$a->strings['Save Settings'] = 'Uložit nastavení';

irc/lang/de/messages.po

@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2021-02-01 18:19+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

irc/lang/it/messages.po

@@ -10,55 +10,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
+"PO-Revision-Date: 2020-09-17 11:40+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Impostazioni IRC"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
 msgstr "Qui puoi modificare le impostazioni globali di sistema per i canali a cui accedere automaticamente attraverso la barra laterale. Nota che le modifiche che effetti qui hanno effetto sulla selezione di canali solo se sei loggato."
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr "Canale(i) a cui autocollegarsi (separati da virgola)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr "Lista di canali che a cui connettersi automaticamente quando l'app è avviata."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Canali popolari (separati da virgola)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr "Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l'adesione."
 
-#: irc.php:39
+#: irc.php:57 irc.php:128
-msgid "IRC Settings"
+msgid "IRC settings saved."
-msgstr "Impostazioni IRC"
+msgstr "Impostazioni IRC salvate."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr "Stanza IRC"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Canali Popolari"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Salva Impostazioni"

irc/lang/it/strings.php

@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
+$a->strings['IRC Settings'] = 'Impostazioni IRC';
 $a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Qui puoi modificare le impostazioni globali di sistema per i canali a cui accedere automaticamente attraverso la barra laterale. Nota che le modifiche che effetti qui hanno effetto sulla selezione di canali solo se sei loggato.';
+$a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Channel(s) to auto connect (comma separated)'] = 'Canale(i) a cui autocollegarsi (separati da virgola)';
 $a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lista di canali che a cui connettersi automaticamente quando l\'app è avviata.';
 $a->strings['Popular Channels (comma separated)'] = 'Canali popolari (separati da virgola)';
 $a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l\'adesione.';
-$a->strings['IRC Settings'] = 'Impostazioni IRC';
+$a->strings['IRC settings saved.'] = 'Impostazioni IRC salvate.';
 $a->strings['IRC Chatroom'] = 'Stanza IRC';
 $a->strings['Popular Channels'] = 'Canali Popolari';
-$a->strings['Save Settings'] = 'Salva Impostazioni';

js_upload/lang/cs/messages.po

@@ -4,56 +4,53 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
+# Michal Šupler <msupler@gmail.com>, 2014
-# michal_s <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
+"PO-Revision-Date: 2014-07-07 19:13+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js_upload.php:34
+#: js_upload.php:43
-msgid "Select files for upload"
+msgid "Upload a file"
-msgstr ""
+msgstr "Nahrát soubor"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
-msgstr "Přetáhněte sem soubory k nahrání"
+msgstr "Přeneste sem soubory k nahrání"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Neúspěch"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "Žádné soubory nebyly nahrány."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "Nahraný soubor je prázdný"
 
-#: js_upload.php:233
+#: js_upload.php:321
-#, php-format
+msgid "Image exceeds size limit of "
-msgid "Image exceeds size limit of %s"
+msgstr "Velikost obrázku překračuje limit velikosti"
-msgstr ""
 
-#: js_upload.php:245
+#: js_upload.php:332
-#, php-format
+msgid "File has an invalid extension, it should be one of "
-msgid "File has an invalid extension, it should be one of %s."
+msgstr "Soubor má neplatnou příponu, ta by měla být jednou z"
-msgstr ""
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"

js_upload/lang/cs/strings.php

@@ -3,11 +3,14 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
-$a->strings['Drop files here to upload'] = 'Přetáhněte sem soubory k nahrání';
+$a->strings['Upload a file'] = 'Nahrát soubor';
+$a->strings['Drop files here to upload'] = 'Přeneste sem soubory k nahrání';
 $a->strings['Cancel'] = 'Zrušit';
 $a->strings['Failed'] = 'Neúspěch';
 $a->strings['No files were uploaded.'] = 'Žádné soubory nebyly nahrány.';
 $a->strings['Uploaded file is empty'] = 'Nahraný soubor je prázdný';
+$a->strings['Image exceeds size limit of '] = 'Velikost obrázku překračuje limit velikosti';
+$a->strings['File has an invalid extension, it should be one of '] = 'Soubor má neplatnou příponu, ta by měla být jednou z';
 $a->strings['Upload was cancelled, or server error encountered'] = 'Nahrávání bylo zrušeno nebo došlo k chybě na serveru';

js_upload/lang/de/messages.po

@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
+"PO-Revision-Date: 2021-12-05 08:34+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

js_upload/lang/es/messages.po

@@ -5,55 +5,52 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
+"PO-Revision-Date: 2016-11-17 18:59+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
+"Last-Translator: Albert\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
+#: js_upload.php:43
-msgid "Select files for upload"
+msgid "Upload a file"
-msgstr "Seleciona archivos a subir"
+msgstr "Subir un archivo"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr "Soltar archivos aquí para subir"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Fallido"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "No se subió ningún archivo."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "El archivo subido está vacío"
 
-#: js_upload.php:233
+#: js_upload.php:321
-#, php-format
+msgid "Image exceeds size limit of "
-msgid "Image exceeds size limit of %s"
+msgstr "La imagen excede el tamaño de"
-msgstr ""
 
-#: js_upload.php:245
+#: js_upload.php:332
-#, php-format
+msgid "File has an invalid extension, it should be one of "
-msgid "File has an invalid extension, it should be one of %s."
+msgstr "El archivo tiene una extensión inválida, debería ser una de"
-msgstr ""
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "La subida fue cancelada, o el servidor tuvo un error"

js_upload/lang/es/strings.php

@@ -3,12 +3,14 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
-$a->strings['Select files for upload'] = 'Seleciona archivos a subir';
+$a->strings['Upload a file'] = 'Subir un archivo';
 $a->strings['Drop files here to upload'] = 'Soltar archivos aquí para subir';
 $a->strings['Cancel'] = 'Cancelar';
 $a->strings['Failed'] = 'Fallido';
 $a->strings['No files were uploaded.'] = 'No se subió ningún archivo.';
 $a->strings['Uploaded file is empty'] = 'El archivo subido está vacío';
+$a->strings['Image exceeds size limit of '] = 'La imagen excede el tamaño de';
+$a->strings['File has an invalid extension, it should be one of '] = 'El archivo tiene una extensión inválida, debería ser una de';
 $a->strings['Upload was cancelled, or server error encountered'] = 'La subida fue cancelada, o el servidor tuvo un error';

js_upload/lang/it/messages.po

@@ -11,14 +11,14 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
+"PO-Revision-Date: 2021-05-05 10:50+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js_upload.php:34
 msgid "Select files for upload"

js_upload/lang/it/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
 $a->strings['Select files for upload'] = 'Seleziona file per il caricamento';
 $a->strings['Drop files here to upload'] = 'Trascina un file qui per caricarlo';

js_upload/lang/nl/messages.po

@@ -5,55 +5,52 @@
 # 
 # Translators:
 # Jeroen De Meerleer <me@jeroened.be>, 2018
-# Ruud Schilders <ruud@schilders.it>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
+"PO-Revision-Date: 2018-08-24 11:48+0000\n"
-"Last-Translator: Ruud Schilders <ruud@schilders.it>, 2020\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
+#: js_upload.php:43
-msgid "Select files for upload"
+msgid "Upload a file"
-msgstr ""
+msgstr "Upload een bestand"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr "Sleep uw bestanden hier om ze te uploaden"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
-msgstr "Afbreken"
+msgstr ""
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
-msgstr "Mislukt"
+msgstr ""
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
-msgstr "Er waren geen bestanden geüpload."
+msgstr ""
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
-msgstr "Het geüploade bestand is leeg"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: js_upload.php:245
+#: js_upload.php:321
-#, php-format
+msgid "Image exceeds size limit of "
-msgid "File has an invalid extension, it should be one of %s."
 msgstr ""
 
-#: js_upload.php:256
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""

js_upload/lang/nl/strings.php

@@ -5,8 +5,5 @@ function string_plural_select_nl($n){
 	$n = intval($n);
 	return intval($n != 1);
 }}
+$a->strings['Upload a file'] = 'Upload een bestand';
 $a->strings['Drop files here to upload'] = 'Sleep uw bestanden hier om ze te uploaden';
-$a->strings['Cancel'] = 'Afbreken';
-$a->strings['Failed'] = 'Mislukt';
-$a->strings['No files were uploaded.'] = 'Er waren geen bestanden geüpload.';
-$a->strings['Uploaded file is empty'] = 'Het geüploade bestand is leeg';

krynn/lang/de/messages.po

@@ -14,9 +14,9 @@ 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"
+"PO-Revision-Date: 2021-12-22 16:22+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

krynn/lang/it/messages.po

@@ -10,20 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
+"PO-Revision-Date: 2021-04-19 11:11+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: krynn.php:127
+#: krynn.php:132 krynn.php:136
+msgid "Krynn"
+msgstr "Krynn"
+
+#: krynn.php:141
+msgid "Krynn Settings"
+msgstr "Impostazioni Krynn"
+
+#: krynn.php:143
 msgid "Enable Krynn Addon"
 msgstr "Abilita componente aggiuntivo Krynn"
 
-#: krynn.php:132
+#: krynn.php:148
-msgid "Krynn Settings"
+msgid "Save Settings"
-msgstr "Impostazioni Krynn"
+msgstr "Salva Impostazioni"

krynn/lang/it/strings.php

@@ -3,7 +3,9 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
-$a->strings['Enable Krynn Addon'] = 'Abilita componente aggiuntivo Krynn';
+$a->strings['Krynn'] = 'Krynn';
 $a->strings['Krynn Settings'] = 'Impostazioni Krynn';
+$a->strings['Enable Krynn Addon'] = 'Abilita componente aggiuntivo Krynn';
+$a->strings['Save Settings'] = 'Salva Impostazioni';

langfilter/lang/ar/messages.po

@@ -4,74 +4,73 @@
 # 
 # 
 # Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
 # Farida Khalaf <faridakhalaf@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
+"PO-Revision-Date: 2021-04-26 09:14+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
+"Language-Team: Arabic (http://www.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"
 
-#: langfilter.php:49
+#: langfilter.php:50
+msgid "Language Filter"
+msgstr "اللغة"
+
+#: 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 ""
 
-#: langfilter.php:50
+#: langfilter.php:52
 msgid "Use the language filter"
 msgstr "اختيار اللغة"
 
-#: langfilter.php:51
+#: langfilter.php:53
 msgid "Able to read"
 msgstr "  قابل  للقراءة"
 
-#: 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 "قائمة الرموز ( ISO 639-1) للغات ، مفصولة بفواصل. على سبيل المثال \"de، it\""
 
-#: langfilter.php:52
+#: langfilter.php:54
 msgid "Minimum confidence in language detection"
 msgstr "الحد الأدنى من نسبة اكتشاف اللغة"
 
-#: 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 "الحد الأدنى من صحة اكتشاف اللغة  ، من 0 إلى 100. لن تتم فلترة المشاركات عندما تكون صحة اكتشاف اللغة أقل من هذه النسبة المئوية."
 
-#: langfilter.php:53
+#: langfilter.php:55
 msgid "Minimum length of message body"
 msgstr "الحد الأدنى لنص الرسالة"
 
-#: 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 "الحد الأدنى لأحرف نص الرسالة لاستخدام الفلتر. لن يتم فلترة المشاركات الأقصر من هذا. ملاحظة: لا يمكن الاعتماد على اكتشاف اللغة للمحتوى القصير (<200 حرف)."
 
-#: langfilter.php:58
+#: langfilter.php:56
-msgid "Language Filter"
-msgstr "مرشح اللغة"
-
-#: langfilter.php:60
 msgid "Save Settings"
 msgstr "حفظ الإعدادات"
 
-#: langfilter.php:193
+#: langfilter.php:187
 #, php-format
 msgid "Filtered language: %s"
 msgstr "اختيار اللغة: %s"

langfilter/lang/ar/strings.php

@@ -5,6 +5,7 @@ function string_plural_select_ar($n){
 	$n = intval($n);
 	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
 }}
+$a->strings['Language Filter'] = 'اللغة';
 $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"';
@@ -12,6 +13,5 @@ $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['Filtered language: %s'] = 'اختيار اللغة: %s';

langfilter/lang/de/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Andreas H., 2018
-# Copiis Praeesse <copiis@vivaldi.net>, 2018
+# Copiis Praeesse <richard@zsemberi.de>, 2018
 # Ralf Thees <ralf@herrthees.de>, 2019
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2015
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020-2021
@@ -15,9 +15,9 @@ 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"
+"PO-Revision-Date: 2021-10-19 18:08+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020-2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

langfilter/lang/it/messages.po

@@ -12,68 +12,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
+"PO-Revision-Date: 2021-10-17 21:25+0000\n"
-"Last-Translator: SickShark X, 2021\n"
+"Last-Translator: SickShark X\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=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 "Filtro Lingua"
+
+#: 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 "Questo plug-in prova a identificare la lingua con cui sono stati scritti i posts. Se non corrisponde a nessuna delle lingue specificate qui sotto, i post verranno nascosti."
 
-#: langfilter.php:50
+#: langfilter.php:52
 msgid "Use the language filter"
 msgstr "Usa il filtro lingua"
 
-#: langfilter.php:51
+#: langfilter.php:53
 msgid "Able to read"
 msgstr "In grado di leggere"
 
-#: 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 "Lista di abbreviazioni (codici ISO 639-1) per le lingue che parli, separate da virgola. Per esempio \"it,de\"."
 
-#: langfilter.php:52
+#: langfilter.php:54
 msgid "Minimum confidence in language detection"
 msgstr "Fiducia minima nel rilevamento della lingua"
 
-#: 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 "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I messaggi non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale."
 
-#: langfilter.php:53
+#: langfilter.php:55
 msgid "Minimum length of message body"
 msgstr "Lunghezza minima del corpo del messaggio"
 
-#: 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 "Numero di caratteri minimo perché il filtro venga usato. I messaggio più corti non saranno filtrati. Nota: la rilevazione della lingua non è affidabile con messaggi brevi (<200 caratteri)"
 
-#: langfilter.php:58
+#: langfilter.php:56
-msgid "Language Filter"
-msgstr "Filtro Lingua"
-
-#: langfilter.php:60
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: langfilter.php:193
+#: langfilter.php:187
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Lingua filtrata: %s"

langfilter/lang/it/strings.php

@@ -3,8 +3,9 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
+$a->strings['Language Filter'] = 'Filtro Lingua';
 $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.'] = 'Questo plug-in prova a identificare la lingua con cui sono stati scritti i posts. Se non corrisponde a nessuna delle lingue specificate qui sotto, i post verranno nascosti.';
 $a->strings['Use the language filter'] = 'Usa il filtro lingua';
 $a->strings['Able to read'] = 'In grado di leggere';
@@ -13,6 +14,5 @@ $a->strings['Minimum confidence in language detection'] = 'Fiducia minima nel ri
 $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.'] = 'Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I messaggi non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale.';
 $a->strings['Minimum length of message body'] = 'Lunghezza minima del corpo del messaggio';
 $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).'] = 'Numero di caratteri minimo perché il filtro venga usato. I messaggio più corti non saranno filtrati. Nota: la rilevazione della lingua non è affidabile con messaggi brevi (<200 caratteri)';
-$a->strings['Language Filter'] = 'Filtro Lingua';
 $a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Filtered language: %s'] = 'Lingua filtrata: %s';

langfilter/langfilter.php

@@ -107,7 +107,7 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 
 	// Never filter own messages
 	// TODO: find a better way to extract this
-	$logged_user_profile = DI::baseUrl() . '/profile/' . DI::userSession()->getLocalUserNickname();
+	$logged_user_profile = DI::baseUrl()->get() . '/profile/' . DI::userSession()->getLocalUserNickname();
 	if ($logged_user_profile == $hook_data['item']['author-link']) {
 		return;
 	}

libertree/lang/cs/messages.po

@@ -4,42 +4,45 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
+# Michal Šupler <msupler@gmail.com>, 2014-2015
-# michal_s <msupler@gmail.com>, 2014-2015
 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: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
+"PO-Revision-Date: 2015-02-11 19:39+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Poslat na libertree"
 
-#: libertree.php:60
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "libertree nastavení příspěvků"
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Povolit doplněk Libertree Post"
+msgstr "Povolit Libertree Post rozšíření"
 
-#: libertree.php:61
+#: libertree.php:74
-msgid "Libertree site URL"
-msgstr "URL adresa Libertree "
-
-#: libertree.php:62
 msgid "Libertree API token"
 msgstr "Libertree API token"
 
-#: libertree.php:63
+#: libertree.php:79
-msgid "Post to Libertree by default"
+msgid "Libertree site URL"
-msgstr "Ve výchozím stavu posílat na Libertree"
+msgstr "URL adresa Libertree "
 
-#: libertree.php:68
+#: libertree.php:84
-msgid "Libertree Export"
+msgid "Post to Libertree by default"
-msgstr ""
+msgstr "Defaultně poslat na Libertree"
+
+#: libertree.php:90
+msgid "Submit"
+msgstr "Odeslat"

libertree/lang/cs/strings.php

@@ -3,10 +3,12 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to libertree'] = 'Poslat na libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Povolit doplněk Libertree Post';
+$a->strings['libertree Post Settings'] = 'libertree nastavení příspěvků';
-$a->strings['Libertree site URL'] = 'URL adresa Libertree ';
+$a->strings['Enable Libertree Post Addon'] = 'Povolit Libertree Post rozšíření';
 $a->strings['Libertree API token'] = 'Libertree API token';
-$a->strings['Post to Libertree by default'] = 'Ve výchozím stavu posílat na Libertree';
+$a->strings['Libertree site URL'] = 'URL adresa Libertree ';
+$a->strings['Post to Libertree by default'] = 'Defaultně poslat na Libertree';
+$a->strings['Submit'] = 'Odeslat';

libertree/lang/de/messages.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
+"PO-Revision-Date: 2022-01-22 17:34+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

libertree/libertree.php

@@ -162,7 +162,7 @@ function libertree_send(array &$b)
 	$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
 	$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = DI::baseUrl()->getHost();
+	$ltree_source = DI::baseUrl()->getHostname();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";

libravatar/lang/de/messages.po

@@ -12,10 +12,10 @@ 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: 2020-12-08 07:16+0000\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
+"PO-Revision-Date: 2021-02-01 06:30+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

libravatar/lang/it/messages.po

@@ -11,14 +11,14 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
+"PO-Revision-Date: 2021-05-05 11:06+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: libravatar.php:68
 msgid "generic profile image"

libravatar/lang/it/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
 $a->strings['generic profile image'] = 'immagine generica del profilo';
 $a->strings['random geometric pattern'] = 'schema geometrico casuale';

ljpost/lang/cs/messages.po

@@ -4,42 +4,45 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
+# Michal Šupler <msupler@gmail.com>, 2014-2015
-# michal_s <msupler@gmail.com>, 2014-2015
 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: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
+"PO-Revision-Date: 2015-02-11 19:38+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
-msgstr "Odeslat na LiveJournal"
+msgstr "Poslat na LiveJournal"
 
-#: ljpost.php:63
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Nastavení LiveJournal Post"
+
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
-msgstr "Povolit doplněk LiveJournal Post"
+msgstr "Povolit LiveJournal Post addon"
 
-#: ljpost.php:64
+#: ljpost.php:77
 msgid "LiveJournal username"
 msgstr "LiveJournal uživatelské jméno"
 
-#: ljpost.php:65
+#: ljpost.php:82
 msgid "LiveJournal password"
 msgstr "LiveJournal heslo"
 
-#: ljpost.php:66
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Defaultně umístit na LiveJournal"
 
-#: ljpost.php:71
+#: ljpost.php:93
-msgid "LiveJournal Export"
+msgid "Submit"
-msgstr ""
+msgstr "Odeslat"

ljpost/lang/cs/strings.php

@@ -3,10 +3,12 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
-$a->strings['Post to LiveJournal'] = 'Odeslat na LiveJournal';
+$a->strings['Post to LiveJournal'] = 'Poslat na LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Povolit doplněk LiveJournal Post';
+$a->strings['LiveJournal Post Settings'] = 'Nastavení LiveJournal Post';
+$a->strings['Enable LiveJournal Post Addon'] = 'Povolit LiveJournal Post addon';
 $a->strings['LiveJournal username'] = 'LiveJournal uživatelské jméno';
 $a->strings['LiveJournal password'] = 'LiveJournal heslo';
 $a->strings['Post to LiveJournal by default'] = 'Defaultně umístit na LiveJournal';
+$a->strings['Submit'] = 'Odeslat';

ljpost/lang/de/messages.po

@@ -6,16 +6,16 @@
 # Translators:
 # Andreas H., 2014
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
+"PO-Revision-Date: 2021-12-22 17:23+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"
@@ -44,4 +44,4 @@ msgstr "Standardmäßig bei LiveJournal veröffentlichen"
 
 #: ljpost.php:71
 msgid "LiveJournal Export"
-msgstr "LiveJournal Export"
+msgstr ""

ljpost/lang/de/strings.php

@@ -10,4 +10,3 @@ $a->strings['Enable LiveJournal Post Addon'] = 'LiveJournal-Post-Addon aktiviere
 $a->strings['LiveJournal username'] = 'LiveJournal-Benutzername';
 $a->strings['LiveJournal password'] = 'LiveJournal-Passwort';
 $a->strings['Post to LiveJournal by default'] = 'Standardmäßig bei LiveJournal veröffentlichen';
-$a->strings['LiveJournal Export'] = 'LiveJournal Export';

ljpost/lang/it/messages.po

@@ -5,41 +5,45 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
+# Sylke Vicious <silkevicious@gmail.com>, 2021
 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: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
+"PO-Revision-Date: 2021-02-16 12:57+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr "Invia a LiveJournal"
 
-#: ljpost.php:63
+#: ljpost.php:73
+msgid "LiveJournal Post Settings"
+msgstr "Impostazioni invio a LiveJournal"
+
+#: ljpost.php:75
 msgid "Enable LiveJournal Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a LiveJournal"
 
-#: ljpost.php:64
+#: ljpost.php:80
 msgid "LiveJournal username"
 msgstr "Nome utente LiveJournal"
 
-#: ljpost.php:65
+#: ljpost.php:85
 msgid "LiveJournal password"
 msgstr "Password LiveJournal"
 
-#: ljpost.php:66
+#: ljpost.php:90
 msgid "Post to LiveJournal by default"
 msgstr "Invia sempre a LiveJournal"
 
-#: ljpost.php:71
+#: ljpost.php:96
-msgid "LiveJournal Export"
+msgid "Save Settings"
-msgstr "Esporta LiveJournal"
+msgstr "Salva Impostazioni"

ljpost/lang/it/strings.php

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

mailstream/lang/C/messages.po

@@ -29,72 +29,68 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: mailstream.php:311
+#: mailstream.php:301
 msgid "Re:"
 msgstr ""
 
-#: mailstream.php:324 mailstream.php:327
+#: mailstream.php:314 mailstream.php:317
 msgid "Friendica post"
 msgstr ""
 
-#: mailstream.php:330
+#: mailstream.php:320
 msgid "Diaspora post"
 msgstr ""
 
-#: mailstream.php:340
+#: mailstream.php:330
 msgid "Feed item"
 msgstr ""
 
-#: mailstream.php:343
+#: mailstream.php:333
 msgid "Email"
 msgstr ""
 
-#: mailstream.php:345
+#: mailstream.php:335
 msgid "Friendica Item"
 msgstr ""
 
-#: mailstream.php:419
+#: mailstream.php:404
 msgid "Upstream"
 msgstr ""
 
-#: mailstream.php:420
+#: mailstream.php:405
-msgid "URI"
-msgstr ""
-
-#: mailstream.php:421
 msgid "Local"
 msgstr ""
 
-#: mailstream.php:499
+#: mailstream.php:481
 msgid "Enabled"
 msgstr ""
 
-#: mailstream.php:504
+#: mailstream.php:486
 msgid "Email Address"
 msgstr ""
 
-#: mailstream.php:506
+#: mailstream.php:488
 msgid "Leave blank to use your account email address"
 msgstr ""
 
-#: mailstream.php:510
+#: mailstream.php:492
 msgid "Exclude Likes"
 msgstr ""
 
-#: mailstream.php:512
+#: mailstream.php:494
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr ""
 
-#: mailstream.php:516
+#: mailstream.php:498
 msgid "Attach Images"
 msgstr ""
 
-#: mailstream.php:518
+#: mailstream.php:500
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr ""
 
-#: mailstream.php:525
+#: mailstream.php:507
 msgid "Mail Stream Settings"
 msgstr ""

mailstream/mailstream.php

@@ -32,6 +32,7 @@ function mailstream_install()
 	Hook::register('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
 	Hook::register('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::register('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
 	Logger::info("mailstream: installed");
@@ -66,10 +67,9 @@ function mailstream_module() {}
 /**
  * Adds an item in "addon features" in the admin menu of the site
  *
- * @param App $a App object (unused)
  * @param string        $o HTML form data
  */
-function mailstream_addon_admin(App $a, string &$o)
+function mailstream_addon_admin(string &$o)
 {
 	$frommail = DI::config()->get('mailstream', 'frommail');
 	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
@@ -110,7 +110,7 @@ function mailstream_generate_id(string $uri): string
 	return $message_id;
 }
 
-function mailstream_send_hook(App $a, array $data)
+function mailstream_send_hook(array $data)
 {
 	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
 	$item = Post::selectFirst([], $criteria);
@@ -138,16 +138,15 @@ function mailstream_send_hook(App $a, array $data)
  * mailstream is enabled and the necessary data is available, forks a
  * workerqueue item to send the email.
  *
- * @param App $a    App object (unused)
  * @param array     $item content of the item (may or may not already be stored in the item table)
  * @return void
  */
-function mailstream_post_hook(App $a, array &$item)
+function mailstream_post_hook(array &$item)
 {
 	mailstream_check_version();
 
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+		Logger::debug('mailstream: not enabled for item ' . $item['id']);
 		return;
 	}
 	if (!$item['uid']) {
@@ -162,8 +161,8 @@ function mailstream_post_hook(App $a, array &$item)
 		Logger::debug('mailstream: no uri for item ' . $item['id']);
 		return;
 	}
-	if ($item['verb'] == Activity::ANNOUNCE) {
+	if (!$item['plink']) {
-		Logger::debug('mailstream: announce item ', ['item' => $item['id']]);
+		Logger::debug('mailstream: no plink for item ' . $item['id']);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
@@ -396,9 +395,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 			$mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($item['thr-parent']));
 		}
 		$mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']);
-		if ($item['plink']) {
+		$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
-			$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
-		}
 		$encoding = 'base64';
 		foreach ($attachments as $url => $image) {
 			$mail->AddStringEmbeddedImage(
@@ -417,10 +414,9 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		$item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid'];
 		$mail->Body = Renderer::replaceMacros($template, [
 						 '$upstream' => DI::l10n()->t('Upstream'),
-						 '$uri' => DI::l10n()->t('URI'),
 						 '$local' => DI::l10n()->t('Local'),
 						 '$item' => $item]);
-		$mail->Body = mailstream_html_wrap($mail->Body);
+		mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
@@ -441,8 +437,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
  * bbcode's output suitable for transmission, we try to break things
  * up so that lines are about 200 characters.
  *
- * @param string $text text to word wrap
+ * @param string $text text to word wrap - modified in-place
- * @return string wrapped text
  */
 function mailstream_html_wrap(string &$text)
 {
@@ -451,7 +446,6 @@ function mailstream_html_wrap(string &$text)
 		$lines[$i] = preg_replace('/ /', "\n", $lines[$i], 1);
 	}
 	$text = implode($lines);
-	return $text;
 }
 
 /**
@@ -468,7 +462,8 @@ function mailstream_convert_table_entries()
 					'message_id' => $ms_item_id['message-id'],
 					'tries' => 0);
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('mailstream_convert_table_entries: item has no message-id.', 'item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
+			Logger::info('mailstream_cron: Item ' .
+							$ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id');
 							continue;
 		}
 		Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data);
@@ -480,11 +475,10 @@ function mailstream_convert_table_entries()
 /**
  * Form for configuring mailstream features for a user
  *
- * @param App   $a    App object
  * @param array $data Hook data array
  * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
  */
-function mailstream_addon_settings(App &$a, array &$data)
+function mailstream_addon_settings(array &$data)
 {
 	$enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
 	$address   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
@@ -528,11 +522,10 @@ function mailstream_addon_settings(App &$a, array &$data)
 
 /**
  * Process data submitted to user's mailstream features form
- * @param App $a
  * @param array          $post POST data
  * @return void
  */
-function mailstream_addon_settings_post(App $a, array $post)
+function mailstream_addon_settings_post(array $post)
 {
 	if (!DI::userSession()->getLocalUserId() || empty($post['mailstream-submit'])) {
 		return;

mailstream/templates/mail.tpl

@@ -6,6 +6,5 @@
 <div class="mailstream-item-body">{{$item.body nofilter}}</div>
 {{if $item.plink}}
 <div>{{$upstream}}: <a class="mailstream-item-plink" href="{{$item.plink}}">{{$item.plink}}</a><div>
-<div>{{$uri}}: <a class="mailstream-item-uri" href="{{$item.uri}}">{{$item.uri}}</a><div>
 <div>{{$local}}: <a class="mailstream-item-url" href="{{$item.url}}">{{$item.url}}</a></div>
 {{/if}}

mathjax/lang/cs/messages.po

@@ -4,29 +4,50 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
+# Michal Šupler <msupler@gmail.com>, 2014-2015
-# michal_s <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
+"PO-Revision-Date: 2015-02-11 19:38+0000\n"
-"Last-Translator: Aditoo, 2018\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Nastavení"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
-msgstr "Doplněk MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$, nebo blok \"eqnarray\"  v příspěvcích na Vaší zdi, záložce Síť a soukromých zprávách."
+msgstr "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách."
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
-msgstr "Použít vykreslování MathJax"
+msgstr "Použít Mathjax vykreslování"
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Odeslat"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "Základní MathJax adresa URL"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax."

mathjax/lang/cs/strings.php

@@ -3,7 +3,12 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($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; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Doplněk MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$, nebo blok "eqnarray"  v příspěvcích na Vaší zdi, záložce Síť a soukromých zprávách.';
+$a->strings['Settings'] = 'Nastavení';
-$a->strings['Use the MathJax renderer'] = 'Použít vykreslování MathJax';
+$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku "eqnarray"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách.';
+$a->strings['Use the MathJax renderer'] = 'Použít Mathjax vykreslování';
+$a->strings['Submit'] = 'Odeslat';
+$a->strings['Settings updated.'] = 'Nastavení aktualizováno.';
+$a->strings['MathJax Base URL'] = 'Základní MathJax adresa URL';
+$a->strings['The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.'] = 'URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax.';

mathjax/lang/de/messages.po

@@ -13,9 +13,9 @@ 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:55+0000\n"
+"PO-Revision-Date: 2021-12-22 16:24+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"Language-Team: German (http://www.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"

mathjax/lang/it/messages.po

@@ -10,23 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
+"PO-Revision-Date: 2021-02-16 12:51+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.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=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mathjax.php:42
+#: mathjax.php:43
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr "Il plugin \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati."
 
-#: mathjax.php:43
+#: mathjax.php:44
 msgid "Use the MathJax renderer"
 msgstr "Usa il render MathJax"
+
+#: mathjax.php:45
+msgid "Save Settings"
+msgstr "Salva Impostazioni"

mathjax/lang/it/strings.php

@@ -3,7 +3,8 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return intval($n != 1);
 }}
 $a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Il plugin "MatJax" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati.';
 $a->strings['Use the MathJax renderer'] = 'Usa il render MathJax';
+$a->strings['Save Settings'] = 'Salva Impostazioni';

monolog/composer.json

@@ -11,8 +11,8 @@
 	}
   ],
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.3",
-    "monolog/monolog": "^3.2"
+    "monolog/monolog": "^2.8"
   },
   "license": "3-clause BSD license",
   "config": {

monolog/composer.lock

@@ -4,31 +4,31 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e812bcd051a73d1c9b19c91ec88a6a21",
+    "content-hash": "d360e9eb0b5580e44579a3780be74dec",
     "packages": [
         {
             "name": "monolog/monolog",
-            "version": "3.2.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "305444bc6fb6c89e490f4b34fa6e979584d7fa81"
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/305444bc6fb6c89e490f4b34fa6e979584d7fa81",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50",
-                "reference": "305444bc6fb6c89e490f4b34fa6e979584d7fa81",
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=7.2",
-                "psr/log": "^2.0 || ^3.0"
+                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "provide": {
-                "psr/log-implementation": "3.0.0"
+                "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^3.0",
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "elasticsearch/elasticsearch": "^7 || ^8",
                 "ext-json": "*",
@@ -37,12 +37,13 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.4",
+                "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan": "^0.12.91",
-                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5.14",
-                "phpunit/phpunit": "^9.5.16",
+                "predis/predis": "^1.1 || ^2.0",
-                "predis/predis": "^1.1",
+                "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
+                "swiftmailer/swiftmailer": "^5.3|^6.0",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -65,7 +66,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.x-dev"
+                    "dev-main": "2.x-dev"
                 }
             },
             "autoload": {
@@ -101,34 +102,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-24T12:00:55+00:00"
+            "time": "2022-07-24T11:55:47+00:00"
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "src"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -148,7 +149,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         }
     ],
     "packages-dev": [],
@@ -158,7 +159,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.0"
+        "php": ">=7.3"
     },
     "platform-dev": [],
     "plugin-api-version": "1.1.0"

monolog/monolog.php

@@ -1,66 +0,0 @@
-<?php
-/*
- * Name: Monolog
- * Description: A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory
- * Version: 1.0
- * Author: Philipp Holzer
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Addon\monolog\src\IntrospectionProcessor;
-use Friendica\DI;
-use Psr\Log\LogLevel;
-
-require_once __DIR__ . '/vendor/autoload.php';
-
-function monolog_install()
-{
-	Hook::register('logger_instance' , __FILE__, 'monolog_instance');
-}
-
-function monolog_uninstall()
-{
-	Hook::unregister('logger_instance', __FILE__, 'monolog_instance');
-}
-
-function monolog_instance(array &$data)
-{
-	if ($data['name'] !== 'monolog') {
-		return;
-	}
-
-	$loggerTimeZone = new \DateTimeZone('UTC');
-
-	$logger = new Monolog\Logger($data['channel']);
-	$logger->setTimezone($loggerTimeZone);
-	$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
-	$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
-	$logger->pushProcessor(new Monolog\Processor\UidProcessor());
-	$logger->pushProcessor(new IntrospectionProcessor($data['introspection'], LogLevel::DEBUG));
-
-	$stream = DI::config()->get('system', 'logfile');
-
-	// just add a stream in case it's either writable or not file
-	if (!is_file($stream) || is_writable($stream)) {
-		try {
-			$loglevel = Monolog\Logger::toMonologLevel($data['loglevel']);
-
-			// fallback to notice if an invalid loglevel is set
-			if (!is_int($loglevel)) {
-				$loglevel = LogLevel::NOTICE;
-			}
-
-			$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
-
-			$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
-			$fileHandler->setFormatter($formatter);
-
-			$logger->pushHandler($fileHandler);
-		} catch (\Throwable $e) {
-			return;
-		}
-	}
-
-	$data['storage'] = $logger;
-}

monolog/src/Factory/Monolog.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Addon\monolog\src\Factory;
+
+use Friendica\Core\Hooks\Capabilities\IAmAStrategy;
+use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Exception\LoggerException;
+use Monolog as MonologModel;
+use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+
+class Monolog implements IAmAStrategy
+{
+	/** @var IManageConfigValues */
+	protected $config;
+	/** @var string  */
+	protected $channel = '';
+	/** @var string  */
+	protected $loglevel = LogLevel::NOTICE;
+	/** @var IHaveCallIntrospections */
+	protected $introspection;
+
+	public function __construct(IManageConfigValues $config, IHaveCallIntrospections $introspection, string $channel = '', string $loglevel = LogLevel::NOTICE)
+	{
+		$this->config        = $config;
+		$this->channel       = $channel;
+		$this->loglevel      = $loglevel;
+		$this->introspection = $introspection;
+	}
+
+	public function create(): LoggerInterface
+	{
+		$loggerTimeZone = new \DateTimeZone('UTC');
+
+		$logger = new MonologModel\Logger($this->channel);
+		$logger->setTimezone($loggerTimeZone);
+		$logger->pushProcessor(new MonologModel\Processor\PsrLogMessageProcessor());
+		$logger->pushProcessor(new MonologModel\Processor\ProcessIdProcessor());
+		$logger->pushProcessor(new MonologModel\Processor\UidProcessor());
+		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
+
+		$stream = $this->config->get('system', 'logfile');
+
+		// just add a stream in case it's either writable or not file
+		if (!is_file($stream) || is_writable($stream)) {
+			try {
+				$loglevel = MonologModel\Logger::toMonologLevel($this->loglevel);
+
+				// fallback to notice if an invalid loglevel is set
+				if (!is_int($loglevel)) {
+					$loglevel = LogLevel::NOTICE;
+				}
+
+				$fileHandler = new MonologModel\Handler\StreamHandler($stream, $loglevel);
+
+				$formatter = new MonologModel\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
+				$fileHandler->setFormatter($formatter);
+
+				$logger->pushHandler($fileHandler);
+
+				return $logger;
+			} catch (\Throwable $e) {
+				throw new LoggerException('Cannot create Loger', $e);
+			}
+		} else {
+			throw new LoggerException(sprintf('Cannot write to file or stream %s', $stream));
+		}
+	}
+}

monolog/src/Monolog/DevelopHandler.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Addon\monolog\src;
+namespace Friendica\Addon\monolog\src\Monolog;
 
 use Friendica\App\Request;
 use Monolog\Handler;

monolog/src/Monolog/IntrospectionProcessor.php

@@ -19,11 +19,10 @@
  *
  */
 
-namespace Friendica\Addon\monolog\src;
+namespace Friendica\Addon\monolog\src\Monolog;
 
 use Friendica\Core\Logger\Util\Introspection;
 use Monolog\Logger;
-use Monolog\LogRecord;
 use Monolog\Processor\ProcessorInterface;
 
 /**
@@ -42,19 +41,19 @@ class IntrospectionProcessor implements ProcessorInterface
 	public function __construct(Introspection $introspection, $level = Logger::DEBUG)
 	{
 		$this->level = Logger::toMonologLevel($level);
-		$introspection->addClasses(['Monolog\\']);
+		$introspection->addClasses(['Monolog\\', IntrospectionProcessor::class]);
 		$this->introspection = $introspection;
 	}
 
-	public function __invoke(LogRecord $record): LogRecord
+	public function __invoke(array $record): array
 	{
 		// return if the level is not high enough
-		if ($record->level < $this->level) {
+		if ($record['level'] < $this->level) {
 			return $record;
 		}
 		// we should have the call source now
-		$record->extra = array_merge(
+		$record['extra'] = array_merge(
-			$record->extra,
+			$record['extra'],
 			$this->introspection->getRecord()
 		);
 

monolog/static/addon.config.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license   GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+$ADDON = [
+	'name'        => 'monolog',
+	'description' => 'Monolog can send your logs to files, sockets, inboxes, database, etc..',
+	'author'      => [
+		'name'  => 'Philipp Holzer',
+		'email' => 'admin@philipp.info',
+	],
+	'maintainer'  => [
+		'name'  => 'Philipp Holzer',
+		'email' => 'admin@philipp.info',
+	],
+	'version'     => '1.0',
+	'status'      => 'supported',
+];

monolog/static/dependencies.config.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license   GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+use Dice\Dice;
+use Friendica\Addon\monolog\src\Factory\Monolog;
+
+return [
+	Monolog::class => [
+		'call' => [
+			['create', [], Dice::CHAIN_CALL],
+		],
+	],
+];

monolog/static/hooks.config.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license   GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+use Friendica\Addon\monolog\src\Factory\Monolog;
+use Friendica\Core\Addons\Capabilities\ILoadAddonHooks;
+use Psr\Log\LoggerInterface;
+
+return [
+	ILoadAddonHooks::ADDON_HOOK_STRATEGIES => [
+		LoggerInterface::class => [
+			'monolog' => [Monolog::class, []],
+		],
+	],
+];

monolog/tests/MonologTest.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Friendica\Addon\monolog\tests;
+
+use Friendica\Addon\monolog\src\Factory\Monolog;
+use Friendica\Test\src\Core\Logger\AbstractLoggerTest;
+use Friendica\Test\Util\VFSTrait;
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamFile;
+use Psr\Log\LogLevel;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+class MonologTest extends AbstractLoggerTest
+{
+	use VFSTrait;
+
+	/** @var vfsStreamFile */
+	protected $logfile;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->setUpVfsDir();
+	}
+
+	protected function getContent()
+	{
+		return $this->logfile->getContent();
+	}
+
+	protected function getInstance($level = LogLevel::DEBUG)
+	{
+		$this->logfile = vfsStream::newFile('friendica.log')
+								  ->at($this->root);
+
+		$this->config->shouldReceive('get')->with('system', 'logfile')->andReturn($this->logfile->url())->once();
+		$this->introspection->shouldReceive('addClasses')->with(['Monolog\\']);
+
+		$loggerFactory = new Monolog($this->config, $this->introspection, 'test', $level);
+		return $loggerFactory->create();
+	}
+
+	/**
+	 * Test if a log entry is correctly interpolated
+	 *
+	 * @note - override the base class, because Monolog adds an "array" prefix to the PsrInterpolate when using arrays
+	 */
+	public function testPsrInterpolate()
+	{
+		$logger = $this->getInstance();
+
+		$logger->emergency('A {psr} test', ['psr' => 'working']);
+		$logger->alert('An {array} test', ['array' => ['it', 'is', 'working']]);
+		$text = $this->getContent();
+		self::assertStringContainsString('A working test', $text);
+		self::assertStringContainsString('An array["it","is","working"] test', $text);
+	}
+
+	/**
+	 * Test a message with an exception
+	 *
+	 * @note - override the base class, because Monolog has an own formatter logic for printing exceptions
+	 */
+	public function testExceptionHandling()
+	{
+		$e = new \Exception("Test String", 123);
+		$eFollowUp = new \Exception("FollowUp", 456, $e);
+
+		$assertion = '[object] (Exception(code: 456)';
+
+		$logger = $this->getInstance();
+		$logger->alert('test', ['e' => $eFollowUp]);
+		$text = $this->getContent();
+
+		self::assertLogline($text);
+
+		self::assertStringContainsString($assertion, $this->getContent());
+	}
+}

monolog/vendor/composer/autoload_classmap.php

@@ -26,7 +26,6 @@ return array(
     'Monolog\\Formatter\\MongoDBFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php',
     'Monolog\\Formatter\\NormalizerFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php',
     'Monolog\\Formatter\\ScalarFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php',
-    'Monolog\\Formatter\\SyslogFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/SyslogFormatter.php',
     'Monolog\\Formatter\\WildfireFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php',
     'Monolog\\Handler\\AbstractHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AbstractHandler.php',
     'Monolog\\Handler\\AbstractProcessingHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php',
@@ -92,6 +91,7 @@ return array(
     'Monolog\\Handler\\SocketHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SocketHandler.php',
     'Monolog\\Handler\\SqsHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SqsHandler.php',
     'Monolog\\Handler\\StreamHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
+    'Monolog\\Handler\\SwiftMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php',
     'Monolog\\Handler\\SymfonyMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php',
     'Monolog\\Handler\\SyslogHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SyslogHandler.php',
     'Monolog\\Handler\\SyslogUdpHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php',
@@ -121,12 +121,15 @@ return array(
     'Monolog\\SignalHandler' => $vendorDir . '/monolog/monolog/src/Monolog/SignalHandler.php',
     'Monolog\\Test\\TestCase' => $vendorDir . '/monolog/monolog/src/Monolog/Test/TestCase.php',
     'Monolog\\Utils' => $vendorDir . '/monolog/monolog/src/Monolog/Utils.php',
-    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/src/AbstractLogger.php',
+    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
-    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/src/InvalidArgumentException.php',
+    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
-    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/src/LogLevel.php',
+    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
-    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/src/LoggerAwareInterface.php',
+    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/src/LoggerAwareTrait.php',
+    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/src/LoggerInterface.php',
+    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
-    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/src/LoggerTrait.php',
+    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
-    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/src/NullLogger.php',
+    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
+    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
 );

monolog/vendor/composer/autoload_psr4.php

@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
+    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
 );