Merge remote-tracking branch 'upstream/develop' into channel-relay

diff --cc src/Model/User.php
Simple merge

diff --cc view/lang/C/messages.po
index e248abf,72b7cad..2815e09
--- 1/view/lang/C/messages.po
--- 2/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2024.03-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2024-01-15 06:14+0000\n"
 -"POT-Creation-Date: 2024-01-15 16:52+0000\n"
++"POT-Creation-Date: 2024-01-15 19:41+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"
@@@ -1770,7 -1770,7 +1770,7 @@@ msgstr "
  msgid "Create new group"
  msgstr ""
  
- #: src/Content/Item.php:332 src/Model/Item.php:3234
 -#: src/Content/Item.php:332 src/Model/Item.php:3166
++#: src/Content/Item.php:332 src/Model/Item.php:3235
  msgid "event"
  msgstr ""
  
@@@ -1778,7 -1778,7 +1778,7 @@@
  msgid "status"
  msgstr ""
  
- #: src/Content/Item.php:341 src/Model/Item.php:3236
 -#: src/Content/Item.php:341 src/Model/Item.php:3168
++#: src/Content/Item.php:341 src/Model/Item.php:3237
  #: src/Module/Post/Tag/Add.php:123
  msgid "photo"
  msgstr ""
@@@ -2191,8 -2191,8 +2191,8 @@@ msgid "
  "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
  msgstr ""
  
- #: src/Content/Text/BBCode.php:998 src/Model/Item.php:3967
- #: src/Model/Item.php:3973 src/Model/Item.php:3974
 -#: src/Content/Text/BBCode.php:994 src/Model/Item.php:3899
 -#: src/Model/Item.php:3905 src/Model/Item.php:3906
++#: src/Content/Text/BBCode.php:998 src/Model/Item.php:3968
++#: src/Model/Item.php:3974 src/Model/Item.php:3975
  msgid "Link to source"
  msgstr ""
  
@@@ -2855,167 -2855,163 +2855,167 @@@ msgstr "
  msgid "Could not connect to database."
  msgstr ""
  
- #: src/Core/L10n.php:441 src/Model/Item.php:2278
 -#: src/Core/L10n.php:446
++#: src/Core/L10n.php:444 src/Model/Item.php:2279
 +msgid "Undetermined"
 +msgstr ""
 +
- #: src/Core/L10n.php:448
++#: src/Core/L10n.php:451
  #, php-format
  msgid "%s (%s)"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:430
 -#: src/Core/L10n.php:494 src/Model/Event.php:430
++#: src/Core/L10n.php:499 src/Model/Event.php:430
  #: src/Module/Settings/Display.php:284
  msgid "Monday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:431
 -#: src/Core/L10n.php:494 src/Model/Event.php:431
++#: src/Core/L10n.php:499 src/Model/Event.php:431
  #: src/Module/Settings/Display.php:285
  msgid "Tuesday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:432
 -#: src/Core/L10n.php:494 src/Model/Event.php:432
++#: src/Core/L10n.php:499 src/Model/Event.php:432
  #: src/Module/Settings/Display.php:286
  msgid "Wednesday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:433
 -#: src/Core/L10n.php:494 src/Model/Event.php:433
++#: src/Core/L10n.php:499 src/Model/Event.php:433
  #: src/Module/Settings/Display.php:287
  msgid "Thursday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:434
 -#: src/Core/L10n.php:494 src/Model/Event.php:434
++#: src/Core/L10n.php:499 src/Model/Event.php:434
  #: src/Module/Settings/Display.php:288
  msgid "Friday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:435
 -#: src/Core/L10n.php:494 src/Model/Event.php:435
++#: src/Core/L10n.php:499 src/Model/Event.php:435
  #: src/Module/Settings/Display.php:289
  msgid "Saturday"
  msgstr ""
  
- #: src/Core/L10n.php:496 src/Model/Event.php:429
 -#: src/Core/L10n.php:494 src/Model/Event.php:429
++#: src/Core/L10n.php:499 src/Model/Event.php:429
  #: src/Module/Settings/Display.php:283
  msgid "Sunday"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:450
 -#: src/Core/L10n.php:498 src/Model/Event.php:450
++#: src/Core/L10n.php:503 src/Model/Event.php:450
  msgid "January"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:451
 -#: src/Core/L10n.php:498 src/Model/Event.php:451
++#: src/Core/L10n.php:503 src/Model/Event.php:451
  msgid "February"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:452
 -#: src/Core/L10n.php:498 src/Model/Event.php:452
