From 2e1f08f1c40427e96de6a68d414c194ca959ca7c Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Thu, 13 Jun 2024 21:48:57 +1000 Subject: [PATCH 1/6] add data: url encoder/decode --- src/Lib/DataUrl.php | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/Lib/DataUrl.php diff --git a/src/Lib/DataUrl.php b/src/Lib/DataUrl.php new file mode 100644 index 000000000..9f5015c91 --- /dev/null +++ b/src/Lib/DataUrl.php @@ -0,0 +1,48 @@ +data = $data; + $this->mediaType = $mediaType; + $this->encoding = $encoding; + return $this; + } + + public function encode() + { + return 'data:' . $this->mediaType . (($this->encoding) ? ';' . $this->encoding : '') . ',' + . (($this->encoding) ? base64_encode($this->data) : urlencode($this->data)); + + } + + public function decode() + { + if (str_starts_with($this->data, 'data:')) { + $explode = explode(',', $this->data); + if (count($explode) === 2) { + $this->mediaType = substr($explode[0], strlen('data:')); + if (str_ends_with($this->mediaType, ';base64')) { + $this->encoding = 'base64'; + $this->mediaType = substr($this->mediaType, 0, strlen($this->mediaType) - strlen(';base64')); + } else { + $this->encoding = ''; + } + return [ + 'data' => $this->encoding ? base64_decode($this->data) : urldecode($this->data), + 'encoding' => $this->encoding, + 'mediaType' => $this->mediaType ?: 'text/plain;charset=US-ASCII', + ]; + } + } + return null; + } + +} From 249dc81f77a328eea5758ed37895cda12442d067 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Thu, 13 Jun 2024 12:58:07 -0700 Subject: [PATCH 2/6] version+strings --- util/messages.po | 2671 +++++++++++++++++++++++----------------------- version.php | 2 +- 2 files changed, 1343 insertions(+), 1330 deletions(-) diff --git a/util/messages.po b/util/messages.po index 771f5b9ba..726968ebf 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 24.06.10\n" +"Project-Id-Version: 24.06.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-09 14:06-0700\n" +"POT-Creation-Date: 2024-06-13 12:57-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -207,8 +207,8 @@ msgstr "" #: extend/addon/a/fuzzloc/Mod_Fuzzloc.php:58 #: extend/addon/a/logrot/logrot.php:38 extend/addon/a/nsfw/Mod_Nsfw.php:53 #: extend/addon/a/openstreetmap/openstreetmap.php:218 -#: extend/addon/a/zotpost/Mod_zotpost.php:83 src/Lib/ThreadItem.php:987 -#: src/Lib/AccessList.php:403 src/Lib/Stringsjs.php:27 +#: extend/addon/a/zotpost/Mod_zotpost.php:83 src/Lib/AccessList.php:403 +#: src/Lib/ThreadItem.php:987 src/Lib/Stringsjs.php:27 #: src/Module/Admin/Themes.php:160 src/Module/Admin/Site.php:276 #: src/Module/Admin/Profs.php:195 src/Module/Admin/Logs.php:87 #: src/Module/Admin/Customsql.php:38 src/Module/Admin/Channels.php:145 @@ -274,7 +274,7 @@ msgstr "" #: src/Module/Admin/Themes.php:79 src/Module/Admin/Addons.php:265 #: src/Module/Display.php:58 src/Module/Display.php:513 src/Module/Dev.php:61 #: src/Module/Filestorage.php:41 src/Module/Inspect.php:31 -#: src/Module/Search.php:510 src/Module/Viewsrc.php:29 src/Module/Thing.php:111 +#: src/Module/Viewsrc.php:29 src/Module/Thing.php:111 src/Module/Search.php:510 msgid "Item not found." msgstr "" @@ -583,8 +583,28 @@ msgstr "" msgid "This API method requires authentication." msgstr "" -#: include/bbcode.php:259 include/bbcode.php:1179 include/bbcode.php:2087 -#: include/bbcode.php:2090 include/misc.php:1835 src/Module/Embedphotos.php:121 +#: include/auth.php:213 +msgid "Delegation session ended." +msgstr "" + +#: include/auth.php:216 +msgid "Logged out." +msgstr "" + +#: include/auth.php:307 +msgid "Email validation is incomplete. Please check your email." +msgstr "" + +#: include/auth.php:327 +msgid "Failed authentication" +msgstr "" + +#: include/auth.php:338 +msgid "Login failed." +msgstr "" + +#: include/bbcode.php:259 include/bbcode.php:1181 include/bbcode.php:2089 +#: include/bbcode.php:2092 include/misc.php:1835 src/Module/Embedphotos.php:121 msgid "Image/photo" msgstr "" @@ -630,78 +650,39 @@ msgid "card" msgstr "" #: include/bbcode.php:682 +msgid "album" +msgstr "" + +#: include/bbcode.php:684 msgid "article" msgstr "" -#: include/bbcode.php:684 include/conversation.php:91 include/misc.php:2385 +#: include/bbcode.php:686 include/misc.php:2385 include/conversation.php:91 #: src/Lib/Markdown.php:220 src/Module/Tagger.php:93 msgid "post" msgstr "" -#: include/bbcode.php:690 src/Lib/Markdown.php:218 +#: include/bbcode.php:692 src/Lib/Markdown.php:218 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: include/bbcode.php:797 include/bbcode.php:806 +#: include/bbcode.php:799 include/bbcode.php:808 msgid "Click to open/close" msgstr "" -#: include/bbcode.php:806 +#: include/bbcode.php:808 msgid "spoiler" msgstr "" -#: include/bbcode.php:1524 include/bbcode.php:1734 +#: include/bbcode.php:1526 include/bbcode.php:1736 msgid "Different viewers will see this text differently" msgstr "" -#: include/bbcode.php:2065 +#: include/bbcode.php:2067 msgid "$1 wrote:" msgstr "" -#: include/auth.php:213 -msgid "Delegation session ended." -msgstr "" - -#: include/auth.php:216 -msgid "Logged out." -msgstr "" - -#: include/auth.php:307 -msgid "Email validation is incomplete. Please check your email." -msgstr "" - -#: include/auth.php:327 -msgid "Failed authentication" -msgstr "" - -#: include/auth.php:338 -msgid "Login failed." -msgstr "" - -#: include/import.php:38 -msgid "Unable to import a removed channel." -msgstr "" - -#: include/import.php:68 -msgid "" -"A channel with these settings was discovered and is not usable as it was " -"removed or reserved for system use. Import failed." -msgstr "" - -#: include/import.php:77 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: include/import.php:98 -msgid "Unable to create a unique channel address. Import failed." -msgstr "" - -#: include/import.php:151 -msgid "Cloned channel not found. Import failed." -msgstr "" - #: include/connections.php:155 include/conversation.php:856 #: src/Lib/Libprofile.php:309 src/Module/Directory.php:453 #: src/Module/Fedi_id.php:55 src/Widget/Follow.php:41 @@ -722,42 +703,42 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: include/connections.php:848 include/event.php:1482 +#: include/connections.php:848 include/event.php:1483 #: src/Module/Connedit.php:870 src/Module/Cdav.php:1380 #: src/Module/Settings/Profile_edit.php:666 msgid "Mobile" msgstr "" -#: include/connections.php:849 include/event.php:1483 +#: include/connections.php:849 include/event.php:1484 #: src/Module/Connedit.php:871 src/Module/Cdav.php:1381 #: src/Module/Settings/Profile_edit.php:667 msgid "Home" msgstr "" -#: include/connections.php:850 include/event.php:1484 +#: include/connections.php:850 include/event.php:1485 msgid "Home, Voice" msgstr "" -#: include/connections.php:851 include/event.php:1485 +#: include/connections.php:851 include/event.php:1486 msgid "Home, Fax" msgstr "" -#: include/connections.php:852 include/event.php:1486 +#: include/connections.php:852 include/event.php:1487 #: src/Module/Connedit.php:872 src/Module/Cdav.php:1382 #: src/Module/Settings/Profile_edit.php:668 msgid "Work" msgstr "" -#: include/connections.php:853 include/event.php:1487 +#: include/connections.php:853 include/event.php:1488 msgid "Work, Voice" msgstr "" -#: include/connections.php:854 include/event.php:1488 +#: include/connections.php:854 include/event.php:1489 msgid "Work, Fax" msgstr "" #: include/connections.php:855 include/connections.php:861 -#: include/event.php:1489 include/event.php:1495 src/Module/Connedit.php:873 +#: include/event.php:1490 include/event.php:1496 src/Module/Connedit.php:873 #: src/Module/Cdav.php:1383 src/Module/Settings/Profile_edit.php:669 #: src/Module/Settings/Profile_edit.php:790 #: src/Module/Settings/Profile_edit.php:808 @@ -788,835 +769,50 @@ msgstr "" msgid "Network: %s" msgstr "" -#: include/attach.php:162 include/attach.php:211 include/attach.php:289 -#: include/attach.php:416 include/attach.php:431 include/attach.php:438 -#: include/attach.php:517 include/attach.php:1133 include/attach.php:1448 -#: include/attach.php:1619 include/photos.php:43 src/Lib/Chatroom.php:153 -#: src/Module/Connedit.php:350 src/Module/Api.php:31 src/Module/Appman.php:100 -#: src/Module/Block.php:31 src/Module/Block.php:84 src/Module/Blocks.php:82 -#: src/Module/Blocks.php:89 src/Module/Calendar.php:248 -#: src/Module/Card_edit.php:63 src/Module/Cards.php:85 -#: src/Module/Channel.php:281 src/Module/Channel.php:459 -#: src/Module/Channel.php:497 src/Module/Chat.php:115 src/Module/Chat.php:120 -#: src/Module/Common.php:48 src/Module/Connections.php:39 -#: src/Module/Display.php:510 src/Module/Cover_photo.php:337 -#: src/Module/Cover_photo.php:351 src/Module/Defperms.php:176 -#: src/Module/Defperms.php:182 src/Module/Item.php:632 src/Module/Item.php:654 -#: src/Module/Item.php:666 src/Module/Item.php:1914 src/Module/Editblock.php:79 -#: src/Module/Editlayout.php:77 src/Module/Editlayout.php:100 -#: src/Module/Editpost.php:26 src/Module/Editwebpage.php:82 -#: src/Module/Editwebpage.php:103 src/Module/Editwebpage.php:122 -#: src/Module/Editwebpage.php:138 src/Module/Events.php:294 -#: src/Module/Filestorage.php:29 src/Module/Filestorage.php:115 -#: src/Module/Filestorage.php:131 src/Module/Filestorage.php:159 -#: src/Module/Filestorage.php:192 src/Module/Filestorage.php:199 -#: src/Module/Inspect.php:17 src/Module/Invite.php:103 src/Module/Manage.php:25 -#: src/Module/Layouts.php:82 src/Module/Layouts.php:89 -#: src/Module/Layouts.php:100 src/Module/Lists.php:107 src/Module/Lists.php:119 -#: src/Module/Lists.php:150 src/Module/Locs.php:105 src/Module/Register.php:101 -#: src/Module/Menu.php:136 src/Module/Menu.php:147 src/Module/Mitem.php:143 -#: src/Module/Moderate.php:24 src/Module/Mood.php:147 -#: src/Module/New_channel.php:114 src/Module/New_channel.php:137 -#: src/Module/Notifications.php:19 src/Module/Page.php:42 -#: src/Module/Page.php:147 src/Module/Pdledit.php:37 src/Module/Photos.php:73 -#: src/Module/Poke.php:118 src/Module/Profile.php:102 -#: src/Module/Profile.php:117 src/Module/Profile_photo.php:349 -#: src/Module/Profile_photo.php:363 src/Module/Regmod.php:25 -#: src/Module/Settings/Profile_edit.php:72 -#: src/Module/Settings/Profile_edit.php:529 src/Module/Webpages.php:144 -#: src/Module/Vote.php:23 src/Module/Viewsrc.php:24 -#: src/Module/Viewconnections.php:25 src/Module/Thing.php:318 -#: src/Module/Thing.php:339 src/Module/Thing.php:381 -#: src/Module/Suggestions.php:35 src/Module/Sources.php:88 -#: src/Module/Sharedwithme.php:22 src/Module/Setup.php:220 -#: src/Module/Settings.php:74 src/Module/Service_limits.php:16 -#: src/Web/WebServer.php:69 -msgid "Permission denied." +#: include/event.php:38 include/event.php:125 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: include/attach.php:284 include/attach.php:411 -msgid "Item was not found." +#: include/event.php:46 include/event.php:131 +msgid "Starts:" msgstr "" -#: include/attach.php:302 -msgid "Unknown error." +#: include/event.php:64 include/event.php:135 +msgid "Finishes:" msgstr "" -#: include/attach.php:606 -msgid "No source file." +#: include/event.php:85 include/event.php:143 src/Lib/Libprofile.php:331 +#: src/Module/Communities.php:133 src/Module/Directory.php:437 +msgid "Location:" msgstr "" -#: include/attach.php:630 -msgid "Cannot locate file to replace" +#: include/event.php:1191 +msgid "This event has been added to your calendar." msgstr "" -#: include/attach.php:651 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: include/attach.php:814 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: include/attach.php:837 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: include/attach.php:1039 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: include/attach.php:1070 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: include/attach.php:1148 include/attach.php:1165 -msgid "Path not available." -msgstr "" - -#: include/attach.php:1382 include/conversation.php:512 -#: src/Lib/ThreadItem.php:197 -msgid "Select" -msgstr "" - -#: include/attach.php:1388 include/conversation.php:970 -#: src/Lib/Activity.php:2330 src/Lib/Apps.php:1261 src/Lib/Apps.php:1352 -#: src/Module/Cdav.php:877 src/Module/Cdav.php:878 src/Module/Cdav.php:884 -#: src/Module/Embedphotos.php:343 src/Module/Photos.php:856 -#: src/Module/Photos.php:1324 src/Storage/Browser.php:183 -#: src/Widget/Album.php:100 src/Widget/Portfolio.php:110 -msgid "Unknown" -msgstr "" - -#: include/attach.php:1398 src/Module/Embedphotos.php:352 -#: src/Module/Photos.php:881 src/Widget/Album.php:109 -#: src/Widget/Portfolio.php:122 -msgid "Edit Album" -msgstr "" - -#: include/attach.php:1400 src/Module/Cover_photo.php:421 -#: src/Module/Embedphotos.php:354 src/Module/Photos.php:747 -#: src/Module/Profile_photo.php:512 src/Storage/Browser.php:423 -#: src/Widget/Album.php:111 src/Widget/Cdav.php:157 src/Widget/Cdav.php:191 -#: src/Widget/Portfolio.php:124 -msgid "Upload" -msgstr "" - -#: include/attach.php:1453 include/attach.php:1624 -msgid "Empty pathname" -msgstr "" - -#: include/attach.php:1481 -msgid "duplicate filename or path" -msgstr "" - -#: include/attach.php:1506 -msgid "Path not found." -msgstr "" - -#: include/attach.php:1577 -msgid "mkdir failed." -msgstr "" - -#: include/attach.php:1580 -msgid "database storage failed." -msgstr "" - -#: include/attach.php:1630 -msgid "Empty path" -msgstr "" - -#: include/conversation.php:61 include/misc.php:2379 src/Module/Like.php:177 -#: src/Module/Tagger.php:85 src/Module/Subthread.php:126 -msgid "photo" -msgstr "" - -#: include/conversation.php:64 include/event.php:1302 include/misc.php:2382 +#: include/event.php:1303 include/misc.php:2382 include/conversation.php:64 #: src/Module/Calendar.php:238 src/Module/Events.php:284 #: src/Module/Like.php:179 src/Module/Tagger.php:89 msgid "event" msgstr "" -#: include/conversation.php:67 src/Module/Plike.php:130 -msgid "channel" -msgstr "" - -#: include/conversation.php:93 include/misc.php:2387 src/Module/Tagger.php:95 -msgid "comment" -msgstr "" - -#: include/conversation.php:108 src/Module/Like.php:226 -#: src/Module/Plike.php:204 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: include/conversation.php:110 src/Module/Like.php:229 -#: src/Module/Plike.php:207 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: include/conversation.php:112 -#, php-format -msgid "%1$s repeated %2$s's %3$s" -msgstr "" - -#: include/conversation.php:118 -#, php-format -msgid "likes %1$s's %2$s" -msgstr "" - -#: include/conversation.php:120 -#, php-format -msgid "doesn't like %1$s's %2$s" -msgstr "" - -#: include/conversation.php:122 -#, php-format -msgid "repeated %1$s's %2$s" -msgstr "" - -#: include/conversation.php:162 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: include/conversation.php:199 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: include/conversation.php:203 include/misc.php:1195 include/misc.php:1199 -msgid "poked" -msgstr "" - -#: include/conversation.php:221 src/Module/Mood.php:84 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" - -#: include/conversation.php:353 src/Lib/ThreadItem.php:562 -msgid "This is an unsaved preview" -msgstr "" - -#: include/conversation.php:439 src/Module/Photos.php:1208 -msgctxt "title" -msgid "Likes" -msgstr "" - -#: include/conversation.php:440 src/Module/Photos.php:1209 -msgctxt "title" -msgid "Dislikes" -msgstr "" - -#: include/conversation.php:441 -msgctxt "title" -msgid "Repeats" -msgstr "" - -#: include/conversation.php:442 src/Module/Photos.php:1210 -msgctxt "title" -msgid "Attending" -msgstr "" - -#: include/conversation.php:443 src/Module/Photos.php:1211 -msgctxt "title" -msgid "Not attending" -msgstr "" - -#: include/conversation.php:444 src/Module/Photos.php:1212 -msgctxt "title" -msgid "Might attend" -msgstr "" - -#: include/conversation.php:513 include/conversation.php:564 -#: src/Lib/ThreadItem.php:189 src/Lib/Apps.php:667 -#: src/Module/Admin/Profs.php:193 src/Module/Admin/Channels.php:147 -#: src/Module/Admin/Accounts.php:203 src/Module/Connedit.php:641 -#: src/Module/Connedit.php:878 src/Module/Blocks.php:175 -#: src/Module/Card_edit.php:140 src/Module/Cdav.php:1079 -#: src/Module/Cdav.php:1388 src/Module/Connections.php:374 -#: src/Module/Editblock.php:154 src/Module/Editlayout.php:151 -#: src/Module/Editwebpage.php:185 src/Module/Photos.php:1261 -#: src/Module/Settings/Oauth2.php:214 src/Module/Settings/Oauth.php:167 -#: src/Module/Settings/Profile_edit.php:674 src/Module/Webpages.php:272 -#: src/Module/Thing.php:306 src/Storage/Browser.php:320 -msgid "Delete" -msgstr "" - -#: include/conversation.php:517 -msgid "Toggle Star Status" -msgstr "" - -#: include/conversation.php:521 src/Lib/ThreadItem.php:111 -msgid "Public visibility" -msgstr "" - -#: include/conversation.php:523 src/Lib/ThreadItem.php:113 -msgid "Direct message (private mail)" -msgstr "" - -#: include/conversation.php:526 src/Lib/ThreadItem.php:116 -msgid "Restricted visibility" -msgstr "" - -#: include/conversation.php:531 src/Lib/ThreadItem.php:299 -msgid "Message signature validated" -msgstr "" - -#: include/conversation.php:532 src/Lib/ThreadItem.php:300 -msgid "Message signature incorrect" -msgstr "" - -#: include/conversation.php:563 src/Module/Admin/Accounts.php:201 -#: src/Module/Connections.php:392 -msgid "Approve" -msgstr "" - -#: include/conversation.php:567 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: include/conversation.php:590 -msgid "Categories:" -msgstr "" - -#: include/conversation.php:591 -msgid "Filed under:" -msgstr "" - -#: include/conversation.php:595 src/Lib/ThreadItem.php:462 -msgid "via" -msgstr "" - -#: include/conversation.php:598 src/Lib/ThreadItem.php:479 -#, php-format -msgid "from %s" -msgstr "" - -#: include/conversation.php:601 src/Lib/ThreadItem.php:482 -#, php-format -msgid "last edited: %s" -msgstr "" - -#: include/conversation.php:602 src/Lib/ThreadItem.php:483 -#, php-format -msgid "Expires: %s" -msgstr "" - -#: include/conversation.php:617 src/Lib/ThreadItem.php:523 -msgid "Pinned post" -msgstr "" - -#: include/conversation.php:619 src/Lib/ThreadItem.php:525 -#: src/Lib/Stringsjs.php:43 -msgid "Unpin this post" -msgstr "" - -#: include/conversation.php:619 src/Lib/ThreadItem.php:525 -#: src/Lib/Stringsjs.php:42 -msgid "Pin this post" -msgstr "" - -#: include/conversation.php:620 -msgid "View Conversation" -msgstr "" - -#: include/conversation.php:622 src/Lib/ThreadItem.php:563 -#: src/Module/Photos.php:1173 -msgid "Please wait" -msgstr "" - -#: include/conversation.php:701 -msgid "remove" -msgstr "" - -#: include/conversation.php:705 -msgid "Loading..." -msgstr "" - -#: include/conversation.php:706 -msgid "Delete Selected Items" -msgstr "" - -#: include/conversation.php:720 -msgid "View source" -msgstr "" - -#: include/conversation.php:730 -msgid "Follow thread" -msgstr "" - -#: include/conversation.php:739 -msgid "Unfollow thread" -msgstr "" - -#: include/conversation.php:813 -msgid "Remote Search" -msgstr "" - -#: include/conversation.php:826 src/Module/Chanview.php:144 -msgid "Visit" -msgstr "" - -#: include/conversation.php:836 -msgid "Nearby" -msgstr "" - -#: include/conversation.php:846 src/Module/Connedit.php:586 -msgid "Recent Activity" -msgstr "" - -#: include/conversation.php:866 -msgid "Edit Connection" -msgstr "" - -#: include/conversation.php:896 -msgid "Block author's site" -msgstr "" - -#: include/conversation.php:903 -msgid "Block author" -msgstr "" - -#: include/conversation.php:1080 -msgid "Set your location" -msgstr "" - -#: include/conversation.php:1081 -msgid "Clear your location" -msgstr "" - -#: include/conversation.php:1105 src/Module/Card_edit.php:112 -#: src/Module/Chat.php:223 src/Module/Editblock.php:131 -#: src/Module/Editwebpage.php:161 -msgid "Insert web link" -msgstr "" - -#: include/conversation.php:1110 src/Lib/ThreadItem.php:997 -msgid "Attach file from your personal cloud" -msgstr "" - -#: include/conversation.php:1111 -msgid "Attach/Embed file" -msgstr "" - -#: include/conversation.php:1112 -msgid "Insert File" -msgstr "" - -#: include/conversation.php:1113 -msgid "from device" -msgstr "" - -#: include/conversation.php:1114 -msgid "from personal cloud" -msgstr "" - -#: include/conversation.php:1158 src/Module/Chat.php:221 -msgid "Please enter a link URL:" -msgstr "" - -#: include/conversation.php:1159 -msgid "Tag term:" -msgstr "" - -#: include/conversation.php:1160 -msgid "Where are you right now?" -msgstr "" - -#: include/conversation.php:1160 -msgid "(Enter a dot . to use your current device coordinates.)" -msgstr "" - -#: include/conversation.php:1163 -msgid "Choose files to embed" -msgstr "" - -#: include/conversation.php:1164 -msgid "Choose a folder" -msgstr "" - -#: include/conversation.php:1165 -msgid "Choose a different folder..." -msgstr "" - -#: include/conversation.php:1166 -msgid "Error getting folder list" -msgstr "" - -#: include/conversation.php:1167 -msgid "Error getting file link" -msgstr "" - -#: include/conversation.php:1168 -msgid "Error getting folder" -msgstr "" - -#: include/conversation.php:1170 src/Lib/Stringsjs.php:13 -msgid "Delete this item?" -msgstr "" - -#: include/conversation.php:1176 src/Lib/ThreadItem.php:999 -#: src/Module/Events.php:513 src/Module/Photos.php:1193 -#: src/Module/Webpages.php:277 -msgid "Preview" -msgstr "" - -#: include/conversation.php:1226 -msgid "Restricted - from connections only" -msgstr "" - -#: include/conversation.php:1227 -msgid "Semi-public - from anybody that can be identified" -msgstr "" - -#: include/conversation.php:1228 -msgid "Public - from anybody on the internet" -msgstr "" - -#: include/conversation.php:1244 -msgid "Accept delivery of comments on this post from" -msgstr "" - -#: include/conversation.php:1270 src/Lib/ThreadItem.php:962 -msgid "Save draft" -msgstr "" - -#: include/conversation.php:1272 src/Module/Blocks.php:174 -#: src/Module/Layouts.php:210 src/Module/Photos.php:1172 -#: src/Module/Webpages.php:271 src/Widget/Cdav.php:147 -msgid "Share" -msgstr "" - -#: include/conversation.php:1283 -msgid "Page link name" -msgstr "" - -#: include/conversation.php:1286 -msgid "Post as" -msgstr "" - -#: include/conversation.php:1288 -msgid "Text styles" -msgstr "" - -#: include/conversation.php:1289 src/Lib/ThreadItem.php:989 -msgid "Bold" -msgstr "" - -#: include/conversation.php:1290 src/Lib/ThreadItem.php:990 -msgid "Italic" -msgstr "" - -#: include/conversation.php:1291 src/Lib/ThreadItem.php:991 -msgid "Underline" -msgstr "" - -#: include/conversation.php:1292 src/Lib/ThreadItem.php:992 -msgid "Quote" -msgstr "" - -#: include/conversation.php:1293 src/Lib/ThreadItem.php:993 -msgid "Code" -msgstr "" - -#: include/conversation.php:1294 src/Lib/ThreadItem.php:996 -msgid "Attach file from your device" -msgstr "" - -#: include/conversation.php:1296 -msgid "Please enter a link location (URL)" -msgstr "" - -#: include/conversation.php:1298 -msgid "Insert link only" -msgstr "" - -#: include/conversation.php:1298 -msgid "Embed content if possible" -msgstr "" - -#: include/conversation.php:1303 -msgid "Embed a file from the cloud" -msgstr "" - -#: include/conversation.php:1305 -msgid "Embed an image from your albums" -msgstr "" - -#: include/conversation.php:1306 include/conversation.php:1378 -#: include/conversation.php:1380 include/conversation.php:1382 -#: src/Module/Admin/Addons.php:426 src/Module/Connedit.php:879 -#: src/Module/Card_edit.php:142 src/Module/Cdav.php:1081 -#: src/Module/Cdav.php:1389 src/Module/Cover_photo.php:425 -#: src/Module/Editblock.php:156 src/Module/Editlayout.php:153 -#: src/Module/Editpost.php:183 src/Module/Editwebpage.php:187 -#: src/Module/Fbrowser.php:75 src/Module/Fbrowser.php:98 -#: src/Module/Filer.php:64 src/Module/Profile_photo.php:519 -#: src/Module/Settings/Oauth2.php:116 src/Module/Settings/Oauth2.php:146 -#: src/Module/Settings/Oauth.php:99 src/Module/Settings/Oauth.php:127 -#: src/Module/Settings/Profile_edit.php:675 src/Module/Tagrm.php:21 -#: src/Module/Tagrm.php:152 -msgid "Cancel" -msgstr "" - -#: include/conversation.php:1307 include/conversation.php:1377 -#: include/conversation.php:1379 include/conversation.php:1381 -#: src/Module/Cover_photo.php:426 src/Module/Profile_photo.php:520 -msgid "OK" -msgstr "" - -#: include/conversation.php:1309 -msgid "Location options" -msgstr "" - -#: include/conversation.php:1310 -msgid "Toggle poll" -msgstr "" - -#: include/conversation.php:1311 -msgid "Option" -msgstr "" - -#: include/conversation.php:1312 -msgid "Add option" -msgstr "" - -#: include/conversation.php:1313 -msgid "Minutes" -msgstr "" - -#: include/conversation.php:1313 -msgid "Hours" -msgstr "" - -#: include/conversation.php:1313 -msgid "Days" -msgstr "" - -#: include/conversation.php:1314 -msgid "Allow multiple answers" -msgstr "" - -#: include/conversation.php:1317 -msgid "Disable comments" -msgstr "" - -#: include/conversation.php:1318 -msgid "Toggle comments" -msgstr "" - -#: include/conversation.php:1319 -msgid "Allow comments on this post" -msgstr "" - -#: include/conversation.php:1322 src/Lib/Apps.php:398 -msgid "Comment Control" -msgstr "" - -#: include/conversation.php:1324 -msgid "Optional: disable comments after (date)" -msgstr "" - -#: include/conversation.php:1332 src/Module/Card_edit.php:128 -#: src/Module/Editblock.php:144 src/Module/Photos.php:733 -#: src/Module/Photos.php:1120 -msgid "Title (optional)" -msgstr "" - -#: include/conversation.php:1335 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: include/conversation.php:1336 src/Module/Events.php:514 -msgid "Permission settings" -msgstr "" - -#: include/conversation.php:1359 -msgid "Other networks and post services" -msgstr "" - -#: include/conversation.php:1360 -msgid "Collections" -msgstr "" - -#: include/conversation.php:1365 -msgid "Check In" -msgstr "" - -#: include/conversation.php:1366 -msgid "Check Out" -msgstr "" - -#: include/conversation.php:1367 -msgid "Set expiration date" -msgstr "" - -#: include/conversation.php:1372 -msgid "Set publish date" -msgstr "" - -#: include/conversation.php:1375 src/Lib/ThreadItem.php:1005 -#: src/Module/Chat.php:222 -msgid "Encrypt text" -msgstr "" - -#: include/conversation.php:1383 src/Lib/ThreadItem.php:559 -#: src/Lib/Libacl.php:147 src/Module/Photos.php:1342 -#: src/Module/Settings/Channel.php:486 -msgid "Close" -msgstr "" - -#: include/conversation.php:1389 src/Module/Admin.php:177 -msgid "Summary" -msgstr "" - -#: include/conversation.php:1390 -msgid "Load remote media players" -msgstr "" - -#: include/conversation.php:1391 -msgid "This may subject viewers of this post to behaviour tracking" -msgstr "" - -#: include/conversation.php:1393 -msgid "Find shareable objects" -msgstr "" - -#: include/conversation.php:1422 -msgid "Post to Collections" -msgstr "" - -#: include/conversation.php:1799 -msgid " distance: " -msgstr "" - -#: include/conversation.php:1896 include/taxonomy.php:755 -#: src/Lib/ThreadItem.php:248 src/Module/Photos.php:1229 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1898 src/Lib/ThreadItem.php:250 -#: src/Lib/ThreadItem.php:548 src/Module/Photos.php:1336 -msgctxt "noun" -msgid "Likes" -msgstr "" - -#: include/conversation.php:1902 src/Lib/ThreadItem.php:256 -#: src/Module/Photos.php:1233 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1904 src/Lib/ThreadItem.php:258 -#: src/Lib/ThreadItem.php:549 src/Module/Photos.php:1337 -msgctxt "noun" -msgid "Dislikes" -msgstr "" - -#: include/conversation.php:1908 -msgctxt "noun" -msgid "Repeat" -msgid_plural "Repeats" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1910 src/Lib/ThreadItem.php:554 -msgctxt "noun" -msgid "Repeats" -msgstr "" - -#: include/conversation.php:1913 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1915 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1917 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1919 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1921 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1923 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - -#: include/event.php:38 include/event.php:124 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: include/event.php:46 include/event.php:130 -msgid "Starts:" -msgstr "" - -#: include/event.php:64 include/event.php:134 -msgid "Finishes:" -msgstr "" - -#: include/event.php:85 include/event.php:142 src/Lib/Libprofile.php:331 -#: src/Module/Communities.php:133 src/Module/Directory.php:437 -msgid "Location:" -msgstr "" - -#: include/event.php:1190 -msgid "This event has been added to your calendar." -msgstr "" - -#: include/event.php:1389 +#: include/event.php:1390 msgid "Not specified" msgstr "" -#: include/event.php:1390 +#: include/event.php:1391 msgid "Needs Action" msgstr "" -#: include/event.php:1391 +#: include/event.php:1392 msgid "Completed" msgstr "" -#: include/event.php:1392 +#: include/event.php:1393 msgid "In Process" msgstr "" -#: include/event.php:1393 +#: include/event.php:1394 msgid "Cancelled" msgstr "" @@ -1672,6 +868,14 @@ msgstr "" msgid "dislikes" msgstr "" +#: include/taxonomy.php:755 include/conversation.php:1896 +#: src/Lib/ThreadItem.php:248 src/Module/Photos.php:1229 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + #: include/language.php:367 include/misc.php:2203 msgid "default" msgstr "" @@ -1690,11 +894,137 @@ msgstr "" msgid "Profile Photos" msgstr "" +#: include/datetime.php:74 src/Module/Settings/Channel.php:545 +#: src/Module/Settings/Profile_edit.php:607 src/Widget/Newmember.php:55 +msgid "Miscellaneous" +msgstr "" + +#: include/datetime.php:167 +msgid "Birthday" +msgstr "" + +#: include/datetime.php:167 +msgid "Age: " +msgstr "" + +#: include/datetime.php:167 +msgid "YYYY-MM-DD or MM-DD" +msgstr "" + +#: include/datetime.php:251 src/Module/Appman.php:151 src/Module/Appman.php:152 +#: src/Module/Events.php:495 src/Module/Events.php:500 +#: src/Module/Settings/Profile_edit.php:617 +#: src/Module/Settings/Profile_edit.php:621 +msgid "Required" +msgstr "" + +#: include/datetime.php:283 +msgid "from now" +msgstr "" + +#: include/datetime.php:286 +msgid "ago" +msgstr "" + +#: include/datetime.php:291 +#, php-format +msgid "less than a second %s" +msgstr "" + +#: include/datetime.php:309 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s %3$s" +msgstr "" + +#: include/datetime.php:320 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:321 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:322 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:323 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:324 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:325 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:576 +#, php-format +msgid "%1$s's birthday" +msgstr "" + +#: include/datetime.php:577 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "" + +#: include/import.php:38 +msgid "Unable to import a removed channel." +msgstr "" + +#: include/import.php:68 +msgid "" +"A channel with these settings was discovered and is not usable as it was " +"removed or reserved for system use. Import failed." +msgstr "" + +#: include/import.php:77 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: include/import.php:98 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: include/import.php:151 +msgid "Cloned channel not found. Import failed." +msgstr "" + #: include/items.php:416 src/Module/Cloud.php:134 src/Module/Dreport.php:19 #: src/Module/Dreport.php:85 src/Module/Import_items.php:133 #: src/Module/Like.php:114 src/Module/Lists.php:191 src/Module/Lists.php:234 -#: src/Module/Lists.php:263 src/Module/Profperm.php:35 src/Module/Search.php:97 -#: src/Module/Subthread.php:99 src/Module/Share.php:82 src/Web/WebServer.php:68 +#: src/Module/Lists.php:263 src/Module/Profperm.php:35 +#: src/Module/Subthread.php:99 src/Module/Share.php:82 src/Module/Search.php:97 +#: src/Web/WebServer.php:68 msgid "Permission denied" msgstr "" @@ -1736,7 +1066,7 @@ msgid "Visible to specific connections." msgstr "" #: include/items.php:3099 include/misc.php:1696 include/misc.php:3168 -#: src/Lib/Activity.php:3871 +#: src/Lib/Activity.php:3942 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1847,6 +1177,10 @@ msgstr "" msgid "poke" msgstr "" +#: include/misc.php:1195 include/misc.php:1199 include/conversation.php:203 +msgid "poked" +msgstr "" + #: include/misc.php:1200 msgid "ping" msgstr "" @@ -2161,6 +1495,15 @@ msgstr "" msgid "Page content type" msgstr "" +#: include/misc.php:2379 include/conversation.php:61 src/Module/Like.php:177 +#: src/Module/Tagger.php:85 src/Module/Subthread.php:126 +msgid "photo" +msgstr "" + +#: include/misc.php:2387 include/conversation.php:93 src/Module/Tagger.php:95 +msgid "comment" +msgstr "" + #: include/misc.php:2393 msgid "activity" msgstr "" @@ -2264,6 +1607,720 @@ msgstr "" msgid "Default" msgstr "" +#: include/conversation.php:67 src/Module/Plike.php:130 +msgid "channel" +msgstr "" + +#: include/conversation.php:108 src/Module/Like.php:226 +#: src/Module/Plike.php:204 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: include/conversation.php:110 src/Module/Like.php:229 +#: src/Module/Plike.php:207 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: include/conversation.php:112 +#, php-format +msgid "%1$s repeated %2$s's %3$s" +msgstr "" + +#: include/conversation.php:118 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "" + +#: include/conversation.php:120 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "" + +#: include/conversation.php:122 +#, php-format +msgid "repeated %1$s's %2$s" +msgstr "" + +#: include/conversation.php:162 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: include/conversation.php:199 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: include/conversation.php:221 src/Module/Mood.php:84 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: include/conversation.php:353 src/Lib/ThreadItem.php:562 +msgid "This is an unsaved preview" +msgstr "" + +#: include/conversation.php:439 src/Module/Photos.php:1208 +msgctxt "title" +msgid "Likes" +msgstr "" + +#: include/conversation.php:440 src/Module/Photos.php:1209 +msgctxt "title" +msgid "Dislikes" +msgstr "" + +#: include/conversation.php:441 +msgctxt "title" +msgid "Repeats" +msgstr "" + +#: include/conversation.php:442 src/Module/Photos.php:1210 +msgctxt "title" +msgid "Attending" +msgstr "" + +#: include/conversation.php:443 src/Module/Photos.php:1211 +msgctxt "title" +msgid "Not attending" +msgstr "" + +#: include/conversation.php:444 src/Module/Photos.php:1212 +msgctxt "title" +msgid "Might attend" +msgstr "" + +#: include/conversation.php:512 include/attach.php:1395 +#: src/Lib/ThreadItem.php:197 +msgid "Select" +msgstr "" + +#: include/conversation.php:513 include/conversation.php:564 +#: src/Lib/Apps.php:667 src/Lib/ThreadItem.php:189 +#: src/Module/Admin/Profs.php:193 src/Module/Admin/Channels.php:147 +#: src/Module/Admin/Accounts.php:203 src/Module/Connedit.php:641 +#: src/Module/Connedit.php:878 src/Module/Blocks.php:175 +#: src/Module/Card_edit.php:140 src/Module/Cdav.php:1079 +#: src/Module/Cdav.php:1388 src/Module/Connections.php:374 +#: src/Module/Editblock.php:154 src/Module/Editlayout.php:151 +#: src/Module/Editwebpage.php:185 src/Module/Photos.php:1261 +#: src/Module/Settings/Oauth2.php:214 src/Module/Settings/Oauth.php:167 +#: src/Module/Settings/Profile_edit.php:674 src/Module/Webpages.php:272 +#: src/Module/Thing.php:306 src/Storage/Browser.php:320 +msgid "Delete" +msgstr "" + +#: include/conversation.php:517 +msgid "Toggle Star Status" +msgstr "" + +#: include/conversation.php:521 src/Lib/ThreadItem.php:111 +msgid "Public visibility" +msgstr "" + +#: include/conversation.php:523 src/Lib/ThreadItem.php:113 +msgid "Direct message (private mail)" +msgstr "" + +#: include/conversation.php:526 src/Lib/ThreadItem.php:116 +msgid "Restricted visibility" +msgstr "" + +#: include/conversation.php:531 src/Lib/ThreadItem.php:299 +msgid "Message signature validated" +msgstr "" + +#: include/conversation.php:532 src/Lib/ThreadItem.php:300 +msgid "Message signature incorrect" +msgstr "" + +#: include/conversation.php:563 src/Module/Admin/Accounts.php:201 +#: src/Module/Connections.php:392 +msgid "Approve" +msgstr "" + +#: include/conversation.php:567 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: include/conversation.php:590 +msgid "Categories:" +msgstr "" + +#: include/conversation.php:591 +msgid "Filed under:" +msgstr "" + +#: include/conversation.php:595 src/Lib/ThreadItem.php:462 +msgid "via" +msgstr "" + +#: include/conversation.php:598 src/Lib/ThreadItem.php:479 +#, php-format +msgid "from %s" +msgstr "" + +#: include/conversation.php:601 src/Lib/ThreadItem.php:482 +#, php-format +msgid "last edited: %s" +msgstr "" + +#: include/conversation.php:602 src/Lib/ThreadItem.php:483 +#, php-format +msgid "Expires: %s" +msgstr "" + +#: include/conversation.php:617 src/Lib/ThreadItem.php:523 +msgid "Pinned post" +msgstr "" + +#: include/conversation.php:619 src/Lib/ThreadItem.php:525 +#: src/Lib/Stringsjs.php:43 +msgid "Unpin this post" +msgstr "" + +#: include/conversation.php:619 src/Lib/ThreadItem.php:525 +#: src/Lib/Stringsjs.php:42 +msgid "Pin this post" +msgstr "" + +#: include/conversation.php:620 +msgid "View Conversation" +msgstr "" + +#: include/conversation.php:622 src/Lib/ThreadItem.php:563 +#: src/Module/Photos.php:1173 +msgid "Please wait" +msgstr "" + +#: include/conversation.php:701 +msgid "remove" +msgstr "" + +#: include/conversation.php:705 +msgid "Loading..." +msgstr "" + +#: include/conversation.php:706 +msgid "Delete Selected Items" +msgstr "" + +#: include/conversation.php:720 +msgid "View source" +msgstr "" + +#: include/conversation.php:730 +msgid "Follow thread" +msgstr "" + +#: include/conversation.php:739 +msgid "Unfollow thread" +msgstr "" + +#: include/conversation.php:813 +msgid "Remote Search" +msgstr "" + +#: include/conversation.php:826 src/Module/Chanview.php:144 +msgid "Visit" +msgstr "" + +#: include/conversation.php:836 +msgid "Nearby" +msgstr "" + +#: include/conversation.php:846 src/Module/Connedit.php:586 +msgid "Recent Activity" +msgstr "" + +#: include/conversation.php:866 +msgid "Edit Connection" +msgstr "" + +#: include/conversation.php:896 +msgid "Block author's site" +msgstr "" + +#: include/conversation.php:903 +msgid "Block author" +msgstr "" + +#: include/conversation.php:970 include/attach.php:1380 include/attach.php:1401 +#: src/Lib/Activity.php:2401 src/Lib/Apps.php:1261 src/Lib/Apps.php:1352 +#: src/Module/Cdav.php:877 src/Module/Cdav.php:878 src/Module/Cdav.php:884 +#: src/Module/Embedphotos.php:379 src/Module/Photos.php:856 +#: src/Module/Photos.php:1324 src/Storage/Browser.php:183 +#: src/Widget/Album.php:100 src/Widget/Portfolio.php:110 +msgid "Unknown" +msgstr "" + +#: include/conversation.php:1080 +msgid "Set your location" +msgstr "" + +#: include/conversation.php:1081 +msgid "Clear your location" +msgstr "" + +#: include/conversation.php:1105 src/Module/Card_edit.php:112 +#: src/Module/Chat.php:223 src/Module/Editblock.php:131 +#: src/Module/Editwebpage.php:161 +msgid "Insert web link" +msgstr "" + +#: include/conversation.php:1110 src/Lib/ThreadItem.php:997 +msgid "Attach file from your personal cloud" +msgstr "" + +#: include/conversation.php:1111 +msgid "Attach/Embed file" +msgstr "" + +#: include/conversation.php:1112 +msgid "Insert File" +msgstr "" + +#: include/conversation.php:1113 +msgid "from device" +msgstr "" + +#: include/conversation.php:1114 +msgid "from personal cloud" +msgstr "" + +#: include/conversation.php:1158 src/Module/Chat.php:221 +msgid "Please enter a link URL:" +msgstr "" + +#: include/conversation.php:1159 +msgid "Tag term:" +msgstr "" + +#: include/conversation.php:1160 +msgid "Where are you right now?" +msgstr "" + +#: include/conversation.php:1160 +msgid "(Enter a dot . to use your current device coordinates.)" +msgstr "" + +#: include/conversation.php:1163 +msgid "Choose files to embed" +msgstr "" + +#: include/conversation.php:1164 +msgid "Choose a folder" +msgstr "" + +#: include/conversation.php:1165 +msgid "Choose a different folder..." +msgstr "" + +#: include/conversation.php:1166 +msgid "Error getting folder list" +msgstr "" + +#: include/conversation.php:1167 +msgid "Error getting file link" +msgstr "" + +#: include/conversation.php:1168 +msgid "Error getting folder" +msgstr "" + +#: include/conversation.php:1170 src/Lib/Stringsjs.php:13 +msgid "Delete this item?" +msgstr "" + +#: include/conversation.php:1176 src/Lib/ThreadItem.php:999 +#: src/Module/Events.php:513 src/Module/Photos.php:1193 +#: src/Module/Webpages.php:277 +msgid "Preview" +msgstr "" + +#: include/conversation.php:1226 +msgid "Restricted - from connections only" +msgstr "" + +#: include/conversation.php:1227 +msgid "Semi-public - from anybody that can be identified" +msgstr "" + +#: include/conversation.php:1228 +msgid "Public - from anybody on the internet" +msgstr "" + +#: include/conversation.php:1244 +msgid "Accept delivery of comments on this post from" +msgstr "" + +#: include/conversation.php:1270 src/Lib/ThreadItem.php:962 +msgid "Save draft" +msgstr "" + +#: include/conversation.php:1272 src/Module/Blocks.php:174 +#: src/Module/Layouts.php:210 src/Module/Photos.php:1172 +#: src/Module/Webpages.php:271 src/Widget/Cdav.php:147 +msgid "Share" +msgstr "" + +#: include/conversation.php:1283 +msgid "Page link name" +msgstr "" + +#: include/conversation.php:1286 +msgid "Post as" +msgstr "" + +#: include/conversation.php:1288 +msgid "Text styles" +msgstr "" + +#: include/conversation.php:1289 src/Lib/ThreadItem.php:989 +msgid "Bold" +msgstr "" + +#: include/conversation.php:1290 src/Lib/ThreadItem.php:990 +msgid "Italic" +msgstr "" + +#: include/conversation.php:1291 src/Lib/ThreadItem.php:991 +msgid "Underline" +msgstr "" + +#: include/conversation.php:1292 src/Lib/ThreadItem.php:992 +msgid "Quote" +msgstr "" + +#: include/conversation.php:1293 src/Lib/ThreadItem.php:993 +msgid "Code" +msgstr "" + +#: include/conversation.php:1294 src/Lib/ThreadItem.php:996 +msgid "Attach file from your device" +msgstr "" + +#: include/conversation.php:1296 +msgid "Please enter a link location (URL)" +msgstr "" + +#: include/conversation.php:1298 +msgid "Insert link only" +msgstr "" + +#: include/conversation.php:1298 +msgid "Embed content if possible" +msgstr "" + +#: include/conversation.php:1303 +msgid "Embed a file from the cloud" +msgstr "" + +#: include/conversation.php:1305 +msgid "Embed an image from your albums" +msgstr "" + +#: include/conversation.php:1306 include/conversation.php:1378 +#: include/conversation.php:1380 include/conversation.php:1382 +#: src/Module/Admin/Addons.php:426 src/Module/Connedit.php:879 +#: src/Module/Card_edit.php:142 src/Module/Cdav.php:1081 +#: src/Module/Cdav.php:1389 src/Module/Cover_photo.php:425 +#: src/Module/Editblock.php:156 src/Module/Editlayout.php:153 +#: src/Module/Editpost.php:183 src/Module/Editwebpage.php:187 +#: src/Module/Fbrowser.php:75 src/Module/Fbrowser.php:98 +#: src/Module/Filer.php:64 src/Module/Profile_photo.php:519 +#: src/Module/Settings/Oauth2.php:116 src/Module/Settings/Oauth2.php:146 +#: src/Module/Settings/Oauth.php:99 src/Module/Settings/Oauth.php:127 +#: src/Module/Settings/Profile_edit.php:675 src/Module/Tagrm.php:21 +#: src/Module/Tagrm.php:152 +msgid "Cancel" +msgstr "" + +#: include/conversation.php:1307 include/conversation.php:1377 +#: include/conversation.php:1379 include/conversation.php:1381 +#: src/Module/Cover_photo.php:426 src/Module/Profile_photo.php:520 +msgid "OK" +msgstr "" + +#: include/conversation.php:1309 +msgid "Location options" +msgstr "" + +#: include/conversation.php:1310 +msgid "Toggle poll" +msgstr "" + +#: include/conversation.php:1311 +msgid "Option" +msgstr "" + +#: include/conversation.php:1312 +msgid "Add option" +msgstr "" + +#: include/conversation.php:1313 +msgid "Minutes" +msgstr "" + +#: include/conversation.php:1313 +msgid "Hours" +msgstr "" + +#: include/conversation.php:1313 +msgid "Days" +msgstr "" + +#: include/conversation.php:1314 +msgid "Allow multiple answers" +msgstr "" + +#: include/conversation.php:1317 +msgid "Disable comments" +msgstr "" + +#: include/conversation.php:1318 +msgid "Toggle comments" +msgstr "" + +#: include/conversation.php:1319 +msgid "Allow comments on this post" +msgstr "" + +#: include/conversation.php:1322 src/Lib/Apps.php:398 +msgid "Comment Control" +msgstr "" + +#: include/conversation.php:1324 +msgid "Optional: disable comments after (date)" +msgstr "" + +#: include/conversation.php:1332 src/Module/Card_edit.php:128 +#: src/Module/Editblock.php:144 src/Module/Photos.php:733 +#: src/Module/Photos.php:1120 +msgid "Title (optional)" +msgstr "" + +#: include/conversation.php:1335 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: include/conversation.php:1336 src/Module/Events.php:514 +msgid "Permission settings" +msgstr "" + +#: include/conversation.php:1359 +msgid "Other networks and post services" +msgstr "" + +#: include/conversation.php:1360 +msgid "Collections" +msgstr "" + +#: include/conversation.php:1365 +msgid "Check In" +msgstr "" + +#: include/conversation.php:1366 +msgid "Check Out" +msgstr "" + +#: include/conversation.php:1367 +msgid "Set expiration date" +msgstr "" + +#: include/conversation.php:1372 +msgid "Set publish date" +msgstr "" + +#: include/conversation.php:1375 src/Lib/ThreadItem.php:1005 +#: src/Module/Chat.php:222 +msgid "Encrypt text" +msgstr "" + +#: include/conversation.php:1383 src/Lib/ThreadItem.php:559 +#: src/Lib/Libacl.php:147 src/Module/Photos.php:1342 +#: src/Module/Settings/Channel.php:486 +msgid "Close" +msgstr "" + +#: include/conversation.php:1389 src/Module/Admin.php:177 +msgid "Summary" +msgstr "" + +#: include/conversation.php:1390 +msgid "Load remote media players" +msgstr "" + +#: include/conversation.php:1391 +msgid "This may subject viewers of this post to behaviour tracking" +msgstr "" + +#: include/conversation.php:1393 +msgid "Find shareable objects" +msgstr "" + +#: include/conversation.php:1422 +msgid "Post to Collections" +msgstr "" + +#: include/conversation.php:1799 +msgid " distance: " +msgstr "" + +#: include/conversation.php:1898 src/Lib/ThreadItem.php:250 +#: src/Lib/ThreadItem.php:548 src/Module/Photos.php:1336 +msgctxt "noun" +msgid "Likes" +msgstr "" + +#: include/conversation.php:1902 src/Lib/ThreadItem.php:256 +#: src/Module/Photos.php:1233 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1904 src/Lib/ThreadItem.php:258 +#: src/Lib/ThreadItem.php:549 src/Module/Photos.php:1337 +msgctxt "noun" +msgid "Dislikes" +msgstr "" + +#: include/conversation.php:1908 +msgctxt "noun" +msgid "Repeat" +msgid_plural "Repeats" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1910 src/Lib/ThreadItem.php:554 +msgctxt "noun" +msgid "Repeats" +msgstr "" + +#: include/conversation.php:1913 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1915 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1917 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1919 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1921 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1923 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + +#: include/help.php:62 src/Lib/Apps.php:415 src/Lib/Navbar.php:276 +msgid "Help" +msgstr "" + +#: include/security.php:665 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "" + +#: include/network.php:1213 +msgid "RSS/Atom" +msgstr "" + +#: include/network.php:1214 src/Module/Stream.php:159 +msgid "ActivityPub" +msgstr "" + +#: include/network.php:1215 +msgid "Diaspora" +msgstr "" + +#: include/network.php:1216 src/Module/Stream.php:155 +msgid "Nomad" +msgstr "" + +#: include/network.php:1217 +msgid "Zot6" +msgstr "" + +#: include/photos.php:43 include/attach.php:162 include/attach.php:211 +#: include/attach.php:289 include/attach.php:416 include/attach.php:431 +#: include/attach.php:438 include/attach.php:517 include/attach.php:1133 +#: include/attach.php:1461 include/attach.php:1632 src/Lib/Chatroom.php:153 +#: src/Module/Connedit.php:350 src/Module/Api.php:31 src/Module/Appman.php:100 +#: src/Module/Block.php:31 src/Module/Block.php:84 src/Module/Blocks.php:82 +#: src/Module/Blocks.php:89 src/Module/Calendar.php:248 +#: src/Module/Card_edit.php:63 src/Module/Cards.php:85 +#: src/Module/Channel.php:281 src/Module/Channel.php:459 +#: src/Module/Channel.php:497 src/Module/Chat.php:115 src/Module/Chat.php:120 +#: src/Module/Common.php:48 src/Module/Connections.php:39 +#: src/Module/Display.php:510 src/Module/Cover_photo.php:337 +#: src/Module/Cover_photo.php:351 src/Module/Defperms.php:176 +#: src/Module/Defperms.php:182 src/Module/Item.php:632 src/Module/Item.php:654 +#: src/Module/Item.php:666 src/Module/Item.php:1916 src/Module/Editblock.php:79 +#: src/Module/Editlayout.php:77 src/Module/Editlayout.php:100 +#: src/Module/Editpost.php:26 src/Module/Editwebpage.php:82 +#: src/Module/Editwebpage.php:103 src/Module/Editwebpage.php:122 +#: src/Module/Editwebpage.php:138 src/Module/Events.php:294 +#: src/Module/Filestorage.php:29 src/Module/Filestorage.php:115 +#: src/Module/Filestorage.php:131 src/Module/Filestorage.php:159 +#: src/Module/Filestorage.php:192 src/Module/Filestorage.php:199 +#: src/Module/Inspect.php:17 src/Module/Invite.php:103 src/Module/Manage.php:25 +#: src/Module/Layouts.php:82 src/Module/Layouts.php:89 +#: src/Module/Layouts.php:100 src/Module/Lists.php:107 src/Module/Lists.php:119 +#: src/Module/Lists.php:150 src/Module/Locs.php:105 src/Module/Register.php:101 +#: src/Module/Menu.php:136 src/Module/Menu.php:147 src/Module/Mitem.php:143 +#: src/Module/Moderate.php:24 src/Module/Mood.php:147 +#: src/Module/New_channel.php:114 src/Module/New_channel.php:137 +#: src/Module/Notifications.php:19 src/Module/Page.php:42 +#: src/Module/Page.php:147 src/Module/Pdledit.php:37 src/Module/Photos.php:73 +#: src/Module/Poke.php:118 src/Module/Profile.php:102 +#: src/Module/Profile.php:117 src/Module/Profile_photo.php:349 +#: src/Module/Profile_photo.php:363 src/Module/Regmod.php:25 +#: src/Module/Settings/Profile_edit.php:72 +#: src/Module/Settings/Profile_edit.php:529 src/Module/Webpages.php:144 +#: src/Module/Vote.php:23 src/Module/Viewsrc.php:24 +#: src/Module/Viewconnections.php:25 src/Module/Thing.php:318 +#: src/Module/Thing.php:339 src/Module/Thing.php:381 +#: src/Module/Suggestions.php:35 src/Module/Sources.php:88 +#: src/Module/Sharedwithme.php:22 src/Module/Setup.php:220 +#: src/Module/Settings.php:74 src/Module/Service_limits.php:16 +#: src/Web/WebServer.php:69 +msgid "Permission denied." +msgstr "" + #: include/photos.php:141 #, php-format msgid "Image exceeds website size limit of %lu bytes" @@ -2311,136 +2368,92 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: include/help.php:62 src/Lib/Apps.php:415 src/Lib/Navbar.php:276 -msgid "Help" +#: include/attach.php:284 include/attach.php:411 +msgid "Item was not found." msgstr "" -#: include/security.php:664 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: include/attach.php:302 +msgid "Unknown error." msgstr "" -#: include/network.php:1213 -msgid "RSS/Atom" +#: include/attach.php:606 +msgid "No source file." msgstr "" -#: include/network.php:1214 src/Module/Stream.php:159 -msgid "ActivityPub" +#: include/attach.php:630 +msgid "Cannot locate file to replace" msgstr "" -#: include/network.php:1215 -msgid "Diaspora" +#: include/attach.php:651 +msgid "Cannot locate file to revise/update" msgstr "" -#: include/network.php:1216 src/Module/Stream.php:155 -msgid "Nomad" -msgstr "" - -#: include/network.php:1217 -msgid "Zot6" -msgstr "" - -#: include/datetime.php:74 src/Module/Settings/Channel.php:545 -#: src/Module/Settings/Profile_edit.php:607 src/Widget/Newmember.php:55 -msgid "Miscellaneous" -msgstr "" - -#: include/datetime.php:167 -msgid "Birthday" -msgstr "" - -#: include/datetime.php:167 -msgid "Age: " -msgstr "" - -#: include/datetime.php:167 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: include/datetime.php:251 src/Module/Appman.php:151 src/Module/Appman.php:152 -#: src/Module/Events.php:495 src/Module/Events.php:500 -#: src/Module/Settings/Profile_edit.php:617 -#: src/Module/Settings/Profile_edit.php:621 -msgid "Required" -msgstr "" - -#: include/datetime.php:283 -msgid "from now" -msgstr "" - -#: include/datetime.php:286 -msgid "ago" -msgstr "" - -#: include/datetime.php:291 +#: include/attach.php:814 #, php-format -msgid "less than a second %s" +msgid "File exceeds size limit of %d" msgstr "" -#: include/datetime.php:309 +#: include/attach.php:837 #, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s %3$s" +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: include/datetime.php:320 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:321 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:322 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:323 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:324 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:325 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:326 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:576 -#, php-format -msgid "%1$s's birthday" +#: include/attach.php:1039 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: include/datetime.php:577 -#, php-format -msgid "Happy Birthday %1$s" +#: include/attach.php:1070 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: include/attach.php:1148 include/attach.php:1165 +msgid "Path not available." +msgstr "" + +#: include/attach.php:1373 +msgid "Attach photo album" +msgstr "" + +#: include/attach.php:1374 include/attach.php:1377 +msgid "Attach photos as album" +msgstr "" + +#: include/attach.php:1411 src/Module/Embedphotos.php:388 +#: src/Module/Photos.php:881 src/Widget/Album.php:109 +#: src/Widget/Portfolio.php:122 +msgid "Edit Album" +msgstr "" + +#: include/attach.php:1413 src/Module/Cover_photo.php:421 +#: src/Module/Embedphotos.php:390 src/Module/Photos.php:747 +#: src/Module/Profile_photo.php:512 src/Storage/Browser.php:423 +#: src/Widget/Album.php:111 src/Widget/Cdav.php:157 src/Widget/Cdav.php:191 +#: src/Widget/Portfolio.php:124 +msgid "Upload" +msgstr "" + +#: include/attach.php:1466 include/attach.php:1637 +msgid "Empty pathname" +msgstr "" + +#: include/attach.php:1494 +msgid "duplicate filename or path" +msgstr "" + +#: include/attach.php:1519 +msgid "Path not found." +msgstr "" + +#: include/attach.php:1590 +msgid "mkdir failed." +msgstr "" + +#: include/attach.php:1593 +msgid "database storage failed." +msgstr "" + +#: include/attach.php:1643 +msgid "Empty path" msgstr "" #: src/Access/PermissionRoles.php:151 @@ -2557,215 +2570,6 @@ msgstr "" msgid "Import complete." msgstr "" -#: src/Lib/ThreadItem.php:138 -msgid "" -"This comment was sent as a protected or private message but the conversation " -"has a different privacy expectation. Discretion advised." -msgstr "" - -#: src/Lib/ThreadItem.php:144 -msgid "" -"This comment is part of a private conversation, yet was shared with the " -"public. Discretion advised." -msgstr "" - -#: src/Lib/ThreadItem.php:152 src/Lib/Libprofile.php:203 src/Lib/Apps.php:666 -#: src/Lib/Menu.php:142 src/Module/Admin/Profs.php:192 -#: src/Module/Blocks.php:173 src/Module/Card_edit.php:110 -#: src/Module/Connections.php:366 src/Module/Connections.php:409 -#: src/Module/Connections.php:430 src/Module/Editblock.php:129 -#: src/Module/Editlayout.php:127 src/Module/Editwebpage.php:160 -#: src/Module/Layouts.php:209 src/Module/Lists.php:364 src/Module/Menu.php:182 -#: src/Module/Settings/Oauth2.php:213 src/Module/Settings/Oauth.php:166 -#: src/Module/Settings/Identities.php:90 src/Module/Webpages.php:270 -#: src/Module/Thing.php:305 src/Storage/Browser.php:319 src/Widget/Cdav.php:149 -#: src/Widget/Cdav.php:184 -msgid "Edit" -msgstr "" - -#: src/Lib/ThreadItem.php:192 src/Storage/Browser.php:307 -msgid "Admin Delete" -msgstr "" - -#: src/Lib/ThreadItem.php:201 src/Module/Filer.php:63 -msgid "Save to Folder" -msgstr "" - -#: src/Lib/ThreadItem.php:223 -msgid "I will attend" -msgstr "" - -#: src/Lib/ThreadItem.php:223 -msgid "I will not attend" -msgstr "" - -#: src/Lib/ThreadItem.php:223 -msgid "I might attend" -msgstr "" - -#: src/Lib/ThreadItem.php:224 -msgid "Undo attendance" -msgstr "" - -#: src/Lib/ThreadItem.php:243 src/Lib/ThreadItem.php:263 -#: src/Lib/ThreadItem.php:273 src/Module/Photos.php:1225 -#: src/Module/Photos.php:1236 -msgid "View all" -msgstr "" - -#: src/Lib/ThreadItem.php:306 -msgid "Add Tag" -msgstr "" - -#: src/Lib/ThreadItem.php:340 src/Module/Photos.php:1166 -msgid "I like this" -msgstr "" - -#: src/Lib/ThreadItem.php:340 src/Module/Photos.php:1170 -msgid "Undo like" -msgstr "" - -#: src/Lib/ThreadItem.php:341 src/Module/Photos.php:1169 -msgid "I don't like this" -msgstr "" - -#: src/Lib/ThreadItem.php:341 src/Module/Photos.php:1171 -msgid "Undo dislike" -msgstr "" - -#: src/Lib/ThreadItem.php:347 -msgid "Share this" -msgstr "" - -#: src/Lib/ThreadItem.php:352 -msgid "Undo repeat" -msgstr "" - -#: src/Lib/ThreadItem.php:355 -msgid "Repeat this" -msgstr "" - -#: src/Lib/ThreadItem.php:367 -msgid "Delivery report" -msgstr "" - -#: src/Lib/ThreadItem.php:396 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: src/Lib/ThreadItem.php:397 -#, php-format -msgid "%d unseen" -msgstr "" - -#: src/Lib/ThreadItem.php:457 src/Lib/ThreadItem.php:458 -#, php-format -msgid "View %s's profile - %s" -msgstr "" - -#: src/Lib/ThreadItem.php:461 -msgid "to" -msgstr "" - -#: src/Lib/ThreadItem.php:463 -msgid "Wall-to-Wall" -msgstr "" - -#: src/Lib/ThreadItem.php:464 -msgid "via Wall-To-Wall:" -msgstr "" - -#: src/Lib/ThreadItem.php:493 -msgid "Attend" -msgstr "" - -#: src/Lib/ThreadItem.php:494 -msgid "Attendance Options" -msgstr "" - -#: src/Lib/ThreadItem.php:496 -msgid "Voting Options" -msgstr "" - -#: src/Lib/ThreadItem.php:497 -msgid "Reply" -msgstr "" - -#: src/Lib/ThreadItem.php:527 -msgid "Saved draft" -msgstr "" - -#: src/Lib/ThreadItem.php:528 -msgid "Save Bookmarks" -msgstr "" - -#: src/Lib/ThreadItem.php:529 -msgid "Add to Calendar" -msgstr "" - -#: src/Lib/ThreadItem.php:540 src/Module/Notifications.php:75 -msgid "Mark all seen" -msgstr "" - -#: src/Lib/ThreadItem.php:568 -msgid "Reply to conversation" -msgstr "" - -#: src/Lib/ThreadItem.php:570 -msgid "Conversation" -msgstr "" - -#: src/Lib/ThreadItem.php:571 src/Module/Connedit.php:625 -msgid "Archive" -msgstr "" - -#: src/Lib/ThreadItem.php:631 src/Lib/Stringsjs.php:15 -#, php-format -msgid "%s show all" -msgstr "" - -#: src/Lib/ThreadItem.php:984 src/Module/Photos.php:1189 -#: src/Module/Photos.php:1295 -msgid "This is you" -msgstr "" - -#: src/Lib/ThreadItem.php:986 src/Lib/Stringsjs.php:14 -#: src/Module/Photos.php:1191 src/Module/Photos.php:1297 -msgid "Comment" -msgstr "" - -#: src/Lib/ThreadItem.php:994 -msgid "Image" -msgstr "" - -#: src/Lib/ThreadItem.php:995 -msgid "Attach/Embed File" -msgstr "" - -#: src/Lib/ThreadItem.php:998 -msgid "Insert Link" -msgstr "" - -#: src/Lib/ThreadItem.php:1000 src/Module/Lostpass.php:143 -#: src/Module/Pdledit.php:72 src/Module/Pdledit.php:80 -msgid "Reset" -msgstr "" - -#: src/Lib/ThreadItem.php:1010 -msgid "Your full name (required)" -msgstr "" - -#: src/Lib/ThreadItem.php:1011 -msgid "Your email address (required)" -msgstr "" - -#: src/Lib/ThreadItem.php:1012 -msgid "Your website URL (optional)" -msgstr "" - #: src/Lib/Permcat.php:77 msgctxt "permcat" msgid "default" @@ -2795,106 +2599,64 @@ msgstr "" msgid "Unable to verify site signature for %s" msgstr "" -#: src/Lib/Channel.php:45 -msgid "Empty name" +#: src/Lib/Libzot.php:773 +msgid "Unable to verify channel signature" msgstr "" -#: src/Lib/Channel.php:49 -msgid "Name too long" -msgstr "" - -#: src/Lib/Channel.php:277 -msgid "No account identifier" -msgstr "" - -#: src/Lib/Channel.php:289 -msgid "Nickname is required." -msgstr "" - -#: src/Lib/Channel.php:303 src/Lib/Channel.php:778 src/Module/Changeaddr.php:73 -msgid "Reserved nickname. Please choose another." -msgstr "" - -#: src/Lib/Channel.php:308 src/Lib/Channel.php:783 src/Module/Changeaddr.php:78 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: src/Lib/Channel.php:392 -msgid "Unable to retrieve created identity" -msgstr "" - -#: src/Lib/Channel.php:704 src/Lib/Channel.php:802 -msgid "Unable to retrieve modified identity" -msgstr "" - -#: src/Lib/Channel.php:1863 src/Module/Cover_photo.php:290 -#: src/Module/Cover_photo.php:292 src/Widget/Cover_photo.php:92 -msgid "cover photo" -msgstr "" - -#: src/Lib/Channel.php:2189 src/Module/Rmagic.php:89 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "" - -#: src/Lib/Channel.php:2190 src/Module/Rmagic.php:92 -msgid "Authenticate" -msgstr "" - -#: src/Lib/Activity.php:494 +#: src/Lib/Activity.php:557 msgid "Quoted post" msgstr "" -#: src/Lib/Activity.php:3214 +#: src/Lib/Activity.php:3285 msgid "Activity" msgstr "" -#: src/Lib/Activity.php:3216 src/Lib/Libprofile.php:753 src/Lib/Apps.php:439 +#: src/Lib/Activity.php:3287 src/Lib/Libprofile.php:753 src/Lib/Apps.php:439 #: src/Module/Profperm.php:131 msgid "Profile" msgstr "" -#: src/Lib/Activity.php:3222 +#: src/Lib/Activity.php:3293 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: src/Lib/Activity.php:3225 +#: src/Lib/Activity.php:3296 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: src/Lib/Activity.php:3228 +#: src/Lib/Activity.php:3299 #, php-format msgid "Flagged %1$s's %2$s" msgstr "" -#: src/Lib/Activity.php:3231 +#: src/Lib/Activity.php:3302 #, php-format msgid "Blocked %1$s's %2$s" msgstr "" -#: src/Lib/Activity.php:3237 +#: src/Lib/Activity.php:3308 #, php-format msgid "Will attend %s's event" msgstr "" -#: src/Lib/Activity.php:3240 +#: src/Lib/Activity.php:3311 #, php-format msgid "Will not attend %s's event" msgstr "" -#: src/Lib/Activity.php:3243 +#: src/Lib/Activity.php:3314 #, php-format msgid "May attend %s's event" msgstr "" -#: src/Lib/Activity.php:3246 +#: src/Lib/Activity.php:3317 #, php-format msgid "May not attend %s's event" msgstr "" -#: src/Lib/Activity.php:3252 +#: src/Lib/Activity.php:3323 #, php-format msgid "📢 Repeated %1$s's %2$s" msgstr "" @@ -3581,6 +3343,52 @@ msgstr "" msgid "Account '%s' deleted" msgstr "" +#: src/Lib/Channel.php:45 +msgid "Empty name" +msgstr "" + +#: src/Lib/Channel.php:49 +msgid "Name too long" +msgstr "" + +#: src/Lib/Channel.php:277 +msgid "No account identifier" +msgstr "" + +#: src/Lib/Channel.php:289 +msgid "Nickname is required." +msgstr "" + +#: src/Lib/Channel.php:303 src/Lib/Channel.php:778 src/Module/Changeaddr.php:73 +msgid "Reserved nickname. Please choose another." +msgstr "" + +#: src/Lib/Channel.php:308 src/Lib/Channel.php:783 src/Module/Changeaddr.php:78 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: src/Lib/Channel.php:392 +msgid "Unable to retrieve created identity" +msgstr "" + +#: src/Lib/Channel.php:704 src/Lib/Channel.php:802 +msgid "Unable to retrieve modified identity" +msgstr "" + +#: src/Lib/Channel.php:1863 src/Module/Cover_photo.php:290 +#: src/Module/Cover_photo.php:292 src/Widget/Cover_photo.php:92 +msgid "cover photo" +msgstr "" + +#: src/Lib/Channel.php:2189 src/Module/Rmagic.php:89 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "" + +#: src/Lib/Channel.php:2190 src/Module/Rmagic.php:92 +msgid "Authenticate" +msgstr "" + #: src/Lib/Libprofile.php:39 msgid "Requested channel is not available." msgstr "" @@ -3601,6 +3409,20 @@ msgstr "" msgid "Edit Profile" msgstr "" +#: src/Lib/Libprofile.php:203 src/Lib/Apps.php:666 src/Lib/Menu.php:142 +#: src/Lib/ThreadItem.php:152 src/Module/Admin/Profs.php:192 +#: src/Module/Blocks.php:173 src/Module/Card_edit.php:110 +#: src/Module/Connections.php:366 src/Module/Connections.php:409 +#: src/Module/Connections.php:430 src/Module/Editblock.php:129 +#: src/Module/Editlayout.php:127 src/Module/Editwebpage.php:160 +#: src/Module/Layouts.php:209 src/Module/Lists.php:364 src/Module/Menu.php:182 +#: src/Module/Settings/Oauth2.php:213 src/Module/Settings/Oauth.php:166 +#: src/Module/Settings/Identities.php:90 src/Module/Webpages.php:270 +#: src/Module/Thing.php:305 src/Storage/Browser.php:319 src/Widget/Cdav.php:149 +#: src/Widget/Cdav.php:184 +msgid "Edit" +msgstr "" + #: src/Lib/Libprofile.php:219 msgid "Profile Image" msgstr "" @@ -4351,8 +4173,199 @@ msgstr "" msgid "Room is full" msgstr "" -#: src/Lib/Libzot.php:773 -msgid "Unable to verify channel signature" +#: src/Lib/ThreadItem.php:138 +msgid "" +"This comment was sent as a protected or private message but the conversation " +"has a different privacy expectation. Discretion advised." +msgstr "" + +#: src/Lib/ThreadItem.php:144 +msgid "" +"This comment is part of a private conversation, yet was shared with the " +"public. Discretion advised." +msgstr "" + +#: src/Lib/ThreadItem.php:192 src/Storage/Browser.php:307 +msgid "Admin Delete" +msgstr "" + +#: src/Lib/ThreadItem.php:201 src/Module/Filer.php:63 +msgid "Save to Folder" +msgstr "" + +#: src/Lib/ThreadItem.php:223 +msgid "I will attend" +msgstr "" + +#: src/Lib/ThreadItem.php:223 +msgid "I will not attend" +msgstr "" + +#: src/Lib/ThreadItem.php:223 +msgid "I might attend" +msgstr "" + +#: src/Lib/ThreadItem.php:224 +msgid "Undo attendance" +msgstr "" + +#: src/Lib/ThreadItem.php:243 src/Lib/ThreadItem.php:263 +#: src/Lib/ThreadItem.php:273 src/Module/Photos.php:1225 +#: src/Module/Photos.php:1236 +msgid "View all" +msgstr "" + +#: src/Lib/ThreadItem.php:306 +msgid "Add Tag" +msgstr "" + +#: src/Lib/ThreadItem.php:340 src/Module/Photos.php:1166 +msgid "I like this" +msgstr "" + +#: src/Lib/ThreadItem.php:340 src/Module/Photos.php:1170 +msgid "Undo like" +msgstr "" + +#: src/Lib/ThreadItem.php:341 src/Module/Photos.php:1169 +msgid "I don't like this" +msgstr "" + +#: src/Lib/ThreadItem.php:341 src/Module/Photos.php:1171 +msgid "Undo dislike" +msgstr "" + +#: src/Lib/ThreadItem.php:347 +msgid "Share this" +msgstr "" + +#: src/Lib/ThreadItem.php:352 +msgid "Undo repeat" +msgstr "" + +#: src/Lib/ThreadItem.php:355 +msgid "Repeat this" +msgstr "" + +#: src/Lib/ThreadItem.php:367 +msgid "Delivery report" +msgstr "" + +#: src/Lib/ThreadItem.php:396 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: src/Lib/ThreadItem.php:397 +#, php-format +msgid "%d unseen" +msgstr "" + +#: src/Lib/ThreadItem.php:457 src/Lib/ThreadItem.php:458 +#, php-format +msgid "View %s's profile - %s" +msgstr "" + +#: src/Lib/ThreadItem.php:461 +msgid "to" +msgstr "" + +#: src/Lib/ThreadItem.php:463 +msgid "Wall-to-Wall" +msgstr "" + +#: src/Lib/ThreadItem.php:464 +msgid "via Wall-To-Wall:" +msgstr "" + +#: src/Lib/ThreadItem.php:493 +msgid "Attend" +msgstr "" + +#: src/Lib/ThreadItem.php:494 +msgid "Attendance Options" +msgstr "" + +#: src/Lib/ThreadItem.php:496 +msgid "Voting Options" +msgstr "" + +#: src/Lib/ThreadItem.php:497 +msgid "Reply" +msgstr "" + +#: src/Lib/ThreadItem.php:527 +msgid "Saved draft" +msgstr "" + +#: src/Lib/ThreadItem.php:528 +msgid "Save Bookmarks" +msgstr "" + +#: src/Lib/ThreadItem.php:529 +msgid "Add to Calendar" +msgstr "" + +#: src/Lib/ThreadItem.php:540 src/Module/Notifications.php:75 +msgid "Mark all seen" +msgstr "" + +#: src/Lib/ThreadItem.php:568 +msgid "Reply to conversation" +msgstr "" + +#: src/Lib/ThreadItem.php:570 +msgid "Conversation" +msgstr "" + +#: src/Lib/ThreadItem.php:571 src/Module/Connedit.php:625 +msgid "Archive" +msgstr "" + +#: src/Lib/ThreadItem.php:631 src/Lib/Stringsjs.php:15 +#, php-format +msgid "%s show all" +msgstr "" + +#: src/Lib/ThreadItem.php:984 src/Module/Photos.php:1189 +#: src/Module/Photos.php:1295 +msgid "This is you" +msgstr "" + +#: src/Lib/ThreadItem.php:986 src/Lib/Stringsjs.php:14 +#: src/Module/Photos.php:1191 src/Module/Photos.php:1297 +msgid "Comment" +msgstr "" + +#: src/Lib/ThreadItem.php:994 +msgid "Image" +msgstr "" + +#: src/Lib/ThreadItem.php:995 +msgid "Attach/Embed File" +msgstr "" + +#: src/Lib/ThreadItem.php:998 +msgid "Insert Link" +msgstr "" + +#: src/Lib/ThreadItem.php:1000 src/Module/Lostpass.php:143 +#: src/Module/Pdledit.php:72 src/Module/Pdledit.php:80 +msgid "Reset" +msgstr "" + +#: src/Lib/ThreadItem.php:1010 +msgid "Your full name (required)" +msgstr "" + +#: src/Lib/ThreadItem.php:1011 +msgid "Your email address (required)" +msgstr "" + +#: src/Lib/ThreadItem.php:1012 +msgid "Your website URL (optional)" msgstr "" #: src/Lib/Url.php:480 @@ -5933,67 +5946,6 @@ msgstr "" msgid "Block embedded HTML from these domains" msgstr "" -#: src/Module/Admin/Dbsync.php:23 -msgid "Update has been marked successful" -msgstr "" - -#: src/Module/Admin/Dbsync.php:35 -#, php-format -msgid "Verification of update %s failed. Check system logs." -msgstr "" - -#: src/Module/Admin/Dbsync.php:37 src/Module/Admin/Dbsync.php:63 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: src/Module/Admin/Dbsync.php:40 -#, php-format -msgid "Verifying update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: src/Module/Admin/Dbsync.php:43 -#, php-format -msgid "Update %s does not contain a verification function." -msgstr "" - -#: src/Module/Admin/Dbsync.php:46 src/Module/Admin/Dbsync.php:69 -#, php-format -msgid "Update function %s could not be found." -msgstr "" - -#: src/Module/Admin/Dbsync.php:61 -#, php-format -msgid "Executing update procedure %s failed. Check system logs." -msgstr "" - -#: src/Module/Admin/Dbsync.php:66 -#, php-format -msgid "" -"Update %s did not return a status. It cannot be determined if it was " -"successful." -msgstr "" - -#: src/Module/Admin/Dbsync.php:89 -msgid "Failed Updates" -msgstr "" - -#: src/Module/Admin/Dbsync.php:91 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: src/Module/Admin/Dbsync.php:92 -msgid "Attempt to verify this update if a verification procedure exists" -msgstr "" - -#: src/Module/Admin/Dbsync.php:93 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: src/Module/Admin/Dbsync.php:97 -msgid "No failed updates." -msgstr "" - #: src/Module/Admin/Accounts.php:46 #, php-format msgid "%s account blocked/unblocked" @@ -6093,6 +6045,67 @@ msgid "" "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" +#: src/Module/Admin/Dbsync.php:23 +msgid "Update has been marked successful" +msgstr "" + +#: src/Module/Admin/Dbsync.php:35 +#, php-format +msgid "Verification of update %s failed. Check system logs." +msgstr "" + +#: src/Module/Admin/Dbsync.php:37 src/Module/Admin/Dbsync.php:63 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: src/Module/Admin/Dbsync.php:40 +#, php-format +msgid "Verifying update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: src/Module/Admin/Dbsync.php:43 +#, php-format +msgid "Update %s does not contain a verification function." +msgstr "" + +#: src/Module/Admin/Dbsync.php:46 src/Module/Admin/Dbsync.php:69 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: src/Module/Admin/Dbsync.php:61 +#, php-format +msgid "Executing update procedure %s failed. Check system logs." +msgstr "" + +#: src/Module/Admin/Dbsync.php:66 +#, php-format +msgid "" +"Update %s did not return a status. It cannot be determined if it was " +"successful." +msgstr "" + +#: src/Module/Admin/Dbsync.php:89 +msgid "Failed Updates" +msgstr "" + +#: src/Module/Admin/Dbsync.php:91 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: src/Module/Admin/Dbsync.php:92 +msgid "Attempt to verify this update if a verification procedure exists" +msgstr "" + +#: src/Module/Admin/Dbsync.php:93 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: src/Module/Admin/Dbsync.php:97 +msgid "No failed updates." +msgstr "" + #: src/Module/Affinity.php:34 msgid "Friend Zoom settings updated." msgstr "" @@ -7042,7 +7055,7 @@ msgid "" "access your channel." msgstr "" -#: src/Module/Cloud.php:132 src/Module/Item.php:1864 +#: src/Module/Cloud.php:132 src/Module/Item.php:1866 msgid "Not found" msgstr "" @@ -7675,38 +7688,38 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: src/Module/Item.php:1628 +#: src/Module/Item.php:1630 msgid "Duplicate post suppressed." msgstr "" -#: src/Module/Item.php:1675 +#: src/Module/Item.php:1677 msgid "" "Draft saved. Use Drafts app to continue " "editing." msgstr "" -#: src/Module/Item.php:1734 +#: src/Module/Item.php:1736 msgid "Your comment has been posted." msgstr "" -#: src/Module/Item.php:1803 +#: src/Module/Item.php:1805 msgid "System error. Post not saved." msgstr "" -#: src/Module/Item.php:1831 +#: src/Module/Item.php:1833 msgid "Your post/comment is awaiting approval." msgstr "" -#: src/Module/Item.php:2008 +#: src/Module/Item.php:2010 msgid "Unable to obtain post information from database." msgstr "" -#: src/Module/Item.php:2015 +#: src/Module/Item.php:2017 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: src/Module/Item.php:2020 +#: src/Module/Item.php:2022 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7863,7 +7876,7 @@ msgstr "" msgid "Validation token" msgstr "" -#: src/Module/Embedphotos.php:337 src/Module/Photos.php:850 +#: src/Module/Embedphotos.php:373 src/Module/Photos.php:850 #: src/Module/Photos.php:1397 src/Widget/Album.php:94 #: src/Widget/Portfolio.php:102 msgid "View Photo" @@ -10820,16 +10833,6 @@ msgstr "" msgid "Ask me" msgstr "" -#: src/Module/Search.php:384 -#, php-format -msgid "Items tagged with: %s" -msgstr "" - -#: src/Module/Search.php:387 -#, php-format -msgid "Search results for: %s" -msgstr "" - #: src/Module/Webpages.php:59 msgid "Provide managed web pages on your channel" msgstr "" @@ -11753,6 +11756,16 @@ msgstr "" msgid "Manage Blocks" msgstr "" +#: src/Module/Search.php:384 +#, php-format +msgid "Items tagged with: %s" +msgstr "" + +#: src/Module/Search.php:387 +#, php-format +msgid "Search results for: %s" +msgstr "" + #: src/Storage/Browser.php:121 src/Storage/Browser.php:318 msgid "parent" msgstr "" diff --git a/version.php b/version.php index f3c6772ee..bf43eb8c9 100644 --- a/version.php +++ b/version.php @@ -1,2 +1,2 @@ Date: Fri, 14 Jun 2024 12:41:49 +1000 Subject: [PATCH 3/6] allow util/admins: set email verification to verified on admin additions. --- util/admins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/admins b/util/admins index 8e0fd3f1d..3da1830f0 100755 --- a/util/admins +++ b/util/admins @@ -47,7 +47,7 @@ if($argc > 1 && $argv[1] === 'list') { if($argc > 2 && $argv[1] === 'add' && intval($argv[2])) { - $r = q('update account set account_roles = (account_roles | 4096) where account_id = %d', + $r = q('update account set account_roles = (account_roles | 4096), account_flags = 0 where account_id = %d', intval($argv[2]) ); } From 69966e42d160dddc36c3503a0c1f2a5607089637 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Fri, 14 Jun 2024 12:52:52 +1000 Subject: [PATCH 4/6] make sure we don't double dip --- util/admins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/admins b/util/admins index 3da1830f0..92880762f 100755 --- a/util/admins +++ b/util/admins @@ -47,7 +47,7 @@ if($argc > 1 && $argv[1] === 'list') { if($argc > 2 && $argv[1] === 'add' && intval($argv[2])) { - $r = q('update account set account_roles = (account_roles | 4096), account_flags = 0 where account_id = %d', + $r = q('update account set account_roles = 4096, account_flags = 0 where account_id = %d', intval($argv[2]) ); } From 98ca24a048bb1e2d9b40fd2973ba3de95326f6b6 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Sat, 15 Jun 2024 07:55:48 +1000 Subject: [PATCH 5/6] improve admin registration workflow --- install/htconfig.sample.php | 2 +- src/Module/Register.php | 39 ++++++++++++++++++++++++++----------- view/de-de/htconfig.tpl | 2 +- view/en-au/htconfig.tpl | 2 +- view/en-gb/htconfig.tpl | 2 +- view/en/htconfig.tpl | 2 +- view/fr/htconfig.tpl | 2 +- view/it/htconfig.tpl | 2 +- view/nb-no/htconfig.tpl | 2 +- view/pl/htconfig.tpl | 2 +- view/pt-br/htconfig.tpl | 2 +- view/ru/htconfig.tpl | 2 +- view/sv/htconfig.tpl | 2 +- view/tpl/register.tpl | 2 +- 14 files changed, 41 insertions(+), 24 deletions(-) diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index 407ba9b79..b02554a28 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -64,7 +64,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // In order to perform system administration via the admin panel, admin_email // must precisely match the email address of the person logged in. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = ''; diff --git a/src/Module/Register.php b/src/Module/Register.php index fd76c1d58..1df9359ca 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -85,6 +85,20 @@ class Register extends Controller $email_verify = get_config('system', 'verify_email'); + // If this is the first account to be created, the login email must match the + // admin email. Other attempts will be rejected. If it is the admin email, bypass + // some restrictive policies. + + $totalAccounts = Account::account_total(); + if ($totalAccounts === 0) { + if (Account::check_admin($_POST)) { + $policy = REGISTER_OPEN; + $email_verify = false; + } else { + notice(t('The first account must be registered using the admin email which was supplied during setup.') . EOL); + return; + } + } switch ($policy) { case REGISTER_OPEN: @@ -125,8 +139,10 @@ class Register extends Controller return; } - require_once('include/security.php'); + // At this point the account has been created without error. Purge any error messages from prior failed + // registration attempts which haven't yet been delivered to the browser and start fresh. + $_SESSION['sysmsg'] = []; if ($_REQUEST['name']) { set_aconfig($result['account']['account_id'], 'register', 'channel_name', $_REQUEST['name']); @@ -141,12 +157,6 @@ class Register extends Controller set_aconfig($result['account']['account_id'], 'register', 'reason', substr(trim(escape_tags($_REQUEST['reason'])),0, 500)); } - // At this point the account has been created without error. Purge any error messages from prior failed registration - // attempts which haven't yet been delivered to the browser and start fresh. If you're willing to figure out why they - // weren't delivered to the browser please adopt zap issue 34. - - $_SESSION['sysmsg'] = []; - $using_invites = intval(get_config('system', 'invitation_only')); $num_invites = intval(get_config('system', 'number_invites')); $invite_code = ((x($_POST, 'invite_code')) ? notags(trim($_POST['invite_code'])) : ''); @@ -215,13 +225,21 @@ class Register extends Controller public function get() { - $registration_is = EMPTY_STR; $other_sites = false; $policy = (int)Config::Get('system','register_policy'); + $email_verify = get_config('system', 'verify_email'); - if ($policy === REGISTER_CLOSED) { + $totalAccounts = Account::account_total(); + if($totalAccounts === 0) { + $policy = REGISTER_OPEN; + $email_verify = false; + info( t('Please use the admin email address supplied during setup.') . EOL); + } + + if ($policy === REGISTER_CLOSED && !is_site_admin()) { notice(t('Registration on this website is disabled.') . EOL); + $registration_is = t('Registration on this website is disabled.'); $other_sites = true; } @@ -298,8 +316,6 @@ class Register extends Controller $auto_create = (bool)get_config('system', 'auto_channel_create'); $default_role = get_config('system', 'default_permissions_role', 'social_restricted'); - $email_verify = get_config('system', 'verify_email'); - $o = replace_macros(Theme::get_template('register.tpl'), [ '$form_security_token' => get_form_security_token("register"), @@ -321,6 +337,7 @@ class Register extends Controller '$pass1' => $password, '$pass2' => $password2, '$reason' => $reason, + '$disabled' => $policy === REGISTER_CLOSED && !is_site_admin(), '$submit' => t('Register'), '$verify_note' => (($email_verify) ? t('This site requires email verification. After completing this form, please check your email for further instructions.') : ''), ]); diff --git a/view/de-de/htconfig.tpl b/view/de-de/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/de-de/htconfig.tpl +++ b/view/de-de/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/en-au/htconfig.tpl +++ b/view/en-au/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/en-gb/htconfig.tpl +++ b/view/en-gb/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index aa8f2c6fa..4a530f844 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/nb-no/htconfig.tpl +++ b/view/nb-no/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/pl/htconfig.tpl b/view/pl/htconfig.tpl index d48078833..fbd946f8e 100644 --- a/view/pl/htconfig.tpl +++ b/view/pl/htconfig.tpl @@ -51,7 +51,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // REGISTER_APPROVE wymaga ustawienia 'admin_email' na adres e-mail już // zarejestrowanej osoby, która może autoryzować i/lub zatwierdź/odrzuć wniosek. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/pt-br/htconfig.tpl +++ b/view/pt-br/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/ru/htconfig.tpl +++ b/view/ru/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 15e93cc97..254b41618 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -50,7 +50,7 @@ App::$config['system']['ssl_cookie_protection'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_policy'] = REGISTER_APPROVE; App::$config['system']['register_text'] = ''; App::$config['system']['admin_email'] = '{{$adminmail}}'; diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 31f2c662c..ac746278c 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -60,7 +60,7 @@ {{include file="field_input.tpl" field=$phrase}} {{/if}} - +

From e4e22316a0a272aa5497643719f738e1e2fdb84e Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Sat, 15 Jun 2024 12:07:37 +1000 Subject: [PATCH 6/6] provide correct message to match workflow --- src/Module/Register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Register.php b/src/Module/Register.php index 1df9359ca..4e241f303 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -174,7 +174,7 @@ class Register extends Controller $res = Account::send_register_success_email($result['email'], $result['password']); } if ($res) { - if ($invite_code) { + if ($invite_code || !$email_verify) { info(t('Registration successful. Continue to create your first channel...') . EOL); } else { info(t('Registration successful. Please check your email for validation instructions.') . EOL);