group membership checked against login instead of DN

2019-11-16 16:07:42 -08:00
3490 changed files with 204752 additions and 168800 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -6,24 +6,5 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+trim_trailing_whitespaces = true
 indent_style = tab
-trim_trailing_whitespace = true
-insert_final_newline = true
-quote_type = single
-max_line_length = off
-
-[*.js]
-quote_type = double
-ij_javascript_use_double_quotes = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2
--- a/.tx/config
+++ b/.tx/config
@ -1,399 +1,399 @@
 [main]
-host = https://api.transifex.com
+host = https://www.transifex.com

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@ -1,69 +0,0 @@
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      event: pull_request
-  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
-    when:
-      event: pull_request
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: '{{ .Repo.Name }}_phpcs_{{ arch }}_{{ os }}'
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      event: pull_request
-  composer_install:
-    image: composer
-    commands:
-      - export COMPOSER_HOME=.composer
-      - ./bin/composer.phar run cs:install
-    when:
-      event: pull_request
-  rebuild_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      rebuild: true
-      cache_key: '{{ .Repo.Name }}_phpcs_{{ arch }}_{{ os }}'
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      event: pull_request
-  check:
-    image: friendicaci/php-cs
-    commands:
-      - cd addon/
-      - if [ ! -z "$${CI_COMMIT_PULL_REQUEST}" ]; then
-          git fetch --no-tags origin ${CI_COMMIT_TARGET_BRANCH};
-          export CHANGED_FILES="$(git diff --name-status $(git merge-base FETCH_HEAD origin/${CI_COMMIT_TARGET_BRANCH})..${CI_COMMIT_SHA} | grep ^A | cut -f2 | sed -e "s/^/addon\\//")";
-        else
-          export CHANGED_FILES="$(git diff --name-status ${CI_COMMIT_SHA} | grep ^A | cut -f2 | sed -e "s/^/addon\\//")";
-        fi
-      - cd ../
-      - /check-php-cs.sh
-    when:
-      event: pull_request
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@ -1,112 +0,0 @@
-# This prevents executing this pipeline at other servers than ci.friendi.ca
-labels:
-  location: friendica
-  type: releaser
-
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  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
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  composer_install:
-    image: friendicaci/php7.4:php7.4.33
-    commands:
-      - export COMPOSER_HOME=.composer
-      - composer validate
-      - composer install --no-dev --optimize-autoloader
-    volumes:
-      - /etc/hosts:/etc/hosts
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  create_artifacts:
-    image: debian
-    commands:
-      - apt-get update
-      - apt-get install bzip2
-      - mkdir ./build
-      - export VERSION="$(cat VERSION)"
-      - export RELEASE="friendica-addons-$VERSION"
-      - export ARTIFACT="$RELEASE.tar.gz"
-      - tar
-        --exclude='.tx'
-        --exclude='.git'
-        --exclude='.editorconfig'
-        --exclude='.gitattributes'
-        --exclude='.gitignore'
-        --exclude='.woodpecker'
-        --exclude='**/*/messages.po'
-        -cvzf ./build/$ARTIFACT addon/
-      - cd ./build
-      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
-      - chmod 664 ./*
-      - ls -lh
-      - cat "$ARTIFACT.sum256"
-      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  sign_artifacts:
-    image: plugins/gpgsign
-    settings:
-      key:
-        from_secret: gpg_key
-      passphrase:
-        from_secret: gpg_password
-      files:
-        - build/*
-      exclude:
-        - build/*.sum256
-      detach_sign: true
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  publish_artifacts:
-    image: alpine
-    commands:
-      - cp -fr build/* /tmp/friendica_files/
-    volumes:
-      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@ -1,37 +0,0 @@
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      event: pull_request
-  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
-    when:
-      event: pull_request
-  build_xgettext:
-    image: friendicaci/transifex
-    commands:
-      - /xgettext-addon.sh
-    when:
-      event: pull_request
-  check:
-    image: friendicaci/transifex
-    commands:
-      - /check-addons.sh
-    when:
-      event: pull_request
-
-branches:
-  exclude: [ stable ]
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@ -1,113 +0,0 @@
-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/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@ -1,105 +0,0 @@
-# This prevents executing this pipeline at other servers than ci.friendi.ca
-labels:
-  location: friendica
-  type: releaser
-
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  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
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  composer_install:
-    image: friendicaci/php7.4:php7.4.33
-    commands:
-      - export COMPOSER_HOME=.composer
-      - composer validate
-      - composer install --no-dev --optimize-autoloader
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-    volumes:
-      - /etc/hosts:/etc/hosts
-  create_artifacts:
-    image: debian
-    commands:
-      - apt-get update
-      - apt-get install bzip2
-      - mkdir ./build
-      - export VERSION="$(cat VERSION)"
-      - export RELEASE="friendica-addons-$VERSION"
-      - export ARTIFACT="$RELEASE.tar.gz"
-      - tar
-        --exclude='.tx'
-        --exclude='.git'
-        --exclude='.editorconfig'
-        --exclude='.gitattributes'
-        --exclude='.gitignore'
-        --exclude='.woodpecker'
-        --exclude='**/*/messages.po'
-        -cvzf ./build/$ARTIFACT addon/
-      - cd ./build
-      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
-      - chmod 664 ./*
-      - ls -lh
-      - cat "$ARTIFACT.sum256"
-      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  sign_artifacts:
-    image: plugins/gpgsign
-    settings:
-      key:
-        from_secret: gpg_key
-      passphrase:
-        from_secret: gpg_password
-      files:
-        - build/*
-      exclude:
-        - build/*.sum256
-      detach_sign: true
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  publish_artifacts:
-    image: alpine
-    commands:
-      - cp -fr build/* /tmp/friendica_files/
-    volumes:
-      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica-addons
-      event: tag
--- a/README.md
+++ b/README.md
@ -6,24 +6,22 @@ You can add these addons to the /addon directory of your Friendica installation

 After uploading the addons to your server, you need to activate the desired addons in the Admin panel. Addons not activated have no effect on your node.

-## Issues
-
-Please report any issues you have with addons of Friendica from this repository in [the main issue tracker of the project](https://github.com/friendica/friendica/issues).
+You can find more addons in the [Friendica Addon listing](https://addons.friendi.ca) in cases the addon developers have choosen not to include them here.

 ## Connectors

-Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/stable/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocol is not supported by Friendica core (DFRN, OStatus and Diaspora).
+Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocol is not supported by Friendica core (DFRN, OStatus and Diaspora).

 For communication with contacts in networks supporting those (e.g. GNU social, Diaspora and red#matrix) you just need to access the page configuration in the Admin panel and enable them. For networks where communication is only possible the API access to a remote account, you need to activate the fitting connectors.

 ## Development

 The addon interface of Friendica is very flexible and powerful, so if you are missing functionality, your chances are high it may be added with an addon.
-See the [documentation](https://github.com/friendica/friendica/blob/stable/doc/Addons.md) for more information on the addon development.
+See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Addons.md) for more information on the addon development.

 ## Translation

 Addons can be translated like any other part of Friendica.
 Translation for addons is done at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).

-Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/stable/doc/translations.md#addon).
+Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/master/doc/translations.md#addon).
--- a/advancedcontentfilter/advancedcontentfilter.js
+++ b/advancedcontentfilter/advancedcontentfilter.js
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@ -36,17 +36,16 @@
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Cache;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
-use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
-use Friendica\Module\Security\Login;
+use Friendica\Model\Term;
+use Friendica\Module\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
 use Psr\Http\Message\ResponseInterface;
@ -55,67 +54,49 @@ use Symfony\Component\ExpressionLanguage;

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

-function advancedcontentfilter_install()
+function advancedcontentfilter_install(App $a)
 {
 	Hook::register('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
 	Hook::register('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');

-	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
-	DBStructure::performUpdate();
+	DBStructure::update($a->getBasePath(), false, true);

-	Logger::notice('installed advancedcontentfilter');
+	Logger::log("installed advancedcontentfilter");
+}
+
+function advancedcontentfilter_uninstall()
+{
+	Hook::unregister('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
+	Hook::unregister('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
+	Hook::unregister('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');
 }

 /*
 * Hooks
 */

-function advancedcontentfilter_dbstructure_definition(&$database)
+function advancedcontentfilter_dbstructure_definition(App $a, &$database)
 {
-	$database['advancedcontentfilter_rules'] = [
-		'comment' => 'Advancedcontentfilter addon rules',
-		'fields' => [
-			'id'         => ['type' => 'int unsigned', 'not null' => '1', 'extra' => 'auto_increment', 'primary' => '1', 'comment' => 'Auto incremented rule id'],
-			'uid'        => ['type' => 'int unsigned', 'not null' => '1', 'comment' => 'Owner user id'],
-			'name'       => ['type' => 'varchar(255)', 'not null' => '1', 'comment' => 'Rule name'],
-			'expression' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Expression text'],
-			'serialized' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Serialized parsed expression'],
-			'active'     => ['type' => 'boolean'     , 'not null' => '1', 'default' => '1', 'comment' => 'Whether the rule is active or not'],
-			'created'    => ['type' => 'datetime'    , 'not null' => '1', 'default' => DBA::NULL_DATETIME, 'comment' => 'Creation date'],
+	$database["advancedcontentfilter_rules"] = [
+		"comment" => "Advancedcontentfilter addon rules",
+		"fields" => [
+			"id"         => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Auto incremented rule id"],
+			"uid"        => ["type" => "int unsigned", "not null" => "1", "comment" => "Owner user id"],
+			"name"       => ["type" => "varchar(255)", "not null" => "1", "comment" => "Rule name"],
+			"expression" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Expression text"],
+			"serialized" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Serialized parsed expression"],
+			"active"     => ["type" => "boolean"     , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"],
+			"created"    => ["type" => "datetime"    , "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
 		],
-		'indexes' => [
-			'PRIMARY' => ['id'],
-			'uid_active' => ['uid', 'active'],
+		"indexes" => [
+			"PRIMARY" => ["id"],
+			"uid_active" => ["uid", "active"],
 		]
 	];
 }

-/**
- * @param array $item Prepared by either Model\Item::prepareBody or advancedcontentfilter_prepare_item_row
- * @return array
- */
-function advancedcontentfilter_get_filter_fields(array $item)
-{
-	$vars = [];
-
-	// Convert the language JSON text into a filterable format
-	if (!empty($item['language']) && ($languages = json_decode($item['language'], true))) {
-		foreach ($languages as $key => $value) {
-			$vars['language_' . strtolower($key)] = $value;
-		}
-	}
-
-	foreach ($item as $key => $value) {
-		$vars[str_replace('-', '_', $key)] = $value;
-	}
-
-	ksort($vars);
-
-	return $vars;
-}
-
-function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
+function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 {
 	static $expressionLanguage;

@ -123,21 +104,22 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}

-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}

-	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
+	$vars = [];
+	foreach ($hook_data['item'] as $key => $value) {
+		$vars[str_replace('-', '_', $key)] = $value;
+	}

-	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
+	$rules = Cache::get('rules_' . local_user());
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
+			['uid' => local_user(), 'active' => true]
 		));
-
-		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
 	}

 	if ($rules) {
@ -155,7 +137,7 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 			}

 			if ($found) {
-				$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered by rule: %s', $rule['name']);
+				$hook_data['filter_reasons'][] = L10n::t('Filtered by rule: %s', $rule['name']);
 				break;
 			}
 		}
@ -163,33 +145,30 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 }


-function advancedcontentfilter_addon_settings(array &$data)
+function advancedcontentfilter_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}

-	$data = [
-		'addon' => 'advancedcontentfilter',
-		'title' => DI::l10n()->t('Advanced Content Filter'),
-		'href'  => 'advancedcontentfilter',
-	];
+	$advancedcontentfilter = L10n::t('Advanced Content Filter');
+
+	$s .= <<<HTML
+		<span class="settings-block fakelink" style="display: block;"><h3><a href="advancedcontentfilter">$advancedcontentfilter <i class="glyphicon glyphicon-share"></i></a></h3></span>
+HTML;
+
+	return;
 }

 /*
 * Module
 */