++#: src/Core/L10n.php:503 src/Model/Event.php:452
  msgid "March"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:453
 -#: src/Core/L10n.php:498 src/Model/Event.php:453
++#: src/Core/L10n.php:503 src/Model/Event.php:453
  msgid "April"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Core/L10n.php:519 src/Model/Event.php:441
 -#: src/Core/L10n.php:498 src/Core/L10n.php:517 src/Model/Event.php:441
++#: src/Core/L10n.php:503 src/Core/L10n.php:522 src/Model/Event.php:441
  msgid "May"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:454
 -#: src/Core/L10n.php:498 src/Model/Event.php:454
++#: src/Core/L10n.php:503 src/Model/Event.php:454
  msgid "June"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:455
 -#: src/Core/L10n.php:498 src/Model/Event.php:455
++#: src/Core/L10n.php:503 src/Model/Event.php:455
  msgid "July"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:456
 -#: src/Core/L10n.php:498 src/Model/Event.php:456
++#: src/Core/L10n.php:503 src/Model/Event.php:456
  msgid "August"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:457
 -#: src/Core/L10n.php:498 src/Model/Event.php:457
++#: src/Core/L10n.php:503 src/Model/Event.php:457
  msgid "September"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:458
 -#: src/Core/L10n.php:498 src/Model/Event.php:458
++#: src/Core/L10n.php:503 src/Model/Event.php:458
  msgid "October"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:459
 -#: src/Core/L10n.php:498 src/Model/Event.php:459
++#: src/Core/L10n.php:503 src/Model/Event.php:459
  msgid "November"
  msgstr ""
  
- #: src/Core/L10n.php:500 src/Model/Event.php:460
 -#: src/Core/L10n.php:498 src/Model/Event.php:460
++#: src/Core/L10n.php:503 src/Model/Event.php:460
  msgid "December"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:422
 -#: src/Core/L10n.php:513 src/Model/Event.php:422
++#: src/Core/L10n.php:518 src/Model/Event.php:422
  msgid "Mon"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:423
 -#: src/Core/L10n.php:513 src/Model/Event.php:423
++#: src/Core/L10n.php:518 src/Model/Event.php:423
  msgid "Tue"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:424
 -#: src/Core/L10n.php:513 src/Model/Event.php:424
++#: src/Core/L10n.php:518 src/Model/Event.php:424
  msgid "Wed"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:425
 -#: src/Core/L10n.php:513 src/Model/Event.php:425
++#: src/Core/L10n.php:518 src/Model/Event.php:425
  msgid "Thu"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:426
 -#: src/Core/L10n.php:513 src/Model/Event.php:426
++#: src/Core/L10n.php:518 src/Model/Event.php:426
  msgid "Fri"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:427
 -#: src/Core/L10n.php:513 src/Model/Event.php:427
++#: src/Core/L10n.php:518 src/Model/Event.php:427
  msgid "Sat"
  msgstr ""
  
- #: src/Core/L10n.php:515 src/Model/Event.php:421
 -#: src/Core/L10n.php:513 src/Model/Event.php:421
++#: src/Core/L10n.php:518 src/Model/Event.php:421
  msgid "Sun"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:437
 -#: src/Core/L10n.php:517 src/Model/Event.php:437
++#: src/Core/L10n.php:522 src/Model/Event.php:437
  msgid "Jan"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:438
 -#: src/Core/L10n.php:517 src/Model/Event.php:438
++#: src/Core/L10n.php:522 src/Model/Event.php:438
  msgid "Feb"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:439
 -#: src/Core/L10n.php:517 src/Model/Event.php:439
++#: src/Core/L10n.php:522 src/Model/Event.php:439
  msgid "Mar"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:440
 -#: src/Core/L10n.php:517 src/Model/Event.php:440
++#: src/Core/L10n.php:522 src/Model/Event.php:440
  msgid "Apr"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:442
 -#: src/Core/L10n.php:517 src/Model/Event.php:442
++#: src/Core/L10n.php:522 src/Model/Event.php:442
  msgid "Jun"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:443
 -#: src/Core/L10n.php:517 src/Model/Event.php:443
++#: src/Core/L10n.php:522 src/Model/Event.php:443
  msgid "Jul"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:444
 -#: src/Core/L10n.php:517 src/Model/Event.php:444
++#: src/Core/L10n.php:522 src/Model/Event.php:444
  msgid "Aug"
  msgstr ""
  
- #: src/Core/L10n.php:519
 -#: src/Core/L10n.php:517
++#: src/Core/L10n.php:522
  msgid "Sep"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:446
 -#: src/Core/L10n.php:517 src/Model/Event.php:446
