From: Michael <heluecht@pirati.ca>
Date: Sun, 23 Apr 2023 21:20:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into audience
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=69e4254dcc51345a36e13fb96f94d9b57bc37489;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into audience
---

69e4254dcc51345a36e13fb96f94d9b57bc37489
diff --cc view/lang/C/messages.po
index e016266561,59055019fa..13ece85f69
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: 2023.03-rc\n"
+ "Project-Id-Version: 2023.06-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2023-04-14 17:15+0000\n"
 -"POT-Creation-Date: 2023-04-20 07:48-0400\n"
++"POT-Creation-Date: 2023-04-09 08:27-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -1597,7 -1600,7 +1601,7 @@@ msgstr "
  msgid "show more"
  msgstr ""
  
- #: src/Content/Item.php:326 src/Model/Item.php:2922
 -#: src/Content/Item.php:326 src/Model/Item.php:2921
++#: src/Content/Item.php:326 src/Model/Item.php:2913
  msgid "event"
  msgstr ""
  
@@@ -1605,7 -1608,7 +1609,7 @@@
  msgid "status"
  msgstr ""
  
- #: src/Content/Item.php:335 src/Model/Item.php:2924
 -#: src/Content/Item.php:335 src/Model/Item.php:2923
++#: src/Content/Item.php:335 src/Model/Item.php:2915
  #: src/Module/Post/Tag/Add.php:123
  msgid "photo"
  msgstr ""
@@@ -2011,8 -2014,8 +2015,8 @@@ msgid "
  "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
  msgstr ""
  
- #: src/Content/Text/BBCode.php:956 src/Model/Item.php:3607
- #: src/Model/Item.php:3613 src/Model/Item.php:3614
 -#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3606
 -#: src/Model/Item.php:3612 src/Model/Item.php:3613
++#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3598
++#: src/Model/Item.php:3604 src/Model/Item.php:3605
  msgid "Link to source"
  msgstr ""
  
@@@ -3181,81 -3184,81 +3185,81 @@@ msgstr "
  msgid "Edit groups"
  msgstr ""
  
- #: src/Model/Item.php:2023
 -#: src/Model/Item.php:2022
++#: src/Model/Item.php:2014
  #, php-format
  msgid "Detected languages in this post:\\n%s"
  msgstr ""
  
- #: src/Model/Item.php:2926
 -#: src/Model/Item.php:2925
++#: src/Model/Item.php:2917
  msgid "activity"
  msgstr ""
  
- #: src/Model/Item.php:2928
 -#: src/Model/Item.php:2927
++#: src/Model/Item.php:2919
  msgid "comment"
  msgstr ""
  
- #: src/Model/Item.php:2931 src/Module/Post/Tag/Add.php:123
 -#: src/Model/Item.php:2930 src/Module/Post/Tag/Add.php:123
++#: src/Model/Item.php:2922 src/Module/Post/Tag/Add.php:123
  msgid "post"
  msgstr ""
  
- #: src/Model/Item.php:3093
 -#: src/Model/Item.php:3092
++#: src/Model/Item.php:3084
  #, php-format
  msgid "%s is blocked"
  msgstr ""
  
- #: src/Model/Item.php:3095
 -#: src/Model/Item.php:3094
++#: src/Model/Item.php:3086
  #, php-format
  msgid "%s is ignored"
  msgstr ""
  
- #: src/Model/Item.php:3097
 -#: src/Model/Item.php:3096
++#: src/Model/Item.php:3088
  #, php-format
  msgid "Content from %s is collapsed"
  msgstr ""
  
- #: src/Model/Item.php:3101
 -#: src/Model/Item.php:3100
++#: src/Model/Item.php:3092
  #, php-format
  msgid "Content warning: %s"
  msgstr ""
  
- #: src/Model/Item.php:3519
 -#: src/Model/Item.php:3518
++#: src/Model/Item.php:3510
  msgid "bytes"
  msgstr ""
  
- #: src/Model/Item.php:3550
 -#: src/Model/Item.php:3549
++#: src/Model/Item.php:3541
  #, php-format
  msgid "%2$s (%3$d%%, %1$d vote)"
  msgid_plural "%2$s (%3$d%%, %1$d votes)"
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3552
 -#: src/Model/Item.php:3551
++#: src/Model/Item.php:3543
  #, php-format
  msgid "%2$s (%1$d vote)"
  msgid_plural "%2$s (%1$d votes)"
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3557
 -#: src/Model/Item.php:3556
++#: src/Model/Item.php:3548
  #, php-format
  msgid "%d voter. Poll end: %s"
  msgid_plural "%d voters. Poll end: %s"
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3559
 -#: src/Model/Item.php:3558
++#: src/Model/Item.php:3550
  #, php-format
  msgid "%d voter."
  msgid_plural "%d voters."
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3561
 -#: src/Model/Item.php:3560
++#: src/Model/Item.php:3552
  #, php-format
  msgid "Poll end: %s"
  msgstr ""
  
- #: src/Model/Item.php:3595 src/Model/Item.php:3596
 -#: src/Model/Item.php:3594 src/Model/Item.php:3595
++#: src/Model/Item.php:3586 src/Model/Item.php:3587
  msgid "View on separate page"
  msgstr ""