Merge pull request 'Tumblr/Bluesky: Avoid problems on first fetch' (#1452 ) from heluecht/friendica-addons:first-fetch into 2023.09-rc

Reviewed-on: friendica/friendica-addons#1452
Tumblr/Bluesky: Avoid problems on first fetch
2023-12-21 13:45:24 +01:00 · 2023-12-21 05:23:38 +00:00 · 2023-12-21 05:21:43 +01:00 · 2023-12-20 20:46:24 +00:00 · 2023-12-20 14:17:01 +01:00 · 2023-12-18 21:28:16 -05:00
1295 changed files with 77718 additions and 43005 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -6,5 +6,24 @@ 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
--- a/.tx/config
+++ b/.tx/config
@ -1,399 +1,399 @@
 [main]
-host = https://www.transifex.com
+host = https://api.transifex.com

-[friendica.addon_advancedcontentfilter_messagespo]
+[o:Friendica:p:friendica:r:addon_advancedcontentfilter_messagespo]
 file_filter = advancedcontentfilter/lang/<lang>/messages.po
 source_file = advancedcontentfilter/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_blackout_messagespo]
+[o:Friendica:p:friendica:r:addon_blackout_messagespo]
 file_filter = blackout/lang/<lang>/messages.po
 source_file = blackout/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_blockem_messagespo]
+[o:Friendica:p:friendica:r:addon_blockem_messagespo]
 file_filter = blockem/lang/<lang>/messages.po
 source_file = blockem/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_blogger_messagespo]
+[o:Friendica:p:friendica:r:addon_blogger_messagespo]
 file_filter = blogger/lang/<lang>/messages.po
 source_file = blogger/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_buffer_messagespo]
+[o:Friendica:p:friendica:r:addon_buffer_messagespo]
 file_filter = buffer/lang/<lang>/messages.po
 source_file = buffer/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_buglink_messagespo]
+[o:Friendica:p:friendica:r:addon_buglink_messagespo]
 file_filter = buglink/lang/<lang>/messages.po
 source_file = buglink/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_catavatar_messagespo]
+[o:Friendica:p:friendica:r:addon_catavatar_messagespo]
 file_filter = catavatar/lang/<lang>/messages.po
 source_file = catavatar/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_cookienotice_messagespo]
+[o:Friendica:p:friendica:r:addon_cookienotice_messagespo]
 file_filter = cookienotice/lang/<lang>/messages.po
 source_file = cookienotice/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_curweather_messagespo]
+[o:Friendica:p:friendica:r:addon_curweather_messagespo]
 file_filter = curweather/lang/<lang>/messages.po
 source_file = curweather/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_diaspora_messagespo]
+[o:Friendica:p:friendica:r:addon_diaspora_messagespo]
 file_filter = diaspora/lang/<lang>/messages.po
 source_file = diaspora/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_dwpost_messagespo]
+[o:Friendica:p:friendica:r:addon_dwpost_messagespo]
 file_filter = dwpost/lang/<lang>/messages.po
 source_file = dwpost/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_forumdirectory_messagespo]
+[o:Friendica:p:friendica:r:addon_forumdirectory_messagespo]
 file_filter = forumdirectory/lang/<lang>/messages.po
 source_file = forumdirectory/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_fromapp_messagespo]
+[o:Friendica:p:friendica:r:addon_fromapp_messagespo]
 file_filter = fromapp/lang/<lang>/messages.po
 source_file = fromapp/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_fromgplus_messagespo]
+[o:Friendica:p:friendica:r:addon_fromgplus_messagespo]
 file_filter = fromgplus/lang/<lang>/messages.po
 source_file = fromgplus/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_geonames_messagespo]
+[o:Friendica:p:friendica:r:addon_geonames_messagespo]
 file_filter = geonames/lang/<lang>/messages.po
 source_file = geonames/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_gnot_messagespo]
+[o:Friendica:p:friendica:r:addon_gnot_messagespo]
 file_filter = gnot/lang/<lang>/messages.po
 source_file = gnot/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_gravatar_messagespo]
+[o:Friendica:p:friendica:r:addon_gravatar_messagespo]
 file_filter = gravatar/lang/<lang>/messages.po
 source_file = gravatar/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_group_text_messagespo]
+[o:Friendica:p:friendica:r: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

-[friendica.addon_ifttt_messagespo]
+[o:Friendica:p:friendica:r:addon_ifttt_messagespo]
 file_filter = ifttt/lang/<lang>/messages.po
 source_file = ifttt/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_ijpost_messagespo]
+[o:Friendica:p:friendica:r:addon_ijpost_messagespo]
 file_filter = ijpost/lang/<lang>/messages.po
 source_file = ijpost/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_impressum_messagespo]
+[o:Friendica:p:friendica:r:addon_impressum_messagespo]
 file_filter = impressum/lang/<lang>/messages.po
 source_file = impressum/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_infiniteimprobabilitydrive_messagespo]
+[o:Friendica:p:friendica:r:addon_infiniteimprobabilitydrive_messagespo]
 file_filter = infiniteimprobabilitydrive/lang/<lang>/messages.po
 source_file = infiniteimprobabilitydrive/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_irc_messagespo]
+[o:Friendica:p:friendica:r:addon_irc_messagespo]
 file_filter = irc/lang/<lang>/messages.po
 source_file = irc/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_jappixmini_messagespo]
+[o:Friendica:p:friendica:r:addon_jappixmini_messagespo]
 file_filter = jappixmini/lang/<lang>/messages.po
 source_file = jappixmini/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_js_upload_messagespo]
+[o:Friendica:p:friendica:r: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

-[friendica.addon_krynn_messagespo]
+[o:Friendica:p:friendica:r:addon_krynn_messagespo]
 file_filter = krynn/lang/<lang>/messages.po
 source_file = krynn/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_langfilter_messagespo]
+[o:Friendica:p:friendica:r:addon_langfilter_messagespo]
 file_filter = langfilter/lang/<lang>/messages.po
 source_file = langfilter/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_libertree_messagespo]
+[o:Friendica:p:friendica:r:addon_libertree_messagespo]
 file_filter = libertree/lang/<lang>/messages.po
 source_file = libertree/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_libravatar_messagespo]
+[o:Friendica:p:friendica:r:addon_libravatar_messagespo]
 file_filter = libravatar/lang/<lang>/messages.po
 source_file = libravatar/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_ljpost_messagespo]
+[o:Friendica:p:friendica:r:addon_ljpost_messagespo]
 file_filter = ljpost/lang/<lang>/messages.po
 source_file = ljpost/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_mailstream_messagespo]
+[o:Friendica:p:friendica:r:addon_mailstream_messagespo]
 file_filter = mailstream/lang/<lang>/messages.po
 source_file = mailstream/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_mathjax_messagespo]
+[o:Friendica:p:friendica:r:addon_mathjax_messagespo]
 file_filter = mathjax/lang/<lang>/messages.po
 source_file = mathjax/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_membersince_messagespo]
+[o:Friendica:p:friendica:r:addon_membersince_messagespo]
 file_filter = membersince/lang/<lang>/messages.po
 source_file = membersince/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_morechoice_messagespo]
+[o:Friendica:p:friendica:r:addon_morechoice_messagespo]
 file_filter = morechoice/lang/<lang>/messages.po
 source_file = morechoice/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_morepokes_messagespo]
+[o:Friendica:p:friendica:r:addon_morepokes_messagespo]
 file_filter = morepokes/lang/<lang>/messages.po
 source_file = morepokes/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_newmemberwidget_messagespo]
+[o:Friendica:p:friendica:r:addon_newmemberwidget_messagespo]
 file_filter = newmemberwidget/lang/<lang>/messages.po
 source_file = newmemberwidget/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_notifyall_messagespo]
+[o:Friendica:p:friendica:r:addon_notifyall_messagespo]
 file_filter = notifyall/lang/<lang>/messages.po
 source_file = notifyall/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_notimeline_messagespo]
+[o:Friendica:p:friendica:r:addon_notimeline_messagespo]
 file_filter = notimeline/lang/<lang>/messages.po
 source_file = notimeline/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_nsfw_messagespo]
+[o:Friendica:p:friendica:r:addon_nsfw_messagespo]
 file_filter = nsfw/lang/<lang>/messages.po
 source_file = nsfw/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_numfriends_messagespo]
+[o:Friendica:p:friendica:r:addon_numfriends_messagespo]
 file_filter = numfriends/lang/<lang>/messages.po
 source_file = numfriends/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_openstreetmap_messagespo]
+[o:Friendica:p:friendica:r:addon_openstreetmap_messagespo]
 file_filter = openstreetmap/lang/<lang>/messages.po
 source_file = openstreetmap/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_pageheader_messagespo]
+[o:Friendica:p:friendica:r:addon_pageheader_messagespo]
 file_filter = pageheader/lang/<lang>/messages.po
 source_file = pageheader/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_piwik_messagespo]
+[o:Friendica:p:friendica:r:addon_piwik_messagespo]
 file_filter = piwik/lang/<lang>/messages.po
 source_file = piwik/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_planets_messagespo]
+[o:Friendica:p:friendica:r:addon_planets_messagespo]
 file_filter = planets/lang/<lang>/messages.po
 source_file = planets/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_public_server_messagespo]
+[o:Friendica:p:friendica:r: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

-[friendica.addon_pumpio_messagespo]
+[o:Friendica:p:friendica:r:addon_pumpio_messagespo]
 file_filter = pumpio/lang/<lang>/messages.po
 source_file = pumpio/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_qcomment_messagespo]
+[o:Friendica:p:friendica:r:addon_qcomment_messagespo]
 file_filter = qcomment/lang/<lang>/messages.po
 source_file = qcomment/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_randplace_messagespo]
+[o:Friendica:p:friendica:r:addon_randplace_messagespo]
 file_filter = randplace/lang/<lang>/messages.po
 source_file = randplace/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_remote_permissions_messagespo]
+[o:Friendica:p:friendica:r: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

-[friendica.addon_rendertime_messagespo]
+[o:Friendica:p:friendica:r:addon_rendertime_messagespo]
 file_filter = rendertime/lang/<lang>/messages.po
 source_file = rendertime/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_securemail_messagespo]
+[o:Friendica:p:friendica:r:addon_securemail_messagespo]
 file_filter = securemail/lang/<lang>/messages.po
 source_file = securemail/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_showmore_messagespo]
+[o:Friendica:p:friendica:r:addon_showmore_messagespo]
 file_filter = showmore/lang/<lang>/messages.po
 source_file = showmore/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_smileybutton_messagespo]
+[o:Friendica:p:friendica:r:addon_smileybutton_messagespo]
 file_filter = smileybutton/lang/<lang>/messages.po
 source_file = smileybutton/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_startpage_messagespo]
+[o:Friendica:p:friendica:r:addon_startpage_messagespo]
 file_filter = startpage/lang/<lang>/messages.po
 source_file = startpage/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_statusnet_messagespo]
+[o:Friendica:p:friendica:r:addon_statusnet_messagespo]
 file_filter = statusnet/lang/<lang>/messages.po
 source_file = statusnet/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_superblock_messagespo]
+[o:Friendica:p:friendica:r:addon_superblock_messagespo]
 file_filter = superblock/lang/<lang>/messages.po
 source_file = superblock/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_testdrive_messagespo]
+[o:Friendica:p:friendica:r:addon_testdrive_messagespo]
 file_filter = testdrive/lang/<lang>/messages.po
 source_file = testdrive/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_tictac_messagespo]
+[o:Friendica:p:friendica:r:addon_tictac_messagespo]
 file_filter = tictac/lang/<lang>/messages.po
 source_file = tictac/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_tumblr_messagespo]