-/**
- * 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 advancedcontentfilter_module() {}

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

 		require __DIR__ . '/src/middlewares.php';
@ -201,16 +180,14 @@ function advancedcontentfilter_init()
 	}
 }

-function advancedcontentfilter_content()
+function advancedcontentfilter_content(App $a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		return Login::form('/' . implode('/', DI::args()->getArgv()));
+	if (!local_user()) {
+		return Login::form('/' . implode('/', $a->argv));
 	}

-	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'help') {
-		$user = User::getById(DI::userSession()->getLocalUserId());
-
-		$lang = $user['language'];
+	if ($a->argc > 1 && $a->argv[1] == 'help') {
+		$lang = $a->user['language'];

 		$default_dir = 'addon/advancedcontentfilter/doc/';
 		$help_file = 'advancedcontentfilter.md';
@ -230,29 +207,29 @@ function advancedcontentfilter_content()
 		$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/advancedcontentfilter/');
 		return Renderer::replaceMacros($t, [
 			'$messages' => [
-				'backtosettings'    => DI::l10n()->t('Back to Addon Settings'),
-				'title'             => DI::l10n()->t('Advanced Content Filter'),
-				'add_a_rule'        => DI::l10n()->t('Add a Rule'),
-				'help'              => DI::l10n()->t('Help'),
-				'intro'             => DI::l10n()->t('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.'),
-				'your_rules'        => DI::l10n()->t('Your rules'),
-				'no_rules'          => DI::l10n()->t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
-				'disabled'          => DI::l10n()->t('Disabled'),
-				'enabled'           => DI::l10n()->t('Enabled'),
-				'disable_this_rule' => DI::l10n()->t('Disable this rule'),
-				'enable_this_rule'  => DI::l10n()->t('Enable this rule'),
-				'edit_this_rule'    => DI::l10n()->t('Edit this rule'),
-				'edit_the_rule'     => DI::l10n()->t('Edit the rule'),
-				'save_this_rule'    => DI::l10n()->t('Save this rule'),
-				'delete_this_rule'  => DI::l10n()->t('Delete this rule'),
-				'rule'              => DI::l10n()->t('Rule'),
-				'close'             => DI::l10n()->t('Close'),
-				'addtitle'          => DI::l10n()->t('Add new rule'),
-				'rule_name'         => DI::l10n()->t('Rule Name'),
-				'rule_expression'   => DI::l10n()->t('Rule Expression'),
-				'cancel'            => DI::l10n()->t('Cancel'),
+				'backtosettings'    => L10n::t('Back to Addon Settings'),
+				'title'             => L10n::t('Advanced Content Filter'),
+				'add_a_rule'        => L10n::t('Add a Rule'),
+				'help'              => L10n::t('Help'),
+				'intro'             => L10n::t('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.'),
+				'your_rules'        => L10n::t('Your rules'),
+				'no_rules'          => L10n::t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
+				'disabled'          => L10n::t('Disabled'),
+				'enabled'           => L10n::t('Enabled'),
+				'disable_this_rule' => L10n::t('Disable this rule'),
+				'enable_this_rule'  => L10n::t('Enable this rule'),
+				'edit_this_rule'    => L10n::t('Edit this rule'),
+				'edit_the_rule'     => L10n::t('Edit the rule'),
+				'save_this_rule'    => L10n::t('Save this rule'),
+				'delete_this_rule'  => L10n::t('Delete this rule'),
+				'rule'              => L10n::t('Rule'),
+				'close'             => L10n::t('Close'),
+				'addtitle'          => L10n::t('Add new rule'),
+				'rule_name'         => L10n::t('Rule Name'),
+				'rule_expression'   => L10n::t('Rule Expression'),
+				'cancel'            => L10n::t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
+			'$current_theme' => $a->getCurrentTheme(),
 			'$rules' => advancedcontentfilter_get_rules(),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
@ -271,20 +248,29 @@ function advancedcontentfilter_build_fields($data)
 	}

 	if (!empty($data['expression'])) {
-		// Using a dummy item to validate the field existence
-		$condition = ["(`uid` = ? OR `uid` = 0)", DI::userSession()->getLocalUserId()];
-		$params = ['order' => ['uid' => true]];
-		$item_row = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), [], $condition, $params);
-
-		if (!DBA::isResult($item_row)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('This addon requires this node having at least one post'));
-		}
+		$allowed_keys = [
+			'author_id', 'author_link', 'author_name', 'author_avatar',
+			'owner_id', 'owner_link', 'owner_name', 'owner_avatar',
+			'contact_id', 'uid', 'id', 'parent', 'uri',
+			'thr_parent', 'parent_uri',
+			'content_warning',
+			'commented', 'created', 'edited', 'received',
+			'verb', 'object_type', 'postopts', 'plink', 'guid', 'wall', 'private', 'starred',
+			'title', 'body',
+			'file', 'event_id', 'location', 'coord', 'app', 'attach',
+			'rendered_hash', 'rendered_html', 'object',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+			'item_id', 'item_network', 'author_thumb', 'owner_thumb',
+			'network', 'url', 'name', 'writable', 'self',
+			'cid', 'alias',
+			'event_created', 'event_edited', 'event_start', 'event_finish', 'event_summary',
+			'event_desc', 'event_location', 'event_type', 'event_nofinish', 'event_adjust', 'event_ignore',
+			'children', 'pagedrop', 'tags', 'hashtags', 'mentions',
+		];

 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
-		$parsedExpression = $expressionLanguage->parse(
-			$data['expression'],
-			array_keys(advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row)))
-		);
+
+		$parsedExpression = $expressionLanguage->parse($data['expression'], $allowed_keys);

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

@ -307,34 +293,34 @@ function advancedcontentfilter_build_fields($data)

 function advancedcontentfilter_get_rules()
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

-	$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()]));
+	$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));

 	return json_encode($rules);
 }

 function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

-	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()]);
+	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);

 	return json_encode($rule);
 }

 function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}

 	$data = json_decode($request->getBody(), true);
@ -342,39 +328,37 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 	try {
 		$fields = advancedcontentfilter_build_fields($data);
 	} catch (Exception $e) {
-		throw new HTTPException\BadRequestException($e->getMessage(), $e);
+		throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
 	}

 	if (empty($fields['name']) || empty($fields['expression'])) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('The rule name and expression are required.'));
+		throw new HTTPException\BadRequestException(L10n::t('The rule name and expression are required.'));
 	}

-	$fields['uid'] = DI::userSession()->getLocalUserId();
+	$fields['uid'] = local_user();
 	$fields['created'] = DateTimeFormat::utcNow();

 	if (!DBA::insert('advancedcontentfilter_rules', $fields)) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}

 	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => DBA::lastInsertId()]);

-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	return json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]);
+	return json_encode(['message' => L10n::t('Rule successfully added'), 'rule' => $rule]);
 }

 function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}

-	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
-		throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}

 	$data = json_decode($request->getBody(), true);
@ -382,80 +366,65 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
 	try {
 		$fields = advancedcontentfilter_build_fields($data);
 	} catch (Exception $e) {
-		throw new HTTPException\BadRequestException($e->getMessage(), $e);
+		throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
 	}

 	if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}

-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	return json_encode(['message' => DI::l10n()->t('Rule successfully updated')]);
+	return json_encode(['message' => L10n::t('Rule successfully updated')]);
 }

 function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}

-	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
-		throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}

 	if (!DBA::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}

-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	return json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]);
+	return json_encode(['message' => L10n::t('Rule successfully deleted')]);
 }

 function advancedcontentfilter_get_variables_guid(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}

 	if (!isset($args['guid'])) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Missing argument: guid.'));
+		throw new HTTPException\BadRequestException(L10n::t('Missing argument: guid.'));
 	}

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

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

-	$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
+	$tags = Term::populateTagsFromItem($item);
+
+	$item['tags'] = $tags['tags'];
+	$item['hashtags'] = $tags['hashtags'];
+	$item['mentions'] = $tags['mentions'];
+
+	$return = [];
+	foreach ($item as $key => $value) {
+		$return[str_replace('-', '_', $key)] = $value;
+	}

 	return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
 }
-
-/**
- * This mimimcs the processing performed in Model\Item::prepareBody
- *
- * @param array $item_row
- * @return array
- * @throws HTTPException\InternalServerErrorException
- * @throws ImagickException
- */
-function advancedcontentfilter_prepare_item_row(array $item_row): array
-{
-	$tags = Tag::populateFromItem($item_row);
-
-	$item_row['tags'] = $tags['tags'];
-	$item_row['hashtags'] = $tags['hashtags'];
-	$item_row['mentions'] = $tags['mentions'];
-	$item_row['attachments'] = DI::postMediaRepository()->splitAttachments($item_row['uri-id']);
-
-	return $item_row;
-}
--- a/advancedcontentfilter/asset/vue/dist/vue.js
+++ b/advancedcontentfilter/asset/vue/dist/vue.js
--- a/advancedcontentfilter/asset/vue/dist/vue.min.js
+++ b/advancedcontentfilter/asset/vue/dist/vue.min.js
--- a/advancedcontentfilter/composer.lock
+++ b/advancedcontentfilter/composer.lock
@ -1,7 +1,7 @@
 {
    "_readme": [
        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
    "content-hash": "d0e3662dd9d910ffe4f71d325bc39319",
@ -35,7 +35,6 @@
            ],
            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
            "homepage": "https://github.com/container-interop/container-interop",
-            "abandoned": "psr/container",
            "time": "2017-02-14T19:40:03+00:00"
        },
        {
@ -281,16 +280,16 @@
        },
        {
            "name": "psr/log",
-            "version": "1.1.2",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/log.git",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
                "shasum": ""
            },
            "require": {
@ -299,7 +298,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                }
            },
            "autoload": {
@ -324,7 +323,7 @@
                "psr",
                "psr-3"
            ],
-            "time": "2019-11-01T11:05:21+00:00"
+            "time": "2016-10-10T12:19:37+00:00"
        },
        {
            "name": "psr/simple-cache",
@ -447,16 +446,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v3.4.36",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3"
+                "reference": "13255ddd056e49f3154747943f8ee175d555d394"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
-                "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394",
+                "reference": "13255ddd056e49f3154747943f8ee175d555d394",
                "shasum": ""
            },
            "require": {
@ -513,7 +512,7 @@
                "caching",
                "psr6"
            ],
-            "time": "2019-12-01T10:45:41+00:00"
+            "time": "2018-04-02T14:35:16+00:00"
        },
        {
            "name": "symfony/expression-language",
@ -567,16 +566,16 @@
        },
        {
            "name": "symfony/polyfill-apcu",
-            "version": "v1.13.1",
+            "version": "v1.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116"
+                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116",
-                "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
+                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
                "shasum": ""
            },
            "require": {
@ -585,7 +584,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.13-dev"
+                    "dev-master": "1.7-dev"
                }
            },
            "autoload": {
@ -619,7 +618,7 @@
                "portable",
                "shim"
            ],
-            "time": "2019-11-27T13:56:44+00:00"
+            "time": "2018-01-30T19:27:44+00:00"
        }
    ],
    "packages-dev": [],
--- a/advancedcontentfilter/doc/advancedcontentfilter.md
+++ b/advancedcontentfilter/doc/advancedcontentfilter.md
@ -34,14 +34,6 @@ If the expression using a post variables returns `true`, the post will be collap

 A post will be collapsed if at least one rule matches, but all matching rule names will be displayed above the collapsed content.

-## Examples
-
-1. Collapse posts with specific domains `body matches "/\\.example\\.com/"`
-2. Collapse posts that contains the words `body matches "/Guten Morgen/"`
-3. Collapse posts with the word facebook that have a space in front and after the word `body matches "//s facebook/s /"`
-4. Collapse posts that contains more than 1 image `body matches "/(?:(?:(?:\\[url(?:=.*)?\\])?\\[img(?:=.*)?\\].*\\[\\/img\\]\\s*(?:\\[\\/url\\])?)\\s*){2}/"`
-
-
 ## Expression Syntax

 ### Supported Literals
@ -330,7 +322,7 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<th>rendered_html</th>
 		<td>string</td>
 		<td>
-			Over-compensation #&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street"&gt;Street&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night"&gt;Night&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights"&gt;CarLights&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep"&gt;Jeep&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople"&gt;NoPeople&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close"&gt;Close&lt;/a&gt;-up &lt;div class="type-link"&gt;&lt;a href="https://www.eyeem.com/p/120800309" target="_blank" rel="noopener noreferrer"&gt;&lt;img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"&gt;&lt;/a&gt;&lt;br&gt;&lt;h4&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;Over-compensation Street Night Car Lights Jeep No | EyeEm&lt;/a&gt;&lt;/h4&gt;&lt;blockquote&gt;Photo by @&lt;a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan"&gt;MrPetovan&lt;/a&gt;&lt;/blockquote&gt;&lt;sup&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;www.eyeem.com&lt;/a&gt;&lt;/sup&gt;&lt;/div&gt;
+			Over-compensation #&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street"&gt;Street&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night"&gt;Night&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights"&gt;CarLights&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep"&gt;Jeep&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople"&gt;NoPeople&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close"&gt;Close&lt;/a&gt;-up &lt;div class="type-link"&gt;&lt;a href="https://www.eyeem.com/p/120800309" target="_blank"&gt;&lt;img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"&gt;&lt;/a&gt;&lt;br&gt;&lt;h4&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;Over-compensation Street Night Car Lights Jeep No | EyeEm&lt;/a&gt;&lt;/h4&gt;&lt;blockquote&gt;Photo by @&lt;a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan"&gt;MrPetovan&lt;/a&gt;&lt;/blockquote&gt;&lt;sup&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;www.eyeem.com&lt;/a&gt;&lt;/sup&gt;&lt;/div&gt;
 		</td>
 	</tr>
 	<tr>
@ -458,6 +450,11 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>string</td>
 		<td>null</td>
 	</tr>
+	<tr>
+		<th>event_adjust</th>
+		<td>boolean</td>
+		<td>null</td>
+	</tr>
 	<tr>
 		<th>event_ignore</th>
 		<td>boolean</td>
@ -473,14 +470,14 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>list</td>
 		<td>
 			<ol start="0">
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer"&gt;street&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer"&gt;night&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer"&gt;carlights&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer"&gt;jeep&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer"&gt;nopeople&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer"&gt;close&lt;/a&gt;</li>
-				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer"&gt;mrpetovan&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer"&gt;close-up&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank"&gt;street&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank"&gt;night&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank"&gt;carlights&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank"&gt;jeep&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank"&gt;nopeople&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank"&gt;close&lt;/a&gt;</li>
+				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank"&gt;mrpetovan&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank"&gt;close-up&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
@ -489,13 +486,13 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>list</td>
 		<td>
 			<ol start="0">
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer"&gt;street&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer"&gt;night&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer"&gt;carlights&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer"&gt;jeep&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer"&gt;nopeople&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer"&gt;close&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer"&gt;close-up&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank"&gt;street&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank"&gt;night&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank"&gt;carlights&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank"&gt;jeep&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank"&gt;nopeople&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank"&gt;close&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank"&gt;close-up&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
@ -504,9 +501,9 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>string</td>
 		<td>
 			<ol start="0">
-				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer"&gt;mrpetovan&lt;/a&gt;</li>
+				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank"&gt;mrpetovan&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
 </tbody>
-</table>
+</table>
--- a/advancedcontentfilter/lang/C/messages.po
+++ b/advancedcontentfilter/lang/C/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+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"
@ -17,145 +17,147 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

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

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

-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr ""

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

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

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have "
 "a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""

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

