From: Art4 <art4@wlabs.de>
Date: Sat, 16 Nov 2024 18:59:55 +0000 (+0000)
Subject: Merge branch 'develop' into run-phpstan-in-ci-pipeline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f75fc9a2fb1ba0b844227432e4c518f6aa94ee80;p=friendica.git

Merge branch 'develop' into run-phpstan-in-ci-pipeline
---

f75fc9a2fb1ba0b844227432e4c518f6aa94ee80
diff --cc view/lang/C/messages.po
index 01da0d4ed7,d66a1acb80..460746db80
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: 2024.09-dev\n"
+ "Project-Id-Version: 2024.12-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2024-11-16 12:20+0000\n"
 -"POT-Creation-Date: 2024-11-16 08:36+0000\n"
++"POT-Creation-Date: 2024-11-16 18:59+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -291,12 -291,12 +291,12 @@@ msgstr "
  #: mod/photos.php:778 mod/photos.php:1055 mod/photos.php:1096
  #: mod/photos.php:1152 mod/photos.php:1232
  #: src/Module/Calendar/Event/Form.php:236 src/Module/Contact/Advanced.php:118
- #: src/Module/Contact/Profile.php:371
+ #: src/Module/Contact/Profile.php:376
  #: src/Module/Debug/ActivityPubConversion.php:128
 -#: src/Module/Debug/Babel.php:288 src/Module/Debug/Localtime.php:50
 +#: src/Module/Debug/Babel.php:279 src/Module/Debug/Localtime.php:50
  #: src/Module/Debug/Probe.php:40 src/Module/Debug/WebFinger.php:37
- #: src/Module/FriendSuggest.php:131 src/Module/Install.php:220
- #: src/Module/Install.php:260 src/Module/Install.php:295
+ #: src/Module/FriendSuggest.php:131 src/Module/Install.php:221
+ #: src/Module/Install.php:261 src/Module/Install.php:296
  #: src/Module/Invite.php:164 src/Module/Item/Compose.php:182
  #: src/Module/Moderation/Item/Source.php:71
  #: src/Module/Moderation/Report/Create.php:154
@@@ -1065,7 -1065,7 +1065,7 @@@ msgstr "
  msgid "Email"
  msgstr ""
  
- #: src/Content/ContactSelector.php:116 src/Module/Debug/Babel.php:273
 -#: src/Content/ContactSelector.php:122 src/Module/Debug/Babel.php:282
++#: src/Content/ContactSelector.php:122 src/Module/Debug/Babel.php:273
  msgid "Diaspora"
  msgstr ""