diff --git a/Code/Daemon/Xchan_photo.php b/Code/Daemon/Xchan_photo.php index da7c25848..897d30787 100644 --- a/Code/Daemon/Xchan_photo.php +++ b/Code/Daemon/Xchan_photo.php @@ -19,6 +19,24 @@ class Xchan_photo implements DaemonInterface // Some photo sources hang after connect and aren't caught by curl timeout + + $xchan = q("select * from xchan where xchan_hash = '%s'", + dbesc($xchan) + ); + + if ($xchan && (int)$xchan[0]['xchan_censored'] === 2) { + $result = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", + dbescdate(datetime_convert()), + dbesc(z_root() . '/' . Channel::get_default_profile_photo()), + dbesc(z_root() . '/' . Channel::get_default_profile_photo(80)), + dbesc(z_root() . '/' . Channel::get_default_profile_photo(48)), + dbesc('image/png'), + dbesc($xchan) + ); + return; + } + + set_time_limit(90); $photos = import_remote_xchan_photo($url, $xchan); diff --git a/Code/Lib/Activity.php b/Code/Lib/Activity.php index f6fb4bcae..e36d49ebf 100644 --- a/Code/Lib/Activity.php +++ b/Code/Lib/Activity.php @@ -2457,6 +2457,7 @@ class Activity // pages of Mastodon and Pleroma instance actors in the directory. // @TODO - (2021-08-27) remove this if they provide a non-person xchan_type // once extended xchan_type directory filtering is implemented. + $censored = ((strpos($profile, 'instance_actor') || strpos($profile, '/internal/fetch')) ? 1 : 0); $r = q( @@ -2504,7 +2505,7 @@ class Activity dbesc(datetime_convert()), intval($hidden), intval($xchan_type), - intval($censored), + intval($r[0]['xchan_censored'] ?: $censored), dbesc($url) ); diff --git a/Code/Lib/Multibase.php b/Code/Lib/Multibase.php new file mode 100644 index 000000000..43ade9cca --- /dev/null +++ b/Code/Lib/Multibase.php @@ -0,0 +1,38 @@ +encode($raw); + } + + public function secretKey($key) + { + $base58 = new Base58(); + $raw = hex2bin('8026') . sodium_base642bin($key, SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING); + return 'z' . $base58->encode($raw); + } + + public function decode($key) + { + $base58 = new Base58(); + $key = substr($key,1); + $raw = $base58->decode($key); + return sodium_bin2base64(substr($raw, 2), SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING); + } + +} diff --git a/Code/Module/Dircensor.php b/Code/Module/Dircensor.php index f2b376f8e..de3df0b03 100644 --- a/Code/Module/Dircensor.php +++ b/Code/Module/Dircensor.php @@ -2,6 +2,7 @@ namespace Code\Module; +use Code\Daemon\Run; use Code\Web\Controller; class Dircensor extends Controller @@ -27,7 +28,7 @@ class Dircensor extends Controller return; } - $val = (($r[0]['xchan_censored']) ? 0 : 1); + $val = ($r[0]['xchan_censored']) ? 0 : 2; q( "update xchan set xchan_censored = $val where xchan_hash = '%s'", @@ -35,6 +36,7 @@ class Dircensor extends Controller ); if ($val) { + Run::Summon(['Xchan_photo', bin2hex($r[0]['xchan_photo_l']), bin2hex($xchan)]); info(t('Entry censored') . EOL); } else { info(t('Entry uncensored') . EOL); diff --git a/Code/Module/Dirsearch.php b/Code/Module/Dirsearch.php index 9064a1517..d9a14d5d1 100644 --- a/Code/Module/Dirsearch.php +++ b/Code/Module/Dirsearch.php @@ -197,7 +197,7 @@ class Dirsearch extends Controller $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : ''); if ($safe < 0) { - $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) "; + $safesql = " and ( xchan_censored > 0 OR xchan_selfcensored = 1 ) "; } if ($type) { diff --git a/util/messages.po b/util/messages.po index 632224889..061d8c2a5 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 23.11.10\n" +"Project-Id-Version: 23.11.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-09 23:41-0800\n" +"POT-Creation-Date: 2023-11-21 12:02-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -110,13 +110,13 @@ msgstr "" msgid "Your service plan only allows %d channels." msgstr "" -#: Code/Import/Friendica.php:191 Code/Lib/Channel.php:552 +#: Code/Import/Friendica.php:191 Code/Lib/Channel.php:512 msgid "Default Profile" msgstr "" #: Code/Import/Friendica.php:237 Code/Import/Friendica.php:238 -#: Code/Import/Friendica.php:246 Code/Lib/Channel.php:601 -#: Code/Lib/Channel.php:603 Code/Module/Settings/Channel.php:621 +#: Code/Import/Friendica.php:246 Code/Lib/Channel.php:561 +#: Code/Lib/Channel.php:563 Code/Module/Settings/Channel.php:621 #: Code/Module/Settings/Channel.php:624 Code/Module/Settings/Channel.php:625 #: Code/Module/Settings/Profile_edit.php:881 Code/Module/Affinity.php:66 #: Code/Module/Connedit.php:697 Code/Widget/Affinity.php:31 @@ -127,7 +127,7 @@ msgstr "" msgid "Import complete." msgstr "" -#: Code/Lib/Stringsjs.php:13 include/conversation.php:1154 +#: Code/Lib/Stringsjs.php:13 include/conversation.php:1153 msgid "Delete this item?" msgstr "" @@ -189,18 +189,18 @@ msgid "Nothing new here" msgstr "" #: Code/Lib/Stringsjs.php:27 Code/Lib/ThreadItem.php:928 -#: Code/Module/Admin/Account_edit.php:81 Code/Module/Admin/Accounts.php:185 -#: Code/Module/Admin/Addons.php:441 Code/Module/Admin/Channels.php:145 -#: Code/Module/Admin/Customsql.php:38 Code/Module/Admin/Logs.php:87 -#: Code/Module/Admin/Profs.php:195 Code/Module/Admin/Security.php:189 -#: Code/Module/Admin/Themes.php:160 Code/Module/Admin/Site.php:275 -#: Code/Module/Dev/Ap_probe.php:25 Code/Module/Dev/Finger.php:26 -#: Code/Module/Dev/Serialize.php:27 Code/Module/Dev/Xchan.php:18 -#: Code/Module/Dev/Zot_probe.php:24 Code/Module/Dev/Zotfinger.php:30 -#: Code/Module/Settings/Account.php:114 Code/Module/Settings/Channel.php:432 -#: Code/Module/Settings/Featured.php:63 Code/Module/Settings/Features.php:66 -#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth2.php:115 -#: Code/Module/Settings/Permcats.php:146 +#: Code/Lib/AccessList.php:403 Code/Module/Admin/Account_edit.php:81 +#: Code/Module/Admin/Accounts.php:185 Code/Module/Admin/Addons.php:441 +#: Code/Module/Admin/Channels.php:145 Code/Module/Admin/Customsql.php:38 +#: Code/Module/Admin/Logs.php:87 Code/Module/Admin/Profs.php:195 +#: Code/Module/Admin/Security.php:189 Code/Module/Admin/Themes.php:160 +#: Code/Module/Admin/Site.php:275 Code/Module/Dev/Ap_probe.php:25 +#: Code/Module/Dev/Finger.php:26 Code/Module/Dev/Serialize.php:27 +#: Code/Module/Dev/Xchan.php:18 Code/Module/Dev/Zot_probe.php:24 +#: Code/Module/Dev/Zotfinger.php:30 Code/Module/Settings/Account.php:114 +#: Code/Module/Settings/Channel.php:432 Code/Module/Settings/Featured.php:63 +#: Code/Module/Settings/Features.php:66 Code/Module/Settings/Oauth.php:98 +#: Code/Module/Settings/Oauth2.php:115 Code/Module/Settings/Permcats.php:146 #: Code/Module/Settings/Profile_edit.php:588 #: Code/Module/Settings/Tokens.php:315 Code/Module/Settings/Display.php:210 #: Code/Module/Settings/Multifactor.php:72 Code/Module/Email_validation.php:47 @@ -606,22 +606,83 @@ msgid "" "language or topic. Replies are sent back to your main channel" msgstr "" -#: Code/Lib/AccessList.php:32 -msgid "" -"A deleted list with this name was revived. Existing item permissions " -"may apply to this list and any future members. If this is " -"not what you intended, please create another list with a different name." +#: Code/Lib/Apps.php:382 Code/Module/Lists.php:208 +msgid "Access Lists" msgstr "" -#: Code/Lib/AccessList.php:370 -msgid "Add new connections to this access list" +#: Code/Lib/Apps.php:383 Code/Lib/Navbar.php:294 +msgid "Apps" msgstr "" -#: Code/Lib/AccessList.php:386 Code/Lib/PermissionDescription.php:114 -msgid "Public" +#: Code/Lib/Apps.php:384 +msgid "Articles" msgstr "" -#: Code/Lib/AccessList.php:387 Code/Lib/Apps.php:398 Code/Lib/Libacl.php:87 +#: Code/Lib/Apps.php:385 +msgid "Audience" +msgstr "" + +#: Code/Lib/Apps.php:386 +msgid "CalDAV" +msgstr "" + +#: Code/Lib/Apps.php:387 +msgid "CardDAV" +msgstr "" + +#: Code/Lib/Apps.php:388 Code/Module/Cards.php:211 +msgid "Cards" +msgstr "" + +#: Code/Lib/Apps.php:389 Code/Lib/Navbar.php:408 Code/Lib/Navbar.php:411 +#: Code/Storage/Browser.php:157 +msgid "Calendar" +msgstr "" + +#: Code/Lib/Apps.php:390 Code/Module/Cdav.php:1091 +#: Code/Widget/Appcategories.php:52 Code/Widget/Categories.php:87 +#: Code/Widget/Categories.php:135 Code/Widget/Categories.php:186 +#: include/taxonomy.php:478 include/taxonomy.php:572 include/taxonomy.php:594 +#: include/taxonomy.php:617 +msgid "Categories" +msgstr "" + +#: Code/Lib/Apps.php:391 +msgid "Channel Home" +msgstr "" + +#: Code/Lib/Apps.php:392 +msgid "Channel Manager" +msgstr "" + +#: Code/Lib/Apps.php:393 Code/Module/Sources.php:107 +#: Code/Widget/Settings_menu.php:117 +msgid "Channel Sources" +msgstr "" + +#: Code/Lib/Apps.php:394 +msgid "Chat" +msgstr "" + +#: Code/Lib/Apps.php:395 Code/Lib/Navbar.php:422 Code/Lib/Navbar.php:425 +#: Code/Widget/Chatroom_list.php:23 +msgid "Chatrooms" +msgstr "" + +#: Code/Lib/Apps.php:396 +msgid "Clients" +msgstr "" + +#: Code/Lib/Apps.php:397 include/conversation.php:1305 +msgid "Comment Control" +msgstr "" + +#: Code/Lib/Apps.php:398 Code/Module/Communities.php:171 +#: Code/Widget/Findpeople.php:40 +msgid "Communities" +msgstr "" + +#: Code/Lib/Apps.php:399 Code/Lib/Libacl.php:87 Code/Lib/AccessList.php:387 #: Code/Module/Affinity.php:68 Code/Module/Lists.php:30 #: Code/Module/Connections.php:391 Code/Module/Connedit.php:699 #: Code/Module/Stream.php:150 Code/Widget/Affinity.php:33 @@ -629,48 +690,335 @@ msgstr "" msgid "Connections" msgstr "" -#: Code/Lib/AccessList.php:398 -msgid "Audience Selection" +#: Code/Lib/Apps.php:400 +msgid "Content Filter" msgstr "" -#: Code/Lib/AccessList.php:399 -msgid "" -"Use this form to select your default posting audience and default " -"permissions for media and file uploads." +#: Code/Lib/Apps.php:401 +#: extend/addon/a/content_import/Mod_content_import.php:147 +msgid "Content Import" msgstr "" -#: Code/Lib/AccessList.php:400 -msgid "" -"Note: If you change your channel type, this form will be reset to the " -"default audience for that type" +#: Code/Lib/Apps.php:402 +msgid "Custom SQL" msgstr "" -#: Code/Lib/AccessList.php:401 -msgid "Default audience for posts and media access" +#: Code/Lib/Apps.php:403 Code/Module/Directory.php:521 +msgid "Directory" msgstr "" -#: Code/Lib/AccessList.php:424 -msgid "edit" +#: Code/Lib/Apps.php:404 Code/Widget/Activity_filter.php:83 +msgid "Drafts" msgstr "" -#: Code/Lib/AccessList.php:443 Code/Widget/Activity_filter.php:148 -msgid "Lists" +#: Code/Lib/Apps.php:405 Code/Widget/Activity_filter.php:111 +msgid "Events" msgstr "" -#: Code/Lib/AccessList.php:444 -msgid "Edit list" +#: Code/Lib/Apps.php:406 +msgid "Expire Posts" msgstr "" -#: Code/Lib/AccessList.php:445 -msgid "Create new list" +#: Code/Lib/Apps.php:407 +msgid "Features" msgstr "" -#: Code/Lib/AccessList.php:446 -msgid "Channels not in any access list" +#: Code/Lib/Apps.php:408 Code/Lib/Navbar.php:397 Code/Module/Fbrowser.php:95 +#: Code/Storage/Browser.php:298 +msgid "Files" msgstr "" -#: Code/Lib/AccessList.php:448 Code/Widget/Savedsearch.php:95 -msgid "add" +#: Code/Lib/Apps.php:409 extend/addon/a/followlist/Mod_followlist.php:123 +msgid "Followlist" +msgstr "" + +#: Code/Lib/Apps.php:410 Code/Module/Connedit.php:688 +msgid "Friend Zoom" +msgstr "" + +#: Code/Lib/Apps.php:411 +msgid "Future Posting" +msgstr "" + +#: Code/Lib/Apps.php:412 extend/addon/a/gallery/Mod_Gallery.php:138 +#: extend/addon/a/gallery/gallery.php:49 +msgid "Gallery" +msgstr "" + +#: Code/Lib/Apps.php:413 +msgid "Guest Pass" +msgstr "" + +#: Code/Lib/Apps.php:414 Code/Lib/Navbar.php:276 include/help.php:62 +msgid "Help" +msgstr "" + +#: Code/Lib/Apps.php:415 +msgid "Invite" +msgstr "" + +#: Code/Lib/Apps.php:416 +msgid "Language" +msgstr "" + +#: Code/Lib/Apps.php:417 +msgid "Legal" +msgstr "" + +#: Code/Lib/Apps.php:418 Code/Lib/Navbar.php:128 Code/Lib/Navbar.php:131 +#: boot.php:1126 +msgid "Login" +msgstr "" + +#: Code/Lib/Apps.php:419 +msgid "Mail" +msgstr "" + +#: Code/Lib/Apps.php:420 +msgid "Markup" +msgstr "" + +#: Code/Lib/Apps.php:421 Code/Module/Connedit.php:601 +msgid "Moderate" +msgstr "" + +#: Code/Lib/Apps.php:422 Code/Module/Mood.php:166 +msgid "Mood" +msgstr "" + +#: Code/Lib/Apps.php:423 +msgid "My Chatrooms" +msgstr "" + +#: Code/Lib/Apps.php:424 +msgid "No Comment" +msgstr "" + +#: Code/Lib/Apps.php:425 Code/Widget/Notes.php:24 +msgid "Notes" +msgstr "" + +#: Code/Lib/Apps.php:426 Code/Lib/Navbar.php:298 +#: Code/Module/Settings/Channel.php:485 Code/Widget/Notifications.php:165 +msgid "Notifications" +msgstr "" + +#: Code/Lib/Apps.php:427 +msgid "OAuth Apps Manager" +msgstr "" + +#: Code/Lib/Apps.php:428 +msgid "OAuth2 Apps Manager" +msgstr "" + +#: Code/Lib/Apps.php:429 +msgid "Order Apps" +msgstr "" + +#: Code/Lib/Apps.php:430 +msgid "PDL Editor" +msgstr "" + +#: Code/Lib/Apps.php:431 Code/Lib/Features.php:158 +msgid "Permission Categories" +msgstr "" + +#: Code/Lib/Apps.php:432 Code/Lib/Navbar.php:389 Code/Module/Fbrowser.php:37 +msgid "Photos" +msgstr "" + +#: Code/Lib/Apps.php:433 +msgid "Photomap" +msgstr "" + +#: Code/Lib/Apps.php:434 +msgid "Poke" +msgstr "" + +#: Code/Lib/Apps.php:435 +msgid "Post" +msgstr "" + +#: Code/Lib/Apps.php:436 +msgid "Premium Channel" +msgstr "" + +#: Code/Lib/Apps.php:437 +msgid "Probe" +msgstr "" + +#: Code/Lib/Apps.php:438 Code/Lib/Libprofile.php:753 Code/Lib/Activity.php:3072 +#: Code/Module/Profperm.php:131 +msgid "Profile" +msgstr "" + +#: Code/Lib/Apps.php:439 +msgid "Profile Photo" +msgstr "" + +#: Code/Lib/Apps.php:440 +msgid "Profiles" +msgstr "" + +#: Code/Lib/Apps.php:441 Code/Module/Pubstream.php:97 +#: Code/Widget/Notifications.php:147 +msgid "Public Stream" +msgstr "" + +#: Code/Lib/Apps.php:442 +msgid "Random Channel" +msgstr "" + +#: Code/Lib/Apps.php:443 +msgid "Remote Diagnostics" +msgstr "" + +#: Code/Lib/Apps.php:444 +msgid "Report Bug" +msgstr "" + +#: Code/Lib/Apps.php:445 +msgid "Roles" +msgstr "" + +#: Code/Lib/Apps.php:446 Code/Lib/Navbar.php:169 Code/Lib/Libacl.php:140 +#: Code/Module/Connections.php:398 Code/Module/Search.php:121 +#: Code/Widget/Sitesearch.php:35 include/misc.php:1023 include/misc.php:1035 +msgid "Search" +msgstr "" + +#: Code/Lib/Apps.php:447 +msgid "Secrets" +msgstr "" + +#: Code/Lib/Apps.php:448 Code/Module/Admin/Addons.php:344 +#: Code/Module/Admin/Themes.php:128 Code/Widget/Newmember.php:57 +#: Code/Widget/Settings_menu.php:124 +msgid "Settings" +msgstr "" + +#: Code/Lib/Apps.php:449 +msgid "Site Admin" +msgstr "" + +#: Code/Lib/Apps.php:450 +msgid "Sites" +msgstr "" + +#: Code/Lib/Apps.php:451 +msgid "Stream" +msgstr "" + +#: Code/Lib/Apps.php:452 Code/Widget/Stream_order.php:154 +msgid "Stream Order" +msgstr "" + +#: Code/Lib/Apps.php:453 +msgid "Suggest" +msgstr "" + +#: Code/Lib/Apps.php:454 Code/Lib/Features.php:286 +msgid "Suggest Channels" +msgstr "" + +#: Code/Lib/Apps.php:455 +msgid "Tagadelic" +msgstr "" + +#: Code/Lib/Apps.php:456 Code/Widget/Tasklist.php:30 +msgid "Tasks" +msgstr "" + +#: Code/Lib/Apps.php:457 +msgid "View Bookmarks" +msgstr "" + +#: Code/Lib/Apps.php:458 Code/Lib/Navbar.php:122 Code/Module/Connedit.php:565 +msgid "View Profile" +msgstr "" + +#: Code/Lib/Apps.php:459 Code/Module/Webpages.php:266 +msgid "Webpages" +msgstr "" + +#: Code/Lib/Apps.php:460 +msgid "Wiki" +msgstr "" + +#: Code/Lib/Apps.php:461 extend/addon/a/zotpost/Mod_zotpost.php:56 +msgid "ZotPost" +msgstr "" + +#: Code/Lib/Apps.php:638 +msgid "Installed" +msgstr "" + +#: Code/Lib/Apps.php:638 Code/Module/Admin/Addons.php:425 +msgid "Install" +msgstr "" + +#: Code/Lib/Apps.php:662 +msgid "Purchase" +msgstr "" + +#: Code/Lib/Apps.php:665 Code/Lib/Libprofile.php:203 Code/Lib/Menu.php:142 +#: Code/Lib/ThreadItem.php:148 Code/Module/Admin/Profs.php:192 +#: Code/Module/Settings/Identities.php:90 Code/Module/Settings/Oauth.php:166 +#: Code/Module/Settings/Oauth2.php:213 Code/Module/Layouts.php:209 +#: Code/Module/Lists.php:360 Code/Module/Blocks.php:173 +#: Code/Module/Card_edit.php:110 Code/Module/Menu.php:182 +#: Code/Module/Connections.php:338 Code/Module/Connections.php:381 +#: Code/Module/Connections.php:402 Code/Module/Editblock.php:129 +#: Code/Module/Editlayout.php:127 Code/Module/Editwebpage.php:160 +#: Code/Module/Thing.php:304 Code/Module/Webpages.php:269 +#: Code/Storage/Browser.php:318 Code/Widget/Cdav.php:149 +#: Code/Widget/Cdav.php:184 +msgid "Edit" +msgstr "" + +#: Code/Lib/Apps.php:666 Code/Lib/ThreadItem.php:185 +#: Code/Module/Admin/Accounts.php:192 Code/Module/Admin/Channels.php:147 +#: Code/Module/Admin/Profs.php:193 Code/Module/Settings/Oauth.php:167 +#: Code/Module/Settings/Oauth2.php:214 +#: Code/Module/Settings/Profile_edit.php:668 Code/Module/Blocks.php:175 +#: Code/Module/Card_edit.php:140 Code/Module/Cdav.php:1078 +#: Code/Module/Cdav.php:1387 Code/Module/Connections.php:346 +#: Code/Module/Connedit.php:641 Code/Module/Connedit.php:877 +#: Code/Module/Editblock.php:154 Code/Module/Editlayout.php:151 +#: Code/Module/Editwebpage.php:185 Code/Module/Photos.php:1259 +#: Code/Module/Thing.php:305 Code/Module/Webpages.php:271 +#: Code/Storage/Browser.php:319 include/conversation.php:505 +#: include/conversation.php:556 +msgid "Delete" +msgstr "" + +#: Code/Lib/Apps.php:667 +msgid "Undelete" +msgstr "" + +#: Code/Lib/Apps.php:677 +msgid "Add to app-tray" +msgstr "" + +#: Code/Lib/Apps.php:678 +msgid "Remove from app-tray" +msgstr "" + +#: Code/Lib/Apps.php:679 +msgid "Pin to navbar" +msgstr "" + +#: Code/Lib/Apps.php:680 +msgid "Unpin from navbar" +msgstr "" + +#: Code/Lib/Apps.php:1260 Code/Lib/Apps.php:1351 Code/Lib/Activity.php:2303 +#: Code/Module/Cdav.php:876 Code/Module/Cdav.php:877 Code/Module/Cdav.php:883 +#: Code/Module/Embedphotos.php:339 Code/Module/Photos.php:854 +#: Code/Module/Photos.php:1322 Code/Storage/Browser.php:182 +#: Code/Widget/Album.php:100 Code/Widget/Portfolio.php:110 +#: include/attach.php:1384 include/conversation.php:954 +msgid "Unknown" msgstr "" #: Code/Lib/Account.php:30 @@ -769,7 +1117,7 @@ msgid "Content filtering" msgstr "" #: Code/Lib/Navbar.php:119 Code/Lib/Navbar.php:141 Code/Lib/Navbar.php:159 -#: boot.php:1116 +#: boot.php:1125 msgid "Logout" msgstr "" @@ -777,19 +1125,10 @@ msgstr "" msgid "End this session" msgstr "" -#: Code/Lib/Navbar.php:122 Code/Lib/Apps.php:457 Code/Module/Connedit.php:565 -msgid "View Profile" -msgstr "" - #: Code/Lib/Navbar.php:122 msgid "Your profile page" msgstr "" -#: Code/Lib/Navbar.php:128 Code/Lib/Navbar.php:131 Code/Lib/Apps.php:417 -#: boot.php:1117 -msgid "Login" -msgstr "" - #: Code/Lib/Navbar.php:128 Code/Lib/Navbar.php:131 msgid "Sign in" msgstr "" @@ -803,7 +1142,7 @@ msgid "Log me out of this site" msgstr "" #: Code/Lib/Navbar.php:164 Code/Module/Communities.php:93 -#: Code/Module/Register.php:304 boot.php:1097 +#: Code/Module/Register.php:304 boot.php:1106 msgid "Register" msgstr "" @@ -811,12 +1150,6 @@ msgstr "" msgid "Create an account" msgstr "" -#: Code/Lib/Navbar.php:169 Code/Lib/Apps.php:445 Code/Lib/Libacl.php:140 -#: Code/Module/Connections.php:398 Code/Module/Search.php:121 -#: Code/Widget/Sitesearch.php:35 include/misc.php:1023 include/misc.php:1035 -msgid "Search" -msgstr "" - #: Code/Lib/Navbar.php:169 msgid "Search site @name, #tag, ?doc, content" msgstr "" @@ -829,10 +1162,6 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: Code/Lib/Navbar.php:276 Code/Lib/Apps.php:413 include/help.php:62 -msgid "Help" -msgstr "" - #: Code/Lib/Navbar.php:280 Code/Module/New_channel.php:170 #: Code/Module/New_channel.php:177 Code/Module/Connedit.php:812 #: Code/Module/Defperms.php:246 Code/Widget/Notifications.php:167 @@ -855,10 +1184,6 @@ msgstr "" msgid "Installed Apps" msgstr "" -#: Code/Lib/Navbar.php:294 Code/Lib/Apps.php:383 -msgid "Apps" -msgstr "" - #: Code/Lib/Navbar.php:295 Code/Module/Apps.php:59 Code/Widget/Appstore.php:18 msgid "Available Apps" msgstr "" @@ -871,11 +1196,6 @@ msgstr "" msgid "Toggle System Apps" msgstr "" -#: Code/Lib/Navbar.php:298 Code/Lib/Apps.php:425 -#: Code/Module/Settings/Channel.php:485 Code/Widget/Notifications.php:165 -msgid "Notifications" -msgstr "" - #: Code/Lib/Navbar.php:366 Code/Module/Admin/Channels.php:150 msgid "Channel" msgstr "" @@ -892,33 +1212,14 @@ msgstr "" msgid "Profile Details" msgstr "" -#: Code/Lib/Navbar.php:389 Code/Lib/Apps.php:431 Code/Module/Fbrowser.php:37 -msgid "Photos" -msgstr "" - #: Code/Lib/Navbar.php:392 include/photos.php:745 msgid "Photo Albums" msgstr "" -#: Code/Lib/Navbar.php:397 Code/Lib/Apps.php:407 Code/Module/Fbrowser.php:95 -#: Code/Storage/Browser.php:298 -msgid "Files" -msgstr "" - #: Code/Lib/Navbar.php:400 msgid "Files and Storage" msgstr "" -#: Code/Lib/Navbar.php:408 Code/Lib/Navbar.php:411 Code/Lib/Apps.php:388 -#: Code/Storage/Browser.php:157 -msgid "Calendar" -msgstr "" - -#: Code/Lib/Navbar.php:422 Code/Lib/Navbar.php:425 Code/Lib/Apps.php:394 -#: Code/Widget/Chatroom_list.php:23 -msgid "Chatrooms" -msgstr "" - #: Code/Lib/Url.php:480 msgid "url: " msgstr "" @@ -951,47 +1252,47 @@ msgstr "" msgid "Name too long" msgstr "" -#: Code/Lib/Channel.php:327 +#: Code/Lib/Channel.php:287 msgid "No account identifier" msgstr "" -#: Code/Lib/Channel.php:339 +#: Code/Lib/Channel.php:299 msgid "Nickname is required." msgstr "" -#: Code/Lib/Channel.php:353 Code/Lib/Channel.php:823 +#: Code/Lib/Channel.php:313 Code/Lib/Channel.php:783 #: Code/Module/Changeaddr.php:72 msgid "Reserved nickname. Please choose another." msgstr "" -#: Code/Lib/Channel.php:358 Code/Lib/Channel.php:828 +#: Code/Lib/Channel.php:318 Code/Lib/Channel.php:788 #: Code/Module/Changeaddr.php:77 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: Code/Lib/Channel.php:442 +#: Code/Lib/Channel.php:402 msgid "Unable to retrieve created identity" msgstr "" -#: Code/Lib/Channel.php:749 Code/Lib/Channel.php:847 +#: Code/Lib/Channel.php:709 Code/Lib/Channel.php:807 msgid "Unable to retrieve modified identity" msgstr "" -#: Code/Lib/Channel.php:1908 Code/Module/Cover_photo.php:289 +#: Code/Lib/Channel.php:1868 Code/Module/Cover_photo.php:289 #: Code/Module/Cover_photo.php:291 Code/Widget/Cover_photo.php:92 msgid "cover photo" msgstr "" -#: Code/Lib/Channel.php:2210 Code/Module/Rmagic.php:88 boot.php:1118 +#: Code/Lib/Channel.php:2170 Code/Module/Rmagic.php:88 boot.php:1127 msgid "Remote Authentication" msgstr "" -#: Code/Lib/Channel.php:2211 Code/Module/Rmagic.php:89 +#: Code/Lib/Channel.php:2171 Code/Module/Rmagic.php:89 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: Code/Lib/Channel.php:2212 Code/Module/Rmagic.php:92 +#: Code/Lib/Channel.php:2172 Code/Module/Rmagic.php:92 msgid "Authenticate" msgstr "" @@ -1013,8 +1314,8 @@ msgstr "" #: Code/Lib/Chatroom.php:153 Code/Module/Settings/Profile_edit.php:71 #: Code/Module/Settings/Profile_edit.php:523 Code/Module/Inspect.php:17 -#: Code/Module/Invite.php:102 Code/Module/Item.php:621 Code/Module/Item.php:643 -#: Code/Module/Item.php:655 Code/Module/Item.php:1894 Code/Module/Api.php:31 +#: Code/Module/Invite.php:102 Code/Module/Item.php:624 Code/Module/Item.php:646 +#: Code/Module/Item.php:658 Code/Module/Item.php:1897 Code/Module/Api.php:31 #: Code/Module/Layouts.php:82 Code/Module/Layouts.php:89 #: Code/Module/Layouts.php:100 Code/Module/Appman.php:100 #: Code/Module/Lists.php:103 Code/Module/Lists.php:115 @@ -1482,10 +1783,6 @@ msgstr "" msgid "Enable management and selection of privacy groups" msgstr "" -#: Code/Lib/Features.php:158 Code/Lib/Apps.php:430 -msgid "Permission Categories" -msgstr "" - #: Code/Lib/Features.php:159 msgid "Create custom connection permission limits" msgstr "" @@ -1594,10 +1891,6 @@ msgstr "" msgid "Filter stream activity by depth of relationships" msgstr "" -#: Code/Lib/Features.php:286 Code/Lib/Apps.php:453 -msgid "Suggest Channels" -msgstr "" - #: Code/Lib/Features.php:287 msgid "Show friend and connection suggestions" msgstr "" @@ -1667,357 +1960,14 @@ msgstr "" msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: Code/Lib/Markdown.php:220 Code/Module/Tagger.php:93 -#: include/conversation.php:90 include/misc.php:2357 include/bbcode.php:680 +#: Code/Lib/Markdown.php:220 Code/Module/Tagger.php:93 include/misc.php:2357 +#: include/bbcode.php:680 include/conversation.php:90 msgid "post" msgstr "" -#: Code/Lib/Apps.php:382 Code/Module/Lists.php:208 -msgid "Access Lists" -msgstr "" - -#: Code/Lib/Apps.php:384 -msgid "Articles" -msgstr "" - -#: Code/Lib/Apps.php:385 -msgid "CalDAV" -msgstr "" - -#: Code/Lib/Apps.php:386 -msgid "CardDAV" -msgstr "" - -#: Code/Lib/Apps.php:387 Code/Module/Cards.php:211 -msgid "Cards" -msgstr "" - -#: Code/Lib/Apps.php:389 Code/Module/Cdav.php:1091 -#: Code/Widget/Appcategories.php:52 Code/Widget/Categories.php:87 -#: Code/Widget/Categories.php:135 Code/Widget/Categories.php:186 -#: include/taxonomy.php:478 include/taxonomy.php:572 include/taxonomy.php:594 -#: include/taxonomy.php:617 -msgid "Categories" -msgstr "" - -#: Code/Lib/Apps.php:390 -msgid "Channel Home" -msgstr "" - -#: Code/Lib/Apps.php:391 -msgid "Channel Manager" -msgstr "" - -#: Code/Lib/Apps.php:392 Code/Module/Sources.php:107 -#: Code/Widget/Settings_menu.php:117 -msgid "Channel Sources" -msgstr "" - -#: Code/Lib/Apps.php:393 -msgid "Chat" -msgstr "" - -#: Code/Lib/Apps.php:395 -msgid "Clients" -msgstr "" - -#: Code/Lib/Apps.php:396 include/conversation.php:1306 -msgid "Comment Control" -msgstr "" - -#: Code/Lib/Apps.php:397 Code/Module/Communities.php:171 -#: Code/Widget/Findpeople.php:40 -msgid "Communities" -msgstr "" - -#: Code/Lib/Apps.php:399 -msgid "Content Filter" -msgstr "" - -#: Code/Lib/Apps.php:400 -#: extend/addon/a/content_import/Mod_content_import.php:147 -msgid "Content Import" -msgstr "" - -#: Code/Lib/Apps.php:401 -msgid "Custom SQL" -msgstr "" - -#: Code/Lib/Apps.php:402 Code/Module/Directory.php:518 -msgid "Directory" -msgstr "" - -#: Code/Lib/Apps.php:403 Code/Widget/Activity_filter.php:83 -msgid "Drafts" -msgstr "" - -#: Code/Lib/Apps.php:404 Code/Widget/Activity_filter.php:111 -msgid "Events" -msgstr "" - -#: Code/Lib/Apps.php:405 -msgid "Expire Posts" -msgstr "" - -#: Code/Lib/Apps.php:406 -msgid "Features" -msgstr "" - -#: Code/Lib/Apps.php:408 extend/addon/a/followlist/Mod_followlist.php:123 -msgid "Followlist" -msgstr "" - -#: Code/Lib/Apps.php:409 Code/Module/Connedit.php:688 -msgid "Friend Zoom" -msgstr "" - -#: Code/Lib/Apps.php:410 -msgid "Future Posting" -msgstr "" - -#: Code/Lib/Apps.php:411 extend/addon/a/gallery/Mod_Gallery.php:138 -#: extend/addon/a/gallery/gallery.php:49 -msgid "Gallery" -msgstr "" - -#: Code/Lib/Apps.php:412 -msgid "Guest Pass" -msgstr "" - -#: Code/Lib/Apps.php:414 -msgid "Invite" -msgstr "" - -#: Code/Lib/Apps.php:415 -msgid "Language" -msgstr "" - -#: Code/Lib/Apps.php:416 -msgid "Legal" -msgstr "" - -#: Code/Lib/Apps.php:418 -msgid "Mail" -msgstr "" - -#: Code/Lib/Apps.php:419 -msgid "Markup" -msgstr "" - -#: Code/Lib/Apps.php:420 Code/Module/Connedit.php:601 -msgid "Moderate" -msgstr "" - -#: Code/Lib/Apps.php:421 Code/Module/Mood.php:166 -msgid "Mood" -msgstr "" - -#: Code/Lib/Apps.php:422 -msgid "My Chatrooms" -msgstr "" - -#: Code/Lib/Apps.php:423 -msgid "No Comment" -msgstr "" - -#: Code/Lib/Apps.php:424 Code/Widget/Notes.php:24 -msgid "Notes" -msgstr "" - -#: Code/Lib/Apps.php:426 -msgid "OAuth Apps Manager" -msgstr "" - -#: Code/Lib/Apps.php:427 -msgid "OAuth2 Apps Manager" -msgstr "" - -#: Code/Lib/Apps.php:428 -msgid "Order Apps" -msgstr "" - -#: Code/Lib/Apps.php:429 -msgid "PDL Editor" -msgstr "" - -#: Code/Lib/Apps.php:432 -msgid "Photomap" -msgstr "" - -#: Code/Lib/Apps.php:433 -msgid "Poke" -msgstr "" - -#: Code/Lib/Apps.php:434 -msgid "Post" -msgstr "" - -#: Code/Lib/Apps.php:435 -msgid "Premium Channel" -msgstr "" - -#: Code/Lib/Apps.php:436 -msgid "Probe" -msgstr "" - -#: Code/Lib/Apps.php:437 Code/Lib/Libprofile.php:753 Code/Lib/Activity.php:3072 -#: Code/Module/Profperm.php:131 -msgid "Profile" -msgstr "" - -#: Code/Lib/Apps.php:438 -msgid "Profile Photo" -msgstr "" - -#: Code/Lib/Apps.php:439 -msgid "Profiles" -msgstr "" - -#: Code/Lib/Apps.php:440 Code/Module/Pubstream.php:97 -#: Code/Widget/Notifications.php:147 -msgid "Public Stream" -msgstr "" - -#: Code/Lib/Apps.php:441 -msgid "Random Channel" -msgstr "" - -#: Code/Lib/Apps.php:442 -msgid "Remote Diagnostics" -msgstr "" - -#: Code/Lib/Apps.php:443 -msgid "Report Bug" -msgstr "" - -#: Code/Lib/Apps.php:444 -msgid "Roles" -msgstr "" - -#: Code/Lib/Apps.php:446 -msgid "Secrets" -msgstr "" - -#: Code/Lib/Apps.php:447 Code/Module/Admin/Addons.php:344 -#: Code/Module/Admin/Themes.php:128 Code/Widget/Newmember.php:57 -#: Code/Widget/Settings_menu.php:124 -msgid "Settings" -msgstr "" - -#: Code/Lib/Apps.php:448 -msgid "Site Admin" -msgstr "" - -#: Code/Lib/Apps.php:449 -msgid "Sites" -msgstr "" - -#: Code/Lib/Apps.php:450 -msgid "Stream" -msgstr "" - -#: Code/Lib/Apps.php:451 Code/Widget/Stream_order.php:154 -msgid "Stream Order" -msgstr "" - -#: Code/Lib/Apps.php:452 -msgid "Suggest" -msgstr "" - -#: Code/Lib/Apps.php:454 -msgid "Tagadelic" -msgstr "" - -#: Code/Lib/Apps.php:455 Code/Widget/Tasklist.php:30 -msgid "Tasks" -msgstr "" - -#: Code/Lib/Apps.php:456 -msgid "View Bookmarks" -msgstr "" - -#: Code/Lib/Apps.php:458 Code/Module/Webpages.php:266 -msgid "Webpages" -msgstr "" - -#: Code/Lib/Apps.php:459 -msgid "Wiki" -msgstr "" - -#: Code/Lib/Apps.php:460 extend/addon/a/zotpost/Mod_zotpost.php:56 -msgid "ZotPost" -msgstr "" - -#: Code/Lib/Apps.php:637 -msgid "Installed" -msgstr "" - -#: Code/Lib/Apps.php:637 Code/Module/Admin/Addons.php:425 -msgid "Install" -msgstr "" - -#: Code/Lib/Apps.php:661 -msgid "Purchase" -msgstr "" - -#: Code/Lib/Apps.php:664 Code/Lib/Libprofile.php:203 Code/Lib/Menu.php:142 -#: Code/Lib/ThreadItem.php:148 Code/Module/Admin/Profs.php:192 -#: Code/Module/Settings/Identities.php:90 Code/Module/Settings/Oauth.php:166 -#: Code/Module/Settings/Oauth2.php:213 Code/Module/Layouts.php:209 -#: Code/Module/Lists.php:360 Code/Module/Blocks.php:173 -#: Code/Module/Card_edit.php:110 Code/Module/Menu.php:182 -#: Code/Module/Connections.php:338 Code/Module/Connections.php:381 -#: Code/Module/Connections.php:402 Code/Module/Editblock.php:129 -#: Code/Module/Editlayout.php:127 Code/Module/Editwebpage.php:160 -#: Code/Module/Thing.php:304 Code/Module/Webpages.php:269 -#: Code/Storage/Browser.php:318 Code/Widget/Cdav.php:149 -#: Code/Widget/Cdav.php:184 -msgid "Edit" -msgstr "" - -#: Code/Lib/Apps.php:665 Code/Lib/ThreadItem.php:185 -#: Code/Module/Admin/Accounts.php:192 Code/Module/Admin/Channels.php:147 -#: Code/Module/Admin/Profs.php:193 Code/Module/Settings/Oauth.php:167 -#: Code/Module/Settings/Oauth2.php:214 -#: Code/Module/Settings/Profile_edit.php:668 Code/Module/Blocks.php:175 -#: Code/Module/Card_edit.php:140 Code/Module/Cdav.php:1078 -#: Code/Module/Cdav.php:1387 Code/Module/Connections.php:346 -#: Code/Module/Connedit.php:641 Code/Module/Connedit.php:877 -#: Code/Module/Editblock.php:154 Code/Module/Editlayout.php:151 -#: Code/Module/Editwebpage.php:185 Code/Module/Photos.php:1259 -#: Code/Module/Thing.php:305 Code/Module/Webpages.php:271 -#: Code/Storage/Browser.php:319 include/conversation.php:505 -#: include/conversation.php:556 -msgid "Delete" -msgstr "" - -#: Code/Lib/Apps.php:666 -msgid "Undelete" -msgstr "" - -#: Code/Lib/Apps.php:676 -msgid "Add to app-tray" -msgstr "" - -#: Code/Lib/Apps.php:677 -msgid "Remove from app-tray" -msgstr "" - -#: Code/Lib/Apps.php:678 -msgid "Pin to navbar" -msgstr "" - -#: Code/Lib/Apps.php:679 -msgid "Unpin from navbar" -msgstr "" - -#: Code/Lib/Apps.php:1259 Code/Lib/Apps.php:1350 Code/Lib/Activity.php:2303 -#: Code/Module/Cdav.php:876 Code/Module/Cdav.php:877 Code/Module/Cdav.php:883 -#: Code/Module/Embedphotos.php:339 Code/Module/Photos.php:854 -#: Code/Module/Photos.php:1322 Code/Storage/Browser.php:182 -#: Code/Widget/Album.php:100 Code/Widget/Portfolio.php:110 -#: include/attach.php:1384 include/conversation.php:955 -msgid "Unknown" +#: Code/Lib/Libsync.php:987 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" #: Code/Lib/Libacl.php:36 Code/Lib/PermissionDescription.php:35 @@ -2072,7 +2022,7 @@ msgstr "" #: Code/Lib/Libacl.php:147 Code/Lib/ThreadItem.php:513 #: Code/Module/Settings/Channel.php:484 Code/Module/Photos.php:1340 -#: include/conversation.php:1367 +#: include/conversation.php:1366 msgid "Close" msgstr "" @@ -2116,24 +2066,24 @@ msgid "Edit visibility" msgstr "" #: Code/Lib/Libprofile.php:296 include/connections.php:182 -#: include/conversation.php:869 +#: include/conversation.php:868 msgid "Direct Message" msgstr "" -#: Code/Lib/Libprofile.php:309 Code/Module/Directory.php:445 +#: Code/Lib/Libprofile.php:309 Code/Module/Directory.php:448 #: Code/Module/Fedi_id.php:55 Code/Widget/Suggestions.php:49 #: Code/Widget/Follow.php:41 include/connections.php:154 -#: include/conversation.php:849 +#: include/conversation.php:848 msgid "Connect" msgstr "" -#: Code/Lib/Libprofile.php:311 Code/Module/Directory.php:445 +#: Code/Lib/Libprofile.php:311 Code/Module/Directory.php:448 #: Code/Widget/Suggestions.php:49 msgid "Join" msgstr "" #: Code/Lib/Libprofile.php:331 Code/Module/Communities.php:133 -#: Code/Module/Directory.php:432 include/event.php:84 include/event.php:141 +#: Code/Module/Directory.php:434 include/event.php:84 include/event.php:141 msgid "Location:" msgstr "" @@ -2239,7 +2189,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: Code/Lib/Libprofile.php:628 Code/Module/Directory.php:427 +#: Code/Lib/Libprofile.php:628 Code/Module/Directory.php:429 msgid "Age:" msgstr "" @@ -2256,7 +2206,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: Code/Lib/Libprofile.php:669 Code/Module/Directory.php:442 +#: Code/Lib/Libprofile.php:669 Code/Module/Directory.php:445 msgid "Hometown:" msgstr "" @@ -2268,7 +2218,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: Code/Lib/Libprofile.php:681 Code/Module/Directory.php:444 +#: Code/Lib/Libprofile.php:681 Code/Module/Directory.php:447 msgid "About:" msgstr "" @@ -2329,6 +2279,11 @@ msgstr "" msgid "Export" msgstr "" +#: Code/Lib/Share.php:126 Code/Module/Share.php:118 include/items.php:3170 +#, php-format +msgid "📢 Repeated %1$s's %2$s" +msgstr "" + #: Code/Lib/Activity.php:473 msgid "Quoted post" msgstr "" @@ -2388,11 +2343,6 @@ msgstr "" msgid "%1$s (%2$s)" msgstr "" -#: Code/Lib/Libsync.php:987 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - #: Code/Lib/Libzotdir.php:88 msgid "Directory Options" msgstr "" @@ -2411,12 +2361,12 @@ msgstr "" #: Code/Module/Connedit.php:817 Code/Module/Content_filter.php:56 #: Code/Module/Defperms.php:189 Code/Module/Import.php:726 #: Code/Module/Events.php:518 Code/Module/Events.php:519 -#: Code/Module/Events.php:544 Code/Storage/Browser.php:435 boot.php:1122 +#: Code/Module/Events.php:544 Code/Storage/Browser.php:435 boot.php:1131 #: extend/addon/a/content_import/Mod_content_import.php:149 #: extend/addon/a/content_import/Mod_content_import.php:150 #: extend/addon/a/content_import/Mod_content_import.php:151 -#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1298 -#: include/conversation.php:1303 view/theme/redbasic/php/config.php:105 +#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1297 +#: include/conversation.php:1302 view/theme/redbasic/php/config.php:105 msgid "No" msgstr "" @@ -2434,12 +2384,12 @@ msgstr "" #: Code/Module/Connedit.php:817 Code/Module/Content_filter.php:56 #: Code/Module/Defperms.php:189 Code/Module/Import.php:726 #: Code/Module/Events.php:518 Code/Module/Events.php:519 -#: Code/Module/Events.php:544 Code/Storage/Browser.php:435 boot.php:1122 +#: Code/Module/Events.php:544 Code/Storage/Browser.php:435 boot.php:1131 #: extend/addon/a/content_import/Mod_content_import.php:149 #: extend/addon/a/content_import/Mod_content_import.php:150 #: extend/addon/a/content_import/Mod_content_import.php:151 -#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1298 -#: include/conversation.php:1303 view/theme/redbasic/php/config.php:105 +#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1297 +#: include/conversation.php:1302 view/theme/redbasic/php/config.php:105 msgid "Yes" msgstr "" @@ -2532,7 +2482,7 @@ msgid "View all" msgstr "" #: Code/Lib/ThreadItem.php:240 Code/Module/Photos.php:1227 -#: include/taxonomy.php:754 include/conversation.php:1880 +#: include/taxonomy.php:754 include/conversation.php:1879 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -2540,13 +2490,13 @@ msgstr[0] "" msgstr[1] "" #: Code/Lib/ThreadItem.php:242 Code/Lib/ThreadItem.php:507 -#: Code/Module/Photos.php:1334 include/conversation.php:1882 +#: Code/Module/Photos.php:1334 include/conversation.php:1881 msgctxt "noun" msgid "Likes" msgstr "" #: Code/Lib/ThreadItem.php:248 Code/Module/Photos.php:1231 -#: include/conversation.php:1886 +#: include/conversation.php:1885 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -2554,7 +2504,7 @@ msgstr[0] "" msgstr[1] "" #: Code/Lib/ThreadItem.php:250 Code/Lib/ThreadItem.php:508 -#: Code/Module/Photos.php:1335 include/conversation.php:1888 +#: Code/Module/Photos.php:1335 include/conversation.php:1887 msgctxt "noun" msgid "Dislikes" msgstr "" @@ -2703,7 +2653,7 @@ msgstr "" msgid "Please wait" msgstr "" -#: Code/Lib/ThreadItem.php:911 include/conversation.php:1254 +#: Code/Lib/ThreadItem.php:911 include/conversation.php:1253 msgid "Save draft" msgstr "" @@ -2712,23 +2662,23 @@ msgstr "" msgid "This is you" msgstr "" -#: Code/Lib/ThreadItem.php:930 include/conversation.php:1273 +#: Code/Lib/ThreadItem.php:930 include/conversation.php:1272 msgid "Bold" msgstr "" -#: Code/Lib/ThreadItem.php:931 include/conversation.php:1274 +#: Code/Lib/ThreadItem.php:931 include/conversation.php:1273 msgid "Italic" msgstr "" -#: Code/Lib/ThreadItem.php:932 include/conversation.php:1275 +#: Code/Lib/ThreadItem.php:932 include/conversation.php:1274 msgid "Underline" msgstr "" -#: Code/Lib/ThreadItem.php:933 include/conversation.php:1276 +#: Code/Lib/ThreadItem.php:933 include/conversation.php:1275 msgid "Quote" msgstr "" -#: Code/Lib/ThreadItem.php:934 include/conversation.php:1277 +#: Code/Lib/ThreadItem.php:934 include/conversation.php:1276 msgid "Code" msgstr "" @@ -2750,7 +2700,7 @@ msgstr "" #: Code/Lib/ThreadItem.php:939 Code/Module/Events.php:526 #: Code/Module/Photos.php:1191 Code/Module/Webpages.php:276 -#: include/conversation.php:1160 +#: include/conversation.php:1159 msgid "Preview" msgstr "" @@ -2760,7 +2710,7 @@ msgid "Reset" msgstr "" #: Code/Lib/ThreadItem.php:945 Code/Module/Chat.php:222 -#: include/conversation.php:1359 +#: include/conversation.php:1358 msgid "Encrypt text" msgstr "" @@ -2804,6 +2754,10 @@ msgstr "" msgid "custom" msgstr "" +#: Code/Lib/PermissionDescription.php:114 Code/Lib/AccessList.php:386 +msgid "Public" +msgstr "" + #: Code/Lib/PermissionDescription.php:116 msgid "Anybody in the $Projectname network" msgstr "" @@ -2845,9 +2799,59 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: Code/Lib/Share.php:126 Code/Module/Share.php:118 include/items.php:3170 -#, php-format -msgid "📢 Repeated %1$s's %2$s" +#: Code/Lib/AccessList.php:32 +msgid "" +"A deleted list with this name was revived. Existing item permissions " +"may apply to this list and any future members. If this is " +"not what you intended, please create another list with a different name." +msgstr "" + +#: Code/Lib/AccessList.php:370 +msgid "Add new connections to this access list" +msgstr "" + +#: Code/Lib/AccessList.php:398 +msgid "Audience Selection" +msgstr "" + +#: Code/Lib/AccessList.php:399 +msgid "" +"Use this form to select your default posting audience and default " +"permissions for media and file uploads." +msgstr "" + +#: Code/Lib/AccessList.php:400 +msgid "" +"Note: If you change your channel type, this form will be reset to the " +"default audience for that type" +msgstr "" + +#: Code/Lib/AccessList.php:401 +msgid "Default audience for posts and media access" +msgstr "" + +#: Code/Lib/AccessList.php:425 +msgid "edit" +msgstr "" + +#: Code/Lib/AccessList.php:444 Code/Widget/Activity_filter.php:148 +msgid "Lists" +msgstr "" + +#: Code/Lib/AccessList.php:445 +msgid "Edit list" +msgstr "" + +#: Code/Lib/AccessList.php:446 +msgid "Create new list" +msgstr "" + +#: Code/Lib/AccessList.php:447 +msgid "Channels not in any access list" +msgstr "" + +#: Code/Lib/AccessList.php:449 Code/Widget/Savedsearch.php:95 +msgid "add" msgstr "" #: Code/Module/Admin/Account_edit.php:34 @@ -3103,9 +3107,9 @@ msgstr "" #: Code/Module/Editpost.php:183 Code/Module/Editwebpage.php:187 #: Code/Module/Fbrowser.php:75 Code/Module/Fbrowser.php:98 #: Code/Module/Profile_photo.php:518 Code/Module/Tagrm.php:21 -#: Code/Module/Tagrm.php:152 include/conversation.php:1290 -#: include/conversation.php:1362 include/conversation.php:1364 -#: include/conversation.php:1366 +#: Code/Module/Tagrm.php:152 include/conversation.php:1289 +#: include/conversation.php:1361 include/conversation.php:1363 +#: include/conversation.php:1365 msgid "Cancel" msgstr "" @@ -3174,12 +3178,12 @@ msgid "Channel '%s' uncensored" msgstr "" #: Code/Module/Admin/Channels.php:148 Code/Module/Connedit.php:617 -#: Code/Module/Directory.php:437 +#: Code/Module/Directory.php:440 msgid "Censor" msgstr "" #: Code/Module/Admin/Channels.php:149 Code/Module/Connedit.php:617 -#: Code/Module/Directory.php:437 +#: Code/Module/Directory.php:440 msgid "Uncensor" msgstr "" @@ -5862,7 +5866,7 @@ msgstr "" msgid "Your software should be updated" msgstr "" -#: Code/Module/Admin.php:180 include/conversation.php:1373 +#: Code/Module/Admin.php:180 include/conversation.php:1372 msgid "Summary" msgstr "" @@ -5894,54 +5898,54 @@ msgstr "" msgid "Repository version (dev)" msgstr "" -#: Code/Module/Item.php:581 Code/Module/Pin.php:49 +#: Code/Module/Item.php:584 Code/Module/Pin.php:49 msgid "Unable to locate original post." msgstr "" -#: Code/Module/Item.php:675 +#: Code/Module/Item.php:678 msgid "Comment may be moderated." msgstr "" -#: Code/Module/Item.php:909 +#: Code/Module/Item.php:912 msgid "Empty post discarded." msgstr "" -#: Code/Module/Item.php:1593 +#: Code/Module/Item.php:1596 msgid "Duplicate post suppressed." msgstr "" -#: Code/Module/Item.php:1640 +#: Code/Module/Item.php:1643 msgid "" "Draft saved. Use Drafts app to continue " "editing." msgstr "" -#: Code/Module/Item.php:1700 +#: Code/Module/Item.php:1703 msgid "Your comment has been posted." msgstr "" -#: Code/Module/Item.php:1769 +#: Code/Module/Item.php:1772 msgid "System error. Post not saved." msgstr "" -#: Code/Module/Item.php:1811 +#: Code/Module/Item.php:1814 msgid "Your post/comment is awaiting approval." msgstr "" -#: Code/Module/Item.php:1844 Code/Module/Cloud.php:132 +#: Code/Module/Item.php:1847 Code/Module/Cloud.php:132 msgid "Not found" msgstr "" -#: Code/Module/Item.php:1988 +#: Code/Module/Item.php:1991 msgid "Unable to obtain post information from database." msgstr "" -#: Code/Module/Item.php:1995 +#: Code/Module/Item.php:1998 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: Code/Module/Item.php:2000 +#: Code/Module/Item.php:2003 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6031,7 +6035,7 @@ msgstr "" #: Code/Module/Layouts.php:210 Code/Module/Blocks.php:174 #: Code/Module/Photos.php:1170 Code/Module/Webpages.php:270 -#: Code/Widget/Cdav.php:147 include/conversation.php:1256 +#: Code/Widget/Cdav.php:147 include/conversation.php:1255 msgid "Share" msgstr "" @@ -6133,7 +6137,7 @@ msgid "Permission denied" msgstr "" #: Code/Module/Like.php:176 Code/Module/Subthread.php:126 -#: Code/Module/Tagger.php:85 include/conversation.php:60 include/misc.php:2351 +#: Code/Module/Tagger.php:85 include/misc.php:2351 include/conversation.php:60 msgid "photo" msgstr "" @@ -6143,7 +6147,7 @@ msgstr "" #: Code/Module/Like.php:178 Code/Module/Calendar.php:250 #: Code/Module/Events.php:297 Code/Module/Tagger.php:89 include/event.php:1337 -#: include/conversation.php:63 include/misc.php:2354 +#: include/misc.php:2354 include/conversation.php:63 msgid "event" msgstr "" @@ -6294,7 +6298,7 @@ msgid "Invalid item." msgstr "" #: Code/Module/Block.php:49 Code/Module/Cal.php:63 Code/Module/Card_edit.php:56 -#: Code/Module/Chanview.php:105 Code/Module/Page.php:85 +#: Code/Module/Chanview.php:106 Code/Module/Page.php:85 #: Code/Module/Superblock.php:44 Code/Module/Wall_upload.php:37 #: include/items.php:4139 msgid "Channel not found." @@ -6432,7 +6436,7 @@ msgid "" "Password reset failed." msgstr "" -#: Code/Module/Lostpass.php:104 boot.php:1126 +#: Code/Module/Lostpass.php:104 boot.php:1135 msgid "Password Reset" msgstr "" @@ -6521,13 +6525,13 @@ msgstr "" #: Code/Module/Card_edit.php:112 Code/Module/Chat.php:223 #: Code/Module/Editblock.php:131 Code/Module/Editwebpage.php:161 -#: include/conversation.php:1089 +#: include/conversation.php:1088 msgid "Insert web link" msgstr "" #: Code/Module/Card_edit.php:128 Code/Module/Editblock.php:144 #: Code/Module/Photos.php:731 Code/Module/Photos.php:1118 -#: include/conversation.php:1316 +#: include/conversation.php:1315 msgid "Title (optional)" msgstr "" @@ -6548,13 +6552,13 @@ msgid "This app allows you to add categories to posts and events." msgstr "" #: Code/Module/Manage.php:83 Code/Module/Manage.php:190 -#: Code/Module/Manage.php:203 Code/Module/Directory.php:447 +#: Code/Module/Manage.php:203 Code/Module/Directory.php:450 #: Code/Storage/Browser.php:148 include/misc.php:3272 msgid "Collection" msgstr "" #: Code/Module/Manage.php:84 Code/Module/Manage.php:191 -#: Code/Module/Directory.php:446 +#: Code/Module/Directory.php:449 msgid "Group" msgstr "" @@ -6870,31 +6874,31 @@ msgid "" "possibly other common richtext constructs." msgstr "" -#: Code/Module/Chanview.php:147 Code/Module/Chanview.php:148 +#: Code/Module/Chanview.php:148 Code/Module/Chanview.php:149 msgid "Not available" msgstr "" -#: Code/Module/Chanview.php:167 +#: Code/Module/Chanview.php:168 msgid "Cover photo for this channel" msgstr "" -#: Code/Module/Chanview.php:169 +#: Code/Module/Chanview.php:170 msgid "Followers" msgstr "" -#: Code/Module/Chanview.php:170 +#: Code/Module/Chanview.php:171 msgid "Following" msgstr "" -#: Code/Module/Chanview.php:173 include/conversation.php:819 +#: Code/Module/Chanview.php:174 include/conversation.php:818 msgid "Visit" msgstr "" -#: Code/Module/Chanview.php:175 +#: Code/Module/Chanview.php:176 msgid "View Recent" msgstr "" -#: Code/Module/Chanview.php:177 +#: Code/Module/Chanview.php:178 msgid "toggle full screen mode" msgstr "" @@ -7015,7 +7019,7 @@ msgstr "" msgid "I am online" msgstr "" -#: Code/Module/Chat.php:221 include/conversation.php:1142 +#: Code/Module/Chat.php:221 include/conversation.php:1141 msgid "Please enter a link URL:" msgstr "" @@ -7437,7 +7441,7 @@ msgstr "" msgid "Restricted or Premium Channel" msgstr "" -#: Code/Module/Follow.php:134 +#: Code/Module/Follow.php:151 msgid "Connection added." msgstr "" @@ -7601,8 +7605,8 @@ msgstr "" msgid "Connections search" msgstr "" -#: Code/Module/Connections.php:401 Code/Module/Directory.php:527 -#: Code/Module/Directory.php:532 Code/Widget/Findpeople.php:36 +#: Code/Module/Connections.php:401 Code/Module/Directory.php:530 +#: Code/Module/Directory.php:535 Code/Widget/Findpeople.php:36 msgid "Find" msgstr "" @@ -7675,7 +7679,7 @@ msgstr "" msgid "Fetch updated photo" msgstr "" -#: Code/Module/Connedit.php:586 include/conversation.php:839 +#: Code/Module/Connedit.php:586 include/conversation.php:838 msgid "Recent Activity" msgstr "" @@ -8034,8 +8038,8 @@ msgid "Use a photo from your albums" msgstr "" #: Code/Module/Cover_photo.php:425 Code/Module/Profile_photo.php:519 -#: include/conversation.php:1291 include/conversation.php:1361 -#: include/conversation.php:1363 include/conversation.php:1365 +#: include/conversation.php:1290 include/conversation.php:1360 +#: include/conversation.php:1362 include/conversation.php:1364 msgid "OK" msgstr "" @@ -8133,67 +8137,67 @@ msgstr "" msgid "Homepage: " msgstr "" -#: Code/Module/Directory.php:421 +#: Code/Module/Directory.php:423 msgid "Cover photo for this directory entry" msgstr "" -#: Code/Module/Directory.php:435 +#: Code/Module/Directory.php:437 msgid "Description:" msgstr "" -#: Code/Module/Directory.php:450 +#: Code/Module/Directory.php:453 msgid "Keywords: " msgstr "" -#: Code/Module/Directory.php:453 +#: Code/Module/Directory.php:456 msgid "Don't suggest" msgstr "" -#: Code/Module/Directory.php:455 +#: Code/Module/Directory.php:458 msgid "Suggestion ranking:" msgstr "" -#: Code/Module/Directory.php:518 +#: Code/Module/Directory.php:521 msgid "Local Directory" msgstr "" -#: Code/Module/Directory.php:528 +#: Code/Module/Directory.php:531 msgid "Finding:" msgstr "" -#: Code/Module/Directory.php:531 Code/Widget/Findpeople.php:37 +#: Code/Module/Directory.php:534 Code/Widget/Findpeople.php:37 msgid "Channel Suggestions" msgstr "" -#: Code/Module/Directory.php:533 +#: Code/Module/Directory.php:536 msgid "next page" msgstr "" -#: Code/Module/Directory.php:533 +#: Code/Module/Directory.php:536 msgid "previous page" msgstr "" -#: Code/Module/Directory.php:534 +#: Code/Module/Directory.php:537 msgid "Sort options" msgstr "" -#: Code/Module/Directory.php:535 +#: Code/Module/Directory.php:538 msgid "Alphabetic" msgstr "" -#: Code/Module/Directory.php:536 +#: Code/Module/Directory.php:539 msgid "Reverse Alphabetic" msgstr "" -#: Code/Module/Directory.php:537 +#: Code/Module/Directory.php:540 msgid "Newest to Oldest" msgstr "" -#: Code/Module/Directory.php:538 +#: Code/Module/Directory.php:541 msgid "Oldest to Newest" msgstr "" -#: Code/Module/Directory.php:563 +#: Code/Module/Directory.php:566 msgid "No entries (some entries may be hidden)." msgstr "" @@ -8547,7 +8551,7 @@ msgstr "" msgid "Edit Location" msgstr "" -#: Code/Module/Events.php:527 include/conversation.php:1320 +#: Code/Module/Events.php:527 include/conversation.php:1319 msgid "Permission settings" msgstr "" @@ -9360,7 +9364,7 @@ msgstr "" msgid "Post not found." msgstr "" -#: Code/Module/Tagger.php:95 include/conversation.php:92 include/misc.php:2359 +#: Code/Module/Tagger.php:95 include/misc.php:2359 include/conversation.php:92 msgid "comment" msgstr "" @@ -10078,18 +10082,6 @@ msgid "" "new account to enter the site admin panel." msgstr "" -#: Code/Module/Vote.php:66 -msgid "Poll not found." -msgstr "" - -#: Code/Module/Vote.php:97 -msgid "Invalid response." -msgstr "" - -#: Code/Module/Vote.php:156 -msgid "Response submitted. Updates may not appear instantly." -msgstr "" - #: Code/Module/Search.php:383 #, php-format msgid "Items tagged with: %s" @@ -10133,6 +10125,18 @@ msgstr "" msgid "Post repeated" msgstr "" +#: Code/Module/Vote.php:66 +msgid "Poll not found." +msgstr "" + +#: Code/Module/Vote.php:97 +msgid "Invalid response." +msgstr "" + +#: Code/Module/Vote.php:156 +msgid "Response submitted. Updates may not appear instantly." +msgstr "" + #: Code/Storage/Browser.php:120 Code/Storage/Browser.php:317 msgid "parent" msgstr "" @@ -10787,45 +10791,45 @@ msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: boot.php:1096 +#: boot.php:1105 msgid "Create an account to access services and applications" msgstr "" -#: boot.php:1120 +#: boot.php:1129 msgid "Login/Email" msgstr "" -#: boot.php:1121 +#: boot.php:1130 msgid "Password" msgstr "" -#: boot.php:1122 +#: boot.php:1131 msgid "Remember me" msgstr "" -#: boot.php:1125 +#: boot.php:1134 msgid "Forgot your password?" msgstr "" -#: boot.php:1851 +#: boot.php:1860 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: boot.php:1856 +#: boot.php:1865 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: boot.php:1900 +#: boot.php:1909 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: boot.php:1905 +#: boot.php:1914 msgid "Cron/Scheduled tasks not running." msgstr "" -#: boot.php:1906 include/datetime.php:278 +#: boot.php:1915 include/datetime.php:278 msgid "never" msgstr "" @@ -11406,359 +11410,6 @@ msgstr "" msgid "dislikes" msgstr "" -#: include/conversation.php:111 -#, php-format -msgid "%1$s repeated %2$s's %3$s" -msgstr "" - -#: include/conversation.php:117 -#, php-format -msgid "likes %1$s's %2$s" -msgstr "" - -#: include/conversation.php:119 -#, php-format -msgid "doesn't like %1$s's %2$s" -msgstr "" - -#: include/conversation.php:121 -#, php-format -msgid "repeated %1$s's %2$s" -msgstr "" - -#: include/conversation.php:161 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: include/conversation.php:198 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: include/conversation.php:202 include/misc.php:1167 include/misc.php:1171 -msgid "poked" -msgstr "" - -#: include/conversation.php:509 -msgid "Toggle Star Status" -msgstr "" - -#: include/conversation.php:559 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: include/conversation.php:582 -msgid "Categories:" -msgstr "" - -#: include/conversation.php:583 -msgid "Filed under:" -msgstr "" - -#: include/conversation.php:612 -msgid "View Conversation" -msgstr "" - -#: include/conversation.php:693 -msgid "remove" -msgstr "" - -#: include/conversation.php:697 -msgid "Loading..." -msgstr "" - -#: include/conversation.php:698 -msgid "Delete Selected Items" -msgstr "" - -#: include/conversation.php:712 -msgid "View source" -msgstr "" - -#: include/conversation.php:722 -msgid "Follow thread" -msgstr "" - -#: include/conversation.php:731 -msgid "Unfollow thread" -msgstr "" - -#: include/conversation.php:806 -msgid "Remote Search" -msgstr "" - -#: include/conversation.php:829 -msgid "Nearby" -msgstr "" - -#: include/conversation.php:859 -msgid "Edit Connection" -msgstr "" - -#: include/conversation.php:889 -msgid "Block author's site" -msgstr "" - -#: include/conversation.php:896 -msgid "Block author" -msgstr "" - -#: include/conversation.php:1064 -msgid "Set your location" -msgstr "" - -#: include/conversation.php:1065 -msgid "Clear your location" -msgstr "" - -#: include/conversation.php:1094 -msgid "Attach file from your personal cloud" -msgstr "" - -#: include/conversation.php:1095 -msgid "Attach/Embed file" -msgstr "" - -#: include/conversation.php:1096 -msgid "Insert File" -msgstr "" - -#: include/conversation.php:1097 -msgid "from device" -msgstr "" - -#: include/conversation.php:1098 -msgid "from personal cloud" -msgstr "" - -#: include/conversation.php:1143 -msgid "Tag term:" -msgstr "" - -#: include/conversation.php:1144 -msgid "Where are you right now?" -msgstr "" - -#: include/conversation.php:1144 -msgid "(Enter a dot . to use your current device coordinates.)" -msgstr "" - -#: include/conversation.php:1147 -msgid "Choose files to embed" -msgstr "" - -#: include/conversation.php:1148 -msgid "Choose a folder" -msgstr "" - -#: include/conversation.php:1149 -msgid "Choose a different folder..." -msgstr "" - -#: include/conversation.php:1150 -msgid "Error getting folder list" -msgstr "" - -#: include/conversation.php:1151 -msgid "Error getting file link" -msgstr "" - -#: include/conversation.php:1152 -msgid "Error getting folder" -msgstr "" - -#: include/conversation.php:1210 -msgid "Restricted - from connections only" -msgstr "" - -#: include/conversation.php:1211 -msgid "Semi-public - from anybody that can be identified" -msgstr "" - -#: include/conversation.php:1212 -msgid "Public - from anybody on the internet" -msgstr "" - -#: include/conversation.php:1228 -msgid "Accept delivery of comments on this post from" -msgstr "" - -#: include/conversation.php:1267 -msgid "Page link name" -msgstr "" - -#: include/conversation.php:1270 -msgid "Post as" -msgstr "" - -#: include/conversation.php:1272 -msgid "Text styles" -msgstr "" - -#: include/conversation.php:1278 -msgid "Attach file from your device" -msgstr "" - -#: include/conversation.php:1280 -msgid "Please enter a link location (URL)" -msgstr "" - -#: include/conversation.php:1282 -msgid "Insert link only" -msgstr "" - -#: include/conversation.php:1282 -msgid "Embed content if possible" -msgstr "" - -#: include/conversation.php:1287 -msgid "Embed a file from the cloud" -msgstr "" - -#: include/conversation.php:1289 -msgid "Embed an image from your albums" -msgstr "" - -#: include/conversation.php:1293 -msgid "Location options" -msgstr "" - -#: include/conversation.php:1294 -msgid "Toggle poll" -msgstr "" - -#: include/conversation.php:1295 -msgid "Option" -msgstr "" - -#: include/conversation.php:1296 -msgid "Add option" -msgstr "" - -#: include/conversation.php:1297 -msgid "Minutes" -msgstr "" - -#: include/conversation.php:1297 -msgid "Hours" -msgstr "" - -#: include/conversation.php:1297 -msgid "Days" -msgstr "" - -#: include/conversation.php:1298 -msgid "Allow multiple answers" -msgstr "" - -#: include/conversation.php:1301 -msgid "Disable comments" -msgstr "" - -#: include/conversation.php:1302 -msgid "Toggle comments" -msgstr "" - -#: include/conversation.php:1303 -msgid "Allow comments on this post" -msgstr "" - -#: include/conversation.php:1308 -msgid "Optional: disable comments after (date)" -msgstr "" - -#: include/conversation.php:1319 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: include/conversation.php:1343 -msgid "Other networks and post services" -msgstr "" - -#: include/conversation.php:1344 -msgid "Collections" -msgstr "" - -#: include/conversation.php:1349 -msgid "Check In" -msgstr "" - -#: include/conversation.php:1350 -msgid "Check Out" -msgstr "" - -#: include/conversation.php:1351 -msgid "Set expiration date" -msgstr "" - -#: include/conversation.php:1356 -msgid "Set publish date" -msgstr "" - -#: include/conversation.php:1374 -msgid "Load remote media players" -msgstr "" - -#: include/conversation.php:1375 -msgid "This may subject viewers of this post to behaviour tracking" -msgstr "" - -#: include/conversation.php:1377 -msgid "Find shareable objects" -msgstr "" - -#: include/conversation.php:1406 -msgid "Post to Collections" -msgstr "" - -#: include/conversation.php:1783 -msgid " distance: " -msgstr "" - -#: include/conversation.php:1891 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1893 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1895 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1897 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1899 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1901 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - #: include/import.php:37 msgid "Unable to import a removed channel." msgstr "" @@ -11810,6 +11461,10 @@ msgstr "" msgid "poke" msgstr "" +#: include/misc.php:1167 include/misc.php:1171 include/conversation.php:202 +msgid "poked" +msgstr "" + #: include/misc.php:1172 msgid "ping" msgstr "" @@ -12107,6 +11762,66 @@ msgstr "" msgid "Specify folder" msgstr "" +#: include/items.php:869 +msgid "(Unknown)" +msgstr "" + +#: include/items.php:1040 +msgid "Visible to anybody on the internet." +msgstr "" + +#: include/items.php:1042 +msgid "Visible to you only." +msgstr "" + +#: include/items.php:1044 +msgid "Visible to anybody in this network." +msgstr "" + +#: include/items.php:1046 +msgid "Visible to anybody authenticated." +msgstr "" + +#: include/items.php:1048 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: include/items.php:1050 +msgid "Visible to all connections." +msgstr "" + +#: include/items.php:1052 +msgid "Visible to approved connections." +msgstr "" + +#: include/items.php:1054 +msgid "Visible to specific connections." +msgstr "" + +#: include/items.php:4119 +msgid "Privacy group is empty." +msgstr "" + +#: include/items.php:4496 +msgid "profile photo" +msgstr "" + +#: include/items.php:4712 +#, php-format +msgid "[Edited %s]" +msgstr "" + +#: include/items.php:4712 +msgctxt "edit_activity" +msgid "Post" +msgstr "" + +#: include/items.php:4712 +msgctxt "edit_activity" +msgid "Comment" +msgstr "" + #: include/datetime.php:166 msgid "Birthday" msgstr "" @@ -12287,71 +12002,360 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: include/items.php:869 -msgid "(Unknown)" -msgstr "" - -#: include/items.php:1040 -msgid "Visible to anybody on the internet." -msgstr "" - -#: include/items.php:1042 -msgid "Visible to you only." -msgstr "" - -#: include/items.php:1044 -msgid "Visible to anybody in this network." -msgstr "" - -#: include/items.php:1046 -msgid "Visible to anybody authenticated." -msgstr "" - -#: include/items.php:1048 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: include/items.php:1050 -msgid "Visible to all connections." -msgstr "" - -#: include/items.php:1052 -msgid "Visible to approved connections." -msgstr "" - -#: include/items.php:1054 -msgid "Visible to specific connections." -msgstr "" - -#: include/items.php:4119 -msgid "Privacy group is empty." -msgstr "" - -#: include/items.php:4496 -msgid "profile photo" -msgstr "" - -#: include/items.php:4712 -#, php-format -msgid "[Edited %s]" -msgstr "" - -#: include/items.php:4712 -msgctxt "edit_activity" -msgid "Post" -msgstr "" - -#: include/items.php:4712 -msgctxt "edit_activity" -msgid "Comment" -msgstr "" - #: include/zid.php:416 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" +#: include/conversation.php:111 +#, php-format +msgid "%1$s repeated %2$s's %3$s" +msgstr "" + +#: include/conversation.php:117 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "" + +#: include/conversation.php:119 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "" + +#: include/conversation.php:121 +#, php-format +msgid "repeated %1$s's %2$s" +msgstr "" + +#: include/conversation.php:161 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: include/conversation.php:198 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: include/conversation.php:509 +msgid "Toggle Star Status" +msgstr "" + +#: include/conversation.php:559 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: include/conversation.php:582 +msgid "Categories:" +msgstr "" + +#: include/conversation.php:583 +msgid "Filed under:" +msgstr "" + +#: include/conversation.php:612 +msgid "View Conversation" +msgstr "" + +#: include/conversation.php:693 +msgid "remove" +msgstr "" + +#: include/conversation.php:697 +msgid "Loading..." +msgstr "" + +#: include/conversation.php:698 +msgid "Delete Selected Items" +msgstr "" + +#: include/conversation.php:712 +msgid "View source" +msgstr "" + +#: include/conversation.php:722 +msgid "Follow thread" +msgstr "" + +#: include/conversation.php:731 +msgid "Unfollow thread" +msgstr "" + +#: include/conversation.php:805 +msgid "Remote Search" +msgstr "" + +#: include/conversation.php:828 +msgid "Nearby" +msgstr "" + +#: include/conversation.php:858 +msgid "Edit Connection" +msgstr "" + +#: include/conversation.php:888 +msgid "Block author's site" +msgstr "" + +#: include/conversation.php:895 +msgid "Block author" +msgstr "" + +#: include/conversation.php:1063 +msgid "Set your location" +msgstr "" + +#: include/conversation.php:1064 +msgid "Clear your location" +msgstr "" + +#: include/conversation.php:1093 +msgid "Attach file from your personal cloud" +msgstr "" + +#: include/conversation.php:1094 +msgid "Attach/Embed file" +msgstr "" + +#: include/conversation.php:1095 +msgid "Insert File" +msgstr "" + +#: include/conversation.php:1096 +msgid "from device" +msgstr "" + +#: include/conversation.php:1097 +msgid "from personal cloud" +msgstr "" + +#: include/conversation.php:1142 +msgid "Tag term:" +msgstr "" + +#: include/conversation.php:1143 +msgid "Where are you right now?" +msgstr "" + +#: include/conversation.php:1143 +msgid "(Enter a dot . to use your current device coordinates.)" +msgstr "" + +#: include/conversation.php:1146 +msgid "Choose files to embed" +msgstr "" + +#: include/conversation.php:1147 +msgid "Choose a folder" +msgstr "" + +#: include/conversation.php:1148 +msgid "Choose a different folder..." +msgstr "" + +#: include/conversation.php:1149 +msgid "Error getting folder list" +msgstr "" + +#: include/conversation.php:1150 +msgid "Error getting file link" +msgstr "" + +#: include/conversation.php:1151 +msgid "Error getting folder" +msgstr "" + +#: include/conversation.php:1209 +msgid "Restricted - from connections only" +msgstr "" + +#: include/conversation.php:1210 +msgid "Semi-public - from anybody that can be identified" +msgstr "" + +#: include/conversation.php:1211 +msgid "Public - from anybody on the internet" +msgstr "" + +#: include/conversation.php:1227 +msgid "Accept delivery of comments on this post from" +msgstr "" + +#: include/conversation.php:1266 +msgid "Page link name" +msgstr "" + +#: include/conversation.php:1269 +msgid "Post as" +msgstr "" + +#: include/conversation.php:1271 +msgid "Text styles" +msgstr "" + +#: include/conversation.php:1277 +msgid "Attach file from your device" +msgstr "" + +#: include/conversation.php:1279 +msgid "Please enter a link location (URL)" +msgstr "" + +#: include/conversation.php:1281 +msgid "Insert link only" +msgstr "" + +#: include/conversation.php:1281 +msgid "Embed content if possible" +msgstr "" + +#: include/conversation.php:1286 +msgid "Embed a file from the cloud" +msgstr "" + +#: include/conversation.php:1288 +msgid "Embed an image from your albums" +msgstr "" + +#: include/conversation.php:1292 +msgid "Location options" +msgstr "" + +#: include/conversation.php:1293 +msgid "Toggle poll" +msgstr "" + +#: include/conversation.php:1294 +msgid "Option" +msgstr "" + +#: include/conversation.php:1295 +msgid "Add option" +msgstr "" + +#: include/conversation.php:1296 +msgid "Minutes" +msgstr "" + +#: include/conversation.php:1296 +msgid "Hours" +msgstr "" + +#: include/conversation.php:1296 +msgid "Days" +msgstr "" + +#: include/conversation.php:1297 +msgid "Allow multiple answers" +msgstr "" + +#: include/conversation.php:1300 +msgid "Disable comments" +msgstr "" + +#: include/conversation.php:1301 +msgid "Toggle comments" +msgstr "" + +#: include/conversation.php:1302 +msgid "Allow comments on this post" +msgstr "" + +#: include/conversation.php:1307 +msgid "Optional: disable comments after (date)" +msgstr "" + +#: include/conversation.php:1318 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: include/conversation.php:1342 +msgid "Other networks and post services" +msgstr "" + +#: include/conversation.php:1343 +msgid "Collections" +msgstr "" + +#: include/conversation.php:1348 +msgid "Check In" +msgstr "" + +#: include/conversation.php:1349 +msgid "Check Out" +msgstr "" + +#: include/conversation.php:1350 +msgid "Set expiration date" +msgstr "" + +#: include/conversation.php:1355 +msgid "Set publish date" +msgstr "" + +#: include/conversation.php:1373 +msgid "Load remote media players" +msgstr "" + +#: include/conversation.php:1374 +msgid "This may subject viewers of this post to behaviour tracking" +msgstr "" + +#: include/conversation.php:1376 +msgid "Find shareable objects" +msgstr "" + +#: include/conversation.php:1405 +msgid "Post to Collections" +msgstr "" + +#: include/conversation.php:1782 +msgid " distance: " +msgstr "" + +#: include/conversation.php:1890 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1892 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1894 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1896 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1898 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1900 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + #: view/theme/redbasic/php/config.php:23 view/theme/redbasic/php/config.php:25 msgid "Focus (default)" msgstr "" diff --git a/version.php b/version.php index e04eb474d..ea698fc1d 100644 --- a/version.php +++ b/version.php @@ -1,2 +1,2 @@ \n" "Language-Team: French \n" "Language: fr_FR\n" @@ -306,12 +306,12 @@ msgstr "Épinglé" #: Code/Lib/Stringsjs.php:42 Code/Lib/ThreadItem.php:485 #: include/conversation.php:611 msgid "Pin this post" -msgstr "Détacher cette publication" +msgstr "Épingler cette publication" #: Code/Lib/Stringsjs.php:43 Code/Lib/ThreadItem.php:485 #: include/conversation.php:611 msgid "Unpin this post" -msgstr "Épingler cette publication" +msgstr "Détacher cette publication" #: Code/Lib/Stringsjs.php:44 msgid "Please accept terms to continue" @@ -814,7 +814,7 @@ msgstr "Mettre fin à la session" #: Code/Lib/Navbar.php:122 Code/Lib/Apps.php:457 Code/Module/Connedit.php:565 msgid "View Profile" -msgstr "Voir mon profil" +msgstr "Voir le profil" #: Code/Lib/Navbar.php:122 msgid "Your profile page" @@ -1226,7 +1226,7 @@ msgstr "Merci de visiter %s pour voir et/ou répondre à vos messages privés." #: Code/Lib/Enotify.php:169 msgid "repeated" -msgstr "relayé" +msgstr "a relayé" #: Code/Lib/Enotify.php:176 msgid "commented on" @@ -1248,7 +1248,7 @@ msgstr "%1$s %2$s [zrl=%3$s]un %4$s[/zrl]" #: Code/Lib/Enotify.php:250 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "%1$s %2$s [zrl=%3$s]%4$s de %5$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]%5$s de %4$s[/zrl]" #: Code/Lib/Enotify.php:262 #, php-format @@ -5424,7 +5424,7 @@ msgstr "Depuis (date)" #: Code/Module/Settings/Profile_edit.php:634 msgid "Tell us about yourself" -msgstr "Parlez nous de vous" +msgstr "À propos de vous" #: Code/Module/Settings/Profile_edit.php:635 msgid "Homepage URL" @@ -12110,7 +12110,7 @@ msgstr "n'aime pas %2$s de %1$s" #: include/conversation.php:121 #, php-format msgid "repeated %1$s's %2$s" -msgstr "a répété le %2$s de %1$s" +msgstr "a relayé le %2$s de %1$s" #: include/conversation.php:161 #, php-format diff --git a/view/fr/strings.php b/view/fr/strings.php index fea486c92..5347f169a 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -60,8 +60,8 @@ App::$strings["A channel name is required."] = "Un nom de canal est nécessaire. App::$strings["This is a "] = "C'est un "; App::$strings[" channel name"] = " nom de canal"; App::$strings["Pinned"] = "Épinglé"; -App::$strings["Pin this post"] = "Détacher cette publication"; -App::$strings["Unpin this post"] = "Épingler cette publication"; +App::$strings["Pin this post"] = "Épingler cette publication"; +App::$strings["Unpin this post"] = "Détacher cette publication"; App::$strings["Please accept terms to continue"] = "Merci d'accepter les conditions pour continuer"; App::$strings["timeago.prefixAgo"] = "il y a"; App::$strings["timeago.prefixFromNow"] = "dans"; @@ -169,7 +169,7 @@ App::$strings["(is off)"] = "(est inactif)"; App::$strings["Content filtering"] = "Filtrage de contenu"; App::$strings["Logout"] = "Déconnexion"; App::$strings["End this session"] = "Mettre fin à la session"; -App::$strings["View Profile"] = "Voir mon profil"; +App::$strings["View Profile"] = "Voir le profil"; App::$strings["Your profile page"] = "Votre profil"; App::$strings["Login"] = "Connexion"; App::$strings["Sign in"] = "Connexion"; @@ -253,12 +253,12 @@ App::$strings["a private message"] = "un message privé"; App::$strings["%1\$s replied to a private message at %2\$s."] = "%1\$s a répondu à un message privé à %2\$s."; App::$strings["%1\$s replied to %2\$s."] = "%1\$s a répondu à %2\$s."; App::$strings["Please visit %s to view and/or reply to your private messages."] = "Merci de visiter %s pour voir et/ou répondre à vos messages privés."; -App::$strings["repeated"] = "relayé"; +App::$strings["repeated"] = "a relayé"; App::$strings["commented on"] = "a commenté"; App::$strings["liked"] = "a aimé"; App::$strings["disliked"] = "n'a pas aimé"; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]un %4\$s[/zrl]"; -App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s de %5\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%5\$s de %4\$s[/zrl]"; App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]votre %4\$s[/zrl]"; App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notification] Commentaire modéré pour la conversation n°%1\$d par %2\$s"; App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notification] Commentaire sur la conversation #%1\$d de %2\$s"; @@ -1160,7 +1160,7 @@ App::$strings["Country"] = "Pays"; App::$strings["Who (if applicable)"] = "Qui (si applicable)"; App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples : marie123, Marie Deschamps, marie@exemple.com"; App::$strings["Since (date)"] = "Depuis (date)"; -App::$strings["Tell us about yourself"] = "Parlez nous de vous"; +App::$strings["Tell us about yourself"] = "À propos de vous"; App::$strings["Homepage URL"] = "URL de ma page personnelle"; App::$strings["Hometown"] = "Lieu de naissance"; App::$strings["Political views"] = "Opinions politiques"; @@ -2602,7 +2602,7 @@ App::$strings["dislikes"] = "n'aime pas"; App::$strings["%1\$s repeated %2\$s's %3\$s"] = "%1\$s a répété %3\$s de %2\$s"; App::$strings["likes %1\$s's %2\$s"] = "aime le %2\$s de %1\$s"; App::$strings["doesn't like %1\$s's %2\$s"] = "n'aime pas %2\$s de %1\$s"; -App::$strings["repeated %1\$s's %2\$s"] = "a répété le %2\$s de %1\$s"; +App::$strings["repeated %1\$s's %2\$s"] = "a relayé le %2\$s de %1\$s"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s est maintenant en connexion avec %2\$s"; App::$strings["%1\$s poked %2\$s"] = "%1\$s a poké %2\$s"; App::$strings["poked"] = "a fait signe à";