++#: src/Core/L10n.php:522 src/Model/Event.php:446
  msgid "Oct"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:447
 -#: src/Core/L10n.php:517 src/Model/Event.php:447
++#: src/Core/L10n.php:522 src/Model/Event.php:447
  msgid "Nov"
  msgstr ""
  
- #: src/Core/L10n.php:519 src/Model/Event.php:448
 -#: src/Core/L10n.php:517 src/Model/Event.php:448
++#: src/Core/L10n.php:522 src/Model/Event.php:448
  msgid "Dec"
  msgstr ""
  
@@@ -3413,99 -3409,99 +3413,99 @@@ msgstr "
  msgid "Happy Birthday %s"
  msgstr ""
  
- #: src/Model/Item.php:2285
 -#: src/Model/Item.php:2217
++#: src/Model/Item.php:2286
  #, php-format
  msgid "%s (%s - %s): %s"
  msgstr ""
  
- #: src/Model/Item.php:2287
 -#: src/Model/Item.php:2219
++#: src/Model/Item.php:2288
  #, php-format
  msgid "%s (%s): %s"
  msgstr ""
  
- #: src/Model/Item.php:2290
 -#: src/Model/Item.php:2222
++#: src/Model/Item.php:2291
  #, php-format
  msgid "Detected languages in this post:\\n%s"
  msgstr ""
  
- #: src/Model/Item.php:3238
 -#: src/Model/Item.php:3170
++#: src/Model/Item.php:3239
  msgid "activity"
  msgstr ""
  
- #: src/Model/Item.php:3240
 -#: src/Model/Item.php:3172
++#: src/Model/Item.php:3241
  msgid "comment"
  msgstr ""
  
- #: src/Model/Item.php:3243 src/Module/Post/Tag/Add.php:123
 -#: src/Model/Item.php:3175 src/Module/Post/Tag/Add.php:123
++#: src/Model/Item.php:3244 src/Module/Post/Tag/Add.php:123
  msgid "post"
  msgstr ""
  
- #: src/Model/Item.php:3413
 -#: src/Model/Item.php:3345
++#: src/Model/Item.php:3414
  #, php-format
  msgid "%s is blocked"
  msgstr ""
  
- #: src/Model/Item.php:3415
 -#: src/Model/Item.php:3347
++#: src/Model/Item.php:3416
  #, php-format
  msgid "%s is ignored"
  msgstr ""
  
- #: src/Model/Item.php:3417
 -#: src/Model/Item.php:3349
++#: src/Model/Item.php:3418
  #, php-format
  msgid "Content from %s is collapsed"
  msgstr ""
  
- #: src/Model/Item.php:3421
 -#: src/Model/Item.php:3353
++#: src/Model/Item.php:3422
  #, php-format
  msgid "Content warning: %s"
  msgstr ""
  
- #: src/Model/Item.php:3874
 -#: src/Model/Item.php:3806
++#: src/Model/Item.php:3875
  msgid "bytes"
  msgstr ""
  
- #: src/Model/Item.php:3905
 -#: src/Model/Item.php:3837
++#: src/Model/Item.php:3906
  #, 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:3907
 -#: src/Model/Item.php:3839
++#: src/Model/Item.php:3908
  #, php-format
  msgid "%2$s (%1$d vote)"
  msgid_plural "%2$s (%1$d votes)"
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3912
 -#: src/Model/Item.php:3844
++#: src/Model/Item.php:3913
  #, php-format
  msgid "%d voter. Poll end: %s"
  msgid_plural "%d voters. Poll end: %s"
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3914
 -#: src/Model/Item.php:3846
++#: src/Model/Item.php:3915
  #, php-format
  msgid "%d voter."
  msgid_plural "%d voters."
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Model/Item.php:3916
 -#: src/Model/Item.php:3848
++#: src/Model/Item.php:3917
  #, php-format
  msgid "Poll end: %s"
  msgstr ""
  
- #: src/Model/Item.php:3950 src/Model/Item.php:3951
 -#: src/Model/Item.php:3882 src/Model/Item.php:3883
++#: src/Model/Item.php:3951 src/Model/Item.php:3952
  msgid "View on separate page"
  msgstr ""
  
--#: src/Model/Mail.php:137 src/Model/Mail.php:266
++#: src/Model/Mail.php:135
  msgid "[no subject]"
  msgstr ""
  
--#: src/Model/Photo.php:1190 src/Module/Media/Photo/Upload.php:170
++#: src/Model/Photo.php:1191 src/Module/Media/Photo/Upload.php:170
  msgid "Wall Photos"
  msgstr ""