diff --git a/CHANGELOG b/CHANGELOG index ee423ed44..df20691c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,82 @@ -Version 2023.03 (unreleased) +Version 2023.04 (2023-04-23) Friendica Core + Updates to the translations AR, BG, CA, CS, DA, DE, EO, ES, ET, FR, GD, HU, IS, IT, JA, NL, PL, RU, SV + Updates to the themes (frio, vier) [damianwajer, haheute, MrPetovan, xundeenergie] + Updates to the documentation [haheute, HankG, MarekBenjamin, MrPetovan] + General code cleanup [annando, MarekBenjamin, MrPetovan, nupplaphil] + Fixed display of blocked contacts [annando] + Fixed usage of environment variables [nupplaphil] + Fixed paging on the Mastodon compatible API endpoints for timelines and statuses [HankG] + Fixed updating of attached links via the API [HankG] + Fixed federation issues with Diaspora*, gup.pe, Hubzilla and Peertube servers [annando] + Fixed a bug with PubSubHubBub subscription [annando] + Fixed a XSS vulnerability in Justified-Gallery JavaScript dependency (frio theme) [MrPetovan] + Improved the translate ability of activities (singular/plural forms) [nupplaphil] + Improved activity update handling [xundeenergie] + Improved BBCode + Markdown parsing [annando] + Improved known Fediverse statistics [annando] + Improved automatic table optimization [HankG] + Improved the performance of local JsonLD requests [MrPetovan] + Improved the performance of local requests [annando] + Improved the performance of the delivery of postings [annando] + Improved the performance of homepage rel-me checks [annando] + Improved supported characters for passwords [MrPetovan] + Improved the ARIA support [MrPetovan] + Improved PHP 8.2 compatibility [MrPetovan] + Added emoticon reaction handling [annando] + Added drag and drop image upload in frio themes [xundeenergie] + Added scope change for comments to the API [annando] + Added posting visibility to the API [HankG] + Added delivery information to the Mastodon compatible API [HankG] + Added notification summary option to the Mastodon compatible API [HankG] + Added option to display activities as emoticons [annando] + Added trending API updates [HankG] + Added blocked/ignored filters to the Mastodon compatible API [HankG] + Added ActivityPub C2S postings to the API [annando] + Added dislike information for postings to the Mastodon compatible API [HankG, mkljczk] + Added the possibility to deletion blocked servers [annando] + Removed the GNUsocial import [annando] Friendica Addons + Updates to the translations AR, CS, DE, ES, HU, IS, IT, NL, PL, RU, SV + mailstream + Various modernization [mexon] + Include post media [mexon] + securemail + Updated the phpseclib dependency [MrPetovan] + twitter + Improve remote-self handling [annando] + impressum + Avoide obfuscation on un-set email addresses [MrPestovan] + notifyall + Fixed a bug selecting the email addresses [nupplaphil] + tumblr + Fixed a bug addressing the tumblr blog via UUID [annando] + Added support for NPF [annando] + Improved the tumblr blog URI detection [annando] + Improved the handling of multible images [annando] + marked as UNSUPPORTED addons + blockem, tictactoe, twitter Closed Issues + 7037, 10974, 11513, 11535, 11825, 11986, 12489, 12490, 12507, 12515, + 12522, 12537, 12545, 12550, 12552, 12559, 12582, 12601, 12602, 12603, + 12607, 12608, 12616, 12617, 12620, 12624, 12625, 12629, 12654, 12658, + 12661, 12665, 12672, 12677, 12682, 12705, 12713, 12721, 12753, 12764, + 12779, 12792, 12793, 12803, 12809, 12828, 12835, 12842, 12846, 12847, + 12858, 12859, 12871, 12888, 12924, 12944, 12970, 12974, 12983, 12993, + 12995, 13002, 19996 + +Version 2023.01 (2023-01-15) + Friendica Core + Improved the global server updating if domains are blocked [MrPetovan] + Improved the forum distribution for comments [annando] + Improved the handling of forum mentions [annando] + Fixed the forum post distribution [annando] + Fixed a security bug in the 404 page [nupplaphil] + + Closed Issues + 12539, 12540, 12655, 12615, 12663 Version 2022.12 (2022-12-20) Friendica Core diff --git a/CREDITS.txt b/CREDITS.txt index 99786b308..6deeaa8bf 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -74,8 +74,11 @@ CrystalStiletto Cyboulette Cyryl Sochacki czarnystokrotek +daingewuvzeevisiddfddd +Damian Wajer Damien Goutte-Gattat Daniel Dupriest +Daniel Siepmann Daria Początek David David Martín Miranda @@ -101,6 +104,7 @@ erik Erkan Yilmaz Eugene Veresk Extarys +F1per 3y Fabian Dost Fabio Comuni Farida Khalaf @@ -126,6 +130,7 @@ GunChleoc guzzisti Haakon Meland Eriksen Hank Grabowski +Hannes Heute Hans Meine Hauke Hauke Altmann @@ -138,7 +143,7 @@ Ilmari ImgBotApp irhen Jakob -Jakobus Schürz (admin) +Jakob Schürz Jens Tautenhahn jensp Jeroen De Meerleer @@ -153,6 +158,7 @@ John Mortensen Jonatan Nyberg Jonny Tischbein Josef Moravek +Josh Soref juanman julia.domagalska Julio Cova @@ -185,6 +191,7 @@ Marcin Klessa Marcin Mikołajczak Marcus Müller Marek Bachmann +MarekBenjamin Marie Olive Mariusz Pisz marmor @@ -209,6 +216,7 @@ mytbk nathilia-peirce Nicola Spanti Nicolas Derive +nnsrymni nobody nupplaPhil Olaf Conradi @@ -227,6 +235,7 @@ Pavel Morozov PerigGouanvic peter Peter Liebetrau +Petr Kučera peturisfeld Phigger Phigger Philipp @@ -244,7 +253,7 @@ Rafael Kalachev Rain Hawk Rainulf Pineda Ralf Thees -Ralph +ralph van der honing Ratten rcmaniac RealKinetix @@ -257,6 +266,7 @@ Rik 4 RJ Madsen Roger Meyer Roland Häder +Ruud Schilders rwa Ryan Voots S.Krumbholz @@ -338,6 +348,7 @@ Wil Tur Wouter Broers Xiaofei Xu XMPPはいいぞ +xundeenergie Yasen Pramatarov Yasmine A ylms diff --git a/VERSION b/VERSION index 4f66207d1..583a9757b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2023.03-rc +2023.06-dev diff --git a/composer.lock b/composer.lock index 10fa75638..af9186e8d 100644 --- a/composer.lock +++ b/composer.lock @@ -41,16 +41,16 @@ }, { "name": "bacon/bacon-qr-code", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/Bacon/BaconQrCode.git", - "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c" + "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c", - "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22", + "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22", "shasum": "" }, "require": { @@ -87,7 +87,7 @@ ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2022-03-14T02:02:36+00:00" + "time": "2022-12-07T17:46:57+00:00" }, { "name": "bower-asset/Chart-js", @@ -123,16 +123,16 @@ }, { "name": "bower-asset/base64", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/davidchambers/Base64.js.git", - "reference": "660b299aa4854843fd35d42b30eda9273125b9da" + "reference": "0048721faa641f1519c4c081725f42da2ada5e9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/davidchambers/Base64.js/zipball/660b299aa4854843fd35d42b30eda9273125b9da", - "reference": "660b299aa4854843fd35d42b30eda9273125b9da", + "url": "https://api.github.com/repos/davidchambers/Base64.js/zipball/0048721faa641f1519c4c081725f42da2ada5e9a", + "reference": "0048721faa641f1519c4c081725f42da2ada5e9a", "shasum": "" }, "type": "bower-asset-library", @@ -150,7 +150,7 @@ "WTFPL" ], "description": "Base64 encoding and decoding", - "time": "2019-11-02T20:07:47+00:00" + "time": "2023-02-22T16:04:49+00:00" }, { "name": "bower-asset/dompurify", @@ -299,16 +299,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.3", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" + "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd", "shasum": "" }, "require": { @@ -366,25 +366,28 @@ "type": "tidelift" } ], - "time": "2022-07-20T07:14:26+00:00" + "time": "2023-01-11T08:27:00+00:00" }, { "name": "dasprid/enum", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/DASPRiD/Enum.git", - "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2" + "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", - "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", + "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", "shasum": "" }, + "require": { + "php": ">=7.1 <9.0" + }, "require-dev": { "phpunit/phpunit": "^7 | ^8 | ^9", - "squizlabs/php_codesniffer": "^3.4" + "squizlabs/php_codesniffer": "*" }, "type": "library", "autoload": { @@ -409,7 +412,7 @@ "enum", "map" ], - "time": "2020-10-02T16:03:48+00:00" + "time": "2023-03-01T18:44:03+00:00" }, { "name": "divineomega/do-file-cache", @@ -588,20 +591,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -631,28 +644,28 @@ "keywords": [ "html" ], - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "fgrosse/phpasn1", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296" + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/eef488991d53e58e60c9554b09b1201ca5ba9296", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/42060ed45344789fb9f21f9f1864fc47b9e3507b", + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b", "shasum": "" }, "require": { - "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "~2.0", - "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -703,7 +716,7 @@ "x690" ], "abandoned": true, - "time": "2021-12-11T12:41:06+00:00" + "time": "2022-12-19T11:08:26+00:00" }, { "name": "friendica/json-ld", @@ -1104,16 +1117,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -1132,11 +1145,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -1206,7 +1214,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "kornrunner/blurhash", @@ -1314,24 +1322,6 @@ "html", "markdown" ], - "funding": [ - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - } - ], "time": "2020-07-01T00:34:03+00:00" }, { @@ -1616,16 +1606,16 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.39", + "version": "2.8.41", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45" + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/0fd6753003fc870f6e229bae869cc1337c99bc45", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", "shasum": "" }, "require": { @@ -1664,7 +1654,7 @@ "mobile detector", "php mobile detect" ], - "time": "2022-02-17T19:24:25+00:00" + "time": "2022-11-08T18:31:26+00:00" }, { "name": "nikic/fast-route", @@ -2059,11 +2049,11 @@ }, { "name": "npm-asset/jgrowl", - "version": "1.4.8", + "version": "1.4.9", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jgrowl/-/jgrowl-1.4.8.tgz", - "shasum": "4ba40ffb93757a7e1d9b262d916be299d03df3a4" + "url": "https://registry.npmjs.org/jgrowl/-/jgrowl-1.4.9.tgz", + "shasum": "f0259b74904f4cfc05ea1ad1188fe9b7b3384e2e" }, "type": "npm-asset-library", "extra": { @@ -2092,7 +2082,7 @@ ], "description": "jGrowl is a jQuery plugin that raises unobtrusive messages within the browser, similar to the way that OS X's Growl Framework works. The idea is simple, deliver notifications to the end user in a noticeable way that doesn't obstruct the work flow and yet ", "homepage": "https://github.com/stanlemon/jGrowl#readme", - "time": "2021-05-20T17:11:40+00:00" + "time": "2023-02-22T23:58:06+00:00" }, { "name": "npm-asset/jquery", @@ -2907,16 +2897,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.18.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "906e0b925895d3a5941eda25f371fbafb3cbc22f" + "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/906e0b925895d3a5941eda25f371fbafb3cbc22f", - "reference": "906e0b925895d3a5941eda25f371fbafb3cbc22f", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933", + "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933", "shasum": "" }, "require": { @@ -2985,7 +2975,7 @@ "secret-key cryptography", "side-channel resistant" ], - "time": "2022-09-13T20:54:27+00:00" + "time": "2022-09-26T03:40:35+00:00" }, { "name": "patrickschur/language-detection", @@ -3091,16 +3081,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.17", + "version": "3.0.19", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761" + "reference": "cc181005cf548bfd8a4896383bb825d859259f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761", - "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95", + "reference": "cc181005cf548bfd8a4896383bb825d859259f95", "shasum": "" }, "require": { @@ -3193,7 +3183,7 @@ "type": "tidelift" } ], - "time": "2022-10-24T10:51:50+00:00" + "time": "2023-03-05T17:13:09+00:00" }, { "name": "pragmarx/google2fa", @@ -3514,21 +3504,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3548,7 +3538,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -3559,25 +3549,25 @@ "psr", "psr-18" ], - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3597,7 +3587,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -3611,29 +3601,29 @@ "request", "response" ], - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -3661,7 +3651,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -3803,16 +3793,16 @@ }, { "name": "smarty/smarty", - "version": "v4.2.1", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007" + "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", - "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e28cb0915b4e3749bf57d4ebae2984e25395cfe5", + "reference": "e28cb0915b4e3749bf57d4ebae2984e25395cfe5", "shasum": "" }, "require": { @@ -3860,7 +3850,7 @@ "keywords": [ "templating" ], - "time": "2022-09-14T10:59:01+00:00" + "time": "2023-03-28T19:47:03+00:00" }, { "name": "spomky-labs/base64url", @@ -3925,16 +3915,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -3948,7 +3938,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4005,20 +3995,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -4030,7 +4020,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4086,7 +4076,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php56", @@ -4155,16 +4145,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -4173,7 +4163,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4224,7 +4214,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "ua-parser/uap-php", @@ -4736,30 +4726,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -4798,7 +4788,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -4963,16 +4953,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -5014,20 +5004,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v4.15.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", "shasum": "" }, "require": { @@ -5066,7 +5056,7 @@ "parser", "php" ], - "time": "2022-09-04T07:30:47+00:00" + "time": "2023-03-05T19:49:14+00:00" }, { "name": "phar-io/manifest", @@ -5173,23 +5163,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -5204,8 +5194,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -5242,7 +5232,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2023-03-06T12:58:08+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5471,20 +5461,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.6.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -5502,19 +5492,19 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -5522,7 +5512,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -5559,9 +5549,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2023-04-14T08:58:40+00:00" }, { "name": "sebastian/cli-parser", @@ -5905,16 +5899,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -5960,7 +5954,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -6254,16 +6248,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -6302,14 +6296,14 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -6364,16 +6358,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -6412,7 +6406,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", diff --git a/database.sql b/database.sql index 42a6c1f2e..334b35f77 100644 --- a/database.sql +++ b/database.sql @@ -1,5 +1,5 @@ -- ------------------------------------------ --- Friendica 2023.03-rc (Giant Rhubarb) +-- Friendica 2023.06-dev (Giant Rhubarb) -- DB_UPDATE_VERSION 1518 -- ------------------------------------------ diff --git a/images/default/corgidon.png b/images/default/corgidon.png index 389719b66..0e06380b3 100644 Binary files a/images/default/corgidon.png and b/images/default/corgidon.png differ diff --git a/images/default/gotosocial.svg b/images/default/gotosocial.svg index 9b4e7665e..d4af811fd 100644 --- a/images/default/gotosocial.svg +++ b/images/default/gotosocial.svg @@ -1,160 +1 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/images/default/hometown.png b/images/default/hometown.png index 29b27183b..314901653 100644 Binary files a/images/default/hometown.png and b/images/default/hometown.png differ diff --git a/images/default/koyuspace.png b/images/default/koyuspace.png index 231e48b20..c622797d6 100644 Binary files a/images/default/koyuspace.png and b/images/default/koyuspace.png differ diff --git a/images/default/plume.png b/images/default/plume.png index 126558136..d6a2f1a77 100644 Binary files a/images/default/plume.png and b/images/default/plume.png differ diff --git a/images/diaspora-banner.jpg b/images/diaspora-banner.jpg index b0df6a2fa..3d423ccf2 100644 Binary files a/images/diaspora-banner.jpg and b/images/diaspora-banner.jpg differ diff --git a/images/friendica-banner.jpg b/images/friendica-banner.jpg index 8b1d0fbf6..dc333f0a4 100644 Binary files a/images/friendica-banner.jpg and b/images/friendica-banner.jpg differ diff --git a/images/friendica-maskable-512.png b/images/friendica-maskable-512.png index b454089f8..da2e0df8b 100644 Binary files a/images/friendica-maskable-512.png and b/images/friendica-maskable-512.png differ diff --git a/images/friendica-maskable.svg b/images/friendica-maskable.svg index 77864d1a5..b2cf4cf65 100644 --- a/images/friendica-maskable.svg +++ b/images/friendica-maskable.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/images/friendica.svg b/images/friendica.svg index 180fe2a90..efbb051cd 100644 --- a/images/friendica.svg +++ b/images/friendica.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/mods/fpostit/friendica.svg b/mods/fpostit/friendica.svg index 180fe2a90..efbb051cd 100644 --- a/mods/fpostit/friendica.svg +++ b/mods/fpostit/friendica.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/security.txt b/security.txt index 2a775e4b3..5795051d0 100644 --- a/security.txt +++ b/security.txt @@ -1,6 +1,6 @@ Contact: mailto:info@friendi.ca -Expires: 2023-12-31T23:59:59Z +Expires: 2024-04-30T23:59:59Z Preferred-Languages: en diff --git a/src/App.php b/src/App.php index bacf794b9..0d860638b 100644 --- a/src/App.php +++ b/src/App.php @@ -64,7 +64,7 @@ class App { const PLATFORM = 'Friendica'; const CODENAME = 'Giant Rhubarb'; - const VERSION = '2023.03-rc'; + const VERSION = '2023.06-dev'; // Allow themes to control internal parameters // by changing App values in theme.php diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php index a6fdd8bfb..22de2903c 100644 --- a/src/Console/Relocate.php +++ b/src/Console/Relocate.php @@ -94,7 +94,7 @@ HELP; $this->out(sprintf('Relocation started from %s to %s. Could take a while to complete.', $this->baseUrl, $this->getArgument(0))); - $old_url = $this->baseUrl; + $old_url = (string)$this->baseUrl; // Generate host names for relocation the addresses in the format user@address.tld $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index ee6fcfa06..d9f475e2e 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -140,6 +140,7 @@ class ContactSelector Protocol::STATUSNET => DI::l10n()->t('GNU Social Connector'), Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'), Protocol::PNUT => DI::l10n()->t('pnut'), + Protocol::TUMBLR => DI::l10n()->t('Tumblr'), ]; Hook::callAll('network_to_name', $nets); @@ -210,6 +211,7 @@ class ContactSelector Protocol::STATUSNET => 'gnu-social', Protocol::ACTIVITYPUB => 'activitypub', Protocol::PNUT => 'file-text-o', /// @todo + Protocol::TUMBLR => 'tumblr', ]; $platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica', diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 715a2ba8f..c59755445 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1653,13 +1653,6 @@ class BBCode $text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1', $text); // Youtube extensions - if ($try_oembed) { - $text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $try_oembed_callback, $text); - $text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $try_oembed_callback, $text); - $text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/shorts\/.*?)\[\/youtube\]/ism", $try_oembed_callback, $text); - $text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", $try_oembed_callback, $text); - } - $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/shorts\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); @@ -1675,11 +1668,6 @@ class BBCode ); } - if ($try_oembed) { - $text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", $try_oembed_callback, $text); - $text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", $try_oembed_callback, $text); - } - $text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); $text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index b198d54cf..93dc5b717 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -120,6 +120,10 @@ class Widget $networks[] = Protocol::TWITTER; } + if (!Addon::isEnabled("tumblr")) { + $networks[] = Protocol::TUMBLR; + } + if (DI::config()->get("system", "ostatus_disabled")) { $networks[] = Protocol::OSTATUS; } diff --git a/src/Core/ACL.php b/src/Core/ACL.php index ba4564589..aa5e2221b 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -66,8 +66,9 @@ class ACL $tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$contacts' => $contacts, - '$selected' => $selected, + '$contacts' => $contacts, + '$contacts_json' => json_encode($contacts), + '$selected' => $selected, ]); Hook::callAll(DI::args()->getModuleName() . '_post_recipient', $o); @@ -327,9 +328,9 @@ class ACL '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'), '$jotnets_summary' => DI::l10n()->t('Connectors'), '$visibility' => $visibility, - '$acl_contacts' => $acl_contacts, - '$acl_groups' => $acl_groups, - '$acl_list' => $acl_list, + '$acl_contacts' => json_encode($acl_contacts), + '$acl_groups' => json_encode($acl_groups), + '$acl_list' => json_encode($acl_list), '$contact_allow' => implode(',', $default_permissions['allow_cid']), '$group_allow' => implode(',', $default_permissions['allow_gid']), '$contact_deny' => implode(',', $default_permissions['deny_cid']), diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php index 5ca366e34..9c5aad83d 100644 --- a/src/Core/Protocol.php +++ b/src/Core/Protocol.php @@ -56,6 +56,7 @@ class Protocol const STATUSNET = 'stac'; // Statusnet connector const TWITTER = 'twit'; // Twitter const DISCOURSE = 'dscs'; // Discourse + const TUMBLR = 'tmbl'; // Tumblr // Dead protocols const APPNET = 'apdn'; // app.net - Dead protocol diff --git a/src/Core/Search.php b/src/Core/Search.php index 7f05a3a94..45b64eb51 100644 --- a/src/Core/Search.php +++ b/src/Core/Search.php @@ -29,6 +29,7 @@ use Friendica\Object\Search\ContactResult; use Friendica\Object\Search\ResultList; use Friendica\Util\Network; use Friendica\Util\Strings; +use GuzzleHttp\Psr7\Uri; /** * Specific class to perform searches for different systems. Currently: @@ -76,7 +77,7 @@ class Search $user_data['name'] ?? '', $user_data['addr'] ?? '', ($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''), - $user_data['url'] ?? '', + new Uri($user_data['url'] ?? ''), $user_data['photo'] ?? '', $user_data['network'] ?? '', $contactDetails['cid'] ?? 0, @@ -142,7 +143,7 @@ class Search $profile['name'] ?? '', $profile['addr'] ?? '', ($contactDetails['addr'] ?? '') ?: $profile_url, - $profile_url, + new Uri($profile_url), $profile['photo'] ?? '', Protocol::DFRN, $contactDetails['cid'] ?? 0, @@ -180,7 +181,7 @@ class Search $contact['name'], $contact['addr'], $contact['addr'] ?: $contact['url'], - $contact['url'], + new Uri($contact['url']), $contact['photo'], $contact['network'], 0, diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index e80cc131f..77ecf7521 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -635,7 +635,7 @@ class Media foreach ($matches[1] as $url) { Logger::info('Got page url (link without description)', ['uri-id' => $uriid, 'url' => $url]); $result = self::insert(['uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $url], false, $network); - if ($result && ($network == Protocol::DFRN)) { + if ($result && !in_array($network, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA])) { self::revertHTMLType($uriid, $url, $fullbody); Logger::debug('Revert HTML type', ['uri-id' => $uriid, 'url' => $url]); } elseif ($result) { @@ -651,7 +651,7 @@ class Media foreach ($matches[1] as $url) { Logger::info('Got page url (link with description)', ['uri-id' => $uriid, 'url' => $url]); $result = self::insert(['uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $url], false, $network); - if ($result && ($network == Protocol::DFRN)) { + if ($result && !in_array($network, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA])) { self::revertHTMLType($uriid, $url, $fullbody); Logger::debug('Revert HTML type', ['uri-id' => $uriid, 'url' => $url]); } elseif ($result) { diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php index cc8fab8f7..675deb8fb 100644 --- a/src/Module/BaseSearch.php +++ b/src/Module/BaseSearch.php @@ -97,6 +97,8 @@ class BaseSearch extends BaseModule } elseif (Search::getGlobalDirectory() && empty($results)) { $results = Search::getContactsFromGlobalDirectory($search, $type, $pager->getPage()); $pager->setItemsPerPage($results->getItemsPage()); + } else { + $results = new ResultList(); } return self::printResult($results, $pager, $header); @@ -120,11 +122,17 @@ class BaseSearch extends BaseModule return ''; } + $filtered = 0; + $entries = []; foreach ($results->getResults() as $result) { - // in case the result is a contact result, add a contact-specific entry if ($result instanceof ContactResult) { + if (Network::isUriBlocked($result->getUrl())) { + $filtered++; + continue; + } + $contact = Model\Contact::getByURLForUser($result->getUrl(), DI::userSession()->getLocalUserId()); if (!empty($contact)) { $entries[] = Contact::getContactTemplateVars($contact); @@ -134,7 +142,11 @@ class BaseSearch extends BaseModule $tpl = Renderer::getMarkupTemplate('contact/list.tpl'); return Renderer::replaceMacros($tpl, [ - 'title' => $header, + '$title' => $header, + '$filtered' => $filtered ? DI::l10n()->tt( + '%d result was filtered out because your node blocks the domain it is registered on. You can review the list of domains your node is currently blocking in the About page.', + '%d results were filtered out because your node blocks the domain they are registered on. You can review the list of domains your node is currently blocking in the About page.', + $filtered) : '', '$contacts' => $entries, '$paginate' => $pager->renderFull($results->getTotal()), ]); diff --git a/src/Module/Install.php b/src/Module/Install.php index abf760237..d99f4d417 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -343,7 +343,7 @@ class Install extends BaseModule */ private function whatNext(): string { - $baseurl = $this->baseUrl; + $baseurl = (string)$this->baseUrl; return $this->t('

What next

') . "

" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') diff --git a/src/Module/Post/Share.php b/src/Module/Post/Share.php index 78ea1c631..db95c38c9 100644 --- a/src/Module/Post/Share.php +++ b/src/Module/Post/Share.php @@ -68,7 +68,7 @@ class Share extends \Friendica\BaseModule $shared = $this->contentItem->getSharedPost($item, ['uri']); if ($shared && empty($shared['comment'])) { $content = '[share]' . $shared['post']['uri'] . '[/share]'; - } elseif ($item['network'] == Protocol::FEED) { + } elseif (!empty($item['plink']) && !in_array($item['network'], Protocol::FEDERATED)) { $content = '[attachment]' . $item['plink'] . '[/attachment]'; } else { $content = '[share]' . $item['uri'] . '[/share]'; diff --git a/src/Module/User/Import.php b/src/Module/User/Import.php index 3407fe52c..48dc0660f 100644 --- a/src/Module/User/Import.php +++ b/src/Module/User/Import.php @@ -232,7 +232,7 @@ class Import extends \Friendica\BaseModule } $oldBaseUrl = $account['baseurl']; - $newBaseUrl = $this->baseUrl; + $newBaseUrl = (string)$this->baseUrl; $oldAddr = str_replace('http://', '@', Strings::normaliseLink($oldBaseUrl)); $newAddr = str_replace('http://', '@', Strings::normaliseLink($newBaseUrl)); diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php index 098d69e23..21cff5634 100644 --- a/src/Module/Xrd.php +++ b/src/Module/Xrd.php @@ -105,7 +105,7 @@ class Xrd extends BaseModule private function printSystemJSON(array $owner) { - $baseURL = $this->baseUrl; + $baseURL = (string)$this->baseUrl; $json = [ 'subject' => 'acct:' . $owner['addr'], 'aliases' => [$owner['url']], @@ -151,7 +151,7 @@ class Xrd extends BaseModule private function printJSON(string $alias, array $owner, array $avatar) { - $baseURL = $this->baseUrl; + $baseURL = (string)$this->baseUrl; $json = [ 'subject' => 'acct:' . $owner['addr'], @@ -228,7 +228,7 @@ class Xrd extends BaseModule private function printXML(string $alias, array $owner, array $avatar) { - $baseURL = $this->baseUrl; + $baseURL = (string)$this->baseUrl; $xmlString = XML::fromArray([ 'XRD' => [ diff --git a/src/Navigation/Notifications/Factory/FormattedNavNotification.php b/src/Navigation/Notifications/Factory/FormattedNavNotification.php index b4e48172c..0a7054b8e 100644 --- a/src/Navigation/Notifications/Factory/FormattedNavNotification.php +++ b/src/Navigation/Notifications/Factory/FormattedNavNotification.php @@ -128,7 +128,7 @@ class FormattedNavNotification extends BaseFactory } if (!isset(self::$contacts[$notification->actorId])) { - self::$contacts[$notification->actorId] = Contact::getById($notification->actorId, ['name', 'url']); + self::$contacts[$notification->actorId] = Contact::getById($notification->actorId, ['name', 'url', 'pending']); } return $this->createFromParams( diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php index 8bfdfbe9a..6c3868524 100644 --- a/src/Navigation/Notifications/Repository/Notify.php +++ b/src/Navigation/Notifications/Repository/Notify.php @@ -264,7 +264,7 @@ class Notify extends BaseRepository } } - $siteurl = $this->baseUrl; + $siteurl = (string)$this->baseUrl; $sitename = $this->config->get('config', 'sitename'); // with $params['show_in_notification_page'] == false, the notification isn't inserted into @@ -807,7 +807,7 @@ class Notify extends BaseRepository $epreamble = $msg['rich']; $sitename = $this->config->get('config', 'sitename'); - $siteurl = $this->baseUrl; + $siteurl = (string)$this->baseUrl; $sitelink = $l10n->t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf($sitelink, $siteurl); diff --git a/src/Object/Post.php b/src/Object/Post.php index 17c0c1f68..b34f51377 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -205,8 +205,9 @@ class Post $lock = ($item['private'] == Item::PRIVATE) ? $privacy : false; $connector = !in_array($item['network'], Protocol::NATIVE_SUPPORT) ? DI::l10n()->t('Connector Message') : false; - $shareable = in_array($conv->getProfileOwner(), [0, DI::userSession()->getLocalUserId()]) && $item['private'] != Item::PRIVATE; - $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]); + $shareable = in_array($conv->getProfileOwner(), [0, DI::userSession()->getLocalUserId()]) && $item['private'] != Item::PRIVATE; + $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER, Protocol::TUMBLR]); + $commentable = ($item['network'] != Protocol::TUMBLR); // On Diaspora only toplevel posts can be reshared if ($announceable && ($item['network'] == Protocol::DIASPORA) && ($item['gravity'] != Item::GRAVITY_PARENT)) { @@ -392,7 +393,11 @@ class Post } } - $comment_html = $this->getCommentBox($indent); + if ($commentable) { + $comment_html = $this->getCommentBox($indent); + } else { + $comment_html = ''; + } if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) { $shiny = 'shiny'; diff --git a/src/Object/Search/ContactResult.php b/src/Object/Search/ContactResult.php index c2922ea0e..c46b9b6e4 100644 --- a/src/Object/Search/ContactResult.php +++ b/src/Object/Search/ContactResult.php @@ -22,6 +22,7 @@ namespace Friendica\Object\Search; use Friendica\Model\Search; +use Psr\Http\Message\UriInterface; /** * A search result for contact searching @@ -51,7 +52,7 @@ class ContactResult implements IResult */ private $item; /** - * @var string + * @var UriInterface */ private $url; /** @@ -108,9 +109,9 @@ class ContactResult implements IResult } /** - * @return string + * @return UriInterface */ - public function getUrl(): string + public function getUrl(): UriInterface { return $this->url; } @@ -143,14 +144,14 @@ class ContactResult implements IResult * @param string $name * @param string $addr * @param string $item - * @param string $url + * @param UriInterface $url * @param string $photo * @param string $network * @param int $cid * @param int $pCid * @param string $tags */ - public function __construct($name, $addr, $item, $url, $photo, $network, $cid = 0, $pCid = 0, $tags = '') + public function __construct($name, $addr, $item, UriInterface $url, $photo, $network, $cid = 0, $pCid = 0, $tags = '') { $this->name = $name; $this->addr = $addr; diff --git a/src/Worker/UpdateGServer.php b/src/Worker/UpdateGServer.php index 4b4e40d76..a9f6ae4cd 100644 --- a/src/Worker/UpdateGServer.php +++ b/src/Worker/UpdateGServer.php @@ -59,6 +59,11 @@ class UpdateGServer return; } + // Silently dropping the worker task if the server domain is blocked + if (Network::isUrlBlocked($filtered)) { + return; + } + if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) { GServer::setFailureByUrl($server_url); return; diff --git a/src/Worker/UpdateGServers.php b/src/Worker/UpdateGServers.php index 281e97771..0e328578c 100644 --- a/src/Worker/UpdateGServers.php +++ b/src/Worker/UpdateGServers.php @@ -27,6 +27,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; +use GuzzleHttp\Psr7\Uri; class UpdateGServers { diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index e01626656..13ece85f6 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2023.03-rc\n" +"Project-Id-Version: 2023.06-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-14 17:15+0000\n" +"POT-Creation-Date: 2023-04-09 08:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -770,17 +770,17 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:432 src/Content/Widget.php:235 src/Core/ACL.php:194 +#: src/BaseModule.php:432 src/Content/Widget.php:239 src/Core/ACL.php:194 #: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:127 #: src/Module/PermissionTooltip.php:149 msgid "Followers" msgstr "" -#: src/BaseModule.php:437 src/Content/Widget.php:236 src/Module/Contact.php:408 +#: src/BaseModule.php:437 src/Content/Widget.php:240 src/Module/Contact.php:408 msgid "Following" msgstr "" -#: src/BaseModule.php:442 src/Content/Widget.php:237 src/Module/Contact.php:409 +#: src/BaseModule.php:442 src/Content/Widget.php:241 src/Module/Contact.php:409 msgid "Mutual friends" msgstr "" @@ -1105,7 +1105,11 @@ msgstr "" msgid "pnut" msgstr "" -#: src/Content/ContactSelector.php:178 +#: src/Content/ContactSelector.php:143 +msgid "Tumblr" +msgstr "" + +#: src/Content/ContactSelector.php:179 #, php-format msgid "%s (via %s)" msgstr "" @@ -1580,7 +1584,7 @@ msgid "" msgstr "" #: src/Content/ForumManager.php:151 src/Content/Nav.php:276 -#: src/Content/Text/HTML.php:878 src/Content/Widget.php:524 +#: src/Content/Text/HTML.php:878 src/Content/Widget.php:528 msgid "Forums" msgstr "" @@ -1588,16 +1592,16 @@ msgstr "" msgid "External link to forum" msgstr "" -#: src/Content/ForumManager.php:156 src/Content/Widget.php:503 +#: src/Content/ForumManager.php:156 src/Content/Widget.php:507 msgid "show less" msgstr "" -#: src/Content/ForumManager.php:157 src/Content/Widget.php:405 -#: src/Content/Widget.php:504 +#: src/Content/ForumManager.php:157 src/Content/Widget.php:409 +#: src/Content/Widget.php:508 msgid "show more" msgstr "" -#: src/Content/Item.php:326 src/Model/Item.php:2922 +#: src/Content/Item.php:326 src/Model/Item.php:2913 msgid "event" msgstr "" @@ -1605,7 +1609,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:335 src/Model/Item.php:2924 +#: src/Content/Item.php:335 src/Model/Item.php:2915 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -2011,8 +2015,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3607 -#: src/Model/Item.php:3613 src/Model/Item.php:3614 +#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3598 +#: src/Model/Item.php:3604 src/Model/Item.php:3605 msgid "Link to source" msgstr "" @@ -2028,11 +2032,11 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1881 +#: src/Content/Text/BBCode.php:1869 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1900 +#: src/Content/Text/BBCode.php:1888 msgid "Invalid link protocol" msgstr "" @@ -2115,72 +2119,72 @@ msgstr "" msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:211 src/Model/Group.php:587 +#: src/Content/Widget.php:215 src/Model/Group.php:587 #: src/Module/Contact.php:394 src/Module/Welcome.php:76 msgid "Groups" msgstr "" -#: src/Content/Widget.php:213 +#: src/Content/Widget.php:217 msgid "Everyone" msgstr "" -#: src/Content/Widget.php:242 +#: src/Content/Widget.php:246 msgid "Relationships" msgstr "" -#: src/Content/Widget.php:244 src/Module/Contact.php:338 +#: src/Content/Widget.php:248 src/Module/Contact.php:338 #: src/Module/Group.php:291 msgid "All Contacts" msgstr "" -#: src/Content/Widget.php:283 +#: src/Content/Widget.php:287 msgid "Protocols" msgstr "" -#: src/Content/Widget.php:285 +#: src/Content/Widget.php:289 msgid "All Protocols" msgstr "" -#: src/Content/Widget.php:313 +#: src/Content/Widget.php:317 msgid "Saved Folders" msgstr "" -#: src/Content/Widget.php:315 src/Content/Widget.php:346 +#: src/Content/Widget.php:319 src/Content/Widget.php:350 msgid "Everything" msgstr "" -#: src/Content/Widget.php:344 +#: src/Content/Widget.php:348 msgid "Categories" msgstr "" -#: src/Content/Widget.php:401 +#: src/Content/Widget.php:405 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: src/Content/Widget.php:497 +#: src/Content/Widget.php:501 msgid "Archives" msgstr "" -#: src/Content/Widget.php:521 +#: src/Content/Widget.php:525 msgid "Persons" msgstr "" -#: src/Content/Widget.php:522 +#: src/Content/Widget.php:526 msgid "Organisations" msgstr "" -#: src/Content/Widget.php:523 src/Model/Contact.php:1656 +#: src/Content/Widget.php:527 src/Model/Contact.php:1656 msgid "News" msgstr "" -#: src/Content/Widget.php:527 src/Module/Settings/Account.php:453 +#: src/Content/Widget.php:531 src/Module/Settings/Account.php:453 msgid "Account Types" msgstr "" -#: src/Content/Widget.php:528 src/Module/Moderation/BaseUsers.php:69 +#: src/Content/Widget.php:532 src/Module/Moderation/BaseUsers.php:69 msgid "All" msgstr "" @@ -3181,81 +3185,81 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Item.php:2023 +#: src/Model/Item.php:2014 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2926 +#: src/Model/Item.php:2917 msgid "activity" msgstr "" -#: src/Model/Item.php:2928 +#: src/Model/Item.php:2919 msgid "comment" msgstr "" -#: src/Model/Item.php:2931 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:2922 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3093 +#: src/Model/Item.php:3084 #, php-format msgid "%s is blocked" msgstr "" -#: src/Model/Item.php:3095 +#: src/Model/Item.php:3086 #, php-format msgid "%s is ignored" msgstr "" -#: src/Model/Item.php:3097 +#: src/Model/Item.php:3088 #, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3101 +#: src/Model/Item.php:3092 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3519 +#: src/Model/Item.php:3510 msgid "bytes" msgstr "" -#: src/Model/Item.php:3550 +#: src/Model/Item.php:3541 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3552 +#: src/Model/Item.php:3543 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3557 +#: src/Model/Item.php:3548 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3559 +#: src/Model/Item.php:3550 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3561 +#: src/Model/Item.php:3552 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3595 src/Model/Item.php:3596 +#: src/Model/Item.php:3586 src/Model/Item.php:3587 msgid "View on separate page" msgstr "" @@ -5537,10 +5541,23 @@ msgstr "" msgid "Forum Search - %s" msgstr "" -#: src/Module/BaseSearch.php:119 src/Module/Contact/MatchInterests.php:139 +#: src/Module/BaseSearch.php:121 src/Module/Contact/MatchInterests.php:139 msgid "No matches" msgstr "" +#: src/Module/BaseSearch.php:147 +#, php-format +msgid "" +"%d result was filtered out because your node blocks the domain it is " +"registered on. You can review the list of domains your node is currently " +"blocking in the About page." +msgid_plural "" +"%d results were filtered out because your node blocks the domain they are " +"registered on. You can review the list of domains your node is currently " +"blocking in the About page." +msgstr[0] "" +msgstr[1] "" + #: src/Module/BaseSettings.php:80 msgid "Account" msgstr "" diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po index 9a7aad1ee..8b6fab3f9 100644 --- a/view/lang/fr/messages.po +++ b/view/lang/fr/messages.po @@ -696,7 +696,7 @@ msgstr "Bloquer ce contact ? Iel ne pourra pas s'abonner à votre compte et vous msgid "" "Ignore this author? You won't be able to see their posts and their " "notifications." -msgstr "" +msgstr "Ignorer cet auteur ? Vous ne serez plus en mesure de voir ses publications et notifications." #: src/App/Page.php:320 msgid "toggle mobile" @@ -1619,7 +1619,7 @@ msgstr "Ignorer" #: src/Content/Item.php:428 src/Module/Contact.php:442 #: src/Module/Contact/Profile.php:494 msgid "Collapse" -msgstr "" +msgstr "Fusionner" #: src/Content/Item.php:432 src/Object/Post.php:460 msgid "Languages" @@ -1633,7 +1633,7 @@ msgstr "Se connecter/Suivre" #: src/Content/Item.php:862 msgid "Unable to fetch user." -msgstr "" +msgstr "Impossible de récupérer l'utilisateur." #: src/Content/Nav.php:120 msgid "Nothing new here" @@ -1671,11 +1671,11 @@ msgstr "Se connecter" #: src/Content/Nav.php:229 src/Module/BaseProfile.php:57 #: src/Module/Contact.php:484 msgid "Conversations" -msgstr "" +msgstr "Discussions" #: src/Content/Nav.php:229 msgid "Conversations you started" -msgstr "" +msgstr "Discussions que vous avez commencées" #: src/Content/Nav.php:230 src/Module/BaseProfile.php:49 #: src/Module/BaseSettings.php:100 src/Module/Contact.php:476 @@ -3157,17 +3157,17 @@ msgstr "publication" #: src/Model/Item.php:3059 #, php-format msgid "%s is blocked" -msgstr "" +msgstr "%s est bloqué(e)" #: src/Model/Item.php:3061 #, php-format msgid "%s is ignored" -msgstr "" +msgstr "%s est ignoré(e)" #: src/Model/Item.php:3063 #, php-format msgid "Content from %s is collapsed" -msgstr "" +msgstr "Le contenu de %s est fusionné" #: src/Model/Item.php:3067 #, php-format @@ -3404,7 +3404,7 @@ msgstr "La taille du mot de passe est limitée à 72 caractères." #: src/Model/User.php:807 msgid "The password can't contain white spaces nor accentuated letters" -msgstr "" +msgstr "Le mot de passe ne peut pas contenir d'espaces ou de lettres accentuées" #: src/Model/User.php:1002 msgid "Passwords do not match. Password unchanged." @@ -5077,7 +5077,7 @@ msgid "" "The system.url entry is missing. This is a low level setting and can lead to" " unexpected behavior. Please add a valid entry as soon as possible in the " "config file or per console command!" -msgstr "" +msgstr "L'entrée system.url est manquante. Il s'agit d'un paramètre bas niveau qui peut conduire à un comportement non attendu. Merci d'ajouter une entrée valide dès que possible dans le fichier de configuration ou via la console de commandes !" #: src/Module/Admin/Summary.php:107 msgid "The worker was never executed. Please check your database structure!" @@ -5260,7 +5260,7 @@ msgstr "Saisissez les règles de votre système ici. Chaque ligne représente un #: src/Module/Api/ApiResponse.php:279 #, php-format msgid "API endpoint %s %s is not implemented but might be in the future." -msgstr "" +msgstr "Le point de terminaison de l'API %s%s n'est pas implémenté mais pourrait l'être à l'avenir." #: src/Module/Api/Mastodon/Apps.php:73 msgid "Missing parameters" @@ -5445,7 +5445,7 @@ msgstr "Détails du profil" #: src/Module/BaseProfile.php:60 msgid "Conversations started" -msgstr "" +msgstr "Discussions commencées" #: src/Module/BaseProfile.php:111 msgid "Only You Can See This" @@ -5671,11 +5671,11 @@ msgstr "Ne montrer que les contacts ignorés" #: src/Module/Contact.php:371 src/Module/Contact.php:419 msgid "Collapsed" -msgstr "" +msgstr "Fusionnés" #: src/Module/Contact.php:374 msgid "Only show collapsed contacts" -msgstr "" +msgstr "N'afficher que les contacts fusionnés" #: src/Module/Contact.php:379 src/Module/Contact.php:420 msgid "Archived" @@ -5723,7 +5723,7 @@ msgstr "Ne plus ignorer" #: src/Module/Contact.php:442 src/Module/Contact/Profile.php:494 msgid "Uncollapse" -msgstr "" +msgstr "Dé-fusionner" #: src/Module/Contact.php:444 msgid "Batch Actions" @@ -5739,7 +5739,7 @@ msgstr "Publications et commentaires" #: src/Module/Contact.php:495 msgid "Individual Posts and Replies" -msgstr "" +msgstr "Publications et réponses individuelles" #: src/Module/Contact.php:503 msgid "Posts containing media objects" @@ -5956,7 +5956,7 @@ msgstr "Ajouter une note personnelle :" #: src/Module/Contact/Follow.php:191 src/Module/Contact/Unfollow.php:138 msgid "Posts and Replies" -msgstr "" +msgstr "Publications et réponses" #: src/Module/Contact/Follow.php:220 msgid "The contact could not be added." @@ -6000,11 +6000,11 @@ msgstr "Le contact a été ignoré" #: src/Module/Contact/Profile.php:210 msgid "Contact has been uncollapsed" -msgstr "" +msgstr "Le contact a été dé-fusionné" #: src/Module/Contact/Profile.php:214 msgid "Contact has been collapsed" -msgstr "" +msgstr "Le contact a été fusionné" #: src/Module/Contact/Profile.php:243 #, php-format @@ -6145,7 +6145,7 @@ msgstr "Actuellement ignoré" #: src/Module/Contact/Profile.php:364 msgid "Currently collapsed" -msgstr "" +msgstr "Actuellement fusionné" #: src/Module/Contact/Profile.php:365 msgid "Currently archived" @@ -6213,7 +6213,7 @@ msgstr "(dés)activer l'état \"ignoré\"" #: src/Module/Contact/Profile.php:496 msgid "Toggle Collapsed status" -msgstr "" +msgstr "Commuter le statut fusionné" #: src/Module/Contact/Profile.php:503 src/Module/Contact/Revoke.php:106 msgid "Revoke Follow" @@ -6920,13 +6920,13 @@ msgstr "Si le système ne peut pas détecter le chemin de l'installation, entrez #: src/Module/Install.php:229 msgid "The Friendica system URL" -msgstr "" +msgstr "L'URL du système Friendica" #: src/Module/Install.php:231 msgid "" "Overwrite this field in case the system URL determination isn't right, " "otherwise leave it as is." -msgstr "" +msgstr "Modifiez ce champ au cas où l'URL du système n'est pas la bonne, sinon laissez le tel quel." #: src/Module/Install.php:242 msgid "Database connection" @@ -8089,7 +8089,7 @@ msgstr "Veuillez copier le code d'identification suivant dans votre application #: src/Module/OAuth/Token.php:82 msgid "Invalid data or unknown client" -msgstr "" +msgstr "Données invalides ou client inconnu" #: src/Module/OAuth/Token.php:104 msgid "Unsupported or missing grant type" @@ -8775,7 +8775,7 @@ msgstr "Votre mot de passe actuel pour confirmer les modifications" msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces and accentuated letters." -msgstr "" +msgstr "Les caractères autorisés sont a-z, A-Z, 0-9 et les caractères spéciaux à l'exception des espaces et des lettres accentuées." #: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:553 @@ -9483,14 +9483,14 @@ msgstr "Si vos publications contiennent un lien, le titre de la page associée s #: src/Module/Settings/Connectors.php:223 msgid "API: Use spoiler field as title" -msgstr "" +msgstr "API : Utiliser le champ spoiler (divulgachis) en tant que titre" #: src/Module/Settings/Connectors.php:223 msgid "" "When activated, the \"spoiler_text\" field in the API will be used for the " "title on standalone posts. When deactivated it will be used for spoiler " "text. For comments it will always be used for spoiler text." -msgstr "" +msgstr "Quand activé, le champ \"spoiler_text\" dans l'API sera utilisé pour le titre des publications individuelles. Quand désactivé, il sera utilisé pour du texte spoiler (divulgachis). Pour les commentaires, il sera toujours utilisé pour du texte spoiler." #: src/Module/Settings/Connectors.php:224 msgid "Your legacy ActivityPub/GNU Social account" @@ -10374,7 +10374,7 @@ msgstr "Exporter vos abonnements au format CSV. Compatible avec Mastodon." #: src/Module/Special/DisplayNotFound.php:37 msgid "Not Found" -msgstr "" +msgstr "Non trouvé" #: src/Module/Special/DisplayNotFound.php:38 msgid "" @@ -10386,7 +10386,7 @@ msgid "" "\t

  • The node has blocked the top-level author or the author of the shared post.
  • \n" "\t
  • You have ignored or blocked the top-level author or the author of the shared post.
  • \n" "" -msgstr "" +msgstr "

    Malheureusement, la discussion demandée ne vous est pas accessible.

    \n

    Les raisons possibles sont :

    \n" #: src/Module/Special/HTTPException.php:78 msgid "Stack trace:" @@ -11193,7 +11193,7 @@ msgstr "Bloquer %s" #: src/Object/Post.php:269 #, php-format msgid "Ignore %s" -msgstr "" +msgstr "Ignorer %s" #: src/Object/Post.php:274 msgid "Save to folder" @@ -11364,42 +11364,42 @@ msgstr "Montrer moins" #: src/Object/Post.php:623 #, php-format msgid "Reshared by: %s" -msgstr "" +msgstr "Repartagé par : %s" #: src/Object/Post.php:628 #, php-format msgid "Viewed by: %s" -msgstr "" +msgstr "Vu par : %s" #: src/Object/Post.php:633 #, php-format msgid "Liked by: %s" -msgstr "" +msgstr "Aimé par : %s" #: src/Object/Post.php:638 #, php-format msgid "Disliked by: %s" -msgstr "" +msgstr "Pas aimé par : %s" #: src/Object/Post.php:643 #, php-format msgid "Attended by: %s" -msgstr "" +msgstr "Y assisteront : %s" #: src/Object/Post.php:648 #, php-format msgid "Maybe attended by: %s" -msgstr "" +msgstr "Y assisteront peut-être : %s" #: src/Object/Post.php:653 #, php-format msgid "Not attended by: %s" -msgstr "" +msgstr "N'y assisteront pas : %s" #: src/Object/Post.php:658 #, php-format msgid "Reacted with %s by: %s" -msgstr "" +msgstr "La réaction %s a été faite par : %s" #: src/Protocol/Delivery.php:547 msgid "(no subject)" diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php index 12ad7f05a..3b89df284 100644 --- a/view/lang/fr/strings.php +++ b/view/lang/fr/strings.php @@ -197,6 +197,7 @@ $a->strings['No system theme config value set.'] = 'Le thème système n\'est pa $a->strings['Apologies but the website is unavailable at the moment.'] = 'Désolé mais le site web n\'est pas disponible pour le moment.'; $a->strings['Delete this item?'] = 'Effacer cet élément?'; $a->strings['Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'] = 'Bloquer ce contact ? Iel ne pourra pas s\'abonner à votre compte et vous ne pourrez pas voir leurs publications ni leurs commentaires.'; +$a->strings['Ignore this author? You won\'t be able to see their posts and their notifications.'] = 'Ignorer cet auteur ? Vous ne serez plus en mesure de voir ses publications et notifications.'; $a->strings['toggle mobile'] = 'activ. mobile'; $a->strings['Method not allowed for this module. Allowed method(s): %s'] = 'Méthode non autorisée pour ce module. Méthode(s) autorisée(s): %s'; $a->strings['Page not found.'] = 'Page introuvable.'; @@ -398,8 +399,10 @@ $a->strings['View Contact'] = 'Voir Contact'; $a->strings['Send PM'] = 'Message privé'; $a->strings['Block'] = 'Bloquer'; $a->strings['Ignore'] = 'Ignorer'; +$a->strings['Collapse'] = 'Fusionner'; $a->strings['Languages'] = 'Langues'; $a->strings['Connect/Follow'] = 'Se connecter/Suivre'; +$a->strings['Unable to fetch user.'] = 'Impossible de récupérer l\'utilisateur.'; $a->strings['Nothing new here'] = 'Rien de neuf ici'; $a->strings['Go back'] = 'Revenir'; $a->strings['Clear notifications'] = 'Effacer les notifications'; @@ -408,6 +411,8 @@ $a->strings['Logout'] = 'Se déconnecter'; $a->strings['End this session'] = 'Mettre fin à cette session'; $a->strings['Login'] = 'Connexion'; $a->strings['Sign in'] = 'Se connecter'; +$a->strings['Conversations'] = 'Discussions'; +$a->strings['Conversations you started'] = 'Discussions que vous avez commencées'; $a->strings['Profile'] = 'Profil'; $a->strings['Your profile page'] = 'Votre page de profil'; $a->strings['Photos'] = 'Photos'; @@ -757,6 +762,9 @@ $a->strings['Detected languages in this post:\n%s'] = 'Langues détectées dans $a->strings['activity'] = 'activité'; $a->strings['comment'] = 'commentaire'; $a->strings['post'] = 'publication'; +$a->strings['%s is blocked'] = '%s est bloqué(e)'; +$a->strings['%s is ignored'] = '%s est ignoré(e)'; +$a->strings['Content from %s is collapsed'] = 'Le contenu de %s est fusionné'; $a->strings['Content warning: %s'] = 'Avertissement de contenu: %s'; $a->strings['bytes'] = 'octets'; $a->strings['%2$s (%3$d%%, %1$d vote)'] = [ @@ -825,6 +833,7 @@ $a->strings['Password can\'t be empty'] = 'Le mot de passe ne peut pas être vid $a->strings['Empty passwords are not allowed.'] = 'Les mots de passe vides ne sont pas acceptés.'; $a->strings['The new password has been exposed in a public data dump, please choose another.'] = 'Le nouveau mot de passe fait partie d\'une fuite de mot de passe publique, veuillez en choisir un autre.'; $a->strings['The password length is limited to 72 characters.'] = 'La taille du mot de passe est limitée à 72 caractères.'; +$a->strings['The password can\'t contain white spaces nor accentuated letters'] = 'Le mot de passe ne peut pas contenir d\'espaces ou de lettres accentuées'; $a->strings['Passwords do not match. Password unchanged.'] = 'Les mots de passe ne correspondent pas. Aucun changement appliqué.'; $a->strings['An invitation is required.'] = 'Une invitation est requise.'; $a->strings['Invitation could not be verified.'] = 'L\'invitation fournie n\'a pu être validée.'; @@ -1324,6 +1333,7 @@ $a->strings['Your table_definition_cache is too low (%d). This can lead to the d $a->strings['There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s'] = 'Une nouvelle version de Friendica est disponible. Votre version est %1$s, la nouvelle version est %2$s'; $a->strings['The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'] = 'La mise à jour automatique de la base de donnée a échoué. Veuillez exécuter la commande php bin/console.php dbstructure update depuis votre répertoire Friendica et noter les erreurs potentielles.'; $a->strings['The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'] = 'La dernière mise à jour a échoué. Merci d\'exécuter "php bin/console.php dbstructure update" depuis la ligne de commandes et de surveiller les erreurs qui pourraient survenir (Certaines erreurs pourraient être dans le fichier journal).'; +$a->strings['The system.url entry is missing. This is a low level setting and can lead to unexpected behavior. Please add a valid entry as soon as possible in the config file or per console command!'] = 'L\'entrée system.url est manquante. Il s\'agit d\'un paramètre bas niveau qui peut conduire à un comportement non attendu. Merci d\'ajouter une entrée valide dès que possible dans le fichier de configuration ou via la console de commandes !'; $a->strings['The worker was never executed. Please check your database structure!'] = 'Le \'worker\' n\'a pas encore été exécuté. Vérifiez la structure de votre base de données.'; $a->strings['The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.'] = 'La dernière exécution du \'worker\' s\'est déroulée à %s, c\'est-à-dire il y a plus d\'une heure. Vérifiez les réglages de crontab.'; $a->strings['Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.'] = 'La configuration de votre site Friendica est maintenant stockée dans le fichier config/local.config.php, veuillez copier le fichier config/local-sample.config.php et transférer votre configuration depuis le fichier .htconfig.php. Veuillez consulter la page d\'aide de configuration (en anglais) pour vous aider dans la transition.'; @@ -1358,6 +1368,7 @@ $a->strings['The Terms of Service'] = 'Conditions d\'Utilisation'; $a->strings['Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.'] = 'Saisissez les Conditions d\'Utilisations de votre site. Les BBCodes sont disponibles, les titres commencent à [h2].'; $a->strings['The rules'] = 'Les règles'; $a->strings['Enter your system rules here. Each line represents one rule.'] = 'Saisissez les règles de votre système ici. Chaque ligne représente une règle.'; +$a->strings['API endpoint %s %s is not implemented but might be in the future.'] = 'Le point de terminaison de l\'API %s%s n\'est pas implémenté mais pourrait l\'être à l\'avenir.'; $a->strings['Missing parameters'] = 'Paramètres manquants'; $a->strings['Only starting posts can be bookmarked'] = 'Seuls les publications initiales peuvent être ajoutées aux signets'; $a->strings['Only starting posts can be muted'] = 'Les notifications de conversation ne peuvent être ignorées qu\'à partir de la publication initiale'; @@ -1410,6 +1421,7 @@ $a->strings['Server Blocklist'] = 'Serveurs bloqués'; $a->strings['Delete Item'] = 'Supprimer un élément'; $a->strings['Item Source'] = 'Source de la publication'; $a->strings['Profile Details'] = 'Détails du profil'; +$a->strings['Conversations started'] = 'Discussions commencées'; $a->strings['Only You Can See This'] = 'Vous seul pouvez voir ça'; $a->strings['Scheduled Posts'] = 'Publications programmées'; $a->strings['Posts that are scheduled for publishing'] = 'Publications programmées à l\'avance'; @@ -1461,6 +1473,8 @@ $a->strings['Blocked'] = 'Bloqués'; $a->strings['Only show blocked contacts'] = 'Ne montrer que les contacts bloqués'; $a->strings['Ignored'] = 'Ignorés'; $a->strings['Only show ignored contacts'] = 'Ne montrer que les contacts ignorés'; +$a->strings['Collapsed'] = 'Fusionnés'; +$a->strings['Only show collapsed contacts'] = 'N\'afficher que les contacts fusionnés'; $a->strings['Archived'] = 'Archivés'; $a->strings['Only show archived contacts'] = 'Ne montrer que les contacts archivés'; $a->strings['Hidden'] = 'Cachés'; @@ -1471,9 +1485,11 @@ $a->strings['Results for: %s'] = 'Résultats pour : %s'; $a->strings['Update'] = 'Mises à jour'; $a->strings['Unblock'] = 'Débloquer'; $a->strings['Unignore'] = 'Ne plus ignorer'; +$a->strings['Uncollapse'] = 'Dé-fusionner'; $a->strings['Batch Actions'] = 'Actions multiples'; $a->strings['Conversations started by this contact'] = 'Conversations entamées par ce contact'; $a->strings['Posts and Comments'] = 'Publications et commentaires'; +$a->strings['Individual Posts and Replies'] = 'Publications et réponses individuelles'; $a->strings['Posts containing media objects'] = 'Publications contenant des objets média'; $a->strings['View all known contacts'] = 'Voir tous les contacts connus'; $a->strings['Advanced Contact Settings'] = 'Réglages avancés du contact'; @@ -1533,6 +1549,7 @@ $a->strings['Profile URL'] = 'URL du Profil'; $a->strings['Tags:'] = 'Étiquette :'; $a->strings['%s knows you'] = '%s vous connaît'; $a->strings['Add a personal note:'] = 'Ajouter une note personnelle :'; +$a->strings['Posts and Replies'] = 'Publications et réponses'; $a->strings['The contact could not be added.'] = 'Le contact n\'a pas pu être ajouté.'; $a->strings['Invalid request.'] = 'Requête invalide.'; $a->strings['No keywords to match. Please add keywords to your profile.'] = 'Aucun mot-clé ne correspond. Merci d\'ajouter des mots-clés à votre profil.'; @@ -1542,6 +1559,8 @@ $a->strings['Contact has been unblocked'] = 'Le contact n\'est plus bloqué'; $a->strings['Contact has been blocked'] = 'Le contact a été bloqué'; $a->strings['Contact has been unignored'] = 'Le contact n\'est plus ignoré'; $a->strings['Contact has been ignored'] = 'Le contact a été ignoré'; +$a->strings['Contact has been uncollapsed'] = 'Le contact a été dé-fusionné'; +$a->strings['Contact has been collapsed'] = 'Le contact a été fusionné'; $a->strings['You are mutual friends with %s'] = 'Vous êtes ami (et réciproquement) avec %s'; $a->strings['You are sharing with %s'] = 'Vous partagez avec %s'; $a->strings['%s is sharing with you'] = '%s partage avec vous'; @@ -1574,6 +1593,7 @@ $a->strings['Update now'] = 'Mettre à jour'; $a->strings['Awaiting connection acknowledge'] = 'En attente de confirmation d\'abonnement'; $a->strings['Currently blocked'] = 'Actuellement bloqué'; $a->strings['Currently ignored'] = 'Actuellement ignoré'; +$a->strings['Currently collapsed'] = 'Actuellement fusionné'; $a->strings['Currently archived'] = 'Actuellement archivé'; $a->strings['Hide this contact from others'] = 'Cacher ce contact aux autres'; $a->strings['Replies/likes to your public posts may still be visible'] = 'Les réponses et "j\'aime" à vos publications publiques peuvent être toujours visibles'; @@ -1588,6 +1608,7 @@ $a->strings['Mark this contact as remote_self, this will cause friendica to repo $a->strings['Refetch contact data'] = 'Récupérer à nouveau les données de contact'; $a->strings['Toggle Blocked status'] = '(dés)activer l\'état "bloqué"'; $a->strings['Toggle Ignored status'] = '(dés)activer l\'état "ignoré"'; +$a->strings['Toggle Collapsed status'] = 'Commuter le statut fusionné'; $a->strings['Revoke Follow'] = 'Révoquer le suivi'; $a->strings['Revoke the follow from this contact'] = 'Empêcher ce contact de vous suivre '; $a->strings['Bad Request.'] = 'Mauvaise requête.'; @@ -1757,6 +1778,8 @@ $a->strings['Check again'] = 'Vérifier à nouveau'; $a->strings['Base settings'] = 'Paramètres de base'; $a->strings['Base path to installation'] = 'Chemin de base de l\'installation'; $a->strings['If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.'] = 'Si le système ne peut pas détecter le chemin de l\'installation, entrez le bon chemin ici. Ce paramètre doit être utilisé uniquement si vous avez des accès restreints à votre système et que vous n\'avez qu\'un lien symbolique vers le répertoire web.'; +$a->strings['The Friendica system URL'] = 'L\'URL du système Friendica'; +$a->strings['Overwrite this field in case the system URL determination isn\'t right, otherwise leave it as is.'] = 'Modifiez ce champ au cas où l\'URL du système n\'est pas la bonne, sinon laissez le tel quel.'; $a->strings['Database connection'] = 'Connexion à la base de données'; $a->strings['In order to install Friendica we need to know how to connect to your database.'] = 'Pour installer Friendica, nous avons besoin de savoir comment contacter votre base de données.'; $a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Merci de vous tourner vers votre hébergeur et/ou administrateur pour toute question concernant ces réglages.'; @@ -2051,6 +2074,7 @@ $a->strings['Do you want to authorize this application to access your posts and $a->strings['Unsupported or missing response type'] = 'Type de réponse manquant ou non pris en charge'; $a->strings['Incomplete request data'] = 'Requête incomplète'; $a->strings['Please copy the following authentication code into your application and close this window: %s'] = 'Veuillez copier le code d\'identification suivant dans votre application et ensuite fermer cette fenêtre: %s'; +$a->strings['Invalid data or unknown client'] = 'Données invalides ou client inconnu'; $a->strings['Unsupported or missing grant type'] = 'Type de "grant" manquant ou non pris en charge'; $a->strings['Resubscribing to OStatus contacts'] = 'Réinscription aux contacts OStatus'; $a->strings['Keep this window open until done.'] = 'Veuillez garder cette fenêtre ouverte jusqu\'à la fin.'; @@ -2204,6 +2228,7 @@ $a->strings['Since version 2022.09, we\'ve realized that any password longer tha $a->strings['Update Password'] = 'Mettre à jour le mot de passe'; $a->strings['Current Password:'] = 'Mot de passe actuel :'; $a->strings['Your current password to confirm the changes'] = 'Votre mot de passe actuel pour confirmer les modifications'; +$a->strings['Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.'] = 'Les caractères autorisés sont a-z, A-Z, 0-9 et les caractères spéciaux à l\'exception des espaces et des lettres accentuées.'; $a->strings['Password length is limited to 72 characters.'] = 'La taille du mot de passe est limitée à 72 caractères.'; $a->strings['Remaining recovery codes: %d'] = 'Codes de récupération restants : %d'; $a->strings['Invalid code, please retry.'] = 'Code invalide, veuillez réessayer.'; @@ -2356,6 +2381,8 @@ $a->strings['Enable simple text shortening'] = 'Activer l\'abbréviation de text $a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Cette option raccourcit le texte des publications au nombre de caractères exact au lieu d\'attendre la fin du paragraphe.'; $a->strings['Attach the link title'] = 'Attacher le titre du lien (Diaspora)'; $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Si vos publications contiennent un lien, le titre de la page associée sera attaché à la publication à destination de vos contacts Diaspora. C\'est principalement utile avec les contacts "remote-self" qui partagent du contenu de flux RSS/Atom.'; +$a->strings['API: Use spoiler field as title'] = 'API : Utiliser le champ spoiler (divulgachis) en tant que titre'; +$a->strings['When activated, the "spoiler_text" field in the API will be used for the title on standalone posts. When deactivated it will be used for spoiler text. For comments it will always be used for spoiler text.'] = 'Quand activé, le champ "spoiler_text" dans l\'API sera utilisé pour le titre des publications individuelles. Quand désactivé, il sera utilisé pour du texte spoiler (divulgachis). Pour les commentaires, il sera toujours utilisé pour du texte spoiler.'; $a->strings['Your legacy ActivityPub/GNU Social account'] = 'Votre ancient compte ActivityPub/GNU Social'; $a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Si vous saisissez votre adresse de compte précédente d\'un réseau basé sur ActivityPub ou GNU Social/Statusnet (au format utilisateur@domaine.tld), vos contacts seront ajoutés autoamtiquement. Le champ sera vidé quand l\'opération sera terminé.'; $a->strings['Repair OStatus subscriptions'] = 'Réparer les abonnements OStatus'; @@ -2585,6 +2612,22 @@ $a->strings['Export all'] = 'Tout exporter'; $a->strings['Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)'] = 'Exporte vos informations de compte, vos contacts et toutes vos publications au format JSON. Ce processus peut prendre beaucoup de temps et générer un fichier de taille importante. Utilisez cette fonctionnalité pour faire une sauvegarde complète de votre compte (vos photos ne sont pas exportées).'; $a->strings['Export Contacts to CSV'] = 'Exporter vos contacts au format CSV'; $a->strings['Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.'] = 'Exporter vos abonnements au format CSV. Compatible avec Mastodon.'; +$a->strings['Not Found'] = 'Non trouvé'; +$a->strings['

    Unfortunately, the requested conversation isn\'t available to you.

    +

    Possible reasons include:

    +'] = '

    Malheureusement, la discussion demandée ne vous est pas accessible.

    +

    Les raisons possibles sont :

    +'; $a->strings['Stack trace:'] = 'Stack trace:'; $a->strings['Exception thrown in %s:%d'] = 'Exception produite dans %s:%d'; $a->strings['At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'] = 'Au moment de l\'inscription, et afin de fournir des communications entre le compte de l\'utilisateur et ses contacts, l\'utilisateur doit fournir un nom d\'affichage (nom de plume), un nom d\'utilisateur (pseudo) et une adresse de courriel fonctionnelle. Les noms seront accessibles sur la page de profil du compte par tout visiteur de la page, même si les autres informations de profil ne sont pas affichées. L\'adresse de courriel ne sera utilisée que pour envoyer des notifications à l\'utilisateur à propos de ses interactions, mais ne sera pas affichée de manière visible. Le référencement du compte dans le répertoire des comptes du nœud ou le répertoire global des utilisateurs est optionnel et peut être contrôlé dans les paramètres utilisateur, il n\'est pas nécessaire pour la communication. '; @@ -2746,6 +2789,7 @@ $a->strings['Edit'] = 'Éditer'; $a->strings['Delete globally'] = 'Effacer globalement'; $a->strings['Remove locally'] = 'Effacer localement'; $a->strings['Block %s'] = 'Bloquer %s'; +$a->strings['Ignore %s'] = 'Ignorer %s'; $a->strings['Save to folder'] = 'Sauvegarder dans le dossier'; $a->strings['I will attend'] = 'Je vais participer'; $a->strings['I will not attend'] = 'Je ne vais pas participer'; @@ -2790,6 +2834,14 @@ $a->strings['%d comment'] = [ ]; $a->strings['Show more'] = 'Montrer plus'; $a->strings['Show fewer'] = 'Montrer moins'; +$a->strings['Reshared by: %s'] = 'Repartagé par : %s'; +$a->strings['Viewed by: %s'] = 'Vu par : %s'; +$a->strings['Liked by: %s'] = 'Aimé par : %s'; +$a->strings['Disliked by: %s'] = 'Pas aimé par : %s'; +$a->strings['Attended by: %s'] = 'Y assisteront : %s'; +$a->strings['Maybe attended by: %s'] = 'Y assisteront peut-être : %s'; +$a->strings['Not attended by: %s'] = 'N\'y assisteront pas : %s'; +$a->strings['Reacted with %s by: %s'] = 'La réaction %s a été faite par : %s'; $a->strings['(no subject)'] = '(aucun sujet)'; $a->strings['%s is now following %s.'] = '%s suit désormais %s.'; $a->strings['following'] = 'following'; diff --git a/view/lang/hu/messages.po b/view/lang/hu/messages.po index 8aea1e3ba..de93acbed 100644 --- a/view/lang/hu/messages.po +++ b/view/lang/hu/messages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Friendica package. # # Translators: -# Balázs Úr, 2020-2022 +# Balázs Úr, 2020-2023 # Balázs Úr , 2020 # Kastal András , 2018 # Kastal András , 2018 @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-02-18 20:49+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" -"Last-Translator: Balázs Úr, 2020-2022\n" +"Last-Translator: Balázs Úr, 2020-2023\n" "Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -673,7 +673,7 @@ msgstr "Tiltja ezt a szerzőt? Nem lesz képes követni Önt, és a nyilvános b msgid "" "Ignore this author? You won't be able to see their posts and their " "notifications." -msgstr "" +msgstr "Mellőzi ezt a szerzőt? Nem lesz képes megtekinteni az ő bejegyzéseit és értesítéseit." #: src/App/Page.php:320 msgid "toggle mobile" @@ -1087,7 +1087,7 @@ msgstr "és %d más személy" #: src/Content/Conversation.php:252 #, php-format msgid " like this" -msgstr "" +msgstr " kedveli ezt" #: src/Content/Conversation.php:253 #, php-format @@ -1097,7 +1097,7 @@ msgstr "%s kedveli ezt." #: src/Content/Conversation.php:256 #, php-format msgid " don't like this" -msgstr "" +msgstr " nem kedveli ezt" #: src/Content/Conversation.php:257 #, php-format @@ -1107,7 +1107,7 @@ msgstr "%s nem kedveli ezt." #: src/Content/Conversation.php:260 #, php-format msgid " attend" -msgstr "" +msgstr " részt vesz" #: src/Content/Conversation.php:261 #, php-format @@ -1117,7 +1117,7 @@ msgstr "%s részt vesz." #: src/Content/Conversation.php:264 #, php-format msgid " don't attend" -msgstr "" +msgstr " nem vesz részt" #: src/Content/Conversation.php:265 #, php-format @@ -1127,7 +1127,7 @@ msgstr "%s nem vesz részt." #: src/Content/Conversation.php:268 #, php-format msgid " attend maybe" -msgstr "" +msgstr " talán részt vesz" #: src/Content/Conversation.php:269 #, php-format @@ -1137,7 +1137,7 @@ msgstr "%s talán részt vesz." #: src/Content/Conversation.php:272 #, php-format msgid " reshared this" -msgstr "" +msgstr " újra megosztotta ezt" #: src/Content/Conversation.php:320 msgid "Visible to everybody" @@ -1596,7 +1596,7 @@ msgstr "Mellőzés" #: src/Content/Item.php:428 src/Module/Contact.php:442 #: src/Module/Contact/Profile.php:494 msgid "Collapse" -msgstr "" +msgstr "Összecsukás" #: src/Content/Item.php:432 src/Object/Post.php:460 msgid "Languages" @@ -1610,7 +1610,7 @@ msgstr "Kapcsolódás vagy követés" #: src/Content/Item.php:862 msgid "Unable to fetch user." -msgstr "" +msgstr "Nem lehet lekérni a felhasználót." #: src/Content/Nav.php:120 msgid "Nothing new here" @@ -1648,11 +1648,11 @@ msgstr "Bejelentkezés" #: src/Content/Nav.php:229 src/Module/BaseProfile.php:57 #: src/Module/Contact.php:484 msgid "Conversations" -msgstr "" +msgstr "Beszélgetések" #: src/Content/Nav.php:229 msgid "Conversations you started" -msgstr "" +msgstr "Ön által elkezdett beszélgetések" #: src/Content/Nav.php:230 src/Module/BaseProfile.php:49 #: src/Module/BaseSettings.php:100 src/Module/Contact.php:476 @@ -2921,7 +2921,7 @@ msgstr "A partnert nem sikerült hozzáadni. Ellenőrizze a hozzá tartozó hál #: src/Model/Contact.php:2979 #, php-format msgid "Expected network %s does not match actual network %s" -msgstr "" +msgstr "A várt %s hálózat nem egyezik a tényleges %s hálózattal" #: src/Model/Contact.php:2996 msgid "The profile address specified does not provide adequate information." @@ -3130,17 +3130,17 @@ msgstr "bejegyzés" #: src/Model/Item.php:3059 #, php-format msgid "%s is blocked" -msgstr "" +msgstr "%s tiltva van" #: src/Model/Item.php:3061 #, php-format msgid "%s is ignored" -msgstr "" +msgstr "%s mellőzve van" #: src/Model/Item.php:3063 #, php-format msgid "Content from %s is collapsed" -msgstr "" +msgstr "A(z) %s helyről származó tartalom összecsukva" #: src/Model/Item.php:3067 #, php-format @@ -3373,7 +3373,7 @@ msgstr "A jelszó hossza 72 karakterre van korlátozva." #: src/Model/User.php:807 msgid "The password can't contain white spaces nor accentuated letters" -msgstr "" +msgstr "A jelszó nem tartalmazhat üres karaktereket vagy ékezetes betűket" #: src/Model/User.php:1002 msgid "Passwords do not match. Password unchanged." @@ -5036,7 +5036,7 @@ msgid "" "The system.url entry is missing. This is a low level setting and can lead to" " unexpected behavior. Please add a valid entry as soon as possible in the " "config file or per console command!" -msgstr "" +msgstr "A system.url bejegyzés hiányzik. Ez egy alacsony szintű beállítás, és váratlan viselkedéshez vezethet. Adjon meg egy érvényes bejegyzést a lehető leghamarabb a beállítófájlban vagy konzolparancsonként!" #: src/Module/Admin/Summary.php:107 msgid "The worker was never executed. Please check your database structure!" @@ -5219,7 +5219,7 @@ msgstr "Itt adja meg a rendszer szabályait. Minden sor egy szabályt jelent." #: src/Module/Api/ApiResponse.php:279 #, php-format msgid "API endpoint %s %s is not implemented but might be in the future." -msgstr "" +msgstr "A(z) %s %s API-végpont nincs megvalósítva, de a jövőben megvalósításra kerülhet." #: src/Module/Api/Mastodon/Apps.php:73 msgid "Missing parameters" @@ -5401,7 +5401,7 @@ msgstr "Profil részletei" #: src/Module/BaseProfile.php:60 msgid "Conversations started" -msgstr "" +msgstr "Beszélgetések elkezdve" #: src/Module/BaseProfile.php:111 msgid "Only You Can See This" @@ -5626,11 +5626,11 @@ msgstr "Csak a mellőzött partnerek megjelenítése" #: src/Module/Contact.php:371 src/Module/Contact.php:419 msgid "Collapsed" -msgstr "" +msgstr "Összecsukva" #: src/Module/Contact.php:374 msgid "Only show collapsed contacts" -msgstr "" +msgstr "Csak az összecsukott partnerek megjelenítése" #: src/Module/Contact.php:379 src/Module/Contact.php:420 msgid "Archived" @@ -5678,7 +5678,7 @@ msgstr "Mellőzés feloldása" #: src/Module/Contact.php:442 src/Module/Contact/Profile.php:494 msgid "Uncollapse" -msgstr "" +msgstr "Összecsukás megszüntetése" #: src/Module/Contact.php:444 msgid "Batch Actions" @@ -5694,7 +5694,7 @@ msgstr "Bejegyzések és hozzászólások" #: src/Module/Contact.php:495 msgid "Individual Posts and Replies" -msgstr "" +msgstr "Egyéni bejegyzések és válaszok" #: src/Module/Contact.php:503 msgid "Posts containing media objects" @@ -5906,7 +5906,7 @@ msgstr "Személyes jegyzet hozzáadása:" #: src/Module/Contact/Follow.php:191 src/Module/Contact/Unfollow.php:138 msgid "Posts and Replies" -msgstr "" +msgstr "Bejegyzések és válaszok" #: src/Module/Contact/Follow.php:220 msgid "The contact could not be added." @@ -5950,11 +5950,11 @@ msgstr "A partner figyelmen kívül lett hagyva" #: src/Module/Contact/Profile.php:210 msgid "Contact has been uncollapsed" -msgstr "" +msgstr "A partner figyelmen összecsukása meg lett szüntetve" #: src/Module/Contact/Profile.php:214 msgid "Contact has been collapsed" -msgstr "" +msgstr "A partner össze lett csukva" #: src/Module/Contact/Profile.php:243 #, php-format @@ -6095,7 +6095,7 @@ msgstr "Jelenleg mellőzve" #: src/Module/Contact/Profile.php:364 msgid "Currently collapsed" -msgstr "" +msgstr "Jelenleg összecsukva" #: src/Module/Contact/Profile.php:365 msgid "Currently archived" @@ -6163,7 +6163,7 @@ msgstr "Mellőzött állapot átváltása" #: src/Module/Contact/Profile.php:496 msgid "Toggle Collapsed status" -msgstr "" +msgstr "Összecsukott állapot átváltása" #: src/Module/Contact/Profile.php:503 src/Module/Contact/Revoke.php:106 msgid "Revoke Follow" @@ -6869,13 +6869,13 @@ msgstr "Ha a rendszer nem tudja felismerni a helyes útvonalat a telepítéshez, #: src/Module/Install.php:229 msgid "The Friendica system URL" -msgstr "" +msgstr "A Friendica rendszer URL-je" #: src/Module/Install.php:231 msgid "" "Overwrite this field in case the system URL determination isn't right, " "otherwise leave it as is." -msgstr "" +msgstr "Abban az esetben írja felül ezt a mezőt, ha a rendszer URL-meghatározása nem megfelelő, egyébként hagyja változatlanul." #: src/Module/Install.php:242 msgid "Database connection" @@ -8025,7 +8025,7 @@ msgstr "Másolja be a következő hitelesítési kódot az alkalmazásába, és #: src/Module/OAuth/Token.php:82 msgid "Invalid data or unknown client" -msgstr "" +msgstr "Érvénytelen adatok vagy ismeretlen ügyfél" #: src/Module/OAuth/Token.php:104 msgid "Unsupported or missing grant type" @@ -8710,7 +8710,7 @@ msgstr "A jelenlegi jelszava a változtatások megerősítéséhez" msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces and accentuated letters." -msgstr "" +msgstr "Az engedélyezett karakterek az a-z, A-Z, 0-9 tartományokban lévők és a különleges karakterek, kivéve az üres karaktereket és az ékezetes betűket." #: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:553 @@ -9418,14 +9418,14 @@ msgstr "Ha be van kapcsolva, akkor a csatolt hivatkozás címe címként lesz ho #: src/Module/Settings/Connectors.php:223 msgid "API: Use spoiler field as title" -msgstr "" +msgstr "API: a spoiler mező használata címként" #: src/Module/Settings/Connectors.php:223 msgid "" "When activated, the \"spoiler_text\" field in the API will be used for the " "title on standalone posts. When deactivated it will be used for spoiler " "text. For comments it will always be used for spoiler text." -msgstr "" +msgstr "Ha aktiválva van, akkor az API-ban lévő „spoiler_text” mező lesz használva az önálló bejegyzések címeként. Ha ki van kapcsolva, akkor a spoiler szövegéhez lesz használva. A megjegyzéseknél mindig a spoiler szövegéhez lesz használva." #: src/Module/Settings/Connectors.php:224 msgid "Your legacy ActivityPub/GNU Social account" @@ -10309,7 +10309,7 @@ msgstr "A követett fiókok listájának exportálása CSV-fájlként. Kompatibi #: src/Module/Special/DisplayNotFound.php:37 msgid "Not Found" -msgstr "" +msgstr "Nem található" #: src/Module/Special/DisplayNotFound.php:38 msgid "" @@ -10321,7 +10321,7 @@ msgid "" "\t
  • The node has blocked the top-level author or the author of the shared post.
  • \n" "\t
  • You have ignored or blocked the top-level author or the author of the shared post.
  • \n" "" -msgstr "" +msgstr "

    Sajnos a kért beszélgetés nem érhető el Önnek.

    \n

    A lehetséges okok a következők:

    \n
      \n\t
    • A legfelső szintű bejegyzés nem látható.
    • \n\t
    • A legfelső szintű bejegyzést törölték.
    • \n\t
    • A csomópont letiltotta a legfelső szintű szerzőt vagy a megosztott bejegyzés szerzőjét.
    • \n\t
    • Ön mellőzte vagy letiltotta a legfelső szintű szerzőt vagy a megosztott bejegyzés szerzőjét.
    • \n
    " #: src/Module/Special/HTTPException.php:78 msgid "Stack trace:" @@ -11057,12 +11057,12 @@ msgstr "%s %s megosztott egy új bejegyzést" #: src/Navigation/Notifications/Repository/Notify.php:791 #, php-format msgid "%1$s %2$s liked your post #%3$d" -msgstr "" +msgstr "%1$s %2$s kedvelte az Ön #%3$d bejegyzését" #: src/Navigation/Notifications/Repository/Notify.php:794 #, php-format msgid "%1$s %2$s liked your comment on #%3$d" -msgstr "" +msgstr "%1$s %2$s kedvelte az Ön hozzászólását ehhez: #%3$d" #: src/Object/EMail/ItemCCEMail.php:42 #, php-format @@ -11127,7 +11127,7 @@ msgstr "%s tiltása" #: src/Object/Post.php:269 #, php-format msgid "Ignore %s" -msgstr "" +msgstr "%s mellőzése" #: src/Object/Post.php:274 msgid "Save to folder" @@ -11297,42 +11297,42 @@ msgstr "Kevesebb megjelenítése" #: src/Object/Post.php:623 #, php-format msgid "Reshared by: %s" -msgstr "" +msgstr "Újra megosztotta: %s" #: src/Object/Post.php:628 #, php-format msgid "Viewed by: %s" -msgstr "" +msgstr "Megtekintette: %s" #: src/Object/Post.php:633 #, php-format msgid "Liked by: %s" -msgstr "" +msgstr "Kedvelte: %s" #: src/Object/Post.php:638 #, php-format msgid "Disliked by: %s" -msgstr "" +msgstr "Nem kedvelte: %s" #: src/Object/Post.php:643 #, php-format msgid "Attended by: %s" -msgstr "" +msgstr "Részt vett: %s" #: src/Object/Post.php:648 #, php-format msgid "Maybe attended by: %s" -msgstr "" +msgstr "Talán részt vett: %s" #: src/Object/Post.php:653 #, php-format msgid "Not attended by: %s" -msgstr "" +msgstr "Nem vett részt: %s" #: src/Object/Post.php:658 #, php-format msgid "Reacted with %s by: %s" -msgstr "" +msgstr "Reagált ezzel: %s: %s" #: src/Protocol/Delivery.php:547 msgid "(no subject)" diff --git a/view/lang/hu/strings.php b/view/lang/hu/strings.php index 465d1847d..e484f2d61 100644 --- a/view/lang/hu/strings.php +++ b/view/lang/hu/strings.php @@ -200,6 +200,7 @@ $a->strings['No system theme config value set.'] = 'Nincs rendszertéma beállí $a->strings['Apologies but the website is unavailable at the moment.'] = 'Elnézést, de a weboldal jelenleg nem érhető el.'; $a->strings['Delete this item?'] = 'Törli ezt az elemet?'; $a->strings['Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'] = 'Tiltja ezt a szerzőt? Nem lesz képes követni Önt, és a nyilvános bejegyzéseit sem látja, valamint Ön sem lesz képes megtekinteni az ő bejegyzéseit és értesítéseit.'; +$a->strings['Ignore this author? You won\'t be able to see their posts and their notifications.'] = 'Mellőzi ezt a szerzőt? Nem lesz képes megtekinteni az ő bejegyzéseit és értesítéseit.'; $a->strings['toggle mobile'] = 'váltás mobilra'; $a->strings['Method not allowed for this module. Allowed method(s): %s'] = 'A módszer nem engedélyezett ennél a modulnál. Az engedélyezett módszerek: %s'; $a->strings['Page not found.'] = 'Az oldal nem található.'; @@ -290,11 +291,17 @@ $a->strings['%s attends maybe.'] = '%s talán részt vesz.'; $a->strings['%s reshared this.'] = '%s újra megosztotta ezt.'; $a->strings['and'] = 'és'; $a->strings['and %d other people'] = 'és %d más személy'; +$a->strings[' like this'] = ' kedveli ezt'; $a->strings['%s like this.'] = '%s kedveli ezt.'; +$a->strings[' don\'t like this'] = ' nem kedveli ezt'; $a->strings['%s don\'t like this.'] = '%s nem kedveli ezt.'; +$a->strings[' attend'] = ' részt vesz'; $a->strings['%s attend.'] = '%s részt vesz.'; +$a->strings[' don\'t attend'] = ' nem vesz részt'; $a->strings['%s don\'t attend.'] = '%s nem vesz részt.'; +$a->strings[' attend maybe'] = ' talán részt vesz'; $a->strings['%s attend maybe.'] = '%s talán részt vesz.'; +$a->strings[' reshared this'] = ' újra megosztotta ezt'; $a->strings['Visible to everybody'] = 'Látható mindenkinek'; $a->strings['Please enter a image/video/audio/webpage URL:'] = 'Írjon be egy kép, videó, hang vagy weboldal URL-t:'; $a->strings['Tag term:'] = 'Címkézési kifejezés:'; @@ -395,8 +402,10 @@ $a->strings['View Contact'] = 'Partner megtekintése'; $a->strings['Send PM'] = 'Személyes üzenet küldése'; $a->strings['Block'] = 'Tiltás'; $a->strings['Ignore'] = 'Mellőzés'; +$a->strings['Collapse'] = 'Összecsukás'; $a->strings['Languages'] = 'Nyelvek'; $a->strings['Connect/Follow'] = 'Kapcsolódás vagy követés'; +$a->strings['Unable to fetch user.'] = 'Nem lehet lekérni a felhasználót.'; $a->strings['Nothing new here'] = 'Semmi új nincs itt'; $a->strings['Go back'] = 'Vissza'; $a->strings['Clear notifications'] = 'Értesítések törlése'; @@ -405,6 +414,8 @@ $a->strings['Logout'] = 'Kijelentkezés'; $a->strings['End this session'] = 'Munkamenet befejezése'; $a->strings['Login'] = 'Bejelentkezés'; $a->strings['Sign in'] = 'Bejelentkezés'; +$a->strings['Conversations'] = 'Beszélgetések'; +$a->strings['Conversations you started'] = 'Ön által elkezdett beszélgetések'; $a->strings['Profile'] = 'Profil'; $a->strings['Your profile page'] = 'Az Ön profiloldala'; $a->strings['Photos'] = 'Fényképek'; @@ -707,6 +718,7 @@ $a->strings['Disallowed profile URL.'] = 'Nem engedélyezett profil URL.'; $a->strings['Blocked domain'] = 'Tiltott tartomány'; $a->strings['Connect URL missing.'] = 'A kapcsolódási URL hiányzik.'; $a->strings['The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'] = 'A partnert nem sikerült hozzáadni. Ellenőrizze a hozzá tartozó hálózat hitelesítési adatait a Beállítások → Közösségi hálózatok oldalon.'; +$a->strings['Expected network %s does not match actual network %s'] = 'A várt %s hálózat nem egyezik a tényleges %s hálózattal'; $a->strings['The profile address specified does not provide adequate information.'] = 'A megadott profilcím nem biztosít elegendő információt.'; $a->strings['No compatible communication protocols or feeds were discovered.'] = 'Nem lettek megfelelő kommunikációs protokollok vagy hírforrások felfedezve.'; $a->strings['An author or name was not found.'] = 'Egy szerző vagy név nem található.'; @@ -753,6 +765,9 @@ $a->strings['Detected languages in this post:\n%s'] = 'A bejegyzésben felismert $a->strings['activity'] = 'tevékenység'; $a->strings['comment'] = 'hozzászólás'; $a->strings['post'] = 'bejegyzés'; +$a->strings['%s is blocked'] = '%s tiltva van'; +$a->strings['%s is ignored'] = '%s mellőzve van'; +$a->strings['Content from %s is collapsed'] = 'A(z) %s helyről származó tartalom összecsukva'; $a->strings['Content warning: %s'] = 'Tartalom figyelmeztetés: %s'; $a->strings['bytes'] = 'bájt'; $a->strings['%2$s (%3$d%%, %1$d vote)'] = [ @@ -817,6 +832,7 @@ $a->strings['Password can\'t be empty'] = 'A jelszó nem lehet üres'; $a->strings['Empty passwords are not allowed.'] = 'Az üres jelszavak nem megengedettek.'; $a->strings['The new password has been exposed in a public data dump, please choose another.'] = 'Az új jelszót közzétették egy nyilvános adattárban. Válasszon egy másikat.'; $a->strings['The password length is limited to 72 characters.'] = 'A jelszó hossza 72 karakterre van korlátozva.'; +$a->strings['The password can\'t contain white spaces nor accentuated letters'] = 'A jelszó nem tartalmazhat üres karaktereket vagy ékezetes betűket'; $a->strings['Passwords do not match. Password unchanged.'] = 'A jelszavak nem egyeznek. A jelszó változatlan maradt.'; $a->strings['An invitation is required.'] = 'Egy meghívás szükséges.'; $a->strings['Invitation could not be verified.'] = 'A meghívást nem sikerült ellenőrizni.'; @@ -1313,6 +1329,7 @@ $a->strings['Your table_definition_cache is too low (%d). This can lead to the d $a->strings['There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s'] = 'Elérhető a Friendica új verziója a letöltéshez. A jelenlegi verziója %1$s, a távoli verzió %2$s.'; $a->strings['The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'] = 'Az adatbázis frissítése sikertelen. Futtassa a „php bin/console.php dbstructure update” parancsot a parancssorból, és nézze meg a hibákat, amelyek esetleg megjelennek.'; $a->strings['The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'] = 'A legutóbbi frissítés sikertelen. Futtassa a „php bin/console.php dbstructure update” parancsot a parancssorból, és nézze meg a hibákat, amelyek esetleg megjelennek (néhány hiba valószínűleg a naplófájlban lesz).'; +$a->strings['The system.url entry is missing. This is a low level setting and can lead to unexpected behavior. Please add a valid entry as soon as possible in the config file or per console command!'] = 'A system.url bejegyzés hiányzik. Ez egy alacsony szintű beállítás, és váratlan viselkedéshez vezethet. Adjon meg egy érvényes bejegyzést a lehető leghamarabb a beállítófájlban vagy konzolparancsonként!'; $a->strings['The worker was never executed. Please check your database structure!'] = 'A feldolgozó sosem lett végrehajtva. Ellenőrizze az adatbázis szerkezetét!'; $a->strings['The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.'] = 'Az utolsó feldolgozó-végrehajtás ideje %s volt (UTC szerint). Ez régebbi mint egy óra. Ellenőrizze a cron-feladat beállításait.'; $a->strings['Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.'] = 'A Friendica beállításai most a „config/local.config.php” fájlban vannak eltárolva. Másolja le a „config/local-sample.config.php” fájlt, és helyezze át a beállításokat a .htconfig.php fájlból. Az átvitelhez való segítségért nézze meg a beállítások súgóoldalát.'; @@ -1347,6 +1364,7 @@ $a->strings['The Terms of Service'] = 'A használati feltételek'; $a->strings['Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.'] = 'Itt adja meg a csomópontja használati feltételeit. Használhat BBCode formázást is. A szakaszok címeinek [h2] vagy az alattiaknak kell lenniük.'; $a->strings['The rules'] = 'A szabályok'; $a->strings['Enter your system rules here. Each line represents one rule.'] = 'Itt adja meg a rendszer szabályait. Minden sor egy szabályt jelent.'; +$a->strings['API endpoint %s %s is not implemented but might be in the future.'] = 'A(z) %s %s API-végpont nincs megvalósítva, de a jövőben megvalósításra kerülhet.'; $a->strings['Missing parameters'] = 'Hiányzó paraméterek'; $a->strings['Only starting posts can be bookmarked'] = 'Csak a kezdeti bejegyzéseket lehet könyvjelzőzni'; $a->strings['Only starting posts can be muted'] = 'Csak a kezdeti bejegyzéseket lehet némítani'; @@ -1396,6 +1414,7 @@ $a->strings['Server Blocklist'] = 'Kiszolgáló-tiltólista'; $a->strings['Delete Item'] = 'Elem törlése'; $a->strings['Item Source'] = 'Elem forrása'; $a->strings['Profile Details'] = 'Profil részletei'; +$a->strings['Conversations started'] = 'Beszélgetések elkezdve'; $a->strings['Only You Can See This'] = 'Csak Ön láthatja ezt'; $a->strings['Scheduled Posts'] = 'Ütemezett bejegyzések'; $a->strings['Posts that are scheduled for publishing'] = 'Bejegyzések, amelyek közzétételre vannak üzemezve'; @@ -1446,6 +1465,8 @@ $a->strings['Blocked'] = 'Tiltva'; $a->strings['Only show blocked contacts'] = 'Csak a tiltott partnerek megjelenítése'; $a->strings['Ignored'] = 'Mellőzve'; $a->strings['Only show ignored contacts'] = 'Csak a mellőzött partnerek megjelenítése'; +$a->strings['Collapsed'] = 'Összecsukva'; +$a->strings['Only show collapsed contacts'] = 'Csak az összecsukott partnerek megjelenítése'; $a->strings['Archived'] = 'Archiválva'; $a->strings['Only show archived contacts'] = 'Csak az archivált partnerek megjelenítése'; $a->strings['Hidden'] = 'Rejtett'; @@ -1456,9 +1477,11 @@ $a->strings['Results for: %s'] = 'Találatok erre: %s'; $a->strings['Update'] = 'Frissítés'; $a->strings['Unblock'] = 'Tiltás feloldása'; $a->strings['Unignore'] = 'Mellőzés feloldása'; +$a->strings['Uncollapse'] = 'Összecsukás megszüntetése'; $a->strings['Batch Actions'] = 'Tömeges műveletek'; $a->strings['Conversations started by this contact'] = 'A partner által elkezdett beszélgetések'; $a->strings['Posts and Comments'] = 'Bejegyzések és hozzászólások'; +$a->strings['Individual Posts and Replies'] = 'Egyéni bejegyzések és válaszok'; $a->strings['Posts containing media objects'] = 'Médiaobjektumokat tartalmazó bejegyzések'; $a->strings['View all known contacts'] = 'Összes ismert partner megtekintése'; $a->strings['Advanced Contact Settings'] = 'Speciális partnerbeállítások'; @@ -1513,6 +1536,7 @@ $a->strings['Profile URL'] = 'Profil URL'; $a->strings['Tags:'] = 'Címkék:'; $a->strings['%s knows you'] = '%s ismeri Önt'; $a->strings['Add a personal note:'] = 'Személyes jegyzet hozzáadása:'; +$a->strings['Posts and Replies'] = 'Bejegyzések és válaszok'; $a->strings['The contact could not be added.'] = 'A partnert nem sikerült hozzáadni.'; $a->strings['Invalid request.'] = 'Érvénytelen kérés.'; $a->strings['No keywords to match. Please add keywords to your profile.'] = 'Nincs illesztendő kulcsszó. Adjon kulcsszavakat a profiljához.'; @@ -1522,6 +1546,8 @@ $a->strings['Contact has been unblocked'] = 'A partner tiltása fel lett oldva'; $a->strings['Contact has been blocked'] = 'A partner tiltva lett'; $a->strings['Contact has been unignored'] = 'A partner figyelmen kívül hagyása fel lett oldva'; $a->strings['Contact has been ignored'] = 'A partner figyelmen kívül lett hagyva'; +$a->strings['Contact has been uncollapsed'] = 'A partner figyelmen összecsukása meg lett szüntetve'; +$a->strings['Contact has been collapsed'] = 'A partner össze lett csukva'; $a->strings['You are mutual friends with %s'] = 'Ön kölcsönösen ismerős %s partnerrel'; $a->strings['You are sharing with %s'] = 'Ön megoszt %s partnerrel'; $a->strings['%s is sharing with you'] = '%s megoszt Önnel'; @@ -1554,6 +1580,7 @@ $a->strings['Update now'] = 'Frissítés most'; $a->strings['Awaiting connection acknowledge'] = 'Várakozás a kapcsolat nyugtázására'; $a->strings['Currently blocked'] = 'Jelenleg tiltva'; $a->strings['Currently ignored'] = 'Jelenleg mellőzve'; +$a->strings['Currently collapsed'] = 'Jelenleg összecsukva'; $a->strings['Currently archived'] = 'Jelenleg archiválva'; $a->strings['Hide this contact from others'] = 'A partner elrejtése mások elől'; $a->strings['Replies/likes to your public posts may still be visible'] = 'A nyilvános bejegyzéseire adott válaszok vagy kedvelések továbbra is láthatóak lehetnek.'; @@ -1568,6 +1595,7 @@ $a->strings['Mark this contact as remote_self, this will cause friendica to repo $a->strings['Refetch contact data'] = 'Partneradatok ismételt lekérése'; $a->strings['Toggle Blocked status'] = 'Tiltott állapot átváltása'; $a->strings['Toggle Ignored status'] = 'Mellőzött állapot átváltása'; +$a->strings['Toggle Collapsed status'] = 'Összecsukott állapot átváltása'; $a->strings['Revoke Follow'] = 'Követés visszavonása'; $a->strings['Revoke the follow from this contact'] = 'A követés visszavonása ettől a partnertől'; $a->strings['Bad Request.'] = 'Hibás kérés.'; @@ -1736,6 +1764,8 @@ $a->strings['Check again'] = 'Ellenőrzés újra'; $a->strings['Base settings'] = 'Alapvető beállítások'; $a->strings['Base path to installation'] = 'Alap útvonal a telepítéshez'; $a->strings['If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.'] = 'Ha a rendszer nem tudja felismerni a helyes útvonalat a telepítéshez, akkor itt adja meg a helyes útvonalat. Ezt a beállítást csak akkor kell megadni, ha korlátozott rendszert és a webgyökérre mutató szimbolikus hivatkozásokat használ.'; +$a->strings['The Friendica system URL'] = 'A Friendica rendszer URL-je'; +$a->strings['Overwrite this field in case the system URL determination isn\'t right, otherwise leave it as is.'] = 'Abban az esetben írja felül ezt a mezőt, ha a rendszer URL-meghatározása nem megfelelő, egyébként hagyja változatlanul.'; $a->strings['Database connection'] = 'Adatbázis-kapcsolat'; $a->strings['In order to install Friendica we need to know how to connect to your database.'] = 'A Friendica telepítése érdekében tudnunk kell, hogy hogyan kell kapcsolódni az adatbázisához.'; $a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Vegye fel a kapcsolatot a tárhelyszolgáltatóval vagy az oldal adminisztrátorával, ha kérdései vannak ezekkel a beállításokkal kapcsolatban.'; @@ -2017,6 +2047,7 @@ $a->strings['Do you want to authorize this application to access your posts and $a->strings['Unsupported or missing response type'] = 'Nem támogatott vagy hiányzó választípus'; $a->strings['Incomplete request data'] = 'Befejezetlen kérésadat'; $a->strings['Please copy the following authentication code into your application and close this window: %s'] = 'Másolja be a következő hitelesítési kódot az alkalmazásába, és zárja be ezt az ablakot: %s'; +$a->strings['Invalid data or unknown client'] = 'Érvénytelen adatok vagy ismeretlen ügyfél'; $a->strings['Unsupported or missing grant type'] = 'Nem támogatott vagy hiányzó felhatalmazástípus'; $a->strings['Resubscribing to OStatus contacts'] = 'Újrafeliratkozás az OStatus partnerekre'; $a->strings['Keep this window open until done.'] = 'Tartsa nyitva ezt az ablakot, amíg el nem készül.'; @@ -2169,6 +2200,7 @@ $a->strings['Since version 2022.09, we\'ve realized that any password longer tha $a->strings['Update Password'] = 'Jelszó frissítése'; $a->strings['Current Password:'] = 'Jelenlegi jelszó:'; $a->strings['Your current password to confirm the changes'] = 'A jelenlegi jelszava a változtatások megerősítéséhez'; +$a->strings['Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.'] = 'Az engedélyezett karakterek az a-z, A-Z, 0-9 tartományokban lévők és a különleges karakterek, kivéve az üres karaktereket és az ékezetes betűket.'; $a->strings['Password length is limited to 72 characters.'] = 'A jelszó hossza 72 karakterre van korlátozva.'; $a->strings['Remaining recovery codes: %d'] = 'Hátralévő visszaszerzési kódok: %d'; $a->strings['Invalid code, please retry.'] = 'Érvénytelen kód, próbálja újra.'; @@ -2321,6 +2353,8 @@ $a->strings['Enable simple text shortening'] = 'Egyszerű szövegrövidítés en $a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Általában a rendszer lerövidíti a bejegyzéseket a következő soremelésnél. Ha ez a beállítás engedélyezve van, akkor a rendszer a legnagyobb karakterkorlátnál fogja rövidíteni a szöveget.'; $a->strings['Attach the link title'] = 'A hivatkozás címének csatolása'; $a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Ha be van kapcsolva, akkor a csatolt hivatkozás címe címként lesz hozzáadva a Diaspora hálózatra küldött bejegyzéseknél. Ez többnyire az olyan „távoli önmaga” partnerekkel hasznos, amelyek megosztják a hírforrás tartalmát.'; +$a->strings['API: Use spoiler field as title'] = 'API: a spoiler mező használata címként'; +$a->strings['When activated, the "spoiler_text" field in the API will be used for the title on standalone posts. When deactivated it will be used for spoiler text. For comments it will always be used for spoiler text.'] = 'Ha aktiválva van, akkor az API-ban lévő „spoiler_text” mező lesz használva az önálló bejegyzések címeként. Ha ki van kapcsolva, akkor a spoiler szövegéhez lesz használva. A megjegyzéseknél mindig a spoiler szövegéhez lesz használva.'; $a->strings['Your legacy ActivityPub/GNU Social account'] = 'Az örökölt ActivityPub/GNU Social fiókja'; $a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'Ha megadja itt a régi, egy ActivityPub alapú rendszerből származó fiókja nevét, illetve a GNU Social vagy Statusnet fiókja nevét (felhasználó@tartomány.tld formátumban), akkor a partnerei automatikusan hozzá lesznek adva. A mező ki lesz ürítve, ha elkészült.'; $a->strings['Repair OStatus subscriptions'] = 'OStatus feliratkozások javítása'; @@ -2550,6 +2584,22 @@ $a->strings['Export all'] = 'Összes exportálása'; $a->strings['Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)'] = 'Fiókinformációk, partnerek és az összes elem exportálása JSON-formátumban. nagyon nagy fájl is lehet, és sokáig eltarthat. A fiókja teljes biztonsági mentésének elkészítéséhez használja ezt (a fényképek nem lesznek exportálva).'; $a->strings['Export Contacts to CSV'] = 'Partnerek exportálása CSV-fájlba'; $a->strings['Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.'] = 'A követett fiókok listájának exportálása CSV-fájlként. Kompatibilis például a Mastodonnal.'; +$a->strings['Not Found'] = 'Nem található'; +$a->strings['

    Unfortunately, the requested conversation isn\'t available to you.

    +

    Possible reasons include:

    +
      +
    • The top-level post isn\'t visible.
    • +
    • The top-level post was deleted.
    • +
    • The node has blocked the top-level author or the author of the shared post.
    • +
    • You have ignored or blocked the top-level author or the author of the shared post.
    • +
    '] = '

    Sajnos a kért beszélgetés nem érhető el Önnek.

    +

    A lehetséges okok a következők:

    +
      +
    • A legfelső szintű bejegyzés nem látható.
    • +
    • A legfelső szintű bejegyzést törölték.
    • +
    • A csomópont letiltotta a legfelső szintű szerzőt vagy a megosztott bejegyzés szerzőjét.
    • +
    • Ön mellőzte vagy letiltotta a legfelső szintű szerzőt vagy a megosztott bejegyzés szerzőjét.
    • +
    '; $a->strings['Stack trace:'] = 'Veremkiíratás:'; $a->strings['Exception thrown in %s:%d'] = 'Kivétel történt itt: %s:%d'; $a->strings['At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'] = 'A regisztrációkor, valamint a felhasználói fiók és a partnerei között történő kommunikáció biztosításához a felhasználónak biztosítania kell egy megjelenített nevet (álnevet), egy felhasználónevet (becenevet) és egy működő e-mail-címet. A nevek hozzáférhetőek lesznek a fiók profiloldalán az oldal bármely látogatója számára, még akkor is, ha más profilrészletek nem jelennek meg. Az e-mail-cím csak az interakciókkal kapcsolatos felhasználói értesítések küldéséhez lesz használva, de nem lesz láthatóan megjelenítve. A fiók felsorolása a csomópont felhasználói könyvtárában vagy a globális felhasználói könyvtárban választható, és a felhasználói beállításokban szabályozható. Ez nem szükséges a kommunikációhoz.'; @@ -2695,6 +2745,8 @@ $a->strings['You\'ve received a [url=%1$s]new registration[/url] from %2$s.'] = $a->strings['Please visit %s to have a look at the new registration.'] = 'Látogassa meg a(z) %s oldal, hogy egy pillantást vessen az új regisztrációra.'; $a->strings['%s %s tagged you'] = '%s %s megjelölte Önt'; $a->strings['%s %s shared a new post'] = '%s %s megosztott egy új bejegyzést'; +$a->strings['%1$s %2$s liked your post #%3$d'] = '%1$s %2$s kedvelte az Ön #%3$d bejegyzését'; +$a->strings['%1$s %2$s liked your comment on #%3$d'] = '%1$s %2$s kedvelte az Ön hozzászólását ehhez: #%3$d'; $a->strings['This message was sent to you by %s, a member of the Friendica social network.'] = 'Ezt az üzenetet %s, a Friendica közösségi hálózatának tagja küldte Önnek.'; $a->strings['You may visit them online at %s'] = 'Meglátogathatja őket az interneten ezen a címen: %s'; $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Vegye fel a kapcsolatot a küldővel erre a bejegyzésre válaszolva, ha nem szeretné megkapni ezeket az üzeneteket.'; @@ -2708,6 +2760,7 @@ $a->strings['Edit'] = 'Szerkesztés'; $a->strings['Delete globally'] = 'Törlés globálisan'; $a->strings['Remove locally'] = 'Eltávolítás helyileg'; $a->strings['Block %s'] = '%s tiltása'; +$a->strings['Ignore %s'] = '%s mellőzése'; $a->strings['Save to folder'] = 'Mentés mappába'; $a->strings['I will attend'] = 'Részt veszek'; $a->strings['I will not attend'] = 'Nem veszek részt'; @@ -2751,6 +2804,14 @@ $a->strings['%d comment'] = [ ]; $a->strings['Show more'] = 'Több megjelenítése'; $a->strings['Show fewer'] = 'Kevesebb megjelenítése'; +$a->strings['Reshared by: %s'] = 'Újra megosztotta: %s'; +$a->strings['Viewed by: %s'] = 'Megtekintette: %s'; +$a->strings['Liked by: %s'] = 'Kedvelte: %s'; +$a->strings['Disliked by: %s'] = 'Nem kedvelte: %s'; +$a->strings['Attended by: %s'] = 'Részt vett: %s'; +$a->strings['Maybe attended by: %s'] = 'Talán részt vett: %s'; +$a->strings['Not attended by: %s'] = 'Nem vett részt: %s'; +$a->strings['Reacted with %s by: %s'] = 'Reagált ezzel: %s: %s'; $a->strings['(no subject)'] = '(nincs tárgy)'; $a->strings['%s is now following %s.'] = '%s mostantól követi %s partnert.'; $a->strings['following'] = 'követés'; diff --git a/view/lang/ru/messages.po b/view/lang/ru/messages.po index 851b8b4cb..bcc38dfbc 100644 --- a/view/lang/ru/messages.po +++ b/view/lang/ru/messages.po @@ -1289,7 +1289,7 @@ msgstr "Публичная запись" #: src/Model/Profile.php:469 src/Module/Admin/Logs/View.php:93 #: src/Module/Post/Edit.php:177 msgid "Message" -msgstr "Личное" +msgstr "Запись" #: src/Content/Conversation.php:407 src/Module/Post/Edit.php:178 #: src/Module/Settings/TwoFactor/Trusted.php:140 @@ -1990,7 +1990,7 @@ msgstr "Конец" #: src/Content/Text/HTML.php:884 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:463 src/Module/Contact/Profile.php:438 msgid "Follow" -msgstr "Подписаться" +msgstr "Подписка" #: src/Content/Widget.php:51 msgid "Add New Contact" @@ -3152,12 +3152,12 @@ msgstr "пост" #: src/Model/Item.php:3059 #, php-format msgid "%s is blocked" -msgstr "" +msgstr "%s заблокирован" #: src/Model/Item.php:3061 #, php-format msgid "%s is ignored" -msgstr "" +msgstr "%s игнорируется" #: src/Model/Item.php:3063 #, php-format @@ -3403,7 +3403,7 @@ msgstr "Длина пароля ограничена 72 символами." #: src/Model/User.php:807 msgid "The password can't contain white spaces nor accentuated letters" -msgstr "" +msgstr "Пароль не может содержать пробелов и букв с акцентами." #: src/Model/User.php:1002 msgid "Passwords do not match. Password unchanged." @@ -8808,7 +8808,7 @@ msgstr "Ваш текущий пароль, для подтверждения и msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces and accentuated letters." -msgstr "" +msgstr "Допустимые символы a-z, A-Z, 0-9 и специальные символы за исключением пробелов и букв с акцентами." #: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Settings/Account.php:553 @@ -9420,13 +9420,13 @@ msgstr "Diaspora (Socialhome, Hubzilla)" #: src/Module/Settings/Connectors.php:168 #, php-format msgid "Built-in support for %s connectivity is enabled" -msgstr "" +msgstr "Встроенная поддержка для %s включена" #: src/Module/Settings/Connectors.php:165 #: src/Module/Settings/Connectors.php:167 #, php-format msgid "Built-in support for %s connectivity is disabled" -msgstr "" +msgstr "Встроенная поддержка для %s отключена" #: src/Module/Settings/Connectors.php:167 #: src/Module/Settings/Connectors.php:168 @@ -10407,7 +10407,7 @@ msgstr "Выгрузить список пользователей, на кот #: src/Module/Special/DisplayNotFound.php:37 msgid "Not Found" -msgstr "" +msgstr "Не найдено" #: src/Module/Special/DisplayNotFound.php:38 msgid "" @@ -11399,42 +11399,42 @@ msgstr "Показать меньше" #: src/Object/Post.php:623 #, php-format msgid "Reshared by: %s" -msgstr "" +msgstr "Репост от: %s" #: src/Object/Post.php:628 #, php-format msgid "Viewed by: %s" -msgstr "" +msgstr "Просмотрено: %s" #: src/Object/Post.php:633 #, php-format msgid "Liked by: %s" -msgstr "" +msgstr "Понравилось: %s" #: src/Object/Post.php:638 #, php-format msgid "Disliked by: %s" -msgstr "" +msgstr "Не понравилось: %s" #: src/Object/Post.php:643 #, php-format msgid "Attended by: %s" -msgstr "" +msgstr "Присутствуют: %s" #: src/Object/Post.php:648 #, php-format msgid "Maybe attended by: %s" -msgstr "" +msgstr "Под вопросом: %s" #: src/Object/Post.php:653 #, php-format msgid "Not attended by: %s" -msgstr "" +msgstr "Не присутствуют: %s" #: src/Object/Post.php:658 #, php-format msgid "Reacted with %s by: %s" -msgstr "" +msgstr "Отреагировали как %s : %s" #: src/Protocol/Delivery.php:547 msgid "(no subject)" diff --git a/view/lang/ru/strings.php b/view/lang/ru/strings.php index 89f4fc402..c8f6865bd 100644 --- a/view/lang/ru/strings.php +++ b/view/lang/ru/strings.php @@ -318,7 +318,7 @@ $a->strings['Categories (comma-separated list)'] = 'Категории (спис $a->strings['Scheduled at'] = 'Запланировано на'; $a->strings['Permission settings'] = 'Настройки разрешений'; $a->strings['Public post'] = 'Публичная запись'; -$a->strings['Message'] = 'Личное'; +$a->strings['Message'] = 'Запись'; $a->strings['Browser'] = 'Браузер'; $a->strings['Open Compose page'] = 'Развернуть редактор'; $a->strings['Pinned item'] = 'Закреплённая запись'; @@ -471,7 +471,7 @@ $a->strings['Invalid source protocol'] = 'Неправильный проток $a->strings['Invalid link protocol'] = 'Неправильная протокольная ссылка'; $a->strings['Loading more entries...'] = 'Загружаю больше сообщений...'; $a->strings['The end'] = 'Конец'; -$a->strings['Follow'] = 'Подписаться'; +$a->strings['Follow'] = 'Подписка'; $a->strings['Add New Contact'] = 'Добавить контакт'; $a->strings['Enter address or web location'] = 'Введите адрес или веб-местонахождение'; $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Пример: bob@example.com, http://example.com/barbara'; @@ -750,6 +750,8 @@ $a->strings['Detected languages in this post:\n%s'] = 'Обнаруженные $a->strings['activity'] = 'активность'; $a->strings['comment'] = 'комментарий'; $a->strings['post'] = 'пост'; +$a->strings['%s is blocked'] = '%s заблокирован'; +$a->strings['%s is ignored'] = '%s игнорируется'; $a->strings['Content from %s is collapsed'] = 'Запись от %s скрыта'; $a->strings['Content warning: %s'] = 'Предупреждение о контенте: %s'; $a->strings['bytes'] = 'байт'; @@ -823,6 +825,7 @@ $a->strings['Password can\'t be empty'] = 'Пароль не может быть $a->strings['Empty passwords are not allowed.'] = 'Пароль не должен быть пустым.'; $a->strings['The new password has been exposed in a public data dump, please choose another.'] = 'Новый пароль содержится в опубликованных списках украденных паролей, пожалуйста, используйте другой.'; $a->strings['The password length is limited to 72 characters.'] = 'Длина пароля ограничена 72 символами.'; +$a->strings['The password can\'t contain white spaces nor accentuated letters'] = 'Пароль не может содержать пробелов и букв с акцентами.'; $a->strings['Passwords do not match. Password unchanged.'] = 'Пароли не совпадают. Пароль не изменен.'; $a->strings['An invitation is required.'] = 'Требуется приглашение.'; $a->strings['Invitation could not be verified.'] = 'Приглашение не может быть проверено.'; @@ -2051,6 +2054,7 @@ $a->strings['Since version 2022.09, we\'ve realized that any password longer tha $a->strings['Update Password'] = 'Изменить пароль'; $a->strings['Current Password:'] = 'Текущий пароль:'; $a->strings['Your current password to confirm the changes'] = 'Ваш текущий пароль, для подтверждения изменений'; +$a->strings['Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.'] = 'Допустимые символы a-z, A-Z, 0-9 и специальные символы за исключением пробелов и букв с акцентами.'; $a->strings['Password length is limited to 72 characters.'] = 'Длина пароля ограничена 72-мя символами.'; $a->strings['Remaining recovery codes: %d'] = 'Осталось кодов для восстановления: %d'; $a->strings['Invalid code, please retry.'] = 'Неправильный код, попробуйте ещё.'; @@ -2184,6 +2188,8 @@ $a->strings['Addon Settings'] = 'Настройки дополнений'; $a->strings['No Addon settings configured'] = 'Настройки дополнений не изменены'; $a->strings['Failed to connect with email account using the settings provided.'] = 'Не удалось подключиться к аккаунту e-mail, используя указанные настройки.'; $a->strings['Diaspora (Socialhome, Hubzilla)'] = 'Diaspora (Socialhome, Hubzilla)'; +$a->strings['Built-in support for %s connectivity is enabled'] = 'Встроенная поддержка для %s включена'; +$a->strings['Built-in support for %s connectivity is disabled'] = 'Встроенная поддержка для %s отключена'; $a->strings['OStatus (GNU Social)'] = 'OStatus (GNU Social)'; $a->strings['Email access is disabled on this site.'] = 'Доступ эл. почты отключен на этом сайте.'; $a->strings['None'] = 'Ничего'; @@ -2432,6 +2438,7 @@ $a->strings['Export all'] = 'Экспорт всего'; $a->strings['Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)'] = 'Выгрузить информацию о вашей учётной записи, контактах и всех ваших записях как файл JSON. Это может занять много времени и создать очень большой файл. Используйте это для создания резервной копии вашей учётной записи (изображения в неё не войдут).'; $a->strings['Export Contacts to CSV'] = 'Экспорт контактов в CSV'; $a->strings['Export the list of the accounts you are following as CSV file. Compatible to e.g. Mastodon.'] = 'Выгрузить список пользователей, на которых вы подписаны, в CSV-файл. Совместимо с Mastodon и др.'; +$a->strings['Not Found'] = 'Не найдено'; $a->strings['Privacy Statement'] = 'Положение о конфиденциальности'; $a->strings['Rules'] = 'Правила'; $a->strings['Parameter uri_id is missing.'] = 'Параметр uri_id отсутствует.'; @@ -2635,6 +2642,14 @@ $a->strings['%d comment'] = [ ]; $a->strings['Show more'] = 'Показать больше'; $a->strings['Show fewer'] = 'Показать меньше'; +$a->strings['Reshared by: %s'] = 'Репост от: %s'; +$a->strings['Viewed by: %s'] = 'Просмотрено: %s'; +$a->strings['Liked by: %s'] = 'Понравилось: %s'; +$a->strings['Disliked by: %s'] = 'Не понравилось: %s'; +$a->strings['Attended by: %s'] = 'Присутствуют: %s'; +$a->strings['Maybe attended by: %s'] = 'Под вопросом: %s'; +$a->strings['Not attended by: %s'] = 'Не присутствуют: %s'; +$a->strings['Reacted with %s by: %s'] = 'Отреагировали как %s : %s'; $a->strings['(no subject)'] = '(нет темы)'; $a->strings['%s is now following %s.'] = '%s теперь подписан на %s.'; $a->strings['following'] = 'следует'; diff --git a/view/templates/acl/full_selector.tpl b/view/templates/acl/full_selector.tpl index ada05fbd4..a2329614e 100644 --- a/view/templates/acl/full_selector.tpl +++ b/view/templates/acl/full_selector.tpl @@ -126,19 +126,19 @@ // Custom visibility tags inputs let acl_groups = new Bloodhound({ - local: {{$acl_groups|@json_encode nofilter}}, + local: {{$acl_groups nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name']), queryTokenizer: Bloodhound.tokenizers.whitespace, }); let acl_contacts = new Bloodhound({ - local: {{$acl_contacts|@json_encode nofilter}}, + local: {{$acl_contacts nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace, }); let acl = new Bloodhound({ - local: {{$acl_list|@json_encode nofilter}}, + local: {{$acl_list nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace, diff --git a/view/templates/acl/message_recipient.tpl b/view/templates/acl/message_recipient.tpl index 0e6d8c939..701ba23a6 100644 --- a/view/templates/acl/message_recipient.tpl +++ b/view/templates/acl/message_recipient.tpl @@ -9,7 +9,7 @@ let $recipient_input = $('[name="recipient"]'); let acl = new Bloodhound({ - local: {{$contacts|@json_encode nofilter}}, + local: {{$contacts_json nofilter}}, identify: function(obj) { return obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace, diff --git a/view/templates/contact/list.tpl b/view/templates/contact/list.tpl index ec77fd521..b3ed7df7b 100644 --- a/view/templates/contact/list.tpl +++ b/view/templates/contact/list.tpl @@ -12,3 +12,7 @@
    {{$paginate nofilter}} + +{{if $filtered}} +

    {{$filtered nofilter}}

    +{{/if}} diff --git a/view/templates/head.tpl b/view/templates/head.tpl index f37fd824e..0b2563644 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -85,9 +85,6 @@ }); }; - var updateInterval = {{$update_interval}}; - var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; - function confirmDelete() { return confirm("{{$delitem}}"); } function commentExpand(id) { $("#comment-edit-text-" + id).putCursorAtEnd(); diff --git a/view/theme/frio/templates/contact/list.tpl b/view/theme/frio/templates/contact/list.tpl index 1925f7ec4..1258ded36 100644 --- a/view/theme/frio/templates/contact/list.tpl +++ b/view/theme/frio/templates/contact/list.tpl @@ -14,4 +14,8 @@ at the suggest page and also at many other places *}}
    {{$paginate nofilter}} - \ No newline at end of file + +{{if $filtered}} +

    {{$filtered nofilter}}

    +{{/if}} + diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index c59b30cf7..09ca31853 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -99,7 +99,7 @@ {{/if}} {{* The jot text field in which the post text is inserted *}} -
    +
    diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index 7d47f46e2..d633913ed 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -192,19 +192,21 @@ // Create colorpickers $("#frio_nav_bg, #frio_nav_icon_color, #frio_background_color, #frio_link_color, #frio_login_bg_color").colorpicker({format: 'hex', align: 'left'}); - // show image options when user starts to type the address of the image - $("#id_frio_background_image").keyup(function(){ - var elText = $(this).val(); - if(elText.length !== 0) { - $("#frio_bg_image_options").show(); - } else { - $("#frio_bg_image_options").hide(); - } - }); + if ($("#id_frio_background_image").length) { + // show image options when user starts to type the address of the image + $("#id_frio_background_image").keyup(function () { + const elText = $(this).val(); + if (elText.length !== 0) { + $("#frio_bg_image_options").show(); + } else { + $("#frio_bg_image_options").hide(); + } + }); - // show the image options if there is already an image - if($("#id_frio_background_image").val().length != 0) { + // show the image options if there is already an image + if ($("#id_frio_background_image").val().length != 0) { $("#frio_bg_image_options").show(); + } } });