From: Art4 <art4@wlabs.de>
Date: Sun, 17 Nov 2024 07:37:58 +0000 (+0000)
Subject: Merge branch 'develop' into refactoring-of-app-class
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5696a5249f972f47d8529df4e5bc17d61faac7bf;p=friendica.git

Merge branch 'develop' into refactoring-of-app-class
---

5696a5249f972f47d8529df4e5bc17d61faac7bf
diff --cc view/lang/C/messages.po
index 5fcd435369,460746db80..d68690a828
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2024.12-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2024-11-16 19:15+0000\n"
 -"POT-Creation-Date: 2024-11-16 18:59+0000\n"
++"POT-Creation-Date: 2024-11-17 07:37+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"
@@@ -293,12 -293,12 +293,12 @@@ msgstr "
  #: src/Module/Calendar/Event/Form.php:236 src/Module/Contact/Advanced.php:118
  #: 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: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/FriendSuggest.php:132 src/Module/Install.php:220
 +#: src/Module/Install.php:260 src/Module/Install.php:295
 +#: src/Module/Invite.php:164 src/Module/Item/Compose.php:185
 +#: src/Module/Moderation/Item/Source.php:74
  #: src/Module/Moderation/Report/Create.php:154
  #: src/Module/Moderation/Report/Create.php:169
  #: src/Module/Moderation/Report/Create.php:197
@@@ -3028,32 -3028,32 +3028,32 @@@ msgstr "
  msgid "Enter a valid existing folder"
  msgstr ""
  
- #: src/Core/Update.php:102
 -#: src/Core/Update.php:104
++#: src/Core/Update.php:103
  #, php-format
  msgid "Updates from version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383."
  msgstr ""
  
- #: src/Core/Update.php:113
 -#: src/Core/Update.php:115
++#: src/Core/Update.php:114
  #, php-format
  msgid "Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383."
  msgstr ""
  
- #: src/Core/Update.php:205
 -#: src/Core/Update.php:207
++#: src/Core/Update.php:206
  #, php-format
  msgid "%s: executing pre update %d"
  msgstr ""
  
- #: src/Core/Update.php:247
 -#: src/Core/Update.php:249
++#: src/Core/Update.php:248
  #, php-format
  msgid "%s: executing post update %d"
  msgstr ""
  
- #: src/Core/Update.php:321
 -#: src/Core/Update.php:323
++#: src/Core/Update.php:322
  #, php-format
  msgid "Update %s failed. See error logs."
  msgstr ""
  
- #: src/Core/Update.php:361
 -#: src/Core/Update.php:363
++#: src/Core/Update.php:362
  #, php-format
  msgid ""
  "\n"
@@@ -3063,16 -3063,16 +3063,16 @@@
  "\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
  msgstr ""
  
- #: src/Core/Update.php:367
 -#: src/Core/Update.php:369
++#: src/Core/Update.php:368
  #, php-format
  msgid "The error message is\\n[pre]%s[/pre]"
  msgstr ""
  
- #: src/Core/Update.php:371 src/Core/Update.php:399
 -#: src/Core/Update.php:373 src/Core/Update.php:401
++#: src/Core/Update.php:372 src/Core/Update.php:400
  msgid "[Friendica Notify] Database update"
  msgstr ""
  
- #: src/Core/Update.php:393
 -#: src/Core/Update.php:395
++#: src/Core/Update.php:394
  #, php-format
  msgid ""
  "\n"
@@@ -6741,7 -6741,7 +6741,7 @@@ msgid "Result Item
  msgstr ""
  
  #: src/Module/Debug/ActivityPubConversion.php:117
- #: src/Module/Debug/Babel.php:267 src/Module/Moderation/Item/Source.php:82
 -#: src/Module/Moderation/Item/Source.php:79
++#: src/Module/Moderation/Item/Source.php:82
  #: src/Module/Security/TwoFactor/Verify.php:84
  msgid "Error"
  msgid_plural "Errors"