+[o:Friendica:p:friendica:r:addon_tumblr_messagespo]
 file_filter = tumblr/lang/<lang>/messages.po
 source_file = tumblr/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_twitter_messagespo]
+[o:Friendica:p:friendica:r:addon_twitter_messagespo]
 file_filter = twitter/lang/<lang>/messages.po
 source_file = twitter/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_viewsrc_messagespo]
+[o:Friendica:p:friendica:r:addon_viewsrc_messagespo]
 file_filter = viewsrc/lang/<lang>/messages.po
 source_file = viewsrc/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_webrtc_messagespo]
+[o:Friendica:p:friendica:r:addon_webrtc_messagespo]
 file_filter = webrtc/lang/<lang>/messages.po
 source_file = webrtc/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_widgets_messagespo]
+[o:Friendica:p:friendica:r:addon_widgets_messagespo]
 file_filter = widgets/lang/<lang>/messages.po
 source_file = widgets/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_windowsphonepush_messagespo]
+[o:Friendica:p:friendica:r:addon_windowsphonepush_messagespo]
 file_filter = windowsphonepush/lang/<lang>/messages.po
 source_file = windowsphonepush/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_wppost_messagespo]
+[o:Friendica:p:friendica:r:addon_wppost_messagespo]
 file_filter = wppost/lang/<lang>/messages.po
 source_file = wppost/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

-[friendica.addon_xmpp_messagespo]
+[o:Friendica:p:friendica:r:addon_xmpp_messagespo]
 file_filter = xmpp/lang/<lang>/messages.po
 source_file = xmpp/lang/C/messages.po
 source_lang = en
-type = PO
+type        = PO

--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@ -0,0 +1,113 @@
+matrix:
+  include:
+    - PHP_MAJOR_VERSION: 7.4
+      PHP_VERSION: 7.4.33
+    - PHP_MAJOR_VERSION: 8.0
+      PHP_VERSION: 8.0.30
+    - PHP_MAJOR_VERSION: 8.1
+      PHP_VERSION: 8.1.23
+    - PHP_MAJOR_VERSION: 8.2
+      PHP_VERSION: 8.2.11
+
+# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
+labels:
+  location: opensocial
+
+skip_clone: true
+
+pipeline:
+  clone_friendica_base:
+    image: alpine/git
+    commands:
+      - git clone https://github.com/friendica/friendica.git .
+      - git checkout $CI_COMMIT_BRANCH
+  clone_friendica_addon:
+    image: alpine/git
+    commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git clone $CI_REPO_LINK addon
+      - cd addon/
+      - git checkout $CI_COMMIT_BRANCH
+      - git fetch origin $CI_COMMIT_REF
+      - git merge $CI_COMMIT_SHA
+  restore_cache:
+    image: meltwater/drone-cache:dev
+    settings:
+      backend: "filesystem"
+      restore: true
+      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
+      archive_format: "gzip"
+      mount:
+        - '.composer'
+    volumes:
+      - /tmp/drone-cache:/tmp/cache
+  composer_install:
+    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
+    commands:
+      - export COMPOSER_HOME=.composer
+      - ./bin/composer.phar validate
+      - ./bin/composer.phar install --prefer-dist
+    volumes:
+      - /etc/hosts:/etc/hosts
+  rebuild_cache:
+    image: meltwater/drone-cache:dev
+    settings:
+      backend: "filesystem"
+      rebuild: true
+      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
+      archive_format: "gzip"
+      mount:
+        - '.composer'
+    volumes:
+      - /tmp/drone-cache:/tmp/cache
+  test:
+    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
+    environment:
+      MYSQL_HOST: "mariadb"
+      MYSQL_PORT: "3306"
+      MYSQL_DATABASE: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_USER: "test"
+      REDIS_HOST: "redis"
+      MEMCACHED_HOST: "memcached"
+      MEMCACHE_HOST: "memcached"
+    commands:
+      - cp config/local-sample.config.php config/local.config.php
+      - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
+      - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
+      - if [ "${PHP_MAJOR_VERSION}" = "7.4" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
+          phpenmod xdebug;
+          export XDEBUG_MODE=coverage;
+          phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;
+        else
+          phpunit --configuration tests/phpunit-addons.xml;
+        fi
+  codecov:
+    image: friendicaci/codecov
+    when:
+      matrix:
+        PHP_MAJOR_VERSION: 7.4
+        PHP_VERSION: 7.4.33
+      repo:
+        - friendica/friendica-addons
+    commands:
+      - codecov -R '.' -Z -f 'clover.xml'
+    secrets:
+      - source: codecov-token
+        target: codecov_token
+
+services:
+  mariadb:
+    image: mariadb:latest
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+      MYSQL_DATABASE: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_USER: "test"
+
+  memcached:
+    image: memcached
+
+  redis:
+    image: redis
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@ -55,7 +55,7 @@ use Symfony\Component\ExpressionLanguage;

 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';

-function advancedcontentfilter_install(App $a)
+function advancedcontentfilter_install()
 {
 	Hook::register('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
@ -71,7 +71,7 @@ function advancedcontentfilter_install(App $a)
 * Hooks
 */

-function advancedcontentfilter_dbstructure_definition(App $a, &$database)
+function advancedcontentfilter_dbstructure_definition(&$database)
 {
 	$database['advancedcontentfilter_rules'] = [
 		'comment' => 'Advancedcontentfilter addon rules',
@ -115,7 +115,7 @@ function advancedcontentfilter_get_filter_fields(array $item)
 	return $vars;
 }

-function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
+function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 {
 	static $expressionLanguage;

@ -163,7 +163,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 }


-function advancedcontentfilter_addon_settings(App $a, array &$data)
+function advancedcontentfilter_addon_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
@ -187,7 +187,7 @@ function advancedcontentfilter_addon_settings(App $a, array &$data)
 */
 function advancedcontentfilter_module() {}

-function advancedcontentfilter_init(App $a)
+function advancedcontentfilter_init()
 {
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
 		$slim = new \Slim\App();
@ -201,7 +201,7 @@ function advancedcontentfilter_init(App $a)
 	}
 }

-function advancedcontentfilter_content(App $a)
+function advancedcontentfilter_content()
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return Login::form('/' . implode('/', DI::args()->getArgv()));
@ -252,7 +252,7 @@ function advancedcontentfilter_content(App $a)
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => $a->getCurrentTheme(),
+			'$current_theme' => DI::app()->getCurrentTheme(),
 			'$rules' => advancedcontentfilter_get_rules(),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
@ -455,7 +455,7 @@ function advancedcontentfilter_prepare_item_row(array $item_row): array
 	$item_row['tags'] = $tags['tags'];
 	$item_row['hashtags'] = $tags['hashtags'];
 	$item_row['mentions'] = $tags['mentions'];
-	$item_row['attachments'] = Post\Media::splitAttachments($item_row['uri-id']);
+	$item_row['attachments'] = DI::postMediaRepository()->splitAttachments($item_row['uri-id']);

 	return $item_row;
 }
--- a/advancedcontentfilter/lang/de/messages.po
+++ b/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://www.transifex.com/Friendica/teams/12172/de/)\n"
+"Language-Team: German (https://app.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"
--- a/advancedcontentfilter/lang/it/messages.po
+++ b/advancedcontentfilter/lang/it/messages.po
@ -3,60 +3,63 @@
 # 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: 2018-04-17 04:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"

-#: advancedcontentfilter.php:134
+#: advancedcontentfilter.php:154
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtrato dalla regola: %s"

-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
+#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
 msgid "Advanced Content Filter"
 msgstr "Filtro Avanzato Contenuti"

-#: advancedcontentfilter.php:203
+#: advancedcontentfilter.php:224
 msgid "Back to Addon Settings"
 msgstr "Torna alle impostazioni del componente aggiuntivo"

-#: advancedcontentfilter.php:205
+#: advancedcontentfilter.php:226
 msgid "Add a Rule"
 msgstr "Aggiungi una regola"

-#: advancedcontentfilter.php:206
+#: advancedcontentfilter.php:227
 msgid "Help"
 msgstr "Aiuto"

-#: advancedcontentfilter.php:207
+#: advancedcontentfilter.php:228
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the <a href=\"advancedcontentfilter/help\">help page</a>."
+"the help page."
 msgstr ""
 "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>."
+"operazioni e variabili disponibili, controlla la pagina di aiuto."

-#: advancedcontentfilter.php:208
+#: advancedcontentfilter.php:229
 msgid "Your rules"
 msgstr "Le tue regole"

-#: advancedcontentfilter.php:209
+#: advancedcontentfilter.php:230
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@ -64,110 +67,106 @@ msgstr ""
 "Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui "
 "sopra a fianco al titolo."

-#: advancedcontentfilter.php:210
+#: advancedcontentfilter.php:231
 msgid "Disabled"
 msgstr "Disabilitato"

-#: advancedcontentfilter.php:211
+#: advancedcontentfilter.php:232
 msgid "Enabled"
 msgstr "Abilitato"

-#: advancedcontentfilter.php:212
+#: advancedcontentfilter.php:233
 msgid "Disable this rule"
 msgstr "Diabilita questa regola"

-#: advancedcontentfilter.php:213
+#: advancedcontentfilter.php:234
 msgid "Enable this rule"
 msgstr "Abilita questa regola"

-#: advancedcontentfilter.php:214
+#: advancedcontentfilter.php:235
 msgid "Edit this rule"
 msgstr "Modifica questa regola"

-#: advancedcontentfilter.php:215
+#: advancedcontentfilter.php:236
 msgid "Edit the rule"
 msgstr "Modifica la regola"

-#: advancedcontentfilter.php:216
+#: advancedcontentfilter.php:237
 msgid "Save this rule"
 msgstr "Salva questa regola"

-#: advancedcontentfilter.php:217
+#: advancedcontentfilter.php:238
 msgid "Delete this rule"
 msgstr "Elimina questa regola"

-#: advancedcontentfilter.php:218
+#: advancedcontentfilter.php:239
 msgid "Rule"
 msgstr "Regola"

-#: advancedcontentfilter.php:219
+#: advancedcontentfilter.php:240
 msgid "Close"
 msgstr "Chiudi"

-#: advancedcontentfilter.php:220
+#: advancedcontentfilter.php:241
 msgid "Add new rule"
 msgstr "Aggiungi nuova regola"

-#: advancedcontentfilter.php:221
+#: advancedcontentfilter.php:242
 msgid "Rule Name"
 msgstr "Nome Regola"

-#: advancedcontentfilter.php:222
+#: advancedcontentfilter.php:243
 msgid "Rule Expression"
 msgstr "Espressione Regola"

-#: 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
+#: advancedcontentfilter.php:244
 msgid "Cancel"
 msgstr "Annulla"

-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
+#: advancedcontentfilter.php:295
+msgid "This addon requires this node having at least one post"
+msgstr ""
+
+#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
+#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
 msgid "You must be logged in to use this method"
 msgstr "Devi essere autenticato per usare questo metodo"

-#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:379
+#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
+#: advancedcontentfilter.php:418
 msgid "Invalid form security token, please refresh the page."
 msgstr "Token di sicurezza invalido, aggiorna la pagina."

-#: advancedcontentfilter.php:328
+#: advancedcontentfilter.php:363
 msgid "The rule name and expression are required."
 msgstr "Il nome e l'espressione della regola sono richiesti."

-#: advancedcontentfilter.php:340
+#: advancedcontentfilter.php:377
 msgid "Rule successfully added"
 msgstr "Regola aggiunta con successo"

-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "La regola non esiste o non ti appartiene."

-#: advancedcontentfilter.php:369
+#: advancedcontentfilter.php:408
 msgid "Rule successfully updated"
 msgstr "Regola aggiornata con successo"

-#: advancedcontentfilter.php:390
+#: advancedcontentfilter.php:431
 msgid "Rule successfully deleted"
 msgstr "Regola eliminata con successo"

-#: advancedcontentfilter.php:400
+#: advancedcontentfilter.php:441
 msgid "Missing argument: guid."
 msgstr "Argomento mancante: guid."

-#: advancedcontentfilter.php:406
+#: advancedcontentfilter.php:449
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Messaggio con guid %s sconosciuto"

-#: src/middlewares.php:28
+#: src/middlewares.php:49
 msgid "Method not found"
 msgstr "Metodo non trovato"
--- a/advancedcontentfilter/lang/it/strings.php
+++ b/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);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $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 <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['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['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,7 +26,6 @@ $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.';
--- a/audon/README.md
+++ b/audon/README.md
@ -0,0 +1,6 @@
+Audon Addon
+=============
+
+This is a quick and dirty addon to add a [Audon][1] website as an app. This Addon based on webrtc. Audon is a service of realtime audio chat 
+
+[1]: https://codeberg.org/nmkj/audon
--- a/audon/audon.php
+++ b/audon/audon.php
@ -0,0 +1,69 @@
+<?php
+/*
+ * Name: Audon Application
+ * Description: add a Audon instance. Based on webRTC Addon
+ * Version: 0.1
+ * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
+ * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
+ * Author: Matthias Ebers <https://loma.ml/profile/feb>
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
+function audon_install()
+{
+	Hook::register('app_menu', __FILE__, 'audon_app_menu');
+}
+
+function audon_app_menu(array &$b)
+{
+	$b['app_menu'][] = '<div class="app-title"><a href="audon">' . DI::l10n()->t('Audon Audiochat') . '</a></div>';
+}
+
+function audon_addon_admin(string &$o)
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/audon/');
+	$o = Renderer::replaceMacros($t, [
+		'$submit'   => DI::l10n()->t('Save Settings'), 
+		'$audonurl' => [
+			'audonurl', 
+			DI::l10n()->t('Audon Base URL'), 
+			DI::config()->get('audon','audonurl'), 
+			DI::l10n()->t('Page your users will create an Audon audio chat room on. For example you could use https://audon.space.'), 
+		], 
+	]);
+}
+
+function audon_addon_admin_post()
+{
+	DI::config()->set('audon', 'audonurl', trim($_POST['audonurl'] ?? ''));
+}
+
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function audon_module() {}
+
+function audon_content(): string
+{
+	$o = '';
+
+	/* landingpage to create chatrooms */
+	$audonurl = DI::config()->get('audon', 'audonurl');
+
+
+	/* embedd the landing page in an iframe */
+	$o .= '<h2>' . DI::l10n()->t('Audio Chat') . '</h2>';
+	$o .= '<p>' . DI::l10n()->t('Audon is an audio conferencing tool. Connect your account to Audon and create a room. Share the generated link to talk to other participants.') . '</p>';
+	if ($audonurl == '') {
+		$o .= '<p>' . DI::l10n()->t('Please contact your Friendica administrator to remind them to configure the Audon addon.') . '</p>';
+	} else {
+		$o .= '<iframe src="' . $audonurl . '" width="740px" height="600px"></iframe>';
+	}
+
+	return $o;
+}
--- a/audon/lang/C/messages.po
+++ b/audon/lang/C/messages.po
@ -0,0 +1,52 @@
+# ADDON audon
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica audon addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-08-18 18:23+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: audon.php:22
+msgid "Audon Audiochat"
+msgstr ""
+
+#: audon.php:29
+msgid "Save Settings"
+msgstr ""
+
+#: audon.php:32
+msgid "Audon Base URL"
+msgstr ""
+
+#: audon.php:34
+msgid ""
+"Page your users will create an Audon audio chat room on. For example you "
+"could use https://audon.space."
+msgstr ""
+
+#: audon.php:60
+msgid "Audio Chat"
+msgstr ""
+
+#: audon.php:61
+msgid ""
+"Audon is an audio conferencing tool. Connect your account to Audon and "
+"create a room. Share the generated link to talk to other participants."
+msgstr ""
+
+#: audon.php:63
+msgid ""
+"Please contact your Friendica administrator to remind them to configure the "
+"Audon addon."
+msgstr ""
--- a/audon/templates/admin.tpl
+++ b/audon/templates/admin.tpl
@ -0,0 +1,2 @@
+{{include file="field_input.tpl" field=$audonurl}}
+<button type="submit">{{$submit}}</button>
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@ -34,7 +34,7 @@ function birdavatar_install()
 /**
 * Bird avatar user settings page
 */
-function birdavatar_addon_settings(App $a, array &$data)
+function birdavatar_addon_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
@ -62,14 +62,14 @@ function birdavatar_addon_settings(App $a, array &$data)
 /**
 * Bird avatar user settings POST handle
 */
-function birdavatar_addon_settings_post(App $a, &$s)
+function birdavatar_addon_settings_post(&$s)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}

 	if (!empty($_POST['birdavatar-usebird'])) {
-		$url = DI::baseUrl()->get() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
+		$url = DI::baseUrl() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();

 		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
 		if (!DBA::isResult($self)) {
@ -114,16 +114,15 @@ function birdavatar_addon_settings_post(App $a, &$s)
 /**
 * Returns the URL to the bird avatar
 *
- * @param $a array
 * @param &$b array
 */
-function birdavatar_lookup(App $a, array &$b)
+function birdavatar_lookup(array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
-		$url = DI::baseUrl()->get() . '/birdavatar/' . $user['uid'];
+		$url = DI::baseUrl() . '/birdavatar/' . $user['uid'];
 	} else {
-		$url = DI::baseUrl()->get() . '/birdavatar/' . md5(trim(strtolower($b['email'])));
+		$url = DI::baseUrl() . '/birdavatar/' . md5(trim(strtolower($b['email'])));
 	}

 	switch ($b['size']) {
@ -149,7 +148,7 @@ function birdavatar_module() {}
 * @throws NotFoundException
 *
 */
-function birdavatar_content(App $a)
+function birdavatar_content()
 {
 	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
 		throw new NotFoundException(); // this should be catched on index and show default "not found" page.
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@ -55,7 +55,7 @@ function blackout_install() {
 	Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }

-function blackout_redirect (App $a, $b)
+function blackout_redirect ($b)
 {
 	// if we have a logged in user, don't throw her out
 	if (DI::userSession()->getLocalUserId()) {
@ -83,7 +83,7 @@ function blackout_redirect (App $a, $b)
 	}
 }

-function blackout_addon_admin(App $a, string &$o)
+function blackout_addon_admin(string &$o)
 {
 	$mystart = DI::config()->get('blackout','begindate');
 	if (! is_string($mystart)) { $mystart = 'YYYY-MM-DD hh:mm'; }
@ -112,7 +112,7 @@ function blackout_addon_admin(App $a, string &$o)
 	]);
 }

-function blackout_addon_admin_post (App $a)
+function blackout_addon_admin_post ()
 {
 	DI::config()->set('blackout', 'begindate', trim($_POST['startdate']));
 	DI::config()->set('blackout', 'enddate', trim($_POST['enddate']));
--- a/blackout/lang/de/messages.po
+++ b/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: 2021-05-23 19:26+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"PO-Revision-Date: 2014-06-22 11:19+0000\n"
+"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@ -8,9 +8,7 @@
 *
 */

-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\System;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
@ -24,7 +22,7 @@ function blockbot_install()
 	Hook::register('init_1', __FILE__, 'blockbot_init_1');
 }

-function blockbot_addon_admin(App $a, string &$o)
+function blockbot_addon_admin(string &$o)
 {
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/blockbot/');

@ -36,14 +34,14 @@ function blockbot_addon_admin(App $a, string &$o)
 	]);
 }