-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next "
 "to the title."
 msgstr ""

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/"
+"profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr ""

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

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr ""

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

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

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

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

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

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

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

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr ""
--- a/advancedcontentfilter/lang/ar/messages.po
+++ b/advancedcontentfilter/lang/ar/messages.po
@ -1,166 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# abidin toumi <abidin24@tutanota.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: advancedcontentfilter.php:153
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "رشّح حسب القاعدة: %s"
-
-#: advancedcontentfilter.php:167 advancedcontentfilter.php:224
-msgid "Advanced Content Filter"
-msgstr "ترشيح المحتوى المتقدم"
-
-#: advancedcontentfilter.php:223
-msgid "Back to Addon Settings"
-msgstr "الرجوع إلى إعدادات الإضافات"
-
-#: advancedcontentfilter.php:225
-msgid "Add a Rule"
-msgstr "أضف قاعدة"
-
-#: advancedcontentfilter.php:226
-msgid "Help"
-msgstr "مساعدة"
-
-#: advancedcontentfilter.php:227
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"إضافة وإدارة قواعد ترشيح المحتوى الشخصية هنا.\n"
-" القواعد لها اسم وتعبير سيتم مطابقته مع بيانات المشاركة. للحصول على مرجع كامل للعمليات والمتغيرات المتاحة ، راجع صفحة المساعدة."
-
-#: advancedcontentfilter.php:228
-msgid "Your rules"
-msgstr "القواعد"
-
-#: advancedcontentfilter.php:229
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"لا يوجد قواعد!\n"
-"أضف واحدة من خلال النقر على الزر أعلاه بجوار العنوان."
-
-#: advancedcontentfilter.php:230
-msgid "Disabled"
-msgstr "معطل"
-
-#: advancedcontentfilter.php:231
-msgid "Enabled"
-msgstr "مفعل"
-
-#: advancedcontentfilter.php:232
-msgid "Disable this rule"
-msgstr "عطّل القاعدة"
-
-#: advancedcontentfilter.php:233
-msgid "Enable this rule"
-msgstr "فعّل القاعدة"
-
-#: advancedcontentfilter.php:234
-msgid "Edit this rule"
-msgstr "عدّل هذه القاعدة"
-
-#: advancedcontentfilter.php:235
-msgid "Edit the rule"
-msgstr "عدّل القاعدة"
-
-#: advancedcontentfilter.php:236
-msgid "Save this rule"
-msgstr "احفظ هذه القاعدة"
-
-#: advancedcontentfilter.php:237
-msgid "Delete this rule"
-msgstr "احذف هذه القاعدة"
-
-#: advancedcontentfilter.php:238
-msgid "Rule"
-msgstr "القاعدة"
-
-#: advancedcontentfilter.php:239
-msgid "Close"
-msgstr "اغلق"
-
-#: advancedcontentfilter.php:240
-msgid "Add new rule"
-msgstr "أضف قاعدة جديدة"
-
-#: advancedcontentfilter.php:241
-msgid "Rule Name"
-msgstr "اسم القاعدة"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Expression"
-msgstr "تعبير القاعدة"
-
-#: advancedcontentfilter.php:243
-msgid "Cancel"
-msgstr "الغ"
-
-#: advancedcontentfilter.php:310 advancedcontentfilter.php:321
-#: advancedcontentfilter.php:332 advancedcontentfilter.php:366
-#: advancedcontentfilter.php:395 advancedcontentfilter.php:416
-msgid "You must be logged in to use this method"
-msgstr "عليك الولوج لاستخدام هذه الطريقة"
-
-#: advancedcontentfilter.php:336 advancedcontentfilter.php:370
-#: advancedcontentfilter.php:399
-msgid "Invalid form security token, please refresh the page."
-msgstr "رمز أمان النموذج غير صالح ، يرجى تحديث الصفحة."
-
-#: advancedcontentfilter.php:348
-msgid "The rule name and expression are required."
-msgstr "يلزم اسم وتعبير للقاعدة."
-
-#: advancedcontentfilter.php:360
-msgid "Rule successfully added"
-msgstr "نجحت إضافة القاعدة"
-
-#: advancedcontentfilter.php:374 advancedcontentfilter.php:403
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "القاعدة غير موجودة أو لا تنتمي إليك."
-
-#: advancedcontentfilter.php:389
-msgid "Rule successfully updated"
-msgstr "نجح تحديث القاعدة"
-
-#: advancedcontentfilter.php:410
-msgid "Rule successfully deleted"
-msgstr "نجح حذف القاعدة"
-
-#: advancedcontentfilter.php:420
-msgid "Missing argument: guid."
-msgstr "معامل ناقص: دليل."
-
-#: advancedcontentfilter.php:428
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "مشاركة غير معروفة ذات الدليل: 1%s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "لم يُعثر على التطبيق"
--- a/advancedcontentfilter/lang/ar/strings.php
+++ b/advancedcontentfilter/lang/ar/strings.php
@ -1,41 +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['Filtered by rule: %s'] = 'رشّح حسب القاعدة: %s';
-$a->strings['Advanced Content Filter'] = 'ترشيح المحتوى المتقدم';
-$a->strings['Back to Addon Settings'] = 'الرجوع إلى إعدادات الإضافات';
-$a->strings['Add a Rule'] = 'أضف قاعدة';
-$a->strings['Help'] = 'مساعدة';
-$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.'] = 'إضافة وإدارة قواعد ترشيح المحتوى الشخصية هنا.
- القواعد لها اسم وتعبير سيتم مطابقته مع بيانات المشاركة. للحصول على مرجع كامل للعمليات والمتغيرات المتاحة ، راجع صفحة المساعدة.';
-$a->strings['Your rules'] = 'القواعد';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'لا يوجد قواعد!
-أضف واحدة من خلال النقر على الزر أعلاه بجوار العنوان.';
-$a->strings['Disabled'] = 'معطل';
-$a->strings['Enabled'] = 'مفعل';
-$a->strings['Disable this rule'] = 'عطّل القاعدة';
-$a->strings['Enable this rule'] = 'فعّل القاعدة';
-$a->strings['Edit this rule'] = 'عدّل هذه القاعدة';
-$a->strings['Edit the rule'] = 'عدّل القاعدة';
-$a->strings['Save this rule'] = 'احفظ هذه القاعدة';
-$a->strings['Delete this rule'] = 'احذف هذه القاعدة';
-$a->strings['Rule'] = 'القاعدة';
-$a->strings['Close'] = 'اغلق';
-$a->strings['Add new rule'] = 'أضف قاعدة جديدة';
-$a->strings['Rule Name'] = 'اسم القاعدة';
-$a->strings['Rule Expression'] = 'تعبير القاعدة';
-$a->strings['Cancel'] = 'الغ';
-$a->strings['You must be logged in to use this method'] = 'عليك الولوج لاستخدام هذه الطريقة';
-$a->strings['Invalid form security token, please refresh the page.'] = 'رمز أمان النموذج غير صالح ، يرجى تحديث الصفحة.';
-$a->strings['The rule name and expression are required.'] = 'يلزم اسم وتعبير للقاعدة.';
-$a->strings['Rule successfully added'] = 'نجحت إضافة القاعدة';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'القاعدة غير موجودة أو لا تنتمي إليك.';
-$a->strings['Rule successfully updated'] = 'نجح تحديث القاعدة';
-$a->strings['Rule successfully deleted'] = 'نجح حذف القاعدة';
-$a->strings['Missing argument: guid.'] = 'معامل ناقص: دليل.';
-$a->strings['Unknown post with guid: %s'] = 'مشاركة غير معروفة ذات الدليل: 1%s';
-$a->strings['Method not found'] = 'لم يُعثر على التطبيق';
--- a/advancedcontentfilter/lang/ca/strings.php
+++ b/advancedcontentfilter/lang/ca/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrat per regla: %s';
-$a->strings['Advanced Content Filter'] = 'Contingut avançat Filtre';
-$a->strings['Back to Addon Settings'] = 'Torna Addon Configuració';
-$a->strings['Add a Rule'] = 'Afegiu una regla';
-$a->strings['Help'] = 'Ajuda';
-$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>.'] = 'Afegiu i gestioneu les vostres regles de filtre de contingut personal en aquesta pantalla. Les regles tenen un nom i una expressió arbitrària que es combinen amb les dades de la publicació. Per obtenir una referència completa de les variables i operacions disponibles, comproveu el botó <a href="advancedcontentfilter/help">pàgina d’ajuda</a>.';
-$a->strings['Your rules'] = 'Les seves normes';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Encara no teniu normes. Comenceu a afegir-ne un fent clic al botó situat al costat del títol.';
-$a->strings['Disabled'] = 'Desactivat';
-$a->strings['Enabled'] = 'Permetre';
-$a->strings['Disable this rule'] = 'Desactiva aquesta regla';
-$a->strings['Enable this rule'] = 'Activa aquesta regla';
-$a->strings['Edit this rule'] = 'Edita aquesta regla';
-$a->strings['Edit the rule'] = 'Edita la regla';
-$a->strings['Save this rule'] = 'Deseu aquesta regla';
-$a->strings['Delete this rule'] = 'Suprimeix aquesta regla';
-$a->strings['Rule'] = 'Regla';
-$a->strings['Close'] = 'Tancar';
-$a->strings['Add new rule'] = 'Add nova regla';
-$a->strings['Rule Name'] = 'Nom de la regla';
-$a->strings['Rule Expression'] = 'Expressió de regla';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Exemples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'cancel·lar';
-$a->strings['You must be logged in to use this method'] = 'Per utilitzar aquest mètode, heu d’iniciar sessió';
-$a->strings['Invalid form security token, please refresh the page.'] = 'El testimoni de seguretat del formulari no és vàlid. Actualitza la pàgina';
-$a->strings['The rule name and expression are required.'] = 'El nom i l’expressió de la regla són obligatoris';
-$a->strings['Rule successfully added'] = 'La regla s\'ha afegit correctament';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regla no existeix o no us pertany.';
-$a->strings['Rule successfully updated'] = 'La regla s\'ha actualitzat correctament';
-$a->strings['Rule successfully deleted'] = 'S\'ha suprimit la regla correctament';
-$a->strings['Missing argument: guid.'] = 'Falta un argument: guia';
-$a->strings['Unknown post with guid: %s'] = 'Publicació desconeguda amb guia: %s';
-$a->strings['Method not found'] = 'Mètode no trobat';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrat per regla: %s";
+$a->strings["Advanced Content Filter"] = "Contingut avançat Filtre";
+$a->strings["Back to Addon Settings"] = "Torna Addon Configuració";
+$a->strings["Add a Rule"] = "Afegiu una regla";
+$a->strings["Help"] = "Ajuda";
+$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>."] = "Afegiu i gestioneu les vostres regles de filtre de contingut personal en aquesta pantalla. Les regles tenen un nom i una expressió arbitrària que es combinen amb les dades de la publicació. Per obtenir una referència completa de les variables i operacions disponibles, comproveu el botó <a href=\"advancedcontentfilter/help\">pàgina d’ajuda</a>.";
+$a->strings["Your rules"] = "Les seves normes";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Encara no teniu normes. Comenceu a afegir-ne un fent clic al botó situat al costat del títol.";
+$a->strings["Disabled"] = "Desactivat";
+$a->strings["Enabled"] = "Permetre";
+$a->strings["Disable this rule"] = "Desactiva aquesta regla";
+$a->strings["Enable this rule"] = "Activa aquesta regla";
+$a->strings["Edit this rule"] = "Edita aquesta regla";
+$a->strings["Edit the rule"] = "Edita la regla";
+$a->strings["Save this rule"] = "Deseu aquesta regla";
+$a->strings["Delete this rule"] = "Suprimeix aquesta regla";
+$a->strings["Rule"] = "Regla";
+$a->strings["Close"] = "Tancar";
+$a->strings["Add new rule"] = "Add nova regla";
+$a->strings["Rule Name"] = "Nom de la regla";
+$a->strings["Rule Expression"] = "Expressió de regla";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "cancel·lar";
+$a->strings["You must be logged in to use this method"] = "Per utilitzar aquest mètode, heu d’iniciar sessió";
+$a->strings["Invalid form security token, please refresh the page."] = "El testimoni de seguretat del formulari no és vàlid. Actualitza la pàgina";
+$a->strings["The rule name and expression are required."] = "El nom i l’expressió de la regla són obligatoris";
+$a->strings["Rule successfully added"] = "La regla s'ha afegit correctament";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "La regla no existeix o no us pertany.";
+$a->strings["Rule successfully updated"] = "La regla s'ha actualitzat correctament";
+$a->strings["Rule successfully deleted"] = "S'ha suprimit la regla correctament";
+$a->strings["Missing argument: guid."] = "Falta un argument: guia";
+$a->strings["Unknown post with guid: %s"] = "Publicació desconeguda amb guia: %s";
+$a->strings["Method not found"] = "Mètode no trobat";
--- a/advancedcontentfilter/lang/cs/strings.php
+++ b/advancedcontentfilter/lang/cs/strings.php
@ -3,38 +3,39 @@
 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; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrováno podle pravidla: %s';
-$a->strings['Advanced Content Filter'] = 'Rozšířený filtr obsahu';
-$a->strings['Back to Addon Settings'] = 'Zpět na nastavení doplňku';
-$a->strings['Add a Rule'] = 'Přidat pravidlo';
-$a->strings['Help'] = 'Nápověda';
-$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>.'] = 'Přidávejte a spravujte Vaše osobní pravidla pro filtrování obsahu na této obrazovce. Pravidla mají název a libovolný výraz, který bude porovnán s daty příspěvku. Pro úplnou referenci dostupných operací a proměnných navštivte <a href="advancedcontentfilter/help">stránku nápovědy</a>.';
-$a->strings['Your rules'] = 'Vaše pravidla';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Ještě nemáte žádná pravidla! Přidejte první kliknutím na tlačítko nahoře vedle nadpisu.';
-$a->strings['Disabled'] = 'Zakázáno';
-$a->strings['Enabled'] = 'Povoleno';
-$a->strings['Disable this rule'] = 'Zakázat toto pravidlo';
-$a->strings['Enable this rule'] = 'Povolit toto pravidlo';
-$a->strings['Edit this rule'] = 'Upravit toto pravidlo';
-$a->strings['Edit the rule'] = 'Upravit pravidlo';
-$a->strings['Save this rule'] = 'Uložit toto pravidlo';
-$a->strings['Delete this rule'] = 'Smazat toto pravidlo';
-$a->strings['Rule'] = 'Pravidlo';
-$a->strings['Close'] = 'Zavřít';
-$a->strings['Add new rule'] = 'Přidat nové pravidlo';
-$a->strings['Rule Name'] = 'Název pravidla';
-$a->strings['Rule Expression'] = 'Výraz pravidla';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Příklady:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'Zrušit';
-$a->strings['You must be logged in to use this method'] = 'Pro použití této metody musíte být přihlášen/a';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Neplatná forma bezpečnostního tokenu, prosím obnovte stránku.';
-$a->strings['The rule name and expression are required.'] = 'Je požadován název pravidla a výraz.';
-$a->strings['Rule successfully added'] = 'Pravidlo úspěšně přidáno';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Pravidlo buď neexistuje, nebo Vám nepatří.';
-$a->strings['Rule successfully updated'] = 'Pravidlo úspěšně aktualizováno';
-$a->strings['Rule successfully deleted'] = 'Pravidlo úspěšně smazáno';
-$a->strings['Missing argument: guid.'] = 'Chybí argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Neznámý pžíspěvek s číslem guid: %s';
-$a->strings['Method not found'] = 'Metoda nenalezena';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrováno podle pravidla: %s";
+$a->strings["Advanced Content Filter"] = "Rozšířený filtr obsahu";
+$a->strings["Back to Addon Settings"] = "Zpět na nastavení doplňku";
+$a->strings["Add a Rule"] = "Přidat pravidlo";
+$a->strings["Help"] = "Nápověda";
+$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>."] = "Přidávejte a spravujte Vaše osobní pravidla pro filtrování obsahu na této obrazovce. Pravidla mají název a libovolný výraz, který bude porovnán s daty příspěvku. Pro úplnou referenci dostupných operací a proměnných navštivte <a href=\"advancedcontentfilter/help\">stránku nápovědy</a>.";
+$a->strings["Your rules"] = "Vaše pravidla";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Ještě nemáte žádná pravidla! Přidejte první kliknutím na tlačítko nahoře vedle nadpisu.";
+$a->strings["Disabled"] = "Zakázáno";
+$a->strings["Enabled"] = "Povoleno";
+$a->strings["Disable this rule"] = "Zakázat toto pravidlo";
+$a->strings["Enable this rule"] = "Povolit toto pravidlo";
+$a->strings["Edit this rule"] = "Upravit toto pravidlo";
+$a->strings["Edit the rule"] = "Upravit pravidlo";
+$a->strings["Save this rule"] = "Uložit toto pravidlo";
+$a->strings["Delete this rule"] = "Smazat toto pravidlo";
+$a->strings["Rule"] = "Pravidlo";
+$a->strings["Close"] = "Zavřít";
+$a->strings["Add new rule"] = "Přidat nové pravidlo";
+$a->strings["Rule Name"] = "Název pravidla";
+$a->strings["Rule Expression"] = "Výraz pravidla";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Příklady:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Zrušit";
+$a->strings["You must be logged in to use this method"] = "Pro použití této metody musíte být přihlášen/a";
+$a->strings["Invalid form security token, please refresh the page."] = "Neplatná forma bezpečnostního tokenu, prosím obnovte stránku.";
+$a->strings["The rule name and expression are required."] = "Je požadován název pravidla a výraz.";
+$a->strings["Rule successfully added"] = "Pravidlo úspěšně přidáno";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Pravidlo buď neexistuje, nebo Vám nepatří.";
+$a->strings["Rule successfully updated"] = "Pravidlo úspěšně aktualizováno";
+$a->strings["Rule successfully deleted"] = "Pravidlo úspěšně smazáno";
+$a->strings["Missing argument: guid."] = "Chybí argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Neznámý pžíspěvek s číslem guid: %s";
+$a->strings["Method not found"] = "Metoda nenalezena";
--- a/advancedcontentfilter/lang/da-dk/messages.po
+++ b/advancedcontentfilter/lang/da-dk/messages.po
@ -1,157 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter 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: 2018-05-24 06:41+0000\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: 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 help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:323
-#: advancedcontentfilter.php:334 advancedcontentfilter.php:370
-#: advancedcontentfilter.php:401 advancedcontentfilter.php:424
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
-#: advancedcontentfilter.php:405
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:350
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:364
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:395
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:418
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:428
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:436
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""
--- a/advancedcontentfilter/lang/da-dk/strings.php
+++ b/advancedcontentfilter/lang/da-dk/strings.php
@ -1,7 +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/advancedcontentfilter/lang/de/messages.po
+++ b/advancedcontentfilter/lang/de/messages.po
@ -3,64 +3,61 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Nach dieser Regel gefiltert: %s"

-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Erweiterter Inhaltsfilter"

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

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

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

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln"
 " müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser "
 "Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann "
 "gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für "
-"die Filter, wirf bitte einen Blick auf die Hilfsseite des Addons."
+"die Filter, wirf bitte einen Blick auf die <a "
+"href=\"advancedcontentfilter/help\">Hilfsseite</a> des Addons."

-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Deine Regeln"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Ein Beispiel:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Abbrechen"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag"
-" existiert."
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
-msgstr "Du musst angemeldet sein, um diese Methode verwenden zu können "
+msgstr "Du musst angemeldet sein um diese Methode verwenden zu können "

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

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

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

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Entweder existiert die Regel nicht, oder sie gehört dir nicht."

-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Regel wurde erfolgreich aktualisiert."

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

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

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Unbekannter Beitrag mit der guid: %s"

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Methode nicht gefunden"
--- a/advancedcontentfilter/lang/de/strings.php
+++ b/advancedcontentfilter/lang/de/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Nach dieser Regel gefiltert: %s';
-$a->strings['Advanced Content Filter'] = 'Erweiterter Inhaltsfilter';
-$a->strings['Back to Addon Settings'] = 'Zurück zu den Addon Einstellungen';
-$a->strings['Add a Rule'] = 'Eine Regel hinzufügen';
-$a->strings['Help'] = 'Hilfe';
-$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.'] = 'Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für die Filter, wirf bitte einen Blick auf die Hilfsseite des Addons.';
-$a->strings['Your rules'] = 'Deine Regeln';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen, verwende bitte den Button neben dem Titel.';
-$a->strings['Disabled'] = 'Deaktiviert';
-$a->strings['Enabled'] = 'Aktiv';
-$a->strings['Disable this rule'] = 'Diese Regel deaktivieren';
-$a->strings['Enable this rule'] = 'Diese Regel aktivieren';
-$a->strings['Edit this rule'] = 'Diese Regel bearbeiten';
-$a->strings['Edit the rule'] = 'Die Regel bearbeiten';
-$a->strings['Save this rule'] = 'Regel speichern';
-$a->strings['Delete this rule'] = 'Diese Regel löschen';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Schließen';
-$a->strings['Add new rule'] = 'Neue Regel hinzufügen';
-$a->strings['Rule Name'] = 'Name der Regel';
-$a->strings['Rule Expression'] = 'Ausdruck der Regel';
-$a->strings['Cancel'] = 'Abbrechen';
-$a->strings['This addon requires this node having at least one post'] = 'Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag existiert.';
-$a->strings['You must be logged in to use this method'] = 'Du musst angemeldet sein, um diese Methode verwenden zu können ';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Ungültiges Sciherheitstoken, bitte die Seite neu laden.';
-$a->strings['The rule name and expression are required.'] = 'Der Name der Regel und der Ausdruck sind erforderlich.';
-$a->strings['Rule successfully added'] = 'Regel erfolgreich hinzugefügt.';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Entweder existiert die Regel nicht, oder sie gehört dir nicht.';
-$a->strings['Rule successfully updated'] = 'Regel wurde erfolgreich aktualisiert.';
-$a->strings['Rule successfully deleted'] = 'Regel erfolgreich gelöscht.';
-$a->strings['Missing argument: guid.'] = 'Fehlendes Argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Unbekannter Beitrag mit der guid: %s';
-$a->strings['Method not found'] = 'Methode nicht gefunden';
+;
+$a->strings["Filtered by rule: %s"] = "Nach dieser Regel gefiltert: %s";
+$a->strings["Advanced Content Filter"] = "Erweiterter Inhaltsfilter";
+$a->strings["Back to Addon Settings"] = "Zurück zu den Addon Einstellungen";
+$a->strings["Add a Rule"] = "Eine Regel hinzufügen";
+$a->strings["Help"] = "Hilfe";
+$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>."] = "Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für die Filter, wirf bitte einen Blick auf die <a href=\"advancedcontentfilter/help\">Hilfsseite</a> des Addons.";
+$a->strings["Your rules"] = "Deine Regeln";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen, verwende bitte den Button neben dem Titel.";
+$a->strings["Disabled"] = "Deaktiviert";
+$a->strings["Enabled"] = "Aktiv";
+$a->strings["Disable this rule"] = "Diese Regel deaktivieren";
+$a->strings["Enable this rule"] = "Diese Regel aktivieren";
+$a->strings["Edit this rule"] = "Diese Regel bearbeiten";
+$a->strings["Edit the rule"] = "Die Regel bearbeiten";
+$a->strings["Save this rule"] = "Regel speichern";
+$a->strings["Delete this rule"] = "Diese Regel löschen";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Schließen";
+$a->strings["Add new rule"] = "Neue Regel hinzufügen";
+$a->strings["Rule Name"] = "Name der Regel";
+$a->strings["Rule Expression"] = "Ausdruck der Regel";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Ein Beispiel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["You must be logged in to use this method"] = "Du musst angemeldet sein um diese Methode verwenden zu können ";
+$a->strings["Invalid form security token, please refresh the page."] = "Ungültiges Sciherheitstoken, bitte die Seite neu laden.";
+$a->strings["The rule name and expression are required."] = "Der Name der Regel und der Ausdruck sind erforderlich.";
+$a->strings["Rule successfully added"] = "Regel erfolgreich hinzugefügt.";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Entweder existiert die Regel nicht, oder sie gehört dir nicht.";
+$a->strings["Rule successfully updated"] = "Regel wurde erfolgreich aktualisiert.";
+$a->strings["Rule successfully deleted"] = "Regel erfolgreich gelöscht.";
+$a->strings["Missing argument: guid."] = "Fehlendes Argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Unbekannter Beitrag mit der guid: %s";
+$a->strings["Method not found"] = "Methode nicht gefunden";
--- a/advancedcontentfilter/lang/en-gb/strings.php
+++ b/advancedcontentfilter/lang/en-gb/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtered by rule: %s';
-$a->strings['Advanced Content Filter'] = 'Advanced Content Filter';
-$a->strings['Back to Addon Settings'] = 'Back to addon settings';
-$a->strings['Add a Rule'] = 'Add a rule';
-$a->strings['Help'] = 'Help';
-$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>.'] = '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>.';
-$a->strings['Your rules'] = 'Your rules';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'You have no rules yet! Start adding one by clicking on the button above next to the title.';
-$a->strings['Disabled'] = 'Disabled';
-$a->strings['Enabled'] = 'Enabled';
-$a->strings['Disable this rule'] = 'Disable this rule';
-$a->strings['Enable this rule'] = 'Enable this rule';
-$a->strings['Edit this rule'] = 'Edit this rule';
-$a->strings['Edit the rule'] = 'Edit the rule';
-$a->strings['Save this rule'] = 'Save this rule';
-$a->strings['Delete this rule'] = 'Delete this rule';
-$a->strings['Rule'] = 'Rule';
-$a->strings['Close'] = 'Close';
-$a->strings['Add new rule'] = 'Add new rule';
-$a->strings['Rule Name'] = 'Rule name';
-$a->strings['Rule Expression'] = 'Rule expression';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'Cancel';
-$a->strings['You must be logged in to use this method'] = 'You must be logged in to use this method';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Invalid form security token, please refresh the page.';
-$a->strings['The rule name and expression are required.'] = 'The rule name and expression are required.';
-$a->strings['Rule successfully added'] = 'Rule successfully added';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Rule doesn\'t exist or doesn\'t belong to you.';
-$a->strings['Rule successfully updated'] = 'Rule successfully updated';
-$a->strings['Rule successfully deleted'] = 'Rule successfully deleted';
-$a->strings['Missing argument: guid.'] = 'Missing argument: Global Unique Identifier (GUID).';
-$a->strings['Unknown post with guid: %s'] = 'Unknown post with Global Unique Identifier (GUID): %s';
-$a->strings['Method not found'] = 'Method not found';
+;
+$a->strings["Filtered by rule: %s"] = "Filtered by rule: %s";
+$a->strings["Advanced Content Filter"] = "Advanced Content Filter";
+$a->strings["Back to Addon Settings"] = "Back to addon settings";
+$a->strings["Add a Rule"] = "Add a rule";
+$a->strings["Help"] = "Help";
+$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>."] = "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>.";
+$a->strings["Your rules"] = "Your rules";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "You have no rules yet! Start adding one by clicking on the button above next to the title.";
+$a->strings["Disabled"] = "Disabled";
+$a->strings["Enabled"] = "Enabled";
+$a->strings["Disable this rule"] = "Disable this rule";
+$a->strings["Enable this rule"] = "Enable this rule";
+$a->strings["Edit this rule"] = "Edit this rule";
+$a->strings["Edit the rule"] = "Edit the rule";
+$a->strings["Save this rule"] = "Save this rule";
+$a->strings["Delete this rule"] = "Delete this rule";
+$a->strings["Rule"] = "Rule";
+$a->strings["Close"] = "Close";
+$a->strings["Add new rule"] = "Add new rule";
+$a->strings["Rule Name"] = "Rule name";
+$a->strings["Rule Expression"] = "Rule expression";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Cancel";
+$a->strings["You must be logged in to use this method"] = "You must be logged in to use this method";
+$a->strings["Invalid form security token, please refresh the page."] = "Invalid form security token, please refresh the page.";
+$a->strings["The rule name and expression are required."] = "The rule name and expression are required.";
+$a->strings["Rule successfully added"] = "Rule successfully added";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Rule doesn't exist or doesn't belong to you.";
+$a->strings["Rule successfully updated"] = "Rule successfully updated";
+$a->strings["Rule successfully deleted"] = "Rule successfully deleted";
+$a->strings["Missing argument: guid."] = "Missing argument: Global Unique Identifier (GUID).";
+$a->strings["Unknown post with guid: %s"] = "Unknown post with Global Unique Identifier (GUID): %s";
+$a->strings["Method not found"] = "Method not found";
--- a/advancedcontentfilter/lang/es/messages.po
+++ b/advancedcontentfilter/lang/es/messages.po
@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Albert, 2018
-# Yasmine A <yasmine.elachkar@gmail.com>, 2018
-# Julio Cova, 2019
-# Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "Método no encontrado"
-
-#: advancedcontentfilter.php:136
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Filtrado por la regla: %s"
-
-#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
-msgid "Advanced Content Filter"
-msgstr "Filtro de contenido avanzado"
-
-#: advancedcontentfilter.php:206
-msgid "Back to Addon Settings"
-msgstr "Volver a Ajustes de Complemento"
-
-#: advancedcontentfilter.php:208
-msgid "Add a Rule"
-msgstr "Añadir una regla"
-
-#: advancedcontentfilter.php:209
-msgid "Help"
-msgstr "Ayuda"
-
-#: advancedcontentfilter.php:210
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"Agregue y administre sus reglas de filtrado de contenido personal en esta "
-"pantalla. Las reglas tienen un nombre y una expresión arbitraria que se "
-"comparará con los datos de la publicación. Para obtener una referencia "
-"completa de las operaciones y variables disponibles, consulte la página de "
-"ayuda."
-
-#: advancedcontentfilter.php:211
-msgid "Your rules"
-msgstr "Tus reglas"
-
-#: advancedcontentfilter.php:212
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"¡Aún no tienes reglas! Empieza añadiendo una haciendo clic en el botón de "
-"arriba al lado del título. "
-
-#: advancedcontentfilter.php:213
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: advancedcontentfilter.php:214
-msgid "Enabled"
-msgstr "Activado"
-
-#: advancedcontentfilter.php:215
-msgid "Disable this rule"
-msgstr "Desactivar esta regla"
-
-#: advancedcontentfilter.php:216
-msgid "Enable this rule"
-msgstr "Activar esta regla"
-
-#: advancedcontentfilter.php:217
-msgid "Edit this rule"
-msgstr "Editar esta regla"
-
-#: advancedcontentfilter.php:218
-msgid "Edit the rule"
-msgstr "Editar regla"
-
-#: advancedcontentfilter.php:219
-msgid "Save this rule"
-msgstr "Guardar esta regla"
-
-#: advancedcontentfilter.php:220
-msgid "Delete this rule"
-msgstr "Borrar esta regla"
-
-#: advancedcontentfilter.php:221
-msgid "Rule"
-msgstr "Regla"
-
-#: advancedcontentfilter.php:222
-msgid "Close"
-msgstr "Cerrar"
-
-#: advancedcontentfilter.php:223
-msgid "Add new rule"
-msgstr "Agregar nueva regla"
-
-#: advancedcontentfilter.php:224
-msgid "Rule Name"
-msgstr "Nombre de la regla"
-
-#: advancedcontentfilter.php:225
-msgid "Rule Expression"
-msgstr "Expresión de la regla"
-
-#: advancedcontentfilter.php:226
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
-#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
-msgid "You must be logged in to use this method"
-msgstr "Debe estar registrado para usar este método"
-
-#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
-#: advancedcontentfilter.php:382
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-"Token de seguridad de formulario inválido, por favor actualice la página."
-
-#: advancedcontentfilter.php:331
-msgid "The rule name and expression are required."
-msgstr "El nombre y la expresión de la regla son obligatorios."
-
-#: advancedcontentfilter.php:343
-msgid "Rule successfully added"
-msgstr "Regla añadida exitosamente"
-
-#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "La regla no existe o no te pertenece."
-
-#: advancedcontentfilter.php:372
-msgid "Rule successfully updated"
-msgstr "Regla actualizada exitosamente"
-
-#: advancedcontentfilter.php:393
-msgid "Rule successfully deleted"
-msgstr "Regla eliminada exitosamente"
-
-#: advancedcontentfilter.php:403
-msgid "Missing argument: guid."
-msgstr "Algumento faltante: guía"
-
-#: advancedcontentfilter.php:411
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Publicacion desconocida con la guía: %s"
--- a/advancedcontentfilter/lang/es/strings.php
+++ b/advancedcontentfilter/lang/es/strings.php
@ -1,39 +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['Method not found'] = 'Método no encontrado';
-$a->strings['Filtered by rule: %s'] = 'Filtrado por la regla: %s';
-$a->strings['Advanced Content Filter'] = 'Filtro de contenido avanzado';
-$a->strings['Back to Addon Settings'] = 'Volver a Ajustes de Complemento';
-$a->strings['Add a Rule'] = 'Añadir una regla';
-$a->strings['Help'] = 'Ayuda';
-$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.'] = 'Agregue y administre sus reglas de filtrado de contenido personal en esta pantalla. Las reglas tienen un nombre y una expresión arbitraria que se comparará con los datos de la publicación. Para obtener una referencia completa de las operaciones y variables disponibles, consulte la página de ayuda.';
-$a->strings['Your rules'] = 'Tus reglas';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = '¡Aún no tienes reglas! Empieza añadiendo una haciendo clic en el botón de arriba al lado del título. ';
-$a->strings['Disabled'] = 'Desactivado';
-$a->strings['Enabled'] = 'Activado';
-$a->strings['Disable this rule'] = 'Desactivar esta regla';
-$a->strings['Enable this rule'] = 'Activar esta regla';
-$a->strings['Edit this rule'] = 'Editar esta regla';
-$a->strings['Edit the rule'] = 'Editar regla';
-$a->strings['Save this rule'] = 'Guardar esta regla';
-$a->strings['Delete this rule'] = 'Borrar esta regla';
-$a->strings['Rule'] = 'Regla';
-$a->strings['Close'] = 'Cerrar';
-$a->strings['Add new rule'] = 'Agregar nueva regla';
-$a->strings['Rule Name'] = 'Nombre de la regla';
-$a->strings['Rule Expression'] = 'Expresión de la regla';
-$a->strings['Cancel'] = 'Cancelar';
-$a->strings['You must be logged in to use this method'] = 'Debe estar registrado para usar este método';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Token de seguridad de formulario inválido, por favor actualice la página.';
-$a->strings['The rule name and expression are required.'] = 'El nombre y la expresión de la regla son obligatorios.';
-$a->strings['Rule successfully added'] = 'Regla añadida exitosamente';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regla no existe o no te pertenece.';
-$a->strings['Rule successfully updated'] = 'Regla actualizada exitosamente';
-$a->strings['Rule successfully deleted'] = 'Regla eliminada exitosamente';
-$a->strings['Missing argument: guid.'] = 'Algumento faltante: guía';
-$a->strings['Unknown post with guid: %s'] = 'Publicacion desconocida con la guía: %s';
--- a/advancedcontentfilter/lang/fi/strings.php
+++ b/advancedcontentfilter/lang/fi/strings.php
@ -3,20 +3,39 @@
 if(! function_exists("string_plural_select_fi")) {
 function string_plural_select_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Add a Rule'] = 'Lisää sääntö';
-$a->strings['Your rules'] = 'Sääntösi';
-$a->strings['Disabled'] = 'Ei käytössä';
-$a->strings['Enabled'] = 'Käytössä';
-$a->strings['Enable this rule'] = 'Ota tämä sääntö käyttöön';
-$a->strings['Edit this rule'] = 'Muokkaa tätä sääntöä';
-$a->strings['Edit the rule'] = 'Muokkaa sääntöä';
-$a->strings['Save this rule'] = 'Tallenna tämä sääntö';
-$a->strings['Delete this rule'] = 'Poista tämä sääntö';
-$a->strings['Rule'] = 'Sääntö';
-$a->strings['Close'] = 'Sulje';
-$a->strings['Add new rule'] = 'Lisää uusi sääntö';
-$a->strings['Rule successfully added'] = 'Sääntö lisätty';
-$a->strings['Rule successfully updated'] = 'Sääntö päivitetty';
-$a->strings['Rule successfully deleted'] = 'Sääntö poistettu';
+;
+$a->strings["Filtered by rule: %s"] = "";
+$a->strings["Advanced Content Filter"] = "";
+$a->strings["Back to Addon Settings"] = "";
+$a->strings["Add a Rule"] = "Lisää sääntö";
+$a->strings["Help"] = "";
+$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>."] = "";
+$a->strings["Your rules"] = "Sääntösi";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "";
+$a->strings["Disabled"] = "Ei käytössä";
+$a->strings["Enabled"] = "Käytössä";
+$a->strings["Disable this rule"] = "";
+$a->strings["Enable this rule"] = "Ota tämä sääntö käyttöön";
+$a->strings["Edit this rule"] = "Muokkaa tätä sääntöä";
+$a->strings["Edit the rule"] = "Muokkaa sääntöä";
+$a->strings["Save this rule"] = "Tallenna tämä sääntö";
+$a->strings["Delete this rule"] = "Poista tämä sääntö";
+$a->strings["Rule"] = "Sääntö";
+$a->strings["Close"] = "Sulje";
+$a->strings["Add new rule"] = "Lisää uusi sääntö";
+$a->strings["Rule Name"] = "";
+$a->strings["Rule Expression"] = "";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "";
+$a->strings["Cancel"] = "";
+$a->strings["You must be logged in to use this method"] = "";
+$a->strings["Invalid form security token, please refresh the page."] = "";
+$a->strings["The rule name and expression are required."] = "";
+$a->strings["Rule successfully added"] = "Sääntö lisätty";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
+$a->strings["Rule successfully updated"] = "Sääntö päivitetty";
+$a->strings["Rule successfully deleted"] = "Sääntö poistettu";
+$a->strings["Missing argument: guid."] = "";
+$a->strings["Unknown post with guid: %s"] = "";
+$a->strings["Method not found"] = "";
--- a/advancedcontentfilter/lang/fr/messages.po
+++ b/advancedcontentfilter/lang/fr/messages.po
@ -7,62 +7,60 @@
 # Marie Olive <lacellule101@gmail.com>, 2018
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 # Phigger Phigger <automates@lepouete.fr>, 2019
-# Wil Tur <wiltur@yargl.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"Last-Translator: Phigger Phigger <automates@lepouete.fr>, 2019\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtré par règle:%s"

-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Filtre avancé de contenu"

-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Retour aux paramètres de l'extension"

-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Ajouter une règle"

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

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
-"Cet écran permet d'ajouter et de gérer vos règles de filtrage de contenu "
-"personnelles. Les règles ont un nom et une expression arbitraire qui sera "
-"comparée aux données des messages. Pour une référence complète des "
-"opérations et variables disponibles, consultez la page d'aide."
+"Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de "
+"contenu. Les règles portent un nom et contiennent une expression arbitraire "
+"qui sera appliquée aux données du post. Pour une liste complète des "
+"opérations disponibles, voyez la page d'aide"

-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Vos règles"

-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@ -70,108 +68,110 @@ msgstr ""
 "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-"
 "dessus près du titre"

-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Désactivé"

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

-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Désactiver cette règle"

-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Activer cette règle"

-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Modifier cette règle"

-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Modifier la règle"

-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Enregistrer cette règle"

-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Supprimer cette règle"

-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Règle"

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

-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Ajouter nouvelle règle"

-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nommer règle"

-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Expression de règle"

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Exemples :</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Annuler"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Cette extension requiert au moins une publication sur ce serveur pour "
-"fonctionner"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Vous devez être connecté pour utiliser cette méthode"

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Formulaire token de sécurité invalide, rafraîchissez la page"

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Le nom et l'expression de cette règle sont requis"

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Règle bien ajoutée"

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Cette règle n'existe pas ou ne vous appartient pas"

-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Règle bien mise à jour"

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Règle bien supprimée"

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argument manquant: "

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Post inconnu avec guid : %s"

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Méthode non trouvée"
--- a/advancedcontentfilter/lang/fr/strings.php
+++ b/advancedcontentfilter/lang/fr/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtré par règle:%s';
-$a->strings['Advanced Content Filter'] = 'Filtre avancé de contenu';
-$a->strings['Back to Addon Settings'] = 'Retour aux paramètres de l\'extension';
-$a->strings['Add a Rule'] = 'Ajouter une règle';
-$a->strings['Help'] = 'Aide';
-$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.'] = 'Cet écran permet d\'ajouter et de gérer vos règles de filtrage de contenu personnelles. Les règles ont un nom et une expression arbitraire qui sera comparée aux données des messages. Pour une référence complète des opérations et variables disponibles, consultez la page d\'aide.';
-$a->strings['Your rules'] = 'Vos règles';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Vous n\'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre';
-$a->strings['Disabled'] = 'Désactivé';
-$a->strings['Enabled'] = 'Activé';
-$a->strings['Disable this rule'] = 'Désactiver cette règle';
-$a->strings['Enable this rule'] = 'Activer cette règle';
-$a->strings['Edit this rule'] = 'Modifier cette règle';
-$a->strings['Edit the rule'] = 'Modifier la règle';
-$a->strings['Save this rule'] = 'Enregistrer cette règle';
-$a->strings['Delete this rule'] = 'Supprimer cette règle';
-$a->strings['Rule'] = 'Règle';
-$a->strings['Close'] = 'Fermer';
-$a->strings['Add new rule'] = 'Ajouter nouvelle règle';
-$a->strings['Rule Name'] = 'Nommer règle';
-$a->strings['Rule Expression'] = 'Expression de règle';
-$a->strings['Cancel'] = 'Annuler';
-$a->strings['This addon requires this node having at least one post'] = 'Cette extension requiert au moins une publication sur ce serveur pour fonctionner';
-$a->strings['You must be logged in to use this method'] = 'Vous devez être connecté pour utiliser cette méthode';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Formulaire token de sécurité invalide, rafraîchissez la page';
-$a->strings['The rule name and expression are required.'] = 'Le nom et l\'expression de cette règle sont requis';
-$a->strings['Rule successfully added'] = 'Règle bien ajoutée';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Cette règle n\'existe pas ou ne vous appartient pas';
-$a->strings['Rule successfully updated'] = 'Règle bien mise à jour';
-$a->strings['Rule successfully deleted'] = 'Règle bien supprimée';
-$a->strings['Missing argument: guid.'] = 'Argument manquant: ';
-$a->strings['Unknown post with guid: %s'] = 'Post inconnu avec guid : %s';
-$a->strings['Method not found'] = 'Méthode non trouvée';
+;
+$a->strings["Filtered by rule: %s"] = "Filtré par règle:%s";
+$a->strings["Advanced Content Filter"] = "Filtre avancé de contenu";
+$a->strings["Back to Addon Settings"] = "Retour aux paramètres de l'extension";
+$a->strings["Add a Rule"] = "Ajouter une règle";
+$a->strings["Help"] = "Aide";
+$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>."] = "Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de contenu. Les règles portent un nom et contiennent une expression arbitraire qui sera appliquée aux données du post. Pour une liste complète des opérations disponibles, voyez la page d'aide";
+$a->strings["Your rules"] = "Vos règles";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre";
+$a->strings["Disabled"] = "Désactivé";
+$a->strings["Enabled"] = "Activé";
+$a->strings["Disable this rule"] = "Désactiver cette règle";
+$a->strings["Enable this rule"] = "Activer cette règle";
+$a->strings["Edit this rule"] = "Modifier cette règle";
+$a->strings["Edit the rule"] = "Modifier la règle";
+$a->strings["Save this rule"] = "Enregistrer cette règle";
+$a->strings["Delete this rule"] = "Supprimer cette règle";
+$a->strings["Rule"] = "Règle";
+$a->strings["Close"] = "Fermer";
+$a->strings["Add new rule"] = "Ajouter nouvelle règle";
+$a->strings["Rule Name"] = "Nommer règle";
+$a->strings["Rule Expression"] = "Expression de règle";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples :</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Annuler";
+$a->strings["You must be logged in to use this method"] = "Vous devez être connecté pour utiliser cette méthode";
+$a->strings["Invalid form security token, please refresh the page."] = "Formulaire token de sécurité invalide, rafraîchissez la page";
+$a->strings["The rule name and expression are required."] = "Le nom et l'expression de cette règle sont requis";
+$a->strings["Rule successfully added"] = "Règle bien ajoutée";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Cette règle n'existe pas ou ne vous appartient pas";
+$a->strings["Rule successfully updated"] = "Règle bien mise à jour";
+$a->strings["Rule successfully deleted"] = "Règle bien supprimée";
+$a->strings["Missing argument: guid."] = "Argument manquant: ";
+$a->strings["Unknown post with guid: %s"] = "Post inconnu avec guid : %s";
+$a->strings["Method not found"] = "Méthode non trouvée";
--- a/advancedcontentfilter/lang/hu/messages.po
+++ b/advancedcontentfilter/lang/hu/messages.po
@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Balázs Úr, 2022\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Szűrve a szabály alapján: %s"
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr "Speciális tartalomszűrő"
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr "Vissza a bővítménybeállításokhoz"
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr "Szabály hozzáadása"
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr "Súgó"
-
-#: 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 help page."
-msgstr ""
-"Személyes tartalomszűrő szabályok hozzáadása és kezelése ezen a képernyőn. A"
-" szabályoknak van nevük és egy tetszőleges kifejezésük, amely a bejegyzés "
-"adataira lesz illesztve. Az elérhető műveletek és változók teljes "
-"hivatkozásáért nézze meg a súgóoldalt."
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr "Az Ön szabályai"
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"Még nincsenek szabályai! Kezdje meg egy szabály hozzáadását a cím mellett "
-"lévő fenti gombra kattintva."
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr "Letiltva"
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr "A szabály letiltása"
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr "A szabály engedélyezése"
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr "A szabály szerkesztése"
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr "A szabály szerkesztése"
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr "A szabály mentése"
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr "A szabály törlése"
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr "Szabály"
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr "Bezárás"
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr "Új szabály hozzáadása"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr "Szabály neve"
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr "Szabály kifejezése"
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr "Mégse"
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy "
-"bejegyzése legyen"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr "Bejelentkezve kell lennie a módszer használatához"
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr "Érvénytelen űrlap biztonsági token. Frissítse az oldalt."
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr "A szabály neve és kifejezése kötelező."
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr "A szabály sikeresen hozzáadva"
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "A szabály nem létezik vagy nem Önhöz tatozik."
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr "A szabály sikeresen frissítve"
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr "A szabály sikeresen törölve"
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr "Hiányzó argumentum: guid."
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Ismeretlen bejegyzés a következő guid azonosítóval: %s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "A módszer nem található"
--- a/advancedcontentfilter/lang/hu/strings.php
+++ b/advancedcontentfilter/lang/hu/strings.php
@ -1,40 +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['Filtered by rule: %s'] = 'Szűrve a szabály alapján: %s';
-$a->strings['Advanced Content Filter'] = 'Speciális tartalomszűrő';
-$a->strings['Back to Addon Settings'] = 'Vissza a bővítménybeállításokhoz';
-$a->strings['Add a Rule'] = 'Szabály hozzáadása';
-$a->strings['Help'] = 'Súgó';
-$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.'] = 'Személyes tartalomszűrő szabályok hozzáadása és kezelése ezen a képernyőn. A szabályoknak van nevük és egy tetszőleges kifejezésük, amely a bejegyzés adataira lesz illesztve. Az elérhető műveletek és változók teljes hivatkozásáért nézze meg a súgóoldalt.';
-$a->strings['Your rules'] = 'Az Ön szabályai';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Még nincsenek szabályai! Kezdje meg egy szabály hozzáadását a cím mellett lévő fenti gombra kattintva.';
-$a->strings['Disabled'] = 'Letiltva';
-$a->strings['Enabled'] = 'Engedélyezve';
-$a->strings['Disable this rule'] = 'A szabály letiltása';
-$a->strings['Enable this rule'] = 'A szabály engedélyezése';
-$a->strings['Edit this rule'] = 'A szabály szerkesztése';
-$a->strings['Edit the rule'] = 'A szabály szerkesztése';
-$a->strings['Save this rule'] = 'A szabály mentése';
-$a->strings['Delete this rule'] = 'A szabály törlése';
-$a->strings['Rule'] = 'Szabály';
-$a->strings['Close'] = 'Bezárás';
-$a->strings['Add new rule'] = 'Új szabály hozzáadása';
-$a->strings['Rule Name'] = 'Szabály neve';
-$a->strings['Rule Expression'] = 'Szabály kifejezése';
-$a->strings['Cancel'] = 'Mégse';
-$a->strings['This addon requires this node having at least one post'] = 'Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy bejegyzése legyen';
-$a->strings['You must be logged in to use this method'] = 'Bejelentkezve kell lennie a módszer használatához';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Érvénytelen űrlap biztonsági token. Frissítse az oldalt.';
-$a->strings['The rule name and expression are required.'] = 'A szabály neve és kifejezése kötelező.';
-$a->strings['Rule successfully added'] = 'A szabály sikeresen hozzáadva';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'A szabály nem létezik vagy nem Önhöz tatozik.';
-$a->strings['Rule successfully updated'] = 'A szabály sikeresen frissítve';
-$a->strings['Rule successfully deleted'] = 'A szabály sikeresen törölve';
-$a->strings['Missing argument: guid.'] = 'Hiányzó argumentum: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Ismeretlen bejegyzés a következő guid azonosítóval: %s';
-$a->strings['Method not found'] = 'A módszer nem található';
--- a/advancedcontentfilter/lang/it/messages.po
+++ b/advancedcontentfilter/lang/it/messages.po
@ -3,63 +3,60 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"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"
+"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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

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

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

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

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

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

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Aggiungi e gestisci le tue regole personali di filtro contenuti in questa "
 "schermata. Le regole hanno un nome e un'espressione arbitraria che sarà "
 "confrontata con i dati del messaggio. Per un elenco completo delle "
-"operazioni e variabili disponibili, controlla la pagina di aiuto."
+"operazioni disponibili, controlla la <a "
+"href=\"advancedcontentfilter/help\">pagina di aiuto</a>."

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Esempi:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Annulla"

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

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

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

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

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

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

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

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

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

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Metodo non trovato"
--- a/advancedcontentfilter/lang/it/strings.php
+++ b/advancedcontentfilter/lang/it/strings.php
@ -3,37 +3,39 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrato dalla regola: %s';
-$a->strings['Advanced Content Filter'] = 'Filtro Avanzato Contenuti';
-$a->strings['Back to Addon Settings'] = 'Torna alle impostazioni del componente aggiuntivo';
-$a->strings['Add a Rule'] = 'Aggiungi una regola';
-$a->strings['Help'] = 'Aiuto';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un\'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni e variabili disponibili, controlla la pagina di aiuto.';
-$a->strings['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';
-$a->strings['Enabled'] = 'Abilitato';
-$a->strings['Disable this rule'] = 'Diabilita questa regola';
-$a->strings['Enable this rule'] = 'Abilita questa regola';
-$a->strings['Edit this rule'] = 'Modifica questa regola';
-$a->strings['Edit the rule'] = 'Modifica la regola';
-$a->strings['Save this rule'] = 'Salva questa regola';
-$a->strings['Delete this rule'] = 'Elimina questa regola';
-$a->strings['Rule'] = 'Regola';
-$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['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->strings['The rule name and expression are required.'] = 'Il nome e l\'espressione della regola sono richiesti.';
-$a->strings['Rule successfully added'] = 'Regola aggiunta con successo';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regola non esiste o non ti appartiene.';
-$a->strings['Rule successfully updated'] = 'Regola aggiornata con successo';
-$a->strings['Rule successfully deleted'] = 'Regola eliminata con successo';
-$a->strings['Missing argument: guid.'] = 'Argomento mancante: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Messaggio con guid %s sconosciuto';
-$a->strings['Method not found'] = 'Metodo non trovato';
+;
+$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["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";
+$a->strings["Enabled"] = "Abilitato";
+$a->strings["Disable this rule"] = "Diabilita questa regola";
+$a->strings["Enable this rule"] = "Abilita questa regola";
+$a->strings["Edit this rule"] = "Modifica questa regola";
+$a->strings["Edit the rule"] = "Modifica la regola";
+$a->strings["Save this rule"] = "Salva questa regola";
+$a->strings["Delete this rule"] = "Elimina questa regola";
+$a->strings["Rule"] = "Regola";
+$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->strings["The rule name and expression are required."] = "Il nome e l'espressione della regola sono richiesti.";
+$a->strings["Rule successfully added"] = "Regola aggiunta con successo";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "La regola non esiste o non ti appartiene.";
+$a->strings["Rule successfully updated"] = "Regola aggiornata con successo";
+$a->strings["Rule successfully deleted"] = "Regola eliminata con successo";
+$a->strings["Missing argument: guid."] = "Argomento mancante: guid.";
+$a->strings["Unknown post with guid: %s"] = "Messaggio con guid %s sconosciuto";
+$a->strings["Method not found"] = "Metodo non trovato";
--- a/advancedcontentfilter/lang/nl/strings.php
+++ b/advancedcontentfilter/lang/nl/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Gefilterd volgens regel: %s';
-$a->strings['Advanced Content Filter'] = 'Geavanceerd filter voor berichtsinhoud';
-$a->strings['Back to Addon Settings'] = 'Terug naar Addon instellingen';
-$a->strings['Add a Rule'] = 'Filterregel toevoegen';
-$a->strings['Help'] = 'Help';
-$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>.'] = 'Beheer de filterregels van je persoonlijke filter voor berichtsinhoud in dit scherm. Regels hebben een naam en bewoording welke we automatisch controleren door te vergelijken met de inhoud van elk bericht. Voor een compleet naslagwerk van de beschikbare bewerkingen en variabelen, zie de  <a href="advancedcontentfilter/help">help pagina</a>.';
-$a->strings['Your rules'] = 'Jouw regels';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Je hebt nog geen regels! Klik op de knop bovenin naast de titel om een regel toe te voegen.';
-$a->strings['Disabled'] = 'Uitgeschakeld';
-$a->strings['Enabled'] = 'Geactiveerd';
-$a->strings['Disable this rule'] = 'Deze regel uitschakelen';
-$a->strings['Enable this rule'] = 'Deze regel inschakelen';
-$a->strings['Edit this rule'] = 'Regel bewerken';
-$a->strings['Edit the rule'] = 'Regel bewerken';
-$a->strings['Save this rule'] = 'Deze regel opslaan';
-$a->strings['Delete this rule'] = 'Deze regel verwijderen';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Sluiten';
-$a->strings['Add new rule'] = 'Voeg nieuwe regel toe';
-$a->strings['Rule Name'] = 'Regel naam';
-$a->strings['Rule Expression'] = 'Regel bewoording';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Voorbeelden:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>label</li></ul>';
-$a->strings['Cancel'] = 'Annuleren';
-$a->strings['You must be logged in to use this method'] = 'Je moet ingelogd zijn om deze methode te gebruiken';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Ongeldige formulier beveiligings token, vernieuw de pagina a.u.b.';
-$a->strings['The rule name and expression are required.'] = 'De regelnaam en bewoording zijn vereist.';
-$a->strings['Rule successfully added'] = 'Regel succesvol toegevoegd';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Deze regel bestaat niet, of is niet van jou.';
-$a->strings['Rule successfully updated'] = 'Regel succesvol opgeslagen';
-$a->strings['Rule successfully deleted'] = 'Regel succesvol verwijderd';
-$a->strings['Missing argument: guid.'] = 'Parameter guid niet aanwezig';
-$a->strings['Unknown post with guid: %s'] = 'Onbekend bericht met guid: %s';
-$a->strings['Method not found'] = 'Methode niet gevonden';
+;
+$a->strings["Filtered by rule: %s"] = "Gefilterd volgens regel: %s";
+$a->strings["Advanced Content Filter"] = "Geavanceerd filter voor berichtsinhoud";
+$a->strings["Back to Addon Settings"] = "Terug naar Addon instellingen";
+$a->strings["Add a Rule"] = "Filterregel toevoegen";
+$a->strings["Help"] = "Help";
+$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>."] = "Beheer de filterregels van je persoonlijke filter voor berichtsinhoud in dit scherm. Regels hebben een naam en bewoording welke we automatisch controleren door te vergelijken met de inhoud van elk bericht. Voor een compleet naslagwerk van de beschikbare bewerkingen en variabelen, zie de  <a href=\"advancedcontentfilter/help\">help pagina</a>.";
+$a->strings["Your rules"] = "Jouw regels";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Je hebt nog geen regels! Klik op de knop bovenin naast de titel om een regel toe te voegen.";
+$a->strings["Disabled"] = "Uitgeschakeld";
+$a->strings["Enabled"] = "Geactiveerd";
+$a->strings["Disable this rule"] = "Deze regel uitschakelen";
+$a->strings["Enable this rule"] = "Deze regel inschakelen";
+$a->strings["Edit this rule"] = "Regel bewerken";
+$a->strings["Edit the rule"] = "Regel bewerken";
+$a->strings["Save this rule"] = "Deze regel opslaan";
+$a->strings["Delete this rule"] = "Deze regel verwijderen";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Sluiten";
+$a->strings["Add new rule"] = "Voeg nieuwe regel toe";
+$a->strings["Rule Name"] = "Regel naam";
+$a->strings["Rule Expression"] = "Regel bewoording";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Voorbeelden:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>label</li></ul>";
+$a->strings["Cancel"] = "Annuleren";
+$a->strings["You must be logged in to use this method"] = "Je moet ingelogd zijn om deze methode te gebruiken";
+$a->strings["Invalid form security token, please refresh the page."] = "Ongeldige formulier beveiligings token, vernieuw de pagina a.u.b.";
+$a->strings["The rule name and expression are required."] = "De regelnaam en bewoording zijn vereist.";
+$a->strings["Rule successfully added"] = "Regel succesvol toegevoegd";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Deze regel bestaat niet, of is niet van jou.";
+$a->strings["Rule successfully updated"] = "Regel succesvol opgeslagen";
+$a->strings["Rule successfully deleted"] = "Regel succesvol verwijderd";
+$a->strings["Missing argument: guid."] = "Parameter guid niet aanwezig";
+$a->strings["Unknown post with guid: %s"] = "Onbekend bericht met guid: %s";
+$a->strings["Method not found"] = "Methode niet gevonden";
--- a/advancedcontentfilter/lang/pl/messages.po
+++ b/advancedcontentfilter/lang/pl/messages.po
@ -3,19 +3,14 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# Joe Doe, 2021
-# Piotr Strębski <strebski@gmail.com>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -23,44 +18,44 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"

-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr " Filtruj według reguły: %s"

-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Zaawansowany filtr zawartości"

-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Powrót do ustawień dodatków"

-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Dodaj regułę"

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

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
-"Na tym ekranie możesz zarządzać swoimi osobistymi regułami filtrowania "
-"treści. Reguły składają się z nazwy oraz dowolnego wyrażenia, do którego "
-"przyrównywane będą posty. Aby uzyskć więcej informacji na temat dostępnych "
-"opracji oraz zmiennych, zapoznaj się ze stronę pomocy."
+"Dodaj i zarządzaj regułami filtrowania treści osobistych na tym ekranie. "
+"Reguły mają nazwę i dowolne wyrażenie, które zostanie dopasowane do danych "
+"postów. Aby uzyskać pełne informacje o dostępnych operacjach i zmiennych, "
+"sprawdź <a href=\"advancedcontentfilter/help\">stronę pomocy</a>."

-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Twoje zasady"

-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@ -68,106 +63,110 @@ msgstr ""
 "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk "
 "znajdujący się nad tytułem."

-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Wyłącz"

-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Włącz"

-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Wyłącz tę regułę"

-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Włącz tę regułę"

-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Edytuj tę regułę"

-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Edytuj regułę"

-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Zapisz tę regułę"

-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Usuń tę regułę"

-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Reguła"

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

-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Dodaj nową regułę"

-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nazwa reguły"

-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Wyrażanie reguły"

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>przykład</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tagi</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Anuluj"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Musisz być zalogowany, aby skorzystać z tej metody"

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

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

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

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

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

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

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

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

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Nie znaleziono metody"
--- a/advancedcontentfilter/lang/pl/strings.php
+++ b/advancedcontentfilter/lang/pl/strings.php
@ -3,38 +3,39 @@
 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; }
+	return ($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);;
 }}
-$a->strings['Filtered by rule: %s'] = ' Filtruj według reguły: %s';
-$a->strings['Advanced Content Filter'] = 'Zaawansowany filtr zawartości';
-$a->strings['Back to Addon Settings'] = 'Powrót do ustawień dodatków';
-$a->strings['Add a Rule'] = 'Dodaj regułę';
-$a->strings['Help'] = 'Pomoc';
-$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.'] = 'Na tym ekranie możesz zarządzać swoimi osobistymi regułami filtrowania treści. Reguły składają się z nazwy oraz dowolnego wyrażenia, do którego przyrównywane będą posty. Aby uzyskć więcej informacji na temat dostępnych opracji oraz zmiennych, zapoznaj się ze stronę pomocy.';
-$a->strings['Your rules'] = 'Twoje zasady';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk znajdujący się nad tytułem.';
-$a->strings['Disabled'] = 'Wyłącz';
-$a->strings['Enabled'] = 'Włącz';
-$a->strings['Disable this rule'] = 'Wyłącz tę regułę';
-$a->strings['Enable this rule'] = 'Włącz tę regułę';
-$a->strings['Edit this rule'] = 'Edytuj tę regułę';
-$a->strings['Edit the rule'] = 'Edytuj regułę';
-$a->strings['Save this rule'] = 'Zapisz tę regułę';
-$a->strings['Delete this rule'] = 'Usuń tę regułę';
-$a->strings['Rule'] = 'Reguła';
-$a->strings['Close'] = 'Zamknij';
-$a->strings['Add new rule'] = 'Dodaj nową regułę';
-$a->strings['Rule Name'] = 'Nazwa reguły';
-$a->strings['Rule Expression'] = 'Wyrażanie reguły';
-$a->strings['Cancel'] = 'Anuluj';
-$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis';
-$a->strings['You must be logged in to use this method'] = 'Musisz być zalogowany, aby skorzystać z tej metody';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Nieprawidłowy token zabezpieczający formularz, odśwież stronę.';
-$a->strings['The rule name and expression are required.'] = 'Nazwa reguły i wyrażenie są wymagane.';
-$a->strings['Rule successfully added'] = 'Reguła została pomyślnie dodana';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Reguła nie istnieje lub nie należy do ciebie.';
-$a->strings['Rule successfully updated'] = 'Reguła została pomyślnie zaktualizowana';
-$a->strings['Rule successfully deleted'] = 'Reguła została pomyślnie usunięta';
-$a->strings['Missing argument: guid.'] = 'Brakujący argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Nieznany post z guid:%s';
-$a->strings['Method not found'] = 'Nie znaleziono metody';
+;
+$a->strings["Filtered by rule: %s"] = " Filtruj według reguły: %s";
+$a->strings["Advanced Content Filter"] = "Zaawansowany filtr zawartości";
+$a->strings["Back to Addon Settings"] = "Powrót do ustawień dodatków";
+$a->strings["Add a Rule"] = "Dodaj regułę";
+$a->strings["Help"] = "Pomoc";
+$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>."] = "Dodaj i zarządzaj regułami filtrowania treści osobistych na tym ekranie. Reguły mają nazwę i dowolne wyrażenie, które zostanie dopasowane do danych postów. Aby uzyskać pełne informacje o dostępnych operacjach i zmiennych, sprawdź <a href=\"advancedcontentfilter/help\">stronę pomocy</a>.";
+$a->strings["Your rules"] = "Twoje zasady";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk znajdujący się nad tytułem.";
+$a->strings["Disabled"] = "Wyłącz";
+$a->strings["Enabled"] = "Włącz";
+$a->strings["Disable this rule"] = "Wyłącz tę regułę";
+$a->strings["Enable this rule"] = "Włącz tę regułę";
+$a->strings["Edit this rule"] = "Edytuj tę regułę";
+$a->strings["Edit the rule"] = "Edytuj regułę";
+$a->strings["Save this rule"] = "Zapisz tę regułę";
+$a->strings["Delete this rule"] = "Usuń tę regułę";
+$a->strings["Rule"] = "Reguła";
+$a->strings["Close"] = "Zamknij";
+$a->strings["Add new rule"] = "Dodaj nową regułę";
+$a->strings["Rule Name"] = "Nazwa reguły";
+$a->strings["Rule Expression"] = "Wyrażanie reguły";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>przykład</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tagi</li></ul>";
+$a->strings["Cancel"] = "Anuluj";
+$a->strings["You must be logged in to use this method"] = "Musisz być zalogowany, aby skorzystać z tej metody";
+$a->strings["Invalid form security token, please refresh the page."] = "Nieprawidłowy token zabezpieczający formularz, odśwież stronę.";
+$a->strings["The rule name and expression are required."] = "Nazwa reguły i wyrażenie są wymagane.";
+$a->strings["Rule successfully added"] = "Reguła została pomyślnie dodana";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Reguła nie istnieje lub nie należy do ciebie.";
+$a->strings["Rule successfully updated"] = "Reguła została pomyślnie zaktualizowana";
+$a->strings["Rule successfully deleted"] = "Reguła została pomyślnie usunięta";
+$a->strings["Missing argument: guid."] = "Brakujący argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Nieznany post z guid:%s";
+$a->strings["Method not found"] = "Nie znaleziono metody";
--- a/advancedcontentfilter/lang/ru/messages.po
+++ b/advancedcontentfilter/lang/ru/messages.po
@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Alexey Adamov <2077@tutanota.com>, 2019
-# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
-# Alexander An <ravnina@gmail.com>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/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"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Отфильтровано по правилу: %s"
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr "Расширенный фильтр содержимого"
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr "Вернуться к настройкам дополнений"
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr "Добавить правило"
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr "Помощь"
-
-#: 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 help page."
-msgstr ""
-"Добавляйте и управляйте своими собственными фильтрами на этой странице. У "
-"правил есть имя и произвольное выражение, которое будет сопоставляться с "
-"данными поста. Для полной ссылки на доступные операции и переменные, "
-"посмотрите страницу справки."
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr "Ваши правила"
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку "
-"выше, рядом с названием."
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr "Отключено"
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr "Включено"
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr "Отключить это правило"
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr "Включить это правило"
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr "Изменить это правило"
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr "Изменить правило"
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr "Сохранить это правило"
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr "Удалить это правило"
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr "Правило"
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr "Закрыть"
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr "Добавить новое правило"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr "Название правила"
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr "Содержание правила"
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr "Отмена"
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Это дополнение требует наличия хотя бы одной записи на этом узле."
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr "Вы должны авторизоваться для использования этого метода"
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr "Неверный ключ, пожалуйста, перезагрузите страницу"
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr "Требуется ввести название и значение правила."
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr "Правило успешно добавлено"
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "Правило не найдено или доступ к нему закрыт"
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr "Правило успешно обновлено"
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr "Правило успешно удалено"
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr "Отсутствующий аргумент: guid."
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Неизвестный пост в ID: %s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "Метод не найден"
--- a/advancedcontentfilter/lang/ru/strings.php
+++ b/advancedcontentfilter/lang/ru/strings.php
@ -1,40 +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['Filtered by rule: %s'] = 'Отфильтровано по правилу: %s';
-$a->strings['Advanced Content Filter'] = 'Расширенный фильтр содержимого';
-$a->strings['Back to Addon Settings'] = 'Вернуться к настройкам дополнений';
-$a->strings['Add a Rule'] = 'Добавить правило';
-$a->strings['Help'] = 'Помощь';
-$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.'] = 'Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите страницу справки.';
-$a->strings['Your rules'] = 'Ваши правила';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку выше, рядом с названием.';
-$a->strings['Disabled'] = 'Отключено';
-$a->strings['Enabled'] = 'Включено';
-$a->strings['Disable this rule'] = 'Отключить это правило';
-$a->strings['Enable this rule'] = 'Включить это правило';
-$a->strings['Edit this rule'] = 'Изменить это правило';
-$a->strings['Edit the rule'] = 'Изменить правило';
-$a->strings['Save this rule'] = 'Сохранить это правило';
-$a->strings['Delete this rule'] = 'Удалить это правило';
-$a->strings['Rule'] = 'Правило';
-$a->strings['Close'] = 'Закрыть';
-$a->strings['Add new rule'] = 'Добавить новое правило';
-$a->strings['Rule Name'] = 'Название правила';
-$a->strings['Rule Expression'] = 'Содержание правила';
-$a->strings['Cancel'] = 'Отмена';
-$a->strings['This addon requires this node having at least one post'] = 'Это дополнение требует наличия хотя бы одной записи на этом узле.';
-$a->strings['You must be logged in to use this method'] = 'Вы должны авторизоваться для использования этого метода';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Неверный ключ, пожалуйста, перезагрузите страницу';
-$a->strings['The rule name and expression are required.'] = 'Требуется ввести название и значение правила.';
-$a->strings['Rule successfully added'] = 'Правило успешно добавлено';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Правило не найдено или доступ к нему закрыт';
-$a->strings['Rule successfully updated'] = 'Правило успешно обновлено';
-$a->strings['Rule successfully deleted'] = 'Правило успешно удалено';
-$a->strings['Missing argument: guid.'] = 'Отсутствующий аргумент: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Неизвестный пост в ID: %s';
-$a->strings['Method not found'] = 'Метод не найден';
--- a/advancedcontentfilter/lang/sv/messages.po
+++ b/advancedcontentfilter/lang/sv/messages.po
@ -5,16 +5,15 @@
 # 
 # Translators:
 # Bjoessi <torbjorn.andersson@syte.se>, 2019
-# Viktor Nilsson, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Viktor Nilsson, 2022\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -22,44 +21,44 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtrerat efter regel: %s"

-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Avancerat innehållsfiter"

-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "TIllbaka till Tilläggsinställningar"

-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Lägg till en regel"

-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Hjälp"

-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Lägg till och hantera dina personliga regler för innehållsfilter i det här "
-"fönstret. Regler har ett namn och ett filteruttryck som jämförs mot "
-"inläggets innehåll. Förteckning över alla operander och variabler finns att "
-"hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>."
+"fönstret. Regler har ett namn och ett valfritt uttryck och kommer jämföras "
+"mot inläggets innehåll. Förteckning av alla operander och variabler finns "
+"att hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>."

-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Dina regler"

-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@ -67,106 +66,110 @@ msgstr ""
 "Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför,"
 " bredvid överskriften."

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

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

-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Inaktivera den här regeln"

-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Aktivera den här regeln"

-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Redigera den här regeln"

-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Redigera den här regeln"

-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Spara den här regeln"

-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Ta bort den här regeln"

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

-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Stäng"

-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Lägg till ny regel"

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

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

-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Exempel:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>taggar</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Avbryt"

-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Detta tillägg kräver att denna nod har åtminstone ett inlägg"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Du måste vara inloggad för att använda den här funktionen"

-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan."

-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Regelns namn och uttryck krävs."

-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Regeln kunde läggas till"

-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Regeln finns inte eller tillhör inte dig."

-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Uppdatering av regel lyckades"

-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Borttagning av regel lyckades"

-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argument saknas: guid."

-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Okänt inlägg med guid: %s"

-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Metod hittades inte"
--- a/advancedcontentfilter/lang/sv/strings.php
+++ b/advancedcontentfilter/lang/sv/strings.php
@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrerat efter regel: %s';
-$a->strings['Advanced Content Filter'] = 'Avancerat innehållsfiter';
-$a->strings['Back to Addon Settings'] = 'TIllbaka till Tilläggsinställningar';
-$a->strings['Add a Rule'] = 'Lägg till en regel';
-$a->strings['Help'] = 'Hjälp';
-$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.'] = 'Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett filteruttryck som jämförs mot inläggets innehåll. Förteckning över alla operander och variabler finns att hitta på <a href="advancedcontentfilter/help">hjälpsidan</a>.';
-$a->strings['Your rules'] = 'Dina regler';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.';
-$a->strings['Disabled'] = 'Inaktiverad';
-$a->strings['Enabled'] = 'Aktiverad';
-$a->strings['Disable this rule'] = 'Inaktivera den här regeln';
-$a->strings['Enable this rule'] = 'Aktivera den här regeln';
-$a->strings['Edit this rule'] = 'Redigera den här regeln';
-$a->strings['Edit the rule'] = 'Redigera den här regeln';
-$a->strings['Save this rule'] = 'Spara den här regeln';
-$a->strings['Delete this rule'] = 'Ta bort den här regeln';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Stäng';
-$a->strings['Add new rule'] = 'Lägg till ny regel';
-$a->strings['Rule Name'] = 'Regelnamn';
-$a->strings['Rule Expression'] = 'Regeluttryck';
-$a->strings['Cancel'] = 'Avbryt';
-$a->strings['This addon requires this node having at least one post'] = 'Detta tillägg kräver att denna nod har åtminstone ett inlägg';
-$a->strings['You must be logged in to use this method'] = 'Du måste vara inloggad för att använda den här funktionen';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.';
-$a->strings['The rule name and expression are required.'] = 'Regelns namn och uttryck krävs.';
-$a->strings['Rule successfully added'] = 'Regeln kunde läggas till';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Regeln finns inte eller tillhör inte dig.';
-$a->strings['Rule successfully updated'] = 'Uppdatering av regel lyckades';
-$a->strings['Rule successfully deleted'] = 'Borttagning av regel lyckades';
-$a->strings['Missing argument: guid.'] = 'Argument saknas: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Okänt inlägg med guid: %s';
-$a->strings['Method not found'] = 'Metod hittades inte';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrerat efter regel: %s";
+$a->strings["Advanced Content Filter"] = "Avancerat innehållsfiter";
+$a->strings["Back to Addon Settings"] = "TIllbaka till Tilläggsinställningar";
+$a->strings["Add a Rule"] = "Lägg till en regel";
+$a->strings["Help"] = "Hjälp";
+$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>."] = "Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett valfritt uttryck och kommer jämföras mot inläggets innehåll. Förteckning av alla operander och variabler finns att hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>.";
+$a->strings["Your rules"] = "Dina regler";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.";
+$a->strings["Disabled"] = "Inaktiverad";
+$a->strings["Enabled"] = "Aktiverad";
+$a->strings["Disable this rule"] = "Inaktivera den här regeln";
+$a->strings["Enable this rule"] = "Aktivera den här regeln";
+$a->strings["Edit this rule"] = "Redigera den här regeln";
+$a->strings["Edit the rule"] = "Redigera den här regeln";
+$a->strings["Save this rule"] = "Spara den här regeln";
+$a->strings["Delete this rule"] = "Ta bort den här regeln";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Stäng";
+$a->strings["Add new rule"] = "Lägg till ny regel";
+$a->strings["Rule Name"] = "Regelnamn";
+$a->strings["Rule Expression"] = "Regeluttryck";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exempel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>taggar</li></ul>";
+$a->strings["Cancel"] = "Avbryt";
+$a->strings["You must be logged in to use this method"] = "Du måste vara inloggad för att använda den här funktionen";
+$a->strings["Invalid form security token, please refresh the page."] = "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.";
+$a->strings["The rule name and expression are required."] = "Regelns namn och uttryck krävs.";
+$a->strings["Rule successfully added"] = "Regeln kunde läggas till";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Regeln finns inte eller tillhör inte dig.";
+$a->strings["Rule successfully updated"] = "Uppdatering av regel lyckades";
+$a->strings["Rule successfully deleted"] = "Borttagning av regel lyckades";
+$a->strings["Missing argument: guid."] = "Argument saknas: guid.";
+$a->strings["Unknown post with guid: %s"] = "Okänt inlägg med guid: %s";
+$a->strings["Method not found"] = "Metod hittades inte";
--- a/advancedcontentfilter/lang/zh-cn/messages.po
+++ b/advancedcontentfilter/lang/zh-cn/messages.po
@ -1,171 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Tom <hxxtom@gmail.com>, 2020
-# 
-#, 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: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tom <hxxtom@gmail.com>, 2020\n"
-"Language-Team: Chinese (China) (https://www.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"
-
-#: advancedcontentfilter.php:134
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "通过规则过滤：%s"
-
-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
-msgid "Advanced Content Filter"
-msgstr "高级内容过滤"
-
-#: advancedcontentfilter.php:203
-msgid "Back to Addon Settings"
-msgstr "返回扩展设置"
-
-#: advancedcontentfilter.php:205
-msgid "Add a Rule"
-msgstr "添加规则"
-
-#: advancedcontentfilter.php:206
-msgid "Help"
-msgstr "帮助"
-
-#: advancedcontentfilter.php:207
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the <a href=\"advancedcontentfilter/help\">help page</a>."
-msgstr ""
-"在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量，请查看<a "
-"href=\"advancedcontentfilter/help\">帮助页面</a>。"
-
-#: advancedcontentfilter.php:208
-msgid "Your rules"
-msgstr "你的规则"
-
-#: advancedcontentfilter.php:209
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr "你还没有规则！点击标题上方的按钮开始新增规则。"
-
-#: advancedcontentfilter.php:210
-msgid "Disabled"
-msgstr "禁用"
-
-#: advancedcontentfilter.php:211
-msgid "Enabled"
-msgstr "启用"
-
-#: advancedcontentfilter.php:212
-msgid "Disable this rule"
-msgstr "禁用此规则"
-
-#: advancedcontentfilter.php:213
-msgid "Enable this rule"
-msgstr "启用此规则"
-
-#: advancedcontentfilter.php:214
-msgid "Edit this rule"
-msgstr "编辑此规则"
-
-#: advancedcontentfilter.php:215
-msgid "Edit the rule"
-msgstr "编辑规则"
-
-#: advancedcontentfilter.php:216
-msgid "Save this rule"
-msgstr "保存规则"
-
-#: advancedcontentfilter.php:217
-msgid "Delete this rule"
-msgstr "删除此规则"
-
-#: advancedcontentfilter.php:218
-msgid "Rule"
-msgstr "规则"
-
-#: advancedcontentfilter.php:219
-msgid "Close"
-msgstr "关闭"
-
-#: advancedcontentfilter.php:220
-msgid "Add new rule"
-msgstr "新增规则"
-
-#: advancedcontentfilter.php:221
-msgid "Rule Name"
-msgstr "规则名"
-
-#: advancedcontentfilter.php:222
-msgid "Rule Expression"
-msgstr "规则表达式"
-
-#: 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>例子：</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>"
-
-#: advancedcontentfilter.php:224
-msgid "Cancel"
-msgstr "取消"
-
-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
-msgid "You must be logged in to use this method"
-msgstr "使用此模式您必须先登录。"
-
-#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:379
-msgid "Invalid form security token, please refresh the page."
-msgstr "无效的安全令牌，请刷新页面。"
-
-#: advancedcontentfilter.php:328
-msgid "The rule name and expression are required."
-msgstr "规则名和表达式必填。"
-
-#: advancedcontentfilter.php:340
-msgid "Rule successfully added"
-msgstr "规则添加成功。"
-
-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "规则不存在或不属于你。"
-
-#: advancedcontentfilter.php:369
-msgid "Rule successfully updated"
-msgstr "规则更新成功"
-
-#: advancedcontentfilter.php:390
-msgid "Rule successfully deleted"
-msgstr "规则删除成功"
-
-#: advancedcontentfilter.php:400
-msgid "Missing argument: guid."
-msgstr "缺少参数：guid。"
-
-#: advancedcontentfilter.php:406
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "未知帖子 guid：%s"
-
-#: src/middlewares.php:28
-msgid "Method not found"
-msgstr "未找到模式"
--- a/advancedcontentfilter/lang/zh-cn/strings.php
+++ b/advancedcontentfilter/lang/zh-cn/strings.php
@ -1,40 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Filtered by rule: %s'] = '通过规则过滤：%s';
-$a->strings['Advanced Content Filter'] = '高级内容过滤';
-$a->strings['Back to Addon Settings'] = '返回扩展设置';
-$a->strings['Add a Rule'] = '添加规则';
-$a->strings['Help'] = '帮助';
-$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>.'] = '在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量，请查看<a href="advancedcontentfilter/help">帮助页面</a>。';
-$a->strings['Your rules'] = '你的规则';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = '你还没有规则！点击标题上方的按钮开始新增规则。';
-$a->strings['Disabled'] = '禁用';
-$a->strings['Enabled'] = '启用';
-$a->strings['Disable this rule'] = '禁用此规则';
-$a->strings['Enable this rule'] = '启用此规则';
-$a->strings['Edit this rule'] = '编辑此规则';
-$a->strings['Edit the rule'] = '编辑规则';
-$a->strings['Save this rule'] = '保存规则';
-$a->strings['Delete this rule'] = '删除此规则';
-$a->strings['Rule'] = '规则';
-$a->strings['Close'] = '关闭';
-$a->strings['Add new rule'] = '新增规则';
-$a->strings['Rule Name'] = '规则名';
-$a->strings['Rule Expression'] = '规则表达式';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>例子：</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = '取消';
-$a->strings['You must be logged in to use this method'] = '使用此模式您必须先登录。';
-$a->strings['Invalid form security token, please refresh the page.'] = '无效的安全令牌，请刷新页面。';
-$a->strings['The rule name and expression are required.'] = '规则名和表达式必填。';
-$a->strings['Rule successfully added'] = '规则添加成功。';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = '规则不存在或不属于你。';
-$a->strings['Rule successfully updated'] = '规则更新成功';
-$a->strings['Rule successfully deleted'] = '规则删除成功';
-$a->strings['Missing argument: guid.'] = '缺少参数：guid。';
-$a->strings['Unknown post with guid: %s'] = '未知帖子 guid：%s';
-$a->strings['Method not found'] = '未找到模式';
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@ -1,25 +1,5 @@
 <?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-use Friendica\DI;
+use Friendica\Core\L10n;

 $container = $slim->getContainer();

@ -30,7 +10,7 @@ $container['errorHandler'] = function () {
 		$responseCode = 500;

 		if (is_a($exception, 'Friendica\Network\HTTPException')) {
-			$responseCode = $exception->getCode();
+			$responseCode = $exception->httpcode;
 		}

 		$errors['message'] = $exception->getMessage();
@ -46,6 +26,6 @@ $container['errorHandler'] = function () {
 $container['notFoundHandler'] = function () {
 	return function ()
 	{
-		throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('Method not found'));
+		throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Method not found'));
 	};
 };
--- a/advancedcontentfilter/src/routes.php
+++ b/advancedcontentfilter/src/routes.php
@ -1,23 +1,6 @@
 <?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
+
+// Routes

 /* @var $slim Slim\App */
 $slim->group('/advancedcontentfilter/api', function () {
--- a/advancedcontentfilter/templates/advancedcontentfilter.vue
+++ b/advancedcontentfilter/templates/advancedcontentfilter.vue
@ -7,7 +7,7 @@
 	3. Replace the render and staticRenderFns members in advancedcontentfilter.js by the contents of the anonymous() functions
 -->
 <div id="rules">
-	<p><a href="settings/addons">🔙 {{ messages.backtosettings }}</a></p>
+	<p><a href="settings/addon">🔙 {{ messages.backtosettings }}</a></p>
 	<h1>
 		{{ messages.title }}
 		&nbsp;
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@ -17,6 +17,6 @@
 	</script>

 	<!-- JS -->
-	<script src="{{$baseurl}}/addon/advancedcontentfilter/asset/vue/dist/vue.min.js"></script>
+	<script src="{{$baseurl}}/view/asset/vue/dist/vue.min.js"></script>
 	<script src="{{$baseurl}}/addon/advancedcontentfilter/advancedcontentfilter.js"></script>
 </div>
--- a/audon/README.md
+++ b/audon/README.md
@ -1,6 +0,0 @@
-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
@ -1,69 +0,0 @@
-<?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
@ -1,52 +0,0 @@
-# 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
@ -1,2 +0,0 @@
-{{include file="field_input.tpl" field=$audonurl}}
-<button type="submit">{{$submit}}</button>
--- a/birdavatar/README.md
+++ b/birdavatar/README.md
@ -1,14 +0,0 @@
-# Bird Avatar Generator
-
-Generate a default avatar based on David Revoy's bird-avatar-generator https://www.peppercarrot.com/extras/html/2019_bird-generator/index.php
-
-## License:
-
-**Artworks:**
-PNG and ORA files licensed under: [CC-By 4.0](https://creativecommons.org/licenses/by/4.0/) 
-attribution: David Revoy with the following exception: Generated pictures used as Avatar 
-(for blog,forum,social-network) don't need direct attribution and so, can be used 
-
-**Original code**
-Original PHP code is licensed under the short and simple permissive:
-[MIT License](https://en.wikipedia.org/wiki/MIT_License)
--- a/birdavatar/avatars/accessorie_1.png
+++ b/birdavatar/avatars/accessorie_1.png
--- a/birdavatar/avatars/accessorie_10.png
+++ b/birdavatar/avatars/accessorie_10.png
--- a/birdavatar/avatars/accessorie_11.png
+++ b/birdavatar/avatars/accessorie_11.png
--- a/birdavatar/avatars/accessorie_12.png
+++ b/birdavatar/avatars/accessorie_12.png
--- a/birdavatar/avatars/accessorie_13.png
+++ b/birdavatar/avatars/accessorie_13.png
--- a/birdavatar/avatars/accessorie_14.png
+++ b/birdavatar/avatars/accessorie_14.png
--- a/birdavatar/avatars/accessorie_15.png
+++ b/birdavatar/avatars/accessorie_15.png
--- a/birdavatar/avatars/accessorie_16.png
+++ b/birdavatar/avatars/accessorie_16.png
--- a/birdavatar/avatars/accessorie_17.png
+++ b/birdavatar/avatars/accessorie_17.png
--- a/birdavatar/avatars/accessorie_18.png
+++ b/birdavatar/avatars/accessorie_18.png
--- a/birdavatar/avatars/accessorie_19.png
+++ b/birdavatar/avatars/accessorie_19.png
--- a/birdavatar/avatars/accessorie_2.png
+++ b/birdavatar/avatars/accessorie_2.png
--- a/birdavatar/avatars/accessorie_20.png
+++ b/birdavatar/avatars/accessorie_20.png
--- a/birdavatar/avatars/accessorie_3.png
+++ b/birdavatar/avatars/accessorie_3.png
--- a/birdavatar/avatars/accessorie_4.png
+++ b/birdavatar/avatars/accessorie_4.png
--- a/birdavatar/avatars/accessorie_5.png
+++ b/birdavatar/avatars/accessorie_5.png
--- a/birdavatar/avatars/accessorie_6.png
+++ b/birdavatar/avatars/accessorie_6.png
--- a/birdavatar/avatars/accessorie_7.png
+++ b/birdavatar/avatars/accessorie_7.png
--- a/birdavatar/avatars/accessorie_8.png
+++ b/birdavatar/avatars/accessorie_8.png
--- a/birdavatar/avatars/accessorie_9.png
+++ b/birdavatar/avatars/accessorie_9.png
--- a/birdavatar/avatars/bec_1.png
+++ b/birdavatar/avatars/bec_1.png
--- a/birdavatar/avatars/bec_2.png
+++ b/birdavatar/avatars/bec_2.png
--- a/birdavatar/avatars/bec_3.png
+++ b/birdavatar/avatars/bec_3.png
--- a/birdavatar/avatars/bec_4.png
+++ b/birdavatar/avatars/bec_4.png
--- a/birdavatar/avatars/bec_5.png
+++ b/birdavatar/avatars/bec_5.png
--- a/birdavatar/avatars/bec_6.png
+++ b/birdavatar/avatars/bec_6.png
--- a/birdavatar/avatars/bec_7.png
+++ b/birdavatar/avatars/bec_7.png
--- a/birdavatar/avatars/bec_8.png
+++ b/birdavatar/avatars/bec_8.png
--- a/birdavatar/avatars/bec_9.png
+++ b/birdavatar/avatars/bec_9.png
--- a/birdavatar/avatars/body_1.png
+++ b/birdavatar/avatars/body_1.png
--- a/birdavatar/avatars/body_2.png
+++ b/birdavatar/avatars/body_2.png
--- a/birdavatar/avatars/body_3.png
+++ b/birdavatar/avatars/body_3.png
--- a/birdavatar/avatars/body_4.png
+++ b/birdavatar/avatars/body_4.png
--- a/birdavatar/avatars/body_5.png
+++ b/birdavatar/avatars/body_5.png
--- a/birdavatar/avatars/body_6.png
+++ b/birdavatar/avatars/body_6.png
--- a/birdavatar/avatars/body_7.png
+++ b/birdavatar/avatars/body_7.png
--- a/birdavatar/avatars/body_8.png
+++ b/birdavatar/avatars/body_8.png
--- a/birdavatar/avatars/body_9.png
+++ b/birdavatar/avatars/body_9.png
--- a/birdavatar/avatars/eyes_1.png
+++ b/birdavatar/avatars/eyes_1.png
--- a/birdavatar/avatars/eyes_2.png
+++ b/birdavatar/avatars/eyes_2.png
--- a/birdavatar/avatars/eyes_3.png
+++ b/birdavatar/avatars/eyes_3.png
--- a/birdavatar/avatars/eyes_4.png
+++ b/birdavatar/avatars/eyes_4.png
--- a/birdavatar/avatars/eyes_5.png
+++ b/birdavatar/avatars/eyes_5.png
--- a/birdavatar/avatars/eyes_6.png
+++ b/birdavatar/avatars/eyes_6.png
--- a/birdavatar/avatars/eyes_7.png
+++ b/birdavatar/avatars/eyes_7.png
--- a/birdavatar/avatars/eyes_8.png
+++ b/birdavatar/avatars/eyes_8.png
--- a/birdavatar/avatars/eyes_9.png
+++ b/birdavatar/avatars/eyes_9.png
--- a/birdavatar/avatars/hoop_1.png
+++ b/birdavatar/avatars/hoop_1.png
--- a/birdavatar/avatars/hoop_10.png
+++ b/birdavatar/avatars/hoop_10.png
--- a/Show more
+++ b/Show more