-function blockbot_addon_admin_post(App $a)
+function blockbot_addon_admin_post()
 {
 	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }

-function blockbot_init_1(App $a)
+function blockbot_init_1()
 {
 	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		return;
@ -52,12 +50,15 @@ function blockbot_init_1(App $a)
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];

 	// List of "good" crawlers
-	$good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
+	$good_agents = [
+		'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 = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
+	$agents = [
+		'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/',
@ -79,7 +80,8 @@ function blockbot_init_1(App $a)
 		'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);
@ -114,7 +116,8 @@ function blockbot_init_1(App $a)
 	}

 	// List of false positives' strings of known "good" agents.
-	$agents = ['curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
+	$agents = [
+		'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',
@ -122,7 +125,8 @@ function blockbot_init_1(App $a)
 		'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);
@ -130,11 +134,11 @@ function blockbot_init_1(App $a)

 	foreach ($agents as $agent) {
 		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			logger::notice('False positive', $logdata);
+			logger::info('False positive', $logdata);
 			return;
 		}
 	}

-	logger::info('Blocked bot', $logdata);
+	logger::notice('Blocked bot', $logdata);
 	throw new ForbiddenException('Bots are not allowed');
 }
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@ -1,229 +0,0 @@
-<?php
-/**
- * Name: blockem
- * Description: Allows users to hide content by collapsing posts and replies.
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * Author: Roland Haeder <https://f.haeder.net/roland>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Util\Strings;
-
-global $blockem_words;
-
-function blockem_install()
-{
-	Hook::register('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
-	Hook::register('display_item'               , 'addon/blockem/blockem.php', 'blockem_display_item');
-	Hook::register('addon_settings'             , 'addon/blockem/blockem.php', 'blockem_addon_settings');
-	Hook::register('addon_settings_post'        , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-	Hook::register('conversation_start'         , 'addon/blockem/blockem.php', 'blockem_conversation_start');
-	Hook::register('item_photo_menu'            , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
-	Hook::register('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
-}
-
-function blockem_addon_settings(App $a, array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$words   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'blockem', 'words', '');
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/blockem/');
-	$html = Renderer::replaceMacros($t, [
-		'$info'    => DI::l10n()->t("Hides user's content by collapsing posts. Also replaces their avatar with generic image."),
-		'$words'   => ['blockem-words', DI::l10n()->t('Comma separated profile URLS:'), $words],
-	]);
-
-	$data = [
-		'addon' => 'blockem',
-		'title' => DI::l10n()->t('Blockem'),
-		'html'  => $html,
-	];
-}
-
-function blockem_addon_settings_post(App $a, array &$b)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (!empty($_POST['blockem-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'blockem', 'words', trim($_POST['blockem-words']));
-	}
-}
-
-function blockem_enotify_store(App $a, array &$b)
-{
-	$words = DI::pConfig()->get($b['uid'], 'blockem', 'words');
-
-	if ($words) {
-		$arr = explode(',', $words);
-	} else {
-		return;
-	}
-
-	$found = false;
-
-	if (count($arr)) {
-		foreach ($arr as $word) {
-			if (!strlen(trim($word))) {
-				continue;
-			}
-
-			if (Strings::compareLink($b['url'], $word)) {
-				$found = true;
-				break;
-			}
-		}
-	}
-
-	if ($found) {
-		// empty out the fields
-		$b = [];
-	}
-}
-
-function blockem_prepare_body_content_filter(App $a, array &$hook_data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$profiles_string = null;
-
-	if (DI::userSession()->getLocalUserId()) {
-		$profiles_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'blockem', 'words');
-	}
-
-	if ($profiles_string) {
-		$profiles_array = explode(',', $profiles_string);
-	} else {
-		return;
-	}
-
-	$found = false;
-
-	foreach ($profiles_array as $word) {
-		if (Strings::compareLink($hook_data['item']['author-link'], trim($word))) {
-			$found = true;
-			break;
-		}
-	}
-
-	if ($found) {
-		$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered user: %s', $hook_data['item']['author-name']);
-	}
-}
-
-function blockem_display_item(App $a, array &$b = null)
-{
-	if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) {
-		$b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg";
-	}
-}
-
-function blockem_conversation_start(App $a, array &$b)
-{
-	global $blockem_words;
-
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'blockem', 'words');
-
-	if ($words) {
-		$blockem_words = explode(',', $words);
-	}
-
-	DI::page()['htmlhead'] .= <<< EOT
-
-<script>
-function blockemBlock(author) {
-	$.get('blockem?block=' +author, function(data) {
-		location.reload(true);
-	});
-}
-function blockemUnblock(author) {
-	$.get('blockem?unblock=' +author, function(data) {
-		location.reload(true);
-	});
-}
-</script>
-
-EOT;
-}
-
-function blockem_item_photo_menu(App $a, array &$b)
-{
-	global $blockem_words;
-
-	if (!DI::userSession()->getLocalUserId() || $b['item']['self']) {
-		return;
-	}
-
-	$blocked = false;
-	$author = $b['item']['author-link'];
-
-	if (!empty($blockem_words)) {
-		foreach($blockem_words as $bloke) {
-			if (Strings::compareLink($bloke,$author)) {
-				$blocked = true;
-				break;
-			}
-		}
-	}
-	if ($blocked) {
-		$b['menu'][DI::l10n()->t('Unblock Author')] = 'javascript:blockemUnblock(\'' . $author . '\');';
-	} else {
-		$b['menu'][DI::l10n()->t('Block Author')] = 'javascript:blockemBlock(\'' . $author . '\');';
-	}
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function blockem_module() {}
-
-function blockem_init(App $a)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'blockem', 'words');
-
-	if (array_key_exists('block', $_GET) && $_GET['block']) {
-		if (strlen($words)) {
-			$words .= ',';
-		}
-
-		$words .= trim($_GET['block']);
-	}
-
-	if (array_key_exists('unblock', $_GET) && $_GET['unblock']) {
-		$arr = explode(',',$words);
-		$newarr = [];
-
-		if (count($arr)) {
-			foreach ($arr as $x) {
-				if (!Strings::compareLink(trim($x), trim($_GET['unblock']))) {
-					$newarr[] = $x;
-				}
-			}
-		}
-
-		$words = implode(',', $newarr);
-	}
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'blockem', 'words', $words);
-	exit();
-}
--- a/blockem/lang/C/messages.po
+++ b/blockem/lang/C/messages.po
@ -1,45 +0,0 @@
-# ADDON blockem
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr ""
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr ""
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr ""
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr ""
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr ""
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr ""
--- a/blockem/lang/ar/messages.po
+++ b/blockem/lang/ar/messages.po
@ -1,52 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# 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-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 08:15+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\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"
-
-#: blockem.php:42 blockem.php:46
-msgid "Blockem"
-msgstr "احجبه<br>"
-
-#: blockem.php:50
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "إخفاء محتوى المستخدم عن طريق تصغير المشاركات. و استبدال الصورة الرمزية الخاصة بهم بصورة عامة."
-
-#: blockem.php:51
-msgid "Comma separated profile URLS:"
-msgstr "عناوين الملفات الشخصية مفصولة بفواصل:"
-
-#: blockem.php:55
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: blockem.php:131
-#, php-format
-msgid "Filtered user: %s"
-msgstr "ترشيح المستخدم :1%s"
-
-#: blockem.php:190
-msgid "Unblock Author"
-msgstr "ألغ الحجب عن المدون"
-
-#: blockem.php:192
-msgid "Block Author"
-msgstr "احجب المدون"
--- a/blockem/lang/ar/strings.php
+++ b/blockem/lang/ar/strings.php
@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-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['Blockem'] = 'احجبه<br>';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'إخفاء محتوى المستخدم عن طريق تصغير المشاركات. و استبدال الصورة الرمزية الخاصة بهم بصورة عامة.';
-$a->strings['Comma separated profile URLS:'] = 'عناوين الملفات الشخصية مفصولة بفواصل:';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Filtered user: %s'] = 'ترشيح المستخدم :1%s';
-$a->strings['Unblock Author'] = 'ألغ الحجب عن المدون';
-$a->strings['Block Author'] = 'احجب المدون';
--- a/blockem/lang/ca/messages.po
+++ b/blockem/lang/ca/messages.po
@ -1,59 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Joan Bar <friendica@tutanota.com>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2019-10-14 11:50+0000\n"
-"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Amaga el contingut de l'usuari mitjançant la publicació col·lapsada. També substitueix el seu avatar per una imatge genèrica"
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "URL de perfil separats per comes:"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Desa la configuració"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "S'ha desat la configuració de BLOCKEM."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Usuari filtrat:%s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Desbloca l'autor"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Autor de bloc"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "S'ha actualitzat la configuració de blockem"
--- a/blockem/lang/ca/strings.php
+++ b/blockem/lang/ca/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ca")) {
-function string_plural_select_ca($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Amaga el contingut de l\'usuari mitjançant la publicació col·lapsada. També substitueix el seu avatar per una imatge genèrica';
-$a->strings['Comma separated profile URLS:'] = 'URL de perfil separats per comes:';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['BLOCKEM Settings saved.'] = 'S\'ha desat la configuració de BLOCKEM.';
-$a->strings['Filtered user: %s'] = 'Usuari filtrat:%s';
-$a->strings['Unblock Author'] = 'Desbloca l\'autor';
-$a->strings['Block Author'] = 'Autor de bloc';
-$a->strings['blockem settings updated'] = 'S\'ha actualitzat la configuració de blockem';
--- a/blockem/lang/cs/messages.po
+++ b/blockem/lang/cs/messages.po
@ -1,60 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2018-08-18 12:25+0000\n"
-"Last-Translator: Aditoo\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"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Skrývá uživatelský obsah zabalením příspěvků. Navíc nahrazuje avatar generickým obrázkem."
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "URL adresy profilů, oddělené čárkami:"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Uložit nastavení"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "Nastavení BLOCKEM uložena."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Filtrovaný uživatel: %s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Odblokovat autora"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Zablokovat autora"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "nastavení blockem aktualizována"
--- a/blockem/lang/cs/strings.php
+++ b/blockem/lang/cs/strings.php
@ -1,16 +0,0 @@
-<?php
-
-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; }
-}}
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Skrývá uživatelský obsah zabalením příspěvků. Navíc nahrazuje avatar generickým obrázkem.';
-$a->strings['Comma separated profile URLS:'] = 'URL adresy profilů, oddělené čárkami:';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['BLOCKEM Settings saved.'] = 'Nastavení BLOCKEM uložena.';
-$a->strings['Filtered user: %s'] = 'Filtrovaný uživatel: %s';
-$a->strings['Unblock Author'] = 'Odblokovat autora';
-$a->strings['Block Author'] = 'Zablokovat autora';
-$a->strings['blockem settings updated'] = 'nastavení blockem aktualizována';
--- a/blockem/lang/da-dk/messages.po
+++ b/blockem/lang/da-dk/messages.po
@ -1,47 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Skjul brugers indhold ved at kollapse deres opslag. Erstatter også deres avatar med et generisk billede."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "Kommasepareret liste over profil-URL's:"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "Blokdem"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Filtreret bruger: %s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Fjern blokering af forfatter"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Blokér forfatter"
--- a/blockem/lang/da-dk/strings.php
+++ b/blockem/lang/da-dk/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Skjul brugers indhold ved at kollapse deres opslag. Erstatter også deres avatar med et generisk billede.';
-$a->strings['Comma separated profile URLS:'] = 'Kommasepareret liste over profil-URL\'s:';
-$a->strings['Blockem'] = 'Blokdem';
-$a->strings['Filtered user: %s'] = 'Filtreret bruger: %s';
-$a->strings['Unblock Author'] = 'Fjern blokering af forfatter';
-$a->strings['Block Author'] = 'Blokér forfatter';
--- a/blockem/lang/de/messages.po
+++ b/blockem/lang/de/messages.po
@ -1,50 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Andreas H., 2018
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\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"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Verbirgt Inhalte von Benutzern durch Zusammenklappen der Beiträge. Des Weiteren wird das Profilbild durch einen generischen Avatar ersetzt."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "Komma-separierte Liste von Profil-URLs"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Gefilterte Person: %s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Autor freischalten"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Autor blockieren"
--- a/blockem/lang/de/strings.php
+++ b/blockem/lang/de/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Verbirgt Inhalte von Benutzern durch Zusammenklappen der Beiträge. Des Weiteren wird das Profilbild durch einen generischen Avatar ersetzt.';
-$a->strings['Comma separated profile URLS:'] = 'Komma-separierte Liste von Profil-URLs';
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Filtered user: %s'] = 'Gefilterte Person: %s';
-$a->strings['Unblock Author'] = 'Autor freischalten';
-$a->strings['Block Author'] = 'Autor blockieren';
--- a/blockem/lang/en-gb/messages.po
+++ b/blockem/lang/en-gb/messages.po
@ -1,59 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Andy H3 <andy@hubup.pro>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-09 13:00+0100\n"
-"PO-Revision-Date: 2018-03-15 14:10+0000\n"
-"Last-Translator: Andy H3 <andy@hubup.pro>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:51 blockem.php:55
-msgid "\"Blockem\""
-msgstr "\"Blockem\""
-
-#: blockem.php:59
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
-
-#: blockem.php:60
-msgid "Comma separated profile URLS:"
-msgstr "Comma separated profile URLs:"
-
-#: blockem.php:64
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: blockem.php:77
-msgid "BLOCKEM Settings saved."
-msgstr "Blockem settings saved."
-
-#: blockem.php:140
-#, php-format
-msgid "Hidden content by %s - Click to open/close"
-msgstr "Hidden content by %s - Reveal/hide"
-
-#: blockem.php:193
-msgid "Unblock Author"
-msgstr "Unblock author"
-
-#: blockem.php:195
-msgid "Block Author"
-msgstr "Block author"
-
-#: blockem.php:227
-msgid "blockem settings updated"
-msgstr "Blockem settings updated"
--- a/blockem/lang/en-gb/strings.php
+++ b/blockem/lang/en-gb/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"Blockem"'] = '"Blockem"';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.';
-$a->strings['Comma separated profile URLS:'] = 'Comma separated profile URLs:';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['BLOCKEM Settings saved.'] = 'Blockem settings saved.';
-$a->strings['Hidden content by %s - Click to open/close'] = 'Hidden content by %s - Reveal/hide';
-$a->strings['Unblock Author'] = 'Unblock author';
-$a->strings['Block Author'] = 'Block author';
-$a->strings['blockem settings updated'] = 'Blockem settings updated';
--- a/blockem/lang/en-us/messages.po
+++ b/blockem/lang/en-us/messages.po
@ -1,61 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Adam Clark <adam@isurf.ca>, 2018
-# Andy H3 <andy@hubup.pro>, 2018
-# R C <miqrogroove@gmail.com>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2018-06-13 02:40+0000\n"
-"Last-Translator: R C <miqrogroove@gmail.com>\n"
-"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_US\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:52 blockem.php:56
-msgid "\"Blockem\""
-msgstr "Blockem"
-
-#: blockem.php:60
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
-
-#: blockem.php:61
-msgid "Comma separated profile URLS:"
-msgstr "Comma-separated profile URLs:"
-
-#: blockem.php:65
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: blockem.php:78
-msgid "BLOCKEM Settings saved."
-msgstr "Blockem settings saved."
-
-#: blockem.php:136
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Filtered user: %s"
-
-#: blockem.php:189
-msgid "Unblock Author"
-msgstr "Unblock author"
-
-#: blockem.php:191
-msgid "Block Author"
-msgstr "Block author"
-
-#: blockem.php:223
-msgid "blockem settings updated"
-msgstr "Blockem settings updated"
--- a/blockem/lang/en-us/strings.php
+++ b/blockem/lang/en-us/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_us")) {
-function string_plural_select_en_us($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"Blockem"'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.';
-$a->strings['Comma separated profile URLS:'] = 'Comma-separated profile URLs:';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['BLOCKEM Settings saved.'] = 'Blockem settings saved.';
-$a->strings['Filtered user: %s'] = 'Filtered user: %s';
-$a->strings['Unblock Author'] = 'Unblock author';
-$a->strings['Block Author'] = 'Block author';
-$a->strings['blockem settings updated'] = 'Blockem settings updated';
--- a/blockem/lang/eo/strings.php
+++ b/blockem/lang/eo/strings.php
@ -1,10 +0,0 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
-$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
-$a->strings["Submit"] = "Sendi";
-$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
-$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi";
-$a->strings["Unblock Author"] = "Malbloki Aŭtoron";
-$a->strings["Block Author"] = "Bloki Aŭtoron";
-$a->strings["blockem settings updated"] = "Ĝisdatigis la blockem agordojn";
--- a/blockem/lang/es/messages.po
+++ b/blockem/lang/es/messages.po
@ -1,53 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Albert, 2018
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# Tupambae.org, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:45+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\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=2; plural=(n != 1);\n"
-
-#: blockem.php:42 blockem.php:46
-msgid "Blockem"
-msgstr "Blockem (Bloquealos)"
-
-#: blockem.php:50
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Oculta el contenido del usuario al colapsar las publicaciones. También reemplaza su avatar con una imagen genérica."
-
-#: blockem.php:51
-msgid "Comma separated profile URLS:"
-msgstr "URLs de perfil separadas por comas:"
-
-#: blockem.php:55
-msgid "Save Settings"
-msgstr "Guardar configuración"
-
-#: blockem.php:131
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Usuario filtrado: %s"
-
-#: blockem.php:190
-msgid "Unblock Author"
-msgstr "Desbloquear autor"
-
-#: blockem.php:192
-msgid "Block Author"
-msgstr "Bloquear autor"
--- a/blockem/lang/es/strings.php
+++ b/blockem/lang/es/strings.php
@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Blockem'] = 'Blockem (Bloquealos)';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Oculta el contenido del usuario al colapsar las publicaciones. También reemplaza su avatar con una imagen genérica.';
-$a->strings['Comma separated profile URLS:'] = 'URLs de perfil separadas por comas:';
-$a->strings['Save Settings'] = 'Guardar configuración';
-$a->strings['Filtered user: %s'] = 'Usuario filtrado: %s';
-$a->strings['Unblock Author'] = 'Desbloquear autor';
-$a->strings['Block Author'] = 'Bloquear autor';
--- a/blockem/lang/fi-fi/messages.po
+++ b/blockem/lang/fi-fi/messages.po
@ -1,60 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2018-04-18 14:44+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:52 blockem.php:56
-msgid "\"Blockem\""
-msgstr "\"Blockem\""
-
-#: blockem.php:60
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr ""
-
-#: blockem.php:61
-msgid "Comma separated profile URLS:"
-msgstr "Profiilien URL-osoitteet pilkulla erotettuina:"
-
-#: blockem.php:65
-msgid "Save Settings"
-msgstr "Tallenna asetukset"
-
-#: blockem.php:78
-msgid "BLOCKEM Settings saved."
-msgstr "Blockem -asetukset tallennettu"
-
-#: blockem.php:136
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Suodatettu käyttäjä: %s"
-
-#: blockem.php:189
-msgid "Unblock Author"
-msgstr "Poista kirjoittaja estolistalta"
-
-#: blockem.php:191
-msgid "Block Author"
-msgstr "Lisää kirjoittaja estolistalle"
-
-#: blockem.php:223
-msgid "blockem settings updated"
-msgstr "blockem -asetukset päivitetty"
--- a/blockem/lang/fi-fi/strings.php
+++ b/blockem/lang/fi-fi/strings.php
@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fi_fi")) {
-function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"Blockem"'] = '"Blockem"';
-$a->strings['Comma separated profile URLS:'] = 'Profiilien URL-osoitteet pilkulla erotettuina:';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['BLOCKEM Settings saved.'] = 'Blockem -asetukset tallennettu';
-$a->strings['Filtered user: %s'] = 'Suodatettu käyttäjä: %s';
-$a->strings['Unblock Author'] = 'Poista kirjoittaja estolistalta';
-$a->strings['Block Author'] = 'Lisää kirjoittaja estolistalle';
-$a->strings['blockem settings updated'] = 'blockem -asetukset päivitetty';
--- a/blockem/lang/fr/messages.po
+++ b/blockem/lang/fr/messages.po
@ -1,50 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# Marie Olive <lacellule101@gmail.com>, 2018
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-# Vladimir Núñez <lapoubelle111@gmail.com>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: Vladimir Núñez <lapoubelle111@gmail.com>, 2018\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "URLs de profil séparées par des virgules:"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "Bloquez-les"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Utilisateur filtré:%s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Débloquer l'Auteur"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Bloquer l'Auteur"
--- a/blockem/lang/fr/strings.php
+++ b/blockem/lang/fr/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Cache le contenu de l\'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique.';
-$a->strings['Comma separated profile URLS:'] = 'URLs de profil séparées par des virgules:';
-$a->strings['Blockem'] = 'Bloquez-les';
-$a->strings['Filtered user: %s'] = 'Utilisateur filtré:%s';
-$a->strings['Unblock Author'] = 'Débloquer l\'Auteur';
-$a->strings['Block Author'] = 'Bloquer l\'Auteur';
--- a/blockem/lang/hu/messages.po
+++ b/blockem/lang/hu/messages.po
@ -1,47 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Elrejti a felhasználók tartalmát a bejegyzések összecsukásával. Ezenkívül lecseréli a profilképeiket egy általános képre."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "Profil URL-ek vesszővel elválasztva:"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Kiszűrt felhasználó: %s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Szerző tiltásának feloldása"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Szerző tiltása"
--- a/blockem/lang/hu/strings.php
+++ b/blockem/lang/hu/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Elrejti a felhasználók tartalmát a bejegyzések összecsukásával. Ezenkívül lecseréli a profilképeiket egy általános képre.';
-$a->strings['Comma separated profile URLS:'] = 'Profil URL-ek vesszővel elválasztva:';
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Filtered user: %s'] = 'Kiszűrt felhasználó: %s';
-$a->strings['Unblock Author'] = 'Szerző tiltásának feloldása';
-$a->strings['Block Author'] = 'Szerző tiltása';
--- a/blockem/lang/is/strings.php
+++ b/blockem/lang/is/strings.php
@ -1,10 +0,0 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\" stillingar";
-$a->strings["Comma separated profile URLS to block"] = "Banna lista af forsíðum (komma á milli)";
-$a->strings["Submit"] = "Senda inn";
-$a->strings["BLOCKEM Settings saved."] = "BLOCKEM stillingar vistaðar.";
-$a->strings["Blocked %s - Click to open/close"] = "%s sett í straff - Smella til að taka úr/setja á";
-$a->strings["Unblock Author"] = "Leyfa notanda";
-$a->strings["Block Author"] = "Banna notanda";
-$a->strings["blockem settings updated"] = "";
--- a/blockem/lang/it/messages.po
+++ b/blockem/lang/it/messages.po
@ -1,59 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014,2018-2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2019-03-11 14:21+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\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=2; plural=(n != 1);\n"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica."
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "URL profili separati da virgola:"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "Impostazioni BLOCKEM salvate."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Utente filtrato: %s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Sblocca autore"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Blocca autore"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "Impostazioni 'blockem' aggiornate."
--- a/blockem/lang/it/strings.php
+++ b/blockem/lang/it/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un\'immagine generica.';
-$a->strings['Comma separated profile URLS:'] = 'URL profili separati da virgola:';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['BLOCKEM Settings saved.'] = 'Impostazioni BLOCKEM salvate.';
-$a->strings['Filtered user: %s'] = 'Utente filtrato: %s';
-$a->strings['Unblock Author'] = 'Sblocca autore';
-$a->strings['Block Author'] = 'Blocca autore';
-$a->strings['blockem settings updated'] = 'Impostazioni \'blockem\' aggiornate.';
--- a/blockem/lang/nb-no/strings.php
+++ b/blockem/lang/nb-no/strings.php
@ -1,10 +0,0 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "";
-$a->strings["Comma separated profile URLS to block"] = "";
-$a->strings["Submit"] = "Lagre";
-$a->strings["BLOCKEM Settings saved."] = "";
-$a->strings["Blocked %s - Click to open/close"] = "";
-$a->strings["Unblock Author"] = "";
-$a->strings["Block Author"] = "";
-$a->strings["blockem settings updated"] = "";
--- a/blockem/lang/nl/messages.po
+++ b/blockem/lang/nl/messages.po
@ -1,60 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# AgnesElisa <agneselisa@disroot.org>, 2018
-# Jeroen De Meerleer <me@jeroened.be>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2018-08-24 13:49+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\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"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Verbergt de inhoud van het bericht van de gebruiker. Daarnaast vervangt het de avatar door een standaardafbeelding."
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "Profiel URLs (kommagescheiden):"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Instellingen opslaan"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "BLOCKEM instellingen opgeslagen."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Gefilterde gebruiker: %s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Deblokkeer Auteur"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Auteur blokkeren"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "blockem instellingen opgeslagen"
--- a/blockem/lang/nl/strings.php
+++ b/blockem/lang/nl/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_nl")) {
-function string_plural_select_nl($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Verbergt de inhoud van het bericht van de gebruiker. Daarnaast vervangt het de avatar door een standaardafbeelding.';
-$a->strings['Comma separated profile URLS:'] = 'Profiel URLs (kommagescheiden):';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['BLOCKEM Settings saved.'] = 'BLOCKEM instellingen opgeslagen.';
-$a->strings['Filtered user: %s'] = 'Gefilterde gebruiker: %s';
-$a->strings['Unblock Author'] = 'Deblokkeer Auteur';
-$a->strings['Block Author'] = 'Auteur blokkeren';
-$a->strings['blockem settings updated'] = 'blockem instellingen opgeslagen';
--- a/blockem/lang/pl/messages.po
+++ b/blockem/lang/pl/messages.po
@ -1,47 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Waldemar Stoczkowski, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2014-06-22 11:20+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "Rozdzielone przecinkami adresy URL profilu:"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "Zablokowanie"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Użytkownik filtrowany: %s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Odblokuj autora"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Zablokuj autora"
--- a/blockem/lang/pl/strings.php
+++ b/blockem/lang/pl/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pl")) {
-function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem.';
-$a->strings['Comma separated profile URLS:'] = 'Rozdzielone przecinkami adresy URL profilu:';
-$a->strings['Blockem'] = 'Zablokowanie';
-$a->strings['Filtered user: %s'] = 'Użytkownik filtrowany: %s';
-$a->strings['Unblock Author'] = 'Odblokuj autora';
-$a->strings['Block Author'] = 'Zablokuj autora';
--- a/blockem/lang/pt-br/strings.php
+++ b/blockem/lang/pt-br/strings.php
@ -1,10 +0,0 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "Configurações \"Blockem\"";
-$a->strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados";
-$a->strings["Submit"] = "Enviar";
-$a->strings["BLOCKEM Settings saved."] = "Configurações BLOCKEM armazenadas.";
-$a->strings["Blocked %s - Click to open/close"] = "Bloqueado %s - Clique para abrir/fechar";
-$a->strings["Unblock Author"] = "Desbloqueie Autor";
-$a->strings["Block Author"] = "Bloqueie Autor";
-$a->strings["blockem settings updated"] = "configurações blockem atualizadas";
--- a/blockem/lang/ro/messages.po
+++ b/blockem/lang/ro/messages.po
@ -1,52 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-07-08 11:43+0000\n"
-"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: blockem.php:53 blockem.php:57
-msgid "\"Blockem\""
-msgstr "\"Blockem\""
-
-#: blockem.php:61
-msgid "Comma separated profile URLS to block"
-msgstr "Adresele URL de profil, de blocat, separate prin virgulă"
-
-#: blockem.php:65
-msgid "Save Settings"
-msgstr "Salvare Configurări"
-
-#: blockem.php:78
-msgid "BLOCKEM Settings saved."
-msgstr "Configurările BLOCKEM au fost salvate."
-
-#: blockem.php:142
-#, php-format
-msgid "Blocked %s - Click to open/close"
-msgstr "%s Blocate - Apăsați pentru a deschide/închide"
-
-#: blockem.php:197
-msgid "Unblock Author"
-msgstr "Deblocare Autor"
-
-#: blockem.php:199
-msgid "Block Author"
-msgstr "Blocare Autor"
-
-#: blockem.php:231
-msgid "blockem settings updated"
-msgstr "Configurările blockem au fost actualizate"
--- a/blockem/lang/ro/strings.php
+++ b/blockem/lang/ro/strings.php
@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ro")) {
-function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
-}}
-$a->strings['"Blockem"'] = '"Blockem"';
-$a->strings['Comma separated profile URLS to block'] = 'Adresele URL de profil, de blocat, separate prin virgulă';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['BLOCKEM Settings saved.'] = 'Configurările BLOCKEM au fost salvate.';
-$a->strings['Blocked %s - Click to open/close'] = '%s Blocate - Apăsați pentru a deschide/închide';
-$a->strings['Unblock Author'] = 'Deblocare Autor';
-$a->strings['Block Author'] = 'Blocare Autor';
-$a->strings['blockem settings updated'] = 'Configurările blockem au fost actualizate';
--- a/blockem/lang/ru/messages.po
+++ b/blockem/lang/ru/messages.po
@ -1,60 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# Stanislav N. <pztrn@pztrn.name>, 2017-2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
-"PO-Revision-Date: 2020-04-23 14:13+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: blockem.php:54 blockem.php:58
-msgid "Blockem"
-msgstr "Blockem"
-
-#: blockem.php:62
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию."
-
-#: blockem.php:63
-msgid "Comma separated profile URLS:"
-msgstr "URL профилей, разделенные запятыми:"
-
-#: blockem.php:67
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr "BLOCKEM Настройки сохранены."
-
-#: blockem.php:143
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Отфильтрованный пользователь: %s"
-
-#: blockem.php:202
-msgid "Unblock Author"
-msgstr "Разблокировать автора"
-
-#: blockem.php:204
-msgid "Block Author"
-msgstr "Блокировать автора"
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr "Настройки Blockem обновлены"
--- a/blockem/lang/ru/strings.php
+++ b/blockem/lang/ru/strings.php
@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Blockem'] = 'Blockem';
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию.';
-$a->strings['Comma separated profile URLS:'] = 'URL профилей, разделенные запятыми:';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['BLOCKEM Settings saved.'] = 'BLOCKEM Настройки сохранены.';
-$a->strings['Filtered user: %s'] = 'Отфильтрованный пользователь: %s';
-$a->strings['Unblock Author'] = 'Разблокировать автора';
-$a->strings['Block Author'] = 'Блокировать автора';
-$a->strings['blockem settings updated'] = 'Настройки Blockem обновлены';
--- a/blockem/lang/sv/messages.po
+++ b/blockem/lang/sv/messages.po
@ -1,47 +0,0 @@
-# ADDON blockem
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockem addon package.
-# 
-# 
-# Translators:
-# Bjoessi <torbjorn.andersson@syte.se>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockem.php:39
-msgid ""
-"Hides user's content by collapsing posts. Also replaces their avatar with "
-"generic image."
-msgstr "Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild."
-
-#: blockem.php:40
-msgid "Comma separated profile URLS:"
-msgstr "Kommaseparerade profiladresser:"
-
-#: blockem.php:45
-msgid "Blockem"
-msgstr "BLOCKEM"
-
-#: blockem.php:120
-#, php-format
-msgid "Filtered user: %s"
-msgstr "Filtrerat på användare:%s"
-
-#: blockem.php:183
-msgid "Unblock Author"
-msgstr "Avblockera författare"
-
-#: blockem.php:185
-msgid "Block Author"
-msgstr "Blockera författare"
--- a/blockem/lang/sv/strings.php
+++ b/blockem/lang/sv/strings.php
@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Hides user\'s content by collapsing posts. Also replaces their avatar with generic image.'] = 'Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild.';
-$a->strings['Comma separated profile URLS:'] = 'Kommaseparerade profiladresser:';
-$a->strings['Blockem'] = 'BLOCKEM';
-$a->strings['Filtered user: %s'] = 'Filtrerat på användare:%s';
-$a->strings['Unblock Author'] = 'Avblockera författare';
-$a->strings['Block Author'] = 'Blockera författare';
--- a/blockem/lang/zh-cn/strings.php
+++ b/blockem/lang/zh-cn/strings.php
@ -1,10 +0,0 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
-$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
-$a->strings["Submit"] = "提交";
-$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
-$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
-$a->strings["Unblock Author"] = "不拦作家";
-$a->strings["Block Author"] = "拦作家";
-$a->strings["blockem settings updated"] = "blockem设置更新了";
--- a/blockem/templates/settings.tpl
+++ b/blockem/templates/settings.tpl
@ -1 +0,0 @@
-{{include file="field_textarea.tpl" field=$words}}
--- a/bluesky/README.md
+++ b/bluesky/README.md
@ -0,0 +1,9 @@
+Bluesky Addon
+==============
+
+This addon supports posting to and receiving posts from Bluesky.
+
+No setup is needed for the admins to make it work for their users.
+
+Bluesky itself is under development as well. It is planned to make it decentral.
+The addon is prepared to support different servers. But it isn't enabled yet.
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
--- a/bluesky/bluesky_feed.php
+++ b/bluesky/bluesky_feed.php
@ -0,0 +1,16 @@
+<?php
+
+use Friendica\Core\Logger;
+
+function bluesky_feed_run($argv, $argc)
+{
+	require_once 'addon/bluesky/bluesky.php';
+
+	if ($argc != 4) {
+		return;
+	}
+
+	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
+	bluesky_fetch_feed($argv[1], $argv[2], $argv[3]);
+	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
+}
--- a/bluesky/bluesky_notifications.php
+++ b/bluesky/bluesky_notifications.php
@ -0,0 +1,16 @@
+<?php
+
+use Friendica\Core\Logger;
+
+function bluesky_notifications_run($argv, $argc)
+{
+	require_once 'addon/bluesky/bluesky.php';
+
+	if ($argc != 3) {
+		return;
+	}
+
+	Logger::notice('importing notifications - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+	bluesky_fetch_notifications($argv[1], $argv[2]);
+	Logger::notice('importing notifications - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+}
--- a/bluesky/bluesky_timeline.php
+++ b/bluesky/bluesky_timeline.php
@ -0,0 +1,16 @@
+<?php
+
+use Friendica\Core\Logger;
+
+function bluesky_timeline_run($argv, $argc)
+{
+	require_once 'addon/bluesky/bluesky.php';
+
+	if ($argc != 3) {
+		return;
+	}
+
+	Logger::notice('importing timeline - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+	bluesky_fetch_timeline($argv[1], $argv[2]);
+	Logger::notice('importing timeline - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+}
--- a/bluesky/lang/C/messages.po
+++ b/bluesky/lang/C/messages.po
@ -0,0 +1,116 @@
+# ADDON bluesky
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica bluesky addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-06 06:30+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: bluesky.php:336
+msgid "Enable Bluesky Post Addon"
+msgstr ""
+
+#: bluesky.php:337
+msgid "Post to Bluesky by default"
+msgstr ""
+
+#: bluesky.php:338
+msgid "Import the remote timeline"
+msgstr ""
+
+#: bluesky.php:339
+msgid "Import the pinned feeds"
+msgstr ""
+
+#: bluesky.php:339
+msgid ""
+"When activated, Posts will be imported from all the feeds that you pinned in "
+"Bluesky."
+msgstr ""
+
+#: bluesky.php:340
+msgid "Personal Data Server"
+msgstr ""
+
+#: bluesky.php:340
+msgid "The personal data server (PDS) is the system that hosts your profile."
+msgstr ""
+
+#: bluesky.php:341
+msgid "Bluesky handle"
+msgstr ""
+
+#: bluesky.php:342
+msgid "Bluesky DID"
+msgstr ""
+
+#: bluesky.php:342
+msgid ""
+"This is the unique identifier. It will be fetched automatically, when the "
+"handle is entered."
+msgstr ""
+
+#: bluesky.php:343
+msgid "Bluesky app password"
+msgstr ""
+
+#: bluesky.php:343
+msgid ""
+"Please don't add your real password here, but instead create a specific app "
+"password in the Bluesky settings."
+msgstr ""
+
+#: bluesky.php:349
+msgid "Bluesky Import/Export"
+msgstr ""
+
+#: bluesky.php:359
+msgid ""
+"You are not authenticated. Please enter your handle and the app password."
+msgstr ""
+
+#: bluesky.php:379
+msgid ""
+"You are authenticated to Bluesky. For security reasons the password isn't "
+"stored."
+msgstr ""
+
+#: bluesky.php:381
+msgid ""
+"The communication with the personal data server service (PDS) is established."
+msgstr ""
+
+#: bluesky.php:383
+msgid "Communication issues with the personal data server service (PDS)."
+msgstr ""
+
+#: bluesky.php:385
+msgid ""
+"The DID for the provided handle could not be detected. Please check if you "
+"entered the correct handle."
+msgstr ""
+
+#: bluesky.php:387
+msgid "The personal data server service (PDS) could not be detected."
+msgstr ""
+
+#: bluesky.php:389
+msgid ""
+"The authentication with the provided handle and password failed. Please "
+"check if you entered the correct password."
+msgstr ""
+
+#: bluesky.php:457
+msgid "Post to Bluesky"
+msgstr ""
--- a/bluesky/lang/de/messages.po
+++ b/bluesky/lang/de/messages.po
@ -0,0 +1,89 @@
+# ADDON bluesky
+# Copyright (C)
+# This file is distributed under the same license as the Friendica bluesky addon package.
+# 
+# 
+# Translators:
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2023
+# haheute <haheute@posteo.de>, 2023
+# Raroun, 2023
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-24 05:52+0000\n"
+"PO-Revision-Date: 2023-05-24 06:02+0000\n"
+"Last-Translator: Raroun, 2023\n"
+"Language-Team: German (https://app.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"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bluesky.php:100
+msgid ""
+"You are authenticated to Bluesky. For security reasons the password isn't "
+"stored."
+msgstr ""
+"Du bist auf Bluesky authentifiziert. Aus Sicherheitsgründen wird das "
+"Passwort nicht gespeichert."
+
+#: bluesky.php:100
+msgid "You are not authenticated. Please enter the app password."
+msgstr ""
+"Du bist derzeit nicht authentifiziert. Bitte gib dein App Passwort ein."
+
+#: bluesky.php:104
+msgid "Enable Bluesky Post Addon"
+msgstr "Bluesky Post Addon aktivieren"
+
+#: bluesky.php:105
+msgid "Post to Bluesky by default"
+msgstr "Standardmäßig auf Bluesky veröffentlichen"
+
+#: bluesky.php:106
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Timeline"
+
+#: bluesky.php:107
+msgid "Bluesky host"
+msgstr "Bluesky Host"
+
+#: bluesky.php:108
+msgid "Bluesky handle"
+msgstr "Bluesky Handle"
+
+#: bluesky.php:109
+msgid "Bluesky DID"
+msgstr "Bluesky DID"
+
+#: bluesky.php:109
+msgid ""
+"This is the unique identifier. It will be fetched automatically, when the "
+"handle is entered."
+msgstr ""
+"Sobald das Handle eingegeben ist, wird diese einzigartige Kennung "
+"automatisch abgerufen."
+
+#: bluesky.php:110
+msgid "Bluesky app password"
+msgstr "Bluesky App Passwort"
+
+#: bluesky.php:110
+msgid ""
+"Please don't add your real password here, but instead create a specific app "
+"password in the Bluesky settings."
+msgstr ""
+"Bitte verwende hier nicht dein echtes Passwort, sondern stattdessen ein "
+"speziell für diese App in den Bluesky Einstellungen festgelegtes Passwort."
+
+#: bluesky.php:116
+msgid "Bluesky Import/Export"
+msgstr "Bluesky Import/Export"
+
+#: bluesky.php:167
+msgid "Post to Bluesky"
+msgstr "Auf Bluesky veröffentlichen"
--- a/bluesky/lang/de/strings.php
+++ b/bluesky/lang/de/strings.php
@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['You are authenticated to Bluesky. For security reasons the password isn\'t stored.'] = 'Du bist auf Bluesky authentifiziert. Aus Sicherheitsgründen wird das Passwort nicht gespeichert.';
+$a->strings['You are not authenticated. Please enter the app password.'] = 'Du bist derzeit nicht authentifiziert. Bitte gib dein App Passwort ein.';
+$a->strings['Enable Bluesky Post Addon'] = 'Bluesky Post Addon aktivieren';
+$a->strings['Post to Bluesky by default'] = 'Standardmäßig auf Bluesky veröffentlichen';
+$a->strings['Import the remote timeline'] = 'Importiere die entfernte Timeline';
+$a->strings['Bluesky host'] = 'Bluesky Host';
+$a->strings['Bluesky handle'] = 'Bluesky Handle';
+$a->strings['Bluesky DID'] = 'Bluesky DID';
+$a->strings['This is the unique identifier. It will be fetched automatically, when the handle is entered.'] = 'Sobald das Handle eingegeben ist, wird diese einzigartige Kennung automatisch abgerufen.';
+$a->strings['Bluesky app password'] = 'Bluesky App Passwort';
+$a->strings['Please don\'t add your real password here, but instead create a specific app password in the Bluesky settings.'] = 'Bitte verwende hier nicht dein echtes Passwort, sondern stattdessen ein speziell für diese App in den Bluesky Einstellungen festgelegtes Passwort.';
+$a->strings['Bluesky Import/Export'] = 'Bluesky Import/Export';
+$a->strings['Post to Bluesky'] = 'Auf Bluesky veröffentlichen';
--- a/bluesky/lang/zh-cn/messages.po
+++ b/bluesky/lang/zh-cn/messages.po
@ -0,0 +1,80 @@
+# ADDON bluesky
+# Copyright (C)
+# This file is distributed under the same license as the Friendica bluesky addon package.
+# 
+# 
+# Translators:
+# tslmuun, 2023
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-24 05:52+0000\n"
+"PO-Revision-Date: 2023-05-24 06:02+0000\n"
+"Last-Translator: tslmuun, 2023\n"
+"Language-Team: Chinese (China) (https://app.transifex.com/Friendica/teams/12172/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: bluesky.php:100
+msgid ""
+"You are authenticated to Bluesky. For security reasons the password isn't "
+"stored."
+msgstr "您已通过 Bluesky 的身份验证。 出于安全原因，不存储密码。"
+
+#: bluesky.php:100
+msgid "You are not authenticated. Please enter the app password."
+msgstr "您未通过身份验证。 请输入应用密码。"
+
+#: bluesky.php:104
+msgid "Enable Bluesky Post Addon"
+msgstr "启用Bluesky插件"
+
+#: bluesky.php:105
+msgid "Post to Bluesky by default"
+msgstr "默认发布到Bluesky"
+
+#: bluesky.php:106
+msgid "Import the remote timeline"
+msgstr "导入远程时间线"
+
+#: bluesky.php:107
+msgid "Bluesky host"
+msgstr "Bluesky地址"
+
+#: bluesky.php:108
+msgid "Bluesky handle"
+msgstr "Bluesky handle"
+
+#: bluesky.php:109
+msgid "Bluesky DID"
+msgstr "Bluesky DID"
+
+#: bluesky.php:109
+msgid ""
+"This is the unique identifier. It will be fetched automatically, when the "
+"handle is entered."
+msgstr "这是唯一标识符。 输入句柄时，它将自动获取。"
+
+#: bluesky.php:110
+msgid "Bluesky app password"
+msgstr "Bluesky 应用密码"
+
+#: bluesky.php:110
+msgid ""
+"Please don't add your real password here, but instead create a specific app "
+"password in the Bluesky settings."
+msgstr "请不要在此处填写您的真实密码，而是在 Bluesky 设置中创建一个特定的应用程序密码。"
+
+#: bluesky.php:116
+msgid "Bluesky Import/Export"
+msgstr "Bluesky 导入/导出"
+
+#: bluesky.php:167
+msgid "Post to Bluesky"
+msgstr "发布到Bluesky"
--- a/bluesky/lang/zh-cn/strings.php
+++ b/bluesky/lang/zh-cn/strings.php
@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return intval(0);
+}}
+$a->strings['You are authenticated to Bluesky. For security reasons the password isn\'t stored.'] = '您已通过 Bluesky 的身份验证。 出于安全原因，不存储密码。';
+$a->strings['You are not authenticated. Please enter the app password.'] = '您未通过身份验证。 请输入应用密码。';
+$a->strings['Enable Bluesky Post Addon'] = '启用Bluesky插件';
+$a->strings['Post to Bluesky by default'] = '默认发布到Bluesky';
+$a->strings['Import the remote timeline'] = '导入远程时间线';
+$a->strings['Bluesky host'] = 'Bluesky地址';
+$a->strings['Bluesky handle'] = 'Bluesky handle';
+$a->strings['Bluesky DID'] = 'Bluesky DID';
+$a->strings['This is the unique identifier. It will be fetched automatically, when the handle is entered.'] = '这是唯一标识符。 输入句柄时，它将自动获取。';
+$a->strings['Bluesky app password'] = 'Bluesky 应用密码';
+$a->strings['Please don\'t add your real password here, but instead create a specific app password in the Bluesky settings.'] = '请不要在此处填写您的真实密码，而是在 Bluesky 设置中创建一个特定的应用程序密码。';
+$a->strings['Bluesky Import/Export'] = 'Bluesky 导入/导出';
+$a->strings['Post to Bluesky'] = '发布到Bluesky';
--- a/bluesky/templates/connector_settings.tpl
+++ b/bluesky/templates/connector_settings.tpl
@ -0,0 +1,9 @@
+<p>{{$status}}</p>
+{{include file="field_checkbox.tpl" field=$enable}}
+{{include file="field_checkbox.tpl" field=$bydefault}}
+{{include file="field_checkbox.tpl" field=$import}}
+{{include file="field_checkbox.tpl" field=$import_feeds}}
+{{include file="field_input.tpl" field=$pds}}
+{{include file="field_input.tpl" field=$handle}}
+{{include file="field_input.tpl" field=$did}}
+{{include file="field_input.tpl" field=$password}}
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@ -15,7 +15,7 @@ function buglink_install()
 	Hook::register('page_end', 'addon/buglink/buglink.php', 'buglink_active');
 }

-function buglink_active(App $a, string &$b)
+function buglink_active(string &$b)
 {
 	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" rel="noopener noreferrer" title="' . DI::l10n()->t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . DI::l10n()->t('Report Bug') . '" /></a></div>';
 }
--- a/buglink/lang/cs/messages.po
+++ b/buglink/lang/cs/messages.po
@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# 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: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-07-07 18:27+0000\n"
-"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"Last-Translator: michal_s <msupler@gmail.com>, 2014\n"
+"Language-Team: Czech (http://app.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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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"

-#: buglink.php:15
+#: buglink.php:20
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
--- a/buglink/lang/cs/strings.php
+++ b/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)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
+	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['Report Bug'] = 'Nahlásit chybu';
--- a/buglink/lang/de/messages.po
+++ b/buglink/lang/de/messages.po
@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2019-11-10 20:12+0000\n"
-"Last-Translator: René Wagner <apollo@rw-net.de>\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2014-06-22 11:27+0000\n"
+"Last-Translator: René Wagner <apollo@rw-net.de>, 2019\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: buglink.php:15
+#: buglink.php:20
 msgid "Report Bug"
 msgstr "Fehler melden"
--- a/calc/calc.php
+++ b/calc/calc.php
@ -14,7 +14,7 @@ function calc_install() {
 	Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
 }

-function calc_app_menu(App $a, array &$b)
+function calc_app_menu(array &$b)
 {
 	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
 }
@ -26,7 +26,7 @@ function calc_app_menu(App $a, array &$b)
 */
 function calc_module() {}

-function calc_init(App $a)
+function calc_init()
 {
 	$x = <<< EOT

--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@ -35,7 +35,7 @@ function catavatar_install()
 /**
 * Cat avatar user settings page
 */
-function catavatar_addon_settings(App $a, array &$data)
+function catavatar_addon_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
@ -63,14 +63,14 @@ function catavatar_addon_settings(App $a, array &$data)
 /**
 * Cat avatar user settings POST handle
 */
-function catavatar_addon_settings_post(App $a, &$s)
+function catavatar_addon_settings_post(&$s)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}

 	if (!empty($_POST['catavatar-usecat'])) {
-		$url = DI::baseUrl()->get() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
+		$url = DI::baseUrl() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();

 		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
 		if (!DBA::isResult($self)) {
@ -115,16 +115,15 @@ function catavatar_addon_settings_post(App $a, &$s)
 /**
 * Returns the URL to the cat avatar
 *
- * @param $a array
 * @param &$b array
 */
-function catavatar_lookup(App $a, array &$b)
+function catavatar_lookup(array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
-		$url = DI::baseUrl()->get() . '/catavatar/' . $user['uid'];
+		$url = DI::baseUrl() . '/catavatar/' . $user['uid'];
 	} else {
-		$url = DI::baseUrl()->get() . '/catavatar/' . md5(trim(strtolower($b['email'])));
+		$url = DI::baseUrl() . '/catavatar/' . md5(trim(strtolower($b['email'])));
 	}

 	switch($b['size']) {
@ -150,7 +149,7 @@ function catavatar_module() {}
 * @throws NotFoundException
 *
 */
-function catavatar_content(App $a)
+function catavatar_content()
 {
 	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
 		throw new NotFoundException(); // this should be catched on index and show default "not found" page.
--- a/catavatar/lang/de/messages.po
+++ b/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://www.transifex.com/Friendica/teams/12172/de/)\n"
+"Language-Team: German (https://app.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"
--- a/catavatar/lang/fr/messages.po
+++ b/catavatar/lang/fr/messages.po
@ -5,8 +5,7 @@
 # 
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
-# Walter Bulbazor, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
+# Florent C., 2023
 # 
 #, fuzzy
 msgid ""
@ -15,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
+"Last-Translator: Florent C., 2023\n"
+"Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -25,7 +24,7 @@ msgstr ""

 #: catavatar.php:48
 msgid "Set default profile avatar or randomize the cat."
-msgstr "Mettre l'avatar par défaut ou tirer au sort le Chat."
+msgstr "Mettre l'avatar par défaut ou tirer au sort le chat."

 #: catavatar.php:53
 msgid "Cat Avatar Settings"
@ -33,15 +32,15 @@ msgstr "Paramètres de Chat avatar"

 #: catavatar.php:56
 msgid "Use Cat as Avatar"
-msgstr "Utiliser Chat comme avatar"
+msgstr "Utiliser ce Chat"

 #: catavatar.php:57
 msgid "Another random Cat!"
-msgstr "Un autre chat aléatoire !"
+msgstr "Un autre Chat aléatoire !"

 #: catavatar.php:58
 msgid "Reset to email Cat"
-msgstr "Réinitialiser à Chat courriel"
+msgstr "Revenir au Chat par défaut"

 #: catavatar.php:77
 msgid "The cat hadn't found itself."
--- a/catavatar/lang/fr/strings.php
+++ b/catavatar/lang/fr/strings.php
@ -5,11 +5,11 @@ function string_plural_select_fr($n){
 	$n = intval($n);
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Mettre l\'avatar par défaut ou tirer au sort le Chat.';
+$a->strings['Set default profile avatar or randomize the cat.'] = 'Mettre l\'avatar par défaut ou tirer au sort le chat.';
 $a->strings['Cat Avatar Settings'] = 'Paramètres de Chat avatar';
-$a->strings['Use Cat as Avatar'] = 'Utiliser Chat comme avatar';
-$a->strings['Another random Cat!'] = 'Un autre chat aléatoire !';
-$a->strings['Reset to email Cat'] = 'Réinitialiser à Chat courriel';
+$a->strings['Use Cat as Avatar'] = 'Utiliser ce Chat';
+$a->strings['Another random Cat!'] = 'Un autre Chat aléatoire !';
+$a->strings['Reset to email Cat'] = 'Revenir au Chat par défaut';
 $a->strings['The cat hadn\'t found itself.'] = 'Le Chat ne s\'y est pas retrouvé';
 $a->strings['There was an error, the cat ran away.'] = 'Il y a eu une erreur et le chat s\'est enfui';
 $a->strings['Profile Photos'] = 'Photos de profil';
--- a/circle_text/group_text.php
+++ b/circle_text/group_text.php
@ -0,0 +1,64 @@
+<?php
+/**
+ * Name: Circle Text
+ * Description: Disable images in circle edit menu
+ * Version: 1.0
+ * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
+function circle_text_install()
+{
+	Hook::register('addon_settings', __FILE__, 'circle_text_settings');
+	Hook::register('addon_settings_post', __FILE__, 'circle_text_settings_post');
+}
+
+/**
+ *
+ * Callback from the settings post function.
+ * $post contains the $_POST array.
+ * We will make sure we've got a valid user account
+ * and if so set our configuration setting for this person.
+ *
+ */
+
+function circle_text_settings_post(array $post)
+{
+	if (!DI::userSession()->getLocalUserId() || empty($post['circle_text-submit'])) {
+		return;
+	}
+
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit', intval($post['circle_text']));
+}
+
+
+/**
+ *
+ * Called from the Addon Setting form.
+ * Add our own settings info to the page.
+ *
+ */
+
+function circle_text_settings(array &$data)
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
+
+	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit') ??
+		DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit');
+
+	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/circle_text/');
+	$html = Renderer::replaceMacros($t, [
+		'$enabled' => ['circle_text', DI::l10n()->t('Use a text only (non-image) circle selector in the "circle edit" menu'), $enabled],
+	]);
+
+	$data = [
+		'addon' => 'circle_text',
+		'title' => DI::l10n()->t('Circle Text'),
+		'html'  => $html,
+	];
+}
--- a/circle_text/lang/C/messages.po
+++ b/circle_text/lang/C/messages.po
@ -0,0 +1,26 @@
+# ADDON circle_text
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica circle_text addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: group_text.php:56
+msgid "Use a text only (non-image) circle selector in the \"circle edit\" menu"
+msgstr ""
+
+#: group_text.php:61
+msgid "Circle Text"
+msgstr ""
--- a/circle_text/lang/ar/messages.po
+++ b/circle_text/lang/ar/messages.po
@ -0,0 +1,32 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2021-02-21 02:59+0000\n"
+"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\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"
+
+#: group_text.php:62
+msgid "Group Text"
+msgstr "نص المجموعة:"
+
+#: group_text.php:64
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة \"تعديل المجموعة\""
+
+#: group_text.php:70
+msgid "Save Settings"
+msgstr "حفظ الإعدادات"
--- a/circle_text/lang/ar/strings.php
+++ b/circle_text/lang/ar/strings.php
@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_ar")) {
+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['Group Text'] = 'نص المجموعة:';
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة "تعديل المجموعة"';
+$a->strings['Save Settings'] = 'حفظ الإعدادات';
--- a/circle_text/lang/ca/messages.po
+++ b/circle_text/lang/ca/messages.po
@ -0,0 +1,36 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Joan Bar <friendica@tutanota.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2019-10-14 00:45+0000\n"
+"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "La configuració del text del grup s'ha actualitzat."
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Missatge del grup"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú 'Edita grup'"
+
+#: group_text.php:84
+msgid "Submit"
+msgstr "sotmetre's"
--- a/circle_text/lang/ca/strings.php
+++ b/circle_text/lang/ca/strings.php
@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Group Text settings updated.'] = 'La configuració del text del grup s\'ha actualitzat.';
+$a->strings['Group Text'] = 'Missatge del grup';
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú \'Edita grup\'';
+$a->strings['Submit'] = 'sotmetre\'s';
--- a/circle_text/lang/cs/messages.po
+++ b/circle_text/lang/cs/messages.po
@ -0,0 +1,37 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-09-12 09:47+0000\n"
+"Last-Translator: Aditoo\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"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Nastavení Group Text aktualizována."
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Skupinový text"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin."
+
+#: group_text.php:84
+msgid "Submit"
+msgstr "Odeslat"
--- a/circle_text/lang/cs/strings.php
+++ b/circle_text/lang/cs/strings.php
@ -0,0 +1,11 @@
+<?php
+
+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; }
+}}
+$a->strings['Group Text settings updated.'] = 'Nastavení Group Text aktualizována.';
+$a->strings['Group Text'] = 'Skupinový text';
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin.';
+$a->strings['Submit'] = 'Odeslat';
--- a/circle_text/lang/da-dk/messages.po
+++ b/circle_text/lang/da-dk/messages.po
@ -0,0 +1,28 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Anton <dev@atjn.dk>, 2022
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen"
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr "Gruppebesked"
--- a/circle_text/lang/da-dk/strings.php
+++ b/circle_text/lang/da-dk/strings.php
@ -0,0 +1,9 @@
+<?php
+
+if(! function_exists("string_plural_select_da_dk")) {
+function string_plural_select_da_dk($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen';
+$a->strings['Group Text'] = 'Gruppebesked';
--- a/circle_text/lang/de/messages.po
+++ b/circle_text/lang/de/messages.po
@ -0,0 +1,31 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Andreas H., 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 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:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr "Gruppen als Text"
--- a/circle_text/lang/de/strings.php
+++ b/circle_text/lang/de/strings.php
@ -0,0 +1,9 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Beim Bearbeiten von Gruppen Text statt Bilder anzeigen';
+$a->strings['Group Text'] = 'Gruppen als Text';
--- a/circle_text/lang/eo/strings.php
+++ b/circle_text/lang/eo/strings.php
@ -0,0 +1,5 @@
+<?php
+
+$a->strings["Group Text"] = "";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "Sendi";
--- a/circle_text/lang/es/messages.po
+++ b/circle_text/lang/es/messages.po
@ -0,0 +1,33 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# 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-02-01 18:15+0100\n"
+"PO-Revision-Date: 2021-04-01 09:56+0000\n"
+"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\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=2; plural=(n != 1);\n"
+
+#: group_text.php:62
+msgid "Group Text"
+msgstr "Grupo de Texto"
+
+#: group_text.php:64
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\""
+
+#: group_text.php:70
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
--- a/circle_text/lang/es/strings.php
+++ b/circle_text/lang/es/strings.php
@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Group Text'] = 'Grupo de Texto';
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilice sólo el selector de grupo de texto (no imagen) en el menú "edición de grupo"';
+$a->strings['Save Settings'] = 'Guardar Ajustes';
--- a/circle_text/lang/fi-fi/messages.po
+++ b/circle_text/lang/fi-fi/messages.po
@ -0,0 +1,37 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-08 15:51+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Group Text -asetukset päivitetty."
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Group Text"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr ""
+
+#: group_text.php:84
+msgid "Submit"
+msgstr "Lähetä"
--- a/circle_text/lang/fi-fi/strings.php
+++ b/circle_text/lang/fi-fi/strings.php
@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Group Text settings updated.'] = 'Group Text -asetukset päivitetty.';
+$a->strings['Group Text'] = 'Group Text';
+$a->strings['Submit'] = 'Lähetä';
--- a/circle_text/lang/fr/messages.po
+++ b/circle_text/lang/fr/messages.po
@ -0,0 +1,29 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# bob lebonche <lebonche@tutanota.com>, 2021
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Utiliser uniquement un groupe de texte (pas d'image) dans le menu \"groupedit\""
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr "Groupe de texte"
--- a/circle_text/lang/fr/strings.php
+++ b/circle_text/lang/fr/strings.php
@ -0,0 +1,9 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+}}
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utiliser uniquement un groupe de texte (pas d\'image) dans le menu "groupedit"';
+$a->strings['Group Text'] = 'Groupe de texte';
--- a/circle_text/lang/hu/messages.po
+++ b/circle_text/lang/hu/messages.po
@ -0,0 +1,28 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Balázs Úr, 2020-2021
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-23 08:35+0000\n"
+"Last-Translator: Balázs Úr, 2020-2021\n"
+"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:58
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben"
+
+#: group_text.php:63
+msgid "Group Text"
+msgstr "Csoportszöveg"
--- a/circle_text/lang/hu/strings.php
+++ b/circle_text/lang/hu/strings.php
@ -0,0 +1,9 @@
+<?php
+
+if(! function_exists("string_plural_select_hu")) {
+function string_plural_select_hu($n){
+	$n = intval($n);
+	return intval($n != 1);
+}}
+$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben';
+$a->strings['Group Text'] = 'Csoportszöveg';
--- a/circle_text/lang/is/strings.php
+++ b/circle_text/lang/is/strings.php
@ -0,0 +1,5 @@
+<?php
+
+$a->strings["Group Text"] = "";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "Senda inn";
--- a/circle_text/lang/it/messages.po
+++ b/circle_text/lang/it/messages.po
@ -0,0 +1,33 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+# Sylke Vicious <silkevicious@gmail.com>, 2021
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"PO-Revision-Date: 2021-02-16 12:48+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\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=2; plural=(n != 1);\n"
+
+#: group_text.php:62
+msgid "Group Text"
+msgstr "Editor Gruppi Testuale"
+
+#: group_text.php:64
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Usa un selettore testuale (senza immagini) nella pagina \"modifica gruppo\""
+
+#: group_text.php:70
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`{{include file="field_textarea.tpl" field=$words}}`